Document environment variables in README.md

pn53x initiator set registers for ISO14443B-2 ST SRx

.gitignore

@@ -0,0 +1,64 @@
+**/.deps/
+**/.libs/
+**/Makefile
+**/Makefile.in
+*.exe
+*.la
+*.lo
+*.o
+*~
+.vs/
+CMakeSettings.json
+Doxyfile
+INSTALL
+aclocal.m4
+ar-lib
+autom4te.cache/
+build
+compile
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+debian/
+depcomp
+examples/nfc-anticol
+examples/nfc-dep-initiator
+examples/nfc-dep-target
+examples/nfc-emulate-forum-tag2
+examples/nfc-emulate-tag
+examples/nfc-emulate-uid
+examples/nfc-mfsetuid
+examples/nfc-poll
+examples/nfc-relay
+examples/pn53x-diagnose
+examples/pn53x-sam
+examples/pn53x-tamashell
+examples/quick_start_example1
+examples/quick_start_example2
+install-sh
+libnfc.pc
+libtool
+ltmain.sh
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
+missing
+stamp-h1
+test-driver
+test/run-test.sh.log
+test/run-test.sh.trs
+test/test-suite.log
+utils/nfc-emulate-forum-tag4
+utils/nfc-jewel
+utils/nfc-list
+utils/nfc-mfclassic
+utils/nfc-mfultralight
+utils/nfc-read-forum-tag3
+utils/nfc-relay-picc
+utils/nfc-scan-device

.travis.yml

@@ -0,0 +1,81 @@
+language: c
+
+matrix:
+  include:
+    - os: windows
+      compiler:
+        - clang
+      before_install:
+        - mkdir build && cd build && wget "https://sourceforge.net/projects/libusb-win32/files/libusb-win32-releases/1.2.6.0/libusb-win32-bin-1.2.6.0.zip" && 7z x libusb-win32-bin-1.2.6.0.zip -o"$PROGRAMFILES" && mv "$PROGRAMFILES/libusb-win32-bin-1.2.6.0" "$PROGRAMFILES/libusb-win32"
+      install:
+        choco install doxygen.install ninja
+      script:
+        cmake -GNinja .. && cmake --build .
+
+    - os: linux
+      dist: bionic
+      compiler:
+        - clang
+      addons:
+        apt:
+          packages:
+            - libusb-dev
+            - doxygen
+            - cmake
+      script:
+        - mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX=~/.local .. && make -j2 && make install
+        
+    - os: linux
+      dist: bionic
+      compiler:
+        - clang
+      addons:
+        apt:
+          packages:
+            - libusb-dev
+            - doxygen
+      script:
+        - autoreconf -vfi && mkdir build && cd build && ../configure --prefix=$HOME/.local/ && make -j2 && make install
+
+    - os: linux
+      dist: bionic
+      compiler:
+        - gcc
+      addons:
+        apt:
+          packages:
+            - libusb-dev
+            - doxygen
+            - cmake
+      script:
+        - mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX=~/.local .. && make -j2 && make install
+
+    - os: linux
+      dist: bionic
+      compiler:
+        - gcc
+      addons:
+        apt:
+          packages:
+            - libusb-dev
+            - doxygen
+      script:
+        - autoreconf -vfi && mkdir build && cd build && ../configure --prefix=$HOME/.local/ && make -j2 && make install
+
+    - os: osx
+      osx_image: xcode12
+      compiler:
+        - clang
+      before_install:
+        - brew install doxygen libusb-compat
+      script:
+        - mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX=~/.local .. && make -j2 && make install
+
+    - os: osx
+      osx_image: xcode12
+      compiler:
+        - clang
+      before_install:
+        - brew install doxygen libusb-compat m4
+      script:
+        - autoreconf -vfi && mkdir build && cd build && ../configure --prefix=$HOME/.local/ && make -j2 && make install

AUTHORS

@@ -1,3 +1,49 @@
+# Alphabetical cleaned output of "git shortlog -s -e|cut -c 8-" :
+Adam Laurie <adam@algroup.co.uk>
+Ahti Legonkov <ahti.legonkov@gmail.com>
+Alex Lian <alian@alum.mit.edu>
+Alexander Inyukhin <shurick@sectorb.msk.ru>
+Anugrah Redja Kusuma <anugrah.redja@gmail.com>
+Audrey Diacre <adiacre@il4p.fr>
+Boris Moiseev <cyberbobs@gmail.com>
+Christoph Gritschenberger <christoph.gritschenberger@gmail.com>
+Dario Carluccio <dario.carluccio@gmail.com>
+David Kreitschmann <david@kreitschmann.de>
+Emanuele Bertoldi <emanuele.bertoldi@gmail.com>
+Emmanuel Dreyfus <manu@netbsd.org>
+Eugeny Boger <eugenyboger@gmail.com>
+Francois Kooman <fkooman@tuxed.net>
+Frank Morgner <frankmorgner@gmail.com>
+Frédéric Bourgeois <bourgeoislab@gmail.com>
+Hidde Wieringa <hidde@hiddewieringa.nl>
+Jairo Andres Suarez <andres4005@gmail.com>
+Jiapeng Li <gapleehit@gmail.com>
+Jim Anastassiou <jim.anastassiou@gmail.com>
+John Galt <centromere@users.noreply.github.com>
+Julien Ehrhart <julien.ehrhart@live.com>
+Julien Schueller <julien.schueller@gmail.com>
+Laurent Latil <laurent@latil.nom.fr>
+Ludovic Rousseau <ludovic.rousseau@gmail.com>
+Marcello Morena <marcello.morena@gmail.com>
+Marcos Vives Del Sol <socram8888@gmail.com>
+Mati Vait <mativait@gmail.com>
+Maxim Martyanov <llorephie@gmail.com>
+Mike Auty <mike.auty@gmail.com>
+Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
+Olliver Schinagl <oliver@schinagl.nl>
+Paul Menzel <paul.menzel@giantmonkey.de>
+Peter Meerwald <pmeerw@pmeerw.net>
+Philippe Teuwen <yobibe@gmail.com>
+Pim 't Hart <pimmeyproductions@gmail.com>
+Ray Lee <rayleesky@outlook.com>
 Roel Verdult <roel@libnfc.org>
-Romain Tartière <romain@libnfc.org>
+Romain Tartiere <romain.tartiere@gmail.com>
 Romuald Conty <romuald@libnfc.org>
+Simon Yorkston <simon.yorkston@gmail.com>
+bhack <s.fabri@email.it>
+lego <lego@debian-fresh.prx>
+quantum-x <simon.yorkston@gmail.com>
+timzi <developers@make-gadget.ru>
+xantares <xantares09@hotmail.com>
+xaqq <kapp.arno@gmail.com>
+yerzhanm <yerzhan.mukhamejan@gmail.com>

CMakeLists.txt

@@ -1,8 +1,14 @@
-PROJECT(libnfc C)
+cmake_minimum_required (VERSION 2.6)
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+
+if (NOT DEFINED CMAKE_BUILD_TYPE)
+  set (CMAKE_BUILD_TYPE Release CACHE STRING "Build type")
+endif ()
+
+project (libnfc C)
+
 SET(VERSION_MAJOR "1")
-SET(VERSION_MINOR "5")
+SET(VERSION_MINOR "8")
-SET(VERSION_PATCH "1")
+SET(VERSION_PATCH "0")
 
 SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
@@ -12,25 +18,57 @@ SET(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
 
 # config.h
 IF(WIN32)
-  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/config_windows.h.cmake ${CMAKE_CURRENT_SOURCE_DIR}/config.h)
+  SET(LIBNFC_SYSCONFDIR "./config" CACHE PATH "libnfc configuration directory")
+  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/config_windows.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/contrib/win32)
+    IF(NOT MINGW)
+      SET(CMAKE_C_FLAGS "-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE ${CMAKE_C_FLAGS}")
+    ENDIF(NOT MINGW)
 ELSE(WIN32)
   SET(_XOPEN_SOURCE 600)
-  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/config_posix.h.cmake ${CMAKE_CURRENT_SOURCE_DIR}/config.h)
+  SET(SYSCONFDIR "/etc" CACHE PATH "System configuration directory")
+  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/config_posix.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 ENDIF(WIN32)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 
 ADD_DEFINITIONS("-DHAVE_CONFIG_H")
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 # make it easy to locate CMake modules for finding libraries
-SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules/")
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/modules/")
 
 # Options
-SET(LIBNFC_DEBUG_OUTPUT OFF CACHE BOOL "Debug output of communication with the NFC chip")
+option (LIBNFC_LOG "Enable log facility (errors, warning, info and debug messages)" ON)
-IF(LIBNFC_DEBUG_OUTPUT)
+IF(LIBNFC_LOG)
-  ADD_DEFINITIONS(-DDEBUG -g3)
+  ADD_DEFINITIONS(-DLOG)
-ENDIF(LIBNFC_DEBUG_OUTPUT)
+ENDIF(LIBNFC_LOG)
+
+option (LIBNFC_ENVVARS "Enable envvars facility" ON)
+IF(LIBNFC_ENVVARS)
+  ADD_DEFINITIONS(-DENVVARS)
+ENDIF(LIBNFC_ENVVARS)
+
+SET(LIBNFC_DEBUG_MODE OFF CACHE BOOL "Debug mode")
+IF(LIBNFC_DEBUG_MODE)
+  ADD_DEFINITIONS(-DDEBUG)
+  SET(CMAKE_C_FLAGS "-g3 ${CMAKE_C_FLAGS}")
+  SET(WIN32_MODE "debug")
+  SET(CMAKE_RC_FLAGS "-D_DEBUG ${CMAKE_RC_FLAGS}")
+ELSE(LIBNFC_DEBUG_MODE)
+  SET(WIN32_MODE "release")
+ENDIF(LIBNFC_DEBUG_MODE)
+
+option (LIBNFC_CONFFILES_MODE "Enable configuration files" ON)
+IF(LIBNFC_CONFFILES_MODE)
+  ADD_DEFINITIONS(-DCONFFILES)
+ENDIF(LIBNFC_CONFFILES_MODE)
+
+option (BUILD_EXAMPLES "build examples ON/OFF" ON)
+option (BUILD_UTILS "build utils ON/OFF" ON)
+
+option (BUILD_DEBPKG "build debian package ON/OFF" OFF)
+
 
 # Doxygen
 SET(builddir "${CMAKE_BINARY_DIR}")
@@ -58,17 +96,41 @@ ENDIF(NOT DEFINED SHARE_INSTALL_PREFIX)
 # Additonnal GCC flags
 IF(CMAKE_COMPILER_IS_GNUCC)
   # Make sure we will not miss some warnings ;)
-  ADD_DEFINITIONS(-Wall -pedantic -std=c99)
+  SET(CMAKE_C_FLAGS "-Wall -pedantic -std=c99 ${CMAKE_C_FLAGS}")
 ENDIF(CMAKE_COMPILER_IS_GNUCC)
 
 # Workarounds for libusb in C99
 ADD_DEFINITIONS(-Du_int8_t=uint8_t -Du_int16_t=uint16_t)
 
 IF(MINGW)
-  # force MinGW-w64 in 32bit mode
+  IF (CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
-  ADD_DEFINITIONS(-m32)
+    # force MinGW-w64 in 32bit mode
-  SET(CMAKE_SHARED_LINKER_FLAGS -m32)
+    SET(CMAKE_C_FLAGS "-m32 ${CMAKE_C_FLAGS}")
-  SET(CMAKE_EXE_LINKER_FLAGS -m32)
+    SET(CMAKE_MODULE_LINKER_FLAGS "-m32 -Wl,--enable-stdcall-fixup ${CMAKE_SHARED_LINKER_FLAGS}")
+    SET(CMAKE_SHARED_LINKER_FLAGS "-m32 -Wl,--enable-stdcall-fixup ${CMAKE_SHARED_LINKER_FLAGS}")
+    SET(CMAKE_EXE_LINKER_FLAGS "-m32 -Wl,--enable-stdcall-fixup ${CMAKE_EXE_LINKER_FLAGS}")
+    SET(CMAKE_RC_FLAGS "--target=pe-i386 --output-format=coff ${CMAKE_RC_FLAGS}")
+  ELSE(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
+    IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86")
+        # force MinGW-w64 in 32bit mode
+        MESSAGE("Building 32-bit Windows DLL")
+        #SET(CMAKE_C_FLAGS "-m32 ${CMAKE_C_FLAGS}")
+        #SET(CMAKE_MODULE_LINKER_FLAGS "--Wl,--enable-stdcall-fixup ${CMAKE_SHARED_LINKER_FLAGS}")
+        #SET(CMAKE_SHARED_LINKER_FLAGS "--Wl,--enable-stdcall-fixup ${CMAKE_SHARED_LINKER_FLAGS}")
+        #SET(CMAKE_EXE_LINKER_FLAGS "--Wl,--enable-stdcall-fixup ${CMAKE_EXE_LINKER_FLAGS}")
+        SET(CMAKE_RC_FLAGS "--target=pe-i386 --output-format=coff ${CMAKE_RC_FLAGS}")
+    ELSEIF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+        MESSAGE("Building 64-bit Windows DLL")
+        SET(CMAKE_RC_FLAGS "--target=pe-x86-64 --output-format=coff ${CMAKE_RC_FLAGS}")
+    ELSE(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86")
+        MESSAGE(FATAL_ERROR "Unknown Processor: ${CMAKE_SYSTEM_PROCESSOR}")
+    ENDIF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86")
+  ENDIF(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
+
+  FIND_PROGRAM(DLLTOOL dlltool CMAKE_FIND_ROOT_PATH_BOTH)
+  IF (NOT DLLTOOL)
+    MESSAGE(FATAL_ERROR "Could not find dlltool command")
+  ENDIF (NOT DLLTOOL)
 ENDIF(MINGW)
 
 IF(NOT WIN32)
@@ -79,15 +141,39 @@ IF(NOT WIN32)
   IF(LIBNFC_DRIVER_PN53X_USB)
     SET(PKG_REQ ${PKG_REQ} "libusb")
   ENDIF(LIBNFC_DRIVER_PN53X_USB)
-  IF(LIBNFC_DRIVER_ACR122)
+  IF(LIBNFC_DRIVER_ACR122_USB)
+    SET(PKG_REQ ${PKG_REQ} "libusb")
+  ENDIF(LIBNFC_DRIVER_ACR122_USB)
+  IF(LIBNFC_DRIVER_PCSC)
     SET(PKG_REQ ${PKG_REQ} "libpcsclite")
-  ENDIF(LIBNFC_DRIVER_ACR122)
+  ENDIF(LIBNFC_DRIVER_PCSC)
+  IF(LIBNFC_DRIVER_ACR122_PCSC)
+    SET(PKG_REQ ${PKG_REQ} "libpcsclite")
+  ENDIF(LIBNFC_DRIVER_ACR122_PCSC)
   # CMake lists are separated by a semi colon, replace with colon
   STRING(REPLACE ";" "," PKG_CONFIG_REQUIRES "${PKG_REQ}")
   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libnfc.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libnfc.pc @ONLY) 
   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libnfc.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 ENDIF(NOT WIN32)
 
+INCLUDE(LibnfcDrivers)
+
+IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    IF(I2C_REQUIRED)
+        # Inspired from http://cmake.3232098.n2.nabble.com/RFC-cmake-analog-to-AC-SEARCH-LIBS-td7585423.html
+        INCLUDE (CheckFunctionExists)
+        INCLUDE (CheckLibraryExists)
+        CHECK_FUNCTION_EXISTS (clock_gettime HAVE_CLOCK_GETTIME)
+        IF (NOT HAVE_CLOCK_GETTIME)
+            CHECK_LIBRARY_EXISTS (rt clock_gettime "" HAVE_CLOCK_GETTIME_IN_RT)
+            IF (HAVE_CLOCK_GETTIME_IN_RT)
+                SET(LIBRT_FOUND TRUE)
+                SET(LIBRT_LIBRARIES "rt")
+            ENDIF (HAVE_CLOCK_GETTIME_IN_RT)
+        ENDIF (NOT HAVE_CLOCK_GETTIME)
+    ENDIF(I2C_REQUIRED)
+  ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+
 IF(PCSC_INCLUDE_DIRS)
   INCLUDE_DIRECTORIES(${PCSC_INCLUDE_DIRS})
   LINK_DIRECTORIES(${PCSC_LIBRARY_DIRS})
@@ -96,23 +182,123 @@ ENDIF(PCSC_INCLUDE_DIRS)
 IF(LIBUSB_INCLUDE_DIRS)
   INCLUDE_DIRECTORIES(${LIBUSB_INCLUDE_DIRS})
   LINK_DIRECTORIES(${LIBUSB_LIBRARY_DIRS})
+  SET(LIBUSB_FOUND TRUE)
 ENDIF(LIBUSB_INCLUDE_DIRS)
 
+# version.rc for Windows
+IF(WIN32)
+  # Date for filling in rc file information
+  IF (CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
+    MACRO (GET_CURRENT_YEAR RESULT)
+        EXECUTE_PROCESS(COMMAND "cmd" " /C date /T" OUTPUT_VARIABLE ${RESULT})
+        STRING(REGEX REPLACE "\n" "" ${RESULT} ${${RESULT}})
+        STRING(REGEX REPLACE ".*(..)/(..)/(....).*" "\\3" ${RESULT} ${${RESULT}})
+    ENDMACRO (GET_CURRENT_YEAR)
+  ELSE(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
+    MACRO (GET_CURRENT_YEAR RESULT)
+        EXECUTE_PROCESS(COMMAND "date" "+%Y" OUTPUT_VARIABLE ${RESULT})
+        STRING(REGEX REPLACE "\n" "" ${RESULT} ${${RESULT}})
+    ENDMACRO (GET_CURRENT_YEAR)
+  ENDIF(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
+  GET_CURRENT_YEAR(CURRENT_YEAR)
+  MESSAGE("Year for copyright is " ${CURRENT_YEAR})
+
+  SET(prefix ${CMAKE_INSTALL_PREFIX})
+  SET(RC_COMMENT "${PACKAGE_NAME} library")
+  SET(RC_INTERNAL_NAME "${PACKAGE_NAME} ${WIN32_MODE}")
+  SET(RC_ORIGINAL_NAME ${PACKAGE_NAME}.dll)
+  # RC_FILE_TYPE: VFT_DLL
+  SET(RC_FILE_TYPE 0x00000002L)
+  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/contrib/win32/version.rc.in ${CMAKE_CURRENT_BINARY_DIR}/windows/libnfc.rc @ONLY)
+ENDIF(WIN32)
+
 ADD_SUBDIRECTORY(libnfc)
 ADD_SUBDIRECTORY(include)
-ADD_SUBDIRECTORY(utils)
+
-ADD_SUBDIRECTORY(examples)
+if (BUILD_UTILS)
+  add_subdirectory (utils)
+endif ()
+
+if (BUILD_EXAMPLES)
+  add_subdirectory (examples)
+endif ()
+
+if (NOT MSVC)
+  # config script install path
+  if ( NOT DEFINED LIBNFC_CMAKE_CONFIG_DIR )
+    set ( LIBNFC_CMAKE_CONFIG_DIR lib${LIB_SUFFIX}/cmake/libnfc )
+  endif ()
+
+  set ( LIBNFC_INCLUDE_DIR ${includedir} )
+  set ( LIBNFC_INCLUDE_DIRS ${LIBNFC_INCLUDE_DIR} )
+  list ( APPEND LIBNFC_INCLUDE_DIRS ${LIBUSB_INCLUDE_DIRS} )
+  set ( LIBNFC_LIBRARY nfc )
+  set ( LIBNFC_LIBRARIES ${LIBNFC_LIBRARY} )
+  list ( APPEND LIBNFC_LIBRARIES ${LIBUSB_LIBRARIES} )
+  set ( LIBNFC_LIBRARY_DIRS ${libdir} )
+  set ( LIBNFC_ROOT_DIR ${prefix} )
+  set ( LIBNFC_VERSION_STRING ${VERSION} )
+  set ( LIBNFC_VERSION_MAJOR ${VERSION_MAJOR} )
+  set ( LIBNFC_VERSION_MINOR ${VERSION_MINOR} )
+  set ( LIBNFC_VERSION_PATCH ${VERSION_PATCH} )
+
+  set ( LIBNFC_USE_FILE ${CMAKE_INSTALL_PREFIX}/${LIBNFC_CMAKE_CONFIG_DIR}/UseLibNFC.cmake )
+
+
+          
+  if(CMAKE_VERSION VERSION_LESS 2.8.8)
+    configure_file ( cmake/LibNFCConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/LibNFCConfig.cmake @ONLY )
+    configure_file ( cmake/LibNFCConfigVersion.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/LibNFCConfigVersion.cmake @ONLY )
+  else ()
+    include(CMakePackageConfigHelpers)
+    configure_package_config_file (
+      cmake/LibNFCConfig.cmake.in
+      ${CMAKE_CURRENT_BINARY_DIR}/LibNFCConfig.cmake
+      INSTALL_DESTINATION ${LIBNFC_CMAKE_CONFIG_DIR}
+      PATH_VARS
+        LIBNFC_USE_FILE
+        LIBNFC_ROOT_DIR
+        LIBNFC_INCLUDE_DIR
+        LIBNFC_INCLUDE_DIRS
+        LIBNFC_LIBRARY_DIRS
+        NO_CHECK_REQUIRED_COMPONENTS_MACRO
+    )
+    write_basic_package_version_file (
+      LibNFCConfigVersion.cmake 
+      VERSION ${LIBNFC_VERSION_STRING} 
+      COMPATIBILITY AnyNewerVersion
+    )
+  endif ()
+   
+  install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/LibNFCConfig.cmake
+                  ${CMAKE_CURRENT_BINARY_DIR}/LibNFCConfigVersion.cmake
+                  cmake/UseLibNFC.cmake
+            DESTINATION ${LIBNFC_CMAKE_CONFIG_DIR}
+          )
+   
+endif ()
 
 # Binary Package
 IF(WIN32)
-  SET(CPACK_GENERATOR "NSIS")
+  SET(CPACK_GENERATOR "ZIP")
 ELSE(WIN32)
   SET(CPACK_GENERATOR "TBZ2")
+  IF(BUILD_DEBPKG)
+    SET(CPACK_GENERATOR "DEB")
+  ENDIF(BUILD_DEBPKG)
 ENDIF(WIN32)
 
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Near Field Communication (NFC) library")
 SET(CPACK_PACKAGE_VENDOR "Roel Verdult")
-SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
+SET(CPACK_PACKAGE_CONTACT "Roel Verdult <roel@libnfc.org>")
+
+#Readme file
+IF(WIN32)
+  SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README-Windows.md")
+ELSE(WIN32)
+  SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
+ENDIF(WIN32)
+
 SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
 SET(CPACK_PACKAGE_INSTALL_DIRECTORY "libnfc")
 SET(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR})
@@ -138,5 +324,5 @@ ELSE(WIN32)
 ENDIF(WIN32)
 
 SET(CPACK_SOURCE_PACKAGE_FILE_NAME "libnfc-${VERSION}")
-SET(CPACK_SOURCE_IGNORE_FILES "~$" "/\\\\.svn/" "bin/")
+SET(CPACK_SOURCE_IGNORE_FILES "~$" "/\\\\.git/" "bin/")
 INCLUDE(CPack)

ChangeLog

@@ -1,3 +1,386 @@
+May 22, 2020 - 1.8.0
+--------------------
+
+Fixes:
+ - Restore nfc_modulation_type enum order to keep compatibility with libnfc 1.7.1
+
+Changes:
+ - Bump revision due to changes in API introduced in v1.7.2
+ - Bump library version to 6.0.0
+
+May 21, 2020 - 1.7.2 (avoid using it, incompatible with 1.7.1)
+--------------------
+
+Fixes:
+ - Remove unreachable code
+ - nfc_emulate_uid: cleaner exit on interrupt
+ - Fix reporting of modulations and baud rates by nfc-scan-device -v
+ - Fix out-of-bounds access in nfc-mfultralight
+ - Several Cygwin compilation fixes
+ - Fix comparison when nfc_initiator_target_is_present() with a specified target
+ - Fix nfc_initiator_poll_target without tag on PN532
+ - Export iso14443b* symbols
+ - Fix udev rule which was executed too early
+ - Fix improper device name initialization
+ - Fix setenv()/unsetenv() for Windows
+ - Fix win32/nfc.def according to nfc.h
+ - Fix missing timeout in pn53x_initiator_select_passive_target()
+ - nfc-mfclassic: fix option to tolerate write errors
+ - nfc-poll: fix card removing check
+ - nfc-relay-picc: fix wrong open mode for file descriptor
+
+Improvements:
+ - Allow ISO14443A to be used at higher baud rates
+ - nfc_initiator_select_passive_target() now checks against
+   reported modulations and baud rates for current device
+ - More serial devices on MAC OS X
+ - Add section to README to help to configure libnfc
+ - Various cmake improvements
+ - Drop PCRE dependency on Windows
+ - Remove deprecated readdir_r
+ - Markdown conversion of the text files
+ - Use hardcoded PN533 descriptors to be more robust on Windows
+ - Add support for SCL3712
+ - Add support for ACR1222U-C1
+ - Add support for NetBSD
+ - Add support for PN532 on RPi3 UART
+ - Add support for cross-compilation of 32b & 64b versions  of the library for Windows
+ - Add pn533_usb to the kernel modules blacklist
+ - Add support for pn71xx NXP's NFC Controllers through Linux Libnfc-nci (untested)
+ - Add support for contactless PC/SC readers (only as initiator)
+ - Add support for Feitian R502 and bR500 into pcsc driver
+ - Add support for HID iClass (Picopass) support (nfc-iclass tool in external nfc-tools repo)
+ - Allows for sending empty data in nfc_initiator_transceive_bits
+ - driver i2c: respect proper timing specifications
+ - driver i2c: add retry on error mechanism
+ - nfc-mfclassic: improvements fo magic cards
+ - nfc-mfclassic: add option to specify UID
+ - nfc-mfclassic/nfc-mfsetuid: add support for new gen (1b) of magic 4K cards
+ - nfc-mfclassic: Add RATS support indicator
+ - nfc-mfsetuid: allow to write complete Block0, instead of only UID
+ - nfc-mfultralight: add automatic modes and --check-magic
+ - nfc-mfultralight: add support for magic gen2 cards
+ - nfc-mfultralight: add option to specify UID
+ - nfc-mfultralight: add support for Ultralight NTAG213/215/216
+ - nfc-barcode: new command to read and decode NFC Barcodes (Tag-Talks-First)
+
+Changes:
+ - nfc_device_get_supported_baud_rate() takes now a "mode" parameter
+ - New nfc_device_get_supported_baud_rate_target_mode()
+ - New NFC modulation type NMT_BARCODE and nfc_barcode_info struct to support Thinfilm NFC Barcode protocol
+ - New NFC modulation type NMT_ISO14443BICLASS and NMT_ISO14443BICLASS struct to support HID iClass (Picopass)
+ - pn53x_transceive() is now part of public API
+
+Special thanks to:
+ - Jim Anastassiou, Frédéric Bourgeois, Dario Carluccio, Emmanuel Dreyfus,
+   Julien Ehrhart, S. Fabri, John Galt, Christoph Gritschenberger,
+   Alexander Inyukhin, Arnaud Kapp, David Kreitschmann, Adam Laurie, Ray Lee,
+   Maxim Martyanov, Paul Menzel, Boris Moiseev, Yerzhan Mukhamejan,
+   Olliver Shinagl, Jairo Andres Suarez, Mati Vait, Marcos Vives Del Sol,
+   Hidde Wieringa, Simon Yorkston, timzi, usk-johnny-s, xantares, Hanno
+   Heinrichs, jgeslin, Mikolaj Stawiski, rstular, Khem Raj, Frank Morgner, jpwidera,
+   Feitian Technologies
+
+Feb 24, 2014 - 1.7.1
+--------------------
+
+Fixes:
+ - Fix several issues reported by Coverity Scan
+   (mem leaks, buff overflows, reuse after free, etc)
+ - More robust when several conflicting uart drivers are in the config
+ - Fix racing condition with uart_flush_input()
+ - Silent pn53x_check_communication error messages when scanning
+ - Fix nfc_target_init(), was returning success in case of timeout
+ - Windows: fix several compilation issues
+ - On tag selection, save current target info also for ISO14443B*
+ - nfc-read-forum-tag3: fix incomplete NDEF retrieval and size of output file
+
+Improvements:
+ - nfc-list: New option to choose which technologies to poll for
+ - UART: drivers now supported under kFreeBSD
+ - New LIBNFC_DEVICE env var to use one reader and exclude all other readers
+   while LIBNFC_DEFAULT_DEVICE only prepends it to the configured devices list
+ - New LIBNFC_AUTO_SCAN env var to enable(default)/disable auto scan
+ - On tag selection, save current target info even if pnt=NULL
+ - On tag selection, grant NP_INFINITE_SELECT also for ISO14443B*
+ - Save & restore NP_INFINITE_SELECT status when changing it internally
+ - nfc-mfclassic: add format/wipe command (thanks to Adam Laurie)
+ - nfc-jewel: new utility to read/write Topaz/Jewel tags (thanks to Pim 't Hart)
+ - nfc_initiator_select_passive_target() provides defaults if pbtInitData=NULL
+ - nfc-read-forum-tag3: add -q option, add full parsing of NDEF Attribute Block
+
+Fixes & improvements specific to nfc_initiator_target_is_present():
+ - Supports fully PN532 & PN533, not tested on other chips
+ - Fix usage after nfc_initiator_poll_target()
+ - Set correctly last_error
+ - Fix issue when there was no saved target
+ - Allow NULL pointer to tag
+ - Fix issues in case of tear off conditions
+ - Now works with:
+    * MFUL, MFC, MFC Mini, MFC 7-byte (re-selection: you'll need to auth again)
+    * ISO14443-4A, ISO14443-4B
+    * ISO14443-4B', ASK CTx, ST SRx
+    * Jewel
+    * FeliCa
+
+Sep 03, 2013 - 1.7.0
+--------------------
+
+Fixes:
+ - pn53x: only create a current target when at least one have been found
+ - pn532_uart: fix 'operation abort' feature with this driver
+ - pn532_uart: let more time to PN532 to wake-up, this fix some specific cases
+   where PN532 shown one of two runs (Thanks to Marcello Morena)
+ - nfc-mfclassic: allow option f for read operation too
+ - Avoid clash with system's htole32 if it exists
+ - Include <stdlib.h>, required for getenv(3)
+ - usb: fix USB enumeration issue (Thanks to Mike Auty)
+ - acr122_pcsc: fix compilation on Mac OSX 10.8.4
+ - Fix pn53x_initiator_transceive_bytes_timed() measures for TypeB
+ - Various minor fixes: warnings, style, etc.
+
+Improvements:
+ - New PN532 over I2C driver, see contrib/libnfc/pn532_i2c_on_rpi.conf.sample
+ - ACR122/Touchatag: misc improvements
+ - ReadMobib/ReadNavigo: improve shell script portability
+ - Add ISO14443-4 chaining support for RX (MI)
+ - UART: add support for BeagleBone serial ports (Thanks to Johan Henselmans)
+ - nfc-mfultralight: allow setting of UID for special 'chinese' ultralight cards
+
+Special thanks to:
+ - Laurent Latil (new pn532_i2c driver for linux)
+ - Nobuhiro Iwamatsu (warning fixes and debian package)
+
+Apr 05, 2013 - 1.7.0-rc7 (release candidate)
+--------------------------------------------
+
+Fixes:
+ - Fix bug when compiling without libusb
+ - Fix several memory leaks in error handling conditions
+ - Remove calls to exit() from the library
+ - Create safer snprint_nfc_*() instead of sprint_nfc_*() functions
+ - Fix warnings returned by cppcheck & clang/scan-build
+   - Obsolete function 'usleep' => nanosleep()
+   - Non reentrant function 'readdir' => readdir_r()
+   - Non reentrant function 'strtok' => new connstring_decode()
+   - Buffer may not be null-terminated after call to strncpy()
+   - scanf without field width limits can crash with huge input data
+   - Resource leaks: missing fclose()
+   - Dead code, unused vars & vars scopes warnings
+ - Unify copyright notices & update authors lists
+ - Windows: Fix compilation due to new usbbus file
+ - Windows: Clean up compiler/linker warnings
+   - Fixed the suppression of the auto-fixup for linking against MS built libs
+   - Fixed all the formatting warnings by shifting to inttypes.h specifiers
+   - shifted to %lu for DWORD printf
+ - nfc-anticol: fix ATS length
+ - nfc-mfclassic: fix reporting of processed blocks total
+ - nfc-mfclassic: detect MIFARE Plus 2K as 2K instead of 1K
+ - pn53x_usb/acr122_usb: check usb_open() returns before using it
+
+Improvements:
+ - New PN532 over SPI driver, see contrib/libnfc/pn532_spi_on_rpi.conf.sample
+ - Devels HACKING file: introduce clang/scan-build & cppcheck for better code
+ - Better internal dependencies handling (bus <> drivers)
+ - Cleaner handling of portability patches
+ - Windows: logging via OutputDebugString(), ease debugging
+ - nfc-mfclassic: use smaller files for cards < 4k
+ - nfc-mfclassic: by defaut don't authorise wrong keyfile, use "f" to force
+ - quick_start_example1.c: remove err.h dependency, easier for Windowsians
+ - nfc-mfclassic: support some new magic cards with writeable sector #0
+ - nfc-anticol: add -t option to use timed functions
+
+Changes:
+ - Upon malloc error, nfc_init() doesn't force exit() anymore
+   so now you should test if context != NULL after nfc_init() call
+ - API: nfc_initiator_target_is_present() & str_nfc_target()
+   now take a pointer to nfc_target as argument instead of passing by value
+
+Special thanks to:
+ - Eugeny Boger (new pn532_spi driver for linux)
+
+Mar 03, 2013 - 1.7.0-rc6 (release candidate)
+--------------------------------------------
+
+Fixes:
+ - Fix several memory leaks (nfc_drivers, libusb, config parser)
+ - Fix stack smash while displaying long data transmission (LOG_HEX)
+ - pn53x-tamashell: allow larger commands up to full extended frame
+ - Add missing windows file in archive (version.rc.in)
+ - Fix compilation warnings & potential bugs
+ - Fix documentation
+ - Fix missing malloc() calls checks
+ - Fix missing free() calls in some error handlers
+
+Improvements:
+ - Allow to disable conffils & envvar supports on embedded platforms
+ - Add option to nfc-mfclassic to tolerate RW errors
+
+Changes:
+ - Replace usb_set_debug() in applications by LIBNFC_LOG_LEVEL libusb group
+
+Feb 16, 2013 - 1.7.0-rc5 (release candidate)
+--------------------------------------------
+
+Fixes:
+ - Add missing sample configuration file in archive
+ - Add missing windows files in archive
+ - Preserve error code while using pn53x_set_property_bool() with
+   NP_AUTO_ISO14443_4 flag
+
+Improvements:
+ - New nfc_register_driver() function allowing to hook custom drivers
+ - New nfc_free() function to free allocated buffers
+
+Special thanks to:
+ - Ahti Legonkov (new nfc_register_driver())
+
+Feb 04, 2013 - 1.7.0-rc4 (release candidate)
+--------------------------------------------
+
+Fixes:
+ - Fix tag selection for nfc-mfclassic, nfc-mfultralight, nfc-read-forum-tag3
+   and nfc-relay-picc
+ - Fix crash in nfc-relay-picc -i/-t if fd3 or fd4 is missing
+
+Improvements:
+ - Windows support build with CMake
+
+Changes:
+ - Configuration directory (ie. libnfc.conf) can now be set a compile-time
+ - Log can be enabled/disabled using CMake
+
+Special thanks to:
+ - Alex Lian (Windows support improvements)
+ - Nobuhiro Iwamatsu (Debian package improvements)
+
+Jan 31, 2013 - 1.7.0-rc3 (release candidate)
+--------------------------------------------
+
+Fixes:
+ - Fix pn53x_usb bulk write timeout
+ - Fix BCC in nfc-emulate-uid example
+ - Fix nfc-relay-picc example
+ - Fix a miss returned value within some internal functions (user program could
+   be affected)
+ - Fix nfc-scan-device -i option
+ - Remove wrong exit() calls in library
+ - Fix issue in driver acr122_usb affecting Touchatag
+ - Reenable some idle in all drivers, add selectively PowerDown when possible
+
+Changes:
+ - nfc_emulate_target() now takes timeout parameter
+
+Special thanks to:
+ - Alex Lian (Windows support refresh)
+
+Jan 20, 2013 - 1.7.0-rc2 (release candidate)
+--------------------------------------------
+
+Fixes:
+ - Fix API version in debian files
+ - Fix wrong condition to display a warning when user disables autoscan
+ - Fix unit tests
+ - Fix ISO14443B' ATS
+
+Improvements:
+ - Allow device.optional=true to tolerate missing device
+
+Changes:
+ - pn532_uart driver is now enabled by default
+
+Dec 09, 2012 - 1.7.0-rc1 (release candidate)
+--------------------------------------------
+
+Fixes:
+ - nfc_initiator_deselect_target() now returns 0 on success (as expected by caller)
+ - example/pn532-sam: Fix few bugs
+ - Fix ACR122S device detection when no ACR122S device available (endless UART receive)
+ - Suppress a lot of compiler warnings !.. which fixes many potential bugs
+ - Display right driver name while detecting PCSC
+ - Correctly handle PCSC header files on Mac OS X
+ - Fix nfc-emulation (now works with utils/nfc-emulate-forum-tag4 and Nexus S)
+
+Improvements:
+ - New nfc_initiator_init_secure_element() function to set SAM as wired card (only relevant with a PN532 SAM-equipped)
+ - New str_nfc_target(), str_nfc_modulation_type(), str_nfc_baud_rate() function to convert some libnfc's types into allocated string
+ - New nfc_device_target_is_present() to check if passed target is in the field
+ - --enable-serial-autoprobe option at compile time to replace it with some run-time options
+ - New -i option to nfc-scan-device to allow intrusive scan
+ - New feature, libnfc now uses configuration files:
+   * main configuration file can be used to set options (ie. intrusive, autoscan, log-level)
+   * main configuration file can contains a device as default device, HIGHLY recommended for UART devices users
+   * multiple devices files can be used to declare multiple devices and ordered them
+ - UART port scan now includes ttyAMA* to detect UART-devices connected on Raspberry Pi (e.g. `nfc-scan-device -i`)
+ - Support for OpenPCD2 (with a dedicated firmware)
+ - Support for FTDI dongle under MacOS
+ - Enhance messages display
+ - Provides modprobe configuration file and instructions for Linux >3.1 with PN533 users.
+ - Greatly improve log facility with log level filter, configurable using conf file (ie. /etc/nfc/libnfc.conf) or environment var LIBNFC_LOG_LEVEL
+ - New man page for nfc-read-forum-tag3 utility (Thanks to UNFORGiVEN512)
+ - New man page for nfc-scan-device utility
+ - New man page for  nfc-emulate-forum-tag2 example
+ - README: Add few words about device permissions and udev/devd rules available in package
+ - utils/nfc-emulate-forum-tag4: add support for v2.0 of the spec
+ - New "make style" command to have a beautiful code
+ - Code cleanup (indentation, white spaces, etc.)
+
+Changes:
+ - New nfc_device_get_information_about() now allocates returned string
+ - No more in/out paramaters in nfc_initiator_transceive_*() functions
+ - Rename nfc-probe to nfc-scan-device
+ - Rename abtUid from struct mifare_param_auth into abtAuthUid: this is not the UID while using 7-bytes UID MIFARE Classic tags.
+ - utils/nfc-list: always display the card type when a card is found
+ - nfc-utils: new fingerprinting method closer to AN10833, (Thanks to Balazs Bucsay)
+
+See NEWS file for major changes (ie. API changes)
+
+Special thanks to:
+ - Ludovic Rousseau (Code cleanup, tests under MacOS, etc.)
+ - Frank Morgner
+
+Feb 27, 2012 - 1.6.0-rc1 (release candidate)
+--------------------------------------------
+
+Fixes:
+ - utils/nfc-mfclassic: use MIFARE instead of Mifare typo
+ - utils/nfc-list: continue to attempt to reach devices after a connection failure
+ - libnfc: avoid readline auto-detection when cross-compiling
+ - driver/pn53x_usb: fix path usage for FreeBSD
+ - doc: quick_start_example1.c fixed
+ - utils/*: verbose option back for nfc-list, and newly implemented in nfc-poll
+
+Improvements:
+ - libnfc: enhanced documentation
+ - libnfc: debug facility back without external depends
+ - libnfc: add nfc_device_get_supported_modulation() and nfc_device_get_supported_baud_rate() functions
+ - libnfc: enhanced code indent
+ - drivers: implement driver for ACR122S device
+ - utils/nfc-mfclassic: remove non-conscistent "extract payload" option in nfc-mfclassic
+ - utils/nfc-emulate-forum-tag2: add missing manpage
+ - utils/nfc-read-forum-tag3: add missing manpage
+ - tests/*: fix some warnings in test
+ - tests/test_dep*: add some DEP tests (Active/Passive in several baud rates)
+ - doc: quick_start_example1 is now compiled when running make check or distcheck
+ - libnfc: a printf-based logging replaces log4c
+ - libnfc: various minor fixes/enhancements
+ - utils/*: nfc-probe example added to show devices connection strings
+
+Changes:
+ - PN53x specific errors are not public anymore;
+ - Timeouts are now integers instead of timeval structure
+ - Removes libusb types workaround (r200) as it seems to not be needed anymore but may disturb compiler
+ - Removes parse_args() from nfc-utils.[hc]
+ - Move nfc-emulate-forum-tag2 from utils to examples.
+ - contrib: move udev and devd files into contrib/
+ - debian: udev rules file renamed
+
+See NEWS file for major changes (ie. API changes)
+
+Special thanks to:
+ - Thomas Hood (Debian packages and various fixes/contributions)
+ - Anugrah Redja (ACR122S driver)
+
 Oct 17, 2011 - 1.5.1 (unstable)
 -------------------------------
 

HACKING.md

@@ -0,0 +1,68 @@
+Hello hackers!
+
+General remarks about contributing
+----------------------------------
+
+Contributions to the libnfc are welcome!
+Here are some directions to get you started:
+
+  1. Follow style conventions
+     The source code of the library trend to follow some conventions so that it
+     is consistent in style and thus easier to read.
+     Look around and respect the same style.
+     Don't use tabs. Increment unit is two spaces.
+     Don't leave dandling spaces or tabs at EOL.
+     Helper script to get some uniformity in the style:
+     $ make style
+
+     If you use vim see the [Vim: How to prevent trailing whitespaces](http://www.carbon-project.org/Vim__How_to_prevent_trailing_whitespaces.html).
+
+  2. Chase warnings: no warning should be introduced by your changes
+  Depending what you touch, you can check with:
+
+    2.1 When using autotools
+
+            $ autoreconf -Wall -vis
+
+    2.2 When compiling
+
+      2.2.1 Using extra flags:
+
+            $ export CFLAGS="-Wall -g -O2 -Wextra -pipe -funsigned-char -fstrict-aliasing \
+              -Wchar-subscripts -Wundef -Wshadow -Wcast-align -Wwrite-strings -Wunused \
+              -Wuninitialized -Wpointer-arith -Wredundant-decls -Winline -Wformat \
+              -Wformat-security -Wswitch-enum -Winit-self -Wmissing-include-dirs \
+              -Wmissing-prototypes -Wstrict-prototypes -Wold-style-definition \
+              -Wbad-function-cast -Wnested-externs -Wmissing-declarations"
+         $ ./configure
+         $ make clean
+         $ make
+
+      2.2.2 Using clang:
+
+        You can use same CFLAGS but also `-Wunreachable-code`
+
+            $ scan-build ./configure
+         $ make clean
+         $ scan-build make
+
+      2.2.3 Using `cppcheck` (v1.58 or higher):
+
+          $ make cppcheck
+
+    2.3 When Debianizing
+
+         $ lintian --info --display-info --display-experimental *deb
+        or (shorter version)
+         $ lintian -iIE *deb
+
+  3. Preserve cross-platform compatibility
+
+     The source code should remain compilable across various platforms,
+     including some you probably cannot test alone so keep it in mind.
+     Supported platforms:
+
+     - Linux
+     - FreeBSD
+     - Mac OS X
+     - Windows with MinGW

Makefile.am

@@ -2,7 +2,13 @@ ACLOCAL_AMFLAGS = -I m4
 
 AM_CFLAGS = $(LIBNFC_CFLAGS)
 
-SUBDIRS = libnfc utils examples include contrib cmake test
+SUBDIRS = libnfc utils
+
+if EXAMPLE_ENABLED
+SUBDIRS += examples
+endif
+
+SUBDIRS += include contrib cmake test
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libnfc.pc
@@ -10,15 +16,18 @@ pkgconfig_DATA = libnfc.pc
 EXTRA_DIST = \
 	CMakeLists.txt \
 	Doxyfile \
-	README-Windows.txt \
+	HACKING.md \
-	pn53x.conf \
+	NEWS.md \
-	pn53x.rules
+	README.md \
+	README-Windows.md \
+	libnfc.conf.sample \
+	mingw-cross-compile.sh
 
 CLEANFILES = Doxygen.log coverage.info libnfc.pc
 
 clean-local: clean-local-doc clean-local-coverage
 
-.PHONY: clean-local-coverage clean-local-doc doc
+.PHONY: clean-local-coverage clean-local-doc doc style
 clean-local-coverage:
 	-rm -rf coverage
 
@@ -30,3 +39,23 @@ doc : Doxyfile
 
 DISTCHECK_CONFIGURE_FLAGS="--with-drivers=all"
 
+style:
+	find . -name "*.[ch]" -exec perl -pi -e 's/[ \t]+$$//' {} \;
+	find . -name "*.[ch]" -exec astyle --formatted --mode=c --suffix=none \
+	    --indent=spaces=2 --indent-switches --indent-preprocessor \
+	    --keep-one-line-blocks --max-instatement-indent=60 \
+	    --style=linux --pad-oper --unpad-paren --pad-header \
+	    --align-pointer=name {} \;
+
+cppcheck:
+	cppcheck --quiet \
+	    -I include -I libnfc -I libnfc/buses -I libnfc/chips -I libnfc/drivers \
+	    --check-config .
+	cppcheck --quiet --enable=all --std=posix --std=c99 \
+	    -I include -I libnfc -I libnfc/buses -I libnfc/chips -I libnfc/drivers \
+	    -DLOG -D__linux__ \
+	    -DDRIVER_PN53X_USB_ENABLED -DDRIVER_ACR122_PCSC_ENABLED \
+	    -DDRIVER_ACR122_USB_ENABLED -DDRIVER_ACR122S_ENABLED \
+	    -DDRIVER_PN532_UART_ENABLED -DDRIVER_ARYGON_ENABLED \
+	    -DDRIVER_PN532_SPI_ENABLED -DDRIVER_PN532_I2C_ENABLED \
+	    --force --inconclusive .

NEWS.md

@@ -1,3 +1,154 @@
+New in 1.8.0:
+
+API Changes:
+ - Restore nfc_modulation_type enum order to keep compatibility with libnfc 1.7.1
+ - Bump library version to 6.0.0
+
+New in 1.7.2:
+
+Drivers:
+
+  * New driver for pn71xx NXP's NFC Controllers through Linux Libnfc-nci (untested)
+  * New driver for contactless PC/SC readers (only as initiator)
+
+API Changes:
+
+  * nfc_device_get_supported_baud_rate() now takes also "mode" as argument
+  * New nfc_device_get_supported_baud_rate_target_mode()
+  * New NFC modulation type NMT_BARCODE and nfc_barcode_info struct to support Thinfilm NFC Barcode protocol
+  * New NFC modulation type NMT_ISO14443BICLASS and NMT_ISO14443BICLASS struct to support HID iClass (Picopass)
+  * pn53x_transceive() is now part of public API
+
+New in 1.7.1:
+
+API Changes:
+
+  * nfc_initiator_select_passive_target() provides defaults if pbtInitData=NULL
+  * nfc_initiator_target_is_present() allow NULL pointer to tag
+
+New in 1.7.0:
+
+Drivers:
+
+  * New PN532 over I2C driver, see contrib/libnfc/pn532_i2c_on_rpi.conf.sample
+
+API Changes:
+
+  * New function iso14443b_crc_append()
+
+New in 1.7.0-rc7:
+
+Drivers:
+
+  * New PN532 over SPI driver, see contrib/libnfc/pn532_spi_on_rpi.conf.sample
+
+API Changes:
+
+  * Functions
+    - nfc_initiator_target_is_present() & str_nfc_target():
+      now take a pointer to nfc_target as argument
+    - nfc_init(): upon malloc error, doesn't force exit() anymore
+      so now you should test if context != NULL after nfc_init() call
+
+New in 1.7.0-rc5:
+
+API Changes:
+
+  * Functions
+    - New nfc_register_driver() function allowing to hook custom drivers.
+
+New in 1.7.0-rc3:
+
+API Changes:
+
+  * Functions
+    - Add timeout param to nfc_emulate_target()
+
+New in 1.7.0-rc2:
+
+Configuration:
+  libnfc can now use a configuration file for special setups, or features
+  activation. This file (/etc/nfc/libnfc.conf under GNU/Linux systems)
+  supports already some keywords:
+    - "allow_autoscan" to enable/disable device auto-detection feature;
+    - "allow_intrusive_scan" to enable/disable intrusive auto-detection
+      (ie. serial port probing);
+    - "log_level" to select library verbosity;
+    - "device.name" and "device.connstring" to define a user device,
+      this is the recommended method if user has a not easily detectable
+      device (ie. a serial one).
+  It is also possible to define devices using dedicated configuration files and
+  put them into device search directory (/etc/nfc/devices.d under GNU/Linux).
+  Example for the OpenPCD2: create /etc/nfc/devices.d/openpcd2.conf with:
+    name = "OpenPCD2"
+    connstring = "pn532_uart:/dev/ttyACM0"
+    optional = true
+  The keyword "optional" does not mandate the device to be present always
+  (it detects if the reader is indeed present before using it)
+
+API Changes:
+
+  * Types
+    - New NFC_ESOFT error to handle software errors (allocations, pipe
+      creation, etc.)
+
+  * Functions
+    - Remove nfc_get_default_device() function: the default device is now the
+      first in nfc_list_devices() or could be open using NULL connstring with
+      nfc_open() function.
+    - New enum-to-string converter functions str_nfc_modulation_type() and
+      str_nfc_baud_rate()
+    - New str_nfc_target() to convert nfc_target struct into allocated string
+    - New nfc_device_get_information_about() function to retreive some device's
+      information
+    - No more in/out function parameter: nfc_initiator_transceive_*() now
+      take a constant size for Rx buffer
+    - New nfc_initiator_target_is_present() to test is the previously selected
+      target is available in the field
+    - nfc_initiator_transceive_bytes() returns NFC_EMFCAUTHFAIL when AUTH
+      command failed on a Mifare Classic
+    - New nfc_initiator_init_secure_element() to initiate a connection with
+      secure element (Only supported with a PN532 with SAM equipped)
+
+New in 1.6.0-rc1:
+
+API Changes:
+
+  * Types
+    - '_t' suffix removed from all types (e.g. nfc_device_t is now nfc_device)
+    - All errors removed in flavour of NFC_EIO, NFC_EINVARG, NFC_EDEVNOTSUPP,
+      NFC_ENOTSUCHDEV, NFC_EOVFLOW, NFC_ETIMEOUT, NFC_EOPABORTED, NFC_ENOTIMPL,
+      NFC_ETGRELEASED, NFC_ERFTRANS, NFC_ECHIP and NFC_SUCCESS
+    - nfc_device_desc_t replaced by nfc_connstring: libnfc now uses connection
+      strings to describe a device
+    - byte_t typedef removed, libnfc now uses uint8_t from C99
+    - nfc_device is now an opaque type
+    - nfc_properties replaces nfc_options
+
+  * Functions
+    - New nfc_get_default_device() function that allows to grab the connstring
+      stored in LIBNFC_DEFAULT_DEVICE environnement variable or returns the
+      first available device if not set
+    - New nfc_device_get_connstring() accessor function to know the device
+      connstring
+    - New nfc_device_set_property_bool() function that replace nfc_configure()
+    - New nfc_device_set_property_int() function to set integer property
+    - nfc_device_name() renamed to nfc_device_get_name() for the sake of
+      consistency
+    - New nfc_device_get_last_error() function, an accessor to last error occured
+    - Whole libnfc's functions now return 0 (NFC_SUCCESS) or positive value if
+      appropriated on success and libnfc's error code on failure
+    - nfc_connect(), nfc_disconnect() renamed to nfc_open(), nfc_close()
+      respectively
+    - Add 2 new functions: initialization and deinitialization functions:
+      nfc_init() and nfc_exit()
+    - New nfc_device_get_supported_modulation() and
+      nfc_device_get_supported_baud_rate() functions
+
+  * Dependencies
+    - log4c is not anymore used for debugging facility. It was a bad choice,
+      sorry for inconvenience.
+
 New in 1.5.1:
 
 API Changes

README

@@ -1,136 +0,0 @@
-*-
-* Public platform independent Near Field Communication (NFC) library
-* Copyright (C) 2009, Roel Verdult
-* Copyright (C) 2010, Romain Tartière, Romuald Conty
--*
-
-General Information
-===================
-
-libnfc is a library which allows userspace application access to NFC devices.
-
-The official web site is:
-  http://www.libnfc.org/
-
-The official forum site is:
-  http://www.libnfc.org/community/
-
-The official development site is:
-  http://libnfc.googlecode.com/
-
-Important note: this file covers POSIX systems, for Windows please read README-Windows.txt
-
-Requirements
-============
-
-Some NFC drivers depends on third party software:
-
-* pn53x_usb:
-
-   - libusb-0.1 http://libusb.sf.net
-
-* acr122:
-
-   - pcsc-lite http://pcsclite.alioth.debian.org/
-
-The regression test suite depend on the cutter framework:
-http://cutter.sf.net
-
-Installation
-============
-
-See the file 'INSTALL'
-
-How to report bugs
-==================
-
-To report a bug, visit http://code.google.com/p/libnfc/issues/list and fill
-out a bug report form.
-
-If you have questions, remarks, we encourage you to post this in the developers
-community: 
-http://www.libnfc.org/community
-
-Please make sure to include:
-
-* The version of libnfc
-
-* Information about your system. For instance:
-
-   - What operating system and version
-   - For Linux, what version of the C library
-
-  And anything else you think is relevant.
-
-* How to reproduce the bug. 
-
-  Please include a short test program that exhibits the behavior. 
-  As a last resort, you can also provide a pointer to a larger piece 
-  of software that can be downloaded.
-
-* If the bug was a crash, the exact text that was printed out
-  when the crash occured.
-
-* Further information such as stack traces may be useful, but
-  is not necessary.
-
-Patches
-=======
-
-Patches can be posted to http://code.google.com/p/libnfc/issues/list or
-can be sent directly to libnfc's developers: http://www.libnfc.org/contact
-
-If the patch fixes a bug, it is usually a good idea to include
-all the information described in "How to Report Bugs".
-
-Building
-========
-
-It should be as simple as running these two commands:
-
-./configure
-make
-
-Troubleshooting
-===============
-
-Touchatag/ACR122:
------------------
-If your Touchatag or ACR122 device fails being detected by libnfc, make sure
-that PCSC-lite daemon (pcscd) is installed and is running.
-
-If your Touchatag or ACR122 device fails being detected by PCSC-lite daemon
-(pcsc_scan doesn't see anything) then try removing the bogus firmware detection
-of libccid: edit libccid_Info.plist configuration file (usually
-/etc/libccid_Info.plist) and locate "<key>ifdDriverOptions</key>", turn
-"<string>0x0000</string>" value into 0x0004 to allow bogus devices and restart
-pcscd daemon.
-
-ACR122:
--------
-Using an ACR122 device with libnfc and without tag (e.g. to use NFCIP modes or
-card emulation) needs yet another PCSC-lite tweak: You need to allow usage of
-CCID Exchange command.  To do this, edit libccid_Info.plist configuration file
-(usually /etc/libccid_Info.plist) and locate "<key>ifdDriverOptions</key>",
-turn "<string>0x0000</string>" value into 0x0001 to allow CCID exchange or
-0x0005 to allow CCID exchange and bogus devices (cf previous remark) and
-restart pcscd daemon.
-
-Warning: if you use ACS CCID drivers (acsccid), configuration file is located
-in something like: /usr/lib/pcsc/drivers/ifd-acsccid.bundle/Contents/Info.plist
-
-SCL3711:
---------
-Libnfc cannot be used concurrently with the PCSC proprietary driver of SCL3711.
-Two possible solutions:
-* Either you don't install SCL3711 driver at all
-* Or you stop the PCSC daemon when you want to use libnfc-based tools
-
-Proprietary Notes
-=================
-
-FeliCa is s registered trademark of the Sony Corporation.
-MIFARE is a trademark of NXP Semiconductors.
-Jewel Topaz is a trademark of Innovision Research & Technology.
-All other trademarks are the property of their respective owners.
-

README-Windows.md

@@ -1,7 +1,16 @@
-*-
+    *-
-* Public platform independent Near Field Communication (NFC) library
+    * Free/Libre Near Field Communication (NFC) library
-* Copyright (C) 2010, Glenn Ergeerts
+    *
--*
+    * Libnfc historical contributors:
+    * Copyright (C) 2009      Roel Verdult
+    * Copyright (C) 2009-2013 Romuald Conty
+    * Copyright (C) 2010-2012 Romain Tartière
+    * Copyright (C) 2010-2013 Philippe Teuwen
+    * Copyright (C) 2012-2013 Ludovic Rousseau
+    * Additional contributors of Windows-specific parts:
+    * Copyright (C) 2010      Glenn Ergeerts
+    * Copyright (C) 2013      Alex Lian
+    -*
 
 Requirements
 ============
@@ -24,13 +33,15 @@ is an example of how to generate a distribution with the above mentioned
 requirements fulfilled (it is assumed the CMake binaries are in the system
 path, this is optional during installation of CMake):
 
-- Add the following directories to your PATH : c:\MinGW64\bin;c:\MinGW64\x86_64-w64-mingw32\lib32;c:\MinGW64\x86_64-w64-mingw32\include
+- Add the following directories to your PATH:
+
+        c:\MinGW64\bin;c:\MinGW64\x86_64-w64-mingw32\lib32;c:\MinGW64\x86_64-w64-mingw32\include
 
 - Now it is possible to run CMake and mingw32-make:
 
-  C:\dev\libnfc-read-only> mkdir ..\libnfc-build
+        C:\dev\libnfc-read-only> mkdir ..\libnfc-build
-  C:\dev\libnfc-read-only> cd ..\libnfc-build
+      C:\dev\libnfc-read-only> cd ..\libnfc-build
-  C:\dev\libnfc-build> cmake-gui .
+      C:\dev\libnfc-build> cmake-gui .
 
 Now you can configure the build. Press "Configure", specify "MinGW32 Makefiles"
 and then you have the opportunity to set some configuration variables. If you
@@ -38,12 +49,12 @@ don't want a Debug build change the variable CMAKE_BUILD_TYPE to "Release".
 
 If a non-GUI solution is preferred one can use:
 
-  C:\dev\libnfc-build> cmake -G "MinGW Makefiles"
+    C:\dev\libnfc-build> cmake -G "MinGW Makefiles"
                                      -DCMAKE_BUILD_TYPE=Release ..\libnfc-read-only
 
 Now run mingw32-make to build:
 
-  C:\dev\libnfc-read-only\bin> mingw32-make
+    C:\dev\libnfc-read-only\bin> mingw32-make
 
 The build will create a shared library for Windows (nfc.dll) to link your applications against. It will compile
 the tools against this shared library.
@@ -53,5 +64,7 @@ References
 [1] the easiest way is to use the TDM-GCC installer.
         Make sure to select MinGW-w64 in the installer, the regular MinGW does not contain headers for PCSC.
         http://sourceforge.net/projects/tdm-gcc/files/TDM-GCC%20Installer/tdm64-gcc-4.5.1.exe/download
+
 [2] http://sourceforge.net/projects/libusb-win32/files/
+
 [3] http://www.cmake.org

README.md

@@ -0,0 +1,250 @@
+```
+*-
+* Free/Libre Near Field Communication (NFC) library
+*
+* Libnfc historical contributors:
+* Copyright (C) 2009      Roel Verdult
+* Copyright (C) 2009-2015 Romuald Conty
+* Copyright (C) 2010-2012 Romain Tartière
+* Copyright (C) 2010-2013 Philippe Teuwen
+* Copyright (C) 2012-2013 Ludovic Rousseau
+* Additional contributors:
+* See AUTHORS file
+-*
+```
+
+General Information
+===================
+
+libnfc is a library which allows userspace application access to NFC devices.
+
+The official web site is:
+  http://www.nfc-tools.org/
+
+The official forum site is:
+  http://www.libnfc.org/community/
+
+The official development site is:
+  https://github.com/nfc-tools/libnfc
+
+Important note: this file covers POSIX systems, for Windows please read README-Windows.md
+
+Requirements
+============
+
+Some NFC drivers depend on third party software:
+
+* pn53x_usb & acr122_usb:
+  
+  - libusb-0.1 http://libusb.sf.net
+
+* acr122_pcsc:
+  
+  - pcsc-lite https://pcsclite.apdu.fr/
+- pcsc:
+  
+  - Support build with pcsc driver, which can be using all compatible readers, Feitian R502 and bR500 already passed the test.
+
+The regression test suite depends on the cutter framework:
+http://cutter.sf.net
+
+Building
+========
+
+Note: If working directly from a git clone of the repository, some of the files need to be generated first. To do this run
+`autoreconf -vis`
+
+Alternatively use a .tar.bz2 version of a packaged release (which already contains ./configure):
+https://github.com/nfc-tools/libnfc/releases/
+
+The build should be as simple as running these commands:
+
+    ./configure
+    make
+
+
+To build with specific driver(s), see option `--with-drivers=...` detailed in `./configure --help`.
+
+Installation
+============
+    
+    make install
+
+You may need to grant permissions to your user to drive your device.
+Under GNU/Linux systems, if you use udev, you could use the provided udev rules.
+  e.g. under Debian, Ubuntu, etc.
+
+    sudo cp contrib/udev/93-pn53x.rules /lib/udev/rules.d/
+
+Under FreeBSD, if you use devd, there is also a rules file: contrib/devd/pn53x.conf.
+
+Configuration
+=============
+
+In order to change the default behavior of the library, the libnfc uses a
+configuration file located in sysconfdir (as provided to ./configure).
+
+A sample commented file is available in sources: libnfc.conf.sample
+
+If you have compiled using:
+
+    ./configure --prefix=/usr --sysconfdir=/etc
+
+you can make configuration directory and copy the sample file:
+
+    sudo mkdir /etc/nfc
+    sudo cp libnfc.conf.sample /etc/nfc/libnfc.conf
+
+To configure multiple devices, you can either modify libnfc.conf or create a
+file per device in a nfc/devices.d directory:
+
+    sudo mkdir -p /etc/nfc/devices.d
+    printf 'name = "My first device"\nconnstring = "pn532_uart:/dev/ttyACM0"\n' | sudo tee /etc/nfc/devices.d/first.conf
+    printf 'name = "My second device"\nconnstring = "pn532_uart:/dev/ttyACM1"\n' | sudo tee /etc/nfc/devices.d/second.conf
+
+Environment Variables
+=====================
+You can override certain configuration options at runtime using the following environment variables:
++ `LIBNFC_DEFAULT_DEVICE=<connstring>`:  `LIBNFC_DEFAULT_DEVICE=pn532_uart:/dev/ttyACM0` will use pn532 on /dev/ttyACM0 as default device
++ `LIBNFC_DEVICE=<connstring>` will ignore all devices in the config files and use only the one defined in the variable
++ `LIBNFC_AUTO_SCAN=<true|false>` overrides `allow_autoscan` option in the config file
++ `LIBNFC_INTRUSIVE_SCAN=<true|false>` overrides `allow_intrusive_scan` option in the config file
++ `LIBNFC_LOG_LEVEL=<0|1|2|3>` overrides `log_level` option in the config file
+
+To obtain the connstring of a recognized device, you can use `nfc-scan-device`: `LIBNFC_AUTO_SCAN=true nfc-scan-device` will show the names & connstrings of all found devices.
+
+How to report bugs
+==================
+
+To report a bug, visit https://github.com/nfc-tools/libnfc/issues and fill
+out a bug report form.
+
+If you have questions, remarks, we encourage you to post this in the developers
+community:
+http://www.libnfc.org/community
+
+Please make sure to include:
+
+* The version of libnfc
+
+* Information about your system. For instance:
+  
+  - What operating system and version
+  - For Linux, what version of the C library
+  
+  And anything else you think is relevant.
+
+* A trace with debug activated.
+  
+  Reproduce the bug with debug, e.g. if it was:
+  
+        $ nfc-list -v
+  
+  run it as:
+  
+        $ LIBNFC_LOG_LEVEL=3 nfc-list -v
+
+* How to reproduce the bug.
+  
+  Please include a short test program that exhibits the behavior.
+  
+  As a last resort, you can also provide a pointer to a larger piece
+  
+  of software that can be downloaded.
+
+* If the bug was a crash, the exact text that was printed out
+  
+  when the crash occured.
+
+* Further information such as stack traces may be useful, but
+  
+  is not necessary.
+
+Patches
+=======
+
+Patches can be posted to https://github.com/nfc-tools/libnfc/issues
+
+If the patch fixes a bug, it is usually a good idea to include
+all the information described in "How to Report Bugs".
+
+Troubleshooting
+===============
+
+Touchatag/ACR122:
+-----------------
+
+If your Touchatag or ACR122 device fails being detected by libnfc, make sure
+that PCSC-lite daemon (`pcscd`) is installed and is running.
+
+If your Touchatag or ACR122 device fails being detected by PCSC-lite daemon
+(`pcsc_scan` doesn't see anything) then try removing the bogus firmware detection
+of libccid: edit libccid_Info.plist configuration file (usually
+`/etc/libccid_Info.plist`) and locate `<key>ifdDriverOptions</key>`, turn
+`<string>0x0000</string>` value into `0x0004` to allow bogus devices and restart
+pcscd daemon.
+
+ACR122:
+-------
+
+Using an ACR122 device with libnfc and without tag (e.g. to use NFCIP modes or
+card emulation) needs yet another PCSC-lite tweak: You need to allow usage of
+CCID Exchange command.  To do this, edit `libccid_Info.plist` configuration file
+(usually `/etc/libccid_Info.plist`) and locate `<key>ifdDriverOptions</key>`,
+turn `<string>0x0000</string>` value into `0x0001` to allow CCID exchange or
+`0x0005` to allow CCID exchange and bogus devices (cf previous remark) and
+restart pcscd daemon.
+
+Warning: if you use ACS CCID drivers (acsccid), configuration file is located
+in something like: `/usr/lib/pcsc/drivers/ifd-acsccid.bundle/Contents/Info.plist`
+
+SCL3711:
+--------
+
+Libnfc cannot be used concurrently with the PCSC proprietary driver of SCL3711.
+Two possible solutions:
+
+* Either you don't install SCL3711 driver at all
+* Or you stop the PCSC daemon when you want to use libnfc-based tools
+
+PN533 USB device on Linux >= 3.1:
+---------------------------------
+
+Since Linux kernel version 3.1, a few kernel-modules must not be loaded in order
+to use libnfc : "nfc", "pn533" and "pn533_usb".
+To prevent kernel from loading automatically these modules, you can blacklist
+them in a modprobe conf file. This file is provided within libnfc archive:
+
+    sudo cp contrib/linux/blacklist-libnfc.conf /etc/modprobe.d/blacklist-libnfc.conf
+
+FEITIAN bR500 and R502:
+-----------------------
+
+Libnfc can work with PCSC proprietary driver of bR500 and R502, which is already available on most Linux setups.
+To activate the PCSC support: `./configure --with-drivers=pcsc`.
+Readers known to work:
+
+- Feitian bR500
+- Feitian R502 Dual interface reader
+- Feitian R502 CL(Contactless) reader
+
+These readers are support by CCID since v1.4.25, make sure your CCID driver version higher or equal to 1.4.25.
+
+On MacOS, you can check your CCID version with the following command, and if required, you can install latest CCID driver from [https://github.com/martinpaljak/osx-ccid-installer/releases](https://github.com/martinpaljak/osx-ccid-installer/releases)
+
+```
+grep -A 1 CFBundleShortVersionString /usr/local/libexec/SmartCardServices/drivers/ifd-ccid.bundle/Contents/Info.plist
+```
+
+On Linux, you can check your CCID version with the following command, and if required, you can install latest CCID driver from [https://ccid.apdu.fr/](https://ccid.apdu.fr/)
+
+```
+grep -A 1 CFBundleShortVersionString /usr/lib/pcsc/drivers/ifd-ccid.bundle/Contents/Info.plist
+```
+
+Proprietary Notes
+=================
+FeliCa is a registered trademark of the Sony Corporation.
+MIFARE is a trademark of NXP Semiconductors.
+Jewel Topaz is a trademark of Innovision Research & Technology.
+All other trademarks are the property of their respective owners.

cmake/LibNFCConfig.cmake.in

@@ -0,0 +1,34 @@
+#                                               -*- cmake -*-
+
+
+# Use the following variables to compile and link against LibNFC:
+#  LIBNFC_FOUND              - True if LibNFC was found on your system
+#  LIBNFC_USE_FILE           - The file making LibNFC usable
+#  LIBNFC_DEFINITIONS        - Definitions needed to build with LibNFC
+#  LIBNFC_INCLUDE_DIR        - Directory where nfc/nfc.h can be found
+#  LIBNFC_INCLUDE_DIRS       - List of directories of LibNFC and it's dependencies
+#  LIBNFC_LIBRARY            - LibNFC library location
+#  LIBNFC_LIBRARIES          - List of libraries to link against LibNFC library
+#  LIBNFC_LIBRARY_DIRS       - List of directories containing LibNFC' libraries
+#  LIBNFC_ROOT_DIR           - The base directory of LibNFC
+#  LIBNFC_VERSION_STRING     - A human-readable string containing the version
+#  LIBNFC_VERSION_MAJOR      - The major version of LibNFC
+#  LIBNFC_VERSION_MINOR      - The minor version of LibNFC
+#  LIBNFC_VERSION_PATCH      - The patch version of LibNFC
+
+set ( LIBNFC_FOUND 1 )
+set ( LIBNFC_USE_FILE     "@LIBNFC_USE_FILE@" )
+
+set ( LIBNFC_DEFINITIONS  "@LIBNFC_DEFINITIONS@" )
+set ( LIBNFC_INCLUDE_DIR  "@LIBNFC_INCLUDE_DIR@" )
+set ( LIBNFC_INCLUDE_DIRS "@LIBNFC_INCLUDE_DIRS@" )
+set ( LIBNFC_LIBRARY      "@LIBNFC_LIBRARY@" )
+set ( LIBNFC_LIBRARIES    "@LIBNFC_LIBRARIES@" )
+set ( LIBNFC_LIBRARY_DIRS "@LIBNFC_LIBRARY_DIRS@" )
+set ( LIBNFC_ROOT_DIR     "@LIBNFC_ROOT_DIR@" )
+
+set ( LIBNFC_VERSION_STRING "@LIBNFC_VERSION_STRING@" )
+set ( LIBNFC_VERSION_MAJOR  "@LIBNFC_VERSION_MAJOR@" )
+set ( LIBNFC_VERSION_MINOR  "@LIBNFC_VERSION_MINOR@" )
+set ( LIBNFC_VERSION_PATCH  "@LIBNFC_VERSION_PATCH@" )
+

cmake/LibNFCConfigVersion.cmake.in

@@ -0,0 +1,31 @@
+# This is a basic version file for the Config-mode of find_package().
+# It is used by write_basic_package_version_file() as input file for configure_file()
+# to create a version-file which can be installed along a config.cmake file.
+#
+# The created file sets PACKAGE_VERSION_EXACT if the current version string and
+# the requested version string are exactly the same and it sets
+# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version.
+# The variable CVF_VERSION must be set before calling configure_file().
+
+set(PACKAGE_VERSION "@LIBNFC_VERSION_STRING@")
+
+if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
+  set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else()
+  set(PACKAGE_VERSION_COMPATIBLE TRUE)
+  if( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}")
+    set(PACKAGE_VERSION_EXACT TRUE)
+  endif()
+endif()
+
+# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
+if("${CMAKE_SIZEOF_VOID_P}"  STREQUAL ""  OR "8" STREQUAL "")
+   return()
+endif()
+
+# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
+if(NOT "${CMAKE_SIZEOF_VOID_P}"  STREQUAL  "8")
+   math(EXPR installedBits "8 * 8")
+   set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
+   set(PACKAGE_VERSION_UNSUITABLE TRUE)
+endif()

cmake/Makefile.am

@@ -3,4 +3,7 @@ SUBDIRS = modules
 EXTRA_DIST = \
 	     FixBundle.cmake.in \
 	     config_posix.h.cmake \
-	     config_windows.h.cmake
+	     config_windows.h.cmake \
+	     LibNFCConfig.cmake.in \
+	     LibNFCConfigVersion.cmake.in \
+	     UseLibNFC.cmake

cmake/UseLibNFC.cmake

@@ -0,0 +1,5 @@
+#                                               -*- cmake -*-
+
+add_definitions     ( ${LIBNFC_DEFINITIONS} )
+include_directories ( ${LIBNFC_INCLUDE_DIRS} )
+link_directories    ( ${LIBNFC_LIBRARY_DIRS} )

cmake/config_posix.h.cmake

@@ -2,3 +2,4 @@
 #cmakedefine PACKAGE_VERSION "@PACKAGE_VERSION@"
 #cmakedefine PACKAGE_STRING "@PACKAGE_STRING@"
 #cmakedefine _XOPEN_SOURCE @_XOPEN_SOURCE@
+#cmakedefine SYSCONFDIR "@SYSCONFDIR@"

cmake/config_windows.h.cmake

@@ -3,3 +3,4 @@
 #cmakedefine PACKAGE_NAME "@PACKAGE_NAME@"
 #cmakedefine PACKAGE_VERSION "@PACKAGE_VERSION@"
 #cmakedefine PACKAGE_STRING "@PACKAGE_STRING@"
+#cmakedefine LIBNFC_SYSCONFDIR "@LIBNFC_SYSCONFDIR@"

cmake/modules/FindLIBUSB.cmake

@@ -26,9 +26,17 @@ ENDIF(CMAKE_SYSTEM_NAME MATCHES FreeBSD)
 
 IF(NOT LIBUSB_FOUND)
   IF(WIN32)
-    FIND_PATH(LIBUSB_INCLUDE_DIRS lusb0_usb.h "$ENV{ProgramFiles}/LibUSB-Win32/include" NO_SYSTEM_ENVIRONMENT_PATH)
+    IF(MINGW)
-    FIND_LIBRARY(LIBUSB_LIBRARIES NAMES libusb PATHS "$ENV{ProgramFiles}/LibUSB-Win32/lib/gcc")
+      FIND_PATH(LIBUSB_INCLUDE_DIRS lusb0_usb.h "${CMAKE_CURRENT_BINARY_DIR}/LibUSB-Win32/include" NO_SYSTEM_ENVIRONMENT_PATH)
-    SET(LIBUSB_LIBRARY_DIR "$ENV{ProgramFiles}/LibUSB-Win32/bin/x86/")
+      FIND_LIBRARY(LIBUSB_LIBRARIES NAMES libusb PATHS "${CMAKE_CURRENT_BINARY_DIR}/LibUSB-Win32/lib/gcc")
+      SET(LIBUSB_LIBRARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/LibUSB-Win32/bin/x86/")
+    ELSE(MINGW)
+      FIND_PATH(LIBUSB_INCLUDE_DIRS lusb0_usb.h "$ENV{ProgramW6432}/libusb-win32/include" NO_SYSTEM_ENVIRONMENT_PATH)
+      FIND_LIBRARY(LIBUSB_LIBRARIES NAMES libusb PATHS "$ENV{ProgramW6432}/libusb-win32/lib/msvc_x64")
+      SET(LIBUSB_LIBRARY_DIR "$ENV{ProgramW6432}/libusb-win32/bin/amd64/")
+    ENDIF(MINGW)
+    # Must fix up variable to avoid backslashes during packaging
+    STRING(REGEX REPLACE "\\\\" "/" LIBUSB_LIBRARY_DIR ${LIBUSB_LIBRARY_DIR})
   ELSE(WIN32)
     # If not under Windows we use PkgConfig
     FIND_PACKAGE (PkgConfig)

cmake/modules/LibnfcDrivers.cmake

@@ -1,29 +1,78 @@
-SET(LIBNFC_DRIVER_ACR122 ON CACHE BOOL "Enable ACR122 support (Depends on PC/SC)")
+SET(LIBNFC_DRIVER_PCSC OFF CACHE BOOL "Enable PC/SC reader support (Depends on PC/SC)")
-SET(LIBNFC_DRIVER_PN53X_USB ON CACHE BOOL "Enable PN531 and PN531 USB support (Depends on libusb)")
+SET(LIBNFC_DRIVER_ACR122_PCSC OFF CACHE BOOL "Enable ACR122 support (Depends on PC/SC)")
+SET(LIBNFC_DRIVER_ACR122_USB ON CACHE BOOL "Enable ACR122 support (Direct USB connection)")
+SET(LIBNFC_DRIVER_ACR122S ON CACHE BOOL "Enable ACR122S support (Use serial port)")
 SET(LIBNFC_DRIVER_ARYGON ON CACHE BOOL "Enable ARYGON support (Use serial port)")
-SET(LIBNFC_DRIVER_PN532_UART OFF CACHE BOOL "Enable PN532 UART support (Use serial port)")
+IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+  SET(LIBNFC_DRIVER_PN532_I2C ON CACHE BOOL "Enable PN532 I2C support (Use I2C bus)")
+  SET(LIBNFC_DRIVER_PN532_SPI ON CACHE BOOL "Enable PN532 SPI support (Use SPI bus)")
+ELSE(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+  SET(LIBNFC_DRIVER_PN532_I2C OFF CACHE BOOL "Enable PN532 I2C support (Use I2C bus)")
+  SET(LIBNFC_DRIVER_PN532_SPI OFF CACHE BOOL "Enable PN532 SPI support (Use SPI bus)")
+ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+SET(LIBNFC_DRIVER_PN532_UART ON CACHE BOOL "Enable PN532 UART support (Use serial port)")
+SET(LIBNFC_DRIVER_PN53X_USB ON CACHE BOOL "Enable PN531 and PN531 USB support (Depends on libusb)")
 
-IF(LIBNFC_DRIVER_ACR122)
+IF(LIBNFC_DRIVER_PCSC)
   FIND_PACKAGE(PCSC REQUIRED)
-  ADD_DEFINITIONS("-DDRIVER_ACR122_ENABLED")
+  ADD_DEFINITIONS("-DDRIVER_PCSC_ENABLED")
-  SET(DRIVERS_SOURCES ${DRIVERS_SOURCES} "drivers/acr122")
+  SET(DRIVERS_SOURCES ${DRIVERS_SOURCES} "drivers/pcsc")
-ENDIF(LIBNFC_DRIVER_ACR122)
+ENDIF(LIBNFC_DRIVER_PCSC)
+
+IF(LIBNFC_DRIVER_ACR122_PCSC)
+  FIND_PACKAGE(PCSC REQUIRED)
+  ADD_DEFINITIONS("-DDRIVER_ACR122_PCSC_ENABLED")
+  SET(DRIVERS_SOURCES ${DRIVERS_SOURCES} "drivers/acr122_pcsc")
+ENDIF(LIBNFC_DRIVER_ACR122_PCSC)
+
+IF(LIBNFC_DRIVER_ACR122_USB)
+  FIND_PACKAGE(LIBUSB REQUIRED)
+  ADD_DEFINITIONS("-DDRIVER_ACR122_USB_ENABLED")
+  SET(DRIVERS_SOURCES ${DRIVERS_SOURCES} "drivers/acr122_usb")
+ENDIF(LIBNFC_DRIVER_ACR122_USB)
+
+IF(LIBNFC_DRIVER_ACR122S)
+  ADD_DEFINITIONS("-DDRIVER_ACR122S_ENABLED")
+  SET(DRIVERS_SOURCES ${DRIVERS_SOURCES} "drivers/acr122s")
+  SET(UART_REQUIRED TRUE)
+ENDIF(LIBNFC_DRIVER_ACR122S)
+
+IF(LIBNFC_DRIVER_ARYGON)
+  ADD_DEFINITIONS("-DDRIVER_ARYGON_ENABLED")
+  SET(DRIVERS_SOURCES ${DRIVERS_SOURCES} "drivers/arygon")
+  SET(UART_REQUIRED TRUE)
+ENDIF(LIBNFC_DRIVER_ARYGON)
+
+IF(LIBNFC_DRIVER_PN532_I2C)
+  ADD_DEFINITIONS("-DDRIVER_PN532_I2C_ENABLED")
+  SET(DRIVERS_SOURCES ${DRIVERS_SOURCES} "drivers/pn532_i2c")
+  SET(I2C_REQUIRED TRUE)
+ENDIF(LIBNFC_DRIVER_PN532_I2C)
+
+IF(LIBNFC_DRIVER_PN532_SPI)
+  ADD_DEFINITIONS("-DDRIVER_PN532_SPI_ENABLED")
+  SET(DRIVERS_SOURCES ${DRIVERS_SOURCES} "drivers/pn532_spi")
+  SET(SPI_REQUIRED TRUE)
+ENDIF(LIBNFC_DRIVER_PN532_SPI)
+
+IF(LIBNFC_DRIVER_PN532_UART)
+  ADD_DEFINITIONS("-DDRIVER_PN532_UART_ENABLED")
+  SET(DRIVERS_SOURCES ${DRIVERS_SOURCES} "drivers/pn532_uart")
+  SET(UART_REQUIRED TRUE)
+ENDIF(LIBNFC_DRIVER_PN532_UART)
 
 IF(LIBNFC_DRIVER_PN53X_USB)
   FIND_PACKAGE(LIBUSB REQUIRED)
   ADD_DEFINITIONS("-DDRIVER_PN53X_USB_ENABLED")
   SET(DRIVERS_SOURCES ${DRIVERS_SOURCES} "drivers/pn53x_usb")
+  SET(USB_REQUIRED TRUE)
 ENDIF(LIBNFC_DRIVER_PN53X_USB)
 
-IF(LIBNFC_DRIVER_ARYGON)
+IF(LIBNFC_DRIVER_ACR122_USB)
-  ADD_DEFINITIONS("-DDRIVER_ARYGON_ENABLED")
+  FIND_PACKAGE(LIBUSB REQUIRED)
-  SET(DRIVERS_SOURCES ${DRIVERS_SOURCES} "drivers/arygon")
+  ADD_DEFINITIONS("-DDRIVER_ACR122_USB_ENABLED")
-ENDIF(LIBNFC_DRIVER_ARYGON)
+  SET(DRIVERS_SOURCES ${DRIVERS_SOURCES} "drivers/acr122_usb")
-
+  SET(USB_REQUIRED TRUE)
-IF(LIBNFC_DRIVER_PN532_UART)
+ENDIF(LIBNFC_DRIVER_ACR122_USB)
-  ADD_DEFINITIONS("-DDRIVER_PN532_UART_ENABLED")
-  SET(DRIVERS_SOURCES ${DRIVERS_SOURCES} "drivers/pn532_uart")
-ENDIF(LIBNFC_DRIVER_PN532_UART)
-
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/drivers)
 
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/libnfc/drivers)

cmake/modules/UseDoxygen.cmake

@@ -91,8 +91,7 @@ if(DOXYGEN_FOUND AND DOXYFILE_IN)
 
 	configure_file(${DOXYFILE_IN} Doxyfile ESCAPE_QUOTES IMMEDIATE @ONLY)
 
-	get_target_property(DOC_TARGET doc TYPE)
+	if(NOT TARGET doc)
-	if(NOT DOC_TARGET)
 		add_custom_target(doc)
 	endif()
 		

configure.ac

@@ -1,28 +1,30 @@
 # General init
 
 # /!\ Don't forget to update 'CMakeLists.txt' too /!\
-AC_INIT(libnfc, 1.5.1, info@libnfc.org)
+AC_INIT([libnfc],[1.8.0],[nfc-tools@googlegroups.com])
 
 AC_CONFIG_MACRO_DIR([m4])
 
 AC_CONFIG_HEADER(config.h)
 
-# SVN revison
+# GIT revison
-define([svn_revision], esyscmd([sh -c "svnversion -n"]))
+GIT_REVISION=`which git > /dev/null && git describe`
-SVN_REVISION=svn_revision
+if test x"$GIT_REVISION" != x""; then
-AC_DEFINE_UNQUOTED([SVN_REVISION], ["$SVN_REVISION"], [SVN revision])
+    AC_DEFINE_UNQUOTED([GIT_REVISION], ["$GIT_REVISION"], [GIT revision])
+fi
 
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE(subdir-objects dist-bzip2 no-dist-gzip foreign)
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
-AC_LANG_C
+AC_LANG([C])
 AC_PROG_CC
 AC_PROG_MAKE_SET
 
 WITH_POSIX_ONLY_EXAMPLES=1
 # Libtool
-AC_PROG_LIBTOOL
+LT_INIT
 case "$host" in
   *-pc-linux-gnu)
     AC_MSG_RESULT([Fixing libtool for -rpath problems.])
@@ -37,15 +39,15 @@ case "$host" in
 esac
 AM_CONDITIONAL(POSIX_ONLY_EXAMPLES_ENABLED, [test "$WITH_POSIX_ONLY_EXAMPLES" = "1"])
 
-AC_PATH_PROG(PKG_CONFIG, pkg-config)
+PKG_PROG_PKG_CONFIG
-if test x"$PKG_CONFIG" = x""; then
-    AC_MSG_ERROR([pkg-config not found.])
-fi
 
 # Checks for header files.
 AC_HEADER_STDC
 AC_HEADER_STDBOOL
 AC_CHECK_HEADERS([fcntl.h limits.h stdio.h stdlib.h stdint.h stddef.h stdbool.h sys/ioctl.h sys/param.h sys/time.h termios.h])
+AC_CHECK_HEADERS([linux/spi/spidev.h], [spi_available="yes"])
+AC_CHECK_HEADERS([linux/i2c-dev.h], [i2c_available="yes"])
+AC_CHECK_HEADERS([linux_nfc_api.h], [nfc_nci_available="yes"])
 AC_CHECK_FUNCS([memmove memset select strdup strerror strstr strtol usleep],
 	       [AC_DEFINE([_XOPEN_SOURCE], [600], [Enable POSIX extensions if present])])
 
@@ -65,46 +67,78 @@ AC_TYPE_INT16_T
 AC_TYPE_INT32_T
 AC_TYPE_OFF_T
 
-AC_TYPE_SIGNAL
-
 LIBNFC_CFLAGS='-I$(top_srcdir)/libnfc -I$(top_builddir)/include -I$(top_srcdir)/include'
 AC_SUBST(LIBNFC_CFLAGS)
 
-# Checks for log4c
+# Log support (default:yes)
-AC_PATH_PROG([LOG4C_CONFIG], [log4c-config])
+AC_ARG_ENABLE([log],AS_HELP_STRING([--disable-log],[Disable any logs]),[enable_log=$enableval],[enable_log="yes"])
-if test x"$LOG4C_CONFIG" != x""; then
+AC_MSG_CHECKING(for log flag)
-    log4c_CFLAGS=`$LOG4C_CONFIG --cflags`
+AC_MSG_RESULT($enable_log)
-    log4c_LIBS=`$LOG4C_CONFIG --libs`
+AM_CONDITIONAL([WITH_LOG], [test "$enable_log" != "no"])
-    AC_SUBST([log4c_CFLAGS])
+ 
-    AC_SUBST([log4c_LIBS])
+if test x"$enable_log" = "xyes"
-    AC_DEFINE([HAS_LOG4C], [1], [Define to 1 if log4c is available.])
+then
+  AC_DEFINE([LOG], [1], [Enable log])
+fi
+
+# Conffiles support (default:yes)
+AC_ARG_ENABLE([conffiles],AS_HELP_STRING([--disable-conffiles],[Disable use of config files]),[enable_conffiles=$enableval],[enable_conffiles="yes"])
+AC_MSG_CHECKING(for conffiles flag)
+AC_MSG_RESULT($enable_conffiles)
+AM_CONDITIONAL([WITH_CONFFILES], [test "$enable_conffiles" != "no"])
+ 
+if test x"$enable_conffiles" = "xyes"
+then
+  AC_DEFINE([CONFFILES], [1], [Enable conffiles])
+fi
+
+# Envvars support (default:yes)
+AC_ARG_ENABLE([envvars],AS_HELP_STRING([--disable-envvars],[Disable use of environment variables]),[enable_envvars=$enableval],[enable_envvars="yes"])
+AC_MSG_CHECKING(for envvars flag)
+AC_MSG_RESULT($enable_envvars)
+AM_CONDITIONAL([WITH_ENVVARS], [test "$enable_envvars" != "no"])
+ 
+if test x"$enable_envvars" = "xyes"
+then
+  AC_DEFINE([ENVVARS], [1], [Enable envvars])
 fi
-AM_CONDITIONAL(HAS_LOG4C, [test x"$LOG4C_CONFIG" != x""])
 
 # Debug support (default:no)
-AC_ARG_ENABLE([debug],AS_HELP_STRING([--enable-debug],[Enable debug output]),[enable_debug=$enableval],[enable_debug="no"])
+AC_ARG_ENABLE([debug],AS_HELP_STRING([--enable-debug],[Enable debug mode]),[enable_debug=$enableval],[enable_debug="no"])
- 
 AC_MSG_CHECKING(for debug flag)
 AC_MSG_RESULT($enable_debug)
 AM_CONDITIONAL([WITH_DEBUG], [test "$enable_debug" != "no"])
  
 if test x"$enable_debug" = "xyes"
 then
-  CFLAGS="$CFLAGS -g -DDEBUG -O0 -ggdb"
+  AC_DEFINE([DEBUG], [1], [Enable debug flag])
+  CFLAGS="$CFLAGS -g -O0 -ggdb"
 fi
 
 # Handle --with-drivers option
 LIBNFC_ARG_WITH_DRIVERS
 
-# Serial autoprobing support (default:no)
+# Enable UART if
-AC_ARG_ENABLE([serial-autoprobe],AS_HELP_STRING([--enable-serial-autoprobe],[Allow serial ports to be probed (can seriously disturb connected serial devices)]),[enable_serial_autoprobe=$enableval],[enable_serial_autoprobe="no"])
+AM_CONDITIONAL(UART_ENABLED, [test x"$uart_required" = x"yes"])
 
-AC_MSG_CHECKING(for serial autoprobe flag)
+# Enable SPI if
-AC_MSG_RESULT($enable_serial_autoprobe)
+AM_CONDITIONAL(SPI_ENABLED, [test x"$spi_required" = x"yes"])
 
-if test x"$enable_serial_autoprobe" = "xyes"
+# Enable I2C if 
+AM_CONDITIONAL(I2C_ENABLED, [test x"$i2c_required" = x"yes"])
+if test x"$i2c_required" = x"yes"
 then
-  CFLAGS="$CFLAGS -DSERIAL_AUTOPROBE_ENABLED"
+  AC_SEARCH_LIBS([clock_gettime], [rt])
+fi
+
+# Enable Libnfc-NCI if required
+if test x"$nfc_nci_required" = x"yes"
+then
+  PKG_CHECK_MODULES([LIBNFC_NCI], [libnfc-nci],
+    [AC_MSG_NOTICE([libnfc-nci present])],
+    [AC_MSG_ERROR([libnfc-nci not present but required for some drivers configuration])]
+  )
+  CFLAGS="$CFLAGS $LIBNFC_NCI_CFLAGS"
 fi
 
 # Documentation (default: no)
@@ -123,6 +157,14 @@ then
 fi
 AM_CONDITIONAL(DOC_ENABLED, [test x"$enable_doc" = xyes])
 
+# Example build (default: yes)
+AC_ARG_ENABLE([example],AS_HELP_STRING([--enable-example],[Enable example build.]),[enable_example=$enableval],[enable_example="yes"])
+
+AC_MSG_CHECKING(for example build)
+AC_MSG_RESULT($enable_example)
+
+AM_CONDITIONAL(EXAMPLE_ENABLED, [test x"$enable_example" = xyes])
+
 # Dependencies
 PKG_CONFIG_REQUIRES=""
 
@@ -134,14 +176,17 @@ AC_SUBST(PKG_CONFIG_REQUIRES)
 AM_CONDITIONAL(LIBUSB_ENABLED, [test "$HAVE_LIBUSB" = "1"])
 AM_CONDITIONAL(PCSC_ENABLED, [test "$HAVE_PCSC" = "1"])
 
-CUTTER_REQUIRED_VERSION=1.1.8
+CUTTER_REQUIRED_VERSION=1.1.7
 m4_ifdef([AC_CHECK_CUTTER], [AC_CHECK_CUTTER([>= $CUTTER_REQUIRED_VERSION])], [ac_cv_use_cutter="no"])
 if test x$ac_cv_with_cutter = xyes -a x$ac_cv_use_cutter = xno; then
   AC_MSG_ERROR([cutter >= $CUTTER_REQUIRED_VERSION is mandatory.])
 fi
 AM_CONDITIONAL([WITH_CUTTER], [test "$ac_cv_use_cutter" != "no"])
 
+if test x"$enable_example" = "xyes"
+then
 AC_CHECK_READLINE
+fi
 
 # Help us to write great code ;-)
 CFLAGS="$CFLAGS -Wall -pedantic -Wextra"
@@ -158,8 +203,14 @@ AC_CONFIG_FILES([
 		cmake/Makefile
 		cmake/modules/Makefile
 		contrib/Makefile
+		contrib/devd/Makefile
+		contrib/libnfc/Makefile
+		contrib/linux/Makefile
+		contrib/udev/Makefile
 		contrib/win32/Makefile
 		contrib/win32/sys/Makefile
+		contrib/win32/libnfc/Makefile
+		contrib/win32/libnfc/buses/Makefile
 		examples/Makefile
 		examples/pn53x-tamashell-scripts/Makefile
 		include/Makefile

contrib/Makefile.am

@@ -1,4 +1,9 @@
-SUBDIRS = win32
+SUBDIRS = \
+	devd \
+	libnfc \
+	linux \
+	udev \
+	win32
 
 EXTRA_DIST = \
 	windows.h

contrib/devd/Makefile.am

@@ -0,0 +1,2 @@
+EXTRA_DIST = \
+	pn53x.conf

contrib/libnfc/Makefile.am

@@ -0,0 +1,7 @@
+EXTRA_DIST = \
+	arygon.conf.sample \
+	pn532_i2c_on_rpi.conf.sample \
+	pn532_spi_on_rpi.conf.sample \
+	pn532_uart_on_rpi_3.conf.sample \
+	pn532_uart_on_rpi.conf.sample \
+	pn532_via_uart2usb.conf.sample

contrib/libnfc/arygon.conf.sample

@@ -0,0 +1,3 @@
+## Typical configuration file for Arygon/IDentive device (with Arygon-MCU on board)
+name = "IDentive"
+connstring = arygon:/dev/ttyS0

contrib/libnfc/pn532_i2c_on_rpi.conf.sample

@@ -0,0 +1,12 @@
+## Typical configuration file for PN532 device on R-Pi connected using I2C
+## Note: to use SPI port on R-Pi, you have to load kernel modules i2c-bcm2708 and i2c-dev:
+## Edit /etc/modprobe.d/raspi-blacklist.conf and comment: #blacklist i2c-bcm2708
+## Edit /etc/modules and add a new line: i2c-dev
+name = "PN532 board via I2C"
+connstring = pn532_i2c:/dev/i2c-0
+
+# Note: If you have an R-Pi revision 2.0, the I2C bus #1 is now routed to connector P1
+# (instead of the I2C bus #0 routed on same connector on initial board revision), so
+# the configuration to use would probably be:
+
+#   connstring = pn532_i2c:/dev/i2c-1

contrib/libnfc/pn532_spi_on_rpi.conf.sample

@@ -0,0 +1,5 @@
+## Typical configuration file for PN532 device on R-Pi connected using SPI
+## Note: to use SPI port on R-Pi, you have to load kernel module spi-bcm2708:
+## Edit /etc/modprobe.d/raspi-blacklist.conf and comment: #blacklist spi-bcm2708
+name = "PN532 board via SPI"
+connstring = pn532_spi:/dev/spidev0.0:500000

contrib/libnfc/pn532_uart_on_rpi.conf.sample

@@ -0,0 +1,5 @@
+## Typical configuration file for PN532 device on R-Pi connected using UART
+## Note: to use UART port on R-Pi, you have to disable linux serial console:
+##   http://learn.adafruit.com/adafruit-nfc-rfid-on-raspberry-pi/freeing-uart-on-the-pi
+name = "PN532 board via UART"
+connstring = pn532_uart:/dev/ttyAMA0

contrib/libnfc/pn532_uart_on_rpi_3.conf.sample

@@ -0,0 +1,22 @@
+## Typical configuration file for PN532 device on R-Pi 3 connected using miniUART
+## Note: Changes have been made to R-Pi 3 with the addition of Bluetooth LE
+## The UART is now being used by the BLE module. Instead of disabling it, you can 
+## use the PN532 device with the "mini UART", which is still hijacked by the linux kernel 
+## as a serial console
+##
+## Tested recipe with PN532 breakout from Adafruit
+##
+## To enable uart on GPIO, add this line to bottom of /boot/config.txt
+## enable_uart=1
+##
+## Stop and disable serial console:
+## $ sudo systemctl stop serial-getty@ttyS0.service
+## $ sudo systemctl disable serial-getty@ttyS0.service
+##
+## Remove console from /boot/cmdline.txt by removing: 
+## console=serial0,115200 Save and reboot for changes to take effect.
+##
+name = "PN532 board via UART"
+connstring = pn532_uart:/dev/ttyS0
+allow_intrusive_scan = true
+

contrib/libnfc/pn532_via_uart2usb.conf.sample

@@ -0,0 +1,3 @@
+## Typical configuration file for PN532 board (ie. microbuilder.eu / Adafruit) device
+name = "Adafruit PN532 board via UART"
+connstring = pn532_uart:/dev/ttyUSB0

contrib/linux/Makefile.am

@@ -0,0 +1,2 @@
+EXTRA_DIST = \
+	blacklist-libnfc.conf

contrib/linux/blacklist-libnfc.conf

@@ -0,0 +1,3 @@
+blacklist nfc
+blacklist pn533
+blacklist pn533_usb

contrib/udev/93-pn53x.rules

@@ -11,7 +11,12 @@ ATTRS{idVendor}=="054c", ATTRS{idProduct}=="0193", MODE="0664", GROUP="plugdev"
 # PN533
 ATTRS{idVendor}=="04cc", ATTRS{idProduct}=="2533", MODE="0664", GROUP="plugdev"
 ATTRS{idVendor}=="04e6", ATTRS{idProduct}=="5591", MODE="0664", GROUP="plugdev"
+ATTRS{idVendor}=="04e6", ATTRS{idProduct}=="5594", MODE="0664", GROUP="plugdev"
 ATTRS{idVendor}=="1fd3", ATTRS{idProduct}=="0608", MODE="0664", GROUP="plugdev"
 ATTRS{idVendor}=="054c", ATTRS{idProduct}=="02e1", MODE="0664", GROUP="plugdev"
 
+# ACR122 / Touchatag
+ATTRS{idVendor}=="072f", ATTRS{idProduct}=="2200", MODE="0664", GROUP="plugdev"
+ATTRS{idVendor}=="072f", ATTRS{idProduct}=="90cc", MODE="0664", GROUP="plugdev"
+
 LABEL="pn53x_rules_end"

contrib/udev/Makefile.am

@@ -0,0 +1,2 @@
+EXTRA_DIST = \
+	93-pn53x.rules

contrib/win32/Makefile.am

@@ -1,4 +1,8 @@
-SUBDIRS = sys .
+SUBDIRS = libnfc sys .
 
 EXTRA_DIST = \
-	err.h
+	err.h		\
+	nfc.def		\
+	stdlib.c	\
+	unistd.h	\
+	version.rc.in

contrib/win32/dirent.h

@@ -0,0 +1,870 @@
+/*
+ * Dirent interface for Microsoft Visual Studio
+ *
+ * Copyright (C) 2006-2012 Toni Ronkko
+ * This file is part of dirent.  Dirent may be freely distributed
+ * under the MIT license.  For all details and documentation, see
+ * https://github.com/tronkko/dirent
+ */
+#ifndef DIRENT_H
+#define DIRENT_H
+
+/*
+ * Include windows.h without Windows Sockets 1.1 to prevent conflicts with
+ * Windows Sockets 2.0.
+ */
+#ifndef WIN32_LEAN_AND_MEAN
+#   define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <wchar.h>
+#include <string.h>
+#include <stdlib.h>
+#include <malloc.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <errno.h>
+
+/* Indicates that d_type field is available in dirent structure */
+#define _DIRENT_HAVE_D_TYPE
+
+/* Indicates that d_namlen field is available in dirent structure */
+#define _DIRENT_HAVE_D_NAMLEN
+
+/* Entries missing from MSVC 6.0 */
+#if !defined(FILE_ATTRIBUTE_DEVICE)
+#   define FILE_ATTRIBUTE_DEVICE 0x40
+#endif
+
+/* File type and permission flags for stat(), general mask */
+#if !defined(S_IFMT)
+#   define S_IFMT _S_IFMT
+#endif
+
+/* Directory bit */
+#if !defined(S_IFDIR)
+#   define S_IFDIR _S_IFDIR
+#endif
+
+/* Character device bit */
+#if !defined(S_IFCHR)
+#   define S_IFCHR _S_IFCHR
+#endif
+
+/* Pipe bit */
+#if !defined(S_IFFIFO)
+#   define S_IFFIFO _S_IFFIFO
+#endif
+
+/* Regular file bit */
+#if !defined(S_IFREG)
+#   define S_IFREG _S_IFREG
+#endif
+
+/* Read permission */
+#if !defined(S_IREAD)
+#   define S_IREAD _S_IREAD
+#endif
+
+/* Write permission */
+#if !defined(S_IWRITE)
+#   define S_IWRITE _S_IWRITE
+#endif
+
+/* Execute permission */
+#if !defined(S_IEXEC)
+#   define S_IEXEC _S_IEXEC
+#endif
+
+/* Pipe */
+#if !defined(S_IFIFO)
+#   define S_IFIFO _S_IFIFO
+#endif
+
+/* Block device */
+#if !defined(S_IFBLK)
+#   define S_IFBLK 0
+#endif
+
+/* Link */
+#if !defined(S_IFLNK)
+#   define S_IFLNK 0
+#endif
+
+/* Socket */
+#if !defined(S_IFSOCK)
+#   define S_IFSOCK 0
+#endif
+
+/* Read user permission */
+#if !defined(S_IRUSR)
+#   define S_IRUSR S_IREAD
+#endif
+
+/* Write user permission */
+#if !defined(S_IWUSR)
+#   define S_IWUSR S_IWRITE
+#endif
+
+/* Execute user permission */
+#if !defined(S_IXUSR)
+#   define S_IXUSR 0
+#endif
+
+/* Read group permission */
+#if !defined(S_IRGRP)
+#   define S_IRGRP 0
+#endif
+
+/* Write group permission */
+#if !defined(S_IWGRP)
+#   define S_IWGRP 0
+#endif
+
+/* Execute group permission */
+#if !defined(S_IXGRP)
+#   define S_IXGRP 0
+#endif
+
+/* Read others permission */
+#if !defined(S_IROTH)
+#   define S_IROTH 0
+#endif
+
+/* Write others permission */
+#if !defined(S_IWOTH)
+#   define S_IWOTH 0
+#endif
+
+/* Execute others permission */
+#if !defined(S_IXOTH)
+#   define S_IXOTH 0
+#endif
+
+/* Maximum length of file name */
+#if !defined(PATH_MAX)
+#   define PATH_MAX MAX_PATH
+#endif
+#if !defined(FILENAME_MAX)
+#   define FILENAME_MAX MAX_PATH
+#endif
+#if !defined(NAME_MAX)
+#   define NAME_MAX FILENAME_MAX
+#endif
+
+/* File type flags for d_type */
+#define DT_UNKNOWN 0
+#define DT_REG S_IFREG
+#define DT_DIR S_IFDIR
+#define DT_FIFO S_IFIFO
+#define DT_SOCK S_IFSOCK
+#define DT_CHR S_IFCHR
+#define DT_BLK S_IFBLK
+#define DT_LNK S_IFLNK
+
+/* Macros for converting between st_mode and d_type */
+#define IFTODT(mode) ((mode) & S_IFMT)
+#define DTTOIF(type) (type)
+
+/*
+ * File type macros.  Note that block devices, sockets and links cannot be
+ * distinguished on Windows and the macros S_ISBLK, S_ISSOCK and S_ISLNK are
+ * only defined for compatibility.  These macros should always return false
+ * on Windows.
+ */
+#if !defined(S_ISFIFO)
+#   define S_ISFIFO(mode) (((mode) & S_IFMT) == S_IFIFO)
+#endif
+#if !defined(S_ISDIR)
+#   define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR)
+#endif
+#if !defined(S_ISREG)
+#   define S_ISREG(mode) (((mode) & S_IFMT) == S_IFREG)
+#endif
+#if !defined(S_ISLNK)
+#   define S_ISLNK(mode) (((mode) & S_IFMT) == S_IFLNK)
+#endif
+#if !defined(S_ISSOCK)
+#   define S_ISSOCK(mode) (((mode) & S_IFMT) == S_IFSOCK)
+#endif
+#if !defined(S_ISCHR)
+#   define S_ISCHR(mode) (((mode) & S_IFMT) == S_IFCHR)
+#endif
+#if !defined(S_ISBLK)
+#   define S_ISBLK(mode) (((mode) & S_IFMT) == S_IFBLK)
+#endif
+
+/* Return the exact length of the file name without zero terminator */
+#define _D_EXACT_NAMLEN(p) ((p)->d_namlen)
+
+/* Return the maximum size of a file name */
+#define _D_ALLOC_NAMLEN(p) ((PATH_MAX)+1)
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* Wide-character version */
+struct _wdirent {
+    /* Always zero */
+    long d_ino;
+
+    /* File position within stream */
+    long d_off;
+
+    /* Structure size */
+    unsigned short d_reclen;
+
+    /* Length of name without \0 */
+    size_t d_namlen;
+
+    /* File type */
+    int d_type;
+
+    /* File name */
+    wchar_t d_name[PATH_MAX+1];
+};
+typedef struct _wdirent _wdirent;
+
+struct _WDIR {
+    /* Current directory entry */
+    struct _wdirent ent;
+
+    /* Private file data */
+    WIN32_FIND_DATAW data;
+
+    /* True if data is valid */
+    int cached;
+
+    /* Win32 search handle */
+    HANDLE handle;
+
+    /* Initial directory name */
+    wchar_t *patt;
+};
+typedef struct _WDIR _WDIR;
+
+/* Multi-byte character version */
+struct dirent {
+    /* Always zero */
+    long d_ino;
+
+    /* File position within stream */
+    long d_off;
+
+    /* Structure size */
+    unsigned short d_reclen;
+
+    /* Length of name without \0 */
+    size_t d_namlen;
+
+    /* File type */
+    int d_type;
+
+    /* File name */
+    char d_name[PATH_MAX+1];
+};
+typedef struct dirent dirent;
+
+struct DIR {
+    struct dirent ent;
+    struct _WDIR *wdirp;
+};
+typedef struct DIR DIR;
+
+
+/* Dirent functions */
+static DIR *opendir (const char *dirname);
+static _WDIR *_wopendir (const wchar_t *dirname);
+
+static struct dirent *readdir (DIR *dirp);
+
+static int readdir_r(
+    DIR *dirp, struct dirent *entry, struct dirent **result);
+
+static int closedir (DIR *dirp);
+static int _wclosedir (_WDIR *dirp);
+
+/* For compatibility with Symbian */
+#define wdirent _wdirent
+#define WDIR _WDIR
+#define wopendir _wopendir
+#define wreaddir _wreaddir
+#define wclosedir _wclosedir
+#define wrewinddir _wrewinddir
+
+
+/* Internal utility functions */
+static WIN32_FIND_DATAW *dirent_first (_WDIR *dirp);
+static WIN32_FIND_DATAW *dirent_next (_WDIR *dirp);
+
+static int dirent_mbstowcs_s(
+    size_t *pReturnValue,
+    wchar_t *wcstr,
+    size_t sizeInWords,
+    const char *mbstr,
+    size_t count);
+
+static int dirent_wcstombs_s(
+    size_t *pReturnValue,
+    char *mbstr,
+    size_t sizeInBytes,
+    const wchar_t *wcstr,
+    size_t count);
+
+static void dirent_set_errno (int error);
+
+
+/*
+ * Open directory stream DIRNAME for read and return a pointer to the
+ * internal working area that is used to retrieve individual directory
+ * entries.
+ */
+static _WDIR*
+_wopendir(
+    const wchar_t *dirname)
+{
+    _WDIR *dirp = NULL;
+    int error;
+
+    /* Must have directory name */
+    if (dirname == NULL  ||  dirname[0] == '\0') {
+        dirent_set_errno (ENOENT);
+        return NULL;
+    }
+
+    /* Allocate new _WDIR structure */
+    dirp = (_WDIR*) malloc (sizeof (struct _WDIR));
+    if (dirp != NULL) {
+        DWORD n;
+
+        /* Reset _WDIR structure */
+        dirp->handle = INVALID_HANDLE_VALUE;
+        dirp->patt = NULL;
+        dirp->cached = 0;
+
+        /* Compute the length of full path plus zero terminator
+         *
+         * Note that on WinRT there's no way to convert relative paths
+         * into absolute paths, so just assume it is an absolute path.
+         */
+#       if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP)
+            n = wcslen(dirname);
+#       else
+            n = GetFullPathNameW (dirname, 0, NULL, NULL);
+#       endif
+
+        /* Allocate room for absolute directory name and search pattern */
+        dirp->patt = (wchar_t*) malloc (sizeof (wchar_t) * n + 16);
+        if (dirp->patt) {
+
+            /*
+             * Convert relative directory name to an absolute one.  This
+             * allows rewinddir() to function correctly even when current
+             * working directory is changed between opendir() and rewinddir().
+             *
+             * Note that on WinRT there's no way to convert relative paths
+             * into absolute paths, so just assume it is an absolute path.
+             */
+#           if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP)
+                wcsncpy_s(dirp->patt, n+1, dirname, n);
+#           else
+                n = GetFullPathNameW (dirname, n, dirp->patt, NULL);
+#           endif
+            if (n > 0) {
+                wchar_t *p;
+
+                /* Append search pattern \* to the directory name */
+                p = dirp->patt + n;
+                if (dirp->patt < p) {
+                    switch (p[-1]) {
+                    case '\\':
+                    case '/':
+                    case ':':
+                        /* Directory ends in path separator, e.g. c:\temp\ */
+                        /*NOP*/;
+                        break;
+
+                    default:
+                        /* Directory name doesn't end in path separator */
+                        *p++ = '\\';
+                    }
+                }
+                *p++ = '*';
+                *p = '\0';
+
+                /* Open directory stream and retrieve the first entry */
+                if (dirent_first (dirp)) {
+                    /* Directory stream opened successfully */
+                    error = 0;
+                } else {
+                    /* Cannot retrieve first entry */
+                    error = 1;
+                    dirent_set_errno (ENOENT);
+                }
+
+            } else {
+                /* Cannot retrieve full path name */
+                dirent_set_errno (ENOENT);
+                error = 1;
+            }
+
+        } else {
+            /* Cannot allocate memory for search pattern */
+            error = 1;
+        }
+
+    } else {
+        /* Cannot allocate _WDIR structure */
+        error = 1;
+    }
+
+    /* Clean up in case of error */
+    if (error  &&  dirp) {
+        _wclosedir (dirp);
+        dirp = NULL;
+    }
+
+    return dirp;
+}
+
+/*
+ * Close directory stream opened by opendir() function.  This invalidates the
+ * DIR structure as well as any directory entry read previously by
+ * _wreaddir().
+ */
+static int
+_wclosedir(
+    _WDIR *dirp)
+{
+    int ok;
+    if (dirp) {
+
+        /* Release search handle */
+        if (dirp->handle != INVALID_HANDLE_VALUE) {
+            FindClose (dirp->handle);
+            dirp->handle = INVALID_HANDLE_VALUE;
+        }
+
+        /* Release search pattern */
+        if (dirp->patt) {
+            free (dirp->patt);
+            dirp->patt = NULL;
+        }
+
+        /* Release directory structure */
+        free (dirp);
+        ok = /*success*/0;
+
+    } else {
+
+        /* Invalid directory stream */
+        dirent_set_errno (EBADF);
+        ok = /*failure*/-1;
+
+    }
+    return ok;
+}
+
+/* Get first directory entry (internal) */
+static WIN32_FIND_DATAW*
+dirent_first(
+    _WDIR *dirp)
+{
+    WIN32_FIND_DATAW *datap;
+
+    /* Open directory and retrieve the first entry */
+    dirp->handle = FindFirstFileExW(
+        dirp->patt, FindExInfoStandard, &dirp->data,
+        FindExSearchNameMatch, NULL, 0);
+    if (dirp->handle != INVALID_HANDLE_VALUE) {
+
+        /* a directory entry is now waiting in memory */
+        datap = &dirp->data;
+        dirp->cached = 1;
+
+    } else {
+
+        /* Failed to re-open directory: no directory entry in memory */
+        dirp->cached = 0;
+        datap = NULL;
+
+    }
+    return datap;
+}
+
+/*
+ * Get next directory entry (internal).
+ *
+ * Returns 
+ */
+static WIN32_FIND_DATAW*
+dirent_next(
+    _WDIR *dirp)
+{
+    WIN32_FIND_DATAW *p;
+
+    /* Get next directory entry */
+    if (dirp->cached != 0) {
+
+        /* A valid directory entry already in memory */
+        p = &dirp->data;
+        dirp->cached = 0;
+
+    } else if (dirp->handle != INVALID_HANDLE_VALUE) {
+
+        /* Get the next directory entry from stream */
+        if (FindNextFileW (dirp->handle, &dirp->data) != FALSE) {
+            /* Got a file */
+            p = &dirp->data;
+        } else {
+            /* The very last entry has been processed or an error occurred */
+            FindClose (dirp->handle);
+            dirp->handle = INVALID_HANDLE_VALUE;
+            p = NULL;
+        }
+
+    } else {
+
+        /* End of directory stream reached */
+        p = NULL;
+
+    }
+
+    return p;
+}
+
+/*
+ * Open directory stream using plain old C-string.
+ */
+static DIR*
+opendir(
+    const char *dirname) 
+{
+    struct DIR *dirp;
+    int error;
+
+    /* Must have directory name */
+    if (dirname == NULL  ||  dirname[0] == '\0') {
+        dirent_set_errno (ENOENT);
+        return NULL;
+    }
+
+    /* Allocate memory for DIR structure */
+    dirp = (DIR*) malloc (sizeof (struct DIR));
+    if (dirp) {
+        wchar_t wname[PATH_MAX + 1];
+        size_t n;
+
+        /* Convert directory name to wide-character string */
+        error = dirent_mbstowcs_s(
+            &n, wname, PATH_MAX + 1, dirname, PATH_MAX + 1);
+        if (!error) {
+
+            /* Open directory stream using wide-character name */
+            dirp->wdirp = _wopendir (wname);
+            if (dirp->wdirp) {
+                /* Directory stream opened */
+                error = 0;
+            } else {
+                /* Failed to open directory stream */
+                error = 1;
+            }
+
+        } else {
+            /*
+             * Cannot convert file name to wide-character string.  This
+             * occurs if the string contains invalid multi-byte sequences or
+             * the output buffer is too small to contain the resulting
+             * string.
+             */
+            error = 1;
+        }
+
+    } else {
+        /* Cannot allocate DIR structure */
+        error = 1;
+    }
+
+    /* Clean up in case of error */
+    if (error  &&  dirp) {
+        free (dirp);
+        dirp = NULL;
+    }
+
+    return dirp;
+}
+
+/*
+ * Read next directory entry.
+ */
+static struct dirent*
+readdir(
+    DIR *dirp)
+{
+    struct dirent *entry;
+
+    /*
+     * Read directory entry to buffer.  We can safely ignore the return value
+     * as entry will be set to NULL in case of error.
+     */
+    (void) readdir_r (dirp, &dirp->ent, &entry);
+
+    /* Return pointer to statically allocated directory entry */
+    return entry;
+}
+
+/*
+ * Read next directory entry into called-allocated buffer.
+ *
+ * Returns zero on success.  If the end of directory stream is reached, then
+ * sets result to NULL and returns zero.
+ */
+static int
+readdir_r(
+    DIR *dirp,
+    struct dirent *entry,
+    struct dirent **result)
+{
+    WIN32_FIND_DATAW *datap;
+
+    /* Read next directory entry */
+    datap = dirent_next (dirp->wdirp);
+    if (datap) {
+        size_t n;
+        int error;
+
+        /* Attempt to convert file name to multi-byte string */
+        error = dirent_wcstombs_s(
+            &n, entry->d_name, PATH_MAX + 1, datap->cFileName, PATH_MAX + 1);
+
+        /*
+         * If the file name cannot be represented by a multi-byte string,
+         * then attempt to use old 8+3 file name.  This allows traditional
+         * Unix-code to access some file names despite of unicode
+         * characters, although file names may seem unfamiliar to the user.
+         *
+         * Be ware that the code below cannot come up with a short file
+         * name unless the file system provides one.  At least
+         * VirtualBox shared folders fail to do this.
+         */
+        if (error  &&  datap->cAlternateFileName[0] != '\0') {
+            error = dirent_wcstombs_s(
+                &n, entry->d_name, PATH_MAX + 1,
+                datap->cAlternateFileName, PATH_MAX + 1);
+        }
+
+        if (!error) {
+            DWORD attr;
+
+            /* Length of file name excluding zero terminator */
+            entry->d_namlen = n - 1;
+
+            /* File attributes */
+            attr = datap->dwFileAttributes;
+            if ((attr & FILE_ATTRIBUTE_DEVICE) != 0) {
+                entry->d_type = DT_CHR;
+            } else if ((attr & FILE_ATTRIBUTE_DIRECTORY) != 0) {
+                entry->d_type = DT_DIR;
+            } else {
+                entry->d_type = DT_REG;
+            }
+
+            /* Reset dummy fields */
+            entry->d_ino = 0;
+            entry->d_off = 0;
+            entry->d_reclen = sizeof (struct dirent);
+
+        } else {
+
+            /*
+             * Cannot convert file name to multi-byte string so construct
+             * an erroneous directory entry and return that.  Note that
+             * we cannot return NULL as that would stop the processing
+             * of directory entries completely.
+             */
+            entry->d_name[0] = '?';
+            entry->d_name[1] = '\0';
+            entry->d_namlen = 1;
+            entry->d_type = DT_UNKNOWN;
+            entry->d_ino = 0;
+            entry->d_off = -1;
+            entry->d_reclen = 0;
+
+        }
+
+        /* Return pointer to directory entry */
+        *result = entry;
+
+    } else {
+
+        /* No more directory entries */
+        *result = NULL;
+
+    }
+
+    return /*OK*/0;
+}
+
+/*
+ * Close directory stream.
+ */
+static int
+closedir(
+    DIR *dirp)
+{
+    int ok;
+    if (dirp) {
+
+        /* Close wide-character directory stream */
+        ok = _wclosedir (dirp->wdirp);
+        dirp->wdirp = NULL;
+
+        /* Release multi-byte character version */
+        free (dirp);
+
+    } else {
+
+        /* Invalid directory stream */
+        dirent_set_errno (EBADF);
+        ok = /*failure*/-1;
+
+    }
+    return ok;
+}
+
+/* Convert multi-byte string to wide character string */
+static int
+dirent_mbstowcs_s(
+    size_t *pReturnValue,
+    wchar_t *wcstr,
+    size_t sizeInWords,
+    const char *mbstr,
+    size_t count)
+{
+    int error;
+
+#if defined(_MSC_VER)  &&  _MSC_VER >= 1400
+
+    /* Microsoft Visual Studio 2005 or later */
+    error = mbstowcs_s (pReturnValue, wcstr, sizeInWords, mbstr, count);
+
+#else
+
+    /* Older Visual Studio or non-Microsoft compiler */
+    size_t n;
+
+    /* Convert to wide-character string (or count characters) */
+    n = mbstowcs (wcstr, mbstr, sizeInWords);
+    if (!wcstr  ||  n < count) {
+
+        /* Zero-terminate output buffer */
+        if (wcstr  &&  sizeInWords) {
+            if (n >= sizeInWords) {
+                n = sizeInWords - 1;
+            }
+            wcstr[n] = 0;
+        }
+
+        /* Length of resulting multi-byte string WITH zero terminator */
+        if (pReturnValue) {
+            *pReturnValue = n + 1;
+        }
+
+        /* Success */
+        error = 0;
+
+    } else {
+
+        /* Could not convert string */
+        error = 1;
+
+    }
+
+#endif
+
+    return error;
+}
+
+/* Convert wide-character string to multi-byte string */
+static int
+dirent_wcstombs_s(
+    size_t *pReturnValue,
+    char *mbstr,
+    size_t sizeInBytes, /* max size of mbstr */
+    const wchar_t *wcstr,
+    size_t count)
+{
+    int error;
+
+#if defined(_MSC_VER)  &&  _MSC_VER >= 1400
+
+    /* Microsoft Visual Studio 2005 or later */
+    error = wcstombs_s (pReturnValue, mbstr, sizeInBytes, wcstr, count);
+
+#else
+
+    /* Older Visual Studio or non-Microsoft compiler */
+    size_t n;
+
+    /* Convert to multi-byte string (or count the number of bytes needed) */
+    n = wcstombs (mbstr, wcstr, sizeInBytes);
+    if (!mbstr  ||  n < count) {
+
+        /* Zero-terminate output buffer */
+        if (mbstr  &&  sizeInBytes) {
+            if (n >= sizeInBytes) {
+                n = sizeInBytes - 1;
+            }
+            mbstr[n] = '\0';
+        }
+
+        /* Length of resulting multi-bytes string WITH zero-terminator */
+        if (pReturnValue) {
+            *pReturnValue = n + 1;
+        }
+
+        /* Success */
+        error = 0;
+
+    } else {
+
+        /* Cannot convert string */
+        error = 1;
+
+    }
+
+#endif
+
+    return error;
+}
+
+/* Set errno variable */
+static void
+dirent_set_errno(
+    int error)
+{
+#if defined(_MSC_VER)  &&  _MSC_VER >= 1400
+
+    /* Microsoft Visual Studio 2005 and later */
+    _set_errno (error);
+
+#else
+
+    /* Non-Microsoft compiler or older Microsoft compiler */
+    errno = error;
+
+#endif
+}
+
+
+#ifdef __cplusplus
+}
+#endif
+#endif /*DIRENT_H*/
+

contrib/win32/err.h

@@ -4,15 +4,15 @@
 #include <stdlib.h>
 
 #define warnx(...) do { \
-	fprintf (stderr, __VA_ARGS__); \
+    fprintf (stderr, __VA_ARGS__); \
-	fprintf (stderr, "\n"); \
+    fprintf (stderr, "\n"); \
-} while (0)
+  } while (0)
 
 #define errx(code, ...) do { \
-	fprintf (stderr, __VA_ARGS__); \
+    fprintf (stderr, __VA_ARGS__); \
-	fprintf (stderr, "\n"); \
+    fprintf (stderr, "\n"); \
-	exit (code); \
+    exit (code); \
-} while (0)
+  } while (0)
 
 #define err errx
 

contrib/win32/getopt.c

@@ -0,0 +1,106 @@
+#include "getopt.h" // make sure you construct the header file as dictated above
+
+/*
+* Copyright (c) 1987, 1993, 1994
+*      The Regents of the University of California.  All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
+* 1. Redistributions of source code must retain the above copyright
+*    notice, this list of conditions and the following disclaimer.
+* 2. Redistributions in binary form must reproduce the above copyright
+*    notice, this list of conditions and the following disclaimer in the
+*    documentation and/or other materials provided with the distribution.
+* 3. All advertising materials mentioning features or use of this software
+*    must display the following acknowledgement:
+*      This product includes software developed by the University of
+*      California, Berkeley and its contributors.
+* 4. Neither the name of the University nor the names of its contributors
+*    may be used to endorse or promote products derived from this software
+*    without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+* ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+* SUCH DAMAGE.
+*/
+
+#include <string.h>
+#include <stdio.h>
+
+int     opterr = 1,             /* if error message should be printed */
+        optind = 1,             /* index into parent argv vector */
+        optopt,                 /* character checked for validity */
+        optreset;               /* reset getopt */
+char    *optarg;                /* argument associated with option */
+
+#define BADCH   (int)'?'
+#define BADARG  (int)':'
+#define EMSG    ""
+
+/*
+ * getopt --
+ *      Parse argc/argv argument vector.
+ */
+int getopt(int nargc, char * const nargv[], const char *ostr)
+{
+  static char *place = EMSG;              /* option letter processing */
+  const char *oli;                              /* option letter list index */
+
+  if (optreset || !*place) {              /* update scanning pointer */
+    optreset = 0;
+    if (optind >= nargc || *(place = nargv[optind]) != '-') {
+      place = EMSG;
+      return (-1);
+    }
+    if (place[1] && *++place == '-') {      /* found "--" */
+      ++optind;
+      place = EMSG;
+      return (-1);
+    }
+  }                                       /* option letter okay? */
+  if ((optopt = (int)*place++) == (int)':' ||
+    !(oli = strchr(ostr, optopt))) {
+      /*
+      * if the user didn't specify '-' as an option,
+      * assume it means -1.
+      */
+      if (optopt == (int)'-')
+        return (-1);
+      if (!*place)
+        ++optind;
+      if (opterr && *ostr != ':')
+        (void)printf("illegal option -- %c\n", optopt);
+      return (BADCH);
+  }
+  if (*++oli != ':') {                    /* don't need argument */
+    optarg = NULL;
+    if (!*place)
+      ++optind;
+  }
+  else {                                  /* need an argument */
+    if (*place)                     /* no white space */
+      optarg = place;
+    else if (nargc <= ++optind) {   /* no arg */
+      place = EMSG;
+      if (*ostr == ':')
+        return (BADARG);
+      if (opterr)
+        (void)printf("option requires an argument -- %c\n", optopt);
+      return (BADCH);
+    }
+    else                            /* white space */
+      optarg = nargv[optind];
+    place = EMSG;
+    ++optind;
+  }
+  return (optopt);                        /* dump back option letter */
+}

contrib/win32/getopt.h

@@ -0,0 +1,13 @@
+#ifndef GETOPT_H
+
+#define GETOPT_H
+
+extern int opterr;		/* if error message should be printed */
+extern int optind;		/* index into parent argv vector */
+extern int optopt;		/* character checked for validity */
+extern int optreset;  	/* reset getopt  */
+extern char *optarg;	/* argument associated with option */
+
+int getopt(int nargc, char * const nargv[], const char *ostr);
+
+#endif

contrib/win32/libnfc/Makefile.am

@@ -0,0 +1,4 @@
+SUBDIRS = buses .
+
+EXTRA_DIST = \
+	log-internal.c

contrib/win32/libnfc/buses/Makefile.am

@@ -0,0 +1,2 @@
+EXTRA_DIST = \
+	uart.c

contrib/win32/libnfc/buses/uart.c

@@ -0,0 +1,284 @@
+/*-
+ * Free/Libre Near Field Communication (NFC) library
+ *
+ * Libnfc historical contributors:
+ * Copyright (C) 2009      Roel Verdult
+ * Copyright (C) 2009-2013 Romuald Conty
+ * Copyright (C) 2010-2012 Romain Tartière
+ * Copyright (C) 2010-2013 Philippe Teuwen
+ * Copyright (C) 2012-2013 Ludovic Rousseau
+ * See AUTHORS file for a more comprehensive list of contributors.
+ * Additional contributors of this file:
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+/**
+ * @file uart.c
+ * @brief Windows UART driver
+ */
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif // HAVE_CONFIG_H
+
+#include "uart.h"
+
+#include <nfc/nfc.h>
+#include "nfc-internal.h"
+
+#include <inttypes.h>
+#include "log.h"
+
+#define LOG_GROUP    NFC_LOG_GROUP_COM
+#define LOG_CATEGORY "libnfc.bus.uart_win32"
+
+// Handle platform specific includes
+#include "contrib/windows.h"
+#define delay_ms( X ) Sleep( X )
+
+struct serial_port_windows {
+  HANDLE  hPort;                // Serial port handle
+  DCB     dcb;                  // Device control settings
+  COMMTIMEOUTS ct;              // Serial port time-out configuration
+};
+
+serial_port
+uart_open(const char *pcPortName)
+{
+  char    acPortName[255];
+  struct serial_port_windows *sp = malloc(sizeof(struct serial_port_windows));
+
+  if (sp == 0)
+    return INVALID_SERIAL_PORT;
+
+  // Copy the input "com?" to "\\.\COM?" format
+  sprintf(acPortName, "\\\\.\\%s", pcPortName);
+  _strupr(acPortName);
+
+  // Try to open the serial port
+  sp->hPort = CreateFileA(acPortName, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL);
+  if (sp->hPort == INVALID_HANDLE_VALUE) {
+    uart_close(sp);
+    return INVALID_SERIAL_PORT;
+  }
+  // Prepare the device control
+  memset(&sp->dcb, 0, sizeof(DCB));
+  sp->dcb.DCBlength = sizeof(DCB);
+  if (!BuildCommDCBA("baud=9600 data=8 parity=N stop=1", &sp->dcb)) {
+    uart_close(sp);
+    return INVALID_SERIAL_PORT;
+  }
+  // Update the active serial port
+  if (!SetCommState(sp->hPort, &sp->dcb)) {
+    uart_close(sp);
+    return INVALID_SERIAL_PORT;
+  }
+
+  sp->ct.ReadIntervalTimeout = 30;
+  sp->ct.ReadTotalTimeoutMultiplier = 0;
+  sp->ct.ReadTotalTimeoutConstant = 30;
+  sp->ct.WriteTotalTimeoutMultiplier = 30;
+  sp->ct.WriteTotalTimeoutConstant = 0;
+
+  if (!SetCommTimeouts(sp->hPort, &sp->ct)) {
+    uart_close(sp);
+    return INVALID_SERIAL_PORT;
+  }
+
+  PurgeComm(sp->hPort, PURGE_RXABORT | PURGE_RXCLEAR);
+
+  return sp;
+}
+
+void
+uart_close(const serial_port sp)
+{
+  if (((struct serial_port_windows *) sp)->hPort != INVALID_HANDLE_VALUE) {
+    CloseHandle(((struct serial_port_windows *) sp)->hPort);
+  }
+  free(sp);
+}
+
+void
+uart_flush_input(const serial_port sp, bool wait)
+{
+  PurgeComm(((struct serial_port_windows *) sp)->hPort, PURGE_RXABORT | PURGE_RXCLEAR);
+}
+
+void
+uart_set_speed(serial_port sp, const uint32_t uiPortSpeed)
+{
+  struct serial_port_windows *spw;
+
+  log_put(LOG_GROUP, LOG_CATEGORY, NFC_LOG_PRIORITY_DEBUG, "Serial port speed requested to be set to %d baud.", uiPortSpeed);
+  // Set port speed (Input and Output)
+  switch (uiPortSpeed) {
+    case 9600:
+    case 19200:
+    case 38400:
+    case 57600:
+    case 115200:
+    case 230400:
+    case 460800:
+      break;
+    default:
+      log_put(LOG_GROUP, LOG_CATEGORY, NFC_LOG_PRIORITY_ERROR, "Unable to set serial port speed to %d baud. Speed value must be one of these constants: 9600 (default), 19200, 38400, 57600, 115200, 230400 or 460800.", uiPortSpeed);
+      return;
+  };
+  spw = (struct serial_port_windows *) sp;
+
+  // Set baud rate
+  spw->dcb.BaudRate = uiPortSpeed;
+  if (!SetCommState(spw->hPort, &spw->dcb)) {
+    log_put(LOG_GROUP, LOG_CATEGORY, NFC_LOG_PRIORITY_ERROR, "%s", "Unable to apply new speed settings.");
+    return;
+  }
+  PurgeComm(spw->hPort, PURGE_RXABORT | PURGE_RXCLEAR);
+}
+
+uint32_t
+uart_get_speed(const serial_port sp)
+{
+  const struct serial_port_windows *spw = (struct serial_port_windows *) sp;
+  if (!GetCommState(spw->hPort, (serial_port) & spw->dcb))
+    return spw->dcb.BaudRate;
+
+  return 0;
+}
+
+int
+uart_receive(serial_port sp, uint8_t *pbtRx, const size_t szRx, void *abort_p, int timeout)
+{
+  DWORD dwBytesToGet = (DWORD)szRx;
+  DWORD dwBytesReceived = 0;
+  DWORD dwTotalBytesReceived = 0;
+  BOOL res;
+
+  // XXX Put this part into uart_win32_timeouts () ?
+  DWORD timeout_ms = timeout;
+  COMMTIMEOUTS timeouts;
+  timeouts.ReadIntervalTimeout = 0;
+  timeouts.ReadTotalTimeoutMultiplier = 0;
+  timeouts.ReadTotalTimeoutConstant = timeout_ms;
+  timeouts.WriteTotalTimeoutMultiplier = 0;
+  timeouts.WriteTotalTimeoutConstant = timeout_ms;
+
+  if (!SetCommTimeouts(((struct serial_port_windows *) sp)->hPort, &timeouts)) {
+    log_put(LOG_GROUP, LOG_CATEGORY, NFC_LOG_PRIORITY_ERROR, "Unable to apply new timeout settings.");
+    return NFC_EIO;
+  }
+  log_put(LOG_GROUP, LOG_CATEGORY, NFC_LOG_PRIORITY_DEBUG, "Timeouts are set to %lu ms", timeout_ms);
+
+  // TODO Enhance the reception method
+  // - According to MSDN, it could be better to implement nfc_abort_command() mechanism using Cancello()
+  volatile bool *abort_flag_p = (volatile bool *)abort_p;
+  do {
+    log_put(LOG_GROUP, LOG_CATEGORY, NFC_LOG_PRIORITY_DEBUG, "ReadFile");
+    res = ReadFile(((struct serial_port_windows *) sp)->hPort, pbtRx + dwTotalBytesReceived,
+                   dwBytesToGet,
+                   &dwBytesReceived, NULL);
+
+    dwTotalBytesReceived += dwBytesReceived;
+
+    if (!res) {
+      DWORD err = GetLastError();
+      log_put(LOG_GROUP, LOG_CATEGORY, NFC_LOG_PRIORITY_ERROR, "ReadFile error: %lu", err);
+      return NFC_EIO;
+    } else if (dwBytesReceived == 0) {
+      return NFC_ETIMEOUT;
+    }
+
+    if (((DWORD)szRx) > dwTotalBytesReceived) {
+      dwBytesToGet -= dwBytesReceived;
+    }
+
+    if (abort_flag_p != NULL && (*abort_flag_p) && dwTotalBytesReceived == 0) {
+      return NFC_EOPABORTED;
+    }
+  } while (((DWORD)szRx) > dwTotalBytesReceived);
+  LOG_HEX(LOG_GROUP, "RX", pbtRx, szRx);
+
+  return (dwTotalBytesReceived == (DWORD) szRx) ? 0 : NFC_EIO;
+}
+
+int
+uart_send(serial_port sp, const uint8_t *pbtTx, const size_t szTx, int timeout)
+{
+  DWORD   dwTxLen = 0;
+
+  COMMTIMEOUTS timeouts;
+  timeouts.ReadIntervalTimeout = 0;
+  timeouts.ReadTotalTimeoutMultiplier = 0;
+  timeouts.ReadTotalTimeoutConstant = timeout;
+  timeouts.WriteTotalTimeoutMultiplier = 0;
+  timeouts.WriteTotalTimeoutConstant = timeout;
+
+  if (!SetCommTimeouts(((struct serial_port_windows *) sp)->hPort, &timeouts)) {
+    log_put(LOG_GROUP, LOG_CATEGORY, NFC_LOG_PRIORITY_ERROR, "Unable to apply new timeout settings.");
+    return NFC_EIO;
+  }
+
+  LOG_HEX(LOG_GROUP, "TX", pbtTx, szTx);
+  if (!WriteFile(((struct serial_port_windows *) sp)->hPort, pbtTx, szTx, &dwTxLen, NULL)) {
+    return NFC_EIO;
+  }
+  if (!dwTxLen)
+    return NFC_EIO;
+  return 0;
+}
+
+BOOL is_port_available(int nPort)
+{
+  TCHAR szPort[15];
+  COMMCONFIG cc;
+  DWORD dwCCSize;
+
+  sprintf(szPort, "COM%d", nPort);
+
+  // Check if this port is available
+  dwCCSize = sizeof(cc);
+  return GetDefaultCommConfig(szPort, &cc, &dwCCSize);
+}
+
+// Path to the serial port is OS-dependant.
+// Try to guess what we should use.
+#define MAX_SERIAL_PORT_WIN 255
+char **
+uart_list_ports(void)
+{
+  char **availablePorts = malloc((1 + MAX_SERIAL_PORT_WIN) * sizeof(char *));
+  if (!availablePorts) {
+    perror("malloc");
+    return availablePorts;
+  }
+  int curIndex = 0;
+  int i;
+  for (i = 1; i <= MAX_SERIAL_PORT_WIN; i++) {
+    if (is_port_available(i)) {
+      availablePorts[curIndex] = (char *)malloc(10);
+      if (!availablePorts[curIndex]) {
+        perror("malloc");
+        break;
+      }
+      sprintf(availablePorts[curIndex], "COM%d", i);
+      // printf("found candidate port: %s\n", availablePorts[curIndex]);
+      curIndex++;
+    }
+  }
+  availablePorts[curIndex] = NULL;
+
+  return availablePorts;
+}

contrib/win32/libnfc/log-internal.c

@@ -0,0 +1,61 @@
+/*-
+ * Free/Libre Near Field Communication (NFC) library
+ *
+ * Libnfc historical contributors:
+ * Copyright (C) 2009      Roel Verdult
+ * Copyright (C) 2009-2013 Romuald Conty
+ * Copyright (C) 2010-2012 Romain Tartière
+ * Copyright (C) 2010-2013 Philippe Teuwen
+ * Copyright (C) 2012-2013 Ludovic Rousseau
+ * See AUTHORS file for a more comprehensive list of contributors.
+ * Additional contributors of this file:
+ * Copyright (C) 2013      Alex Lian
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+#include "log-internal.h"
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <strsafe.h>
+
+static void
+log_output_debug(const char *format, va_list args)
+{
+  char buffer[1024];
+  HRESULT hr = StringCbVPrintf(buffer, sizeof(buffer), format, args);
+  // Spew what we got, even if the buffer is not sized large enough
+  if ((STRSAFE_E_INSUFFICIENT_BUFFER == hr) || (S_OK == hr))
+    OutputDebugString(buffer);
+}
+
+void
+log_vput_internal(const char *format, va_list args)
+{
+  vfprintf(stderr, format, args);
+  // Additional windows output to the debug window for debugging purposes
+  log_output_debug(format, args);
+}
+
+void
+log_put_internal(const char *format, ...)
+{
+  va_list va;
+  va_start(va, format);
+  vfprintf(stderr, format, va);
+  // Additional windows output to the debug window for debugging purposes
+  log_output_debug(format, va);
+  va_end(va);
+}

contrib/win32/nfc.def

@@ -0,0 +1,57 @@
+LIBRARY libnfc
+VERSION 1.7
+
+EXPORTS
+  nfc_init
+  nfc_exit
+  nfc_register_driver
+  nfc_open
+  nfc_close
+  nfc_abort_command
+  nfc_list_devices
+  nfc_idle
+  nfc_initiator_init
+  nfc_initiator_init_secure_element
+  nfc_initiator_select_passive_target
+  nfc_initiator_list_passive_targets
+  nfc_initiator_poll_target
+  nfc_initiator_select_dep_target
+  nfc_initiator_poll_dep_target
+  nfc_initiator_deselect_target
+  nfc_initiator_transceive_bytes
+  nfc_initiator_transceive_bits
+  nfc_initiator_transceive_bytes_timed
+  nfc_initiator_transceive_bits_timed
+  nfc_initiator_target_is_present
+  nfc_target_init
+  nfc_target_send_bytes
+  nfc_target_receive_bytes
+  nfc_target_send_bits
+  nfc_target_receive_bits
+  nfc_strerror
+  nfc_strerror_r
+  nfc_perror
+  nfc_device_get_last_error
+  nfc_device_get_name
+  nfc_device_get_connstring
+  nfc_device_get_supported_modulation
+  nfc_device_get_supported_baud_rate
+  nfc_device_get_supported_baud_rate_target_mode
+  nfc_device_set_property_int
+  nfc_device_set_property_bool
+  nfc_emulate_target
+  iso14443a_crc
+  iso14443a_crc_append
+  iso14443b_crc
+  iso14443b_crc_append
+  iso14443a_locate_historical_bytes
+  nfc_free
+  nfc_version
+  nfc_device_get_information_about
+  str_nfc_modulation_type
+  str_nfc_baud_rate
+  str_nfc_target
+  pn53x_transceive
+  pn532_SAMConfiguration
+  pn53x_read_register
+  pn53x_write_register

contrib/win32/nfc_msvc.def

@@ -0,0 +1,57 @@
+LIBRARY nfc
+VERSION 1.7
+
+EXPORTS
+  nfc_init
+  nfc_exit
+  nfc_register_driver
+  nfc_open
+  nfc_close
+  nfc_abort_command
+  nfc_list_devices
+  nfc_idle
+  nfc_initiator_init
+  nfc_initiator_init_secure_element
+  nfc_initiator_select_passive_target
+  nfc_initiator_list_passive_targets
+  nfc_initiator_poll_target
+  nfc_initiator_select_dep_target
+  nfc_initiator_poll_dep_target
+  nfc_initiator_deselect_target
+  nfc_initiator_transceive_bytes
+  nfc_initiator_transceive_bits
+  nfc_initiator_transceive_bytes_timed
+  nfc_initiator_transceive_bits_timed
+  nfc_initiator_target_is_present
+  nfc_target_init
+  nfc_target_send_bytes
+  nfc_target_receive_bytes
+  nfc_target_send_bits
+  nfc_target_receive_bits
+  nfc_strerror
+  nfc_strerror_r
+  nfc_perror
+  nfc_device_get_last_error
+  nfc_device_get_name
+  nfc_device_get_connstring
+  nfc_device_get_supported_modulation
+  nfc_device_get_supported_baud_rate
+  nfc_device_get_supported_baud_rate_target_mode
+  nfc_device_set_property_int
+  nfc_device_set_property_bool
+  nfc_emulate_target
+  iso14443a_crc
+  iso14443a_crc_append
+  iso14443b_crc
+  iso14443b_crc_append
+  iso14443a_locate_historical_bytes
+  nfc_free
+  nfc_version
+  nfc_device_get_information_about
+  str_nfc_modulation_type
+  str_nfc_baud_rate
+  str_nfc_target
+  pn53x_transceive
+  pn532_SAMConfiguration
+  pn53x_read_register
+  pn53x_write_register

contrib/win32/stdlib.c

@@ -0,0 +1,57 @@
+/*-
+ * Free/Libre Near Field Communication (NFC) library
+ *
+ * Libnfc historical contributors:
+ * Copyright (C) 2009      Roel Verdult
+ * Copyright (C) 2009-2013 Romuald Conty
+ * Copyright (C) 2010-2012 Romain Tartière
+ * Copyright (C) 2010-2013 Philippe Teuwen
+ * Copyright (C) 2012-2013 Ludovic Rousseau
+ * See AUTHORS file for a more comprehensive list of contributors.
+ * Additional contributors of this file:
+ * Copyright (C) 2013      Alex Lian
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+/**
+ * @file stdlib.c
+ * @brief Windows System compatibility
+ */
+
+// Handle platform specific includes
+#include "contrib/windows.h"
+
+//There is no setenv()and unsetenv() in windows,but we can use putenv() instead.
+int setenv(const char *name, const char *value, int overwrite)
+{
+  char *env = getenv(name);
+  if ((env && overwrite) || (!env)) {
+    char *str[32];
+    strcpy(str, name);
+    strcat(str, "=");
+    strcat(str, value);
+    return putenv(str);
+  }
+  return -1;
+}
+
+void unsetenv(const char *name)
+{
+  char *str[32];
+  strcpy(str, name);
+  strcat(str, "=");
+  putenv(str);
+}

contrib/win32/sys/select.h

@@ -1,7 +1,12 @@
 /*-
- * Public platform independent Near Field Communication (NFC) library
+ * Free/Libre Near Field Communication (NFC) library
  *
- * Copyright (C) 2011, Romuald Conty
+ * Libnfc historical contributors:
+ * Copyright (C) 2009      Roel Verdult
+ * Copyright (C) 2009-2013 Romuald Conty
+ * Copyright (C) 2010-2012 Romain Tartière
+ * Copyright (C) 2010-2013 Philippe Teuwen
+ * Copyright (C) 2012-2013 Ludovic Rousseau
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published by the

contrib/win32/unistd.h

@@ -1,7 +1,14 @@
 /*-
- * Public platform independent Near Field Communication (NFC) library
+ * Free/Libre Near Field Communication (NFC) library
  *
- * Copyright (C) 2011, Romuald Conty
+ * Libnfc historical contributors:
+ * Copyright (C) 2009      Roel Verdult
+ * Copyright (C) 2009-2013 Romuald Conty
+ * Copyright (C) 2010-2012 Romain Tartière
+ * Copyright (C) 2010-2013 Philippe Teuwen
+ * Copyright (C) 2012-2013 Ludovic Rousseau
+ * See AUTHORS file for a more comprehensive list of contributors.
+ * Additional contributors of this file:
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published by the
@@ -25,9 +32,17 @@
 #ifndef _UNISTD_H_
 #define _UNISTD_H_
 
+#include "contrib/windows.h"
+
 // Needed by Sleep() under Windows
 #  include <winbase.h>
 #  define sleep(X) Sleep( X * 1000)
 
+// With MinGW, getopt(3) is provided as separate header
+#if defined(WIN32) && defined(__GNUC__) /* mingw compiler */
+#include <getopt.h>
+#endif
+
+
 #endif /* _UNISTD_H_ */
 

contrib/win32/version.rc.in

@@ -0,0 +1,29 @@
+1 VERSIONINFO
+ FILEVERSION @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_PATCH@,0
+ PRODUCTVERSION @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_PATCH@,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS 0x00040004L
+ FILETYPE @RC_FILE_TYPE@
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904e4" 
+        BEGIN
+            VALUE "Comments", "@RC_COMMENT@\0"
+            VALUE "CompanyName", "libnfc.org\0"
+            VALUE "FileDescription", "\0"
+            VALUE "FileVersion", "@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@.0\0"
+            VALUE "InternalName", "@RC_INTERNAL_NAME@ @WIN32_MODE@\0"
+            VALUE "LegalCopyright", "Copyright (C) @CURRENT_YEAR@\0"
+            VALUE "OriginalFilename", "@RC_ORIGINAL_NAME@\0"
+            VALUE "ProductName", "@PACKAGE_NAME@ @WIN32_MODE@\0"
+            VALUE "ProductVersion", "@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@.0\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x0409, 1252
+    END
+END

contrib/windows.h

@@ -1,8 +1,15 @@
 /*-
- * Public platform independent Near Field Communication (NFC) library
+ * Free/Libre Near Field Communication (NFC) library
  *
- * Copyright (C) 2010, Romuald Conty
+ * Libnfc historical contributors:
- * Copyright (C) 2011, Glenn Ergeerts
+ * Copyright (C) 2009      Roel Verdult
+ * Copyright (C) 2009-2013 Romuald Conty
+ * Copyright (C) 2010-2012 Romain Tartière
+ * Copyright (C) 2010-2013 Philippe Teuwen
+ * Copyright (C) 2012-2013 Ludovic Rousseau
+ * See AUTHORS file for a more comprehensive list of contributors.
+ * Additional contributors of this file:
+ * Copyright (C) 2011      Glenn Ergeerts
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published by the
@@ -30,16 +37,28 @@
 #  include <winerror.h>
 #  include "win32/err.h"
 #  if defined (__MINGW32__)
-#    define snprintf(S, n, F, ...) sprintf(S, F, __VA_ARGS__)
+/*
-#    define MAX(a,b) max(a,b)
+ * Cheating here on the snprintf to incorporate the format argument
-#    define MIN(a,b) min(a,b)
+ * into the VA_ARGS. Else we get MinGW errors regarding number of arguments
+ * if doing a fixed string with no arguments.
+*/
+#    define snprintf(S, n, ...) sprintf(S, __VA_ARGS__)
 #    define pipe(fds) _pipe(fds, 5000, _O_BINARY)
 #    define ETIMEDOUT     WSAETIMEDOUT
 #    define ENOTSUP       WSAEOPNOTSUPP
 #    define ECONNABORTED  WSAECONNABORTED
 #  else
+#ifndef _MSC_VER
 #    define snprintf sprintf_s
+#endif
 #    define strdup _strdup
 #  endif
 
+/*
+ * setenv and unsetenv are not Windows compliant nor implemented in MinGW.
+ * These declarations get rid of the "implicit declaration warning."
+ */
+int setenv(const char *name, const char *value, int overwrite);
+void unsetenv(const char *name);
+
 #endif

debian/changelog

@@ -1,145 +0,0 @@
-libnfc (1.5.1-0) unstable; urgency=low
-  
-  * Move nfc-emulate-nfcforum-tag2, nfc-emulate-nfcforum-tag4 and
-     nfc-relay-picc from libnfc-examples to libnfc-bin package.
-  * Add nfc-read-forum-tag3 to libnfc-bin package.
-
- -- Romuald Conty <rconty@il4p.fr>  Mon, 10 Oct 2011 02:42:42 +0100
-
-libnfc (1.5.0pre1.4-0) unstable; urgency=low
-  
-  * All drivers are now enabled under Debian;
-  * Add nfc-emulate-nfcforum-tag2 and nfc-mfsetuid to libnfc-examples.
-
- -- Romuald Conty <rconty@il4p.fr>  Tue, 13 May 2011 15:42:42 +0100
-
-libnfc (1.5.0pre1.3-0) unstable; urgency=low
-  
-  * Update debian/copyright.
-
- -- Romuald Conty <rconty@il4p.fr>  Wed, 18 May 2011 12:42:42 +0100
-
-libnfc (1.5.0pre1.2-0) unstable; urgency=low
-  
-  * Change name of lib to libnfc2 to match SONAME major version 2.
-
- -- Thomas Hood <jdthood@gmail.com>  Fri, 13 May 2011 12:00:00 +0100
-
-libnfc (1.5.0pre1.1-0) unstable; urgency=low
-  
-  * Change name of lib to libnfc1 to match SONAME major version 1.
-  * Change section and priority.
-  * Don't depend on automake which doesn't get run on build.
-    (Instead, automake-generated files are included in patches/.)
-  * Set debian/source/format contents to "3.0 (quilt)"
-  * chmod ugo+x ./configure in debian/rules.
-  * Depend on debhelper (>= 7) to match debian/compat.
-  * Make the following changes that were suggested by lintian.
-  * Depend on ${misc:Depends} since we use debhelper.
-  * Use dh_prep instead of dh_clean -k.
-
- -- Thomas Hood <jdthood@gmail.com>  Mon, 10 May 2011 12:00:00 +0100
-
-libnfc (1.5.0-0) unstable; urgency=low
-  
-  * Experimental released version (r1019).
-
- -- Romuald Conty <rconty@il4p.fr>  Mon, 29 Apr 2011 11:42:42 +0100
-
-libnfc (1.4.2-0) unstable; urgency=low
-  
-  * New upstream release.
-
- -- Romuald Conty <rconty@il4p.fr>  Tue, 21 Feb 2011 11:42:42 +0100
-
-libnfc (1.4.1-0) unstable; urgency=low
-  
-  * New upstream release.
-
- -- Romuald Conty <rconty@il4p.fr>  Tue, 1 Feb 2011 10:42:42 +0100
-
-libnfc (1.4.0-0) unstable; urgency=low
-  
-  * New upstream release.
-
- -- Romuald Conty <rconty@il4p.fr>  Tue, 26 Oct 2010 16:42:42 +0100
-
-libnfc (1.3.9-0) unstable; urgency=low
-  
-  * New upstream release.
-
- -- Romuald Conty <rconty@il4p.fr>  Tue, 31 Aug 2010 14:42:42 +0100
-
-libnfc (1.3.4-0) unstable; urgency=low
-  
-  * New upstream release.
-
- -- Romuald Conty <rconty@il4p.fr>  Wed, 31 Mar 2010 12:42:42 +0100
-
-libnfc (1.3.3-0) unstable; urgency=low
-  
-  * New upstream release.
-
- -- Romuald Conty <rconty@il4p.fr>  Thu, 17 Feb 2010 15:42:42 +0100
-
-libnfc (1.3.2-0) unstable; urgency=low
-  
-  * New upstream release.
-
- -- Romuald Conty <rconty@il4p.fr>  Fri, 29 Jan 2010 15:42:42 +0100
-
-libnfc (1.3.1-0) unstable; urgency=low
-  
-  * New upstream release.
-
- -- Romuald Conty <rconty@il4p.fr>  Mon, 25 Jan 2010 11:42:42 +0100
-
-libnfc (1.3.0-0) unstable; urgency=low
-  
-  * New upstream release.
-
- -- Romuald Conty <rconty@il4p.fr>  Thu, 14 Jan 2010 16:42:42 +0100
-
-libnfc (1.2.1-4) unstable; urgency=low
-  
-  * Add udev rules for USB PN53x.
-
- -- Romuald Conty <rconty@il4p.fr>  Fri, 20 Nov 2009 16:42:42 +0100
-
-libnfc (1.2.1-3) unstable; urgency=low
-  
-  * Don't use CDBS anymore, should now cross compile.
-
- -- Romuald Conty <rconty@il4p.fr>  Thu, 29 Sep 2009 9:42:42 +0100
-
-libnfc (1.2.1-2) unstable; urgency=low
-
-  * Add missing dependencies for ACR122 devices (pcscd).
-
- -- Romuald Conty <rconty@il4p.fr>  Fri, 23 Sep 2009 16:42:42 +0100
-
-libnfc (1.2.1-1) unstable; urgency=low
-
-  * Description have been updated.
-  * Provided binairies should not be consider as tools but as examples.
-
- -- Romuald Conty <rconty@il4p.fr>  Fri, 03 Sep 2009 18:42:42 +0100
-
-libnfc (1.2.1-0) unstable; urgency=low
-
-  * New upstream version.
-
- -- Romuald Conty <rconty@il4p.fr>  Fri, 24 Jul 2009 16:42:42 +0100
-
-libnfc (1.2.0-0) unstable; urgency=low
-
-  * New upstream version.
-
- -- Romuald Conty <rconty@il4p.fr>  Thu, 23 Jul 2009 15:42:42 +0100
-
-libnfc (1.1.0-0) unstable; urgency=low
-
-  * Initial debian package.
-
- -- Romuald Conty <rconty@il4p.fr>  Wed, 22 Apr 2009 10:42:42 +0100
-

debian/compat

@@ -1 +0,0 @@
-7

debian/control

@@ -1,51 +0,0 @@
-Source: libnfc
-Section: libs
-Priority: extra
-Maintainer: Thomas Hood <jdthood@gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), dh-autoreconf, libtool, pkg-config, libusb-dev, libpcsclite-dev
-Standards-Version: 3.9.2
-Homepage: http://www.libnfc.org/
-Vcs-Svn: http://libnfc.googlecode.com/svn/trunk
-Vcs-Browser: http://code.google.com/p/libnfc/source/browse/#svn/trunk
-
-Package: libnfc2
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libusb-0.1-4, libpcsclite1 (>= 1.5), libccid (>= 1.3.10), pcscd (>= 1.5)
-Description: Near Field Communication (NFC) library
- libnfc is a Free Software library for Near Field Communication.
- Supported NFC hardware devices are, theorically, all hardware
- based on the NXP PN531, PN532 or PN533 NFC controller chip.
-
-Package: libnfc-dev
-Section: libdevel
-Architecture: any
-Depends: ${misc:Depends}, libnfc2 (= ${binary:Version}), libusb-dev, libpcsclite-dev
-Description: Near Field Communication library (development files)
- libnfc is a free software library for near-field communication.
- It supports most hardware based on the NXP PN531, PN532 or PN533
- controller chips.
-
-Package: libnfc-bin
-Section: utils
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libnfc2 (>= ${binary:Version})
-Description: Near Field Communication binaries
- Some binaries are provided with libnfc useful for development
- purposes (nfc-list, nfc-mfclassic, nfc-mfultralight, etc.).
-
-Package: libnfc-examples
-Section: utils
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libnfc2 (>= ${binary:Version})
-Description: Near Field Communication examples
- Some examples are provided with libnfc for debugging and/or
- educational purposes (nfc-anticol, nfc-emulate, etc.).
-
-Package: libnfc-pn53x-examples
-Section: utils
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libnfc2 (>= ${binary:Version})
-Description: Near Field Communication examples for PN53x chips only
- Some PN53x-only examples are provided with libnfc for debugging
- and/or educational purposes (pn53x-sam, pn53x-tamashell, etc.).

debian/copyright

@@ -1,58 +0,0 @@
-Format: http://dep.debian.net/deps/dep5
-Upstream-Name: libnfc
-Source: http://www.libnfc.org/
-
-Files: *
-Copyright: 2009, Roel Verdult <roel@libnfc.org>, Romuald Conty <romuald@libnfc.org>
-           2010-2011, Romain Tartière <romain@libnfc.org>, Romuald Conty <romuald@libnfc.org>
-License: LGPL-3
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License version 3 
- as published by the Free Software Foundation
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program; if not, see <http://www.gnu.org/licenses/>.
- .
- On Debian GNU/Linux systems, the complete text of the GNU General
- Public License, version 3, can be found in the file
- /usr/share/common-licenses/LGPL-3.
-
-Files: examples/*
-Copyright: 2009, Roel Verdult <roel@libnfc.org>, Romuald Conty <romuald@libnfc.org>
-           2010-2011, Romain Tartière <romain@libnfc.org>, Romuald Conty <romuald@libnfc.org>
-License: BSD-2-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
- .
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
-
-Files: debian/*
-Copyright: 2009-2011, Romuald Conty <romuald@libnfc.org>
-           2011, Thomas Hood <jdthood@gmail.com>
-License: GPL-2
- The Debian packaging is licensed under the GPL, version 2.
- .
- On Debian GNU/Linux systems, the complete text of the GNU General
- Public License, version 2, can be found in the file
- /usr/share/common-licenses/GPL-2.

debian/libnfc-bin.install

@@ -1,12 +0,0 @@
-debian/tmp/usr/bin/nfc-emulate-forum-tag2
-debian/tmp/usr/bin/nfc-emulate-forum-tag4
-debian/tmp/usr/bin/nfc-list
-debian/tmp/usr/bin/nfc-mfclassic
-debian/tmp/usr/bin/nfc-mfultralight
-debian/tmp/usr/bin/nfc-relay-picc
-debian/tmp/usr/bin/nfc-read-forum-tag3
-debian/tmp/usr/share/man/man1/nfc-emulate-forum-tag4.1
-debian/tmp/usr/share/man/man1/nfc-list.1
-debian/tmp/usr/share/man/man1/nfc-mfclassic.1
-debian/tmp/usr/share/man/man1/nfc-mfultralight.1
-debian/tmp/usr/share/man/man1/nfc-relay-picc.1

debian/libnfc-dev.install

@@ -1,3 +0,0 @@
-debian/tmp/usr/include/nfc
-debian/tmp/usr/lib/libnfc.{a,la,so}
-debian/tmp/usr/lib/pkgconfig/libnfc.pc

debian/libnfc-examples.install

@@ -1,16 +0,0 @@
-debian/tmp/usr/bin/nfc-anticol
-debian/tmp/usr/bin/nfc-dep-initiator
-debian/tmp/usr/bin/nfc-dep-target
-debian/tmp/usr/bin/nfc-emulate-tag
-debian/tmp/usr/bin/nfc-emulate-uid
-debian/tmp/usr/bin/nfc-mfsetuid
-debian/tmp/usr/bin/nfc-poll
-debian/tmp/usr/bin/nfc-relay
-debian/tmp/usr/share/man/man1/nfc-anticol.1
-debian/tmp/usr/share/man/man1/nfc-dep-initiator.1
-debian/tmp/usr/share/man/man1/nfc-dep-target.1
-debian/tmp/usr/share/man/man1/nfc-emulate-tag.1
-debian/tmp/usr/share/man/man1/nfc-emulate-uid.1
-debian/tmp/usr/share/man/man1/nfc-mfsetuid.1
-debian/tmp/usr/share/man/man1/nfc-poll.1
-debian/tmp/usr/share/man/man1/nfc-relay.1

debian/libnfc-pn53x-examples.install

@@ -1,3 +0,0 @@
-debian/tmp/usr/bin/pn53x-*
-debian/tmp/usr/share/man/man1/pn53x-*
-examples/pn53x-tamashell-scripts/*.cmd usr/share/doc/libnfc-pn53x-examples/scripts

debian/libnfc2.install

@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/libnfc.so.*
-pn53x.rules lib/udev/rules.d

debian/rules

@@ -1,23 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# "nocheck" option prevents from running tests (which need dedicated hardware)
-export DEB_BUILD_OPTIONS=nocheck
-
-override_dh_installchangelogs:
-	dh_installchangelogs ChangeLog
-
-override_dh_auto_configure: 
-#	dh_auto_configure -- --enable-serial-autoprobe
-	dh_auto_configure -- --enable-debug --with-drivers=all --enable-serial-autoprobe
-
-%:
-	dh --with autoreconf $@

debian/source/format

@@ -1 +0,0 @@
-3.0 (quilt)

debian/watch

@@ -1,7 +0,0 @@
-# See uscan(1) for format
-
-# Compulsory line, this is a version 3 file
-version=3
-
-http://googlecode.debian.net/p/libnfc/libnfc-(.*)\.tar\.gz
-

examples/CMakeLists.txt

@@ -1,10 +1,41 @@
-SET(EXAMPLES-SOURCES nfc-anticol nfc-dep-initiator nfc-dep-target nfc-emulate-tag nfc-emulate-uid nfc-poll nfc-relay)
+SET(EXAMPLES-SOURCES
+  nfc-anticol
+  nfc-dep-initiator
+  nfc-dep-target
+  nfc-emulate-forum-tag2
+  nfc-emulate-tag
+  nfc-emulate-uid
+  nfc-mfsetuid
+  nfc-poll
+  nfc-relay
+  nfc-st25tb
+  pn53x-diagnose
+  pn53x-sam
+  pn53x-tamashell
+)
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libnfc)
 
 # Examples
 FOREACH(source ${EXAMPLES-SOURCES})
-  ADD_EXECUTABLE(${source} ${source}.c)
+  SET (TARGETS ${source}.c)
+
+  IF(WIN32)
+    SET(RC_COMMENT "${PACKAGE_NAME} example")
+    SET(RC_INTERNAL_NAME ${source})
+    SET(RC_ORIGINAL_NAME ${source}.exe)
+    # RC_FILE_TYPE: VFT_APP
+    SET(RC_FILE_TYPE 0x00000001L)
+    CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/../contrib/win32/version.rc.in ${CMAKE_CURRENT_BINARY_DIR}/../windows/${source}.rc @ONLY)
+    LIST(APPEND TARGETS ${CMAKE_CURRENT_BINARY_DIR}/../windows/${source}.rc)
+	
+	  
+	IF(${source} MATCHES "nfc-st25tb")
+		LIST(APPEND TARGETS ${CMAKE_CURRENT_SOURCE_DIR}/../contrib/win32/getopt.c)
+	ENDIF()
+  ENDIF(WIN32)
+
+  ADD_EXECUTABLE(${source} ${TARGETS})
   TARGET_LINK_LIBRARIES(${source} nfc)
   TARGET_LINK_LIBRARIES(${source} nfcutils)
   INSTALL(TARGETS ${source} RUNTIME DESTINATION bin COMPONENT examples)

examples/Makefile.am

@@ -4,10 +4,13 @@ bin_PROGRAMS = \
 		nfc-anticol \
 		nfc-dep-initiator \
 		nfc-dep-target \
+		nfc-emulate-forum-tag2 \
 		nfc-emulate-tag \
 		nfc-emulate-uid \
+		nfc-mfsetuid \
 		nfc-poll \
 		nfc-relay \
+		nfc-st25tb \
 		pn53x-diagnose \
 		pn53x-sam
 
@@ -16,8 +19,12 @@ bin_PROGRAMS += \
 		pn53x-tamashell
 endif
 
+check_PROGRAMS = \
+		quick_start_example1 \
+		quick_start_example2
+
 # set the include path found by configure
-INCLUDES = $(all_includes) $(LIBNFC_CFLAGS)
+AM_CPPFLAGS = $(all_includes) $(LIBNFC_CFLAGS)
 
 AM_CFLAGS = -I$(top_srcdir)/libnfc -I$(top_srcdir)
 
@@ -33,6 +40,10 @@ nfc_relay_SOURCES = nfc-relay.c
 nfc_relay_LDADD = $(top_builddir)/libnfc/libnfc.la \
 		  $(top_builddir)/utils/libnfcutils.la
 
+nfc_emulate_forum_tag2_SOURCES = nfc-emulate-forum-tag2.c
+nfc_emulate_forum_tag2_LDADD = $(top_builddir)/libnfc/libnfc.la \
+			$(top_builddir)/utils/libnfcutils.la
+
 nfc_emulate_tag_SOURCES = nfc-emulate-tag.c
 nfc_emulate_tag_LDADD = $(top_builddir)/libnfc/libnfc.la \
 			$(top_builddir)/utils/libnfcutils.la
@@ -49,6 +60,13 @@ nfc_dep_initiator_SOURCES = nfc-dep-initiator.c
 nfc_dep_initiator_LDADD = $(top_builddir)/libnfc/libnfc.la \
 			  $(top_builddir)/utils/libnfcutils.la
 
+nfc_mfsetuid_SOURCES = nfc-mfsetuid.c
+nfc_mfsetuid_LDADD = $(top_builddir)/libnfc/libnfc.la \
+			  $(top_builddir)/utils/libnfcutils.la
+
+nfc_st25tb_SOURCES = nfc-st25tb.c
+nfc_st25tb_LDADD = $(top_builddir)/libnfc/libnfc.la
+
 pn53x_diagnose_SOURCES = pn53x-diagnose.c
 pn53x_diagnose_LDADD = $(top_builddir)/libnfc/libnfc.la \
 		       $(top_builddir)/utils/libnfcutils.la
@@ -60,8 +78,18 @@ pn53x_sam_LDADD = $(top_builddir)/libnfc/libnfc.la \
 pn53x_tamashell_SOURCES = pn53x-tamashell.c
 pn53x_tamashell_LDADD = $(top_builddir)/libnfc/libnfc.la \
 		        $(top_builddir)/utils/libnfcutils.la
+pn53x_tamashell_CFLAGS = @READLINE_INCLUDES@ -I$(top_srcdir)
 pn53x_tamashell_LDFLAGS = @READLINE_LIBS@
 
+quick_start_example1_SOURCES = doc/quick_start_example1.c
+quick_start_example1_LDADD =  $(top_builddir)/libnfc/libnfc.la \
+		  $(top_builddir)/utils/libnfcutils.la
+
+quick_start_example2_SOURCES = doc/quick_start_example2.c
+quick_start_example2_LDADD =  $(top_builddir)/libnfc/libnfc.la \
+		  $(top_builddir)/utils/libnfcutils.la
+
+
 dist_man_MANS = \
 		nfc-anticol.1 \
 		nfc-dep-initiator.1 \
@@ -70,13 +98,10 @@ dist_man_MANS = \
 		nfc-emulate-uid.1 \
 		nfc-poll.1 \
 		nfc-relay.1 \
+		nfc-mfsetuid.1 \
 		pn53x-diagnose.1 \
 		pn53x-sam.1 \
-		pn53x-tamashell.1
+		pn53x-tamashell.1 \
-
+		nfc-emulate-forum-tag2.1
-if HAS_LOG4C
-  AM_CFLAGS += @log4c_CFLAGS@
-  LIBADD = @log4c_LIBS@
-endif
 
 EXTRA_DIST = CMakeLists.txt

examples/doc/quick_start_example1.c

@@ -1,53 +1,86 @@
-#ifdef HAVE_CONFIG_H
+/**
-#  include "config.h"
+ * @file quick_start_example1.c
-#endif // HAVE_CONFIG_H
+ * @brief Quick start example that presents how to use libnfc
+ */
+
+// To compile this simple example:
+// $ gcc -o quick_start_example1 quick_start_example1.c -lnfc
 
 #include <stdlib.h>
 #include <nfc/nfc.h>
 
-#include "nfc-utils.h"
+static void
+print_hex(const uint8_t *pbtData, const size_t szBytes)
+{
+  size_t  szPos;
+
+  for (szPos = 0; szPos < szBytes; szPos++) {
+    printf("%02x  ", pbtData[szPos]);
+  }
+  printf("\n");
+}
 
 int
-main (int argc, const char *argv[])
+main(int argc, const char *argv[])
 {
-  nfc_device_t *pnd;
+  nfc_device *pnd;
-  nfc_target_info_t nti;
+  nfc_target nt;
+
+  // Allocate only a pointer to nfc_context
+  nfc_context *context;
+
+  // Initialize libnfc and set the nfc_context
+  nfc_init(&context);
+  if (context == NULL) {
+    printf("Unable to init libnfc (malloc)\n");
+    exit(EXIT_FAILURE);
+  }
 
   // Display libnfc version
-  const char *acLibnfcVersion = nfc_version ();
+  const char *acLibnfcVersion = nfc_version();
-  printf ("%s uses libnfc %s\n", argv[0], acLibnfcVersion);
+  (void)argc;
+  printf("%s uses libnfc %s\n", argv[0], acLibnfcVersion);
 
-  // Connect using the first available NFC device
+  // Open, using the first available NFC device which can be in order of selection:
-  pnd = nfc_connect (NULL);
+  //   - default device specified using environment variable or
+  //   - first specified device in libnfc.conf (/etc/nfc) or
+  //   - first specified device in device-configuration directory (/etc/nfc/devices.d) or
+  //   - first auto-detected (if feature is not disabled in libnfc.conf) device
+  pnd = nfc_open(context, NULL);
 
   if (pnd == NULL) {
-    ERR ("%s", "Unable to connect to NFC device.");
+    printf("ERROR: %s\n", "Unable to open NFC device.");
-    return EXIT_FAILURE;
+    exit(EXIT_FAILURE);
+  }
+  // Set opened NFC device to initiator mode
+  if (nfc_initiator_init(pnd) < 0) {
+    nfc_perror(pnd, "nfc_initiator_init");
+    exit(EXIT_FAILURE);
   }
-  // Set connected NFC device to initiator mode
-  nfc_initiator_init (pnd);
 
-  printf ("Connected to NFC reader: %s\n", pnd->acName);
+  printf("NFC reader: %s opened\n", nfc_device_get_name(pnd));
 
   // Poll for a ISO14443A (MIFARE) tag
-  const nfc_modulation_t nmMifare = {
+  const nfc_modulation nmMifare = {
     .nmt = NMT_ISO14443A,
     .nbr = NBR_106,
   };
-  if (nfc_initiator_select_passive_target (pnd, PM_ISO14443A_106, NULL, 0, &nti)) {
+  if (nfc_initiator_select_passive_target(pnd, nmMifare, NULL, 0, &nt) > 0) {
-    printf ("The following (NFC) ISO14443A tag was found:\n");
+    printf("The following (NFC) ISO14443A tag was found:\n");
-    printf ("    ATQA (SENS_RES): ");
+    printf("    ATQA (SENS_RES): ");
-    print_hex (nti.nai.abtAtqa, 2);
+    print_hex(nt.nti.nai.abtAtqa, 2);
-    printf ("       UID (NFCID%c): ", (nti.nai.abtUid[0] == 0x08 ? '3' : '1'));
+    printf("       UID (NFCID%c): ", (nt.nti.nai.abtUid[0] == 0x08 ? '3' : '1'));
-    print_hex (nti.nai.abtUid, nti.nai.szUidLen);
+    print_hex(nt.nti.nai.abtUid, nt.nti.nai.szUidLen);
-    printf ("      SAK (SEL_RES): ");
+    printf("      SAK (SEL_RES): ");
-    print_hex (&nti.nai.btSak, 1);
+    print_hex(&nt.nti.nai.btSak, 1);
-    if (nti.nai.szAtsLen) {
+    if (nt.nti.nai.szAtsLen) {
-      printf ("          ATS (ATR): ");
+      printf("          ATS (ATR): ");
-      print_hex (nti.nai.abtAts, nti.nai.szAtsLen);
+      print_hex(nt.nti.nai.abtAts, nt.nti.nai.szAtsLen);
     }
   }
-  // Disconnect from NFC device
+  // Close NFC device
-  nfc_disconnect (pnd);
+  nfc_close(pnd);
-  return EXIT_SUCCESS;
+  // Release the context
+  nfc_exit(context);
+  exit(EXIT_SUCCESS);
 }

examples/doc/quick_start_example2.c

@@ -0,0 +1,83 @@
+/**
+ * @file quick_start_example2.c
+ * @brief Quick start example that presents how to use libnfc
+ */
+
+// This is same example as quick_start_example1.c but using
+// some helper functions existing in libnfc.
+// Those functions are not available yet in a library
+// so binary object must be linked statically:
+// $ gcc -o quick_start_example2 -lnfc -I../.. quick_start_example2.c ../../utils/nfc-utils.o
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif // HAVE_CONFIG_H
+
+#include <stdlib.h>
+#include <nfc/nfc.h>
+#include "utils/nfc-utils.h"
+
+int
+main(int argc, const char *argv[])
+{
+  nfc_device *pnd;
+  nfc_target nt;
+
+  // Allocate only a pointer to nfc_context
+  nfc_context *context;
+
+  // Initialize libnfc and set the nfc_context
+  nfc_init(&context);
+  if (context == NULL) {
+    ERR("Unable to init libnfc (malloc)");
+    exit(EXIT_FAILURE);
+  }
+
+  // Display libnfc version
+  const char *acLibnfcVersion = nfc_version();
+  (void)argc;
+  printf("%s uses libnfc %s\n", argv[0], acLibnfcVersion);
+
+  // Open, using the first available NFC device which can be in order of selection:
+  //   - default device specified using environment variable or
+  //   - first specified device in libnfc.conf (/etc/nfc) or
+  //   - first specified device in device-configuration directory (/etc/nfc/devices.d) or
+  //   - first auto-detected (if feature is not disabled in libnfc.conf) device
+  pnd = nfc_open(context, NULL);
+
+  if (pnd == NULL) {
+    ERR("%s", "Unable to open NFC device.");
+    exit(EXIT_FAILURE);
+  }
+  // Set opened NFC device to initiator mode
+  if (nfc_initiator_init(pnd) < 0) {
+    nfc_perror(pnd, "nfc_initiator_init");
+    exit(EXIT_FAILURE);
+  }
+
+  printf("NFC reader: %s opened\n", nfc_device_get_name(pnd));
+
+  // Poll for a ISO14443A (MIFARE) tag
+  const nfc_modulation nmMifare = {
+    .nmt = NMT_ISO14443A,
+    .nbr = NBR_106,
+  };
+  if (nfc_initiator_select_passive_target(pnd, nmMifare, NULL, 0, &nt) > 0) {
+    printf("The following (NFC) ISO14443A tag was found:\n");
+    printf("    ATQA (SENS_RES): ");
+    print_hex(nt.nti.nai.abtAtqa, 2);
+    printf("       UID (NFCID%c): ", (nt.nti.nai.abtUid[0] == 0x08 ? '3' : '1'));
+    print_hex(nt.nti.nai.abtUid, nt.nti.nai.szUidLen);
+    printf("      SAK (SEL_RES): ");
+    print_hex(&nt.nti.nai.btSak, 1);
+    if (nt.nti.nai.szAtsLen) {
+      printf("          ATS (ATR): ");
+      print_hex(nt.nti.nai.abtAts, nt.nti.nai.szAtsLen);
+    }
+  }
+  // Close NFC device
+  nfc_close(pnd);
+  // Release the context
+  nfc_exit(context);
+  exit(EXIT_SUCCESS);
+}

examples/nfc-anticol.1

@@ -23,7 +23,7 @@ Please report any bugs on the
 .B libnfc
 issue tracker at:
 .br
-.BR http://code.google.com/p/libnfc/issues
+.BR https://github.com/nfc-tools/libnfc/issues
 .SH LICENCE
 .B libnfc
 is licensed under the GNU Lesser General Public License (LGPL), version 3.

examples/nfc-anticol.c

@@ -1,7 +1,14 @@
 /*-
- * Public platform independent Near Field Communication (NFC) library examples
+ * Free/Libre Near Field Communication (NFC) library
  *
- * Copyright (C) 2009, Roel Verdult
+ * Libnfc historical contributors:
+ * Copyright (C) 2009      Roel Verdult
+ * Copyright (C) 2009-2013 Romuald Conty
+ * Copyright (C) 2010-2012 Romain Tartière
+ * Copyright (C) 2010-2013 Philippe Teuwen
+ * Copyright (C) 2012-2013 Ludovic Rousseau
+ * See AUTHORS file for a more comprehensive list of contributors.
+ * Additional contributors of this file:
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -51,45 +58,54 @@
 
 #define MAX_FRAME_LEN 264
 
-static byte_t abtRx[MAX_FRAME_LEN];
+static uint8_t abtRx[MAX_FRAME_LEN];
-static size_t szRxBits;
+static int szRxBits;
 static size_t szRx = sizeof(abtRx);
-static byte_t abtRawUid[12];
+static uint8_t abtRawUid[12];
-static byte_t abtAtqa[2];
+static uint8_t abtAtqa[2];
-static byte_t abtSak;
+static uint8_t abtSak;
-static byte_t abtAts[MAX_FRAME_LEN];
+static uint8_t abtAts[MAX_FRAME_LEN];
-static byte_t szAts = 0;
+static uint8_t szAts = 0;
 static size_t szCL = 1;//Always start with Cascade Level 1 (CL1)
-static nfc_device_t *pnd;
+static nfc_device *pnd;
 
 bool    quiet_output = false;
 bool    force_rats = false;
+bool    timed = false;
 bool    iso_ats_supported = false;
 
 // ISO14443A Anti-Collision Commands
-byte_t  abtReqa[1] = { 0x26 };
+uint8_t  abtReqa[1] = { 0x26 };
-byte_t  abtSelectAll[2] = { 0x93, 0x20 };
+uint8_t  abtSelectAll[2] = { 0x93, 0x20 };
-byte_t  abtSelectTag[9] = { 0x93, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+uint8_t  abtSelectTag[9] = { 0x93, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-byte_t  abtRats[4] = { 0xe0, 0x50, 0x00, 0x00 };
+uint8_t  abtRats[4] = { 0xe0, 0x50, 0x00, 0x00 };
-byte_t  abtHalt[4] = { 0x50, 0x00, 0x00, 0x00 };
+uint8_t  abtHalt[4] = { 0x50, 0x00, 0x00, 0x00 };
 #define CASCADE_BIT 0x04
 
 static  bool
-transmit_bits (const byte_t * pbtTx, const size_t szTxBits)
+transmit_bits(const uint8_t *pbtTx, const size_t szTxBits)
 {
+  uint32_t cycles = 0;
   // Show transmitted command
   if (!quiet_output) {
-    printf ("Sent bits:     ");
+    printf("Sent bits:     ");
-    print_hex_bits (pbtTx, szTxBits);
+    print_hex_bits(pbtTx, szTxBits);
   }
   // Transmit the bit frame command, we don't use the arbitrary parity feature
-  if (!nfc_initiator_transceive_bits (pnd, pbtTx, szTxBits, NULL, abtRx, &szRxBits, NULL))
+  if (timed) {
-    return false;
+    if ((szRxBits = nfc_initiator_transceive_bits_timed(pnd, pbtTx, szTxBits, NULL, abtRx, sizeof(abtRx), NULL, &cycles)) < 0)
-
+      return false;
+    if ((!quiet_output) && (szRxBits > 0)) {
+      printf("Response after %u cycles\n", cycles);
+    }
+  } else {
+    if ((szRxBits = nfc_initiator_transceive_bits(pnd, pbtTx, szTxBits, NULL, abtRx, sizeof(abtRx), NULL)) < 0)
+      return false;
+  }
   // Show received answer
   if (!quiet_output) {
-    printf ("Received bits: ");
+    printf("Received bits: ");
-    print_hex_bits (abtRx, szRxBits);
+    print_hex_bits(abtRx, szRxBits);
   }
   // Succesful transfer
   return true;
@@ -97,96 +113,129 @@ transmit_bits (const byte_t * pbtTx, const size_t szTxBits)
 
 
 static  bool
-transmit_bytes (const byte_t * pbtTx, const size_t szTx)
+transmit_bytes(const uint8_t *pbtTx, const size_t szTx)
 {
+  uint32_t cycles = 0;
   // Show transmitted command
   if (!quiet_output) {
-    printf ("Sent bits:     ");
+    printf("Sent bits:     ");
-    print_hex (pbtTx, szTx);
+    print_hex(pbtTx, szTx);
   }
+  int res;
   // Transmit the command bytes
-  if (!nfc_initiator_transceive_bytes (pnd, pbtTx, szTx, abtRx, &szRx, NULL))
+  if (timed) {
-    return false;
+    if ((res = nfc_initiator_transceive_bytes_timed(pnd, pbtTx, szTx, abtRx, sizeof(abtRx), &cycles)) < 0)
-
+      return false;
+    if ((!quiet_output) && (res > 0)) {
+      printf("Response after %u cycles\n", cycles);
+    }
+  } else {
+    if ((res = nfc_initiator_transceive_bytes(pnd, pbtTx, szTx, abtRx, sizeof(abtRx), 0)) < 0)
+      return false;
+  }
+  szRx = res;
   // Show received answer
   if (!quiet_output) {
-    printf ("Received bits: ");
+    printf("Received bits: ");
-    print_hex (abtRx, szRx);
+    print_hex(abtRx, szRx);
   }
   // Succesful transfer
   return true;
 }
 
 static void
-print_usage (char *argv[])
+print_usage(char *argv[])
 {
-  printf ("Usage: %s [OPTIONS]\n", argv[0]);
+  printf("Usage: %s [OPTIONS]\n", argv[0]);
-  printf ("Options:\n");
+  printf("Options:\n");
-  printf ("\t-h\tHelp. Print this message.\n");
+  printf("\t-h\tHelp. Print this message.\n");
-  printf ("\t-q\tQuiet mode. Suppress output of READER and EMULATOR data (improves timing).\n");
+  printf("\t-q\tQuiet mode. Suppress output of READER and EMULATOR data (improves timing).\n");
-  printf ("\t-f\tForce RATS.\n");
+  printf("\t-f\tForce RATS.\n");
+  printf("\t-t\tMeasure response time (in cycles).\n");
 }
 
 int
-main (int argc, char *argv[])
+main(int argc, char *argv[])
 {
   int     arg;
 
   // Get commandline options
   for (arg = 1; arg < argc; arg++) {
-    if (0 == strcmp (argv[arg], "-h")) {
+    if (0 == strcmp(argv[arg], "-h")) {
-      print_usage (argv);
+      print_usage(argv);
       exit(EXIT_SUCCESS);
-    } else if (0 == strcmp (argv[arg], "-q")) {
+    } else if (0 == strcmp(argv[arg], "-q")) {
       quiet_output = true;
-    } else if (0 == strcmp (argv[arg], "-f")) {
+    } else if (0 == strcmp(argv[arg], "-f")) {
       force_rats = true;
+    } else if (0 == strcmp(argv[arg], "-t")) {
+      timed = true;
     } else {
-      ERR ("%s is not supported option.", argv[arg]);
+      ERR("%s is not supported option.", argv[arg]);
-      print_usage (argv);
+      print_usage(argv);
       exit(EXIT_FAILURE);
     }
   }
 
-  // Try to open the NFC reader
+  nfc_context *context;
-  pnd = nfc_connect (NULL);
+  nfc_init(&context);
+  if (context == NULL) {
+    ERR("Unable to init libnfc (malloc)");
+    exit(EXIT_FAILURE);
+  }
 
-  if (!pnd) {
+  // Try to open the NFC reader
-    printf ("Error connecting NFC reader\n");
+  pnd = nfc_open(context, NULL);
+
+  if (pnd == NULL) {
+    ERR("Error opening NFC reader");
+    nfc_exit(context);
     exit(EXIT_FAILURE);
   }
 
   // Initialise NFC device as "initiator"
-  nfc_initiator_init (pnd);
+  if (nfc_initiator_init(pnd) < 0) {
+    nfc_perror(pnd, "nfc_initiator_init");
+    nfc_close(pnd);
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
+  }
 
   // Configure the CRC
-  if (!nfc_configure (pnd, NDO_HANDLE_CRC, false)) {
+  if (nfc_device_set_property_bool(pnd, NP_HANDLE_CRC, false) < 0) {
-    nfc_perror (pnd, "nfc_configure");
+    nfc_perror(pnd, "nfc_device_set_property_bool");
-    exit (EXIT_FAILURE);
+    nfc_close(pnd);
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
   }
   // Use raw send/receive methods
-  if (!nfc_configure (pnd, NDO_EASY_FRAMING, false)) {
+  if (nfc_device_set_property_bool(pnd, NP_EASY_FRAMING, false) < 0) {
-    nfc_perror (pnd, "nfc_configure");
+    nfc_perror(pnd, "nfc_device_set_property_bool");
-    exit (EXIT_FAILURE);
+    nfc_close(pnd);
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
   }
   // Disable 14443-4 autoswitching
-  if (!nfc_configure (pnd, NDO_AUTO_ISO14443_4, false)) {
+  if (nfc_device_set_property_bool(pnd, NP_AUTO_ISO14443_4, false) < 0) {
-    nfc_perror (pnd, "nfc_configure");
+    nfc_perror(pnd, "nfc_device_set_property_bool");
-    exit (EXIT_FAILURE);
+    nfc_close(pnd);
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
   }
 
-  printf ("Connected to NFC reader: %s\n\n", pnd->acName);
+  printf("NFC reader: %s opened\n\n", nfc_device_get_name(pnd));
 
   // Send the 7 bits request command specified in ISO 14443A (0x26)
-  if (!transmit_bits (abtReqa, 7)) {
+  if (!transmit_bits(abtReqa, 7)) {
-    printf ("Error: No tag available\n");
+    printf("Error: No tag available\n");
-    nfc_disconnect (pnd);
+    nfc_close(pnd);
-    return 1;
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
   }
-  memcpy (abtAtqa, abtRx, 2);
+  memcpy(abtAtqa, abtRx, 2);
 
   // Anti-collision
-  transmit_bytes (abtSelectAll, 2);
+  transmit_bytes(abtSelectAll, 2);
 
   // Check answer
   if ((abtRx[0] ^ abtRx[1] ^ abtRx[2] ^ abtRx[3] ^ abtRx[4]) != 0) {
@@ -194,12 +243,12 @@ main (int argc, char *argv[])
   }
 
   // Save the UID CL1
-  memcpy (abtRawUid, abtRx, 4);
+  memcpy(abtRawUid, abtRx, 4);
 
   //Prepare and send CL1 Select-Command
-  memcpy (abtSelectTag + 2, abtRx, 5);
+  memcpy(abtSelectTag + 2, abtRx, 5);
-  iso14443a_crc_append (abtSelectTag, 7);
+  iso14443a_crc_append(abtSelectTag, 7);
-  transmit_bytes (abtSelectTag, 9);
+  transmit_bytes(abtSelectTag, 9);
   abtSak = abtRx[0];
 
   // Test if we are dealing with a CL2
@@ -211,14 +260,14 @@ main (int argc, char *argv[])
     }
   }
 
-  if(szCL == 2) {
+  if (szCL == 2) {
     // We have to do the anti-collision for cascade level 2
 
     // Prepare CL2 commands
     abtSelectAll[0] = 0x95;
 
     // Anti-collision
-    transmit_bytes (abtSelectAll, 2);
+    transmit_bytes(abtSelectAll, 2);
 
     // Check answer
     if ((abtRx[0] ^ abtRx[1] ^ abtRx[2] ^ abtRx[3] ^ abtRx[4]) != 0) {
@@ -226,13 +275,13 @@ main (int argc, char *argv[])
     }
 
     // Save UID CL2
-    memcpy (abtRawUid + 4, abtRx, 4);
+    memcpy(abtRawUid + 4, abtRx, 4);
 
     // Selection
     abtSelectTag[0] = 0x95;
-    memcpy (abtSelectTag + 2, abtRx, 5);
+    memcpy(abtSelectTag + 2, abtRx, 5);
-    iso14443a_crc_append (abtSelectTag, 7);
+    iso14443a_crc_append(abtSelectTag, 7);
-    transmit_bytes (abtSelectTag, 9);
+    transmit_bytes(abtSelectTag, 9);
     abtSak = abtRx[0];
 
     // Test if we are dealing with a CL3
@@ -244,12 +293,12 @@ main (int argc, char *argv[])
       }
     }
 
-    if ( szCL == 3) {
+    if (szCL == 3) {
       // We have to do the anti-collision for cascade level 3
 
       // Prepare and send CL3 AC-Command
       abtSelectAll[0] = 0x97;
-      transmit_bytes (abtSelectAll, 2);
+      transmit_bytes(abtSelectAll, 2);
 
       // Check answer
       if ((abtRx[0] ^ abtRx[1] ^ abtRx[2] ^ abtRx[3] ^ abtRx[4]) != 0) {
@@ -257,58 +306,59 @@ main (int argc, char *argv[])
       }
 
       // Save UID CL3
-      memcpy (abtRawUid + 8, abtRx, 4);
+      memcpy(abtRawUid + 8, abtRx, 4);
 
       // Prepare and send final Select-Command
       abtSelectTag[0] = 0x97;
-      memcpy (abtSelectTag + 2, abtRx, 5);
+      memcpy(abtSelectTag + 2, abtRx, 5);
-      iso14443a_crc_append (abtSelectTag, 7);
+      iso14443a_crc_append(abtSelectTag, 7);
-      transmit_bytes (abtSelectTag, 9);
+      transmit_bytes(abtSelectTag, 9);
       abtSak = abtRx[0];
     }
   }
 
   // Request ATS, this only applies to tags that support ISO 14443A-4
   if (abtRx[0] & SAK_FLAG_ATS_SUPPORTED) {
-        iso_ats_supported = true;
+    iso_ats_supported = true;
   }
   if ((abtRx[0] & SAK_FLAG_ATS_SUPPORTED) || force_rats) {
     iso14443a_crc_append(abtRats, 2);
-    if (transmit_bytes (abtRats, 4)) {
+    if (transmit_bytes(abtRats, 4)) {
-        memcpy (abtAts, abtRx, szRx);
+      memcpy(abtAts, abtRx, szRx);
-        szAts = szRx;
+      szAts = szRx;
     }
   }
 
   // Done, halt the tag now
   iso14443a_crc_append(abtHalt, 2);
-  transmit_bytes (abtHalt, 4);
+  transmit_bytes(abtHalt, 4);
 
-  printf ("\nFound tag with\n UID: ");
+  printf("\nFound tag with\n UID: ");
   switch (szCL) {
     case 1:
-      printf ("%02x%02x%02x%02x", abtRawUid[0], abtRawUid[1], abtRawUid[2], abtRawUid[3]);
+      printf("%02x%02x%02x%02x", abtRawUid[0], abtRawUid[1], abtRawUid[2], abtRawUid[3]);
-    break;
+      break;
     case 2:
-      printf ("%02x%02x%02x", abtRawUid[1], abtRawUid[2], abtRawUid[3]);
+      printf("%02x%02x%02x", abtRawUid[1], abtRawUid[2], abtRawUid[3]);
-      printf ("%02x%02x%02x%02x", abtRawUid[4], abtRawUid[5], abtRawUid[6], abtRawUid[7]);
+      printf("%02x%02x%02x%02x", abtRawUid[4], abtRawUid[5], abtRawUid[6], abtRawUid[7]);
-    break;
+      break;
     case 3:
-      printf ("%02x%02x%02x", abtRawUid[1], abtRawUid[2], abtRawUid[3]);
+      printf("%02x%02x%02x", abtRawUid[1], abtRawUid[2], abtRawUid[3]);
-      printf ("%02x%02x%02x", abtRawUid[5], abtRawUid[6], abtRawUid[7]);
+      printf("%02x%02x%02x", abtRawUid[5], abtRawUid[6], abtRawUid[7]);
-      printf ("%02x%02x%02x%02x", abtRawUid[8], abtRawUid[9], abtRawUid[10], abtRawUid[11]);
+      printf("%02x%02x%02x%02x", abtRawUid[8], abtRawUid[9], abtRawUid[10], abtRawUid[11]);
-    break;
+      break;
   }
   printf("\n");
   printf("ATQA: %02x%02x\n SAK: %02x\n", abtAtqa[1], abtAtqa[0], abtSak);
   if (szAts > 1) { // if = 1, it's not actual ATS but error code
-      if (force_rats && ! iso_ats_supported) {
+    if (force_rats && ! iso_ats_supported) {
-          printf(" RATS forced\n");
+      printf(" RATS forced\n");
-      }
+    }
-      printf(" ATS: ");
+    printf(" ATS: ");
-      print_hex (abtAts, szAts);
+    print_hex(abtAts, szAts);
   }
 
-  nfc_disconnect (pnd);
+  nfc_close(pnd);
-  return 0;
+  nfc_exit(context);
+  exit(EXIT_SUCCESS);
 }

examples/nfc-dep-initiator.1

@@ -18,7 +18,7 @@ Please report any bugs on the
 .B libnfc
 issue tracker at:
 .br
-.BR http://code.google.com/p/libnfc/issues
+.BR https://github.com/nfc-tools/libnfc/issues
 .SH LICENCE
 .B libnfc
 is licensed under the GNU Lesser General Public License (LGPL), version 3.

examples/nfc-dep-initiator.c

@@ -1,8 +1,14 @@
 /*-
- * Public platform independent Near Field Communication (NFC) library examples
+ * Free/Libre Near Field Communication (NFC) library
  *
- * Copyright (C) 2009, Roel Verdult
+ * Libnfc historical contributors:
- * Copyright (C) 2010, Romuald Conty
+ * Copyright (C) 2009      Roel Verdult
+ * Copyright (C) 2009-2013 Romuald Conty
+ * Copyright (C) 2010-2012 Romain Tartière
+ * Copyright (C) 2010-2013 Philippe Teuwen
+ * Copyright (C) 2012-2013 Ludovic Rousseau
+ * See AUTHORS file for a more comprehensive list of contributors.
+ * Additional contributors of this file:
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -48,62 +54,83 @@
 
 #define MAX_FRAME_LEN 264
 
-static nfc_device_t *pnd;
+static nfc_device *pnd;
+static nfc_context *context;
 
-void stop_dep_communication (int sig)
+static void stop_dep_communication(int sig)
 {
   (void) sig;
-  if (pnd)
+  if (pnd != NULL) {
-    nfc_abort_command (pnd);
+    nfc_abort_command(pnd);
-  else
+  } else {
-    exit (EXIT_FAILURE);
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
+  }
 }
 
 int
-main (int argc, const char *argv[])
+main(int argc, const char *argv[])
 {
-  nfc_target_t nt;
+  nfc_target nt;
-  byte_t  abtRx[MAX_FRAME_LEN];
+  uint8_t  abtRx[MAX_FRAME_LEN];
-  size_t  szRx = sizeof(abtRx);
+  uint8_t  abtTx[] = "Hello World!";
-  byte_t  abtTx[] = "Hello World!";
 
   if (argc > 1) {
-    printf ("Usage: %s\n", argv[0]);
+    printf("Usage: %s\n", argv[0]);
-    return EXIT_FAILURE;
+    exit(EXIT_FAILURE);
   }
 
-  pnd = nfc_connect (NULL);
+  nfc_init(&context);
-  if (!pnd) {
+  if (context == NULL) {
-    printf("Unable to connect to NFC device.\n");
+    ERR("Unable to init libnfc (malloc)");
-    return EXIT_FAILURE;
+    exit(EXIT_FAILURE);
   }
-  printf ("Connected to NFC device: %s\n", pnd->acName);
 
-  signal (SIGINT, stop_dep_communication);
+  pnd = nfc_open(context, NULL);
+  if (pnd == NULL) {
+    ERR("Unable to open NFC device.");
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
+  }
+  printf("NFC device: %s\n opened", nfc_device_get_name(pnd));
 
-  if (!nfc_initiator_init (pnd)) {
+  signal(SIGINT, stop_dep_communication);
+
+  if (nfc_initiator_init(pnd) < 0) {
     nfc_perror(pnd, "nfc_initiator_init");
-    return EXIT_FAILURE;
+    nfc_close(pnd);
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
   }
 
-  if(!nfc_initiator_select_dep_target (pnd, NDM_PASSIVE, NBR_212, NULL, &nt)) {
+  if (nfc_initiator_select_dep_target(pnd, NDM_PASSIVE, NBR_212, NULL, &nt, 1000) < 0) {
     nfc_perror(pnd, "nfc_initiator_select_dep_target");
-    goto error;
+    nfc_close(pnd);
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
   }
-  print_nfc_target (nt, false);
+  print_nfc_target(&nt, false);
 
-  printf ("Sending: %s\n", abtTx);
+  printf("Sending: %s\n", abtTx);
-  if (!nfc_initiator_transceive_bytes (pnd, abtTx, sizeof(abtTx), abtRx, &szRx, NULL)) {
+  int res;
+  if ((res = nfc_initiator_transceive_bytes(pnd, abtTx, sizeof(abtTx), abtRx, sizeof(abtRx), 0)) < 0) {
     nfc_perror(pnd, "nfc_initiator_transceive_bytes");
-    goto error;
+    nfc_close(pnd);
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
   }
 
-  abtRx[szRx] = 0;
+  abtRx[res] = 0;
-  printf ("Received: %s\n", abtRx);
+  printf("Received: %s\n", abtRx);
 
-  nfc_initiator_deselect_target (pnd);
+  if (nfc_initiator_deselect_target(pnd) < 0) {
+    nfc_perror(pnd, "nfc_initiator_deselect_target");
+    nfc_close(pnd);
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
+  }
 
-error:
+  nfc_close(pnd);
-  nfc_disconnect (pnd);
+  nfc_exit(context);
-  return EXIT_SUCCESS;
+  exit(EXIT_SUCCESS);
 }

examples/nfc-dep-target.1

@@ -18,7 +18,7 @@ Please report any bugs on the
 .B libnfc
 issue tracker at:
 .br
-.BR http://code.google.com/p/libnfc/issues
+.BR https://github.com/nfc-tools/libnfc/issues
 .SH LICENCE
 .B libnfc
 is licensed under the GNU Lesser General Public License (LGPL), version 3.

examples/nfc-dep-target.c

@@ -1,8 +1,14 @@
 /*-
- * Public platform independent Near Field Communication (NFC) library examples
+ * Free/Libre Near Field Communication (NFC) library
  *
- * Copyright (C) 2009, Roel Verdult
+ * Libnfc historical contributors:
- * Copyright (C) 2010, Romuald Conty
+ * Copyright (C) 2009      Roel Verdult
+ * Copyright (C) 2009-2013 Romuald Conty
+ * Copyright (C) 2010-2012 Romain Tartière
+ * Copyright (C) 2010-2013 Philippe Teuwen
+ * Copyright (C) 2012-2013 Ludovic Rousseau
+ * See AUTHORS file for a more comprehensive list of contributors.
+ * Additional contributors of this file:
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -47,46 +53,55 @@
 
 #define MAX_FRAME_LEN 264
 
-static nfc_device_t *pnd;
+static nfc_device *pnd;
+static nfc_context *context;
 
-void stop_dep_communication (int sig)
+static void stop_dep_communication(int sig)
 {
   (void) sig;
-  if (pnd)
+  if (pnd != NULL) {
-    nfc_abort_command (pnd);
+    nfc_abort_command(pnd);
-  else
+  } else {
-    exit (EXIT_FAILURE);
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
+  }
 }
 
 int
-main (int argc, const char *argv[])
+main(int argc, const char *argv[])
 {
-  byte_t  abtRx[MAX_FRAME_LEN];
+  uint8_t  abtRx[MAX_FRAME_LEN];
-  size_t  szRx = sizeof(abtRx);
+  int  szRx;
-  size_t  szDeviceFound;
+  uint8_t  abtTx[] = "Hello Mars!";
-  byte_t  abtTx[] = "Hello Mars!";
-  #define MAX_DEVICE_COUNT 2
-  nfc_device_desc_t pnddDevices[MAX_DEVICE_COUNT];
-  nfc_list_devices (pnddDevices, MAX_DEVICE_COUNT, &szDeviceFound);
-  // Little hack to allow using nfc-dep-initiator & nfc-dep-target from
-  // the same machine: if there is more than one readers connected
-  // nfc-dep-target will connect to the second reader
-  // (we hope they're always detected in the same order)
-  if (szDeviceFound == 1) {
-    pnd = nfc_connect (&(pnddDevices[0]));
-  } else if (szDeviceFound > 1) {
-    pnd = nfc_connect (&(pnddDevices[1]));
-  } else {
-    printf("No device found.");
-    return EXIT_FAILURE;
-  }
 
   if (argc > 1) {
-    printf ("Usage: %s\n", argv[0]);
+    printf("Usage: %s\n", argv[0]);
-    return EXIT_FAILURE;
+    exit(EXIT_FAILURE);
   }
 
-  nfc_target_t nt = {
+  nfc_init(&context);
+  if (context == NULL) {
+    ERR("Unable to init libnfc (malloc)");
+    exit(EXIT_FAILURE);
+  }
+#define MAX_DEVICE_COUNT 2
+  nfc_connstring connstrings[MAX_DEVICE_COUNT];
+  size_t szDeviceFound = nfc_list_devices(context, connstrings, MAX_DEVICE_COUNT);
+  // Little hack to allow using nfc-dep-initiator & nfc-dep-target from
+  // the same machine: if there is more than one readers opened
+  // nfc-dep-target will open the second reader
+  // (we hope they're always detected in the same order)
+  if (szDeviceFound == 1) {
+    pnd = nfc_open(context, connstrings[0]);
+  } else if (szDeviceFound > 1) {
+    pnd = nfc_open(context, connstrings[1]);
+  } else {
+    printf("No device found.\n");
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
+  }
+
+  nfc_target nt = {
     .nm = {
       .nmt = NMT_DEP,
       .nbr = NBR_UNDEFINED
@@ -96,7 +111,7 @@ main (int argc, const char *argv[])
         .abtNFCID3 = { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xff, 0x00, 0x00 },
         .szGB = 4,
         .abtGB = { 0x12, 0x34, 0x56, 0x78 },
-	.ndm = NDM_UNDEFINED,
+        .ndm = NDM_UNDEFINED,
         /* These bytes are not used by nfc_target_init: the chip will provide them automatically to the initiator */
         .btDID = 0x00,
         .btBS = 0x00,
@@ -107,39 +122,46 @@ main (int argc, const char *argv[])
     },
   };
 
-  if (!pnd) {
+  if (pnd == NULL) {
-    printf("Unable to connect to NFC device.\n");
+    printf("Unable to open NFC device.\n");
-    return EXIT_FAILURE;
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
   }
-  printf ("Connected to NFC device: %s\n", pnd->acName);
+  printf("NFC device: %s opened\n", nfc_device_get_name(pnd));
 
-  signal (SIGINT, stop_dep_communication);
+  signal(SIGINT, stop_dep_communication);
 
-  printf ("NFC device will now act as: ");
+  printf("NFC device will now act as: ");
-  print_nfc_target (nt, false);
+  print_nfc_target(&nt, false);
 
-  printf ("Waiting for initiator request...\n");
+  printf("Waiting for initiator request...\n");
-  if(!nfc_target_init (pnd, &nt, abtRx, &szRx)) {
+  if ((szRx = nfc_target_init(pnd, &nt, abtRx, sizeof(abtRx), 0)) < 0) {
     nfc_perror(pnd, "nfc_target_init");
-    goto error;
+    nfc_close(pnd);
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
   }
 
   printf("Initiator request received. Waiting for data...\n");
-  if (!nfc_target_receive_bytes (pnd, abtRx, &szRx, NULL)) {
+  if ((szRx = nfc_target_receive_bytes(pnd, abtRx, sizeof(abtRx), 0)) < 0) {
     nfc_perror(pnd, "nfc_target_receive_bytes");
-    goto error;
+    nfc_close(pnd);
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
   }
-  abtRx[szRx] = '\0';
+  abtRx[(size_t) szRx] = '\0';
-  printf ("Received: %s\n", abtRx);
+  printf("Received: %s\n", abtRx);
 
-  printf ("Sending: %s\n", abtTx);
+  printf("Sending: %s\n", abtTx);
-  if (!nfc_target_send_bytes (pnd, abtTx, sizeof(abtTx), NULL)) {
+  if (nfc_target_send_bytes(pnd, abtTx, sizeof(abtTx), 0) < 0) {
     nfc_perror(pnd, "nfc_target_send_bytes");
-    goto error;
+    nfc_close(pnd);
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
   }
   printf("Data sent.\n");
 
-error:
+  nfc_close(pnd);
-  nfc_disconnect (pnd);
+  nfc_exit(context);
-  return EXIT_SUCCESS;
+  exit(EXIT_SUCCESS);
 }

examples/nfc-emulate-forum-tag2.1

@@ -0,0 +1,52 @@
+.Dd September 19, 2012
+.Dt NFC-EMULATE-FORUM-TAG2 1 URM
+.Sh NAME
+.Nm nfc-emulate-forum-tag2
+.Nd NFC Forum tag type 2 emulation command line demonstration tool
+.Sh SYNOPSIS
+.Nm
+.Sh DESCRIPTION
+.Nm 
+is a demonstration tool that emulates a NFC-Forum Tag Type 2 with NDEF content.
+.Pp
+Some devices compliant with NFC-Forum Tag Type 2 can be used with this example,
+in read mode only.
+.Sh IMPORTANT
+This example has been developed using PN533 USB hardware as target and Google
+Nexus S phone as initiator.
+.Pp
+This is know to NOT work with Nokia 6212 Classic and could fail with several
+NFC Forum compliant devices due to the following reasons:
+.Pp
+- The emulated target has only a 4-byte UID while most devices assume a
+Tag Type 2 has always a 7-byte UID (as a real Mifare Ultralight tag);
+.Pp
+- The chip is emulating an ISO/IEC 14443-3 tag, without any hardware helper.
+If the initiator have too strict timeouts for software-based emulation
+(which is usually the case), this example will fail.
+This is not a bug and we can't do anything using this hardware (PN531/PN533).
+.Pp
+ACR122 devices (like touchatag, etc.) can be used by this example, but if
+something goes wrong, you will have to unplug/replug your device.
+This is not a
+.Em libnfc's
+bug, this problem is due to ACR122's internal MCU in front of NFC chip (PN532).
+.Sh BUGS
+Please report any bugs on the
+.Em libnfc
+issue tracker at:
+.Em https://github.com/nfc-tools/libnfc/issues
+.Sh LICENCE
+.Em libnfc
+is licensed under the GNU Lesser General Public License (LGPL), version 3.
+.Em libnfc-utils
+and 
+.Em libnfc-examples
+are covered by the BSD 2-Clause license.
+.Sh AUTHORS
+.An Roel Verdult Aq roel@libnfc.org
+.An Romain Tartière Aq romain@libnfc.org
+.An Romuald Conty Aq romuald@libnfc.org
+.Pp
+This manual page was written by Romuald Conty.
+It is licensed under the terms of the GNU GPL (version 2 or later).

examples/nfc-emulate-forum-tag2.c

@@ -1,7 +1,14 @@
 /*-
- * Public platform independent Near Field Communication (NFC) library examples
+ * Free/Libre Near Field Communication (NFC) library
  *
- * Copyright (C) 2011, Romuald Conty
+ * Libnfc historical contributors:
+ * Copyright (C) 2009      Roel Verdult
+ * Copyright (C) 2009-2013 Romuald Conty
+ * Copyright (C) 2010-2012 Romain Tartière
+ * Copyright (C) 2010-2013 Philippe Teuwen
+ * Copyright (C) 2012-2013 Ludovic Rousseau
+ * See AUTHORS file for a more comprehensive list of contributors.
+ * Additional contributors of this file:
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -29,19 +36,21 @@
 
 /**
  * @file nfc-emulate-forum-tag2.c
- * @brief Emulates a NFC Forum Tag Type 2 with a NDEF message
+ * @brief Emulates a NFC-Forum Tag Type 2 with a NDEF message
- * This example allow to emulate an NFC Forum Tag Type 2 that contains a read-only NDEF message.
+ * This example allow to emulate an NFC-Forum Tag Type 2 that contains
+ * a read-only NDEF message.
  *
- * It have been developed using PN533 USB hardware as target and Google Nexus S phone as initiator.
+ * This example has been developed using PN533 USB hardware as target and
+ * Google Nexus S phone as initiator.
  *
- * This is know to NOT work with Nokia 6212 Classic and could not work with
+ * This is know to NOT work with Nokia 6212 Classic and could fail with
- * several NFC Forum compiliant devices due to these reasons:
+ * several NFC Forum compliant devices due to the following reasons:
- *  - The emulated target only have a 4 bytes UID where 7 bytes UID (as a real
+ *  - The emulated target has only a 4-byte UID while most devices assume a Tag
- *  Mifare Ultralight tag) are usually attempted;
+ *  Type 2 has always a 7-byte UID (as a real Mifare Ultralight tag);
- *  - The chip is emulating a ISO/IEC 14443-3 tag, without any hardware helper.
+ *  - The chip is emulating an ISO/IEC 14443-3 tag, without any hardware helper.
- *  If the initiator have too short timeouts for software-based emulation
+ *  If the initiator has too strict timeouts for software-based emulation
- *  (which is usually the case), this example will failed, this is not a bug
+ *  (which is usually the case), this example will fail. This is not a bug
- *  and we can't do anything using this kind of hardware (PN531/PN533).
+ *  and we can't do anything using this hardware (PN531/PN533).
  */
 
 /*
@@ -69,18 +78,20 @@
 #include <nfc/nfc.h>
 #include <nfc/nfc-emulation.h>
 
-#include "nfc-utils.h"
+#include "utils/nfc-utils.h"
 
-static nfc_device_t *pnd;
+static nfc_device *pnd;
+static nfc_context *context;
 
-void
+static void
-stop_emulation (int sig)
+stop_emulation(int sig)
 {
   (void)sig;
-  if (pnd) {
+  if (pnd != NULL) {
-   nfc_abort_command(pnd);
+    nfc_abort_command(pnd);
   } else {
-    exit (EXIT_FAILURE);
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
   }
 }
 
@@ -111,15 +122,15 @@ static uint8_t __nfcforum_tag2_memory_area[] = {
 #define SECTOR_SELECT 	0xC2
 
 #define HALT 		0x50
-int
+static int
-nfcforum_tag2_io (struct nfc_emulator *emulator, const byte_t *data_in, const size_t data_in_len, byte_t *data_out, const size_t data_out_len)
+nfcforum_tag2_io(struct nfc_emulator *emulator, const uint8_t *data_in, const size_t data_in_len, uint8_t *data_out, const size_t data_out_len)
 {
   int res = 0;
 
   uint8_t *nfcforum_tag2_memory_area = (uint8_t *)(emulator->user_data);
 
-  printf ("    In: ");
+  printf("    In: ");
-  print_hex (data_in, data_in_len);
+  print_hex(data_in, data_in_len);
 
   switch (data_in[0]) {
     case READ:
@@ -131,19 +142,19 @@ nfcforum_tag2_io (struct nfc_emulator *emulator, const byte_t *data_in, const si
       }
       break;
     case HALT:
-      printf ("HALT sent\n");
+      printf("HALT sent\n");
       res = -ECONNABORTED;
       break;
     default:
-      printf ("Unknown command: 0x%02x\n", data_in[0]);
+      printf("Unknown command: 0x%02x\n", data_in[0]);
       res = -ENOTSUP;
   }
 
   if (res < 0) {
-    ERR ("%s (%d)", strerror (-res), -res);
+    ERR("%s (%d)", strerror(-res), -res);
   } else {
-    printf ("    Out: ");
+    printf("    Out: ");
-    print_hex (data_out, res);
+    print_hex(data_out, res);
   }
 
   return res;
@@ -155,7 +166,7 @@ main(int argc, char *argv[])
   (void)argc;
   (void)argv;
 
-  nfc_target_t nt = {
+  nfc_target nt = {
     .nm = {
       .nmt = NMT_ISO14443A,
       .nbr = NBR_UNDEFINED, // Will be updated by nfc_target_init()
@@ -172,37 +183,41 @@ main(int argc, char *argv[])
   };
 
   struct nfc_emulation_state_machine state_machine = {
-    .io   = nfcforum_tag2_io
+    .io = nfcforum_tag2_io
   };
 
   struct nfc_emulator emulator = {
-    .target= &nt,
+    .target = &nt,
     .state_machine = &state_machine,
     .user_data = __nfcforum_tag2_memory_area,
   };
 
-  signal (SIGINT, stop_emulation);
+  signal(SIGINT, stop_emulation);
-  pnd = nfc_connect (NULL);
+
+  nfc_init(&context);
+  if (context == NULL) {
+    ERR("Unable to init libnfc (malloc)");
+    exit(EXIT_FAILURE);
+  }
+  pnd = nfc_open(context, NULL);
 
   if (pnd == NULL) {
-    ERR("Unable to connect to NFC device");
+    ERR("Unable to open NFC device");
-    exit (EXIT_FAILURE);
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
   }
 
-  printf ("Connected to NFC device: %s\n", pnd->acName);
+  printf("NFC device: %s opened\n", nfc_device_get_name(pnd));
-  printf ("Emulating NDEF tag now, please touch it with a second NFC device\n");
+  printf("Emulating NDEF tag now, please touch it with a second NFC device\n");
 
-  if (nfc_emulate_target (pnd, &emulator) < 0) {
+  if (nfc_emulate_target(pnd, &emulator, 0) < 0) {
-    goto error;
+    nfc_perror(pnd, argv[0]);
+    nfc_close(pnd);
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
   }
 
-  nfc_disconnect(pnd);
+  nfc_close(pnd);
-
+  nfc_exit(context);
-  exit (EXIT_SUCCESS);
+  exit(EXIT_SUCCESS);
-
-error:
-  if (pnd) {
-    nfc_perror (pnd, argv[0]);
-    nfc_disconnect (pnd);
-  }
 }

examples/nfc-emulate-tag.1

@@ -39,7 +39,7 @@ Please report any bugs on the
 .B libnfc
 issue tracker at:
 .br
-.BR http://code.google.com/p/libnfc/issues
+.BR https://github.com/nfc-tools/libnfc/issues
 .SH LICENCE
 .B libnfc
 is licensed under the GNU Lesser General Public License (LGPL), version 3.

examples/nfc-emulate-tag.c

@@ -1,7 +1,14 @@
 /*-
- * Public platform independent Near Field Communication (NFC) library examples
+ * Free/Libre Near Field Communication (NFC) library
  *
- * Copyright (C) 2010, Romuald Conty
+ * Libnfc historical contributors:
+ * Copyright (C) 2009      Roel Verdult
+ * Copyright (C) 2009-2013 Romuald Conty
+ * Copyright (C) 2010-2012 Romain Tartière
+ * Copyright (C) 2010-2013 Philippe Teuwen
+ * Copyright (C) 2012-2013 Ludovic Rousseau
+ * See AUTHORS file for a more comprehensive list of contributors.
+ * Additional contributors of this file:
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -54,39 +61,43 @@
 #define MAX_FRAME_LEN (264)
 #define SAK_ISO14443_4_COMPLIANT 0x20
 
-static byte_t abtRx[MAX_FRAME_LEN];
+static uint8_t abtRx[MAX_FRAME_LEN];
-static size_t szRx = sizeof(abtRx);
+static int szRx;
-static nfc_device_t *pnd;
+static nfc_context *context;
+static nfc_device *pnd;
 static bool quiet_output = false;
 static bool init_mfc_auth = false;
 
-void
+static void
-intr_hdlr (void)
+intr_hdlr(int sig)
 {
-  printf ("\nQuitting...\n");
+  (void) sig;
+  printf("\nQuitting...\n");
   if (pnd != NULL) {
-    nfc_disconnect(pnd);
+    nfc_abort_command(pnd);
   }
-  exit (EXIT_FAILURE);
+  nfc_close(pnd);
+  nfc_exit(context);
+  exit(EXIT_FAILURE);
 }
 
-bool 
+static bool
-target_io( nfc_target_t * pnt, const byte_t * pbtInput, const size_t szInput, byte_t * pbtOutput, size_t *pszOutput )
+target_io(nfc_target *pnt, const uint8_t *pbtInput, const size_t szInput, uint8_t *pbtOutput, size_t *pszOutput)
 {
   bool loop = true;
   *pszOutput = 0;
 
   // Show transmitted command
   if (!quiet_output) {
-    printf ("    In: ");
+    printf("    In: ");
-    print_hex (pbtInput, szInput);
+    print_hex(pbtInput, szInput);
   }
-  if(szInput) {
+  if (szInput) {
-    switch(pbtInput[0]) {
+    switch (pbtInput[0]) {
       case 0x30: // Mifare read
         // block address is in pbtInput[1]
         *pszOutput = 15;
-        strcpy((char*)pbtOutput, "You read block ");
+        strcpy((char *)pbtOutput, "You read block ");
         pbtOutput[15] = pbtInput[1];
         break;
       case 0x50: // HLTA (ISO14443-3)
@@ -107,9 +118,9 @@ target_io( nfc_target_t * pnt, const byte_t * pbtInput, const size_t szInput, by
       case 0xe0: // RATS (ISO14443-4)
         // Send ATS
         *pszOutput = pnt->nti.nai.szAtsLen + 1;
-        pbtOutput[0] = pnt->nti.nai.szAtsLen + 1; // ISO14443-4 says that ATS contains ATS_Lenght as first byte
+        pbtOutput[0] = pnt->nti.nai.szAtsLen + 1; // ISO14443-4 says that ATS contains ATS_Length as first byte
-        if(pnt->nti.nai.szAtsLen) {
+        if (pnt->nti.nai.szAtsLen) {
-          memcpy(pbtOutput+1, pnt->nti.nai.abtAts, pnt->nti.nai.szAtsLen);
+          memcpy(pbtOutput + 1, pnt->nti.nai.abtAts, pnt->nti.nai.szAtsLen);
         }
         break;
       case 0xc2: // S-block DESELECT
@@ -127,39 +138,44 @@ target_io( nfc_target_t * pnt, const byte_t * pbtInput, const size_t szInput, by
   }
   // Show transmitted command
   if ((!quiet_output) && *pszOutput) {
-    printf ("    Out: ");
+    printf("    Out: ");
-    print_hex (pbtOutput, *pszOutput);
+    print_hex(pbtOutput, *pszOutput);
   }
   return loop;
 }
 
-bool
+static bool
-nfc_target_emulate_tag(nfc_device_t* pnd, nfc_target_t * pnt)
+nfc_target_emulate_tag(nfc_device *dev, nfc_target *pnt)
 {
   size_t szTx;
-  byte_t abtTx[MAX_FRAME_LEN];
+  uint8_t abtTx[MAX_FRAME_LEN];
   bool loop = true;
 
-  if (!nfc_target_init (pnd, pnt, abtRx, &szRx)) {
+  if ((szRx = nfc_target_init(dev, pnt, abtRx, sizeof(abtRx), 0)) < 0) {
-    nfc_perror (pnd, "nfc_target_init");
+    nfc_perror(dev, "nfc_target_init");
     return false;
   }
 
-  while ( loop ) {
+  while (loop) {
-    loop = target_io( pnt, abtRx, szRx, abtTx, &szTx );
+    loop = target_io(pnt, abtRx, (size_t) szRx, abtTx, &szTx);
     if (szTx) {
-      if (!nfc_target_send_bytes(pnd, abtTx, szTx, NULL)) {
+      if (nfc_target_send_bytes(dev, abtTx, szTx, 0) < 0) {
-        nfc_perror (pnd, "nfc_target_send_bytes");
+        nfc_perror(dev, "nfc_target_send_bytes");
         return false;
       }
     }
-    if ( loop ) {
+    if (loop) {
-      if ( init_mfc_auth ) {
+      if (init_mfc_auth) {
-        nfc_configure (pnd, NDO_HANDLE_CRC, false);
+        if (nfc_device_set_property_bool(dev, NP_HANDLE_CRC, false) < 0) {
+          nfc_perror(pnd, "nfc_target_emulate_tag");
+          nfc_close(pnd);
+          nfc_exit(context);
+          exit(EXIT_FAILURE);
+        }
         init_mfc_auth = false;
       }
-      if (!nfc_target_receive_bytes(pnd, abtRx, &szRx, NULL)) {
+      if ((szRx = nfc_target_receive_bytes(dev, abtRx, sizeof(abtRx), 0)) < 0) {
-        nfc_perror (pnd, "nfc_target_receive_bytes");
+        nfc_perror(dev, "nfc_target_receive_bytes");
         return false;
       }
     }
@@ -168,30 +184,37 @@ nfc_target_emulate_tag(nfc_device_t* pnd, nfc_target_t * pnt)
 }
 
 int
-main (int argc, char *argv[])
+main(int argc, char *argv[])
 {
   (void) argc;
   const char *acLibnfcVersion;
 
 #ifdef WIN32
-  signal (SIGINT, (void (__cdecl *) (int)) intr_hdlr);
+  signal(SIGINT, (void (__cdecl *)(int)) intr_hdlr);
 #else
-  signal (SIGINT, (void (*)()) intr_hdlr);
+  signal(SIGINT, intr_hdlr);
 #endif
 
-  // Try to open the NFC reader
+  nfc_init(&context);
-  pnd = nfc_connect (NULL);
+  if (context == NULL) {
-
+    ERR("Unable to init libnfc (malloc)");
-  // Display libnfc version
+    exit(EXIT_FAILURE);
-  acLibnfcVersion = nfc_version ();
-  printf ("%s uses libnfc %s\n", argv[0], acLibnfcVersion);
-
-  if (pnd == NULL) {
-    ERR("Unable to connect to NFC device");
-    exit (EXIT_FAILURE);
   }
 
-  printf ("Connected to NFC device: %s\n", pnd->acName);
+  // Display libnfc version
+  acLibnfcVersion = nfc_version();
+  printf("%s uses libnfc %s\n", argv[0], acLibnfcVersion);
+
+  // Try to open the NFC reader
+  pnd = nfc_open(context, NULL);
+
+  if (pnd == NULL) {
+    ERR("Unable to open NFC device");
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
+  }
+
+  printf("NFC device: %s opened\n", nfc_device_get_name(pnd));
 
   // Notes for ISO14443-A emulated tags:
   // * Only short UIDs are supported
@@ -203,7 +226,7 @@ main (int argc, char *argv[])
 
   // Example of a Mifare Classic Mini
   // Note that crypto1 is not implemented in this example
-  nfc_target_t nt = {
+  nfc_target nt = {
     .nm = {
       .nmt = NMT_ISO14443A,
       .nbr = NBR_UNDEFINED,
@@ -218,42 +241,62 @@ main (int argc, char *argv[])
       },
     },
   };
-/*
+  /*
   // Example of a FeliCa
-  nfc_target_t nt = {
+  nfc_target nt = {
-    .nm.nmt = NMT_FELICA,
+    .nm = {
-    .nm.nbr = NBR_UNDEFINED,
+      .nmt = NMT_FELICA,
-    .nti.nfi.abtId = { 0x01, 0xFE, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF },
+      .nbr = NBR_UNDEFINED,
-    .nti.nfi.abtPad = { 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF },
+    },
-    .nti.nfi.abtSysCode = { 0xFF, 0xFF },
+    .nti = {
+      .nfi = {
+        .abtId = { 0x01, 0xFE, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF },
+        .abtPad = { 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF },
+        .abtSysCode = { 0xFF, 0xFF },
+      },
+    },
   };
-*/
+  */
-/*
+  /*
   // Example of a ISO14443-4 (DESfire)
-  nfc_target_t nt = {
+  nfc_target nt = {
-    .nm.nmt = NMT_ISO14443A,
+    .nm = {
-    .nm.nbr = NBR_UNDEFINED,
+      .nmt = NMT_ISO14443A,
-    .nti.nai.abtAtqa = { 0x03, 0x44 },
+      .nbr = NBR_UNDEFINED,
-    .nti.nai.abtUid = { 0x08, 0xab, 0xcd, 0xef },
+    },
-    .nti.nai.btSak = 0x20,
+    .nti = {
-    .nti.nai.szUidLen = 4,
+      .nai = {
-    .nti.nai.abtAts = { 0x75, 0x77, 0x81, 0x02, 0x80 },
+        .abtAtqa = { 0x03, 0x44 },
-    .nti.nai.szAtsLen = 5,
+        .abtUid = { 0x08, 0xab, 0xcd, 0xef },
+        .btSak = 0x20,
+        .szUidLen = 4,
+        .abtAts = { 0x75, 0x77, 0x81, 0x02, 0x80 },
+        .szAtsLen = 5,
+      },
+    },
   };
-*/
+  */
 
-  printf ("%s will emulate this ISO14443-A tag:\n", argv[0]);
+  printf("%s will emulate this ISO14443-A tag:\n", argv[0]);
-  print_nfc_iso14443a_info (nt.nti.nai, true);
+  print_nfc_target(&nt, true);
 
-  // Switch off NDO_EASY_FRAMING if target is not ISO14443-4
+  // Switch off NP_EASY_FRAMING if target is not ISO14443-4
-  nfc_configure (pnd, NDO_EASY_FRAMING, (nt.nti.nai.btSak & SAK_ISO14443_4_COMPLIANT));
+  if (nfc_device_set_property_bool(pnd, NP_EASY_FRAMING, (nt.nti.nai.btSak & SAK_ISO14443_4_COMPLIANT)) < 0) {
-  printf ("NFC device (configured as target) is now emulating the tag, please touch it with a second NFC device (initiator)\n");
+    nfc_perror(pnd, "nfc_target_emulate_tag");
-  if (!nfc_target_emulate_tag (pnd, &nt)) {
+    nfc_close(pnd);
-    nfc_perror (pnd, "nfc_target_emulate_tag");
+    nfc_exit(context);
-    exit (EXIT_FAILURE);
+    exit(EXIT_FAILURE);
+  }
+  printf("NFC device (configured as target) is now emulating the tag, please touch it with a second NFC device (initiator)\n");
+  if (!nfc_target_emulate_tag(pnd, &nt)) {
+    nfc_perror(pnd, "nfc_target_emulate_tag");
+    nfc_close(pnd);
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
   }
 
-  nfc_disconnect(pnd);
+  nfc_close(pnd);
-  exit (EXIT_SUCCESS);
+  nfc_exit(context);
+  exit(EXIT_SUCCESS);
 }
 

examples/nfc-emulate-uid.1

@@ -7,14 +7,14 @@ nfc-emulate-uid \- NFC target emulation command line tool based on libnfc
 .RI [ UID ]
 .SH DESCRIPTION
 .B nfc-emulate-uid
-is a tag emulation tool that allows to choose any tag UID. Tag emulation is one
+is a tag emulation tool that allows one to choose any tag UID. Tag emulation is one
 of the main added features in NFC. But to avoid abuse of existing systems,
 manufacturers of the NFC controller intentionally did not support emulation of
 fully customized UID but only of "random" UIDs, which always start with 0x08.
 The nfc-emulate-uid tool demonstrates that this can still be done using
 transmission of raw frames, and the desired UID can be optionally specified.
 
-This makes it a serious thread for security systems that rely only on the
+This makes it a serious threat for security systems that rely only on the
 uniqueness of the UID.
 
 Unfortunately, this example can't directly start in fully customisable
@@ -54,7 +54,7 @@ Please report any bugs on the
 .B libnfc
 issue tracker at:
 .br
-.BR http://code.google.com/p/libnfc/issues
+.BR https://github.com/nfc-tools/libnfc/issues
 .SH LICENCE
 .B libnfc
 is licensed under the GNU Lesser General Public License (LGPL), version 3.

examples/nfc-emulate-uid.c

@@ -1,8 +1,14 @@
 /*-
- * Public platform independent Near Field Communication (NFC) library examples
+ * Free/Libre Near Field Communication (NFC) library
  *
- * Copyright (C) 2009, Roel Verdult
+ * Libnfc historical contributors:
- * Copyright (C) 2010, Romuald Conty
+ * Copyright (C) 2009      Roel Verdult
+ * Copyright (C) 2009-2013 Romuald Conty
+ * Copyright (C) 2010-2012 Romain Tartière
+ * Copyright (C) 2010-2013 Philippe Teuwen
+ * Copyright (C) 2012-2013 Ludovic Rousseau
+ * See AUTHORS file for a more comprehensive list of contributors.
+ * Additional contributors of this file:
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -56,39 +62,44 @@
 
 #define MAX_FRAME_LEN 264
 
-static byte_t abtRecv[MAX_FRAME_LEN];
+static uint8_t abtRecv[MAX_FRAME_LEN];
-static size_t szRecvBits;
+static int szRecvBits;
-static nfc_device_t *pnd;
+static nfc_device *pnd;
+static nfc_context *context;
 
 // ISO14443A Anti-Collision response
-byte_t  abtAtqa[2] = { 0x04, 0x00 };
+uint8_t  abtAtqa[2] = { 0x04, 0x00 };
-byte_t  abtUidBcc[5] = { 0xDE, 0xAD, 0xBE, 0xEF, 0x62 };
+uint8_t  abtUidBcc[5] = { 0xDE, 0xAD, 0xBE, 0xEF, 0x22 };
-byte_t  abtSak[9] = { 0x08, 0xb6, 0xdd };
+uint8_t  abtSak[9] = { 0x08, 0xb6, 0xdd };
 
-void
+static void
-intr_hdlr (void)
+intr_hdlr(int sig)
 {
+  (void) sig;
   if (pnd != NULL) {
-    printf ("\nAborting current command...\n");
+    printf("\nAborting current command...\n");
-    nfc_abort_command (pnd);
+    nfc_abort_command(pnd);
+    nfc_close(pnd);
   }
+  nfc_exit(context);
+  exit(EXIT_SUCCESS);
 }
 
-void
+static void
-print_usage (char *argv[])
+print_usage(char *argv[])
 {
-  printf ("Usage: %s [OPTIONS] [UID]\n", argv[0]);
+  printf("Usage: %s [OPTIONS] [UID]\n", argv[0]);
-  printf ("Options:\n");
+  printf("Options:\n");
-  printf ("\t-h\tHelp. Print this message.\n");
+  printf("\t-h\tHelp. Print this message.\n");
-  printf ("\t-q\tQuiet mode. Silent output: received and sent frames will not be shown (improves timing).\n");
+  printf("\t-q\tQuiet mode. Silent output: received and sent frames will not be shown (improves timing).\n");
-  printf ("\n");
+  printf("\n");
-  printf ("\t[UID]\tUID to emulate, specified as 8 HEX digits (default is DEADBEEF).\n");
+  printf("\t[UID]\tUID to emulate, specified as 8 HEX digits (default is DEADBEEF).\n");
 }
 
 int
-main (int argc, char *argv[])
+main(int argc, char *argv[])
 {
-  byte_t *pbtTx = NULL;
+  uint8_t *pbtTx = NULL;
   size_t  szTxBits;
   bool    quiet_output = false;
 
@@ -97,50 +108,57 @@ main (int argc, char *argv[])
 
   // Get commandline options
   for (arg = 1; arg < argc; arg++) {
-    if (0 == strcmp (argv[arg], "-h")) {
+    if (0 == strcmp(argv[arg], "-h")) {
-      print_usage (argv);
+      print_usage(argv);
       exit(EXIT_SUCCESS);
-    } else if (0 == strcmp (argv[arg], "-q")) {
+    } else if (0 == strcmp(argv[arg], "-q")) {
-      printf ("Quiet mode.\n");
+      printf("Quiet mode.\n");
       quiet_output = true;
-    } else if ((arg == argc - 1) && (strlen (argv[arg]) == 8)) {        // See if UID was specified as HEX string
+    } else if ((arg == argc - 1) && (strlen(argv[arg]) == 8)) {         // See if UID was specified as HEX string
-      byte_t  abtTmp[3] = { 0x00, 0x00, 0x00 };
+      uint8_t  abtTmp[3] = { 0x00, 0x00, 0x00 };
-      printf ("[+] Using UID: %s\n", argv[arg]);
+      printf("[+] Using UID: %s\n", argv[arg]);
       abtUidBcc[4] = 0x00;
       for (i = 0; i < 4; ++i) {
-        memcpy (abtTmp, argv[arg] + i * 2, 2);
+        memcpy(abtTmp, argv[arg] + i * 2, 2);
-        abtUidBcc[i] = (byte_t) strtol ((char *) abtTmp, NULL, 16);
+        abtUidBcc[i] = (uint8_t) strtol((char *) abtTmp, NULL, 16);
         abtUidBcc[4] ^= abtUidBcc[i];
       }
     } else {
-      ERR ("%s is not supported option.", argv[arg]);
+      ERR("%s is not supported option.", argv[arg]);
-      print_usage (argv);
+      print_usage(argv);
       exit(EXIT_FAILURE);
     }
   }
 
 #ifdef WIN32
-  signal (SIGINT, (void (__cdecl *) (int)) intr_hdlr);
+  signal(SIGINT, (void (__cdecl *)(int)) intr_hdlr);
 #else
-  signal (SIGINT, (void (*)()) intr_hdlr);
+  signal(SIGINT, intr_hdlr);
 #endif
 
-  // Try to open the NFC device
+  nfc_init(&context);
-  pnd = nfc_connect (NULL);
+  if (context == NULL) {
-
+    ERR("Unable to init libnfc (malloc)");
-  if (pnd == NULL) {
-    printf ("Unable to connect to NFC device\n");
     exit(EXIT_FAILURE);
   }
 
-  printf ("\n");
+  // Try to open the NFC device
-  printf ("Connected to NFC device: %s\n", pnd->acName);
+  pnd = nfc_open(context, NULL);
-  printf ("[+] Try to break out the auto-emulation, this requires a second NFC device!\n");
-  printf ("[+] To do this, please send any command after the anti-collision\n");
-  printf ("[+] For example, send a RATS command or use the \"nfc-anticol\" or \"nfc-list\" tool.\n");
 
-  // Note: We have to build a "fake" nfc_target_t in order to do exactly the same that was done before the new nfc_target_init() was introduced.
+  if (pnd == NULL) {
-  nfc_target_t nt = {
+    ERR("Unable to open NFC device");
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
+  }
+
+  printf("\n");
+  printf("NFC device: %s opened\n", nfc_device_get_name(pnd));
+  printf("[+] Try to break out the auto-emulation, this requires a second NFC device!\n");
+  printf("[+] To do this, please send any command after the anti-collision\n");
+  printf("[+] For example, send a RATS command or use the \"nfc-anticol\" or \"nfc-list\" tool.\n");
+
+  // Note: We have to build a "fake" nfc_target in order to do exactly the same that was done before the new nfc_target_init() was introduced.
+  nfc_target nt = {
     .nm = {
       .nmt = NMT_ISO14443A,
       .nbr = NBR_UNDEFINED,
@@ -155,71 +173,71 @@ main (int argc, char *argv[])
       },
     },
   };
-  if (!nfc_target_init (pnd, &nt, abtRecv, &szRecvBits)) {
+  if ((szRecvBits = nfc_target_init(pnd, &nt, abtRecv, sizeof(abtRecv), 0)) < 0) {
-    nfc_perror (pnd, "nfc_target_init");
+    nfc_perror(pnd, "nfc_target_init");
-    ERR ("Could not come out of auto-emulation, no command was received");
+    ERR("Could not come out of auto-emulation, no command was received");
-    goto error;
+    nfc_close(pnd);
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
   }
-  printf ("[+] Received initiator command: ");
+  printf("[+] Received initiator command: ");
-  print_hex_bits (abtRecv, szRecvBits);
+  print_hex_bits(abtRecv, (size_t) szRecvBits);
-  printf ("[+] Configuring communication\n");
+  printf("[+] Configuring communication\n");
-  if (!nfc_configure (pnd, NDO_HANDLE_CRC, false) || !nfc_configure (pnd, NDO_HANDLE_PARITY, true)) {
+  if ((nfc_device_set_property_bool(pnd, NP_HANDLE_CRC, false) < 0) || (nfc_device_set_property_bool(pnd, NP_HANDLE_PARITY, true) < 0)) {
-    nfc_perror (pnd, "nfc_configure");
+    nfc_perror(pnd, "nfc_device_set_property_bool");
-    exit (EXIT_FAILURE);
+    nfc_close(pnd);
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
   }
-  printf ("[+] Done, the emulated tag is initialized with UID: %02X%02X%02X%02X\n\n", abtUidBcc[0], abtUidBcc[1],
+  printf("[+] Done, the emulated tag is initialized with UID: %02X%02X%02X%02X\n\n", abtUidBcc[0], abtUidBcc[1],
-          abtUidBcc[2], abtUidBcc[3]);
+         abtUidBcc[2], abtUidBcc[3]);
 
   while (true) {
     // Test if we received a frame
-    if (nfc_target_receive_bits (pnd, abtRecv, &szRecvBits, NULL)) {
+    if ((szRecvBits = nfc_target_receive_bits(pnd, abtRecv, sizeof(abtRecv), 0)) > 0) {
       // Prepare the command to send back for the anti-collision request
       switch (szRecvBits) {
-      case 7:                  // Request or Wakeup
+        case 7:                  // Request or Wakeup
-        pbtTx = abtAtqa;
+          pbtTx = abtAtqa;
-        szTxBits = 16;
+          szTxBits = 16;
-        // New anti-collsion session started
+          // New anti-collsion session started
-        if (!quiet_output)
+          if (!quiet_output)
-          printf ("\n");
+            printf("\n");
-        break;
+          break;
 
-      case 16:                 // Select All
+        case 16:                 // Select All
-        pbtTx = abtUidBcc;
+          pbtTx = abtUidBcc;
-        szTxBits = 40;
+          szTxBits = 40;
-        break;
+          break;
 
-      case 72:                 // Select Tag
+        case 72:                 // Select Tag
-        pbtTx = abtSak;
+          pbtTx = abtSak;
-        szTxBits = 24;
+          szTxBits = 24;
-        break;
+          break;
 
-      default:                 // unknown length?
+        default:                 // unknown length?
-        szTxBits = 0;
+          szTxBits = 0;
-        break;
+          break;
       }
 
       if (!quiet_output) {
-        printf ("R: ");
+        printf("R: ");
-        print_hex_bits (abtRecv, szRecvBits);
+        print_hex_bits(abtRecv, (size_t) szRecvBits);
       }
       // Test if we know how to respond
       if (szTxBits) {
         // Send and print the command to the screen
-        if (!nfc_target_send_bits (pnd, pbtTx, szTxBits, NULL)) {
+        if (nfc_target_send_bits(pnd, pbtTx, szTxBits, NULL) < 0) {
-          nfc_perror (pnd, "nfc_target_send_bits");
+          nfc_perror(pnd, "nfc_target_send_bits");
-          goto error;
+          nfc_close(pnd);
+          nfc_exit(context);
+          exit(EXIT_FAILURE);
         }
         if (!quiet_output) {
-          printf ("T: ");
+          printf("T: ");
-          print_hex_bits (pbtTx, szTxBits);
+          print_hex_bits(pbtTx, szTxBits);
         }
       }
     }
   }
-  nfc_disconnect (pnd);
-  exit (EXIT_SUCCESS);
-
-error:
-  nfc_disconnect (pnd);
-  exit (EXIT_FAILURE);
 }

examples/nfc-mfsetuid.1

@@ -24,7 +24,7 @@ Please report any bugs on the
 .B libnfc
 issue tracker at:
 .br
-.BR http://code.google.com/p/libnfc/issues
+.BR https://github.com/nfc-tools/libnfc/issues
 .SH LICENCE
 .B libnfc
 is licensed under the GNU Lesser General Public License (LGPL), version 3.

examples/nfc-mfsetuid.c

@@ -0,0 +1,399 @@
+/*-
+ * Free/Libre Near Field Communication (NFC) library
+ *
+ * Libnfc historical contributors:
+ * Copyright (C) 2009      Roel Verdult
+ * Copyright (C) 2009-2013 Romuald Conty
+ * Copyright (C) 2010-2012 Romain Tartière
+ * Copyright (C) 2010-2013 Philippe Teuwen
+ * Copyright (C) 2012-2013 Ludovic Rousseau
+ * See AUTHORS file for a more comprehensive list of contributors.
+ * Additional contributors of this file:
+ * Copyright (C) 2011      Adam Laurie
+ * Copyright (C) 2014      Dario Carluccio
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *  1) Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  2 )Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Note that this license only applies on the examples, NFC library itself is under LGPL
+ *
+ */
+
+/**
+ * @file nfc-mfsetuid.c
+ * @brief Set UID of special Mifare cards
+ */
+
+/**
+ * based on nfc-anticol.c
+ */
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif // HAVE_CONFIG_H
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <string.h>
+
+#include <nfc/nfc.h>
+
+#include "utils/nfc-utils.h"
+
+#define SAK_FLAG_ATS_SUPPORTED 0x20
+
+#define MAX_FRAME_LEN 264
+
+static uint8_t abtRx[MAX_FRAME_LEN];
+static int szRxBits;
+static uint8_t abtRawUid[12];
+static uint8_t abtAtqa[2];
+static uint8_t abtSak;
+static uint8_t abtAts[MAX_FRAME_LEN];
+static uint8_t szAts = 0;
+static size_t szCL = 1;//Always start with Cascade Level 1 (CL1)
+static nfc_device *pnd;
+
+bool    quiet_output = false;
+bool    iso_ats_supported = false;
+
+// ISO14443A Anti-Collision Commands
+uint8_t  abtReqa[1] = { 0x26 };
+uint8_t  abtSelectAll[2] = { 0x93, 0x20 };
+uint8_t  abtSelectTag[9] = { 0x93, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+uint8_t  abtRats[4] = { 0xe0, 0x50, 0x00, 0x00 };
+uint8_t  abtHalt[4] = { 0x50, 0x00, 0x00, 0x00 };
+#define CASCADE_BIT 0x04
+
+// special unlock command
+uint8_t  abtUnlock1[1] = { 0x40 };
+uint8_t  abtUnlock2[1] = { 0x43 };
+uint8_t  abtWipe[1] = { 0x41 };
+uint8_t abtWrite[4] = { 0xa0,  0x00,  0x5f,  0xb1 };
+uint8_t abtData[18] = { 0x01,  0x23,  0x45,  0x67,  0x00,  0x08,  0x04,  0x00,  0x46,  0x59,  0x25,  0x58,  0x49,  0x10,  0x23,  0x02,  0x23,  0xeb };
+uint8_t abtBlank[18] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x07, 0x80, 0x69, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x36, 0xCC };
+
+
+static  bool
+transmit_bits(const uint8_t *pbtTx, const size_t szTxBits)
+{
+  // Show transmitted command
+  if (!quiet_output) {
+    printf("Sent bits:     ");
+    print_hex_bits(pbtTx, szTxBits);
+  }
+  // Transmit the bit frame command, we don't use the arbitrary parity feature
+  if ((szRxBits = nfc_initiator_transceive_bits(pnd, pbtTx, szTxBits, NULL, abtRx, sizeof(abtRx), NULL)) < 0)
+    return false;
+
+  // Show received answer
+  if (!quiet_output) {
+    printf("Received bits: ");
+    print_hex_bits(abtRx, szRxBits);
+  }
+  // Succesful transfer
+  return true;
+}
+
+
+static  bool
+transmit_bytes(const uint8_t *pbtTx, const size_t szTx)
+{
+  // Show transmitted command
+  if (!quiet_output) {
+    printf("Sent bits:     ");
+    print_hex(pbtTx, szTx);
+  }
+  int res;
+  // Transmit the command bytes
+  if ((res = nfc_initiator_transceive_bytes(pnd, pbtTx, szTx, abtRx, sizeof(abtRx), 0)) < 0)
+    return false;
+
+  // Show received answer
+  if (!quiet_output) {
+    printf("Received bits: ");
+    print_hex(abtRx, res);
+  }
+  // Succesful transfer
+  return true;
+}
+
+static void
+print_usage(char *argv[])
+{
+  printf("Usage: %s [OPTIONS] [UID|BLOCK0]\n", argv[0]);
+  printf("Options:\n");
+  printf("\t-h\tHelp. Print this message.\n");
+  printf("\t-f\tFormat. Delete all data (set to 0xFF) and reset ACLs to default.\n");
+  printf("\t-q\tQuiet mode. Suppress output of READER and CARD data (improves timing).\n");
+  printf("\n\tSpecify UID (4 HEX bytes) to set UID, or leave blank for default '01234567'.\n");
+  printf("\n\tSpecify BLOCK0 (16 HEX bytes) to set content of Block0. CRC (Byte 4) is recalculated an overwritten'.\n");
+  printf("\tThis utility can be used to recover cards that have been damaged by writing bad\n");
+  printf("\tdata (e.g. wrong BCC), thus making them non-selectable by most tools/readers.\n");
+  printf("\n\t*** Note: this utility only works with special Mifare 1K cards (Chinese clones).\n\n");
+}
+
+int
+main(int argc, char *argv[])
+{
+  int      arg, i;
+  bool     format = false;
+  unsigned int c;
+  char     tmp[3] = { 0x00, 0x00, 0x00 };
+
+
+  // Get commandline options
+  for (arg = 1; arg < argc; arg++) {
+    if (0 == strcmp(argv[arg], "-h")) {
+      print_usage(argv);
+      exit(EXIT_SUCCESS);
+    } else if (0 == strcmp(argv[arg], "-f")) {
+      format = true;
+    } else if (0 == strcmp(argv[arg], "-q")) {
+      quiet_output = true;
+    } else if (strlen(argv[arg]) == 8) {
+      for (i = 0 ; i < 4 ; ++i) {
+        memcpy(tmp, argv[arg] + i * 2, 2);
+        sscanf(tmp, "%02x", &c);
+        abtData[i] = (char) c;
+      }
+      abtData[4] = abtData[0] ^ abtData[1] ^ abtData[2] ^ abtData[3];
+      iso14443a_crc_append(abtData, 16);
+    } else if (strlen(argv[arg]) == 32) {
+      for (i = 0 ; i < 16 ; ++i) {
+        memcpy(tmp, argv[arg] + i * 2, 2);
+        sscanf(tmp, "%02x", &c);
+        abtData[i] = (char) c;
+      }
+      abtData[4] = abtData[0] ^ abtData[1] ^ abtData[2] ^ abtData[3];
+      iso14443a_crc_append(abtData, 16);
+    } else {
+      ERR("%s is not supported option.", argv[arg]);
+      print_usage(argv);
+      exit(EXIT_FAILURE);
+    }
+  }
+
+  nfc_context *context;
+  nfc_init(&context);
+  if (context == NULL) {
+    ERR("Unable to init libnfc (malloc)");
+    exit(EXIT_FAILURE);
+  }
+
+  // Try to open the NFC reader
+  pnd = nfc_open(context, NULL);
+
+  if (pnd == NULL) {
+    ERR("Error opening NFC reader");
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
+  }
+
+  // Initialise NFC device as "initiator"
+  if (nfc_initiator_init(pnd) < 0) {
+    nfc_perror(pnd, "nfc_initiator_init");
+    nfc_close(pnd);
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
+  }
+
+  // Configure the CRC
+  if (nfc_device_set_property_bool(pnd, NP_HANDLE_CRC, false) < 0) {
+    nfc_perror(pnd, "nfc_device_set_property_bool");
+    nfc_close(pnd);
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
+  }
+  // Use raw send/receive methods
+  if (nfc_device_set_property_bool(pnd, NP_EASY_FRAMING, false) < 0) {
+    nfc_perror(pnd, "nfc_device_set_property_bool");
+    nfc_close(pnd);
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
+  }
+  // Disable 14443-4 autoswitching
+  if (nfc_device_set_property_bool(pnd, NP_AUTO_ISO14443_4, false) < 0) {
+    nfc_perror(pnd, "nfc_device_set_property_bool");
+    nfc_close(pnd);
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
+  }
+
+  printf("NFC reader: %s opened\n", nfc_device_get_name(pnd));
+
+  // Send the 7 bits request command specified in ISO 14443A (0x26)
+  if (!transmit_bits(abtReqa, 7)) {
+    printf("Error: No tag available\n");
+    nfc_close(pnd);
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
+  }
+  memcpy(abtAtqa, abtRx, 2);
+
+  // Anti-collision
+  transmit_bytes(abtSelectAll, 2);
+
+  // Check answer
+  if ((abtRx[0] ^ abtRx[1] ^ abtRx[2] ^ abtRx[3] ^ abtRx[4]) != 0) {
+    printf("WARNING: BCC check failed!\n");
+  }
+
+  // Save the UID CL1
+  memcpy(abtRawUid, abtRx, 4);
+
+  //Prepare and send CL1 Select-Command
+  memcpy(abtSelectTag + 2, abtRx, 5);
+  iso14443a_crc_append(abtSelectTag, 7);
+  transmit_bytes(abtSelectTag, 9);
+  abtSak = abtRx[0];
+
+  // Test if we are dealing with a CL2
+  if (abtSak & CASCADE_BIT) {
+    szCL = 2;//or more
+    // Check answer
+    if (abtRawUid[0] != 0x88) {
+      printf("WARNING: Cascade bit set but CT != 0x88!\n");
+    }
+  }
+
+  if (szCL == 2) {
+    // We have to do the anti-collision for cascade level 2
+
+    // Prepare CL2 commands
+    abtSelectAll[0] = 0x95;
+
+    // Anti-collision
+    transmit_bytes(abtSelectAll, 2);
+
+    // Check answer
+    if ((abtRx[0] ^ abtRx[1] ^ abtRx[2] ^ abtRx[3] ^ abtRx[4]) != 0) {
+      printf("WARNING: BCC check failed!\n");
+    }
+
+    // Save UID CL2
+    memcpy(abtRawUid + 4, abtRx, 4);
+
+    // Selection
+    abtSelectTag[0] = 0x95;
+    memcpy(abtSelectTag + 2, abtRx, 5);
+    iso14443a_crc_append(abtSelectTag, 7);
+    transmit_bytes(abtSelectTag, 9);
+    abtSak = abtRx[0];
+
+    // Test if we are dealing with a CL3
+    if (abtSak & CASCADE_BIT) {
+      szCL = 3;
+      // Check answer
+      if (abtRawUid[0] != 0x88) {
+        printf("WARNING: Cascade bit set but CT != 0x88!\n");
+      }
+    }
+
+    if (szCL == 3) {
+      // We have to do the anti-collision for cascade level 3
+
+      // Prepare and send CL3 AC-Command
+      abtSelectAll[0] = 0x97;
+      transmit_bytes(abtSelectAll, 2);
+
+      // Check answer
+      if ((abtRx[0] ^ abtRx[1] ^ abtRx[2] ^ abtRx[3] ^ abtRx[4]) != 0) {
+        printf("WARNING: BCC check failed!\n");
+      }
+
+      // Save UID CL3
+      memcpy(abtRawUid + 8, abtRx, 4);
+
+      // Prepare and send final Select-Command
+      abtSelectTag[0] = 0x97;
+      memcpy(abtSelectTag + 2, abtRx, 5);
+      iso14443a_crc_append(abtSelectTag, 7);
+      transmit_bytes(abtSelectTag, 9);
+      abtSak = abtRx[0];
+    }
+  }
+
+  // Request ATS, this only applies to tags that support ISO 14443A-4
+  if (abtRx[0] & SAK_FLAG_ATS_SUPPORTED) {
+    iso_ats_supported = true;
+  }
+
+  printf("\nFound tag with\n UID: ");
+  switch (szCL) {
+    case 1:
+      printf("%02x%02x%02x%02x", abtRawUid[0], abtRawUid[1], abtRawUid[2], abtRawUid[3]);
+      break;
+    case 2:
+      printf("%02x%02x%02x", abtRawUid[1], abtRawUid[2], abtRawUid[3]);
+      printf("%02x%02x%02x%02x", abtRawUid[4], abtRawUid[5], abtRawUid[6], abtRawUid[7]);
+      break;
+    case 3:
+      printf("%02x%02x%02x", abtRawUid[1], abtRawUid[2], abtRawUid[3]);
+      printf("%02x%02x%02x", abtRawUid[5], abtRawUid[6], abtRawUid[7]);
+      printf("%02x%02x%02x%02x", abtRawUid[8], abtRawUid[9], abtRawUid[10], abtRawUid[11]);
+      break;
+  }
+  printf("\n");
+  printf("ATQA: %02x%02x\n SAK: %02x\n", abtAtqa[1], abtAtqa[0], abtSak);
+  if (szAts > 1) { // if = 1, it's not actual ATS but error code
+    printf(" ATS: ");
+    print_hex(abtAts, szAts);
+  }
+  printf("\n");
+
+  // now reset UID
+  iso14443a_crc_append(abtHalt, 2);
+  transmit_bytes(abtHalt, 4);
+
+  if (!transmit_bits(abtUnlock1, 7)) {
+    printf("Warning: Unlock command [1/2]: failed / not acknowledged.\n");
+  } else {
+    if (format) {
+      transmit_bytes(abtWipe, 1);
+      transmit_bytes(abtHalt, 4);
+      transmit_bits(abtUnlock1, 7);
+    }
+
+    if (transmit_bytes(abtUnlock2, 1)) {
+      printf("Card unlocked\n");
+    } else {
+      printf("Warning: Unlock command [2/2]: failed / not acknowledged.\n");
+    }
+  }
+
+  transmit_bytes(abtWrite, 4);
+  transmit_bytes(abtData, 18);
+  if (format) {
+    for (i = 3 ; i < 64 ; i += 4) {
+      abtWrite[1] = (char) i;
+      iso14443a_crc_append(abtWrite, 2);
+      transmit_bytes(abtWrite, 4);
+      transmit_bytes(abtBlank, 18);
+    }
+  }
+
+  nfc_close(pnd);
+  nfc_exit(context);
+  exit(EXIT_SUCCESS);
+}

examples/nfc-poll.1

@@ -1,6 +1,6 @@
 .TH nfc-poll 1 "June 26, 2009" "libnfc" "libnfc's examples"
 .SH NAME
-nfc-poll \- Poll for one NFC target
+nfc-poll \- poll first available NFC target
 .SH SYNOPSIS
 .B nfc-poll
 .SH DESCRIPTION
@@ -8,8 +8,18 @@ nfc-poll \- Poll for one NFC target
 is a utility for polling any available target (tags but also NFCIP targets)
 using ISO14443-A, FeliCa, Jewel and ISO14443-B modulations.
 
-This tool relies on a hardware polling feature of the PN532, it will display
+This tool uses hardware polling feature if available (ie. PN532) or switch back
-available information retrieved from the tag.
+to software polling, it will display available information retrieved from the
+tag.
+
+.SH OPTIONS
+.TP
+.B \-v
+Tells
+.I
+nfc-poll
+to be verbose and display detailed information about the targets shown.
+This includes SAK decoding and fingerprinting is available.
 
 .SH IMPORTANT
 There are some well-know limits with this example:
@@ -32,7 +42,7 @@ Please report any bugs on the
 .B libnfc
 issue tracker at:
 .br
-.BR http://code.google.com/p/libnfc/issues
+.BR https://github.com/nfc-tools/libnfc/issues
 .SH LICENCE
 .B libnfc
 is licensed under the GNU Lesser General Public License (LGPL), version 3.

examples/nfc-poll.c

@@ -1,8 +1,15 @@
 /*-
- * Public platform independent Near Field Communication (NFC) library examples
+ * Free/Libre Near Field Communication (NFC) library
  *
- * Copyright (C) 2010, Romuald Conty
+ * Libnfc historical contributors:
- * Copyright (C) 2011, Romain Tartiere, Romuald Conty
+ * Copyright (C) 2009      Roel Verdult
+ * Copyright (C) 2009-2013 Romuald Conty
+ * Copyright (C) 2010-2012 Romain Tartière
+ * Copyright (C) 2010-2013 Philippe Teuwen
+ * Copyright (C) 2012-2013 Ludovic Rousseau
+ * See AUTHORS file for a more comprehensive list of contributors.
+ * Additional contributors of this file:
+ * Copyright (C) 2020      Adam Laurie
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -29,7 +36,7 @@
  */
 
 /**
- * @file nfc-poll
+ * @file nfc-poll.c
  * @brief Polling example
  */
 
@@ -38,6 +45,7 @@
 #endif // HAVE_CONFIG_H
 
 #include <err.h>
+#include <inttypes.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stddef.h>
@@ -51,91 +59,104 @@
 
 #define MAX_DEVICE_COUNT 16
 
-static nfc_device_t *pnd = NULL;
+static nfc_device *pnd = NULL;
+static nfc_context *context;
 
-void stop_polling (int sig)
+static void stop_polling(int sig)
 {
   (void) sig;
-  if (pnd)
+  if (pnd != NULL)
-    nfc_abort_command (pnd);
+    nfc_abort_command(pnd);
-  else
+  else {
-    exit (EXIT_FAILURE);
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
+  }
+}
+
+static void
+print_usage(const char *progname)
+{
+  printf("usage: %s [-v]\n", progname);
+  printf("  -v\t verbose display\n");
 }
 
 int
-main (int argc, const char *argv[])
+main(int argc, const char *argv[])
 {
-  size_t  szFound;
-  size_t  i;
   bool verbose = false;
-  nfc_device_desc_t *pnddDevices;
 
-  signal (SIGINT, stop_polling);
+  signal(SIGINT, stop_polling);
-
-  pnddDevices = parse_args (argc, argv, &szFound, &verbose);
 
   // Display libnfc version
-  const char *acLibnfcVersion = nfc_version ();
+  const char *acLibnfcVersion = nfc_version();
 
-  if (argc > 1) {
+  printf("%s uses libnfc %s\n", argv[0], acLibnfcVersion);
-    errx (1, "usage: %s", argv[0]);
+  if (argc != 1) {
-  }
+    if ((argc == 2) && (0 == strcmp("-v", argv[1]))) {
-
+      verbose = true;
-  printf ("%s uses libnfc %s\n", argv[0], acLibnfcVersion);
-
-  if (szFound == 0) {
-    if (!(pnddDevices = malloc (MAX_DEVICE_COUNT * sizeof (*pnddDevices)))) {
-      fprintf (stderr, "malloc() failed\n");
-      exit (EXIT_FAILURE);
-    }
-  }
-
-  nfc_list_devices (pnddDevices, MAX_DEVICE_COUNT, &szFound);
-
-  if (szFound == 0) {
-    printf ("No NFC device found.\n");
-  }
-
-  for (i = 0; i < szFound; i++) {
-    const uint8_t uiPollNr = 20;
-    const uint8_t uiPeriod = 2;
-    const nfc_modulation_t nmModulations[5] = {
-      { .nmt = NMT_ISO14443A, .nbr = NBR_106 },
-      { .nmt = NMT_ISO14443B, .nbr = NBR_106 },
-      { .nmt = NMT_FELICA, .nbr = NBR_212 },
-      { .nmt = NMT_FELICA, .nbr = NBR_424 },
-      { .nmt = NMT_JEWEL, .nbr = NBR_106 },
-    };
-    const size_t szModulations = 5;
-
-    nfc_target_t nt;
-    bool    res;
-
-    pnd = nfc_connect (&(pnddDevices[i]));
-
-    if (pnd == NULL) {
-      ERR ("%s", "Unable to connect to NFC device.");
-      exit (EXIT_FAILURE);
-    }
-    nfc_initiator_init (pnd);
-
-    printf ("Connected to NFC reader: %s\n", pnd->acName);
-    printf ("NFC device will poll during %ld ms (%u pollings of %lu ms for %zd modulations)\n", (unsigned long) uiPollNr * szModulations * uiPeriod * 150, uiPollNr, (unsigned long) uiPeriod * 150, szModulations);
-    res = nfc_initiator_poll_target (pnd, nmModulations, szModulations, uiPollNr, uiPeriod, &nt);
-    if (res) {
-      print_nfc_target ( nt, verbose );
     } else {
-      if (pnd->iLastError) {
+      print_usage(argv[0]);
-        nfc_perror (pnd, "nfc_initiator_poll_targets");
+      exit(EXIT_FAILURE);
-        nfc_disconnect (pnd);
-        exit (EXIT_FAILURE);
-      } else {
-        printf ("No target found.\n");
-      }
     }
-    nfc_disconnect (pnd);
   }
 
-  free (pnddDevices);
+  const uint8_t uiPollNr = 20;
-  exit (EXIT_SUCCESS);
+  const uint8_t uiPeriod = 2;
+  const nfc_modulation nmModulations[6] = {
+    { .nmt = NMT_ISO14443A, .nbr = NBR_106 },
+    { .nmt = NMT_ISO14443B, .nbr = NBR_106 },
+    { .nmt = NMT_FELICA, .nbr = NBR_212 },
+    { .nmt = NMT_FELICA, .nbr = NBR_424 },
+    { .nmt = NMT_JEWEL, .nbr = NBR_106 },
+    { .nmt = NMT_ISO14443BICLASS, .nbr = NBR_106 },
+  };
+  const size_t szModulations = 6;
+
+  nfc_target nt;
+  int res = 0;
+
+  nfc_init(&context);
+  if (context == NULL) {
+    ERR("Unable to init libnfc (malloc)");
+    exit(EXIT_FAILURE);
+  }
+
+  pnd = nfc_open(context, NULL);
+
+  if (pnd == NULL) {
+    ERR("%s", "Unable to open NFC device.");
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
+  }
+
+  if (nfc_initiator_init(pnd) < 0) {
+    nfc_perror(pnd, "nfc_initiator_init");
+    nfc_close(pnd);
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
+  }
+
+  printf("NFC reader: %s opened\n", nfc_device_get_name(pnd));
+  printf("NFC device will poll during %ld ms (%u pollings of %lu ms for %" PRIdPTR " modulations)\n", (unsigned long) uiPollNr * szModulations * uiPeriod * 150, uiPollNr, (unsigned long) uiPeriod * 150, szModulations);
+  if ((res = nfc_initiator_poll_target(pnd, nmModulations, szModulations, uiPollNr, uiPeriod, &nt))  < 0) {
+    nfc_perror(pnd, "nfc_initiator_poll_target");
+    nfc_close(pnd);
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
+  }
+
+  if (res > 0) {
+    print_nfc_target(&nt, verbose);
+    printf("Waiting for card removing...");
+    fflush(stdout);
+    while (0 == nfc_initiator_target_is_present(pnd, NULL)) {}
+    nfc_perror(pnd, "nfc_initiator_target_is_present");
+    printf("done.\n");
+  } else {
+    printf("No target found.\n");
+  }
+
+  nfc_close(pnd);
+  nfc_exit(context);
+  exit(EXIT_SUCCESS);
 }

examples/nfc-relay.1

@@ -22,7 +22,7 @@ Please report any bugs on the
 .B libnfc
 issue tracker at:
 .br
-.BR http://code.google.com/p/libnfc/issues
+.BR https://github.com/nfc-tools/libnfc/issues
 .SH LICENCE
 .B libnfc
 is licensed under the GNU Lesser General Public License (LGPL), version 3.

examples/nfc-relay.c

@@ -1,8 +1,14 @@
 /*-
- * Public platform independent Near Field Communication (NFC) library examples
+ * Free/Libre Near Field Communication (NFC) library
  *
- * Copyright (C) 2009, Roel Verdult
+ * Libnfc historical contributors:
- * Copyright (C) 2010, Romuald Conty
+ * Copyright (C) 2009      Roel Verdult
+ * Copyright (C) 2009-2013 Romuald Conty
+ * Copyright (C) 2010-2012 Romain Tartière
+ * Copyright (C) 2010-2013 Philippe Teuwen
+ * Copyright (C) 2012-2013 Ludovic Rousseau
+ * See AUTHORS file for a more comprehensive list of contributors.
+ * Additional contributors of this file:
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -37,6 +43,7 @@
 #  include "config.h"
 #endif /* HAVE_CONFIG_H */
 
+#include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
@@ -50,92 +57,96 @@
 #define MAX_FRAME_LEN 264
 #define MAX_DEVICE_COUNT 2
 
-static byte_t abtReaderRx[MAX_FRAME_LEN];
+static uint8_t abtReaderRx[MAX_FRAME_LEN];
-static byte_t abtReaderRxPar[MAX_FRAME_LEN];
+static uint8_t abtReaderRxPar[MAX_FRAME_LEN];
-static size_t szReaderRxBits;
+static int szReaderRxBits;
-static byte_t abtTagRx[MAX_FRAME_LEN];
+static uint8_t abtTagRx[MAX_FRAME_LEN];
-static byte_t abtTagRxPar[MAX_FRAME_LEN];
+static uint8_t abtTagRxPar[MAX_FRAME_LEN];
-static size_t szTagRxBits;
+static int szTagRxBits;
-static nfc_device_t *pndReader;
+static nfc_device *pndReader;
-static nfc_device_t *pndTag;
+static nfc_device *pndTag;
 static bool quitting = false;
 
-void
+static void
-intr_hdlr (void)
+intr_hdlr(int sig)
 {
-  printf ("\nQuitting...\n");
+  (void) sig;
+  printf("\nQuitting...\n");
   quitting = true;
   return;
 }
 
-void
+static void
-print_usage (char *argv[])
+print_usage(char *argv[])
 {
-  printf ("Usage: %s [OPTIONS]\n", argv[0]);
+  printf("Usage: %s [OPTIONS]\n", argv[0]);
-  printf ("Options:\n");
+  printf("Options:\n");
-  printf ("\t-h\tHelp. Print this message.\n");
+  printf("\t-h\tHelp. Print this message.\n");
-  printf ("\t-q\tQuiet mode. Suppress output of READER and EMULATOR data (improves timing).\n");
+  printf("\t-q\tQuiet mode. Suppress output of READER and EMULATOR data (improves timing).\n");
 }
 
 int
-main (int argc, char *argv[])
+main(int argc, char *argv[])
 {
   int     arg;
   bool    quiet_output = false;
-  size_t  szFound;
+  const char *acLibnfcVersion = nfc_version();
-  nfc_device_desc_t *pnddDevices;
-  const char *acLibnfcVersion = nfc_version ();
 
   // Get commandline options
   for (arg = 1; arg < argc; arg++) {
-    if (0 == strcmp (argv[arg], "-h")) {
+    if (0 == strcmp(argv[arg], "-h")) {
-      print_usage (argv);
+      print_usage(argv);
-      return EXIT_SUCCESS;
+      exit(EXIT_SUCCESS);
-    } else if (0 == strcmp (argv[arg], "-q")) {
+    } else if (0 == strcmp(argv[arg], "-q")) {
       quiet_output = true;
     } else {
-      ERR ("%s is not supported option.", argv[arg]);
+      ERR("%s is not supported option.", argv[arg]);
-      print_usage (argv);
+      print_usage(argv);
-      return EXIT_FAILURE;
+      exit(EXIT_FAILURE);
     }
   }
 
   // Display libnfc version
-  printf ("%s uses libnfc %s\n", argv[0], acLibnfcVersion);
+  printf("%s uses libnfc %s\n", argv[0], acLibnfcVersion);
 
 #ifdef WIN32
-  signal (SIGINT, (void (__cdecl *) (int)) intr_hdlr);
+  signal(SIGINT, (void (__cdecl *)(int)) intr_hdlr);
 #else
-  signal (SIGINT, (void (*)()) intr_hdlr);
+  signal(SIGINT, intr_hdlr);
 #endif
 
-  // Allocate memory to put the result of available devices listing
+  nfc_context *context;
-  if (!(pnddDevices = malloc (MAX_DEVICE_COUNT * sizeof (*pnddDevices)))) {
+  nfc_init(&context);
-    fprintf (stderr, "malloc() failed\n");
+  if (context == NULL) {
-    return EXIT_FAILURE;
+    ERR("Unable to init libnfc (malloc)");
+    exit(EXIT_FAILURE);
   }
+  nfc_connstring connstrings[MAX_DEVICE_COUNT];
   // List available devices
-  nfc_list_devices (pnddDevices, MAX_DEVICE_COUNT, &szFound);
+  size_t szFound = nfc_list_devices(context, connstrings, MAX_DEVICE_COUNT);
 
   if (szFound < 2) {
-    ERR ("%zd device found but two connected devices are needed to relay NFC.", szFound);
+    ERR("%" PRIdPTR " device found but two opened devices are needed to relay NFC.", szFound);
-    return EXIT_FAILURE;
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
   }
+
   // Try to open the NFC emulator device
-  pndTag = nfc_connect (&(pnddDevices[0]));
+  pndTag = nfc_open(context, connstrings[0]);
   if (pndTag == NULL) {
-    printf ("Error connecting NFC emulator device\n");
+    ERR("Error opening NFC emulator device");
-    return EXIT_FAILURE;
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
   }
 
-  printf ("Hint: tag <---> initiator (relay) <---> target (relay) <---> original reader\n\n");
+  printf("Hint: tag <---> initiator (relay) <---> target (relay) <---> original reader\n\n");
 
-  printf ("Connected to the NFC emulator device: %s\n", pndTag->acName);
+  printf("NFC emulator device: %s opened\n", nfc_device_get_name(pndTag));
-  printf ("[+] Try to break out the auto-emulation, this requires a second reader!\n");
+  printf("[+] Try to break out the auto-emulation, this requires a second reader!\n");
-  printf ("[+] To do this, please send any command after the anti-collision\n");
+  printf("[+] To do this, please send any command after the anti-collision\n");
-  printf ("[+] For example, send a RATS command or use the \"nfc-anticol\" tool\n");
+  printf("[+] For example, send a RATS command or use the \"nfc-anticol\" tool\n");
 
-  nfc_target_t nt = {
+  nfc_target nt = {
     .nm = {
       .nmt = NMT_ISO14443A,
       .nbr = NBR_UNDEFINED,
@@ -151,73 +162,102 @@ main (int argc, char *argv[])
     },
   };
 
-  if (!nfc_target_init (pndTag, &nt, abtReaderRx, &szReaderRxBits)) {
+  if ((szReaderRxBits = nfc_target_init(pndTag, &nt, abtReaderRx, sizeof(abtReaderRx), 0)) < 0) {
-    ERR ("%s", "Initialization of NFC emulator failed");
+    ERR("%s", "Initialization of NFC emulator failed");
-    nfc_disconnect (pndTag);
+    nfc_close(pndTag);
-    return EXIT_FAILURE;
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
   }
-  printf ("%s", "Configuring emulator settings...");
+  printf("%s", "Configuring emulator settings...");
-  if (!nfc_configure (pndTag, NDO_HANDLE_CRC, false) ||
+  if ((nfc_device_set_property_bool(pndTag, NP_HANDLE_CRC, false) < 0) ||
-      !nfc_configure (pndTag, NDO_HANDLE_PARITY, false) || !nfc_configure (pndTag, NDO_ACCEPT_INVALID_FRAMES, true)) {
+      (nfc_device_set_property_bool(pndTag, NP_HANDLE_PARITY, false) < 0) || (nfc_device_set_property_bool(pndTag, NP_ACCEPT_INVALID_FRAMES, true)) < 0) {
-    nfc_perror (pndTag, "nfc_configure");
+    nfc_perror(pndTag, "nfc_device_set_property_bool");
-    exit (EXIT_FAILURE);
+    nfc_close(pndTag);
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
   }
-  printf ("%s", "Done, emulated tag is initialized");
+  printf("%s", "Done, emulated tag is initialized");
 
   // Try to open the NFC reader
-  pndReader = nfc_connect (&(pnddDevices[1]));
+  pndReader = nfc_open(context, connstrings[1]);
-
+  if (pndReader == NULL) {
-  printf ("Connected to the NFC reader device: %s", pndReader->acName);
+    printf("Error opening NFC reader device\n");
-  printf ("%s", "Configuring NFC reader settings...");
+    nfc_close(pndTag);
-  nfc_initiator_init (pndReader);
+    nfc_exit(context);
-  if (!nfc_configure (pndReader, NDO_HANDLE_CRC, false) ||
+    exit(EXIT_FAILURE);
-      !nfc_configure (pndReader, NDO_HANDLE_PARITY, false) ||
-      !nfc_configure (pndReader, NDO_ACCEPT_INVALID_FRAMES, true)) {
-    nfc_perror (pndReader, "nfc_configure");
-    exit (EXIT_FAILURE);
   }
-  printf ("%s", "Done, relaying frames now!");
+
+  printf("NFC reader device: %s opened", nfc_device_get_name(pndReader));
+  printf("%s", "Configuring NFC reader settings...");
+
+  if (nfc_initiator_init(pndReader) < 0) {
+    nfc_perror(pndReader, "nfc_initiator_init");
+    nfc_close(pndTag);
+    nfc_close(pndReader);
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
+  }
+  if ((nfc_device_set_property_bool(pndReader, NP_HANDLE_CRC, false) < 0) ||
+      (nfc_device_set_property_bool(pndReader, NP_HANDLE_PARITY, false) < 0) ||
+      (nfc_device_set_property_bool(pndReader, NP_ACCEPT_INVALID_FRAMES, true)) < 0) {
+    nfc_perror(pndReader, "nfc_device_set_property_bool");
+    nfc_close(pndTag);
+    nfc_close(pndReader);
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
+  }
+  printf("%s", "Done, relaying frames now!");
 
   while (!quitting) {
     // Test if we received a frame from the reader
-    if (nfc_target_receive_bits (pndTag, abtReaderRx, &szReaderRxBits, abtReaderRxPar)) {
+    if ((szReaderRxBits = nfc_target_receive_bits(pndTag, abtReaderRx, sizeof(abtReaderRx), abtReaderRxPar)) > 0) {
       // Drop down the field before sending a REQA command and start a new session
       if (szReaderRxBits == 7 && abtReaderRx[0] == 0x26) {
         // Drop down field for a very short time (original tag will reboot)
-        if (!nfc_configure (pndReader, NDO_ACTIVATE_FIELD, false)) {
+        if (nfc_device_set_property_bool(pndReader, NP_ACTIVATE_FIELD, false) < 0) {
-          nfc_perror (pndReader, "nfc_configure");
+          nfc_perror(pndReader, "nfc_device_set_property_bool");
-          exit (EXIT_FAILURE);
+          nfc_close(pndTag);
+          nfc_close(pndReader);
+          nfc_exit(context);
+          exit(EXIT_FAILURE);
         }
         if (!quiet_output)
-          printf ("\n");
+          printf("\n");
-        if (!nfc_configure (pndReader, NDO_ACTIVATE_FIELD, true)) {
+        if (nfc_device_set_property_bool(pndReader, NP_ACTIVATE_FIELD, true) < 0) {
-          nfc_perror (pndReader, "nfc_configure");
+          nfc_perror(pndReader, "nfc_device_set_property_bool");
-          exit (EXIT_FAILURE);
+          nfc_close(pndTag);
+          nfc_close(pndReader);
+          nfc_exit(context);
+          exit(EXIT_FAILURE);
         }
       }
       // Print the reader frame to the screen
       if (!quiet_output) {
-        printf ("R: ");
+        printf("R: ");
-        print_hex_par (abtReaderRx, szReaderRxBits, abtReaderRxPar);
+        print_hex_par(abtReaderRx, (size_t) szReaderRxBits, abtReaderRxPar);
       }
       // Forward the frame to the original tag
-      if (nfc_initiator_transceive_bits
+      if ((szTagRxBits = nfc_initiator_transceive_bits
-          (pndReader, abtReaderRx, szReaderRxBits, abtReaderRxPar, abtTagRx, &szTagRxBits, abtTagRxPar)) {
+                         (pndReader, abtReaderRx, (size_t) szReaderRxBits, abtReaderRxPar, abtTagRx, sizeof(abtTagRx), abtTagRxPar)) > 0) {
         // Redirect the answer back to the reader
-        if (!nfc_target_send_bits (pndTag, abtTagRx, szTagRxBits, abtTagRxPar)) {
+        if (nfc_target_send_bits(pndTag, abtTagRx, szTagRxBits, abtTagRxPar) < 0) {
-          nfc_perror (pndTag, "nfc_target_send_bits");
+          nfc_perror(pndTag, "nfc_target_send_bits");
-          exit (EXIT_FAILURE);
+          nfc_close(pndTag);
+          nfc_close(pndReader);
+          nfc_exit(context);
+          exit(EXIT_FAILURE);
         }
         // Print the tag frame to the screen
         if (!quiet_output) {
-          printf ("T: ");
+          printf("T: ");
-          print_hex_par (abtTagRx, szTagRxBits, abtTagRxPar);
+          print_hex_par(abtTagRx, szTagRxBits, abtTagRxPar);
         }
       }
     }
   }
 
-  nfc_disconnect (pndTag);
+  nfc_close(pndTag);
-  nfc_disconnect (pndReader);
+  nfc_close(pndReader);
-  exit (EXIT_SUCCESS);
+  nfc_exit(context);
+  exit(EXIT_SUCCESS);
 }

examples/nfc-st25tb.c

@@ -0,0 +1,600 @@
+/*-
+ * Free/Libre Near Field Communication (NFC) library
+ *
+ * Libnfc historical contributors:
+ * Copyright (C) 2009      Roel Verdult
+ * Copyright (C) 2009-2013 Romuald Conty
+ * Copyright (C) 2010-2012 Romain Tartière
+ * Copyright (C) 2010-2013 Philippe Teuwen
+ * Copyright (C) 2012-2013 Ludovic Rousseau
+ * See AUTHORS file for a more comprehensive list of contributors.
+ * Additional contributors of this file:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *  1) Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  2 )Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Note that this license only applies on the examples, NFC library itself is under LGPL
+ *
+ */
+
+/**
+ * @file nfc-st25tb.c
+ * @brief Tool to operate on ISO-14443-B ST25TB* and legacy SR* cards
+ */
+
+/*	Benjamin DELPY `gentilkiwi`
+ *	https://blog.gentilkiwi.com
+ *	benjamin@gentilkiwi.com
+ *	Licence : https://creativecommons.org/licenses/by/4.0/
+ *	Rely on : libnfc - https://github.com/nfc-tools/libnfc
+ *	
+ *	$ gcc -Wall -lnfc -o nfc-st25tb nfc-st25tb.c
+ *	$ ./nfc-st25tb -h
+ *
+ * Tested with
+ * - ST25TB512-AC - (BE/Brussels/STIB ; AliExpress ones)
+ * - ST25TB512-AT - (FR/Lille/Ilevia ; FR/Reims/Citura ; FR/Dijon/Divia ; FR/Strasbourg/CTS)
+ * - SRT512 - legacy - (FR/Bordeaux/TBM)
+ * - SRI512 - legacy - (anonymous vending machine)
+ */
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif // HAVE_CONFIG_H
+ 
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdbool.h>
+#include <string.h>
+#include <nfc/nfc.h>
+
+#if defined(WIN32) /* mingw compiler */
+#include <getopt.h>
+#endif
+
+#define ST25TB_SR_BLOCK_MAX_SIZE	((uint8_t) 4) // for static arrays
+typedef void(*get_info_specific) (uint8_t * systemArea);
+
+typedef struct _st_data {
+	uint8_t chipId;
+	bool bIsLegacy;
+	const char *szName;
+	const char *szDatasheetUrl;
+	uint8_t blockSize;
+	uint8_t nbNormalBlock;
+	uint8_t bnSystem;
+	get_info_specific pfnGetInfo;
+} st_data;
+
+bool get_block_at(nfc_device *pnd, uint8_t block, uint8_t *data, uint8_t cbData, bool bPrintIt);
+bool set_block_at(nfc_device *pnd, uint8_t block, uint8_t *data, uint8_t cbData, bool bPrintIt);
+bool set_block_at_confirmed(nfc_device *pnd, uint8_t block, uint8_t *data, uint8_t cbData, bool bPrintIt);
+const st_data * get_info(const nfc_target *pnt, bool bPrintIt);
+void display_system_info(nfc_device *pnd, const st_data * stdata);
+void print_hex(const uint8_t *pbtData, const size_t szBytes);
+
+int main(int argc, char *argv[])
+{
+	nfc_context *context = NULL;
+	nfc_device *pnd = NULL;
+	nfc_target nt = {0};
+	nfc_modulation nm = {NMT_ISO14443B2SR, NBR_106};
+	const st_data * stcurrent;
+	int opt, res;
+	bool bIsBlock = false, bIsRead = false, bIsWrite = false, bIsBadCli = false;
+	uint8_t i, blockNumber = 0, data[ST25TB_SR_BLOCK_MAX_SIZE] = {0xff, 0xff, 0xff, 0xff}; // just in case...
+	size_t cbData = 0;
+	
+	while(!bIsBadCli && ((opt = getopt(argc, argv, ":hib:rw:")) != -1))
+	{
+		switch(opt)
+		{
+			case 'i':
+				
+				break;
+			
+			case 'b':
+				if(optarg)
+				{
+					bIsBlock = true;
+					blockNumber = strtoul(optarg, NULL, 0);
+				}
+				else bIsBadCli = true;
+
+				break;
+
+			case 'r':
+				bIsRead = true;
+				
+				break;
+
+			case 'w':
+					if(optarg)
+					{
+						cbData = strlen(optarg);
+						if((cbData == (2*2)) || ((cbData == (4*2))))
+						{
+							cbData >>= 1;
+							if(cbData == 2) // sr176
+							{
+								res = sscanf(optarg, "%02hhx%02hhx", data, data + 1);
+							}
+							else // all others
+							{
+								res = sscanf(optarg, "%02hhx%02hhx%02hhx%02hhx", data, data + 1, data + 2, data + 3);
+							}
+							
+							if(res == (int) cbData)
+							{
+								bIsWrite = true;
+							}
+						}
+						
+						if(!bIsWrite)
+						{
+							bIsBadCli = true;
+						}
+					}
+				
+				break;
+			
+			default: // includes -h
+				bIsBadCli = true;
+				
+		}
+	}
+	
+	if(!bIsBadCli)
+	{
+		if(bIsBlock && (bIsRead || bIsWrite))
+		{
+			if(bIsRead && bIsWrite)
+			{
+				printf("|mode   : read then write\n");
+			}
+			else if(bIsRead)
+			{
+				printf("|mode   : read\n");
+			}
+			else if(bIsWrite)
+			{
+				printf("|mode   : write\n");
+			}
+			
+			printf("|blk num: 0x%02hhx\n", blockNumber);
+			if(bIsWrite)
+			{
+				printf("|data   : ");
+				print_hex(data, cbData);
+				printf("\n");
+			}
+		}
+		else if(!bIsRead && !bIsWrite && !bIsBlock)
+		{
+			printf("|mode   : info\n");
+		}
+		else bIsBadCli = true;
+	}
+	
+	if(!bIsBadCli)
+	{
+		nfc_init(&context);
+		if(context)
+		{
+			pnd = nfc_open(context, NULL);
+			if(pnd)
+			{
+				res = nfc_initiator_init(pnd);
+				if(res == NFC_SUCCESS)
+				{
+					printf("Reader  : %s - via %s\n  ...wait for card...\n", nfc_device_get_name(pnd), nfc_device_get_connstring(pnd));
+					
+					if (nfc_initiator_select_passive_target(pnd, nm, NULL, 0, &nt) > 0)
+					{
+						stcurrent = get_info(&nt, true);
+						if(stcurrent)
+						{
+							printf("\n");
+
+							if(bIsBlock && (bIsRead || bIsWrite))
+							{
+								if(bIsRead)
+								{
+									get_block_at(pnd, blockNumber, NULL, 0, true);
+								}
+								
+								if(bIsWrite)
+								{
+									set_block_at_confirmed(pnd, blockNumber, data, cbData, true);
+								}
+							}
+							else if(!bIsRead && !bIsWrite && !bIsBlock)
+							{
+								for(i = 0; i < stcurrent->nbNormalBlock; i++)
+								{
+									get_block_at(pnd, i, NULL, 0, true);
+								}
+								display_system_info(pnd, stcurrent);
+							}
+						}
+					}
+				}
+				else printf("ERROR - nfc_initiator_init: %i\n", res);
+				
+				nfc_close(pnd);
+			}
+			else printf("ERROR - nfc_open\n");
+			
+			nfc_exit(context);
+		}
+		else printf("ERROR - nfc_init\n");
+	}
+	else
+	{
+		printf(
+			"Usage:\n"
+			"  %s [-i]\n"
+			"  %s -b N -r\n"
+			"  %s -b N [-r] -w ABCD[EF01]\n  %s -h\n"
+			"Options:\n"
+			"  -i               (default) information mode - will try to dump the tag content and display informations\n"
+			"  -b N             specify block number to operate on (tag dependent), needed for read (-r) and write (-w) modes\n"
+			"  -r               read mode - will try to read block (specified with -b N parameter)\n"
+			"  -w ABCD[EF01]    write mode - will try to write specicied data (2 or 4 bytes depending on tag) to block (specified with -b N parameter)\n"
+			"  -h               this help\n"
+			"Examples:\n"
+			"  %s -i\n"
+			"        Display all tag informations\n"
+			"  %s -b 0x0e -r\n"
+			"        Read block 0x0e (14) of the tag\n"
+			"  %s -b 0x0d -w 0123abcd\n"
+			"        Write block 0x0d (13) of the tag with hexadecimal value '01 23 ab cd'\n"
+			"  %s -b 0x0c -r -w 0123abcd\n"
+			"        Read, then write block 0x0c (12) of the tag with hexadecimal value '01 23 ab cd'\n"
+			"Warnings:\n"
+			"  Be careful with: system area, counters & otp, bytes order.\n"
+		, argv[0], argv[0], argv[0], argv[0], argv[0], argv[0], argv[0], argv[0]);
+	}
+	
+	return 0;
+}
+
+bool get_block_at(nfc_device *pnd, uint8_t block, uint8_t *data, uint8_t cbData, bool bPrintIt)
+{
+	bool bRet = false;
+	uint8_t tx[2] = {0x08, block}, rx[ST25TB_SR_BLOCK_MAX_SIZE]; // 4 is the maximum, SR176 (only 2) will fit
+	int res;
+	
+	res = nfc_initiator_transceive_bytes(pnd, tx, sizeof(tx), rx, sizeof(rx), 0);
+	if((res == 2) || (res == 4))
+	{
+		if(data)
+		{
+			if(cbData == res)
+			{
+				memcpy(data, rx, res);
+				bRet = true;
+			}
+			else printf("ERROR - We got %i bytes for a %hhu buffer size?\n", res, cbData);
+		}
+		else bRet = true;
+		
+		if(bPrintIt)
+		{
+			printf("[0x%02hhx] ", block);
+			print_hex(rx, res);
+			printf("\n");
+		}
+	}
+	else if(res > 0)
+	{
+		printf("ERROR - We got %i bytes?\n", res);
+	}
+	else printf("ERROR - nfc_initiator_transceive_bytes(get): %i\n", res);
+	
+	return bRet;
+}
+
+bool set_block_at(nfc_device *pnd, uint8_t block, uint8_t *data, uint8_t cbData, bool bPrintIt)
+{
+	bool bRet = false;
+	uint8_t tx[2 + ST25TB_SR_BLOCK_MAX_SIZE] = {0x09, block}; // 4 is the maximum, SR176 (only 2) will fit
+	int res;
+	
+	if(cbData <= ST25TB_SR_BLOCK_MAX_SIZE)
+	{
+		memcpy(tx + 2, data, cbData);
+		
+		if(bPrintIt)
+		{
+			printf(">0x%02hhx> ", block);
+			print_hex(data, cbData);
+			printf("\n");
+		}
+		
+		res = nfc_initiator_transceive_bytes(pnd, tx, 2 + cbData, NULL, 0, 0);
+		if(res == NFC_ERFTRANS) // ? :')
+		{
+			bRet = true;
+		}
+		else printf("ERROR - nfc_initiator_transceive_bytes(set): %i\n", res);
+	}
+	else printf("ERROR - Wanted to write %hhu bytes, but maximum is %hhu\n", cbData, ST25TB_SR_BLOCK_MAX_SIZE);
+	
+	return bRet;
+}
+
+bool set_block_at_confirmed(nfc_device *pnd, uint8_t block, uint8_t *data, uint8_t cbData, bool bPrintIt)
+{
+	bool bRet = false;
+	uint8_t buffer[ST25TB_SR_BLOCK_MAX_SIZE]; // maximum size will be checked in set_block_at
+	
+	if(set_block_at(pnd, block, data, cbData, bPrintIt))
+	{
+		if(get_block_at(pnd, block, buffer, cbData, bPrintIt))
+		{
+			if(memcmp(data, buffer, cbData) == 0)
+			{
+				bRet = true;
+			}
+			else if(bPrintIt) 
+			{
+				printf("WARNING - not same value readed after write\n");
+			}
+		}
+	}
+	
+	return bRet;
+}
+
+void get_info_st25tb512(uint8_t * systemArea)
+{
+	uint8_t b, i;
+	
+	b = ((*(uint32_t *) systemArea) >> 15) & 1;
+	
+	printf("  | ST reserved  : ");
+	for(i = 0; i < 15; i++)
+	{
+		printf("%hhu", (uint8_t) (((*(uint32_t *) systemArea) >> i) & 1));
+	}
+	printf("\n  | b15          : %hhu - %sOTP (?)\n  | OTP_Lock_Reg : ", b, b ? "not " : "");
+	for(i = 16; i < 32; i++)
+	{
+		printf("%hhu", (uint8_t) (((*(uint32_t *) systemArea) >> i) & 1));
+	}
+	printf("\n");
+	for(i = 16; i < 32; i++)
+	{
+		if(!(((*(uint32_t *) systemArea) >> i) & 1))
+		{
+			printf("     block 0x%02hhx is write protected\n", ((uint8_t) (i - 16)));
+		}
+	}
+}
+
+void get_info_st25tb2k_4k(uint8_t * systemArea)
+{
+	uint8_t b, i;
+	
+	b = ((*(uint32_t *) systemArea) >> 15) & 1;
+	
+	printf("  | ST reserved  : ");
+	for(i = 0; i < 15; i++)
+	{
+		printf("%hhu", (uint8_t) (((*(uint32_t *) systemArea) >> i) & 1));
+	}
+	printf("\n  | b15          : %hhu - %sOTP (?)\n  | OTP_Lock_RegU: ", b, b ? "not " : "");
+	for(i = 16; i < 24; i++)
+	{
+		printf("%hhu", (uint8_t) (((*(uint32_t *) systemArea) >> i) & 1));
+	}
+	printf("\n  | OTP_Lock_Reg : ");
+	for(i = 24; i < 32; i++)
+	{
+		printf("%hhu", (uint8_t) (((*(uint32_t *) systemArea) >> i) & 1));
+	}
+	printf("\n");
+	if(!(((*(uint32_t *) systemArea) >> 24) & 1))
+	{
+		printf("     blocks 0x07 and 0x08 are write protected\n");
+	}
+	for(i = 25; i < 32; i++)
+	{
+		if(!(((*(uint32_t *) systemArea) >> i) & 1))
+		{
+			printf("     block 0x%02hhx is write protected\n", ((uint8_t) (i - 16)));
+		}
+	}
+}
+
+void get_info_sr176_legacy(uint8_t * systemArea)
+{
+	uint8_t i;
+	
+	printf("  | Fixed Chip_ID: 0x%1x\n  | ST reserved  : ", systemArea[0] & 0x0f);
+	for(i = 4; i < 8; i++)
+	{
+		printf("%hhu", (uint8_t) (((*(uint16_t *) systemArea) >> i) & 1));
+	}
+	printf("\n  | OTP_Lock_Reg : ");
+	for(i = 8; i < 16; i++)
+	{
+		printf("%hhu", (uint8_t) (((*(uint16_t *) systemArea) >> i) & 1));
+	}
+	printf("\n");
+	for(i = 8; i < 16; i++)
+	{
+		if(((*(uint16_t *) systemArea) >> i) & 1)
+		{
+			printf("     blocks 0x%02hhx and 0x%02hhx are write protected\n", (uint8_t) ((i - 8) * 2), (uint8_t) (((i - 8) * 2) + 1));
+		}
+	}
+}
+
+void get_info_sri_srt_512_legacy(uint8_t * systemArea)
+{
+	uint8_t b, i;
+	
+	b = ((*(uint32_t *) systemArea) >> 15) & 1;
+	
+	printf("  | Fixed Chip_ID: 0x%02hhx\n  | ST reserved  : ", systemArea[0]);
+	for(i = 8; i < 15; i++)
+	{
+		printf("%hhu", (uint8_t) (((*(uint32_t *) systemArea) >> i) & 1));
+	}
+	printf("\n  | b15          : %hhu - %sOTP (?)\n  | OTP_Lock_Reg : ", b, b ? "not " : "");
+	for(i = 16; i < 32; i++)
+	{
+		printf("%hhu", (uint8_t) (((*(uint32_t *) systemArea) >> i) & 1));
+	}
+	printf("\n");
+	for(i = 16; i < 32; i++)
+	{
+		if(!(((*(uint32_t *) systemArea) >> i) & 1))
+		{
+			printf("     block 0x%02hhx is write protected\n", (uint8_t) (i - 16));
+		}
+	}
+}
+
+void get_info_sri2k_4k_srix4k_srix512_legacy(uint8_t * systemArea)
+{
+	uint8_t i;
+	
+	printf("  | Fixed Chip_ID: 0x%02hhx\n  | ST reserved  : ", systemArea[0]);
+	for(i = 8; i < 24; i++)
+	{
+		printf("%hhu", (uint8_t) (((*(uint32_t *) systemArea) >> i) & 1));
+	}
+	printf("\n  | OTP_Lock_Reg : ");
+	for(i = 24; i < 32; i++)
+	{
+		printf("%hhu", (uint8_t) (((*(uint32_t *) systemArea) >> i) & 1));
+	}
+	printf("\n");
+	if(!(((*(uint32_t *) systemArea) >> 24) & 1))
+	{
+		printf("     blocks 0x07 and 0x08 are write protected\n");
+	}
+	for(i = 25; i < 32; i++)
+	{
+		if(!(((*(uint32_t *) systemArea) >> i) & 1))
+		{
+			printf("     block 0x%02hhx is write protected\n", (uint8_t) (i - 16));
+		}
+	}
+}
+
+const st_data STRefs[] = {
+	{0x1b, false, "ST25TB512-AC", "https://www.st.com/resource/en/datasheet/st25tb512-ac.pdf", 4, 16,  255,  get_info_st25tb512},
+	{0x33, false, "ST25TB512-AT", "https://www.st.com/resource/en/datasheet/st25tb512-at.pdf", 4, 16,  255,  get_info_st25tb512},
+	{0x3f, false, "ST25TB02K",    "https://www.st.com/resource/en/datasheet/st25tb02k.pdf",    4, 64,  255,  get_info_st25tb2k_4k},
+	{0x1f, false, "ST25TB04K",    "https://www.st.com/resource/en/datasheet/st25tb04k.pdf",    4, 128, 255,  get_info_st25tb2k_4k},
+};
+const st_data STRefs_legacy[] = {
+	{ 0, true, "SRI4K(s)", NULL,                                                   4, 128, 255, NULL},
+	{ 2, true, "SR176",    "https://www.st.com/resource/en/datasheet/sr176.pdf",   2, 15,  15,  get_info_sr176_legacy},
+	{ 3, true, "SRIX4K",   NULL,                                                   4, 128, 255, get_info_sri2k_4k_srix4k_srix512_legacy},
+	{ 4, true, "SRIX512",  "https://www.st.com/resource/en/datasheet/srix512.pdf", 4, 16,  255, get_info_sri2k_4k_srix4k_srix512_legacy},
+	{ 6, true, "SRI512",   "https://www.st.com/resource/en/datasheet/sri512.pdf",  4, 16,  255, get_info_sri_srt_512_legacy},
+	{ 7, true, "SRI4K",    "https://www.st.com/resource/en/datasheet/sri4k.pdf",   4, 128, 255, get_info_sri2k_4k_srix4k_srix512_legacy},
+	{12, true, "SRT512",   "https://www.st.com/resource/en/datasheet/srt512.pdf",  4, 16,  255, get_info_sri_srt_512_legacy},
+	{15, true, "SRI2K",    "https://www.st.com/resource/en/datasheet/sri2k.pdf",   4, 64,  255, get_info_sri2k_4k_srix4k_srix512_legacy},
+};
+
+const st_data * get_info(const nfc_target *pnt, bool bPrintIt)
+{
+	const st_data *currentData = NULL;
+	const uint8_t *p;
+	uint8_t chipId, i;
+	
+	if(pnt->nm.nmt == NMT_ISO14443B2SR)
+	{
+		printf("Target  : %s (%s)\nUID     : ", str_nfc_modulation_type(pnt->nm.nmt), str_nfc_baud_rate(pnt->nm.nbr));
+		print_hex(pnt->nti.nsi.abtUID, sizeof(pnt->nti.nsi.abtUID));
+		printf("\n");
+		
+		p = pnt->nti.nsi.abtUID;
+		if(p[7] == 0xd0) // ST25TB* / SR*
+		{
+			chipId = p[5];
+			printf("Manuf   : 0x%02hhx - %s\n", p[6], (p[6] == 0x02) ? "STMicroelectronics" : "other");
+			
+			for(i = 0; i < (sizeof(STRefs) / sizeof(STRefs[0])); i++)
+			{
+				if(chipId == STRefs[i].chipId)
+				{
+					currentData = &STRefs[i];
+					break;
+				}
+			}
+			
+			if(!currentData)
+			{
+				chipId >>= 2;
+				for(i = 0; i < (sizeof(STRefs_legacy) / sizeof(STRefs_legacy[0])); i++)
+				{
+					if(chipId == STRefs_legacy[i].chipId)
+					{
+						currentData = &STRefs_legacy[i];
+						break;
+					}
+				}
+			}
+			
+			if(bPrintIt && currentData)
+			{
+				printf("ChipId  : 0x%02hhx - %s%s\nSerial  : 0x", currentData->chipId, currentData->szName, currentData->bIsLegacy ? " (legacy)" : "");
+				if(currentData->bIsLegacy)
+				{
+					printf("%1hhx", (uint8_t) (p[5] & 0x03));
+				}
+				printf("%02hhx%02hhx%02hhx%02hhx%02hhx\n|blk sz : %hhu bits\n|nb blks: %hhu\n|sys idx: %hhu\n", p[4], p[3], p[2], p[1], p[0], (uint8_t) (currentData->blockSize * 8), currentData->nbNormalBlock, currentData->bnSystem);
+			}
+		}
+		else printf("WARNI - Last byte of UID isn\'t 0xd0, but 0x%02hhx (not ST25TB / SR series?)\n", p[7]);
+	}
+	else printf("ERROR - not a NMT_ISO14443B2SR ?\n");
+	
+	return currentData;
+}
+
+void display_system_info(nfc_device *pnd, const st_data * stdata)
+{
+	uint8_t systemArea[ST25TB_SR_BLOCK_MAX_SIZE];
+	
+	if(get_block_at(pnd, stdata->bnSystem, systemArea, stdata->blockSize, true))
+	{
+		if(stdata->pfnGetInfo)
+		{
+			stdata->pfnGetInfo(systemArea);
+		}
+	}
+}
+
+void print_hex(const uint8_t *pbtData, const size_t szBytes)
+{
+	size_t szPos;
+	for (szPos = 0; szPos < szBytes; szPos++)
+	{
+		printf("%02hhx ", pbtData[szPos]);
+	}
+}
+

examples/pn53x-diagnose.1

@@ -13,7 +13,7 @@ Please report any bugs on the
 .B libnfc
 issue tracker at:
 .br
-.BR http://code.google.com/p/libnfc/issues
+.BR https://github.com/nfc-tools/libnfc/issues
 .SH LICENCE
 .B libnfc
 is licensed under the GNU Lesser General Public License (LGPL), version 3.

examples/pn53x-diagnose.c

@@ -1,7 +1,14 @@
 /*-
- * Public platform independent Near Field Communication (NFC) library examples
+ * Free/Libre Near Field Communication (NFC) library
  *
- * Copyright (C) 2010, Romuald Conty
+ * Libnfc historical contributors:
+ * Copyright (C) 2009      Roel Verdult
+ * Copyright (C) 2009-2013 Romuald Conty
+ * Copyright (C) 2010-2012 Romain Tartière
+ * Copyright (C) 2010-2013 Philippe Teuwen
+ * Copyright (C) 2012-2013 Ludovic Rousseau
+ * See AUTHORS file for a more comprehensive list of contributors.
+ * Additional contributors of this file:
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -32,8 +39,6 @@
  * @brief Small application to diagnose PN53x using dedicated commands
  */
 
-/* vim:set ts=2 sw=2 et: */
-
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif // HAVE_CONFIG_H
@@ -50,73 +55,84 @@
 #define MAX_DEVICE_COUNT 16
 
 int
-main (int argc, const char *argv[])
+main(int argc, const char *argv[])
 {
-  size_t  szFound;
   size_t  i;
-  nfc_device_t *pnd;
+  nfc_device *pnd = NULL;
-  nfc_device_desc_t *pnddDevices;
   const char *acLibnfcVersion;
   bool    result;
 
-  byte_t  abtRx[PN53x_EXTENDED_FRAME__DATA_MAX_LEN];
+  uint8_t  abtRx[PN53x_EXTENDED_FRAME__DATA_MAX_LEN];
   size_t  szRx = sizeof(abtRx);
-  const byte_t pncmd_diagnose_communication_line_test[] = { Diagnose, 0x00, 0x06, 'l', 'i', 'b', 'n', 'f', 'c' };
+  const uint8_t pncmd_diagnose_communication_line_test[] = { Diagnose, 0x00, 0x06, 'l', 'i', 'b', 'n', 'f', 'c' };
-  const byte_t pncmd_diagnose_rom_test[] = { Diagnose, 0x01 };
+  const uint8_t pncmd_diagnose_rom_test[] = { Diagnose, 0x01 };
-  const byte_t pncmd_diagnose_ram_test[] = { Diagnose, 0x02 };
+  const uint8_t pncmd_diagnose_ram_test[] = { Diagnose, 0x02 };
 
   if (argc > 1) {
-    errx (1, "usage: %s", argv[0]);
+    printf("Usage: %s", argv[0]);
+    exit(EXIT_FAILURE);
   }
+
+  nfc_context *context;
+  nfc_init(&context);
+  if (context == NULL) {
+    ERR("Unable to init libnfc (malloc)");
+    exit(EXIT_FAILURE);
+  }
+
   // Display libnfc version
-  acLibnfcVersion = nfc_version ();
+  acLibnfcVersion = nfc_version();
-  printf ("%s uses libnfc %s\n", argv[0], acLibnfcVersion);
+  printf("%s uses libnfc %s\n", argv[0], acLibnfcVersion);
 
-  if (!(pnddDevices = malloc (MAX_DEVICE_COUNT * sizeof (*pnddDevices)))) {
+  nfc_connstring connstrings[MAX_DEVICE_COUNT];
-    fprintf (stderr, "malloc() failed\n");
+  size_t szFound = nfc_list_devices(context, connstrings, MAX_DEVICE_COUNT);
-    return EXIT_FAILURE;
-  }
-
-  nfc_list_devices (pnddDevices, MAX_DEVICE_COUNT, &szFound);
 
   if (szFound == 0) {
-    printf ("No NFC device found.\n");
+    printf("No NFC device found.\n");
   }
 
   for (i = 0; i < szFound; i++) {
-    pnd = nfc_connect (&(pnddDevices[i]));
+    int res = 0;
+    pnd = nfc_open(context, connstrings[i]);
 
     if (pnd == NULL) {
-      ERR ("%s", "Unable to connect to NFC device.");
+      ERR("%s", "Unable to open NFC device.");
-      return EXIT_FAILURE;
+      nfc_exit(context);
+      exit(EXIT_FAILURE);
     }
 
-    printf ("NFC device [%s] connected.\n", pnd->acName);
+    printf("NFC device [%s] opened.\n", nfc_device_get_name(pnd));
 
-    result = pn53x_transceive (pnd, pncmd_diagnose_communication_line_test, sizeof (pncmd_diagnose_communication_line_test), abtRx, &szRx, NULL);
+    res = pn53x_transceive(pnd, pncmd_diagnose_communication_line_test, sizeof(pncmd_diagnose_communication_line_test), abtRx, szRx, 0);
-    if (result) {
+    if (res > 0) {
+      szRx = (size_t) res;
       // Result of Diagnose ping for RC-S360 doesn't contain status byte so we've to handle both cases
-      result = (memcmp (pncmd_diagnose_communication_line_test + 1, abtRx, sizeof (pncmd_diagnose_communication_line_test) - 1) == 0) ||
+      result = (memcmp(pncmd_diagnose_communication_line_test + 1, abtRx, sizeof(pncmd_diagnose_communication_line_test) - 1) == 0) ||
-               (memcmp (pncmd_diagnose_communication_line_test + 2, abtRx, sizeof (pncmd_diagnose_communication_line_test) - 2) == 0);
+               (memcmp(pncmd_diagnose_communication_line_test + 2, abtRx, sizeof(pncmd_diagnose_communication_line_test) - 2) == 0);
+      printf(" Communication line test: %s\n", result ? "OK" : "Failed");
     } else {
-      nfc_perror (pnd, "pn53x_transceive");
+      nfc_perror(pnd, "pn53x_transceive: cannot diagnose communication line");
     }
-    printf (" Communication line test: %s\n", result ? "OK" : "Failed");
 
-    result = pn53x_transceive (pnd, pncmd_diagnose_rom_test, sizeof (pncmd_diagnose_rom_test), abtRx, &szRx, NULL);
+    res = pn53x_transceive(pnd, pncmd_diagnose_rom_test, sizeof(pncmd_diagnose_rom_test), abtRx, szRx, 0);
-    if (result) {
+    if (res > 0) {
+      szRx = (size_t) res;
       result = ((szRx == 1) && (abtRx[0] == 0x00));
+      printf(" ROM test: %s\n", result ? "OK" : "Failed");
     } else {
-      nfc_perror (pnd, "pn53x_transceive");
+      nfc_perror(pnd, "pn53x_transceive: cannot diagnose ROM");
     }
-    printf (" ROM test: %s\n", result ? "OK" : "Failed");
 
-    result = pn53x_transceive (pnd, pncmd_diagnose_ram_test, sizeof (pncmd_diagnose_ram_test), abtRx, &szRx, NULL);
+    res = pn53x_transceive(pnd, pncmd_diagnose_ram_test, sizeof(pncmd_diagnose_ram_test), abtRx, szRx, 0);
-    if (result) {
+    if (res > 0) {
+      szRx = (size_t) res;
       result = ((szRx == 1) && (abtRx[0] == 0x00));
+      printf(" RAM test: %s\n", result ? "OK" : "Failed");
     } else {
-      nfc_perror (pnd, "pn53x_transceive");
+      nfc_perror(pnd, "pn53x_transceive: cannot diagnose RAM");
     }
-    printf (" RAM test: %s\n", result ? "OK" : "Failed");
   }
+  nfc_close(pnd);
+  nfc_exit(context);
+  exit(EXIT_SUCCESS);
 }

examples/pn53x-sam.1

@@ -19,7 +19,7 @@ Please report any bugs on the
 .B libnfc
 issue tracker at:
 .br
-.BR http://code.google.com/p/libnfc/issues
+.BR https://github.com/nfc-tools/libnfc/issues
 .SH LICENCE
 .B libnfc
 is licensed under the GNU Lesser General Public License (LGPL), version 3.

examples/pn53x-sam.c

@@ -1,7 +1,15 @@
 /*-
- * Public platform independent Near Field Communication (NFC) library examples
+ * Free/Libre Near Field Communication (NFC) library
  *
- * Copyright (C) 2010, Emanuele Bertoldi
+ * Libnfc historical contributors:
+ * Copyright (C) 2009      Roel Verdult
+ * Copyright (C) 2009-2013 Romuald Conty
+ * Copyright (C) 2010-2012 Romain Tartière
+ * Copyright (C) 2010-2013 Philippe Teuwen
+ * Copyright (C) 2012-2013 Ludovic Rousseau
+ * See AUTHORS file for a more comprehensive list of contributors.
+ * Additional contributors of this file:
+ * Copyright (C) 2010      Emanuele Bertoldi
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -51,112 +59,151 @@
 #define MAX_FRAME_LEN 264
 #define TIMEOUT 60              // secs.
 
-void
+static void
-wait_one_minute ()
+wait_one_minute(void)
 {
   int     secs = 0;
 
-  printf ("|");
+  printf("|");
-  fflush (stdout);
+  fflush(stdout);
 
   while (secs < TIMEOUT) {
-    sleep (1);
+    sleep(1);
     secs++;
-    printf (".");
+    printf(".");
-    fflush (stdout);
+    fflush(stdout);
   }
 
-  printf ("|\n");
+  printf("|\n");
 }
 
 int
-main (int argc, const char *argv[])
+main(int argc, const char *argv[])
 {
-  nfc_device_t *pnd;
-
   (void) argc;
   (void) argv;
 
-  // Display libnfc version
+  nfc_context *context;
-  const char *acLibnfcVersion = nfc_version ();
+  nfc_init(&context);
-  printf ("%s uses libnfc %s\n", argv[0], acLibnfcVersion);
+  if (context == NULL) {
+    ERR("Unable to init libnfc (malloc)");
+    exit(EXIT_FAILURE);
+  }
 
-  // Connect using the first available NFC device
+  // Display libnfc version
-  pnd = nfc_connect (NULL);
+  const char *acLibnfcVersion = nfc_version();
+  printf("%s uses libnfc %s\n", argv[0], acLibnfcVersion);
+
+  // Open using the first available NFC device
+  nfc_device *pnd;
+  pnd = nfc_open(context, NULL);
 
   if (pnd == NULL) {
-    ERR ("%s", "Unable to connect to NFC device.");
+    ERR("%s", "Unable to open NFC device.");
-    return EXIT_FAILURE;
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
   }
 
-  printf ("Connected to NFC device: %s\n", pnd->acName);
+  printf("NFC device: %s opened\n", nfc_device_get_name(pnd));
 
   // Print the example's menu
-  printf ("\nSelect the communication mode:\n");
+  printf("\nSelect the communication mode:\n");
-  printf ("[1] Virtual card mode.\n");
+  printf("[1] Virtual card mode.\n");
-  printf ("[2] Wired card mode.\n");
+  printf("[2] Wired card mode.\n");
-  printf ("[3] Dual card mode.\n");
+  printf("[3] Dual card mode.\n");
-  printf (">> ");
+  printf(">> ");
 
   // Take user's choice
-  char    input = getchar ();
+  int input = getchar();
-  int iMode = input - '0' + 1;
+  printf("\n");
-  printf ("\n");
+  if ((input < '1') || (input > '3')) {
-  if (iMode < 1 || iMode > 3) {
+    ERR("%s", "Invalid selection.");
-    ERR ("%s", "Invalid selection.");
+    nfc_close(pnd);
-    exit (EXIT_FAILURE);
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
   }
+
+  /*
+   * '1' -> "Virtual mode" (0x02)
+   * '2' -> "Wired card" (0x03)
+   * '3' -> "Dual card" (0x04)
+   */
+  int iMode = input - '0' + 0x01;
   pn532_sam_mode mode = iMode;
 
   // Connect with the SAM
-  // FIXME: Its a private pn53x function
-  if (!pn53x_SAMConfiguration (pnd, mode, NULL)) {
-    nfc_perror (pnd, "pn53x_SAMConfiguration");
-    exit (EXIT_FAILURE);
-  }
 
   switch (mode) {
-  case PSM_VIRTUAL_CARD:
+    case PSM_VIRTUAL_CARD: {
-    {
+      // FIXME Its a private pn53x function
-      printf ("Now the SAM is readable for 1 minute from an external reader.\n");
+      if (pn532_SAMConfiguration(pnd, mode, 0) < 0) {
-      wait_one_minute ();
+        nfc_perror(pnd, "pn53x_SAMConfiguration");
+        nfc_close(pnd);
+        nfc_exit(context);
+        exit(EXIT_FAILURE);
+      }
+      printf("Now the SAM is readable for 1 minute from an external reader.\n");
+      wait_one_minute();
     }
     break;
 
-  case PSM_WIRED_CARD:
+    case PSM_WIRED_CARD: {
-    {
+      // Set opened NFC device to initiator mode
-      nfc_target_t nt;
+      if (nfc_initiator_init_secure_element(pnd) < 0) {
-
+        nfc_perror(pnd, "nfc_initiator_init_secure_element");
-      // Set connected NFC device to initiator mode
+        nfc_close(pnd);
-      nfc_initiator_init (pnd);
+        nfc_exit(context);
+        exit(EXIT_FAILURE);
+      }
 
       // Let the reader only try once to find a tag
-      if (!nfc_configure (pnd, NDO_INFINITE_SELECT, false)) {
+      if (nfc_device_set_property_bool(pnd, NP_INFINITE_SELECT, false) < 0) {
-        nfc_perror (pnd, "nfc_configure");
+        nfc_perror(pnd, "nfc_device_set_property_bool");
-        exit (EXIT_FAILURE);
+        nfc_close(pnd);
+        nfc_exit(context);
+        exit(EXIT_FAILURE);
       }
       // Read the SAM's info
-      const nfc_modulation_t nmSAM = {
+      const nfc_modulation nmSAM = {
         .nmt = NMT_ISO14443A,
         .nbr = NBR_106,
       };
-      if (!nfc_initiator_select_passive_target (pnd, nmSAM, NULL, 0, &nt)) {
+      nfc_target nt;
-        nfc_perror (pnd, "nfc_initiator_select_passive_target");
-        ERR ("%s", "Reading of SAM info failed.");
-        exit (EXIT_FAILURE);
-      }
 
-      printf ("The following ISO14443A tag (SAM) was found:\n");
+      int res;
-      print_nfc_iso14443a_info (nt.nti.nai, true);
+      if ((res = nfc_initiator_select_passive_target(pnd, nmSAM, NULL, 0, &nt)) < 0) {
+        nfc_perror(pnd, "nfc_initiator_select_passive_target");
+        nfc_close(pnd);
+        nfc_exit(context);
+        exit(EXIT_FAILURE);
+      } else if (res == 0) {
+        ERR("No SAM found.");
+        nfc_close(pnd);
+        nfc_exit(context);
+        exit(EXIT_FAILURE);
+      } else if (res == 1) {
+        printf("The following ISO14443A tag (SAM) was found:\n");
+        print_nfc_target(&nt, true);
+      } else {
+        ERR("%s", "More than one ISO14442 tag found as SAM.");
+        nfc_close(pnd);
+        nfc_exit(context);
+        exit(EXIT_FAILURE);
+      }
     }
     break;
 
-  case PSM_DUAL_CARD:
+    case PSM_DUAL_CARD: {
-    {
+      // FIXME Its a private pn53x function
-      byte_t  abtRx[MAX_FRAME_LEN];
+      if (pn532_SAMConfiguration(pnd, mode, 0) < 0) {
-      size_t  szRx = sizeof(abtRx);
+        nfc_perror(pnd, "pn53x_SAMConfiguration");
+        nfc_close(pnd);
+        nfc_exit(context);
+        exit(EXIT_FAILURE);
+      }
+      uint8_t  abtRx[MAX_FRAME_LEN];
 
-      nfc_target_t nt = {
+      nfc_target nt = {
         .nm = {
           .nmt = NMT_ISO14443A,
           .nbr = NBR_UNDEFINED,
@@ -171,24 +218,27 @@ main (int argc, const char *argv[])
           },
         },
       };
-      printf ("Now both, NFC device (configured as target) and SAM are readables from an external NFC initiator.\n");
+      printf("Now both, NFC device (configured as target) and SAM are readables from an external NFC initiator.\n");
-      printf ("Please note that NFC device (configured as target) stay in target mode until it receive RATS, ATR_REQ or proprietary command.\n");
+      printf("Please note that NFC device (configured as target) stay in target mode until it receive RATS, ATR_REQ or proprietary command.\n");
-      if (!nfc_target_init (pnd, &nt, abtRx, &szRx)) {
+      if (nfc_target_init(pnd, &nt, abtRx, sizeof(abtRx), 0) < 0) {
         nfc_perror(pnd, "nfc_target_init");
-        return EXIT_FAILURE;
+        nfc_close(pnd);
+        nfc_exit(context);
+        exit(EXIT_FAILURE);
       }
       // wait_one_minute ();
     }
     break;
-  default:
+    case PSM_NORMAL:
-    break;
+      // This should not happend... nothing to do.
+      break;
   }
 
   // Disconnect from the SAM
-  pn53x_SAMConfiguration (pnd, PSM_NORMAL, NULL);
+  pn532_SAMConfiguration(pnd, PSM_NORMAL, -1);
 
-  // Disconnect from NFC device
+  // Close NFC device
-  nfc_disconnect (pnd);
+  nfc_close(pnd);
-
+  nfc_exit(context);
-  exit (EXIT_SUCCESS);
+  exit(EXIT_SUCCESS);
 }

examples/pn53x-tamashell-scripts/ReadMobib.sh

@@ -1,8 +1,10 @@
-#!/bin/bash
+#!/bin/sh
+
+#DEBUG='//;'
 
 cat << EOF | \
     pn53x-tamashell |\
-    awk '\
+    awk $DEBUG'\
         /^> #.*:/{
             sub(/^> #/,"")
             n=$0
@@ -15,90 +17,111 @@ cat << EOF | \
             sub(/Rx: 00/,"")
             gsub(/ +/," ")
             sub(/ 90 00 $/,"")
-            print n toupper($0)}'
+            print n toupper($0)}' |\
+    grep -v ": 6A 83"
 
 # Select one typeB target
 4A010300
 
+# SELECT AID "1TIC.ICA"
+4001 00a4 0400 08 315449432e494341
+
 # Select ICC file
-4001 80a4 0800 04 3f00 0002
+4001 00a4 0000 02 3f00
+4001 00a4 0000 02 0002
 #ICC:
-4001 80b2 0104 1d
+4001 00b2 0104 1d
 
 # Select Holder file
-4001 80a4 0800 04 3f00 3f1c
+4001 00a4 0000 02 3f1c
 #Holder1:
-4001 80b2 0104 1d
+4001 00b2 0104 1d
 #Holder2:
-4001 80b2 0204 1d
+4001 00b2 0204 1d
 
 # Select EnvHol file
-4001 80a4 0800 04 2000 2001
+4001 00a4 0000 00
+4001 00a4 0000 02 2000
+4001 00a4 0000 02 2001
 #EnvHol1:
-4001 80b2 0104 1d
+4001 00b2 0104 1d
 #EnvHol2:
-4001 80b2 0204 1d
+4001 00b2 0204 1d
 
 # Select EvLog file
-4001 80a4 0800 04 2000 2010
+4001 00a4 0000 02 2010
 #EvLog1:
-4001 80b2 0104 1d
+4001 00b2 0104 1d
 #EvLog2:
-4001 80b2 0204 1d
+4001 00b2 0204 1d
 #EvLog3:
-4001 80b2 0304 1d
+4001 00b2 0304 1d
 
 # Select ConList file
-4001 80a4 0800 04 2000 2050
+4001 00a4 0000 02 2050
 #ConList:
-4001 80b2 0104 1d
+4001 00b2 0104 1d
 
 # Select Contra file
-4001 80a4 0800 04 2000 2020
+4001 00a4 0000 02 2020
 #Contra1:
-4001 80b2 0104 1d
+4001 00b2 0104 1d
 #Contra2:
-4001 80b2 0204 1d
+4001 00b2 0204 1d
 #Contra3:
-4001 80b2 0304 1d
+4001 00b2 0304 1d
 #Contra4:
-4001 80b2 0404 1d
+4001 00b2 0404 1d
 #Contra5:
-4001 80b2 0504 1d
+4001 00b2 0504 1d
 #Contra6:
-4001 80b2 0604 1d
+4001 00b2 0604 1d
 #Contra7:
-4001 80b2 0704 1d
+4001 00b2 0704 1d
 #Contra8:
-4001 80b2 0804 1d
+4001 00b2 0804 1d
+#Contra9:
+4001 00b2 0904 1d
+#ContraA:
+4001 00b2 0a04 1d
+#ContraB:
+4001 00b2 0b04 1d
+#ContraC:
+4001 00b2 0c04 1d
 
 # Select Counter file
-4001 80a4 0800 04 2000 2069
+4001 00a4 0000 02 2069
 #Counter:
-4001 80b2 0104 1d
+4001 00b2 0104 1d
 
 # Select LoadLog file
-4001 80a4 0800 04 1000 1014
+4001 00a4 0000 00
+4001 00a4 0000 02 1000
+4001 00a4 0000 02 1014
 #LoadLog:
-4001 80b2 0104 1d
+4001 00b2 0104 1d
 
 # Select Purcha file
-4001 80a4 08 0004 1000 1015
+4001 00a4 0000 02 1015
 #Purcha1:
-4001 80b2 0104 1d
+4001 00b2 0104 1d
 #Purcha2:
-4001 80b2 0204 1d
+4001 00b2 0204 1d
+#Purcha3:
+4001 00b2 0304 1d
 
 # Select SpecEv file
-4001 80a4 08 0004 2000 2040
+4001 00a4 0000 00
+4001 00a4 0000 02 2000
+4001 00a4 0000 02 2040
 #SpecEv1:
-4001 80b2 0104 1d
+4001 00b2 0104 1d
 #SpecEv2:
-4001 80b2 0204 1d
+4001 00b2 0204 1d
 #SpecEv3:
-4001 80b2 0304 1d
+4001 00b2 0304 1d
 #SpecEv4:
-4001 80b2 0404 1d
+4001 00b2 0404 1d
 EOF
 
 

examples/pn53x-tamashell-scripts/ReadNavigo.sh

@@ -1,9 +1,9 @@
-#!/bin/bash
+#!/bin/sh
 
 ID=$(cat << EOF | \
     pn53x-tamashell |\
     grep -A1 "^Tx: 42  01  0b  3f  80" |\
-    grep -o -P "(?<=Rx: 00  ..  ..  )..  ..  ..  .."|sed 's/  //g'
+    sed -e '1d' -e "s/^Rx: 00  ..  ..  \(..  ..  ..  ..\).*/\1/" -e 's/  //g'
 # Timeouts
 3205000002
 # ListTarget ModeB
@@ -13,6 +13,11 @@ ID=$(cat << EOF | \
 EOF
 )
 
+if [ -z "$ID" ]; then
+	echo "Error: I was not abble to read Navigo ID" >&2
+	exit 1
+fi
+
 cat << EOF | \
     pn53x-tamashell |\
     awk '\

examples/pn53x-tamashell.1

@@ -68,7 +68,7 @@ Please report any bugs on the
 .B libnfc
 issue tracker at:
 .br
-.BR http://code.google.com/p/libnfc/issues
+.BR https://github.com/nfc-tools/libnfc/issues
 .SH LICENCE
 .B libnfc
 is licensed under the GNU Lesser General Public License (LGPL), version 3.

examples/pn53x-tamashell.c

@@ -1,7 +1,14 @@
 /*-
- * Public platform independent Near Field Communication (NFC) library examples
+ * Free/Libre Near Field Communication (NFC) library
  *
- * Copyright (C) 2010, Romuald Conty
+ * Libnfc historical contributors:
+ * Copyright (C) 2009      Roel Verdult
+ * Copyright (C) 2009-2013 Romuald Conty
+ * Copyright (C) 2010-2012 Romain Tartière
+ * Copyright (C) 2010-2013 Philippe Teuwen
+ * Copyright (C) 2012-2013 Ludovic Rousseau
+ * See AUTHORS file for a more comprehensive list of contributors.
+ * Additional contributors of this file:
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -36,8 +43,6 @@
 #  include "config.h"
 #endif // HAVE_CONFIG_H
 
-#  define _GNU_SOURCE // for getline on system with glibc < 2.10
-#  define _POSIX_C_SOURCE 200809L // for getline on system with glibc >= 2.10
 #  include <stdio.h>
 #if defined(HAVE_READLINE)
 #  include <readline/readline.h>
@@ -50,15 +55,16 @@
 #include <time.h>
 
 #ifndef _WIN32
-// Needed by sleep() under Unix
+#  include <time.h>
-#  include <unistd.h>
+#  define msleep(x) do { \
-#  define sleep usleep
+    struct timespec xsleep; \
-#  define SUSP_TIME 1000           // usecs.
+    xsleep.tv_sec = x / 1000; \
+    xsleep.tv_nsec = (x - xsleep.tv_sec * 1000) * 1000 * 1000; \
+    nanosleep(&xsleep, NULL); \
+  } while (0)
 #else
-// Needed by Sleep() under Windows
 #  include <winbase.h>
-#  define sleep Sleep
+#  define msleep Sleep
-#  define SUSP_TIME 1        // msecs.
 #endif
 
 
@@ -69,51 +75,69 @@
 
 #define MAX_FRAME_LEN 264
 
-int main(int argc, const char* argv[])
+int main(int argc, const char *argv[])
 {
-  nfc_device_t* pnd;
+  nfc_device *pnd;
-  byte_t abtRx[MAX_FRAME_LEN];
+  uint8_t abtRx[MAX_FRAME_LEN];
-  byte_t abtTx[MAX_FRAME_LEN];
+  uint8_t abtTx[MAX_FRAME_LEN];
   size_t szRx = sizeof(abtRx);
   size_t szTx;
-  extern FILE* stdin;
+  FILE *input = NULL;
-  FILE* input = NULL;
 
   if (argc >= 2) {
-    if((input=fopen(argv[1], "r"))==NULL) {
+    if ((input = fopen(argv[1], "r")) == NULL) {
-      ERR ("%s", "Cannot open file.");
+      ERR("%s", "Cannot open file.");
-      return EXIT_FAILURE;
+      exit(EXIT_FAILURE);
     }
   }
 
-  // Try to open the NFC reader
+  nfc_context *context;
-  pnd = nfc_connect(NULL);
+  nfc_init(&context);
-
+  if (context == NULL) {
-  if (pnd == NULL) {
+    ERR("Unable to init libnfc (malloc)");
-    ERR ("%s", "Unable to connect to NFC device.");
+    exit(EXIT_FAILURE);
-    return EXIT_FAILURE;
   }
 
-  printf ("Connected to NFC reader: %s\n", pnd->acName);
+  // Try to open the NFC reader
-  nfc_initiator_init(pnd);
+  pnd = nfc_open(context, NULL);
 
-  char * cmd;
+  if (pnd == NULL) {
-  char * prompt="> ";
+    ERR("%s", "Unable to open NFC device.");
-  while(1) {
+    if (input != NULL) {
-    int offset=0;
+      fclose(input);
+    }
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
+  }
+
+  printf("NFC reader: %s opened\n", nfc_device_get_name(pnd));
+  if (nfc_initiator_init(pnd) < 0) {
+    nfc_perror(pnd, "nfc_initiator_init");
+    if (input != NULL) {
+      fclose(input);
+    }
+    nfc_close(pnd);
+    nfc_exit(context);
+    exit(EXIT_FAILURE);
+  }
+
+  const char *prompt = "> ";
+  while (1) {
+    int offset = 0;
+    char *cmd;
 #if defined(HAVE_READLINE)
-    if (input==NULL) { // means we use stdin
+    if (input == NULL) { // means we use stdin
-      cmd=readline(prompt);
+      cmd = readline(prompt);
       // NULL if ctrl-d
-      if (cmd==NULL) {
+      if (cmd == NULL) {
         printf("Bye!\n");
         break;
       }
       add_history(cmd);
     } else {
 #endif //HAVE_READLINE
-      size_t n = 255;
+      size_t n = 512;
-      char * ret = NULL;
+      char *ret = NULL;
       cmd = malloc(n);
       printf("%s", prompt);
       fflush(0);
@@ -132,39 +156,39 @@ int main(int argc, const char* argv[])
 #if defined(HAVE_READLINE)
     }
 #endif //HAVE_READLINE
-    if (cmd[0]=='q') {
+    if (cmd[0] == 'q') {
       printf("Bye!\n");
       free(cmd);
       break;
     }
-    if (cmd[0]=='p') {
+    if (cmd[0] == 'p') {
-      int s=0;
+      int ms = 0;
       offset++;
       while (isspace(cmd[offset])) {
         offset++;
       }
-      sscanf(cmd+offset, "%d", &s);
+      sscanf(cmd + offset, "%10d", &ms);
-      printf("Pause for %i msecs\n", s);
+      printf("Pause for %i msecs\n", ms);
-      if (s>0) {
+      if (ms > 0) {
-          sleep(s * SUSP_TIME);
+        msleep(ms);
       }
       free(cmd);
       continue;
     }
     szTx = 0;
-    for(int i = 0; i<MAX_FRAME_LEN-10; i++) {
+    for (int i = 0; i < MAX_FRAME_LEN; i++) {
       int size;
-      byte_t byte;
+      unsigned int byte;
       while (isspace(cmd[offset])) {
         offset++;
       }
-      size = sscanf(cmd+offset, "%2x", (unsigned int*)&byte);
+      size = sscanf(cmd + offset, "%2x", &byte);
-      if (size<1) {
+      if (size < 1) {
         break;
       }
       abtTx[i] = byte;
       szTx++;
-      if (cmd[offset+1] == 0) { // if last hex was only 1 symbol
+      if (cmd[offset + 1] == 0) { // if last hex was only 1 symbol
         break;
       }
       offset += 2;
@@ -175,14 +199,16 @@ int main(int argc, const char* argv[])
       continue;
     }
     printf("Tx: ");
-    print_hex((byte_t*)abtTx,szTx);
+    print_hex(abtTx, szTx);
 
     szRx = sizeof(abtRx);
-    if (!pn53x_transceive (pnd, abtTx, szTx, abtRx, &szRx, NULL)) {
+    int res = 0;
+    if ((res = pn53x_transceive(pnd, abtTx, szTx, abtRx, szRx, 0)) < 0) {
       free(cmd);
-      nfc_perror (pnd, "Rx");
+      nfc_perror(pnd, "Rx");
       continue;
     }
+    szRx = (size_t) res;
 
     printf("Rx: ");
     print_hex(abtRx, szRx);
@@ -192,6 +218,7 @@ int main(int argc, const char* argv[])
   if (input != NULL) {
     fclose(input);
   }
-  nfc_disconnect(pnd);
+  nfc_close(pnd);
-  return 1;
+  nfc_exit(context);
+  exit(EXIT_SUCCESS);
 }

include/nfc/nfc-emulation.h

@@ -1,7 +1,14 @@
 /*-
- * Public platform independent Near Field Communication (NFC) library
+ * Free/Libre Near Field Communication (NFC) library
  *
- * Copyright (C) 2011, Romuald Conty, Romain Tartière
+ * Libnfc historical contributors:
+ * Copyright (C) 2009      Roel Verdult
+ * Copyright (C) 2009-2013 Romuald Conty
+ * Copyright (C) 2010-2012 Romain Tartière
+ * Copyright (C) 2010-2013 Philippe Teuwen
+ * Copyright (C) 2012-2013 Ludovic Rousseau
+ * See AUTHORS file for a more comprehensive list of contributors.
+ * Additional contributors of this file:
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published by the
@@ -17,6 +24,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 
+/**
+ * @file nfc-emulation.h
+ * @brief Provide a small API to ease emulation in libnfc
+ */
+
 #ifndef __NFC_EMULATION_H__
 #define __NFC_EMULATION_H__
 
@@ -30,19 +42,26 @@ extern  "C" {
 struct nfc_emulator;
 struct nfc_emulation_state_machine;
 
-
+/**
+ * @struct nfc_emulator
+ * @brief NFC emulator structure
+ */
 struct nfc_emulator {
-  nfc_target_t *target;
+  nfc_target *target;
   struct nfc_emulation_state_machine *state_machine;
   void *user_data;
 };
 
+/**
+ * @struct nfc_emulation_state_machine
+ * @brief  NFC emulation state machine structure
+ */
 struct nfc_emulation_state_machine {
-  int (*io)(struct nfc_emulator *emulator, const byte_t *data_in, const size_t data_in_len, byte_t *data_out, const size_t data_out_len);
+  int (*io)(struct nfc_emulator *emulator, const uint8_t *data_in, const size_t data_in_len, uint8_t *data_out, const size_t data_out_len);
   void *data;
 };
 
-NFC_EXPORT int    nfc_emulate_target (nfc_device_t* pnd, struct nfc_emulator *emulator);
+NFC_EXPORT int    nfc_emulate_target(nfc_device *pnd, struct nfc_emulator *emulator, const int timeout);
 
 #ifdef __cplusplus
 }

include/nfc/nfc-types.h

@@ -1,9 +1,15 @@
-/**
+/*-
- * Public platform independent Near Field Communication (NFC) library
+ * Free/Libre Near Field Communication (NFC) library
  *
- * Copyright (C) 2009, Roel Verdult
+ * Libnfc historical contributors:
- * Copyright (C) 2010, Romain Tartière, Romuald Conty
+ * Copyright (C) 2009      Roel Verdult
- * Copyright (C) 2011, Romain Tartière, Romuald Conty
+ * Copyright (C) 2009-2013 Romuald Conty
+ * Copyright (C) 2010-2012 Romain Tartière
+ * Copyright (C) 2010-2013 Philippe Teuwen
+ * Copyright (C) 2012-2013 Ludovic Rousseau
+ * See AUTHORS file for a more comprehensive list of contributors.
+ * Additional contributors of this file:
+ * Copyright (C) 2020      Adam Laurie
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published by the
@@ -25,271 +31,273 @@
  */
 
 #ifndef __NFC_TYPES_H__
-#  define __NFC_TYPES_H__
+#define __NFC_TYPES_H__
 
-#  include <stddef.h>
+#include <stddef.h>
-#  include <stdint.h>
+#include <stdint.h>
-#  include <stdbool.h>
+#include <stdbool.h>
-#  include <stdio.h>
+#include <stdio.h>
 
-typedef uint8_t byte_t;
+#ifndef NFC_BUFSIZE_CONNSTRING
-
+#define NFC_BUFSIZE_CONNSTRING 1024
-#  define DEVICE_NAME_LENGTH  256
+#endif
-#  define DEVICE_PORT_LENGTH  64
 
 /**
- * @struct nfc_device_t
+ * NFC context
- * @brief NFC device information
  */
-typedef struct {
+typedef struct nfc_context nfc_context;
-/** Driver's functions for handling device specific wrapping */
-  const struct nfc_driver_t *driver;
-  void* driver_data;
-  void* chip_data;
-
-/** Device name string, including device wrapper firmware */
-  char    acName[DEVICE_NAME_LENGTH];
-/** Is the crc automaticly added, checked and removed from the frames */
-  bool    bCrc;
-/** Does the chip handle parity bits, all parities are handled as data */
-  bool    bPar;
-/** Should the chip handle frames encapsulation and chaining */
-  bool    bEasyFraming;
-/** Should the chip switch automatically activate ISO14443-4 when
-    selecting tags supporting it? */
-  bool    bAutoIso14443_4;
-/** Supported modulation encoded in a byte */
-  byte_t  btSupportByte;
-/** Last error reported by the PCD / encountered by the PCD driver
- * MSB       LSB
- *  | 00 | 00 |
- *    ||   ||
- *    ||   ++----- Chip-level error (as reported by the PCD)
- *    |+---------- Driver-level specific error
- *    +----------- Driver-level general error (common to all drivers)
- */
-  int     iLastError;
-} nfc_device_t;
 
 /**
- * @struct nfc_device_desc_t
+ * NFC device
- * @brief NFC device description
- *
- * This struct is used to try to connect to a specified nfc device when nfc_connect(...)
  */
-typedef struct {
+typedef struct nfc_device nfc_device;
-  /** Device name (e.g. "ACS ACR 38U-CCID 00 00") */
-  char    acDevice[DEVICE_NAME_LENGTH];
-  /** Driver name (e.g. "PN532_UART")*/
-  char   *pcDriver;
-  /** Port (e.g. "/dev/ttyUSB0") */
-  char    acPort[DEVICE_PORT_LENGTH];
-  /** Port speed (e.g. "115200") */
-  uint32_t uiSpeed;
-  /** Device index for backward compatibility (used to choose one specific device in USB or PSCS devices list) */
-  uint32_t uiBusIndex;
-} nfc_device_desc_t;
 
-// Compiler directive, set struct alignment to 1 byte_t for compatibility
+/**
+ * NFC device driver
+ */
+typedef struct nfc_driver nfc_driver;
+
+/**
+ * Connection string
+ */
+typedef char nfc_connstring[NFC_BUFSIZE_CONNSTRING];
+
+/**
+ * Properties
+ */
+typedef enum {
+  /**
+   * Default command processing timeout
+   * Property value's (duration) unit is ms and 0 means no timeout (infinite).
+   * Default value is set by driver layer
+   */
+  NP_TIMEOUT_COMMAND,
+  /**
+   * Timeout between ATR_REQ and ATR_RES
+   * When the device is in initiator mode, a target is considered as mute if no
+   * valid ATR_RES is received within this timeout value.
+   * Default value for this property is 103 ms on PN53x based devices.
+   */
+  NP_TIMEOUT_ATR,
+  /**
+   * Timeout value to give up reception from the target in case of no answer.
+   * Default value for this property is 52 ms).
+   */
+  NP_TIMEOUT_COM,
+  /** Let the PN53X chip handle the CRC bytes. This means that the chip appends
+  * the CRC bytes to the frames that are transmitted. It will parse the last
+  * bytes from received frames as incoming CRC bytes. They will be verified
+  * against the used modulation and protocol. If an frame is expected with
+  * incorrect CRC bytes this option should be disabled. Example frames where
+  * this is useful are the ATQA and UID+BCC that are transmitted without CRC
+  * bytes during the anti-collision phase of the ISO14443-A protocol. */
+  NP_HANDLE_CRC,
+  /** Parity bits in the network layer of ISO14443-A are by default generated and
+   * validated in the PN53X chip. This is a very convenient feature. On certain
+   * times though it is useful to get full control of the transmitted data. The
+   * proprietary MIFARE Classic protocol uses for example custom (encrypted)
+   * parity bits. For interoperability it is required to be completely
+   * compatible, including the arbitrary parity bits. When this option is
+   * disabled, the functions to communicating bits should be used. */
+  NP_HANDLE_PARITY,
+  /** This option can be used to enable or disable the electronic field of the
+   * NFC device. */
+  NP_ACTIVATE_FIELD,
+  /** The internal CRYPTO1 co-processor can be used to transmit messages
+   * encrypted. This option is automatically activated after a successful MIFARE
+   * Classic authentication. */
+  NP_ACTIVATE_CRYPTO1,
+  /** The default configuration defines that the PN53X chip will try indefinitely
+   * to invite a tag in the field to respond. This could be desired when it is
+   * certain a tag will enter the field. On the other hand, when this is
+   * uncertain, it will block the application. This option could best be compared
+   * to the (NON)BLOCKING option used by (socket)network programming. */
+  NP_INFINITE_SELECT,
+  /** If this option is enabled, frames that carry less than 4 bits are allowed.
+   * According to the standards these frames should normally be handles as
+   * invalid frames. */
+  NP_ACCEPT_INVALID_FRAMES,
+  /** If the NFC device should only listen to frames, it could be useful to let
+   * it gather multiple frames in a sequence. They will be stored in the internal
+   * FIFO of the PN53X chip. This could be retrieved by using the receive data
+   * functions. Note that if the chip runs out of bytes (FIFO = 64 bytes long),
+   * it will overwrite the first received frames, so quick retrieving of the
+   * received data is desirable. */
+  NP_ACCEPT_MULTIPLE_FRAMES,
+  /** This option can be used to enable or disable the auto-switching mode to
+   * ISO14443-4 is device is compliant.
+   * In initiator mode, it means that NFC chip will send RATS automatically when
+   * select and it will automatically poll for ISO14443-4 card when ISO14443A is
+   * requested.
+   * In target mode, with a NFC chip compliant (ie. PN532), the chip will
+   * emulate a 14443-4 PICC using hardware capability */
+  NP_AUTO_ISO14443_4,
+  /** Use automatic frames encapsulation and chaining. */
+  NP_EASY_FRAMING,
+  /** Force the chip to switch in ISO14443-A */
+  NP_FORCE_ISO14443_A,
+  /** Force the chip to switch in ISO14443-B */
+  NP_FORCE_ISO14443_B,
+  /** Force the chip to run at 106 kbps */
+  NP_FORCE_SPEED_106,
+} nfc_property;
+
+// Compiler directive, set struct alignment to 1 uint8_t for compatibility
 #  pragma pack(1)
 
 /**
- * @enum nfc_device_option_t
+ * @enum nfc_dep_mode
- * @brief NFC device option
- */
-typedef enum {
-/** Let the PN53X chip handle the CRC bytes. This means that the chip appends
- * the CRC bytes to the frames that are transmitted. It will parse the last
- * bytes from received frames as incoming CRC bytes. They will be verified
- * against the used modulation and protocol. If an frame is expected with
- * incorrect CRC bytes this option should be disabled. Example frames where
- * this is useful are the ATQA and UID+BCC that are transmitted without CRC
- * bytes during the anti-collision phase of the ISO14443-A protocol. */
-  NDO_HANDLE_CRC = 0x00,
-/** Parity bits in the network layer of ISO14443-A are by default generated and
- * validated in the PN53X chip. This is a very convenient feature. On certain
- * times though it is useful to get full control of the transmitted data. The
- * proprietary MIFARE Classic protocol uses for example custom (encrypted)
- * parity bits. For interoperability it is required to be completely
- * compatible, including the arbitrary parity bits. When this option is
- * disabled, the functions to communicating bits should be used. */
-  NDO_HANDLE_PARITY = 0x01,
-/** This option can be used to enable or disable the electronic field of the
- * NFC device. */
-  NDO_ACTIVATE_FIELD = 0x10,
-/** The internal CRYPTO1 co-processor can be used to transmit messages
- * encrypted. This option is automatically activated after a successful MIFARE
- * Classic authentication. */
-  NDO_ACTIVATE_CRYPTO1 = 0x11,
-/** The default configuration defines that the PN53X chip will try indefinitely
- * to invite a tag in the field to respond. This could be desired when it is
- * certain a tag will enter the field. On the other hand, when this is
- * uncertain, it will block the application. This option could best be compared
- * to the (NON)BLOCKING option used by (socket)network programming. */
-  NDO_INFINITE_SELECT = 0x20,
-/** If this option is enabled, frames that carry less than 4 bits are allowed.
- * According to the standards these frames should normally be handles as
- * invalid frames. */
-  NDO_ACCEPT_INVALID_FRAMES = 0x30,
-/** If the NFC device should only listen to frames, it could be useful to let
- * it gather multiple frames in a sequence. They will be stored in the internal
- * FIFO of the PN53X chip. This could be retrieved by using the receive data
- * functions. Note that if the chip runs out of bytes (FIFO = 64 bytes long),
- * it will overwrite the first received frames, so quick retrieving of the
- * received data is desirable. */
-  NDO_ACCEPT_MULTIPLE_FRAMES = 0x31,
-/** This option can be used to enable or disable the auto-switching mode to
- * ISO14443-4 is device is compliant.
- * In initiator mode, it means that NFC chip will send RATS automatically when
- * select and it will automatically poll for ISO14443-4 card when ISO14443A is
- * requested.
- * In target mode, with a NFC chip compiliant (ie. PN532), the chip will
- * emulate a 14443-4 PICC using hardware capability */
-  NDO_AUTO_ISO14443_4 = 0x40,
-/** Use automatic frames encapsulation and chaining. */
-  NDO_EASY_FRAMING = 0x41,
-/** Force the chip to switch in ISO14443-A */
-  NDO_FORCE_ISO14443_A = 0x42,
-/** Force the chip to switch in ISO14443-B */
-  NDO_FORCE_ISO14443_B = 0x43,
-/** Force the chip to run at 106 kbps */
-  NDO_FORCE_SPEED_106 = 0x50,
-} nfc_device_option_t;
-
-/**
- * @enum nfc_dep_mode_t
  * @brief NFC D.E.P. (Data Exchange Protocol) active/passive mode
  */
 typedef enum {
   NDM_UNDEFINED = 0,
   NDM_PASSIVE,
   NDM_ACTIVE,
-} nfc_dep_mode_t;
+} nfc_dep_mode;
 
 /**
- * @struct nfc_dep_info_t
+ * @struct nfc_dep_info
  * @brief NFC target information in D.E.P. (Data Exchange Protocol) see ISO/IEC 18092 (NFCIP-1)
  */
 typedef struct {
-/** NFCID3 */
+  /** NFCID3 */
-  byte_t  abtNFCID3[10];
+  uint8_t  abtNFCID3[10];
-/** DID */
+  /** DID */
-  byte_t  btDID;
+  uint8_t  btDID;
-/** Supported send-bit rate */
+  /** Supported send-bit rate */
-  byte_t  btBS;
+  uint8_t  btBS;
-/** Supported receive-bit rate */
+  /** Supported receive-bit rate */
-  byte_t  btBR;
+  uint8_t  btBR;
-/** Timeout value */
+  /** Timeout value */
-  byte_t  btTO;
+  uint8_t  btTO;
-/** PP Parameters */
+  /** PP Parameters */
-  byte_t  btPP;
+  uint8_t  btPP;
-/** General Bytes */
+  /** General Bytes */
-  byte_t  abtGB[48];
+  uint8_t  abtGB[48];
   size_t  szGB;
-/** DEP mode */
+  /** DEP mode */
-  nfc_dep_mode_t ndm;
+  nfc_dep_mode ndm;
-} nfc_dep_info_t;
+} nfc_dep_info;
 
 /**
- * @struct nfc_iso14443a_info_t
+ * @struct nfc_iso14443a_info
  * @brief NFC ISO14443A tag (MIFARE) information
  */
 typedef struct {
-  byte_t  abtAtqa[2];
+  uint8_t  abtAtqa[2];
-  byte_t  btSak;
+  uint8_t  btSak;
   size_t  szUidLen;
-  byte_t  abtUid[10];
+  uint8_t  abtUid[10];
   size_t  szAtsLen;
-  byte_t  abtAts[254]; // Maximal theoretical ATS is FSD-2, FSD=256 for FSDI=8 in RATS
+  uint8_t  abtAts[254]; // Maximal theoretical ATS is FSD-2, FSD=256 for FSDI=8 in RATS
-} nfc_iso14443a_info_t;
+} nfc_iso14443a_info;
 
 /**
- * @struct nfc_felica_info_t
+ * @struct nfc_felica_info
  * @brief NFC FeLiCa tag information
  */
 typedef struct {
   size_t  szLen;
-  byte_t  btResCode;
+  uint8_t  btResCode;
-  byte_t  abtId[8];
+  uint8_t  abtId[8];
-  byte_t  abtPad[8];
+  uint8_t  abtPad[8];
-  byte_t  abtSysCode[2];
+  uint8_t  abtSysCode[2];
-} nfc_felica_info_t;
+} nfc_felica_info;
 
 /**
- * @struct nfc_iso14443b_info_t
+ * @struct nfc_iso14443b_info
  * @brief NFC ISO14443B tag information
  */
 typedef struct {
-/** abtPupi store PUPI contained in ATQB (Answer To reQuest of type B) (see ISO14443-3) */
+  /** abtPupi store PUPI contained in ATQB (Answer To reQuest of type B) (see ISO14443-3) */
-  byte_t abtPupi[4];
+  uint8_t abtPupi[4];
-/** abtApplicationData store Application Data contained in ATQB (see ISO14443-3) */
+  /** abtApplicationData store Application Data contained in ATQB (see ISO14443-3) */
-  byte_t abtApplicationData[4];
+  uint8_t abtApplicationData[4];
-/** abtProtocolInfo store Protocol Info contained in ATQB (see ISO14443-3) */
+  /** abtProtocolInfo store Protocol Info contained in ATQB (see ISO14443-3) */
-  byte_t abtProtocolInfo[3];
+  uint8_t abtProtocolInfo[3];
-/** ui8CardIdentifier store CID (Card Identifier) attributted by PCD to the PICC */
+  /** ui8CardIdentifier store CID (Card Identifier) attributted by PCD to the PICC */
   uint8_t ui8CardIdentifier;
-} nfc_iso14443b_info_t;
+} nfc_iso14443b_info;
 
 /**
- * @struct nfc_iso14443bi_info_t
+ * @struct nfc_iso14443bi_info
  * @brief NFC ISO14443B' tag information
  */
 typedef struct {
-/** DIV: 4 LSBytes of tag serial number */
+  /** DIV: 4 LSBytes of tag serial number */
-  byte_t abtDIV[4];
+  uint8_t abtDIV[4];
-/** Software version & type of REPGEN */
+  /** Software version & type of REPGEN */
-  byte_t btVerLog;
+  uint8_t btVerLog;
-/** Config Byte, present if long REPGEN */
+  /** Config Byte, present if long REPGEN */
-  byte_t btConfig;
+  uint8_t btConfig;
-/** ATR, if any */
+  /** ATR, if any */
   size_t szAtrLen;
-  byte_t  abtAtr[33];
+  uint8_t  abtAtr[33];
-} nfc_iso14443bi_info_t;
+} nfc_iso14443bi_info;
 
 /**
- * @struct nfc_iso14443b2sr_info_t
+ * @struct nfc_iso14443biclass_info
+ * @brief NFC ISO14443BiClass tag information
+ */
+typedef struct {
+  uint8_t abtUID[8];
+} nfc_iso14443biclass_info;
+
+/**
+ * @struct nfc_iso14443b2sr_info
  * @brief NFC ISO14443-2B ST SRx tag information
  */
 typedef struct {
-  byte_t abtUID[8];
+  uint8_t abtUID[8];
-} nfc_iso14443b2sr_info_t;
+} nfc_iso14443b2sr_info;
 
 /**
- * @struct nfc_iso14443b2ct_info_t
+ * @struct nfc_iso14443b2ct_info
  * @brief NFC ISO14443-2B ASK CTx tag information
  */
 typedef struct {
-  byte_t abtUID[4];
+  uint8_t abtUID[4];
-  byte_t btProdCode;
+  uint8_t btProdCode;
-  byte_t btFabCode;
+  uint8_t btFabCode;
-} nfc_iso14443b2ct_info_t;
+} nfc_iso14443b2ct_info;
 
 /**
- * @struct nfc_jewel_info_t
+ * @struct nfc_jewel_info
  * @brief NFC Jewel tag information
  */
 typedef struct {
-  byte_t  btSensRes[2];
+  uint8_t  btSensRes[2];
-  byte_t  btId[4];
+  uint8_t  btId[4];
-} nfc_jewel_info_t;
+} nfc_jewel_info;
 
 /**
- * @union nfc_target_info_t
+ * @struct nfc_barcode_info
+ * @brief Thinfilm NFC Barcode information
+ */
+typedef struct {
+  size_t   szDataLen;
+  uint8_t  abtData[32];
+} nfc_barcode_info;
+
+/**
+ * @union nfc_target_info
  * @brief Union between all kind of tags information structures.
  */
 typedef union {
-  nfc_iso14443a_info_t nai;
+  nfc_iso14443a_info nai;
-  nfc_felica_info_t nfi;
+  nfc_felica_info nfi;
-  nfc_iso14443b_info_t nbi;
+  nfc_iso14443b_info nbi;
-  nfc_iso14443bi_info_t nii;
+  nfc_iso14443bi_info nii;
-  nfc_iso14443b2sr_info_t nsi;
+  nfc_iso14443b2sr_info nsi;
-  nfc_iso14443b2ct_info_t nci;
+  nfc_iso14443b2ct_info nci;
-  nfc_jewel_info_t nji;
+  nfc_jewel_info nji;
-  nfc_dep_info_t ndi;
+  nfc_dep_info ndi;
-} nfc_target_info_t;
+  nfc_barcode_info nti; // "t" for Thinfilm, "b" already used
+  nfc_iso14443biclass_info nhi; // hid iclass / picopass - nii already used
+} nfc_target_info;
 
 /**
- * @enum nfc_baud_rate_t
+ * @enum nfc_baud_rate
  * @brief NFC baud rate enumeration
  */
 typedef enum {
@@ -298,14 +306,14 @@ typedef enum {
   NBR_212,
   NBR_424,
   NBR_847,
-} nfc_baud_rate_t;
+} nfc_baud_rate;
 
 /**
- * @enum nfc_modulation_type_t
+ * @enum nfc_modulation_type
  * @brief NFC modulation type enumeration
  */
 typedef enum {
-  NMT_ISO14443A,
+  NMT_ISO14443A = 1,
   NMT_JEWEL,
   NMT_ISO14443B,
   NMT_ISO14443BI, // pre-ISO14443B aka ISO/IEC 14443 B' or Type B'
@@ -313,25 +321,37 @@ typedef enum {
   NMT_ISO14443B2CT, // ISO14443-2B ASK CTx
   NMT_FELICA,
   NMT_DEP,
-} nfc_modulation_type_t;
+  NMT_BARCODE,    // Thinfilm NFC Barcode
+  NMT_ISO14443BICLASS, // HID iClass 14443B mode
+  NMT_END_ENUM = NMT_ISO14443BICLASS, // dummy for sizing - always should alias last
+} nfc_modulation_type;
 
 /**
- * @struct nfc_modulation_t
+ * @enum nfc_mode
+ * @brief NFC mode type enumeration
+ */
+typedef enum {
+  N_TARGET,
+  N_INITIATOR,
+} nfc_mode;
+
+/**
+ * @struct nfc_modulation
  * @brief NFC modulation structure
  */
 typedef struct {
-  nfc_modulation_type_t nmt;
+  nfc_modulation_type nmt;
-  nfc_baud_rate_t nbr;
+  nfc_baud_rate nbr;
-} nfc_modulation_t;
+} nfc_modulation;
 
 /**
- * @struct nfc_target_t
+ * @struct nfc_target
  * @brief NFC target structure
  */
 typedef struct {
-  nfc_target_info_t nti;
+  nfc_target_info nti;
-  nfc_modulation_t nm;
+  nfc_modulation nm;
-} nfc_target_t;
+} nfc_target;
 
 // Reset struct alignment to default
 #  pragma pack()

include/nfc/nfc.h

@@ -1,8 +1,14 @@
 /*-
- * Public platform independent Near Field Communication (NFC) library
+ * Free/Libre Near Field Communication (NFC) library
  *
- * Copyright (C) 2009, Roel Verdult
+ * Libnfc historical contributors:
- * Copyright (C) 2010, Romuald Conty
+ * Copyright (C) 2009      Roel Verdult
+ * Copyright (C) 2009-2013 Romuald Conty
+ * Copyright (C) 2010-2012 Romain Tartière
+ * Copyright (C) 2010-2013 Philippe Teuwen
+ * Copyright (C) 2012-2013 Ludovic Rousseau
+ * See AUTHORS file for a more comprehensive list of contributors.
+ * Additional contributors of this file:
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published by the
@@ -22,131 +28,197 @@
  * @file nfc.h
  * @brief libnfc interface
  *
- * Provide all usefull functions (API) to handle NFC devices.
+ * Provide all useful functions (API) to handle NFC devices.
  */
 
 #ifndef _LIBNFC_H_
 #  define _LIBNFC_H_
 
-#  include <sys/time.h>
-
 #  include <stdint.h>
 #  include <stdbool.h>
 
 #  ifdef _WIN32
-  /* Windows platform */
+/* Windows platform */
 #    ifndef _WINDLL
-    /* CMake compilation */
+/* CMake compilation */
 #      ifdef nfc_EXPORTS
 #        define  NFC_EXPORT __declspec(dllexport)
 #      else
-      /* nfc_EXPORTS */
+/* nfc_EXPORTS */
 #        define  NFC_EXPORT __declspec(dllimport)
 #      endif
-       /* nfc_EXPORTS */
+/* nfc_EXPORTS */
 #    else
-      /* _WINDLL */
+/* _WINDLL */
-    /* Manual makefile */
+/* Manual makefile */
 #      define NFC_EXPORT
 #    endif
-       /* _WINDLL */
+/* _WINDLL */
 #  else
-      /* _WIN32 */
+/* _WIN32 */
 #    define NFC_EXPORT
 #  endif
-       /* _WIN32 */
+/* _WIN32 */
 
 #  include <nfc/nfc-types.h>
 
+#  ifndef __has_attribute
+#    define __has_attribute(x) 0
+#  endif
+
+#  if __has_attribute(nonnull) || defined(__GNUC__)
+#    define __has_attribute_nonnull 1
+#  endif
+
+#  if __has_attribute_nonnull
+#    define ATTRIBUTE_NONNULL( param ) __attribute__((nonnull (param)))
+#  else
+#  define ATTRIBUTE_NONNULL( param )
+#  endif
+
 #  ifdef __cplusplus
 extern  "C" {
 #  endif                        // __cplusplus
 
+/* Library initialization/deinitialization */
+NFC_EXPORT void nfc_init(nfc_context **context) ATTRIBUTE_NONNULL(1);
+NFC_EXPORT void nfc_exit(nfc_context *context) ATTRIBUTE_NONNULL(1);
+NFC_EXPORT int nfc_register_driver(const nfc_driver *driver);
+
 /* NFC Device/Hardware manipulation */
-  NFC_EXPORT nfc_device_t *nfc_connect (nfc_device_desc_t * pndd);
+NFC_EXPORT nfc_device *nfc_open(nfc_context *context, const nfc_connstring connstring) ATTRIBUTE_NONNULL(1);
-  NFC_EXPORT void nfc_disconnect (nfc_device_t * pnd);
+NFC_EXPORT void nfc_close(nfc_device *pnd);
-  NFC_EXPORT bool nfc_abort_command (nfc_device_t * pnd);
+NFC_EXPORT int nfc_abort_command(nfc_device *pnd);
-  NFC_EXPORT void nfc_list_devices (nfc_device_desc_t pnddDevices[], size_t szDevices, size_t * pszDeviceFound);
+NFC_EXPORT size_t nfc_list_devices(nfc_context *context, nfc_connstring connstrings[], size_t connstrings_len) ATTRIBUTE_NONNULL(1);
-  NFC_EXPORT bool nfc_configure (nfc_device_t * pnd, const nfc_device_option_t ndo, const bool bEnable);
+NFC_EXPORT int nfc_idle(nfc_device *pnd);
-  NFC_EXPORT bool nfc_idle (nfc_device_t * pnd);
 
 /* NFC initiator: act as "reader" */
-  NFC_EXPORT bool nfc_initiator_init (nfc_device_t * pnd);
+NFC_EXPORT int nfc_initiator_init(nfc_device *pnd);
-  NFC_EXPORT bool nfc_initiator_select_passive_target (nfc_device_t * pnd, const nfc_modulation_t nm, const byte_t * pbtInitData, const size_t szInitData, nfc_target_t * pnt);
+NFC_EXPORT int nfc_initiator_init_secure_element(nfc_device *pnd);
-  NFC_EXPORT bool nfc_initiator_list_passive_targets (nfc_device_t * pnd, const nfc_modulation_t nm, nfc_target_t ant[], const size_t szTargets, size_t * pszTargetFound);
+NFC_EXPORT int nfc_initiator_select_passive_target(nfc_device *pnd, const nfc_modulation nm, const uint8_t *pbtInitData, const size_t szInitData, nfc_target *pnt);
-  NFC_EXPORT bool nfc_initiator_poll_target (nfc_device_t * pnd, const nfc_modulation_t * pnmTargetTypes, const size_t szTargetTypes, const uint8_t uiPollNr, const uint8_t uiPeriod, nfc_target_t * pnt);
+NFC_EXPORT int nfc_initiator_list_passive_targets(nfc_device *pnd, const nfc_modulation nm, nfc_target ant[], const size_t szTargets);
-  NFC_EXPORT bool nfc_initiator_select_dep_target (nfc_device_t * pnd, const nfc_dep_mode_t ndm, const nfc_baud_rate_t nbr, const nfc_dep_info_t * pndiInitiator, nfc_target_t * pnt);
+NFC_EXPORT int nfc_initiator_poll_target(nfc_device *pnd, const nfc_modulation *pnmTargetTypes, const size_t szTargetTypes, const uint8_t uiPollNr, const uint8_t uiPeriod, nfc_target *pnt);
-  NFC_EXPORT bool nfc_initiator_deselect_target (nfc_device_t * pnd);
+NFC_EXPORT int nfc_initiator_select_dep_target(nfc_device *pnd, const nfc_dep_mode ndm, const nfc_baud_rate nbr, const nfc_dep_info *pndiInitiator, nfc_target *pnt, const int timeout);
-  NFC_EXPORT bool nfc_initiator_transceive_bytes (nfc_device_t * pnd, const byte_t * pbtTx, const size_t szTx, byte_t * pbtRx, size_t * pszRx, struct timeval *timeout);
+NFC_EXPORT int nfc_initiator_poll_dep_target(nfc_device *pnd, const nfc_dep_mode ndm, const nfc_baud_rate nbr, const nfc_dep_info *pndiInitiator, nfc_target *pnt, const int timeout);
-  NFC_EXPORT bool nfc_initiator_transceive_bits (nfc_device_t * pnd, const byte_t * pbtTx, const size_t szTxBits, const byte_t * pbtTxPar, byte_t * pbtRx, size_t * pszRxBits, byte_t * pbtRxPar);
+NFC_EXPORT int nfc_initiator_deselect_target(nfc_device *pnd);
-  NFC_EXPORT bool nfc_initiator_transceive_bytes_timed (nfc_device_t * pnd, const byte_t * pbtTx, const size_t szTx, byte_t * pbtRx, size_t * pszRx, uint32_t * cycles);
+NFC_EXPORT int nfc_initiator_transceive_bytes(nfc_device *pnd, const uint8_t *pbtTx, const size_t szTx, uint8_t *pbtRx, const size_t szRx, int timeout);
-  NFC_EXPORT bool nfc_initiator_transceive_bits_timed (nfc_device_t * pnd, const byte_t * pbtTx, const size_t szTxBits, const byte_t * pbtTxPar, byte_t * pbtRx, size_t * pszRxBits, byte_t * pbtRxPar, uint32_t * cycles);
+NFC_EXPORT int nfc_initiator_transceive_bits(nfc_device *pnd, const uint8_t *pbtTx, const size_t szTxBits, const uint8_t *pbtTxPar, uint8_t *pbtRx, const size_t szRx, uint8_t *pbtRxPar);
+NFC_EXPORT int nfc_initiator_transceive_bytes_timed(nfc_device *pnd, const uint8_t *pbtTx, const size_t szTx, uint8_t *pbtRx, const size_t szRx, uint32_t *cycles);
+NFC_EXPORT int nfc_initiator_transceive_bits_timed(nfc_device *pnd, const uint8_t *pbtTx, const size_t szTxBits, const uint8_t *pbtTxPar, uint8_t *pbtRx, const size_t szRx, uint8_t *pbtRxPar, uint32_t *cycles);
+NFC_EXPORT int nfc_initiator_target_is_present(nfc_device *pnd, const nfc_target *pnt);
 
 /* NFC target: act as tag (i.e. MIFARE Classic) or NFC target device. */
-  NFC_EXPORT bool nfc_target_init (nfc_device_t * pnd, nfc_target_t * pnt, byte_t * pbtRx, size_t * pszRx);
+NFC_EXPORT int nfc_target_init(nfc_device *pnd, nfc_target *pnt, uint8_t *pbtRx, const size_t szRx, int timeout);
-  NFC_EXPORT bool nfc_target_send_bytes (nfc_device_t * pnd, const byte_t * pbtTx, const size_t szTx, struct timeval *timout);
+NFC_EXPORT int nfc_target_send_bytes(nfc_device *pnd, const uint8_t *pbtTx, const size_t szTx, int timeout);
-  NFC_EXPORT bool nfc_target_receive_bytes (nfc_device_t * pnd, byte_t * pbtRx, size_t * pszRx, struct timeval *timout);
+NFC_EXPORT int nfc_target_receive_bytes(nfc_device *pnd, uint8_t *pbtRx, const size_t szRx, int timeout);
-  NFC_EXPORT bool nfc_target_send_bits (nfc_device_t * pnd, const byte_t * pbtTx, const size_t szTxBits, const byte_t * pbtTxPar);
+NFC_EXPORT int nfc_target_send_bits(nfc_device *pnd, const uint8_t *pbtTx, const size_t szTxBits, const uint8_t *pbtTxPar);
-  NFC_EXPORT bool nfc_target_receive_bits (nfc_device_t * pnd, byte_t * pbtRx, size_t * pszRxBits, byte_t * pbtRxPar);
+NFC_EXPORT int nfc_target_receive_bits(nfc_device *pnd, uint8_t *pbtRx, const size_t szRx, uint8_t *pbtRxPar);
 
 /* Error reporting */
-  NFC_EXPORT const char *nfc_strerror (const nfc_device_t * pnd);
+NFC_EXPORT const char *nfc_strerror(const nfc_device *pnd);
-  NFC_EXPORT int nfc_strerror_r (const nfc_device_t * pnd, char *pcStrErrBuf, size_t szBufLen);
+NFC_EXPORT int nfc_strerror_r(const nfc_device *pnd, char *buf, size_t buflen);
-  NFC_EXPORT void nfc_perror (const nfc_device_t * pnd, const char *pcString);
+NFC_EXPORT void nfc_perror(const nfc_device *pnd, const char *s);
+NFC_EXPORT int nfc_device_get_last_error(const nfc_device *pnd);
 
 /* Special data accessors */
-  NFC_EXPORT const char *nfc_device_name (nfc_device_t * pnd);
+NFC_EXPORT const char *nfc_device_get_name(nfc_device *pnd);
+NFC_EXPORT const char *nfc_device_get_connstring(nfc_device *pnd);
+NFC_EXPORT int nfc_device_get_supported_modulation(nfc_device *pnd, const nfc_mode mode,  const nfc_modulation_type **const supported_mt);
+NFC_EXPORT int nfc_device_get_supported_baud_rate(nfc_device *pnd, const nfc_modulation_type nmt, const nfc_baud_rate **const supported_br);
+NFC_EXPORT int nfc_device_get_supported_baud_rate_target_mode(nfc_device *pnd, const nfc_modulation_type nmt, const nfc_baud_rate **const supported_br);
+
+/* Properties accessors */
+NFC_EXPORT int nfc_device_set_property_int(nfc_device *pnd, const nfc_property property, const int value);
+NFC_EXPORT int nfc_device_set_property_bool(nfc_device *pnd, const nfc_property property, const bool bEnable);
 
 /* Misc. functions */
-  NFC_EXPORT void iso14443a_crc (byte_t * pbtData, size_t szLen, byte_t * pbtCrc);
+NFC_EXPORT void iso14443a_crc(uint8_t *pbtData, size_t szLen, uint8_t *pbtCrc);
-  NFC_EXPORT void iso14443a_crc_append (byte_t * pbtData, size_t szLen);
+NFC_EXPORT void iso14443a_crc_append(uint8_t *pbtData, size_t szLen);
-  NFC_EXPORT byte_t * iso14443a_locate_historical_bytes (byte_t * pbtAts, size_t szAts, size_t * pszTk);
+NFC_EXPORT void iso14443b_crc(uint8_t *pbtData, size_t szLen, uint8_t *pbtCrc);
-  NFC_EXPORT const char *nfc_version (void);
+NFC_EXPORT void iso14443b_crc_append(uint8_t *pbtData, size_t szLen);
+NFC_EXPORT uint8_t *iso14443a_locate_historical_bytes(uint8_t *pbtAts, size_t szAts, size_t *pszTk);
 
-/* PN53x specific errors */
+NFC_EXPORT void nfc_free(void *p);
-// TODO: Be not PN53x-specific here
+NFC_EXPORT const char *nfc_version(void);
-#define ETIMEOUT	0x01
+NFC_EXPORT int nfc_device_get_information_about(nfc_device *pnd, char **buf);
-#define ECRC		0x02
-#define EPARITY		0x03
-#define EBITCOUNT	0x04
-#define EFRAMING	0x05
-#define EBITCOLL	0x06
-#define ESMALLBUF	0x07
-#define EBUFOVF		0x09
-#define ERFTIMEOUT	0x0a
-#define ERFPROTO	0x0b
-#define EOVHEAT		0x0d
-#define EINBUFOVF	0x0e
-#define EINVPARAM	0x10
-#define EDEPUNKCMD	0x12
-#define EINVRXFRAM	0x13
-#define EMFAUTH		0x14
-#define ENSECNOTSUPP	0x18	// PN533 only
-#define EBCC		0x23
-#define EDEPINVSTATE	0x25
-#define EOPNOTALL	0x26
-#define ECMD		0x27
-#define ETGREL		0x29
-#define ECID		0x2a
-#define ECDISCARDED	0x2b
-#define ENFCID3		0x2c
-#define EOVCURRENT	0x2d
-#define ENAD		0x2e
 
-/* PN53x framing-level errors */
+/* String converter functions */
-#define EFRAACKMISMATCH   0x0100  /* Unexpected data */
+NFC_EXPORT const char *str_nfc_modulation_type(const nfc_modulation_type nmt);
-#define EFRAISERRFRAME    0x0101  /* Error frame */
+NFC_EXPORT const char *str_nfc_baud_rate(const nfc_baud_rate nbr);
+NFC_EXPORT int str_nfc_target(char **buf, const nfc_target *pnt, bool verbose);
 
-/* Communication-level errors */
+/* Error codes */
-#define ECOMIO            0x1000  /* Input/output error */
+/** @ingroup error
-#define ECOMTIMEOUT       0x1001  /* Operation timeout */
+ * @hideinitializer
+ * Success (no error)
+ */
+#define NFC_SUCCESS			 0
+/** @ingroup error
+ * @hideinitializer
+ * Input / output error, device may not be usable anymore without re-open it
+ */
+#define NFC_EIO				-1
+/** @ingroup error
+ * @hideinitializer
+ * Invalid argument(s)
+ */
+#define NFC_EINVARG			-2
+/** @ingroup error
+ * @hideinitializer
+ *  Operation not supported by device
+ */
+#define NFC_EDEVNOTSUPP			-3
+/** @ingroup error
+ * @hideinitializer
+ * No such device
+ */
+#define NFC_ENOTSUCHDEV			-4
+/** @ingroup error
+ * @hideinitializer
+ * Buffer overflow
+ */
+#define NFC_EOVFLOW			-5
+/** @ingroup error
+ * @hideinitializer
+ * Operation timed out
+ */
+#define NFC_ETIMEOUT			-6
+/** @ingroup error
+ * @hideinitializer
+ * Operation aborted (by user)
+ */
+#define NFC_EOPABORTED			-7
+/** @ingroup error
+ * @hideinitializer
+ * Not (yet) implemented
+ */
+#define NFC_ENOTIMPL			-8
+/** @ingroup error
+ * @hideinitializer
+ * Target released
+ */
+#define NFC_ETGRELEASED			-10
+/** @ingroup error
+ * @hideinitializer
+ * Error while RF transmission
+ */
+#define NFC_ERFTRANS			-20
+/** @ingroup error
+ * @hideinitializer
+ * MIFARE Classic: authentication failed
+ */
+#define NFC_EMFCAUTHFAIL		-30
+/** @ingroup error
+ * @hideinitializer
+ * Software error (allocation, file/pipe creation, etc.)
+ */
+#define NFC_ESOFT			-80
+/** @ingroup error
+ * @hideinitializer
+ * Device's internal chip error
+ */
+#define NFC_ECHIP			-90
 
-/* Software level errors */
-#define ETGUIDNOTSUP      0xFF00  /* Target UID not supported */
-#define EOPABORT          0xFF01  /* Operation aborted */
-#define EINVALARG         0xFF02  /* Invalid argument */
-#define EDEVNOTSUP        0xFF03  /* Not supported by device */
-#define ENOTIMPL          0xFF04  /* Not (yet) implemented in libnfc */
 
 #  ifdef __cplusplus
 }

libnfc.conf.sample

@@ -0,0 +1,20 @@
+# Allow device auto-detection (default: true)
+# Note: if this auto-detection is disabled, user has to set manually a device
+# configuration using file or environment variable
+#allow_autoscan = true
+
+# Allow intrusive auto-detection (default: false)
+# Warning: intrusive auto-detection can seriously disturb other devices
+# This option is not recommended, user should prefer to add manually his device.
+#allow_intrusive_scan = false
+
+# Set log level (default: error)
+# Valid log levels are (in order of verbosity): 0 (none), 1 (error), 2 (info), 3 (debug)
+# Note: if you compiled with --enable-debug option, the default log level is "debug"
+#log_level = 1
+
+# Manually set default device (no default)
+# To set a default device, you must set both name and connstring for your device
+# Note: if autoscan is enabled, default device will be the first device available in device list.
+#device.name = "microBuilder.eu"
+#device.connstring = "pn532_uart:/dev/ttyUSB0"

libnfc/CMakeLists.txt

@@ -1,19 +1,55 @@
+# Windows MinGW workarounds
+IF(WIN32)
+  SET(WINDOWS_SOURCES ../contrib/win32/stdlib)
+  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../contrib/win32)
+
+  # Add in the rc for version information in the dll
+  LIST(APPEND WINDOWS_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/../windows/libnfc.rc)
+  IF (NOT MINGW)
+    LIST(APPEND WINDOWS_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../contrib/win32/nfc_msvc.def)
+  ENDIF()
+ENDIF(WIN32)
+
 # Library's chips
 SET(CHIPS_SOURCES chips/pn53x)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/chips)
 
 # Library's buses
-SET(BUSES_SOURCES buses/uart)
+IF(USB_REQUIRED)
+  LIST(APPEND BUSES_SOURCES buses/usbbus)
+ENDIF(USB_REQUIRED)
+
+IF(UART_REQUIRED)
+  IF(WIN32)
+    # Windows have a special implementation for UART
+    LIST(APPEND BUSES_SOURCES ../contrib/win32/libnfc/buses/uart)
+  ELSE(WIN32)
+    LIST(APPEND BUSES_SOURCES buses/uart)
+  ENDIF(WIN32)
+ENDIF(UART_REQUIRED)
+
+IF(I2C_REQUIRED)
+  IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    LIST(APPEND BUSES_SOURCES buses/i2c)
+  ELSE(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    # Only Linux is supported at the moment
+    #LIST(APPEND BUSES_SOURCES ../contrib/win32/libnfc/buses/i2c)
+    MESSAGE( FATAL_ERROR "I2C is only (yet) supported in Linux!" )
+  ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+ENDIF(I2C_REQUIRED)
+
+IF(SPI_REQUIRED)
+  IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    LIST(APPEND BUSES_SOURCES buses/spi)
+  ELSE(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    # Only Linux is supported at the moment
+    #LIST(APPEND BUSES_SOURCES ../contrib/win32/libnfc/buses/spi)
+    MESSAGE( FATAL_ERROR "SPI is only (yet) supported in Linux!" )
+  ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+ENDIF(SPI_REQUIRED)
+
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/buses)
 
-# Library's drivers
-SET(LIBNFC_SERIAL_AUTOPROBE_ENABLED OFF CACHE BOOL "Allow serial ports to be probed (can seriously disturb connected serial devices)")
-IF(LIBNFC_SERIAL_AUTOPROBE_ENABLED)
-  ADD_DEFINITIONS("-DSERIAL_AUTOPROBE_ENABLED")
-ENDIF(LIBNFC_SERIAL_AUTOPROBE_ENABLED)
-
-INCLUDE(LibnfcDrivers)
-
 IF(PCSC_FOUND)
   INCLUDE_DIRECTORIES(${PCSC_INCLUDE_DIRS})
   LINK_DIRECTORIES(${PCSC_LIBRARY_DIRS})
@@ -25,8 +61,19 @@ IF(LIBUSB_FOUND)
 ENDIF(LIBUSB_FOUND)
 
 # Library
-SET(LIBRARY_SOURCES nfc nfc-device nfc-emulation nfc-internal iso14443-subr mirror-subr ${DRIVERS_SOURCES} ${BUSES_SOURCES} ${CHIPS_SOURCES})
+SET(LIBRARY_SOURCES nfc nfc-device nfc-emulation nfc-internal conf iso14443-subr mirror-subr target-subr ${DRIVERS_SOURCES} ${BUSES_SOURCES} ${CHIPS_SOURCES} ${WINDOWS_SOURCES})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+
+IF(LIBNFC_LOG)
+  IF(WIN32)
+    IF(MINGW)
+      SET(CMAKE_C_FLAGS "-fgnu89-inline ${CMAKE_C_FLAGS}")
+    ENDIF(MINGW)
+    LIST(APPEND LIBRARY_SOURCES log ../contrib/win32/libnfc/log-internal)
+  ELSE(WIN32)
+    LIST(APPEND LIBRARY_SOURCES log log-internal)
+  ENDIF(WIN32)
+ENDIF(LIBNFC_LOG)
 ADD_LIBRARY(nfc SHARED ${LIBRARY_SOURCES})
 
 IF(PCSC_FOUND)
@@ -37,18 +84,32 @@ IF(LIBUSB_FOUND)
   TARGET_LINK_LIBRARIES(nfc ${LIBUSB_LIBRARIES})
 ENDIF(LIBUSB_FOUND)
 
-IF(WIN32)
+IF(LIBRT_FOUND)
-  TARGET_LINK_LIBRARIES(nfc wsock32)
+  TARGET_LINK_LIBRARIES(nfc ${LIBRT_LIBRARIES})
-ENDIF(WIN32)
+ENDIF(LIBRT_FOUND)
-SET_TARGET_PROPERTIES(nfc PROPERTIES SOVERSION 0)
+
+SET_TARGET_PROPERTIES(nfc PROPERTIES SOVERSION 6 VERSION 6.0.0)
 
 IF(WIN32)
+  # Libraries that are windows specific
+  TARGET_LINK_LIBRARIES(nfc wsock32)
+  IF(MINGW)
+    ADD_CUSTOM_COMMAND(
+      OUTPUT libnfc.lib
+      COMMAND ${DLLTOOL} -d ${CMAKE_CURRENT_SOURCE_DIR}/../contrib/win32/nfc.def -l ${CMAKE_CURRENT_BINARY_DIR}/libnfc.lib ${CMAKE_CURRENT_BINARY_DIR}/libnfc.dll
+      DEPENDS nfc ${CMAKE_CURRENT_SOURCE_DIR}/../contrib/win32/nfc.def
+    )
+    ADD_CUSTOM_TARGET(win32lib ALL DEPENDS libnfc.lib)
+  ELSE()
+    ADD_LIBRARY(win32lib ALIAS nfc)
+  ENDIF()
+
   # On Windows the shared (runtime) library should be either in the same 
   # directory as the excutables or in the path, we add it to same directory
   INSTALL(TARGETS nfc RUNTIME DESTINATION bin COMPONENT libraries)
 
   # At compile time we need the .LIB file, we place it in the lib directory
-  INSTALL(TARGETS nfc ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT headers)
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libnfc.lib DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries)
 ELSE(WIN32)
   INSTALL(TARGETS nfc LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries)
 ENDIF(WIN32)