jarjar/libnfc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,365 Commits 3 Branches 26 Tags
b27f8634d689eddd2df39e55253a5e8f78b6d29e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Romuald Conty b27f8634d6 acr122_usb: Fixes CCID reply decoding. 2012-10-04 09:35:47 +00:00
Romuald Conty 26dabba7ac Add Touchatag support for experimental acr122_usb driver; Thanks to Gregoire Sage for its contribution. (Fixes Issue 201) 2012-10-03 16:21:11 +00:00
Romuald Conty 88a57a50b3 Fix error code when no reply is not ISO14443B2CT compliant 2012-10-03 16:21:02 +00:00
Romuald Conty 91ce008d62 Removes a FIXME: not relevant anymore 2012-10-03 16:20:50 +00:00
Romuald Conty 1f0ec1b43a Remove unused macro. (Fixes Issue 192) 2012-09-27 07:36:02 +00:00
Romuald Conty 921d64dadc Support FTDI dongle under MacOS 2012-09-27 07:35:55 +00:00
Romuald Conty 310d7eba07 New str_nfc_target() function in API. 
This allow to convert a nfc_target struct into allocated string.
 2012-09-17 13:47:54 +00:00
Romuald Conty 82e3416619 minor header clean up 2012-09-17 13:47:43 +00:00
Romuald Conty de827ab583 nfc_device_get_information_about() now allocates returned string. 
Note: must be freed by free().
 2012-09-17 13:47:30 +00:00
Romuald Conty 2aba0f962a documentation: add missing group description 2012-09-17 13:47:18 +00:00
Romuald Conty 3cd6015c81 minor header cleanup 2012-09-17 13:47:11 +00:00
Romuald Conty 9f38ae715d pn53x: allow more delay for Card Presence command (tested on PN533 and PN532 in various contexts). 2012-06-12 16:51:47 +00:00
Romuald Conty ab312299d6 pn53x_reset_settings() now resets CRC, parity, easyframing and crypto1. 
These settings are quite specifics and should be reset in other functions that call pn53x_reset_settings() too: i.e. nfc_initiator_init_secure_element()
 2012-06-12 16:46:20 +00:00
Romuald Conty b4ef1a3a5d New nfc_initiator_init_secure_element() function to set SAM as wired card (only relevant with a PN532 SAM-equipped) 2012-06-04 00:16:28 +00:00
Romuald Conty 6f10d6e321 pn53x: return all errors when NP_ACTIVATE_FIELD failed 2012-06-04 00:16:17 +00:00
Romuald Conty f47af31fb7 Indent correctly previous commit (make style) 2012-06-03 21:05:26 +00:00
Romuald Conty ce443d50ca Rename abtUid from struct mifare_param_auth into abtAuthUid: this is not the UID while using 7-bytes UID MIFARE Classic tags. 2012-06-03 21:02:54 +00:00
Romuald Conty c973800164 nfc_device_target_is_present() checks if passed target if the current target before sending Card Presence command 2012-06-03 21:02:47 +00:00
Romuald Conty 2b81baa14f Add documentation related to previous commit (NFC_ETGRELEASED on MFC AUTH failure) 2012-06-03 21:02:38 +00:00
Romuald Conty b7a74931f6 Returns a NFC_ETGRELEASED error when MIFARE Classic's authentication failed (instead of NFC_ECHIP): a MIFARE Classic is halted on AUTH command failure. 2012-06-03 21:02:31 +00:00
Romuald Conty c7820c6a77 Log an error when user-Rx buffer is too sort to gain data 2012-06-03 21:02:23 +00:00
Romuald Conty 62c4ffd0b7 Raises up default timeout from 250 to 350ms 
PN53x sometimes needs more time to compute usual command (ie. with Diagnose/Card Presence when card become unreachable)
 2012-05-30 23:02:56 +00:00
Romuald Conty 13e1e054c2 Minor code fix. 2012-05-30 23:02:48 +00:00
Romuald Conty d7e7979580 Listing passive targets now quit earlier if szTargets count is reached and in that case, leave with the latest tag selected. 
That's quite useful when you need to directly use 1 target because in contrast of nfc_initiator_select_passive_target, you don't need to prepare initiator data by hands
 2012-05-30 23:02:41 +00:00
Romuald Conty b5c634cb07 drivers/pn53x_usb: use default timeout command instead of infinite 2012-05-30 23:02:34 +00:00
Romuald Conty 26865bbc19 Remove extra whitespaces/tabs before EOL. 
find . -name '*.[ch]' | xargs perl -pi -e 's/\t+$//; s/ +$//'

Thanks to Ludovic.
 2012-05-29 00:33:22 +00:00
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