Philippe Teuwen 05b9cde966 Merge branch 'master' into pn532_spi ...

* master: (43 commits)
  Windows: workaround as libusb is not automatically detected by CMake
  Add usbbus to Makefile.am EXTRA_DIST
  make style
  Add log_posix to Makefile.am
  Split logging internals so that platforms may choose additional or alternate spew mechanisms
  More explicitely ignoring return value as suggested by Ludovic
  Windows: Clean up all compiler warnings and link warnings
  API change
  make style
  pn53x-sam: fix print_nfc_target
  Convert by value passing of nfc_target to pointer for str_nfc_target and nfc_initiator_target_is_present
  Windows: Fix bug when compiling without libusb: skip usbbus.c
  Windows: Fix compilation due to new usbbus file
  Fix bug when compiling without libusb: skip usbbus.c
  Fix scan-build warning: cast increases required alignment from 1 to 4
  Fix cppcheck warning "Obsolete function 'usleep' called"
  Avoid warning about ignoring return value of 'read'
  Fix cppcheck warning "Non reentrant function 'readdir' called"
  conf.h: make it more standard
  uart_posix.c: remove redundant include
  ...

2013-03-08 23:00:44 +01:00

..

buses

Merge branch 'master' into pn532_spi

2013-03-08 23:00:44 +01:00

chips

Windows: Clean up all compiler warnings and link warnings

2013-03-07 09:37:36 +01:00

drivers

Merge branch 'master' into pn532_spi

2013-03-08 23:00:44 +01:00

additional-pages.dox

Various typos

2013-01-31 21:58:29 +01:00

CMakeLists.txt

Split logging internals so that platforms may choose additional or alternate spew mechanisms

2013-03-07 10:36:33 +01:00

conf.c

Fix cppcheck warning "Non reentrant function 'readdir' called"

2013-03-06 20:59:41 +01:00

conf.h

conf.h: make it more standard

2013-03-06 19:36:32 +01:00

drivers.h

'make style' and align some #preprocessor directives

2013-02-19 00:43:20 +01:00

iso7816.h

Use copyright format recommended by GNU project.

2012-10-21 14:09:16 +00:00

iso14443-subr.c

Use copyright format recommended by GNU project.

2012-10-21 14:09:16 +00:00

log_posix.c

Split logging internals so that platforms may choose additional or alternate spew mechanisms

2013-03-07 10:36:33 +01:00

log_win32.c

make style

2013-03-08 00:35:04 +01:00

log-printf.c

make style

2013-03-08 00:35:04 +01:00

log.c

Fix a typo detected by lintian(1)

2013-01-25 14:41:33 +01:00

log.h

Replace usb_set_debug() in utils by new group in LIBNFC_LOG_LEVEL

2013-03-02 23:43:37 +01:00

Makefile.am

Add log_posix to Makefile.am

2013-03-08 00:34:14 +01:00

mirror-subr.c

Use copyright format recommended by GNU project.

2012-10-21 14:09:16 +00:00

mirror-subr.h

Use copyright format recommended by GNU project.

2012-10-21 14:09:16 +00:00

nfc-device.c

nfc_device_new(): replace err() by return

2013-03-05 19:58:32 +01:00

nfc-emulation.c

Add timeout parameter to nfc_emulate_target() function.

2013-01-30 00:10:24 +01:00

nfc-internal.c

nfc_context_new(): replace err() by return, problem still in nfc_init()!!

2013-03-05 20:03:19 +01:00

nfc-internal.h

Convert by value passing of nfc_target to pointer for str_nfc_target and nfc_initiator_target_is_present

2013-03-07 09:16:33 +01:00

nfc.c

Merge branch 'master' into pn532_spi

2013-03-08 23:00:44 +01:00

target-subr.c

Windows: Clean up all compiler warnings and link warnings

2013-03-07 09:37:36 +01:00

target-subr.h

Convert by value passing of nfc_target to pointer for str_nfc_target and nfc_initiator_target_is_present

2013-03-07 09:16:33 +01:00