Commit graph

1722 commits

Author SHA1 Message Date
Alex Lian
ef33827f04 Fix setenv/unsetenv link errors by implementing a local version using Windows SetEnvironmentVariable.
Untested, and does not comply with the error returns per setenv.
2013-01-31 15:52:39 +01:00
Alex Lian
9f682cc52b Fix enabling of LIBNFC_DEBUG_OUTPUT
- inclusion of log-printf.c didn't align with needed preprocessor definitions
- Added extra #error as well as preprocessor protection
- fixed CMakeList to specify -DLOG as appropriate per the header log.h usage
2013-01-31 15:52:39 +01:00
Alex Lian
eb90c5a8db Add CMake options for Win32 to require PCRE 2013-01-31 15:52:39 +01:00
Alex Lian
ef82a1e4d4 For Windows MinGW address the "ISO C99 requires rest arguments to be used" error 2013-01-31 15:52:39 +01:00
Philippe Teuwen
8bc7a1c291 call idle() from driver-dependent close() rather than from nfc_close() as some driver still need to do an ack() before 2013-01-31 01:18:23 +01:00
Philippe Teuwen
683505f39b pn53x_idle: call driver-dependent PowerDown & do InRelease first, skip redundant InDeselect 2013-01-31 01:16:37 +01:00
Philippe Teuwen
1682a86166 Add driver-dependent PowerDown 2013-01-31 01:15:03 +01:00
Philippe Teuwen
db8033622a acr122_pcsc: fix log category 2013-01-31 01:08:23 +01:00
Philippe Teuwen
f7010faf18 Changelog 2013-01-31 01:05:28 +01:00
Philippe Teuwen
5446242094 acr122_usb: remove pn53x_idle support. Fixes issue #217 2013-01-30 01:27:18 +01:00
Romuald Conty
a303b9e33c Updates ChangeLog 2013-01-30 01:15:41 +01:00
Romuald Conty
98948172b4 Fixes pn53x_usb timeout while bulk write.
Thanks to Tredger for reporting.

Fixes issue 223.
2013-01-30 00:57:06 +01:00
Romuald Conty
cd2b03a08a Add timeout parameter to nfc_emulate_target() function.
Fixes issue 219.

Thanks to raidolinja.
2013-01-30 00:10:24 +01:00
Philippe Teuwen
b675db73be nfc-scan-device: fix option -i 2013-01-29 13:52:53 +01:00
Romuald Conty
4b97700352 Removes exit() calls
Fixes issue 220

exit() was used to run abort-driven development while API changed, I forgot to remove them, sorry for that :-)
2013-01-28 13:57:40 +01:00
Alex Lian
88fd42a89d Windows: Fix nfc-scan-device to compile by linking in contrib/nfc_win32.c
Re-factored the executable call with a list that is created, so that its easier to modify per tool.
2013-01-27 23:24:03 -05:00
Alex Lian
3c9cfc5036 Windows: getopt usage in nfc-read-forum-tag3 fixed by referencing correct header 2013-01-27 23:22:35 -05:00
Alex Lian
5aab7513cf Fix all utils compilation on windows.
- As nfc-utils now references str_nfc_target from the lib itself, so the static lib was not properly referencing the libnfc itself, so the final utility link would fail.
- Simply added the libnfc as a target for the static nfcutils library internal to cmake
2013-01-27 23:08:22 -05:00
Alex Lian
fa3ca0ab62 Fix setenv/unsetenv link errors by implementing a local version using Windows SetEnvironmentVariable.
Untested, and does not comply with the error returns per setenv.
2013-01-27 22:34:58 -05:00
Alex Lian
1e184f95e4 Fix enabling of LIBNFC_DEBUG_OUTPUT
- inclusion of log-printf.c didn't align with needed preprocessor definitions
- Added extra #error as well as preprocessor protection
- fixed CMakeList to specify -DLOG as appropriate per the header log.h usage
2013-01-27 21:55:34 -05:00
Alex Lian
21302147a9 Add CMake options for Win32 to require PCRE 2013-01-26 18:43:58 -05:00
Alex Lian
ebab43d532 For Windows MinGW address the "ISO C99 requires rest arguments to be used" error 2013-01-26 18:42:56 -05:00
Philippe Teuwen
3d580dc3ec Missing ref to nfc-scan-device.1 in debian/libnfc-bin.install 2013-01-25 16:09:27 +01:00
Ludovic Rousseau
2faa532826 Fix a typo detected by lintian(1)
unkown -> unknown
2013-01-25 14:41:33 +01:00
Nobuhiro Iwamatsu
df51859d74 Add debian's changelog
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2013-01-25 14:26:49 +01:00
Nobuhiro Iwamatsu
2bcca34a59 Add myself to copyright
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2013-01-25 14:26:49 +01:00
Nobuhiro Iwamatsu
8d32b00af2 Change Maintainer filed to myself
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2013-01-25 14:26:49 +01:00
Nobuhiro Iwamatsu
c0b10139e2 Fix package version for debian/changelog
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2013-01-25 14:26:49 +01:00
Nobuhiro Iwamatsu
edf540bb71 Remove *.la from debian/libnfc-dev.install
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2013-01-25 14:26:49 +01:00
Nobuhiro Iwamatsu
103a67fb75 Remove libusb-0.1-4 from Depends
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2013-01-25 14:26:49 +01:00
Nobuhiro Iwamatsu
2db7087041 Add support multiarch
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2013-01-25 14:26:49 +01:00
Nobuhiro Iwamatsu
c8e2d39cbc Update debhelper version to 8
This is not update to 9. Because I think about backport and use in
Squeeze (Debian 6.0).

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2013-01-25 14:26:49 +01:00
Nobuhiro Iwamatsu
09e9a532d9 Enable varbose build log
If we enable varbose build log, hardening checking is easy.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2013-01-25 14:26:49 +01:00
Nobuhiro Iwamatsu
a6301e4310 Update Standards-Version to 3.9.4
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2013-01-25 14:26:49 +01:00
Ludovic Rousseau
109d496222 Compilation: Change the order of arguments
Put the -lnfc at the end of the command lie to avoid undefined
references on Ubuntu 12.04.

Close #219
2013-01-25 14:18:28 +01:00
Philippe Teuwen
5876e33e49 Fix returned value ((res=f()<0)) => ((res=f())<0); this solves a bug in nfc-relay-picc 2013-01-22 00:56:34 +01:00
Philippe Teuwen
0ac3b26982 nfc-relay-picc: Fix received bytes count 2013-01-22 00:54:47 +01:00
Philippe Teuwen
9815ac728f nfc-emulate-uid: fix BCC 2013-01-22 00:45:42 +01:00
Romuald Conty
49d7ce61f3 Debian package uses the default configure script 2013-01-20 17:00:57 +01:00
Romuald Conty
ca7d01ade3 Enables pn532_uart driver by default 2013-01-20 17:00:21 +01:00
Philippe Teuwen
edacadbce6 make style 2013-01-20 15:48:32 +01:00
Philippe Teuwen
ea05559fa5 Prepare for version 1.7.0-RC2 2013-01-20 15:45:57 +01:00
Philippe Teuwen
84af758877 Add /etc/nfc/devices.d/ example in NEWS 2013-01-20 15:41:53 +01:00
Philippe Teuwen
532b30a2cd Merge branch 'test_user_defined_device_optional'
* test_user_defined_device_optional:
  Fix double malloc
  Allow device.optional=true to tolerate missing device
2013-01-20 15:36:29 +01:00
Philippe Teuwen
bcd53a7cdc Fix double malloc 2013-01-20 15:24:03 +01:00
Philippe Teuwen
4576bad369 Fix ISO14443B' ATS broken by updated API 2013-01-19 00:14:19 +01:00
Philippe Teuwen
04a7d2a3ba Allow device.optional=true to tolerate missing device 2013-01-18 22:54:44 +01:00
Philippe Teuwen
24fed18590 Require cutter >=1.1.7 rather than >=1.1.8 2013-01-18 22:48:24 +01:00
Romuald Conty
2d53208082 Fix unit tests
This commit bring tests to life!

New issue
Summary: test_dep_states test fails
When first device is idle, the second one states  "RF Transmission Error" instead of simply not found any available device.
Full cutter log here:

debug   libnfc.chip.pn53x       InJumpForDEP
debug   libnfc.chip.pn53x       Timeout values: 300
debug   libnfc.bus.uart TX: 00  00  ff  05  fb  d4  56  00  00  00  d6  00
debug   libnfc.bus.uart RX: 00  00  ff  00  ff  00
debug   libnfc.chip.pn53x       PN53x ACKed
debug   libnfc.bus.uart Timeout!
debug   libnfc.chip.pn53x       InJumpForDEP
debug   libnfc.chip.pn53x       Timeout values: 300
debug   libnfc.bus.uart TX: 00  00  ff  05  fb  d4  56  00  00  00  d6  00
debug   libnfc.bus.uart RX: 00  00  ff  00  ff  00
debug   libnfc.chip.pn53x       PN53x ACKed
debug   libnfc.bus.uart RX: 00  00  ff  03  fd
debug   libnfc.bus.uart RX: d5  57
debug   libnfc.bus.uart RX: 01
debug   libnfc.bus.uart RX: d3  00
debug   libnfc.chip.pn53x       Chip error: "Timeout" (01), returned error: "RF Transmission Error" (-20))
F
===============================================================================
Failure: test_dep_states
Problem with nfc_idle
<0 == res>
expected: <0>
  actual: <-20>

diff:
? -20

./test_device_modes_as_dep.c:171: initiator_thread(): cut_assert_equal_int(0, res, cut_test_context_set_current_result_user_message( cut_test_context_current_peek(), cut_test_context_take_printf(cut_test_context_current_peek(), "Problem with nfc_idle")))
===============================================================================
2013-01-18 18:28:45 +01:00
Romuald Conty
443f70dd65 Fix wrong condition to display a warning when user disables autoscan 2013-01-18 18:14:59 +01:00