jarjar/libnfc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
710 Commits 3 Branches 26 Tags
4a50be27de9c142c9944ac77c082aa25afb2bd6a
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Romuald Conty 4a50be27de Add a iso14443a function to extract Historical Bytes from ATS 2010-10-14 17:32:15 +00:00
Romuald Conty 8142e69121 Fix a misunderstood Historical Bytes decoding 2010-10-14 16:28:16 +00:00
Romuald Conty 7c76e1bf32 nfc_target_init() now update nfc_target_t baud rate 2010-10-14 16:27:50 +00:00
Romuald Conty 7294e4fbaf examples/nfc-utils: decode more ATS info 2010-10-14 14:48:59 +00:00
Romuald Conty 507a23b708 Improve nfc_target_init() 2010-10-14 13:31:36 +00:00
Romuald Conty 60c9da598a Support different baud rates for nfc_initiator_select_dep_target() 2010-10-14 13:03:23 +00:00
Romuald Conty 2f267f5463 nfc-relay-picc: Add new example to relay ISO14443-4 communications, with this one it can communicate over network... Enjoy! (Thanks to generous contributor) 2010-10-14 12:27:51 +00:00
Romuald Conty af88da1a9c Replace nfc_target_info_t with nfc_target_t in API function, we now have a coherent struct to handle nfc_target_t, use it! 2010-10-14 11:44:43 +00:00
Romuald Conty 6f3fbcb6bf Fix nfc_dep_mode_t usage in API, fix/improve documentation 2010-10-14 11:12:23 +00:00
Romuald Conty f559838352 MERGE (less-strange-types): Clean up libnfc's types. 
* Old nfc_modulation_t became pn53x_modulation_t (not accessible from API);
  * Old nfc_target_type_t became pn53x_target_type_t (not accessible from API);
  * New nfc_modulation_type_t (NMT_ISO14443A, NMT_ISO14443B, NMT_JEWEL, etc.);
  * New nfc_baud_rate_t (NBR_106, NBR_212, etc.);
  * New nfc_modulation_t that contains a couple { nfc_modulation_type_t, nfc_baud_rate_t };
  * nfc_target_t now have nfc_modulation_t instead of the old strange nfc_target_type_t;
  * Move some pn53x oriented code from nfc.c to chips/pn53x.c (pn53x_initiator_select_passive_target);
  * New nfc_dep_mode_t type to handle ACTIVE/PASSIVE mode of DEP;
  * Split logical part and wrapping part for InAutoPoll;
  * Add conversion functions: nfc types to pn53x types, and vice versa;
  * examples/nfc-utils: Add print_nfc_target() and str_nfc_baud_rate() to display nfc_target_t;
  * Add manual test results.
 2010-10-14 10:28:01 +00:00
Romuald Conty 3146c4c150 update manual-test-results.txt 2010-10-13 22:56:29 +00:00
Romuald Conty 7703c9672d sort manual-test-results.txt 2010-10-13 22:54:17 +00:00
Romuald Conty 9c075a98d1 Add manually done test results. 2010-10-13 22:40:42 +00:00
Romuald Conty d41e7f2ca0 Hack polling modulations in order to have ISO14443-4 with ATS and ISO14443-3 targets 2010-10-13 22:28:29 +00:00
Romuald Conty 3c4972b9a3 Add TODO 2010-10-13 22:26:17 +00:00
Romuald Conty 9d9b5a629e Fix nfc-poll, improve pn53x_target_type_t decoding 2010-10-13 21:40:54 +00:00
Romuald Conty adba90684d introduce nfc_dep_mode_t type instead of bool in nfc_initiator_select_dep_target() 2010-10-13 19:59:39 +00:00
Romuald Conty 124cc28bac Typo 2010-10-13 19:51:21 +00:00
Romuald Conty f2a3d51037 Fix a bug introduce in r729, fix a compilation warning 2010-10-13 19:50:43 +00:00
Romuald Conty ec601f6a00 Fix two bugs introduced in r729, typo. 2010-10-13 19:31:02 +00:00
Romuald Conty d67527932c Add some FIXME/TODO about PN532 that does not supported B type (ISO14443) 2010-10-13 19:24:24 +00:00
Romuald Conty 979430ecd1 nfc_target_t have now nfc_modulation_t instead of nfc_modulatation_type_t 2010-10-13 19:17:51 +00:00
Romuald Conty 584a18ec11 Remove unused pn53x_modulations 2010-10-13 18:41:48 +00:00
Romuald Conty d289eabc36 Attempt to provide clean types for API 2010-10-13 17:43:23 +00:00
Romuald Conty 9020014160 Rename nfc_modulation_t as pn53x_modulation_t 2010-10-13 15:39:52 +00:00
Romuald Conty 695e5c2f37 Rename nfc_target_type_t as pn53x_target_type_t 2010-10-13 15:31:48 +00:00
Romuald Conty c53c512831 Change some nfc_target_type_t to insist on the ISO/IEC 14443-4 compliance 2010-10-13 11:49:34 +00:00
Romuald Conty 0fe30e3db7 Change some nfc_target_mode_t to insist on the restrictions offer these mode 2010-10-13 11:35:28 +00:00
Romuald Conty 61b0df5fe9 Minor documentation fix 2010-10-12 15:34:37 +00:00
Romuald Conty c34be50ef1 For the sake of consistency, rename all szRxLen to szRx and szTxLen to szTx 2010-10-12 14:56:42 +00:00
Romuald Conty 5d753827c1 Add a nfc-utils fonction (not in API) to display nfc_target_type_t as string 2010-10-12 14:05:28 +00:00
Romuald Conty 202c2a7a8b nfc-emulate-uid: fix wrong UID length in initial nfc_target_t 2010-10-12 14:04:30 +00:00
Romuald Conty d7bffac0e6 Fix const bytes notation, string notation will add EOL ('\0') 2010-10-12 14:02:53 +00:00
Romuald Conty b333a4b1cf Add FeliCa to emulation capabilities 2010-10-12 09:44:39 +00:00
Romuald Conty c67d915250 Attempt to fix pcsc-lite detection on MacOS 2010-10-12 08:20:46 +00:00
Romuald Conty 2857b1dd1a Remove a wrong FIXME 2010-10-11 14:53:10 +00:00
Romuald Conty 602787bd03 We can now use an nfc_dep_info_t to specify DEP info as initiator. 2010-10-11 14:49:08 +00:00
Romuald Conty 6e932142f0 arygon: send ACK frame for ARYGON devices too. 2010-10-11 10:54:49 +00:00
Romuald Conty 0bdef6cb2a pn532_uart: send ACK frame to cancel a eventual previous command during nfc_connect() too. 2010-10-11 10:53:24 +00:00
Romuald Conty 49e6fff104 pn532_uart: start with sending an ACK frame to cancel a eventual previous command. 2010-10-11 10:41:03 +00:00
Romuald Conty 08b06c1d03 Emulated DEP targets can now be customized (NFCID3 and General Bytes). 2010-10-08 21:54:59 +00:00
Romuald Conty b8395d9506 Rename nfcip-* examples to nfc-dep-* 2010-10-08 20:36:13 +00:00
Romuald Conty 1e9c390dfa Improve DEP info struct: add more info, and InJumpDEP now fill fully this struct. 2010-10-08 20:25:34 +00:00
Romuald Conty 74a8ebde41 nfcip-*: Add man pages. 2010-10-08 18:28:23 +00:00
Romuald Conty 13d0bb7b0f nfcip-*: code clean up, enhance output to understand what happens. 2010-10-08 18:15:00 +00:00
Romuald Conty bf1f9c68d3 nfc-list: remove some useless calls to nfc_configure(), these settings are applied by default. 2010-10-08 18:13:18 +00:00
Romuald Conty aeadaf536c nfc-poll: code clean up, add man page. 2010-10-08 17:05:05 +00:00
Romuald Conty 8ec4c57910 pn53x-diagnose: add man page. 2010-10-08 16:57:09 +00:00
Romuald Conty 9b3dbc272c Update existing man pages. 2010-10-08 16:24:04 +00:00
Romuald Conty 994b119c32 nfc-emulate-forum-tag4 (renamed from nfc-emulate-ndef): add a man page. 2010-10-08 15:37:21 +00:00
Romuald Conty fd211d53f8 nfc-emulate-tag: improve documentation, add a man page. 2010-10-08 14:45:48 +00:00
Romuald Conty 993a16f17c nfc-emulate-uid: finalize renaming. 2010-10-08 14:10:28 +00:00
Romuald Conty 79ebce2549 examples: rename nfc-emulate to nfc-emulate-uid. 
Add some code documentation.
Update man page.
 2010-10-08 14:05:10 +00:00
Romuald Conty 69bf5caa9d Enforce sources cleaning before tarball build. 2010-10-08 13:52:19 +00:00
Romuald Conty 1565d540a8 Remove useless FIXME 2010-10-07 13:00:57 +00:00
Romuald Conty 840ff89450 Fix minor warnings 2010-10-07 12:59:12 +00:00
Romuald Conty 814ccad1e3 Only send WriteRegister command if register sent value is different from actual one. 2010-10-07 09:46:21 +00:00
Romuald Conty b8d65f9b27 Keep the last byte as \0 to be sure abtFw will be null-terminated. Fixes an issue I have with my ACR122U205: the last char of the firmware string was changing each nfc-list launch. 2010-10-06 17:52:15 +00:00
Romuald Conty d9505bbbcc Better handling of SetParameters command, use a cache, prevent from double set, adjust comments, remove junk code. 2010-10-06 15:12:33 +00:00
Romuald Conty 623c8bbeef Remove useless FIXME 2010-10-06 10:11:24 +00:00
Romuald Conty da7a2bc4c6 Add ISO/IEC 14443B baud rates: 212, 424 and 847 kbps. Set a device error when using a not supported modulation baud rate in InListPassive(). 2010-10-06 10:06:12 +00:00
Romuald Conty e03fb8a916 Minor code clean up. 2010-10-06 10:02:12 +00:00
Romuald Conty 5fdb7ab254 examples: rename nfc-sam to pn53x-sam, it need to made some direct calls to pn53x_* functions. 2010-10-06 09:10:14 +00:00
Romuald Conty ec3f854a68 nfc-sam: code clean up and fix comments 2010-10-06 09:03:08 +00:00
Romuald Conty 98d0f2522f nfc-emulate-tag: add DESELECT command, enhance debug 2010-10-04 19:17:40 +00:00
Romuald Conty e800765ffc nfc-emulate-ndef: remove one pn53x_set_parameters(). Note: it works a lot better with ARYGON (serial @9600 bauds) than touchatag through PCSC and USB. 2010-10-04 18:12:57 +00:00
Romuald Conty ad7a8a59a6 nfc-emulate: Use a better const byte_t notation (no \0 EOL character). 2010-10-04 18:00:17 +00:00
Romuald Conty e9fdccfa63 Fix missing renaming. 2010-10-04 16:34:02 +00:00
Romuald Conty 178f73d98a nfc-sam: NTM_PICC does exist anymore and I dont think thats needed to all but ISO14443-4 initiator in this place. 2010-10-04 13:30:12 +00:00
Romuald Conty da1de80aa6 nfc-emulate-ndef: use nfc_target_receive_bytes() instead of pn53x_target_receive_bytes(), adjust NTM_PICC new name 2010-10-04 13:28:36 +00:00
Romuald Conty 92cc9a5736 Add non restrictive mode for emulation (NTM_NORMAL), fix comments, rename NTM_PICC to insist on "ISO14443-4" PICC mode. 2010-10-04 13:26:47 +00:00
Romuald Conty 5233fceda7 Improve the target emulation functions (ATM, only ISO14443A), add an example (nfc-emulate-tag), update examples to use the new API. 2010-10-04 12:46:03 +00:00
Romuald Conty d2d15afa3b examples: minor enhancements 2010-10-04 12:43:22 +00:00
Romuald Conty afb1c3a0f8 examples: minor enhancements 2010-10-04 12:37:43 +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 ae522c843c nfc-sam: fix author fields (name and email). 2010-10-01 16:30:38 +00:00
Romuald Conty f31cb6193b Minor man pages update. 2010-10-01 14:27:39 +00:00
Romuald Conty 4a3a185857 Fix bad indent 
Update issue 84
Indent insert some blank lines.
 2010-10-01 11:00:27 +00:00
Romuald Conty bf995b3c4e nfc-emulate-ndef: change Tx/Rx message to prevent from mixing with TX/RX from debug mode, add the first receive datas. 2010-09-30 16:02:02 +00:00
Romuald Conty b53b623c38 Split pn53x_target_init() into TgInitAsTarget command wrapper and the "logical" part 2010-09-30 12:51:13 +00:00
Romuald Conty 33e42f389a Detect PN53x USB devices before ACR122. 
This change is needed by the fact that ACR122 use PCSC framework, and PCSC try to detect more than ACR122 devices, this reduce the connection speed (Plus, one some systems pcscd is not launched at boot time, its launched when some application access to using libpcsclite.)
 2010-09-30 10:32:44 +00:00
Romuald Conty 6b679862e7 Fix bad indent. 
Update issue 84
Current indent command push these comments the next line.
 2010-09-30 10:27:34 +00:00
Romuald Conty 10f9a3d2b0 PN531 and PN533 does not support NTM_PICC mode 2010-09-30 08:37:46 +00:00
Romuald Conty 3c5e815ddd nfc-emulate-ndef: remove minor compilation warnings, add a FIXME to remove pn53x specific code in this example. 
New issue
Summary: Remove pn53x specific from nfc* examples
Labels: Priority-Low Milestone-1.4.x
Examples provided by libnfc should show the "right" way to use libnfc and to use pn53x specific (and non public) functions is not a good pratice.
There can be some exceptions only if its really dedicated to one kind of chip and the example name have to follow the format "chip-function" instead of usual "nfc-function". (e.g. pn53x-diagnose)
 2010-09-30 08:36:49 +00:00
Romuald Conty 68879ba255 Fix bad indent. 
Update issue 84
Status: Reopened
Currently, indent trucate long line which make the code almost unreadable.
 2010-09-30 08:14:21 +00:00
Romuald Conty 3cd0860203 nfc-emulate-ndef: minor clean up, improve error debugging. 2010-09-29 15:26:17 +00:00
Romuald Conty 4d880e6ce8 Enhance documentation and fix typo. 2010-09-29 14:26:06 +00:00
Romuald Conty 89971c9036 Update human readable ChangeLog 2010-09-29 12:41:46 +00:00
Romuald Conty a9b8b84e13 Build nfc-emulate-ndef example 2010-09-29 11:08:06 +00:00
Romuald Conty 2318182c2c Remove minor warning. 2010-09-29 09:59:02 +00:00
Romuald Conty 0c72e7ed1a Workaround to prevent from USB toogle bit issue discussed on Issue 114. 
Update issue 114
Status: Fixed
Owner: yobibe
This workaround allow to use PN533 USB (like SCL3711) without toogle bit issue (on OSes that care about this toogle bit: e.g. GNU/Linux, MacOS).
libfreefare tests suite now works as expected, enjoy!
 2010-09-29 09:57:50 +00:00
Romuald Conty 5efa9e2cdb Jewel/Topaz full UID is 6 bytes long (7 bytes with the manufacturer ID) but during select only the 4 LSB are returned, so we change the display to keep it in mind. (Thanks to Phil) 2010-09-28 15:37:36 +00:00
Romuald Conty 8672c809bd example: Jewel support in nfc-list and nfc-poll. (Many thanks to Phil) 2010-09-28 15:31:31 +00:00
Romuald Conty cab6d19c5a examples: decode more data from ATQB. (Thanks to Phil) 2010-09-28 15:27:06 +00:00
Romuald Conty 15f3609eaf nfcip-target: add an hack to allow to use two devices on the same machine. (Thanks to Phil) 2010-09-28 15:24:05 +00:00
Romuald Conty 7a7687b3b8 Hack that allow to re-use PN53x (connected in USB) when something goes wrong. 
New issue
Summary: Implement the abort mechanism (PCD->PICC ACK)
Currently, this issue is motivated by the need to reconnect to the device after a failure: ie. Issue 114.
BTW, this feature could also be useful to break an infinite polling or to cancel a previously sent command.
 2010-09-28 15:15:36 +00:00
Romuald Conty 6d47171bdc Attempt to fix MacOS build. 2010-09-28 09:59:51 +00:00
Romuald Conty 1acf950ce9 Improve ISO14443B display: some protocol information are now decoded to be displayed. 2010-09-23 17:03:19 +00:00
Romuald Conty 2f95fb254b Improve ATQB decoding: "PUPI", "Application Data", and "Protocol Info" is now available as separated fields. 2010-09-23 16:26:06 +00:00