Commit graph

43 commits

Author SHA1 Message Date
Romain Tartiere
3f8068b760 Include "config.h" at the beginning of all source code, remove it from headers.
While here distinguish licence comments using the /*- special comment delimiter.
2010-01-15 10:18:11 +00:00
Roel Verdult
15981b743e fixed windows compiling issues 2010-01-13 16:23:06 +00:00
Roel Verdult
4179bb1918 ARYGON ADRB-USB 9600 baud note, removed invalid connection Mac OS X string for pn532 uart. This only applies for ARYGON devices since they use a silabs-usb-to-uart chip 2010-01-13 14:24:29 +00:00
Romuald Conty
e4ca9245ec C99 compiler is a requirement so we don't need --enable-std99 anymore.
Define _XOPEN_SOURCE 600 using config.h
2010-01-12 17:58:13 +00:00
Romuald Conty
0b720d30cd Avoid BUFSIZ usage since it will be a HUGE buffer under linux (8192 bytes). 2010-01-12 12:47:26 +00:00
Romuald Conty
f0acc73541 Fix compilation warnings. Fix Issue 52. 2010-01-12 12:36:43 +00:00
Romuald Conty
9cc3dca98b Improve Doxygen generation.
Move doxygen comment from header to source (make installed header more cleaner).
2010-01-10 18:14:26 +00:00
Romuald Conty
377caecefe Allow all ACS ACR122U to be detected as valid NFC device. 2010-01-03 12:48:21 +00:00
Romain Tartiere
73448612af Increase _XOPEN_SOURCE to 600.
The snprintf() function conforms to C99.  On FreeBSD, sys/cdefs.h instruct us that _XOPEN_SOURCE == 500 defines _POSIX_C_SOURCE as 199506 which in turn defines __ISO_C_VISIBLE as 1990.  600 is the minimal _XOPEN_SOURCE value we can use to allow us using C99 functions.

Reported by:	tinderbox
2009-12-23 12:01:40 +00:00
Romain Tartiere
e0fab1c9a7 Add stdlib.h header where applicable (where we call malloc() / free()).
Reported by:	tinderbox
2009-12-23 11:56:56 +00:00
Adam Laurie
c0493a91e0 fix warning '... discards qualifiers from pointer target type' (missing const) 2009-12-17 10:01:40 +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
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
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
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
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
Romuald Conty
56219ced36 Fix CMake build. 2009-12-01 11:39:35 +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
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
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
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
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
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
Romuald Conty
14a9112dea It now compile using Autotools. 2009-11-04 10:14:17 +00:00
Romuald Conty
ab62855d80 First attempt to reorganize tree. 2009-11-03 14:51:14 +00:00