Commit Graph
100 Commits
Author SHA1 Message Date
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 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 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
Romuald Conty fd19773c21 drivers/pn53x_usb: Make valgrind more happy :) 2011-06-28 14:05:40 +00:00
Romuald Conty eec2794d2d drivers/pn532_uart,arygon: Make valgrind happy with UART-based drivers 2011-06-28 13:16:44 +00:00
Romuald Conty e6051ceca4 chip/pn53x: clean up SAMConfiguration usage. 2011-06-27 17:12:25 +00:00
Romuald Conty eb70f3842e Error handling improvement:
- Attempt to sort errors depending their source
 - Rename DE* errors to differenciate Device-Error and Driver-Error
 - Add ENOTIMPL error to raise a error when a feature is not (yet) implemented in libnfc
2011-06-27 16:31:10 +00:00
Romuald Conty 9c314d5652 Shrink InJumpForDEP frame size according to user manual. 2011-06-27 12:33:55 +00:00
Romuald Conty 904f41e0f7 drivers/pn53x*: use shared pn53x_ack_frame[] and pn53x_nack_frame[] instead of local declaration. 2011-06-27 10:33:55 +00:00
Romuald Conty 699e9008d1 Move ISO14443-3 UID cascading in a dedicated function. 2011-06-27 10:19:00 +00:00
Romuald Conty 0b42cbfb8f examples/nfc-emulate-forum-tag4: this example now fails with ENOTSUPP when used with a non-PN532 chip. 2011-06-27 09:14:19 +00:00
Romuald Conty 7b6baafd1d example/nfc-relay-picc: Move windows related code into contrib/win32 2011-06-27 08:56:38 +00:00
Romuald Conty c40319c7b4 Windows: implement automatic uart port detection and input flush (Thanks to Edwin Evans) 2011-06-16 11:50:39 +00:00
Romuald Conty 29856a67a0 Rename USB_TIMEOUT to USB_INFINITE_TIMEOUT and use it each time bulk read need to be infinite. (Thanks to Guty) 2011-06-10 10:04:31 +00:00
Romuald Conty 850b3c2375 Improve USB support:
- All USB errors are now reported in text format;
 - USB drivers now relies on libusb-win32 with version >= 1.2.4.x (1.2.4.6 recommended) (Many thanks to Glenn)
2011-06-09 14:00:45 +00:00
Romuald Conty 17c63aebb5 pn53x_usb: continue to search a available device on usb errors (r1092 reverted then issue fixed). 2011-05-25 12:08:42 +00:00
Romuald Conty 917717c4ca drivers: UART based drivers could now use uart_flush_input() to discard junk bytes on input. 2011-05-25 10:31:19 +00:00
Romuald Conty 22e25a8b1e chips/pn53x: drivers now uses pn53x_data_new() and pn53x_data_free() to handle strcut pn53x_data allocation, initialization and freeing. 2011-05-25 10:25:17 +00:00
Romuald Conty c45d4e685a pn53x_usb: continue to search a available device on usb errors (ie. Device Busy) 2011-05-25 10:15:18 +00:00
Romuald Conty 78ce62e7b6 Fix ISO/IEC 14443-4 hardware emulation.
NDO_AUTO_ISO14443_4 is now set to _true_ by default with nfc_target_init();
nfc_emulate_target() now fails (return _false_) when emulator->state_machine->io() failed;
Initialize nfc_device_t variables to _false_ in order to send correctly (see notes in nfc-device.c);
nfc_emulate_forum_tag4 prints error when nfc_emulate_target() failed.
2011-05-24 17:10:13 +00:00
Romuald Conty 975cd275d1 minor fixes 2011-05-20 16:09:00 +00:00
Romuald Conty d8b31dbd46 debian: silent down lintian and add watch file 2011-05-20 15:07:12 +00:00
Romuald Conty 0c2671d7f9 remove duplicate file LICENSE (see COPYING) 2011-05-20 15:06:36 +00:00
Romuald Conty dc88d6f3aa debian: now use debhelper 7 (dh7) style rules file 2011-05-20 14:40:36 +00:00
Romuald Conty 1aadfef363 debian: update copyright 2011-05-18 10:59:27 +00:00
Romuald Conty 70155985f8 debian: use a numbering that allow to have libnfc pre-version and debian package pre-version too. (Thanks to Thomas Hood) 2011-05-18 08:59:07 +00:00
Romuald Conty da6add3534 drivers/pn53x_usb: make PN53x usb connection more stable:
- move well-know USB problem hack into pn53x_usb_bulk_write()
 - put NACK hack to handle PN533 direct reply case
2011-05-17 10:41:26 +00:00
Romuald Conty 6b5a582386 debian: fix version numbering, fix .install files and remove PPA upload mention (Thanks to Thomas Hood) 2011-05-17 10:32:59 +00:00
Romuald Conty 12095307e5 debian: change name of lib to libnfc2 to match SONAME major version 2 (Thanks to Thomas Hood) 2011-05-16 12:55:44 +00:00
Romuald Conty 224c7b3fc3 debian: the directory debian/patches and its contents gets generated at build time and need not be kept in svn. 2011-05-16 12:52:11 +00:00
Romuald Conty b9bcfaf959 debian: improve debian packaging (Thanks to Thomas Hood) 2011-05-12 14:01:51 +00:00
Romuald Conty 2a9f876363 Import BUFFER_* macros from libfreefare and use them in writeback cache 2011-05-10 19:13:08 +00:00
Romuald Conty 2e630f7e0f windows port: fix uart_receive() under Win32 platform 2011-05-10 17:02:33 +00:00
Romuald Conty d37b917352 chips/pn53x: remove double defines for pn53x registers. 2011-05-10 15:13:19 +00:00
Romuald Conty e4dfa75045 chips/pn53x: *_timed() functions should prefer pn53x_WriteRegister() to bypass any kind of logical handling (mask, writeback, etc) 2011-05-10 13:53:48 +00:00
Romuald Conty 9e1230bed7 debian: add debian/source/format
From Thomas Hood:
The file that should be present is debian/source/format, containing
the following line "3.0 (quilt)".  This causes dpkg-source to build source
files in the new, recommended, source format.  For details see, e.g.,
http://wiki.debian.org/Projects/DebSrc3.0
2011-05-10 13:43:19 +00:00
Romuald Conty 7bb4f4597d windows port: implement abort mecanism in pn532_uart driver (Based on provided patch: many thanks to Edwin Evans) 2011-05-10 13:26:57 +00:00
Romuald Conty c808511694 debian: update debian files (Thanks to Thomas Hood) 2011-05-10 12:58:13 +00:00
Romuald Conty ef3303839a chips/pn53x: fix memset size on writeback cache, typo and fix a mask problem on data store 2011-05-09 20:42:11 +00:00
Romuald Conty b3cade2db2 Fix writeback cache size and some typo. 2011-05-09 19:55:22 +00:00
Romuald Conty 009d851771 Implement WriteBack cache (Fixes Issue 155) 2011-05-09 19:34:00 +00:00
Romuald Conty 95914345e1 chips/pn53x: add pn53x_data_new() function to alloc and init pn53x_data structure. 2011-05-09 18:47:48 +00:00
Romuald Conty ebb352f1f3 Clean up and add some debug msg on ReadRegister/WriteRegister 2011-05-09 15:14:50 +00:00
Romuald Conty 25e2dbec95 chips/pn53x: set ui8LastCommand in chip layer instead of driver layer. 2011-05-09 14:22:12 +00:00