Commit graph

29 commits

Author SHA1 Message Date
Ludovic Rousseau
a57793fe5a Do not build pn532_spi if spi is not available
Check if the include file linux/spi/spidev.h is available and, only if
the header file is present, add the driver pn532_spi for "default" and
"all" driver configuration.

This Linux header file is not present on Mac OS X for example.
2013-04-03 16:08:34 +02:00
Philippe Teuwen
7df8fdd0f6 spi: fix doc typos 2013-03-27 22:58:59 +01:00
Philippe Teuwen
fc420d58af Only include SPI related files when (at least) one SPI driver is enabled 2013-03-27 16:58:01 +01:00
Philippe Teuwen
1417bdc164 Merge branch 'master' into pn532_spi
* master: (28 commits)
  Update Changelog
  Add missing windows files in archive
  Move log implementation for Windows in dedicated directory
  Move UART implementation for Windows in dedicated directory
  CMake: only compile usbbus.c when (at least) one USB driver is enabled
  CMake: only include UART related files when (at least) one UART driver is enabled
  Only include UART related files when (at least) one UART driver is enabled
  Fix environment vars usage when compiling with CMake
  Remove unsed code section in log.c (was commented)
  pn53x_current_target_new() now returns null ptr upon malloc() error
  fix missing tests on malloc() return
  pn53x_data_new() now returns null ptr upon malloc() error
  uart drivers: missing pn53x_data_free() on some error handling branches
  uart drivers: missing nfc_device_free() on some error handling branches
  uart drivers: missing uart_close() on some error handling branches
  uart drivers: fix missing free(ndd.port)
  config parser: missing fclose()
  UART drivers: fix double free() of serial port info
  Fix cmake build failure under linux
  quick_start_example1.c: avoid using warnx() to remove err.h dependency
  ...

Conflicts:
	libnfc/buses/Makefile.am
2013-03-27 11:44:29 +01:00
Romuald Conty
699e9123ea Only include UART related files when (at least) one UART driver is enabled 2013-03-18 23:07:19 +01:00
Eugeny Boger
d9fd9155ea Adding a SPI driver for pn532
The driver seems to work well.
I tested it on Linux with i.mx233-based board using hardware SPI.
I tried to modify the build files as well, but it's probably a little messy.
I'm not sure whether it will work on other *nix OSes,
so it's probably better to limit the driver to Linux only using build system.
2013-02-28 23:24:42 +01:00
Romuald Conty
ca7d01ade3 Enables pn532_uart driver by default 2013-01-20 17:00:21 +01:00
Ludovic Rousseau
db2173efdf configure.ac:84: warning: The macro `AC_HELP_STRING' is obsolete.
The new name is AS_HELP_STRING (available since Autoconf 2.58)
2012-05-18 07:33:30 +00:00
Romuald Conty
fb50e3b235 Display right driver name while detecting PCSC 2012-05-17 00:37:00 +00:00
Ludovic Rousseau
782b72e29f Correctly handle PCSC header files on Mac OS X
Fixes Issue #195
2012-05-16 13:34:21 +00:00
Romuald Conty
82b2cfa883 Smart merge of acr122_usb branch: add acr122_usb driver without removing acr122_pcsc support. 2012-05-01 23:09:57 +00:00
Romuald Conty
e49eb6c660 libnfc-1.5-acr122-usb> import partial work on "ACR122 without PCSC" driver 2012-01-26 15:23:11 +00:00
Anugrah Redja Kusuma
136cfdf48d Implement driver for ACR122S device 2011-11-23 03:05:12 +00:00
Philippe Teuwen
789cb13dec Avoid readline auto-detection when cross-compiling. Still feasible to use readline if you specify the path to it. 2011-10-18 13:28:01 +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
Romain Tartiere
e94513fdb7 libpcsclite is not really required. 2011-09-22 10:01:37 +00:00
Romain Tartiere
f1f31d1b4c Unbreak and merge PN53x USB drivers.
While here fix some includes that would not work if SRCDIR != BUILDDIR.
2011-03-05 19:54:52 +00:00
Romuald Conty
200487d172 Fix typo 2011-02-01 09:23:30 +00:00
Romuald Conty
58dcf63e7c MERGE: libnfc-mingw-cross merge with trunk (r805-821) 2010-11-17 08:29:41 +00:00
Romuald Conty
c67d915250 Attempt to fix pcsc-lite detection on MacOS 2010-10-12 08:20:46 +00:00
Romuald Conty
f23a8eced3 Fix minor autotools warning 2010-10-04 12:31:55 +00:00
Romuald Conty
17b940c610 Finalize pn53x-tamashell integration (add readline m4, fiw minor warnings, adjust Makefile.am) 2010-10-04 10:24:45 +00:00
Romuald Conty
6d47171bdc Attempt to fix MacOS build. 2010-09-28 09:59:51 +00:00
Romain Tartiere
9629d073cb - Fix missing checks reported by autoscan (we still do nothing on failure but at least the configure output might be more useful in case of problem);
- Lint configure output when libusb detection methods fallback over and over.
2010-09-07 09:01:59 +00:00
Romain Tartiere
b1f4c38f8f Improve configure's --with-drivers documentation.
- List drivers compiled in the default set;
- Expose the 'all' special-driver;
- Remove some autotools (broken) magic.
    Since it's broken, display "--with-drivers=DRIVERS" on all system and stop
    making my eyes bleeding with "--with-drivers=driver[[,]driver...]" which is
    a complete nonsense when using "recent" autotools.
2010-09-03 08:36:41 +00:00
Romuald Conty
6e84e757c7 List available drivers in ./configure --help 2010-08-17 14:40:35 +00:00
Romain Tartiere
d77c25224a After a bazillion tests, make the Debian-5-year-outdated-and-buggy autotools happy with some weird m4 syntax and hope it will not fail on a much more recent autolol suite. 2010-07-31 15:37:27 +00:00
Romain Tartiere
cd53efb038 Enforce ISO C conformance about empty files.
ISO C forbids empty source files.  Instead of compiling possibly empty source
files depending on the compiler parameters, only compile required files to
build the library as requested at the ./configure stage.

Windows users (and more precisely non-autotools users), you may have to update
whatever you use to build the libnfc to fit your needs.  The Makefile shipped
in the windows directory compiles all drivers as it is written so you should
not notice any difference, but if you don't use _that_ makefile, then you will
have to do some adjustment.

For now, keep the defines in CFLAGS just in case.  Planned for removal in circa
one week.

While here, pet `./configure` output (--help format and summary).
2010-07-31 13:21:56 +00:00
Romuald Conty
b55400a0d5 configure.ac rework
- Put libusb and PC/SC check in m4 macros.
- Suppress --disable-pcsclite and --disable-libusb
- Add --with-drivers option: we now could choose which driver to build. without this option a default set is build (ATM all drivers except PN532_UART)
2010-04-15 14:41:13 +00:00