Commit Graph
100 Commits
Author SHA1 Message Date
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
Romuald Conty 902bbfb04c Fix a segfault when abort_p is NULL. 2011-05-09 11:19:01 +00:00
Romuald Conty 921d28d976 Attempt to provide an abort mecanism for windows users... 2011-05-09 11:14:43 +00:00
Romuald Conty 468027ba2b chips/pn53x: PN532 now goes in LowVBat mode when setting idle mode from target mode. 2011-05-09 10:44:44 +00:00
Romuald Conty be0f0b0828 New function nfc_idle() to set the NFC device in idle mode.
nfc_disconnect() now switch NFC device into idle before disconnecting;
pn53x_data now have a operating_mode enum to know the current running mode (initiator, target or idle);
new pn53x_PowerDown wrapper for PowerDown (PN532) command;

Note: ARYGON idle mode now to be implemented and ACR122 does not support this mode.
2011-05-09 10:09:40 +00:00
Romuald Conty 3a9327d1be document nfc_abort_command() 2011-05-06 23:25:41 +00:00
Romuald Conty 805d738b24 Implement PN53x extended information frames with USB devices. (Fixes Issue 158) 2011-05-06 15:03:08 +00:00
Romuald Conty 11a91af749 Add some SFR registers description, typo in PN53X_REG_CIU_TxMode address. 2011-05-06 14:32:32 +00:00
Romuald Conty cd6946e751 Add ISO/IEC 14443 B' aka Type B' modulation partial support 2011-05-06 14:14:06 +00:00
Romuald Conty cad3dc652d chips/pn53x: print a debug trace when reading PN53x registers. 2011-05-05 18:19:20 +00:00
Romuald Conty 579102bd7b add some manual test reports. 2011-05-05 16:03:09 +00:00
Romuald Conty 04820bea47 chips/pn53x: set some parameters in FeliCa when using DEP mode. 2011-05-05 15:19:46 +00:00
Romuald Conty 80b4cd9767 chips/pn53x: set some parameters in ISO/IEC 14443A when using DEP mode (ie. SAK says ISO/IEC 18092 compliant) 2011-05-05 15:00:34 +00:00
Romuald Conty 651d88fd15 examples/nfc-anticol: now use nfc_abort_command() 2011-05-05 14:24:27 +00:00
Romuald Conty 64b036b129 drivers: InDataExchange is an abortable command too. 2011-05-05 11:49:43 +00:00
Romuald Conty 008f2a8d4c Minor returns fixes. 2011-05-05 11:46:12 +00:00
Romuald Conty 5f890fedcc Remove obsolete callbacks 2011-05-05 09:45:39 +00:00
Romuald Conty 0265515a0c Abort mecanism is now implemented in driver layer:
iAbortFd file descriptor array have been removed from nfc_device_t;
nfc_abort_command() can now failed (return false);
nfc_abort_command() now call abort_command pointer from drivers;
pn532_uart and arygon drivers use a pipe-based mecanism (similar from previous one);
pn53x_usb driver use a boolean flag-based mecanism (the previous one does not work as expected);
pn53x_usb now print smarter messages on error at usb connection;
pn53x_usb now handle a strange case: sometimes, the first sent command is not ACKed by PN53x USB device, a dummy command is now sent.
2011-05-05 09:27:17 +00:00
Romuald Conty 72422e819b examples/nfc-dep-*: disconnect from NFC device on error. 2011-05-05 09:17:38 +00:00
Romuald Conty 9231f47123 examples/pn53x-tamashell-scripts: minor enhancements. 2011-05-03 15:10:51 +00:00
Romuald Conty c7da492872 drivers/pn53x_usb: use progressive field on/off only for ISO14443 Type B target listing. 2011-05-03 13:55:38 +00:00
Romuald Conty 26071a817b drivers/pn53x_usb: enable progressive field on init to allow pn53x-tamashell to works (note: it does not distrib progressive field enabling when nfc_list_passive_target() is used). 2011-05-03 13:19:03 +00:00
Romuald Conty 96358368f5 cast explicitly sz (uint8_t) in size_t 2011-05-02 16:43:03 +00:00
Romuald Conty 517cde2517 Prepare 1.5.0 version 2011-04-29 10:13:57 +00:00
Romuald Conty 59c4e69feb examples/pn53x-diagnose: fix memcmp strings coverage 2011-04-28 13:35:05 +00:00
Romuald Conty 7c274029e7 examples/pn53x-diagnose: fix PN53x commands and report internal error using nfc_perror() 2011-04-28 13:26:47 +00:00
Romuald Conty 6974fb4562 examples/nfc-dep-*: add signal handler to use the abort mecanism. 2011-04-27 15:10:14 +00:00
Romuald Conty de9255eaea drivers/arygon: enable abort() mecanism on InJumpForDEP command 2011-04-27 15:09:22 +00:00
Romuald Conty 6fc4a5b70a Use a new current target pointer to choose correctly the sending/receiving method (ie. TgSetData/TgGetData or TgResponseToInitiator/TgGetInitiatorCommand). 2011-04-27 14:42:27 +00:00
Romuald Conty 1107b226ac drivers/pn532_uart: enable abort() mecanism on InJumpForDEP command 2011-04-27 14:38:05 +00:00
Romuald Conty ee718d6f9b drivers/pn53x_usb: do not send ACK when its not needed, enable abort() mecanism on InJumpForDEP command 2011-04-27 14:37:24 +00:00
Romuald Conty 1198a71d64 chip/pn53x: handle PN532 "power down" and "low VBat" power mode instead of a simple "sleep" mode. (Fixes Issue 167) 2011-04-27 13:16:36 +00:00
Romuald Conty 09b18bf6b8 example/nfc-emulate-forum-tag4: add some notes about my experiments. 2011-04-22 17:32:07 +00:00
Romuald Conty 332e4afc31 drivers/arygon: add a debug message when a not supported payload is sent. 2011-04-22 17:30:17 +00:00