crewID/libnfc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(libnfc-less-bitutils-more-ponies) MFT

Browse source
This commit is contained in:
Romain Tartiere 2010-04-16 19:27:49 +00:00
commit 3820c34f28
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -84,6 +84,12 @@ IF(NOT MSVC)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libnfc.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libnfc.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
ENDIF(NOT MSVC) ENDIF(NOT MSVC)
ADD_DEFINITIONS(-DDRIVER_ACR122_ENABLED)
ADD_DEFINITIONS(-DDRIVER_PN531_USB_ENABLED)
ADD_DEFINITIONS(-DDRIVER_PN533_USB_ENABLED)
ADD_DEFINITIONS(-DDRIVER_ARYGON_ENABLED)
#ADD_DEFINITIONS(-DDRIVER_PN532_UART_ENABLED)
ADD_SUBDIRECTORY(libnfc) ADD_SUBDIRECTORY(libnfc)
ADD_SUBDIRECTORY(include) ADD_SUBDIRECTORY(include)
ADD_SUBDIRECTORY(examples) ADD_SUBDIRECTORY(examples)

3
examples/CMakeLists.txt
View file

@ -6,10 +6,13 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libnfc)
INCLUDE_DIRECTORIES(${LIBUSB_INCLUDE_DIRS} ${PCSC_INCLUDE_DIRS}) INCLUDE_DIRECTORIES(${LIBUSB_INCLUDE_DIRS} ${PCSC_INCLUDE_DIRS})
LINK_DIRECTORIES(${LIBUSB_LIBRARY_DIRS} ${PCSC_LIBRARY_DIRS}) LINK_DIRECTORIES(${LIBUSB_LIBRARY_DIRS} ${PCSC_LIBRARY_DIRS})
ADD_LIBRARY(nfc-utils nfc-utils)
# Examples # Examples
FOREACH(source ${EXAMPLES-SOURCES}) FOREACH(source ${EXAMPLES-SOURCES})
ADD_EXECUTABLE(${source} ${source}.c) ADD_EXECUTABLE(${source} ${source}.c)
TARGET_LINK_LIBRARIES(${source} nfc) TARGET_LINK_LIBRARIES(${source} nfc)
TARGET_LINK_LIBRARIES(${source} nfc-utils)
INSTALL(TARGETS ${source} RUNTIME DESTINATION bin COMPONENT examples) INSTALL(TARGETS ${source} RUNTIME DESTINATION bin COMPONENT examples)
ENDFOREACH(source) ENDFOREACH(source)

3
libnfc/nfc.c
View file

@ -596,12 +596,13 @@ nfc_initiator_poll_targets(const nfc_device_t* pnd,
} }
// byte_t abtInAutoPoll[] = { 0xd4, 0x60, 0x0f, 0x01, 0x00 }; // byte_t abtInAutoPoll[] = { 0xd4, 0x60, 0x0f, 0x01, 0x00 };
size_t szTxInAutoPoll = 4 + szTargetTypes; size_t szTxInAutoPoll = 4 + szTargetTypes;
size_t n;
byte_t *pbtTxInAutoPoll = malloc( szTxInAutoPoll ); byte_t *pbtTxInAutoPoll = malloc( szTxInAutoPoll );
pbtTxInAutoPoll[0] = 0xd4; pbtTxInAutoPoll[0] = 0xd4;
pbtTxInAutoPoll[1] = 0x60; pbtTxInAutoPoll[1] = 0x60;
pbtTxInAutoPoll[2] = btPollNr; pbtTxInAutoPoll[2] = btPollNr;
pbtTxInAutoPoll[3] = btPeriod; pbtTxInAutoPoll[3] = btPeriod;
for(size_t n=0; n<szTargetTypes; n++) { for(n=0; n<szTargetTypes; n++) {
pbtTxInAutoPoll[4+n] = pnttTargetTypes[n]; pbtTxInAutoPoll[4+n] = pnttTargetTypes[n];
} }