Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
1d36547d
Commit
1d36547d
authored
Feb 12, 2020
by
Matej Frančeškin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove reference to NXP NFC Library. Keep only QtNFC.
parent
a97230c7
Changes
55
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
55 changed files
with
5 additions
and
8942 deletions
+5
-8942
QGCCommon.pri
QGCCommon.pri
+0
-1
QGCExternalLibs.pri
QGCExternalLibs.pri
+0
-2
qgroundcontrol.pro
qgroundcontrol.pro
+0
-76
P2P_NDEF.h
src/PairingManager/NfcLibrary/NdefLibrary/inc/P2P_NDEF.h
+0
-18
RW_NDEF.h
src/PairingManager/NfcLibrary/NdefLibrary/inc/RW_NDEF.h
+0
-34
RW_NDEF_T1T.h
src/PairingManager/NfcLibrary/NdefLibrary/inc/RW_NDEF_T1T.h
+0
-16
RW_NDEF_T2T.h
src/PairingManager/NfcLibrary/NdefLibrary/inc/RW_NDEF_T2T.h
+0
-17
RW_NDEF_T3T.h
src/PairingManager/NfcLibrary/NdefLibrary/inc/RW_NDEF_T3T.h
+0
-17
RW_NDEF_T4T.h
src/PairingManager/NfcLibrary/NdefLibrary/inc/RW_NDEF_T4T.h
+0
-17
T4T_NDEF_emu.h
src/PairingManager/NfcLibrary/NdefLibrary/inc/T4T_NDEF_emu.h
+0
-16
P2P_NDEF.c
src/PairingManager/NfcLibrary/NdefLibrary/src/P2P_NDEF.c
+0
-298
RW_NDEF.c
src/PairingManager/NfcLibrary/NdefLibrary/src/RW_NDEF.c
+0
-100
RW_NDEF_T1T.c
src/PairingManager/NfcLibrary/NdefLibrary/src/RW_NDEF_T1T.c
+0
-171
RW_NDEF_T2T.c
src/PairingManager/NfcLibrary/NdefLibrary/src/RW_NDEF_T2T.c
+0
-234
RW_NDEF_T3T.c
src/PairingManager/NfcLibrary/NdefLibrary/src/RW_NDEF_T3T.c
+0
-125
RW_NDEF_T4T.c
src/PairingManager/NfcLibrary/NdefLibrary/src/RW_NDEF_T4T.c
+0
-361
T4T_NDEF_emu.c
src/PairingManager/NfcLibrary/NdefLibrary/src/T4T_NDEF_emu.c
+0
-145
NxpNci.h
src/PairingManager/NfcLibrary/NxpNci/inc/NxpNci.h
+0
-48
NxpNci.c
src/PairingManager/NfcLibrary/NxpNci/src/NxpNci.c
+0
-941
Nfc.h
src/PairingManager/NfcLibrary/inc/Nfc.h
+0
-310
Nfc_settings.h
src/PairingManager/NfcLibrary/inc/Nfc_settings.h
+0
-129
ndef_helper.h
src/PairingManager/NfcTask/inc/ndef_helper.h
+0
-62
nfc_task.h
src/PairingManager/NfcTask/inc/nfc_task.h
+0
-16
ndef_helper.c
src/PairingManager/NfcTask/src/ndef_helper.c
+0
-202
nfc_task.c
src/PairingManager/NfcTask/src/nfc_task.c
+0
-608
PairingManager.cc
src/PairingManager/PairingManager.cc
+3
-3
PairingManager.h
src/PairingManager/PairingManager.h
+2
-5
PairingNFC.cc
src/PairingManager/PairingNFC.cc
+0
-214
PairingNFC.h
src/PairingManager/PairingNFC.h
+0
-43
framework_Allocator.h
src/PairingManager/TML/inc/framework_Allocator.h
+0
-29
framework_Container.h
src/PairingManager/TML/inc/framework_Container.h
+0
-53
framework_Interface.h
src/PairingManager/TML/inc/framework_Interface.h
+0
-132
framework_Map.h
src/PairingManager/TML/inc/framework_Map.h
+0
-45
framework_Parcel.h
src/PairingManager/TML/inc/framework_Parcel.h
+0
-54
framework_Timer.h
src/PairingManager/TML/inc/framework_Timer.h
+0
-35
framework_linux.h
src/PairingManager/TML/inc/framework_linux.h
+0
-31
hidapi.h
src/PairingManager/TML/inc/hidapi.h
+0
-383
lpcusbsio.h
src/PairingManager/TML/inc/lpcusbsio.h
+0
-431
lpcusbsio_i2c.h
src/PairingManager/TML/inc/lpcusbsio_i2c.h
+0
-189
tml.h
src/PairingManager/TML/inc/tml.h
+0
-24
tml_hid.h
src/PairingManager/TML/inc/tml_hid.h
+0
-19
tool.h
src/PairingManager/TML/inc/tool.h
+0
-22
framework_Allocator.c
src/PairingManager/TML/src/framework_Allocator.c
+0
-80
framework_Container.c
src/PairingManager/TML/src/framework_Container.c
+0
-322
framework_Map.c
src/PairingManager/TML/src/framework_Map.c
+0
-286
framework_Parcel.c
src/PairingManager/TML/src/framework_Parcel.c
+0
-358
framework_Timer.c
src/PairingManager/TML/src/framework_Timer.c
+0
-156
framework_log.c
src/PairingManager/TML/src/framework_log.c
+0
-107
framework_mutex.c
src/PairingManager/TML/src/framework_mutex.c
+0
-115
framework_sem.c
src/PairingManager/TML/src/framework_sem.c
+0
-82
framework_thread.c
src/PairingManager/TML/src/framework_thread.c
+0
-107
hid.c
src/PairingManager/TML/src/hid.c
+0
-586
lpcusbsio.c
src/PairingManager/TML/src/lpcusbsio.c
+0
-883
tml.c
src/PairingManager/TML/src/tml.c
+0
-33
tml_hid.c
src/PairingManager/TML/src/tml_hid.c
+0
-151
No files found.
QGCCommon.pri
View file @
1d36547d
...
...
@@ -22,7 +22,6 @@ linux {
message("Linux build")
CONFIG += LinuxBuild
DEFINES += __STDC_LIMIT_MACROS
DEFINES += QGC_ENABLE_NFC RW_SUPPORT
DEFINES += QGC_GST_TAISYNC_ENABLED
DEFINES += QGC_GST_MICROHARD_ENABLED
DEFINES += QGC_ENABLE_MAVLINK_INSPECTOR
...
...
QGCExternalLibs.pri
View file @
1d36547d
...
...
@@ -147,12 +147,10 @@ contains(DEFINES, QGC_ENABLE_PAIRING) {
} else {
# There is some circular reference settings going on between QGCExternalLibs.pri and gqgroundcontrol.pro.
# So this duplicates some of the enable/disable logic which would normally be in qgroundcontrol.pro.
DEFINES -= QGC_ENABLE_NFC
DEFINES -= QGC_ENABLE_PAIRING
}
} else:WindowsBuild {
#- Pairing is not supported on Windows
DEFINES -= QGC_ENABLE_NFC
DEFINES -= QGC_ENABLE_PAIRING
} else {
LIBS += -lcrypto -lz
...
...
qgroundcontrol.pro
View file @
1d36547d
...
...
@@ -187,18 +187,6 @@ contains (DEFINES, QGC_DISABLE_BLUETOOTH) {
DEFINES
+=
QGC_ENABLE_BLUETOOTH
}
#
NFC
contains
(
DEFINES
,
QGC_DISABLE_NFC
)
{
message
(
"Skipping support for NFC (manual override from command line)"
)
DEFINES
-=
QGC_ENABLE_NFC
}
else
:
exists
(
user_config
.
pri
)
:
infile
(
user_config
.
pri
,
DEFINES
,
QGC_DISABLE_NFC
)
{
message
(
"Skipping support for NFC (manual override from user_config.pri)"
)
DEFINES
-=
QGC_ENABLE_NFC
}
else
:
exists
(
user_config
.
pri
)
:
infile
(
user_config
.
pri
,
DEFINES
,
QGC_ENABLE_NFC
)
{
message
(
"Including support for NFC (manual override from user_config.pri)"
)
DEFINES
+=
QGC_ENABLE_NFC
}
#
QTNFC
contains
(
DEFINES
,
QGC_DISABLE_QTNFC
)
{
message
(
"Skipping support for QTNFC (manual override from command line)"
)
...
...
@@ -318,14 +306,11 @@ DEFINES+=QGC_DISABLE_PAIRING
#
Pairing
contains
(
DEFINES
,
QGC_DISABLE_PAIRING
)
{
message
(
"Skipping support for Pairing"
)
DEFINES
-=
QGC_ENABLE_NFC
}
else
:
exists
(
user_config
.
pri
)
:
infile
(
user_config
.
pri
,
DEFINES
,
QGC_DISABLE_PAIRING
)
{
message
(
"Skipping support for Pairing (manual override from user_config.pri)"
)
DEFINES
-=
QGC_ENABLE_NFC
}
else
:
AndroidBuild
:
contains
(
QT_ARCH
,
arm64
)
{
#
Haven
'
t
figured
out
how
to
get
64
bit
arm
OpenSLL
yet
which
pairing
requires
message
(
"Skipping support for Pairing (Missing Android OpenSSL 64 bit support)"
)
DEFINES
-=
QGC_ENABLE_NFC
}
else
{
message
(
"Enabling support for Pairing"
)
DEFINES
+=
QGC_ENABLE_PAIRING
...
...
@@ -737,37 +722,6 @@ contains (DEFINES, QGC_ENABLE_PAIRING) {
}
}
contains
(
DEFINES
,
QGC_ENABLE_PAIRING
)
{
contains
(
DEFINES
,
QGC_ENABLE_NFC
)
{
HEADERS
+=
\
src
/
PairingManager
/
PairingNFC
.
h
\
src
/
PairingManager
/
NfcLibrary
/
inc
/
Nfc
.
h
\
src
/
PairingManager
/
NfcLibrary
/
inc
/
Nfc_settings
.
h
\
src
/
PairingManager
/
NfcLibrary
/
NdefLibrary
/
inc
/
P2P_NDEF
.
h
\
src
/
PairingManager
/
NfcLibrary
/
NdefLibrary
/
inc
/
RW_NDEF
.
h
\
src
/
PairingManager
/
NfcLibrary
/
NdefLibrary
/
inc
/
RW_NDEF_T1T
.
h
\
src
/
PairingManager
/
NfcLibrary
/
NdefLibrary
/
inc
/
RW_NDEF_T2T
.
h
\
src
/
PairingManager
/
NfcLibrary
/
NdefLibrary
/
inc
/
RW_NDEF_T3T
.
h
\
src
/
PairingManager
/
NfcLibrary
/
NdefLibrary
/
inc
/
RW_NDEF_T4T
.
h
\
src
/
PairingManager
/
NfcLibrary
/
NdefLibrary
/
inc
/
T4T_NDEF_emu
.
h
\
src
/
PairingManager
/
NfcLibrary
/
NxpNci
/
inc
/
NxpNci
.
h
\
src
/
PairingManager
/
NfcTask
/
inc
/
ndef_helper
.
h
\
src
/
PairingManager
/
TML
/
inc
/
framework_Allocator
.
h
\
src
/
PairingManager
/
TML
/
inc
/
framework_Interface
.
h
\
src
/
PairingManager
/
TML
/
inc
/
framework_Map
.
h
\
src
/
PairingManager
/
TML
/
inc
/
framework_Timer
.
h
\
src
/
PairingManager
/
TML
/
inc
/
lpcusbsio
.
h
\
src
/
PairingManager
/
TML
/
inc
/
tml
.
h
\
src
/
PairingManager
/
TML
/
inc
/
tool
.
h
\
src
/
PairingManager
/
TML
/
inc
/
framework_Container
.
h
\
src
/
PairingManager
/
TML
/
inc
/
framework_linux
.
h
\
src
/
PairingManager
/
TML
/
inc
/
framework_Parcel
.
h
\
src
/
PairingManager
/
TML
/
inc
/
hidapi
.
h
\
src
/
PairingManager
/
TML
/
inc
/
lpcusbsio_i2c
.
h
\
src
/
PairingManager
/
TML
/
inc
/
tml_hid
.
h
}
}
!
NoSerialBuild
{
HEADERS
+=
\
src
/
comm
/
QGCSerialPortInfo
.
h
\
...
...
@@ -966,36 +920,6 @@ contains (DEFINES, QGC_ENABLE_PAIRING) {
}
}
contains
(
DEFINES
,
QGC_ENABLE_PAIRING
)
{
contains
(
DEFINES
,
QGC_ENABLE_NFC
)
{
SOURCES
+=
\
src
/
PairingManager
/
PairingNFC
.
cc
\
src
/
PairingManager
/
NfcLibrary
/
NxpNci
/
src
/
NxpNci
.
c
\
src
/
PairingManager
/
NfcLibrary
/
NdefLibrary
/
src
/
RW_NDEF_T4T
.
c
\
src
/
PairingManager
/
NfcLibrary
/
NdefLibrary
/
src
/
P2P_NDEF
.
c
\
src
/
PairingManager
/
NfcLibrary
/
NdefLibrary
/
src
/
RW_NDEF_T3T
.
c
\
src
/
PairingManager
/
NfcLibrary
/
NdefLibrary
/
src
/
RW_NDEF
.
c
\
src
/
PairingManager
/
NfcLibrary
/
NdefLibrary
/
src
/
RW_NDEF_T1T
.
c
\
src
/
PairingManager
/
NfcLibrary
/
NdefLibrary
/
src
/
RW_NDEF_T2T
.
c
\
src
/
PairingManager
/
NfcLibrary
/
NdefLibrary
/
src
/
T4T_NDEF_emu
.
c
\
src
/
PairingManager
/
TML
/
src
/
framework_Map
.
c
\
src
/
PairingManager
/
TML
/
src
/
framework_log
.
c
\
src
/
PairingManager
/
TML
/
src
/
framework_Parcel
.
c
\
src
/
PairingManager
/
TML
/
src
/
framework_sem
.
c
\
src
/
PairingManager
/
TML
/
src
/
framework_mutex
.
c
\
src
/
PairingManager
/
TML
/
src
/
hid
.
c
\
src
/
PairingManager
/
TML
/
src
/
framework_Allocator
.
c
\
src
/
PairingManager
/
TML
/
src
/
tml_hid
.
c
\
src
/
PairingManager
/
TML
/
src
/
framework_Container
.
c
\
src
/
PairingManager
/
TML
/
src
/
framework_thread
.
c
\
src
/
PairingManager
/
TML
/
src
/
framework_Timer
.
c
\
src
/
PairingManager
/
TML
/
src
/
lpcusbsio
.
c
\
src
/
PairingManager
/
TML
/
src
/
tml
.
c
\
src
/
PairingManager
/
NfcTask
/
src
/
ndef_helper
.
c
LIBS
+=
-
lrt
-
ludev
}
}
!
MobileBuild
{
SOURCES
+=
\
src
/
GPS
/
Drivers
/
src
/
gps_helper
.
cpp
\
...
...
src/PairingManager/NfcLibrary/NdefLibrary/inc/P2P_NDEF.h
deleted
100644 → 0
View file @
a97230c7
/*
* Copyright (c), NXP Semiconductors Caen / France
*
* (C)NXP Semiconductors
* All rights are reserved. Reproduction in whole or in part is
* prohibited without the written consent of the copyright owner.
* NXP reserves the right to make changes without notice at any time.
* NXP makes no warranty, expressed, implied or statutory, including but
* not limited to any implied warranty of merchantability or fitness for any
*particular purpose, or that the use will not infringe any third party patent,
* copyright or trademark. NXP must not be liable for any loss or damage
* arising from its use.
*/
#define P2P_NDEF_MAX_NDEF_MESSAGE_SIZE 240
void
P2P_NDEF_Reset
(
void
);
void
P2P_NDEF_Next
(
unsigned
char
*
pCmd
,
unsigned
short
Cmd_size
,
unsigned
char
*
Rsp
,
unsigned
short
*
pRsp_size
);
src/PairingManager/NfcLibrary/NdefLibrary/inc/RW_NDEF.h
deleted
100644 → 0
View file @
a97230c7
/*
* Copyright (c), NXP Semiconductors Caen / France
*
* (C)NXP Semiconductors
* All rights are reserved. Reproduction in whole or in part is
* prohibited without the written consent of the copyright owner.
* NXP reserves the right to make changes without notice at any time.
* NXP makes no warranty, expressed, implied or statutory, including but
* not limited to any implied warranty of merchantability or fitness for any
*particular purpose, or that the use will not infringe any third party patent,
* copyright or trademark. NXP must not be liable for any loss or damage
* arising from its use.
*/
#define RW_MAX_NDEF_FILE_SIZE 500
extern
unsigned
char
NdefBuffer
[
RW_MAX_NDEF_FILE_SIZE
];
typedef
void
RW_NDEF_Callback_t
(
unsigned
char
*
,
unsigned
short
);
#define RW_NDEF_TYPE_T1T 0x1
#define RW_NDEF_TYPE_T2T 0x2
#define RW_NDEF_TYPE_T3T 0x3
#define RW_NDEF_TYPE_T4T 0x4
extern
unsigned
char
*
pRW_NdefMessage
;
extern
unsigned
short
RW_NdefMessage_size
;
extern
RW_NDEF_Callback_t
*
pRW_NDEF_PullCb
;
extern
RW_NDEF_Callback_t
*
pRW_NDEF_PushCb
;
void
RW_NDEF_Reset
(
unsigned
char
type
);
void
RW_NDEF_Read_Next
(
unsigned
char
*
pCmd
,
unsigned
short
Cmd_size
,
unsigned
char
*
Rsp
,
unsigned
short
*
pRsp_size
);
void
RW_NDEF_Write_Next
(
unsigned
char
*
pCmd
,
unsigned
short
Cmd_size
,
unsigned
char
*
Rsp
,
unsigned
short
*
pRsp_size
);
src/PairingManager/NfcLibrary/NdefLibrary/inc/RW_NDEF_T1T.h
deleted
100644 → 0
View file @
a97230c7
/*
* Copyright (c), NXP Semiconductors Caen / France
*
* (C)NXP Semiconductors
* All rights are reserved. Reproduction in whole or in part is
* prohibited without the written consent of the copyright owner.
* NXP reserves the right to make changes without notice at any time.
* NXP makes no warranty, expressed, implied or statutory, including but
* not limited to any implied warranty of merchantability or fitness for any
*particular purpose, or that the use will not infringe any third party patent,
* copyright or trademark. NXP must not be liable for any loss or damage
* arising from its use.
*/
void
RW_NDEF_T1T_Reset
(
void
);
void
RW_NDEF_T1T_Read_Next
(
unsigned
char
*
pCmd
,
unsigned
short
Cmd_size
,
unsigned
char
*
Rsp
,
unsigned
short
*
pRsp_size
);
src/PairingManager/NfcLibrary/NdefLibrary/inc/RW_NDEF_T2T.h
deleted
100644 → 0
View file @
a97230c7
/*
* Copyright (c), NXP Semiconductors Caen / France
*
* (C)NXP Semiconductors
* All rights are reserved. Reproduction in whole or in part is
* prohibited without the written consent of the copyright owner.
* NXP reserves the right to make changes without notice at any time.
* NXP makes no warranty, expressed, implied or statutory, including but
* not limited to any implied warranty of merchantability or fitness for any
*particular purpose, or that the use will not infringe any third party patent,
* copyright or trademark. NXP must not be liable for any loss or damage
* arising from its use.
*/
void
RW_NDEF_T2T_Reset
(
void
);
void
RW_NDEF_T2T_Read_Next
(
unsigned
char
*
pCmd
,
unsigned
short
Cmd_size
,
unsigned
char
*
Rsp
,
unsigned
short
*
pRsp_size
);
void
RW_NDEF_T2T_Write_Next
(
unsigned
char
*
pCmd
,
unsigned
short
Cmd_size
,
unsigned
char
*
Rsp
,
unsigned
short
*
pRsp_size
);
src/PairingManager/NfcLibrary/NdefLibrary/inc/RW_NDEF_T3T.h
deleted
100644 → 0
View file @
a97230c7
/*
* Copyright (c), NXP Semiconductors Caen / France
*
* (C)NXP Semiconductors
* All rights are reserved. Reproduction in whole or in part is
* prohibited without the written consent of the copyright owner.
* NXP reserves the right to make changes without notice at any time.
* NXP makes no warranty, expressed, implied or statutory, including but
* not limited to any implied warranty of merchantability or fitness for any
*particular purpose, or that the use will not infringe any third party patent,
* copyright or trademark. NXP must not be liable for any loss or damage
* arising from its use.
*/
void
RW_NDEF_T3T_Reset
(
void
);
void
RW_NDEF_T3T_SetIDm
(
unsigned
char
*
pIDm
);
void
RW_NDEF_T3T_Read_Next
(
unsigned
char
*
pCmd
,
unsigned
short
Cmd_size
,
unsigned
char
*
Rsp
,
unsigned
short
*
pRsp_size
);
src/PairingManager/NfcLibrary/NdefLibrary/inc/RW_NDEF_T4T.h
deleted
100644 → 0
View file @
a97230c7
/*
* Copyright (c), NXP Semiconductors Caen / France
*
* (C)NXP Semiconductors
* All rights are reserved. Reproduction in whole or in part is
* prohibited without the written consent of the copyright owner.
* NXP reserves the right to make changes without notice at any time.
* NXP makes no warranty, expressed, implied or statutory, including but
* not limited to any implied warranty of merchantability or fitness for any
*particular purpose, or that the use will not infringe any third party patent,
* copyright or trademark. NXP must not be liable for any loss or damage
* arising from its use.
*/
void
RW_NDEF_T4T_Reset
(
void
);
void
RW_NDEF_T4T_Read_Next
(
unsigned
char
*
pCmd
,
unsigned
short
Cmd_size
,
unsigned
char
*
Rsp
,
unsigned
short
*
pRsp_size
);
void
RW_NDEF_T4T_Write_Next
(
unsigned
char
*
pCmd
,
unsigned
short
Cmd_size
,
unsigned
char
*
Rsp
,
unsigned
short
*
pRsp_size
);
src/PairingManager/NfcLibrary/NdefLibrary/inc/T4T_NDEF_emu.h
deleted
100644 → 0
View file @
a97230c7
/*
* Copyright (c), NXP Semiconductors Caen / France
*
* (C)NXP Semiconductors
* All rights are reserved. Reproduction in whole or in part is
* prohibited without the written consent of the copyright owner.
* NXP reserves the right to make changes without notice at any time.
* NXP makes no warranty, expressed, implied or statutory, including but
* not limited to any implied warranty of merchantability or fitness for any
*particular purpose, or that the use will not infringe any third party patent,
* copyright or trademark. NXP must not be liable for any loss or damage
* arising from its use.
*/
void
T4T_NDEF_EMU_Reset
(
void
);
void
T4T_NDEF_EMU_Next
(
unsigned
char
*
pCmd
,
unsigned
short
Cmd_size
,
unsigned
char
*
Rsp
,
unsigned
short
*
pRsp_size
);
src/PairingManager/NfcLibrary/NdefLibrary/src/P2P_NDEF.c
deleted
100644 → 0
View file @
a97230c7
/*
* Copyright (c), NXP Semiconductors Caen / France
*
* (C)NXP Semiconductors
* All rights are reserved. Reproduction in whole or in part is
* prohibited without the written consent of the copyright owner.
* NXP reserves the right to make changes without notice at any time.
* NXP makes no warranty, expressed, implied or statutory, including but
* not limited to any implied warranty of merchantability or fitness for any
*particular purpose, or that the use will not infringe any third party patent,
* copyright or trademark. NXP must not be liable for any loss or damage
* arising from its use.
*/
#ifdef P2P_SUPPORT
#include <TML/inc/tool.h>
#include <NfcLibrary/NdefLibrary/inc/P2P_NDEF.h>
/* Well-known LLCP SAP Values */
#define SAP_SDP 1
#define SAP_SNEP 4
/* SNEP codes */
#define SNEP_VER10 0x10
#define SNEP_PUT 0x2
#define SNEP_SUCCESS 0x81
/* LLCP PDU Types */
#define SYMM 0x0
#define PAX 0x1
#define AGF 0x2
#define UI 0x3
#define CONNECT 0x4
#define DISC 0x5
#define CC 0x6
#define DM 0x7
#define FRMR 0x8
#define SNL 0x9
#define reservedA 0xA
#define reservedB 0xB
#define I 0xC
#define RR 0xD
#define RNR 0xE
#define reservedF 0xF
/* LLCP parameters */
#define VERSION 1
#define MIUX 2
#define WKS 3
#define LTO 4
#define RW 5
#define SN 6
const
unsigned
char
SNEP_PUT_SUCCESS
[]
=
{
SNEP_VER10
,
SNEP_SUCCESS
,
0x00
,
0x00
,
0x00
,
0x00
};
const
unsigned
char
LLCP_CONNECT_SNEP
[]
=
{
0x11
,
0x20
};
const
unsigned
char
LLCP_I_SNEP_PUT_HEADER
[]
=
{
SNEP_VER10
,
SNEP_PUT
,
0x00
,
0x00
,
0x00
,
0x00
};
const
unsigned
char
LLCP_SYMM
[]
=
{
0x00
,
0x00
};
unsigned
char
*
pNdefMessage
;
unsigned
short
NdefMessage_size
=
0
;
/* Defines the number of symmetry exchanges is expected before initiating the NDEF push (to allow a remote phone to beam an NDEF message first) */
#define NDEF_PUSH_DELAY_COUNT 2
/* Defines at which frequency the symmetry is exchange (in ms) */
#define SYMM_FREQ 500
typedef
enum
{
Idle
,
Initial
,
DelayingPush
,
SnepClientConnecting
,
SnepClientConnected
,
NdefMsgSent
}
P2P_SnepClient_state_t
;
typedef
struct
{
unsigned
char
Dsap
;
unsigned
char
Pdu
;
unsigned
char
Ssap
;
unsigned
char
Version
;
unsigned
short
Miux
;
unsigned
short
Wks
;
unsigned
char
Lto
;
unsigned
char
Rw
;
unsigned
char
Sn
[
30
];
}
P2P_NDEF_LlcpHeader_t
;
typedef
void
P2P_NDEF_Callback_t
(
unsigned
char
*
,
unsigned
short
);
static
P2P_SnepClient_state_t
eP2P_SnepClient_State
=
Initial
;
static
P2P_NDEF_Callback_t
*
pP2P_NDEF_PushCb
=
NULL
;
static
P2P_NDEF_Callback_t
*
pP2P_NDEF_PullCb
=
NULL
;
static
unsigned
short
P2P_SnepClient_DelayCount
=
NDEF_PUSH_DELAY_COUNT
;
static
void
ParseLlcp
(
unsigned
char
*
pBuf
,
unsigned
short
BufSize
,
P2P_NDEF_LlcpHeader_t
*
pLlcpHeader
)
{
uint8_t
i
=
2
;
pLlcpHeader
->
Dsap
=
pBuf
[
0
]
>>
2
;
pLlcpHeader
->
Pdu
=
((
pBuf
[
0
]
&
3
)
<<
2
)
+
(
pBuf
[
1
]
>>
6
);
pLlcpHeader
->
Ssap
=
pBuf
[
1
]
&
0x3F
;
while
(
i
<
BufSize
)
{
switch
(
pBuf
[
i
]){
case
VERSION
:
pLlcpHeader
->
Version
=
pBuf
[
i
+
2
];
break
;
case
MIUX
:
pLlcpHeader
->
Miux
=
(
pBuf
[
i
+
2
]
<<
8
)
+
pBuf
[
i
+
3
];
break
;
case
WKS
:
pLlcpHeader
->
Wks
=
(
pBuf
[
i
+
2
]
<<
8
)
+
pBuf
[
i
+
3
];
break
;
case
LTO
:
pLlcpHeader
->
Lto
=
pBuf
[
i
+
2
];
break
;
case
RW
:
pLlcpHeader
->
Rw
=
pBuf
[
i
+
2
];
break
;
case
SN
:
memcpy
(
pLlcpHeader
->
Sn
,
&
pBuf
[
i
+
2
],
pBuf
[
i
+
1
]
<
sizeof
(
pLlcpHeader
->
Sn
)
?
pBuf
[
i
+
1
]
:
sizeof
(
pLlcpHeader
->
Sn
));
break
;
default:
break
;
}
i
+=
pBuf
[
i
+
1
]
+
2
;
}
}
static
void
FillLlcp
(
P2P_NDEF_LlcpHeader_t
LlcpHeader
,
unsigned
char
*
pBuf
)
{
pBuf
[
0
]
=
(
LlcpHeader
.
Ssap
<<
2
)
+
((
LlcpHeader
.
Pdu
>>
2
)
&
3
);
pBuf
[
1
]
=
(
LlcpHeader
.
Pdu
<<
6
)
+
LlcpHeader
.
Dsap
;
}
bool
P2P_NDEF_SetMessage
(
unsigned
char
*
pMessage
,
unsigned
short
Message_size
,
void
*
pCb
)
{
if
(
Message_size
<=
P2P_NDEF_MAX_NDEF_MESSAGE_SIZE
)
{
pNdefMessage
=
pMessage
;
NdefMessage_size
=
Message_size
;
pP2P_NDEF_PushCb
=
(
P2P_NDEF_Callback_t
*
)
pCb
;
return
true
;
}
else
{
NdefMessage_size
=
0
;
pP2P_NDEF_PushCb
=
NULL
;
return
false
;
}
}
void
P2P_NDEF_RegisterPullCallback
(
void
*
pCb
)
{
pP2P_NDEF_PullCb
=
(
P2P_NDEF_Callback_t
*
)
pCb
;
}
void
P2P_NDEF_Reset
(
void
)
{
if
(
NdefMessage_size
!=
0
)
{
eP2P_SnepClient_State
=
Initial
;
}
else
{
eP2P_SnepClient_State
=
Idle
;
}
}
void
P2P_NDEF_Next
(
unsigned
char
*
pCmd
,
unsigned
short
Cmd_size
,
unsigned
char
*
pRsp
,
unsigned
short
*
pRsp_size
)
{
P2P_NDEF_LlcpHeader_t
LlcpHeader
;
/* Initialize answer */
*
pRsp_size
=
0
;
ParseLlcp
(
pCmd
,
Cmd_size
,
&
LlcpHeader
);
switch
(
LlcpHeader
.
Pdu
)
{
case
CONNECT
:
/* Is connection from SNEP Client ? */
if
((
LlcpHeader
.
Dsap
==
SAP_SNEP
)
||
(
memcmp
(
LlcpHeader
.
Sn
,
"urn:nfc:sn:snep"
,
15
)
==
0
))
{
/* Only accept the connection is application is registered for NDEF reception */
if
(
pP2P_NDEF_PullCb
!=
NULL
)
{
LlcpHeader
.
Pdu
=
CC
;
FillLlcp
(
LlcpHeader
,
pRsp
);
*
pRsp_size
=
2
;
}
}
else
{
/* Refuse any other connection request */
LlcpHeader
.
Pdu
=
DM
;
FillLlcp
(
LlcpHeader
,
pRsp
);
*
pRsp_size
=
2
;
}
break
;
case
I
:
/* Is SNEP PUT ? */
if
((
pCmd
[
3
]
==
SNEP_VER10
)
&&
(
pCmd
[
4
]
==
SNEP_PUT
))
{
/* Notify application of the NDEF reception */
if
(
pP2P_NDEF_PullCb
!=
NULL
)
pP2P_NDEF_PullCb
(
&
pCmd
[
9
],
pCmd
[
8
]);
/* Acknowledge the PUT request */
LlcpHeader
.
Pdu
=
I
;
FillLlcp
(
LlcpHeader
,
pRsp
);
pRsp
[
2
]
=
(
pCmd
[
2
]
>>
4
)
+
1
;
// N(R)
memcpy
(
&
pRsp
[
3
],
SNEP_PUT_SUCCESS
,
sizeof
(
SNEP_PUT_SUCCESS
));
*
pRsp_size
=
9
;
}
break
;
case
CC
:
/* Connection to remote SNEP server completed, send NDEF message inside SNEP PUT request */
eP2P_SnepClient_State
=
SnepClientConnected
;
break
;
default:
break
;
}
/* No answer was set */
if
(
*
pRsp_size
==
0
)
{
switch
(
eP2P_SnepClient_State
)
{
case
Initial
:
if
((
pP2P_NDEF_PullCb
==
NULL
)
||
(
NDEF_PUSH_DELAY_COUNT
==
0
))
{
memcpy
(
pRsp
,
LLCP_CONNECT_SNEP
,
sizeof
(
LLCP_CONNECT_SNEP
));
*
pRsp_size
=
sizeof
(
LLCP_CONNECT_SNEP
);
eP2P_SnepClient_State
=
SnepClientConnecting
;
}
else
{
P2P_SnepClient_DelayCount
=
1
;
eP2P_SnepClient_State
=
DelayingPush
;
/* Wait then send a SYMM */
Sleep
(
SYMM_FREQ
);
memcpy
(
pRsp
,
LLCP_SYMM
,
sizeof
(
LLCP_SYMM
));
*
pRsp_size
=
sizeof
(
LLCP_SYMM
);
}
break
;
case
DelayingPush
:
if
(
P2P_SnepClient_DelayCount
==
NDEF_PUSH_DELAY_COUNT
)
{
memcpy
(
pRsp
,
LLCP_CONNECT_SNEP
,
sizeof
(
LLCP_CONNECT_SNEP
));
*
pRsp_size
=
sizeof
(
LLCP_CONNECT_SNEP
);
eP2P_SnepClient_State
=
SnepClientConnecting
;
}
else
{
P2P_SnepClient_DelayCount
++
;
/* Wait then send a SYMM */
Sleep
(
1000
);
memcpy
(
pRsp
,
LLCP_SYMM
,
sizeof
(
LLCP_SYMM
));
*
pRsp_size
=
sizeof
(
LLCP_SYMM
);
}
break
;
case
SnepClientConnected
:
LlcpHeader
.
Pdu
=
I
;
FillLlcp
(
LlcpHeader
,
pRsp
);
pRsp
[
2
]
=
0
;
// N(R)
pRsp
[
3
]
=
SNEP_VER10
;
pRsp
[
4
]
=
SNEP_PUT
;
pRsp
[
5
]
=
0
;
pRsp
[
6
]
=
0
;
pRsp
[
7
]
=
0
;
pRsp
[
8
]
=
(
unsigned
char
)
NdefMessage_size
;
memcpy
(
&
pRsp
[
9
],
pNdefMessage
,
NdefMessage_size
);
*
pRsp_size
=
9
+
NdefMessage_size
;
eP2P_SnepClient_State
=
NdefMsgSent
;
/* Notify application of the NDEF push */
if
(
pP2P_NDEF_PushCb
!=
NULL
)
pP2P_NDEF_PushCb
(
pNdefMessage
,
NdefMessage_size
);
break
;
default:
/* Wait then send a SYMM */
Sleep
(
SYMM_FREQ
);
memcpy
(
pRsp
,
LLCP_SYMM
,
sizeof
(
LLCP_SYMM
));
*
pRsp_size
=
sizeof
(
LLCP_SYMM
);
break
;
}
}
}
#endif
src/PairingManager/NfcLibrary/NdefLibrary/src/RW_NDEF.c
deleted
100644 → 0
View file @
a97230c7
/*
* Copyright (c), NXP Semiconductors Caen / France
*
* (C)NXP Semiconductors
* All rights are reserved. Reproduction in whole or in part is
* prohibited without the written consent of the copyright owner.
* NXP reserves the right to make changes without notice at any time.
* NXP makes no warranty, expressed, implied or statutory, including but
* not limited to any implied warranty of merchantability or fitness for any
*particular purpose, or that the use will not infringe any third party patent,
* copyright or trademark. NXP must not be liable for any loss or damage
* arising from its use.
*/
#ifdef RW_SUPPORT
#ifndef NO_NDEF_SUPPORT
#include <TML/inc/tool.h>
#include <NfcLibrary/NdefLibrary/inc/RW_NDEF.h>
#include <NfcLibrary/NdefLibrary/inc/RW_NDEF_T1T.h>
#include <NfcLibrary/NdefLibrary/inc/RW_NDEF_T2T.h>
#include <NfcLibrary/NdefLibrary/inc/RW_NDEF_T3T.h>
#include <NfcLibrary/NdefLibrary/inc/RW_NDEF_T4T.h>
/* Allocate buffer for NDEF operations */
unsigned
char
NdefBuffer
[
RW_MAX_NDEF_FILE_SIZE
];
typedef
void
RW_NDEF_Fct_t
(
unsigned
char
*
pCmd
,
unsigned
short
Cmd_size
,
unsigned
char
*
Rsp
,
unsigned
short
*
pRsp_size
);
unsigned
char
*
pRW_NdefMessage
;
unsigned
short
RW_NdefMessage_size
;
RW_NDEF_Callback_t
*
pRW_NDEF_PullCb
;
RW_NDEF_Callback_t
*
pRW_NDEF_PushCb
;
static
RW_NDEF_Fct_t
*
pReadFct
=
NULL
;
static
RW_NDEF_Fct_t
*
pWriteFct
=
NULL
;
bool
RW_NDEF_SetMessage
(
unsigned
char
*
pMessage
,
unsigned
short
Message_size
,
void
*
pCb
)
{
if
(
Message_size
<=
RW_MAX_NDEF_FILE_SIZE
)
{
pRW_NdefMessage
=
pMessage
;
RW_NdefMessage_size
=
Message_size
;
pRW_NDEF_PushCb
=
(
RW_NDEF_Callback_t
*
)
pCb
;
return
true
;
}
else
{
RW_NdefMessage_size
=
0
;
pRW_NDEF_PushCb
=
NULL
;
return
false
;
}
}
void
RW_NDEF_RegisterPullCallback
(
void
*
pCb
)
{
pRW_NDEF_PullCb
=
(
RW_NDEF_Callback_t
*
)
pCb
;
}
void
RW_NDEF_Reset
(
unsigned
char
type
)
{
pReadFct
=
NULL
;
pWriteFct
=
NULL
;
switch
(
type
)
{
case
RW_NDEF_TYPE_T1T
:
RW_NDEF_T1T_Reset
();
pReadFct
=
RW_NDEF_T1T_Read_Next
;
break
;
case
RW_NDEF_TYPE_T2T
:
RW_NDEF_T2T_Reset
();
pReadFct
=
RW_NDEF_T2T_Read_Next
;
pWriteFct
=
RW_NDEF_T2T_Write_Next
;
break
;
case
RW_NDEF_TYPE_T3T
:
RW_NDEF_T3T_Reset
();
pReadFct
=
RW_NDEF_T3T_Read_Next
;
break
;
case
RW_NDEF_TYPE_T4T
:
RW_NDEF_T4T_Reset
();
pReadFct
=
RW_NDEF_T4T_Read_Next
;
pWriteFct
=
RW_NDEF_T4T_Write_Next
;
break
;
default:
break
;
}
}
void
RW_NDEF_Read_Next
(
unsigned
char
*
pCmd
,
unsigned
short
Cmd_size
,
unsigned
char
*
Rsp
,
unsigned
short
*
pRsp_size
)
{
if
(
pReadFct
!=
NULL
)
pReadFct
(
pCmd
,
Cmd_size
,
Rsp
,
pRsp_size
);
}
void
RW_NDEF_Write_Next
(
unsigned
char
*
pCmd
,
unsigned
short
Cmd_size
,
unsigned
char
*
Rsp
,
unsigned
short
*
pRsp_size
)
{
if
(
pWriteFct
!=
NULL
)
pWriteFct
(
pCmd
,
Cmd_size
,
Rsp
,
pRsp_size
);
}
#endif
#endif
src/PairingManager/NfcLibrary/NdefLibrary/src/RW_NDEF_T1T.c
deleted
100644 → 0
View file @
a97230c7
/*
* Copyright (c), NXP Semiconductors Caen / France
*
* (C)NXP Semiconductors
* All rights are reserved. Reproduction in whole or in part is
* prohibited without the written consent of the copyright owner.
* NXP reserves the right to make changes without notice at any time.