Commit Graph
18 Commits
Author SHA1 Message Date
Romain Tartiere e92de4d49e Ensure UART file descriptors are valid before using them in uart_close ().
The uart_open() function may call uart_close() with a 'serial_port' structure with an invalid member 'fd' if the port was not opened successfully.  The call to uart_close() was kept for consistency with the rest of the function because uart_close() is also in charge of freeing 'serial_port'.
2010-01-15 10:38:50 +00:00
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
Romain Tartiere 31597117a2 Update the ChangeLog entry of FreeBSD support (libnfc has not been run on a "today current" -CURRENT FreeBSD system. It's smooth on -STABLE BTW).
While here, fix a typo and adjust style for consistency.
2010-01-06 10:24:49 +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
Romain Tartiere aa7d7171c8 Sync libnfc.pc includedir with the rest of the project source files.
When I introduced headers separation (aka includes-revamp branch), the libnfc source code includes have been changed from '#include "../xx/nfc*.h"' to '#include <nfc/nfc*>' (when compiling, the source include dir (src/include) has precedence over '${prefix}/include').  For the sake of consistency, update libnfc.pc includedir so that compiling third party code using '#include <nfc/nfc*>' just works (tm).  This provides much more consistent headers since they are usually referred relative to the includedir (exceptions are e.g. glib, gtk, xorg... quite bigger than libnfc I could say).
2009-12-22 21:02:19 +00:00
Romain Tartiere 61a0aba66e Make use of the new AM_SILENT_RULES macro of automake 1.11 if possible.
We can see warnings again!
2009-12-16 23:16:21 +00:00
Romain Tartiere 462d986633 Free memory allocated by pick_device() once we are connected to the device in nfc_connect(). 2009-12-16 23:14:31 +00:00
Romain Tartiere 86dac7a4bb Do not call drivers' connect() function if pick_device() returns NULL. 2009-12-03 02:08:40 +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
Romain Tartiere 5c164c97b2 Fix build on recent FreeBSD (ie. upcoming FreeBSD 8.0; FreeBSD CURRENT).
Since March 9, 2009; the FreeBSD operating system base ships with libusb.  As a consequence, the devel/libusb ports that used to provide userland programs access to USB devices is useless and so marked as IGNORE for recent versions of FreeBSD.  This patch detects the FreeBSD version configure is run on and conditionally ignore the libusb detection if relevant.

Obtained from:	Ooo vcs.
2009-11-26 23:32:40 +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
Romain Tartiere fbb924e3bb Add workarounds for libusb in c99. 2009-11-24 12:55:34 +00:00