Commit Graph
100 Commits
Author SHA1 Message Date
Romuald Conty 167238c60d Fix uninitialized variable szTargetsData 2012-05-27 23:25:52 +00:00
Romuald Conty 8f08431ddf New function nfc_initiator_target_is_present() to test is a previously selected target is in the field. 2012-05-27 22:34:21 +00:00
Romuald Conty 2c9275adde nfc_initiator_transceive_bytes() now take a constant size for Rx buffer to have a cleaner API: no more in/out parameters 2012-05-27 21:06:22 +00:00
Romuald Conty 531702a1fc example/pn532-sam: Fix few bugs in SAM example
- Fix choice input (Dual card mode was not available);
 - Fix segfault when target selection returns no target;
 - Use error label to close the device before exiting;
2012-05-20 23:09:21 +00:00
Romuald Conty cfd95bae2c Fix shadowed declaration warnings 2012-05-17 01:18:24 +00:00
Romuald Conty e4802de965 Add new public functions to grab information in string format:
- New nfc_device_get_information_about()
 - Moved nfc-utils function str_nfc_baud_rate()
 - New str_nfc_modulation_type()
 - Add new device_get_information_about callback to nfc_driver struct
 - Export new symbols
 - Changed internal pn53x firmware text handling: we now store firmware text for further operations
 - print_nfc_target() now uses str_nfc_* functions
 - nfc-probe util now have a verbose which display information on detected devices (Fix verbose set but not used warning ;-) )
2012-05-17 00:48:47 +00:00
Romuald Conty 6710ca943e Fix ACR122S device detection when no ACR122S device available (endless UART receive) 2012-05-17 00:38:54 +00:00
Romuald Conty fb50e3b235 Display right driver name while detecting PCSC 2012-05-17 00:37:00 +00:00
Romuald Conty 45ef3b43c4 Fix unused result warnings and add a new NFC_ESOFT error. 2012-05-16 18:24:16 +00:00
Romuald Conty bfcdb1bd4c Fix more warnings while using -Wswitch-enum and -Wshadow on internal libnfc files 2012-05-16 18:08:42 +00:00
Romuald Conty d6a1249469 current debian package can compile all drivers except acr122_pcsc (PCSC dependencies have already been removed from package) 2012-05-16 18:06:27 +00:00
Romuald Conty 9ea7a9ea27 delete unused log4crc file 2012-05-16 18:02:51 +00:00
Romuald Conty 05acb85372 Use explicit case instead of default in switch()
- Fix warnings while using -Wswitch-enum
 - Fix two minor bugs due to a bad case handle
2012-05-16 17:51:34 +00:00
Romuald Conty 10f24d97aa Any successfull PowerDown command have to change local power mode state 2012-05-16 16:48:06 +00:00
Romuald Conty 7b82a98b72 Improve acr122_usb frame building and add links to documentations 2012-05-15 07:27:28 +00:00
Romuald Conty a56e5f9cd7 Fix nfc-emulation, now works with utils/nfc-emulate-forum-tag4 and Nexus S 2012-05-14 21:20:26 +00:00
Romuald Conty 9383fa66bf Fix emulation based on nfc-emulation.c 2012-05-14 20:47:41 +00:00
Romuald Conty 769fc63bb0 Fix acr122_pcsc driver name. 2012-05-14 20:40:19 +00:00
Romuald Conty 851d035588 drivers/pn532_uart: flush uart input on error to resync uart port 2012-05-10 19:37:55 +00:00
Romuald Conty 4990f57df8 debug messages are sent in stderr stream (Thanks to Spock) 2012-05-02 01:46:44 +00:00
Romuald Conty 8549bc1e4c share some traces with USB devices (Thank to yobibe) 2012-05-01 23:17:24 +00:00
Romuald Conty 82b2cfa883 Smart merge of acr122_usb branch: add acr122_usb driver without removing acr122_pcsc support. 2012-05-01 23:09:57 +00:00
Romuald Conty e7f85811a1 fix *get_supported_modulation and *get_supported_baud_rate protos in nfc_driver and public ones. 2012-03-01 13:52:51 +00:00
Romuald Conty f98437c377 fix pn53x_get_supported_modulation() and pn53x_get_supported_baud_rate() functions 2012-03-01 13:43:04 +00:00
Romuald Conty 3eba0e9b54 Prepare libnfc 1.6.0-rc1 2012-03-01 12:00:23 +00:00
Romuald Conty 03d185b536 Prepare libnfc 1.6.0-rc1 2012-03-01 11:37:16 +00:00
Romuald Conty 9720bc45b4 Prepare libnfc 1.6.0-rc1 2012-03-01 11:24:59 +00:00
Romuald Conty 4878361d27 drivers/acr122s: fix ACR122S initialization (Fixes Issue 185) 2012-02-27 14:10:47 +00:00
Romuald Conty 75e776ffd0 utils/nfc-mfclassic: remove non-conscistent "extract payload" option in nfc-mfclassic and use MIFARE instead of Mifare typo (Thanks to Thomas Hood) 2012-02-15 13:41:38 +00:00
Romuald Conty 70484509af libnfc-1.5-acr122-usb> support for ACR122U only (not Touchatag) 2012-01-27 14:38:14 +00:00
Romuald Conty 24e298626a libnfc-1.5-acr122-usb> fix minor bugs and apply pn53x_usb's patch to be used under FreeBSD too 2012-01-26 21:36:08 +00:00
Romuald Conty e49eb6c660 libnfc-1.5-acr122-usb> import partial work on "ACR122 without PCSC" driver 2012-01-26 15:23:11 +00:00
Romuald Conty a3a0002f8d fix miss-returned error code (ETGREL -> NFC_ETGRELEASED). 2012-01-18 18:08:39 +00:00
Romuald Conty b366b8c027 add nfc_device_get_connstring() function and nfc-probe example to show devices connection strings 2012-01-18 13:17:01 +00:00
Romuald Conty 38bdfe3281 pn53x_usb: minor code clean up. 2012-01-18 09:39:33 +00:00
Romuald Conty e86d08218b add nfc_initiator_poll_dep_target() 2012-01-10 14:17:18 +00:00
Romuald Conty efa86f0e35 fix various minor mistakes, ajust timeouts 2012-01-10 14:10:44 +00:00
Romuald Conty 7df3bb5aeb various minor fixes/enhancements 2012-01-06 13:08:16 +00:00
Romuald Conty 48e92149e4 drop log4c support 2012-01-06 13:05:10 +00:00
Romuald Conty 22bea8d99b nfc_target_receive_*() need to know rx buffer size 2012-01-05 21:35:02 +00:00
Romuald Conty 93b34fa70b enhance new error handling
- add accessor to last error occured
- add new public error NFC_ETGRELEASED (Target Released)
2012-01-05 01:39:10 +00:00
Romuald Conty 125553c72e verbose option back for nfc-list, and newly implemented in nfc-poll 2012-01-04 21:29:43 +00:00
Romuald Conty af22d34d57 fix some return codes and error checkings 2012-01-04 20:50:05 +00:00
Romuald Conty 254053b940 fix few minor bugs:
- timeout values handling in pn53x_transceive()
- check error code after filling it in pn53x_transceive()
- fix pn53x_check_communication() return code
- lower timeout default values
- fix arygon_abort() return code
2012-01-04 20:02:51 +00:00
Romuald Conty d6477df7a6 doc: quick start example minor fix (make distcheck OK) 2011-12-22 17:40:22 +00:00
Romuald Conty bf7c36d9bb less structs and defines publicly exposed
- nfc_device is now an opaque type;
 - PN53x specific errors are not public anymore;
 - nfc_device_name() renamed to nfc_device_get_name() for the sake of consistency;
 - examples/*, utils/* uses the new nfc_device_get_name() function instead of access directly to struct's content;
 - new error defined: NFC_ERFTRANS for notifying about RF transmission error, its used by mifare.c to detect permissions error on mifare;
 - drivers initiator_transceive_bytes() function now returns libnfc's error code on failure (<0), and received bytes count on success (>=0);
 - remove some unused errors.
2011-12-19 00:23:21 +00:00
Romuald Conty 9bdc20353c nfc_device struct is not exposed as public API anymore (partial commit)
- split libnfc's errors and chip's errors
 - fix nfc_property enum
2011-12-15 16:02:38 +00:00
Romuald Conty c181cb35ec set correctly default timeout values 2011-12-14 15:03:29 +00:00
Romuald Conty 26b9c28f48 new properties to tune timeouts:
- add nfc_properties (will replace nfc_options)
 - introduce some error codes
 - rework functions to use the new timeout_command value
2011-12-14 13:27:11 +00:00
Romuald Conty b3b14a3fb8 debian: udev rules file renamed 2011-12-09 16:14:50 +00:00
Romuald Conty 2ac8df2b28 contrib: move udev and devd files into contrib/ 2011-12-09 16:13:32 +00:00
Romuald Conty 90c05c7d13 Add a printf-based logging when log4c is not available (I experiemented some bugs using log4c) 2011-12-07 14:59:40 +00:00
Romuald Conty c286eec920 DEP enhancements:
- Add timeout on InJumpForDEP (pn53x) and initiator_select_dep (libnfc API)
- test_dep now works again (except 424Kbps)
- Fix ndi.ndm feeling when select a DEP target
Important: test_dep does not work on PN53x_USB devices after running previous tests
2011-12-06 10:05:35 +00:00
Romuald Conty e76e531d2d pn53x_usb: clean timeout handling. 2011-11-25 16:13:40 +00:00
Romuald Conty 63f168440b Provide a (poor) logging capability when log4c is not available but DEBUG is enabled. 2011-10-27 15:14:18 +00:00
Romuald Conty 2e2d091bfd nfc-list: continue to attempt to reach devices after a connection failure. 2011-10-27 13:46:13 +00:00
Romuald Conty 6752951084 Refresh quick_start_example1.c according to new API 2011-10-18 16:07:13 +00:00
Romuald Conty b4ebb4510d Removes libusb types workaround (r200) as it seems to not be needed anymore but may disturb compiler. 2011-10-18 11:03:54 +00:00
Romuald Conty b7f928a24c Update ChangeLog 2011-10-17 16:40:24 +00:00
Romuald Conty b6c23c7c0e FixBundle.cmake.in was missing from released archives. (Thanks to GruGue from the libnfc forum) 2011-10-17 13:11:37 +00:00
Romuald Conty 55daa29a7c Allow to connect to a device using a connection string:
- Provide a nfc_get_default_device() that allow to grab the connstring stored
   in LIBNFC_DEFAULT_DEVICE environnement variable or returns the first
   available device if not set;
 - nfc_connect(NULL) now takes the default device (see
   nfc_get_default_device());
 - Removes nfc_driver_desc_t from public types
 - Defines nfc_connstring as char[1024]
 - examples/*: use nfc_connstring
 - examples/nfc-poll: now uses only the default device (instead of all devices
   availables)
 - Removes parse_args() from nfc-utils.[hc]
2011-10-17 13:03:56 +00:00
Romuald Conty 47f4883444 configure now checks for int16_t 2011-10-17 12:32:16 +00:00
Romuald Conty dc842a844c examples/nfc-read-forum-tag3: add new example to read a NFC Forum Tag Type 3 2011-10-10 00:40:34 +00:00
Romuald Conty 57db10acf0 m4/libusb: search for "libusb-legacy" module if "libusb" module is not found 2011-10-09 19:54:25 +00:00
Romuald Conty 1372c1df19 ECONNABORTED is not defined under windows 2011-10-05 22:42:55 +00:00
Romuald Conty b24191a9b9 Fix compilation using cmake 2011-10-04 21:43:05 +00:00
Romuald Conty 8fa83ac70f Fix infinite software polling 2011-10-04 21:42:06 +00:00
Romuald Conty ace9fb27b1 Fix indent in cmake/modules/FindLIBUSB.cmake 2011-10-04 21:41:15 +00:00
Romuald Conty dccfd65c80 Add software polling for non-PN532 equipped device (Fixes Issue 136) 2011-10-03 11:19:08 +00:00
Romuald Conty 66e3ea6146 nfc-relay-picc.1 was missing from tarball 2011-10-03 11:16:42 +00:00
Romuald Conty b1a30e3e3b drivers/pn53x_usb: fix timeout computing 2011-10-03 08:59:21 +00:00
Romuald Conty a2eb6a1f49 Update ChangeLog 2011-10-02 21:52:05 +00:00
Romuald Conty b2666dea15 windows port improved:
- PCSC headers/libs are not a requierement sif you dont select ACR122 driver
 - uart_win32 implementation now handles timeouts
2011-10-01 14:50:53 +00:00
Romuald Conty d286a3c4b7 make distcheck OK 2011-10-01 13:29:18 +00:00
Romuald Conty ea0ffa615a Remove (g)indent references.
Unfortunately, there is no automatic way that is good to indent the code. Developers need to take care about indent themself ;) (Fixes Issue 84)
2011-10-01 12:33:11 +00:00
Romuald Conty 03a6f5e29c Update examples and utils manpages.(Fixes Issue 159) 2011-10-01 12:26:11 +00:00
Romuald Conty 5ecf382dfc windows: Oups... timeout is a pointer... 2011-10-01 09:59:27 +00:00
Romuald Conty afd015f1b7 Attempt to provide a Windows implementation of timeouts handling in UART 2011-09-30 14:02:51 +00:00
Romuald Conty 8c7b61eaba move some examples to utils/ since they are not examples anymore :) (Fixes Issue 164) 2011-09-30 11:33:31 +00:00
Romuald Conty 8f7834c625 drivers/arygon,pn532_uart,pn53x_usb: all PN53x commands are now cancelable 2011-09-29 14:53:52 +00:00
Romuald Conty 49ab6a7f31 raise up loggin level when PCSC context is not found (e.g. under POSIX system, pcscd is not running) 2011-09-29 11:59:34 +00:00
Romuald Conty 590e3910de Document new timeout parameter 2011-09-29 09:49:08 +00:00
Romuald Conty a12574e095 Add a special mention to be sure pcscd is running when using ACR122 driver... 2011-09-29 09:10:14 +00:00
Romuald Conty 87c13825af drivers/pn53x_usb: rework timeout usage 2011-09-22 16:21:22 +00:00
Romuald Conty f6b582cf2b windows: Remove DGB/WARN/ERROR obsolete macros usage. 2011-09-21 06:54:53 +00:00
Romuald Conty e4524bc810 chips/pn53x: add RFConfiguration wrappers 2011-09-20 22:43:45 +00:00
Romuald Conty b33fb81234 logging: fix LOG_CATEGORY and show the last command status. 2011-09-20 18:22:47 +00:00
Romuald Conty cf99796a77 Removes semaphore.h depends. 2011-09-20 16:23:48 +00:00
Romuald Conty ca8bd1df91 logging: remove semaphore usage since libnfc is not threaded and log4c does handle threaded cases itself. (Should ease Windows compiling) 2011-09-20 14:07:40 +00:00
Romuald Conty c4b45cd390 debian: add nfc-mfsetuid and nfc-emulate-nfcforum-tag2 to libnfc-example package. 2011-09-13 13:12:54 +00:00
Romuald Conty 0f3b733239 directory include/nfc does not have iso7816.h file. 2011-09-12 19:50:21 +00:00
Romuald Conty e8eec583ed Enhance logging system:
* Removes internal DBG/WARN/ERR macros (but keep them in examples);
 * Removes almost all DEBUG define references;
 * Uses the flexible log4c library to log all messages.
2011-09-12 14:50:01 +00:00
Romuald Conty 580768a489 pn53x-diagnose: uses config.h if present 2011-09-12 14:46:58 +00:00
Romuald Conty aff1a51eb7 Threaded tests need cutter >= 1.1.8 2011-09-12 14:33:26 +00:00
Romuald Conty c30453d176 Add a threaded DEP test to check DEP communication between two local devices 2011-09-12 14:30:59 +00:00
Romuald Conty d18cae4f06 Enable all drivers under Debian 2011-09-12 14:28:50 +00:00
Romuald Conty fa7084fa77 removes the libusb-win32 workaround: libusb-win32 project released a new stable version which fixes the infinite timeout issue. (Thanks to Ergeerts Glenn) 2011-08-08 10:02:47 +00:00
Romuald Conty 676477e20c rework the way to determine which command is needed to send/receive a frame as target. 2011-06-30 17:05:59 +00:00
Romuald Conty 3a1cb72681 examples/nfc-emulate-forum-tag2: add new example to emulate a NFC Forum Tag Type 2 2011-06-30 14:59:47 +00:00
Romuald Conty 10d9e30615 examples/nfc-emulate-forum-tag4: add document references. 2011-06-30 14:24:47 +00:00