Commit graph

152 commits

Author SHA1 Message Date
Adam Laurie
51854f508c add nfc_device_name() routine to allow external languages to extract device name 2009-12-14 19:18:29 +00:00
Adam Laurie
6a97e694ec preserve PCSC device name 2009-12-13 17:38:50 +00:00
Adam Laurie
a0cdc3e0d4 ensure USB name is blank before we start 2009-12-09 11:20:28 +00:00
Adam Laurie
a3f573cdff report device names and a little tidying up 2009-12-09 10:36:27 +00:00
Romuald Conty
20df0d785d Speed up PN532_UART driver by removing useless delay. Thanks to Zuck for issue reporting. 2009-12-09 10:32:55 +00:00
Adam Laurie
c15fc93494 simplify abstraction of pn531/pn533 and remove more duplicate code 2009-12-08 21:06:59 +00:00
Emanuele Bertoldi
673986835a Fix Issue 16. 2009-12-08 14:34:07 +00:00
Adam Laurie
6f353013fd minor fixes to pn531/pn533 list routines and some more debugging 2009-12-07 22:18:32 +00:00
Adam Laurie
112b4c45e4 set approrpiate reporting level for error messages 2009-12-07 21:28:07 +00:00
Adam Laurie
b223ec5780 add pn531/pn533 _list_devices and _pick routines (plus minor fixes for acr122 and pn532_uart) 2009-12-07 21:13:36 +00:00
Romuald Conty
1909518572 Fix NFC device autodetection. 2009-12-07 13:53:15 +00:00
Adam Laurie
309cbd6635 consolidate duplicated code in pn531/pn533 drivers 2009-12-06 16:36:55 +00:00
Adam Laurie
50a42a5b97 leave usb devices as we found them (fixes hang on second use) and yet more debuggers 2009-12-06 00:41:48 +00:00
Adam Laurie
b9c7bb89a7 reverse revision 230 - calling connect(NULL) is correct behaviour (selects 1st available device) 2009-12-04 13:51:30 +00:00
Romuald Conty
5b767ec91e Improve debug messages.
Small fix in ACR122 driver.
2009-12-03 21:24:06 +00:00
Romuald Conty
e5ba266420 Add list_devices capabilities to PN532_UART driver. Note: Theses functions exists for this driver only for convenience, please note that it can be anoying if there are others devices plugged on UART (ie. ttySx, ttyUSBx, COM, etc.) 2009-12-03 15:57:13 +00:00
Romain Tartiere
86dac7a4bb Do not call drivers' connect() function if pick_device() returns NULL. 2009-12-03 02:08:40 +00:00
Adam Laurie
b8a9a7d743 more debuggers and fix auto-connecting to libusb devices (still no way to list them though) 2009-12-02 11:45:38 +00:00
Adam Laurie
c449fe8561 add some debuggers to help figure out why nfc-list doesn't see libusb devices 2009-12-01 22:28:41 +00:00
Romain Tartiere
2b8232b9ab Merge the includes-revamp branch into trunk. 2009-12-01 14:23:00 +00:00
Romain Tartiere
dedfbb0ec8 Fix CMakeLists for FreeBSD. 2009-12-01 13:26:34 +00:00
Romuald Conty
56219ced36 Fix CMake build. 2009-12-01 11:39:35 +00:00
Romuald Conty
f9f49cc0d0 Fix r217 build. 2009-12-01 10:44:31 +00:00
Romuald Conty
8a3b8bb3c9 - Avoid null pointers in the USB structures in some circumstances with Windows and libusb;
- In case of error, don't stop but look for other readers (was partly done, now on all errors)
 - In case of error on a specifically requested reader, fail & stop, don't look further.
2009-12-01 10:07:30 +00:00
Romuald Conty
a56a217ca9 Support for the generic vendorid/productid of the NXP chip. 2009-12-01 09:45:01 +00:00
Romuald Conty
0286eeecdd Simply turns off the RF field upon exit. 2009-12-01 09:31:29 +00:00
Adam Laurie
a3431c8e4c fix what looks like accidental editor mangling so it can compile 2009-11-30 20:18:09 +00:00
Romuald Conty
3ff80e55c4 Fix Issue 48: nfc-mfultralight's output should be more clear (Thanks to Zuck) 2009-11-27 17:02:53 +00:00
Romuald Conty
9b2246930e Fix Issue 38: nfc-mfclassic's output should be more clear (Thanks to Zuck) 2009-11-27 16:51:39 +00:00
Romuald Conty
0f0c9abe24 Prepare next release.
Update Debian packages.
Set svn:ignore properties.
2009-11-27 15:44:25 +00:00
Romain Tartiere
92cdc705cd Avoid blocking operations in acr122_list_devices.
The various SCardConnect() can block if a device is already opened in PC/SC potentially leading to deadlocks.  Avoiding using this and matching the device name against a list of supported devices instead.
2009-11-25 02:55:05 +00:00
Romain Tartiere
21df72269a Reindent; Fix ACR122 driver [1]; make distcheck OK.
Pointy hat to:   me [1]
2009-11-24 18:05:31 +00:00
Romain Tartiere
4e50bf7a8b Fix ACR122 with firmware > 2.0 support. 2009-11-24 17:58:07 +00:00
Romain Tartiere
220bef3490 ACR122 devices support enhancements.
- Add driver agnostic nfc_pick_device(), nfc_list_devices();
  - New API function: nfc_list_devices();
  - PCSC Context sharing for acr122 driver;
  - List all devices in nfc-list(1);
  - Various code fixes and cleanup;
  - Remove warnings when compiling;
  - Merge r191:199 from trunk \_°< Coin!
2009-11-24 17:49:24 +00:00
Romain Tartiere
1af29561e8 Add device listing capabilities
- acr122: add acr122_pick_device(), acr122_list_devices();
  - Add device name to device descriptions (nfc_device_desc_t) to select a given PCSC device;
  - Use constants for driver names;
  - Various code cleanups and enhancements.
2009-11-24 13:03:48 +00:00
Romuald Conty
1e5658eeba Make distcheck OK.
Add SVN revision to libnfc version (if available).
2009-11-20 13:43:18 +00:00
Romuald Conty
877176c98f Attempt to extract PN53x related code for nfc.c.
multichip> chips sub-folder introduction with pn53x.h/c.
2009-11-20 11:27:07 +00:00
Romuald Conty
483c69dd03 Rename tag_info to nfc_target_info_t.
Rename init_modulation to nfc_modulation_t.
2009-11-18 11:52:18 +00:00
Romuald Conty
2feedddbfe Rename dev_config_option to nfc_device_option_t.
Use NULL instead of INVALID_DEVICE_INFO to know if device is valid (all occurences are now replaced).
2009-11-18 11:11:06 +00:00
Romuald Conty
2a0ff6c5d0 Rename chip_type to nfc_chip_t.
Rename dev_spec to nfc_device_spec_t.
Update configure.ac and autotools related files.
2009-11-18 10:52:13 +00:00
Romuald Conty
8a579c3aab merge with trunk r183:184. 2009-11-18 09:35:50 +00:00
Roel Verdult
48621a7883 uart proper timeval struct restore for linux select() implementation 2009-11-14 00:47:11 +00:00
Roel Verdult
365d60ce4a added support for recv/send of larger data chunks (>default_os_buffer) 2009-11-13 21:12:51 +00:00
Romuald Conty
aa8bb42d9f Remove nfc-defines.h public header.
Use NULL instead of INVALID_DEVICE_INFO to know if device is valid.
Make distcheck OK
2009-11-10 09:47:59 +00:00
Romuald Conty
9fccd11fc7 merge with trunk r178:179. 2009-11-09 13:30:59 +00:00
Romuald Conty
854dc3aceb Prefix defines.h, messages.h and types.h headers by "nfc-"
Rename dev_info struct to nfc_device_t
Some code cleanup
Rename pn531.h/c to pn531_usb.h/c
Rename pn533.h/c to pn533_usb.h/c
2009-11-09 11:23:33 +00:00
Romuald Conty
fabdf4214a Fix Issue 46 and Issue 47. Many thanks to ud. 2009-11-09 09:39:38 +00:00
Romuald Conty
473965d3a6 It now works on MacOS. 2009-11-04 14:55:24 +00:00
Romuald Conty
c9689c74fb It cow compile using CMake. 2009-11-04 12:03:49 +00:00
Romuald Conty
06a76f6470 Attempt to make it works on MacOS. Small fixes. CMake work started. 2009-11-04 10:42:53 +00:00