crewID/libnfc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1767 commits 2 branches 0 tags 2.9 MiB
Commit graph

428 commits

Author SHA1 Message Date
Ludovic Rousseau
551512ad54 Do not cast pointers to different size integers 
It will work only on little endian machines.

Fix clang warning
pn53x-tamashell.c:163:40: warning: cast from 'uint8_t *' (aka 'unsigned char *')
      to 'unsigned int *' increases required alignment from 1 to 4
      [-Wcast-align]
      size = sscanf(cmd+offset, "%2x", (unsigned int*)&byte);
                                       ^~~~~~~~~~~~~~~~~~~~
 2012-05-17 07:16:02 +00:00
Romuald Conty
cfd95bae2c Fix shadowed declaration warnings 2012-05-17 01:18:24 +00:00
Ludovic Rousseau
cf56496ee9 Fix compiler warning 
pn53x-sam.c:120: warning: enumeration value ‘PSM_NORMAL’ not handled in
switch
 2012-05-16 19:06:42 +00:00
Ludovic Rousseau
d28889c696 Remove now useless #define for getline() 
getline() is no more used. So no need to use this ugly hack.

This also solves a compiler warning;
In file included from ../libnfc/log.h:22:0,
                 from ../libnfc/chips/pn53x-internal.h:28,
                 from ../libnfc/chips/pn53x.h:31,
                 from pn53x-tamashell.c:68:
../config.h:153:0: warning: "_XOPEN_SOURCE" redefined [enabled by default]
/usr/include/features.h:165:0: note: this is the location of the previous definition
 2012-05-15 07:57:37 +00:00
Philippe Teuwen
7597055f26 fix typos 2012-05-14 19:44:03 +00:00
Romain Tartiere
e9b2f5729c Fix a bunch of warnings. 2012-05-14 13:47:31 +00:00
Romain Tartiere
2256d5d3dc Fix usage of possibly uninitialized 'result'. 
Can't tell how gcc/clang fail to detect this…
 2012-05-14 12:50:04 +00:00
Ludovic Rousseau
a2b022609f Fix some spelling mistakes 
Closes Issue #196
 2012-05-13 13:10:15 +00:00
Ludovic Rousseau
b5c1f2d619 Fix compiler warning 
nfc-dep-initiator.c:54: warning: no previous prototype for ‘stop_dep_communication’
 2012-05-13 12:54:37 +00:00
Ludovic Rousseau
6abb1c4eab Fix compiler warning 
nfc-dep-target.c:53: warning: no previous prototype for ‘stop_dep_communication’
 2012-05-13 12:51:57 +00:00
Ludovic Rousseau
edefdf0157 Fix compiler warnings 
nfc-emulate-forum-tag2.c:78: warning: no previous prototype for ‘stop_emulation’
nfc-emulate-forum-tag2.c:116: warning: no previous prototype for ‘nfcforum_tag2_io’
 2012-05-13 12:50:30 +00:00
Ludovic Rousseau
72ad8f7ad5 Remove an explicit cast and fix a compiler warning 
nfc-emulate-uid.c:125: warning: function declaration isn’t a prototype
 2012-05-13 12:49:28 +00:00
Ludovic Rousseau
714997fc34 Fix compiler warnings 
nfc-emulate-uid.c:70: warning: no previous prototype for ‘intr_hdlr’
nfc-emulate-uid.c:79: warning: no previous prototype for ‘print_usage’
 2012-05-13 12:48:28 +00:00
Ludovic Rousseau
96b1643522 Remove an explicit cast and fix a compiler warning 
nfc-emulate-tag.c:180: warning: function declaration isn’t a prototype
 2012-05-13 12:46:33 +00:00
Ludovic Rousseau
a7325ffded Fix compiler warnings: 
nfc-emulate-tag.c:65: warning: no previous prototype for ‘intr_hdlr’
nfc-emulate-tag.c:76: warning: no previous prototype for ‘target_io’
nfc-emulate-tag.c:139: warning: no previous prototype for ‘nfc_target_emulate_tag’
 2012-05-13 12:44:13 +00:00
Ludovic Rousseau
b65c133f80 stdin is already defined by stdio.h 
Fix compiler warnings:

pn53x-tamashell.c: In function ‘main’:
pn53x-tamashell.c:79: warning: nested extern declaration of ‘__stdinp’
pn53x-tamashell.c:79: warning: redundant redeclaration of ‘__stdinp’
/usr/include/stdio.h:164: warning: previous declaration of ‘__stdinp’
was here
 2012-05-13 12:42:51 +00:00
Ludovic Rousseau
e60f4ef870 Fix compiler warning 
pn53x-tamashell.c:106: warning: initialization discards qualifiers from
pointer target type
 2012-05-13 12:41:17 +00:00
Ludovic Rousseau
b3e21fecd2 Fix compiler warnings 
nfc-poll.c:57: warning: no previous prototype for ‘stop_polling’
nfc-poll.c:67: warning: no previous prototype for ‘print_usage’
 2012-05-13 12:39:17 +00:00
Ludovic Rousseau
da25554128 Remove an explicit cast and fix a compiler warning 
nfc-relay.c:107: warning: function declaration isn’t a prototype
 2012-05-13 12:38:18 +00:00
Ludovic Rousseau
43569e22e4 Fix compiler warnings 
nfc-relay.c:65: warning: no previous prototype for ‘intr_hdlr’
nfc-relay.c:73: warning: no previous prototype for ‘print_usage’
 2012-05-13 12:36:59 +00:00
Ludovic Rousseau
61ba0478cd Fix compiler warning 
pn53x-sam.c:56: warning: no previous prototype for ‘wait_one_minute’
 2012-05-13 12:32:30 +00:00
Romuald Conty
3eba0e9b54 Prepare libnfc 1.6.0-rc1 2012-03-01 12:00:23 +00:00
Audrey Diacre
3d393e58a9 add some Doxygen documentation. 2012-01-31 09:49:43 +00:00
Audrey Diacre
26245add73 Merge libnfc-1.5-new-api branch to trunk (r1168:1303). 2012-01-25 09:56:05 +00:00
Audrey Diacre
5a475cf074 add some whitespaces 2012-01-20 09:17:38 +00:00
Audrey Diacre
4c011279ff add context to nfc_init(), nfc_exit(), nfc_open() and nfc_list_devices() functions. 2012-01-18 16:22:06 +00:00
Audrey Diacre
207199dc34 examples, test and utils use now nfc_exit() function. 2012-01-18 11:36:18 +00:00
Audrey Diacre
1d55b6f8c6 examples, test and utils use now nfc_init() function. 2012-01-18 11:09:01 +00:00
Audrey Diacre
324af418db rename nfc_connect() function to nfc_open(). 2012-01-17 15:21:56 +00:00
Audrey Diacre
9eb37b3eee rename nfc_disconnect() function to nfc_close(). 2012-01-17 14:52:39 +00:00
Romain Tartiere
2d393bff91 Make these function accept no argument (instead of any). 2012-01-15 11:06:24 +00:00
Audrey Diacre
1ec504e163 nfc_list_devices() function returns now the number of devices found. 2012-01-10 10:35:36 +00:00
Audrey Diacre
00818e048c rx buffer size parameter of nfc_target_init() function is now a const size_t. 2012-01-09 11:26:57 +00:00
Audrey Diacre
c10b473361 rx buffer size parameter of pn53x_transceive() function is now a const size_t. 2012-01-09 10:24:00 +00:00
Romuald Conty
7df3bb5aeb various minor fixes/enhancements 2012-01-06 13:08:16 +00:00
Romuald Conty
48e92149e4 drop log4c support 2012-01-06 13:05:10 +00:00
Romuald Conty
22bea8d99b nfc_target_receive_*() need to know rx buffer size 2012-01-05 21:35:02 +00:00
Audrey Diacre
601105ef79 fix bad cast done in last revision. 2012-01-05 17:03:38 +00:00
Audrey Diacre
642f9a38f7 nfc_target_receive_bytes() function does not now use pszRx as parameter because this function returns it. 2012-01-05 16:33:55 +00:00
Audrey Diacre
7e7ee3299e nfc_target_receive_bits() function does not now use pszRxBits as parameter because this function returns it. 2012-01-05 15:50:07 +00:00
Audrey Diacre
239fd750c4 add timeout on nfc_target_init() and this function returns now received bytes count on success. 2012-01-05 15:10:11 +00:00
Audrey Diacre
c80ebdca25 nfc_abort_command() function returns now 0 on success and libnfc error code on failure and fix some warnings. 2012-01-05 14:49:02 +00:00
Audrey Diacre
81d76c8c70 check result of nfc_disconnect() function in examples/nfc-dep-initiator.c 2012-01-05 10:56:36 +00:00
Audrey Diacre
5a1f0c2115 check result of nfc_initiator_init() function in examples/ and utils/ 2012-01-05 10:33:50 +00:00
Romuald Conty
125553c72e verbose option back for nfc-list, and newly implemented in nfc-poll 2012-01-04 21:29:43 +00:00
Audrey Diacre
b699743973 nfc_initiator_transceive_bits_timed() function does not now use pszRxBits as parameter because this function returns it. 2012-01-04 15:43:08 +00:00
Audrey Diacre
6e7092b160 nfc_initiator_transceive_bits() function does not now use pszRxBits as parameter because this function returns it. 2012-01-04 15:30:42 +00:00
Audrey Diacre
0de1136037 nfc_target_receive_bits() function returns now received bits count on success and libnfc error code on failure. 2012-01-04 13:33:53 +00:00
Audrey Diacre
951dde8143 nfc_target_send_bits() function returns now sent bits count on success and libnfc error code on failure. 2012-01-04 13:27:15 +00:00
Audrey Diacre
61074f3497 nfc_initiator_transceive_bits() function returns now received bits count on success and libnfc error code on failure. 2012-01-04 11:46:07 +00:00
Romuald Conty
d6477df7a6 doc: quick start example minor fix (make distcheck OK) 2011-12-22 17:40:22 +00:00
Audrey Diacre
9c1371dcca nfc_target_send_bytes() function returns now sent bytes count on success and libnfc error code on failure. 2011-12-22 15:59:08 +00:00
Audrey Diacre
ac6f652368 nfc_target_receive_bytes() function returns now received bytes count on success and libnfc error code on failure. 2011-12-22 15:39:51 +00:00
Audrey Diacre
b864215d63 pn53x_initiator_poll_target() function returns now polled targets count on success. 2011-12-22 11:16:27 +00:00
Audrey Diacre
f93bc59504 nfc_initiator_select_passive_target() function returns now the selected passive targets count on success. 2011-12-21 11:33:21 +00:00
Audrey Diacre
c41d7de8ca nfc_initiator_select_dep_target() function returns nox libnf error code and fix some uses of nfc_initiator_transceive_bytes() function. 2011-12-21 09:15:44 +00:00
Audrey Diacre
0f5cc5683d nfc_initiator_poll_target() function returns now libnfc error code. 2011-12-20 15:46:35 +00:00
Audrey Diacre
9c5ec3c4e1 the following functions now return libnfc error code: 
_pn53x_write_register()
_pn53x_WriteRegister()
_pn53x_transceive()
_pn53x_SAMConfiguration()
_pn53x_PowerDown()
 _pn53x_InListPassiveTarget()
_pn53x_InDeselect()
_pn53x_InRelease()
_pn53x_RFConfiguration__*
 2011-12-20 11:25:33 +00:00
Audrey Diacre
103485518c nfc_initiator_select_passive_target() function returns now libnfc error code. 2011-12-19 16:27:50 +00:00
Audrey Diacre
ba2a7cfe2e nfc_target_init() function returns now 0 on succes and libnfc error code on failure. 2011-12-19 15:35:37 +00:00
Audrey Diacre
145cc4b2ad nfc_initiator_transceive_bytesfunction now returns libnfc error code on failure and received bytes count on success. 2011-12-19 14:37:22 +00:00
Romuald Conty
bf7c36d9bb less structs and defines publicly exposed 
- nfc_device is now an opaque type;
 - PN53x specific errors are not public anymore;
 - nfc_device_name() renamed to nfc_device_get_name() for the sake of consistency;
 - examples/*, utils/* uses the new nfc_device_get_name() function instead of access directly to struct's content;
 - new error defined: NFC_ERFTRANS for notifying about RF transmission error, its used by mifare.c to detect permissions error on mifare;
 - drivers initiator_transceive_bytes() function now returns libnfc's error code on failure (<0), and received bytes count on success (>=0);
 - remove some unused errors.
 2011-12-19 00:23:21 +00:00
Audrey Diacre
98355d36a7 nfc_initiator_init returns now error code and nfc_initiator_list_passive_targets returns now the number of targets found or error code. 2011-12-15 11:46:14 +00:00
Audrey Diacre
a615d969fd nfc_properties replace now nfc_options and nfc_configure is replaced by nfc_device_set_property_bool which returns error code. 2011-12-14 16:01:00 +00:00
Romuald Conty
90c05c7d13 Add a printf-based logging when log4c is not available (I experiemented some bugs using log4c) 2011-12-07 14:59:40 +00:00
Romuald Conty
c286eec920 DEP enhancements: 
- Add timeout on InJumpForDEP (pn53x) and initiator_select_dep (libnfc API)
- test_dep now works again (except 424Kbps)
- Fix ndi.ndm feeling when select a DEP target
Important: test_dep does not work on PN53x_USB devices after running previous tests
 2011-12-06 10:05:35 +00:00
Audrey Diacre
3b657ee547 quick_start_example1 is now compiled when running make check or distcheck (Fixes Issue 178) 2011-11-30 11:21:01 +00:00
Audrey Diacre
52bc5853d8 Remove whitespace after star symbol for pointers 2011-11-25 15:21:10 +00:00
Audrey Diacre
5c7454a2f7 Timeout is now integer. 2011-11-25 11:37:30 +00:00
Audrey Diacre
784a2f86a2 Change byte_t type to uint8_t (Fixes Issue 147) 2011-11-24 10:54:42 +00:00
Audrey Diacre
ce846931bc Move nfc-emulate-forum-tag2 from utils to examples. 2011-11-24 10:27:02 +00:00
Audrey Diacre
c718fafee7 Massive code clean up: (Fixes Issue 161) 
- Remove typedef from internal structs
- Remove _t suffix from types
- Fix tests using connstrings
 2011-11-23 15:55:40 +00:00
Romuald Conty
6752951084 Refresh quick_start_example1.c according to new API 2011-10-18 16:07:13 +00:00
Romuald Conty
55daa29a7c Allow to connect to a device using a connection string: 
- Provide a nfc_get_default_device() that allow to grab the connstring stored
   in LIBNFC_DEFAULT_DEVICE environnement variable or returns the first
   available device if not set;
 - nfc_connect(NULL) now takes the default device (see
   nfc_get_default_device());
 - Removes nfc_driver_desc_t from public types
 - Defines nfc_connstring as char[1024]
 - examples/*: use nfc_connstring
 - examples/nfc-poll: now uses only the default device (instead of all devices
   availables)
 - Removes parse_args() from nfc-utils.[hc]
 2011-10-17 13:03:56 +00:00
Romuald Conty
dccfd65c80 Add software polling for non-PN532 equipped device (Fixes Issue 136) 2011-10-03 11:19:08 +00:00
Romuald Conty
b2666dea15 windows port improved: 
- PCSC headers/libs are not a requierement sif you dont select ACR122 driver
 - uart_win32 implementation now handles timeouts
 2011-10-01 14:50:53 +00:00
Romuald Conty
d286a3c4b7 make distcheck OK 2011-10-01 13:29:18 +00:00
Romuald Conty
03a6f5e29c Update examples and utils manpages.(Fixes Issue 159) 2011-10-01 12:26:11 +00:00
Romuald Conty
8c7b61eaba move some examples to utils/ since they are not examples anymore :) (Fixes Issue 164) 2011-09-30 11:33:31 +00:00
Romuald Conty
8f7834c625 drivers/arygon,pn532_uart,pn53x_usb: all PN53x commands are now cancelable 2011-09-29 14:53:52 +00:00
Romain Tartiere
481fb4943f - Add timeout capablities to nfc_initiator_transceive_bytes(), nfc_target_send_bytes() and nfc_target_receive_bytes(); 
- Bump version to 1.5.1.
 2011-09-22 13:03:47 +00:00
Romain Tartiere
f6fc637d77 Soooo fragile :-)))) 2011-09-12 17:05:00 +00:00
Romuald Conty
580768a489 pn53x-diagnose: uses config.h if present 2011-09-12 14:46:58 +00:00
Adam Laurie
24881bd32d Fix accidental overwrite of Mifare special trailer block in unlocked read 2011-09-07 09:41:04 +00:00
Adam Laurie
028f310576 Unlocked read and format/wipe of special Mifare cards 2011-09-06 21:17:38 +00:00
Adam Laurie
1a07613ce2 -h usage explicitly state Chinese clone cards required for block 0 write 2011-09-06 11:00:01 +00:00
Adam Laurie
8d6f0d7321 Add man page for nfc-mfsetuid 2011-09-06 09:47:50 +00:00
Adam Laurie
e401f4ec4e Write special Mifare 1K cards, including Block 0 / UID 2011-09-05 14:40:56 +00:00
Romain Tartiere
752c247761 Add cast to fix build on 32bit systems. 2011-07-05 08:00:11 +00:00
Romuald Conty
3a1cb72681 examples/nfc-emulate-forum-tag2: add new example to emulate a NFC Forum Tag Type 2 2011-06-30 14:59:47 +00:00
Romuald Conty
10d9e30615 examples/nfc-emulate-forum-tag4: add document references. 2011-06-30 14:24:47 +00:00
Romuald Conty
eec2794d2d drivers/pn532_uart,arygon: Make valgrind happy with UART-based drivers 2011-06-28 13:16:44 +00:00
Romuald Conty
e6051ceca4 chip/pn53x: clean up SAMConfiguration usage. 2011-06-27 17:12:25 +00:00
Romuald Conty
0b42cbfb8f examples/nfc-emulate-forum-tag4: this example now fails with ENOTSUPP when used with a non-PN532 chip. 2011-06-27 09:14:19 +00:00
Romuald Conty
7b6baafd1d example/nfc-relay-picc: Move windows related code into contrib/win32 2011-06-27 08:56:38 +00:00
Romain Tartiere
4259f595ec Initialize DEP mode (nt.nti.ndi.ndm) to NDM_UNDEFINED. 2011-06-26 14:43:11 +00:00
Philippe Teuwen
80a5ad1fd6 More attempt to support Sony S360 reader 
Initialisation of RC-S360 in mode 0
Better generic nfc-list, does not rely only on DeSelect to avoid duplicates
Restore SetParameters for RC-S360
Handle Diagnose communication test properly

Tested:
    - nfc-list          => ok except for B' & 3B
    - nfc-anticol       => fails to send raw frames before select
    - nfc-mfultralight  => ok
    - nfc-mfclassic     => ok
    - pn53x-tamashell   => ok
    - pn53x-diagnose    => ok
    - nfc-dep-initiator => ok
    - nfc-dep-target    => fails in InitAsTarget
    - nfc-emulate-*     => fails in InitAsTarget

Commands momentarily disabled for RC-S330:
    - InDeselect
    - InRelease
    - select_passive_target for B'& 3B
 2011-06-07 20:36:20 +00:00
Philippe Teuwen
cbbda20018 nfc-anticol: -f option to force RATS 2011-06-07 18:47:20 +00:00
Philippe Teuwen
f4c3d9d4ed nfc-mfclassic: handle 7-byte UID cards & MFC Mini 2011-05-26 22:49:45 +00:00
Philippe Teuwen
96538d052b Extend max length for firmware description & fix typo 2011-05-25 19:53:45 +00:00