Commit graph

181 commits

Author SHA1 Message Date
Romuald Conty
56219ced36 Fix CMake build. 2009-12-01 11:39:35 +00:00
Romuald Conty
f9f49cc0d0 Fix r217 build. 2009-12-01 10:44:31 +00:00
Romuald Conty
8a3b8bb3c9 - Avoid null pointers in the USB structures in some circumstances with Windows and libusb;
- In case of error, don't stop but look for other readers (was partly done, now on all errors)
 - In case of error on a specifically requested reader, fail & stop, don't look further.
2009-12-01 10:07:30 +00:00
Romuald Conty
a56a217ca9 Support for the generic vendorid/productid of the NXP chip. 2009-12-01 09:45:01 +00:00
Romuald Conty
0286eeecdd Simply turns off the RF field upon exit. 2009-12-01 09:31:29 +00:00
Adam Laurie
a3431c8e4c fix what looks like accidental editor mangling so it can compile 2009-11-30 20:18:09 +00:00
Romuald Conty
3ff80e55c4 Fix Issue 48: nfc-mfultralight's output should be more clear (Thanks to Zuck) 2009-11-27 17:02:53 +00:00
Romuald Conty
9b2246930e Fix Issue 38: nfc-mfclassic's output should be more clear (Thanks to Zuck) 2009-11-27 16:51:39 +00:00
Romuald Conty
0f0c9abe24 Prepare next release.
Update Debian packages.
Set svn:ignore properties.
2009-11-27 15:44:25 +00:00
Romain Tartiere
92cdc705cd Avoid blocking operations in acr122_list_devices.
The various SCardConnect() can block if a device is already opened in PC/SC potentially leading to deadlocks.  Avoiding using this and matching the device name against a list of supported devices instead.
2009-11-25 02:55:05 +00:00
Romain Tartiere
21df72269a Reindent; Fix ACR122 driver [1]; make distcheck OK.
Pointy hat to:   me [1]
2009-11-24 18:05:31 +00:00
Romain Tartiere
4e50bf7a8b Fix ACR122 with firmware > 2.0 support. 2009-11-24 17:58:07 +00:00
Romain Tartiere
220bef3490 ACR122 devices support enhancements.
- Add driver agnostic nfc_pick_device(), nfc_list_devices();
  - New API function: nfc_list_devices();
  - PCSC Context sharing for acr122 driver;
  - List all devices in nfc-list(1);
  - Various code fixes and cleanup;
  - Remove warnings when compiling;
  - Merge r191:199 from trunk \_°< Coin!
2009-11-24 17:49:24 +00:00
Romain Tartiere
1af29561e8 Add device listing capabilities
- acr122: add acr122_pick_device(), acr122_list_devices();
  - Add device name to device descriptions (nfc_device_desc_t) to select a given PCSC device;
  - Use constants for driver names;
  - Various code cleanups and enhancements.
2009-11-24 13:03:48 +00:00
Romuald Conty
1e5658eeba Make distcheck OK.
Add SVN revision to libnfc version (if available).
2009-11-20 13:43:18 +00:00
Romuald Conty
877176c98f Attempt to extract PN53x related code for nfc.c.
multichip> chips sub-folder introduction with pn53x.h/c.
2009-11-20 11:27:07 +00:00
Romuald Conty
483c69dd03 Rename tag_info to nfc_target_info_t.
Rename init_modulation to nfc_modulation_t.
2009-11-18 11:52:18 +00:00
Romuald Conty
2feedddbfe Rename dev_config_option to nfc_device_option_t.
Use NULL instead of INVALID_DEVICE_INFO to know if device is valid (all occurences are now replaced).
2009-11-18 11:11:06 +00:00
Romuald Conty
2a0ff6c5d0 Rename chip_type to nfc_chip_t.
Rename dev_spec to nfc_device_spec_t.
Update configure.ac and autotools related files.
2009-11-18 10:52:13 +00:00
Romuald Conty
8a579c3aab merge with trunk r183:184. 2009-11-18 09:35:50 +00:00
Roel Verdult
48621a7883 uart proper timeval struct restore for linux select() implementation 2009-11-14 00:47:11 +00:00
Roel Verdult
365d60ce4a added support for recv/send of larger data chunks (>default_os_buffer) 2009-11-13 21:12:51 +00:00
Romuald Conty
aa8bb42d9f Remove nfc-defines.h public header.
Use NULL instead of INVALID_DEVICE_INFO to know if device is valid.
Make distcheck OK
2009-11-10 09:47:59 +00:00
Romuald Conty
9fccd11fc7 merge with trunk r178:179. 2009-11-09 13:30:59 +00:00
Romuald Conty
854dc3aceb Prefix defines.h, messages.h and types.h headers by "nfc-"
Rename dev_info struct to nfc_device_t
Some code cleanup
Rename pn531.h/c to pn531_usb.h/c
Rename pn533.h/c to pn533_usb.h/c
2009-11-09 11:23:33 +00:00
Romuald Conty
fabdf4214a Fix Issue 46 and Issue 47. Many thanks to ud. 2009-11-09 09:39:38 +00:00
Romuald Conty
473965d3a6 It now works on MacOS. 2009-11-04 14:55:24 +00:00
Romuald Conty
c9689c74fb It cow compile using CMake. 2009-11-04 12:03:49 +00:00
Romuald Conty
06a76f6470 Attempt to make it works on MacOS. Small fixes. CMake work started. 2009-11-04 10:42:53 +00:00
Romuald Conty
14a9112dea It now compile using Autotools. 2009-11-04 10:14:17 +00:00
Romuald Conty
4a5945e67d Third attempt to reorganize tree. 2009-11-03 15:53:35 +00:00
Romuald Conty
507991ac2b Second attempt to reorganize tree 2009-11-03 15:20:36 +00:00
Romuald Conty
ab62855d80 First attempt to reorganize tree. 2009-11-03 14:51:14 +00:00
Romuald Conty
9d7369e234 Fix Issue 45: nfc_target_init doesn't correctly reset the parity during initalization. Thanks to Mike Auty. 2009-11-02 17:06:55 +00:00
Romuald Conty
39a1e1fd11 Add function to return library version at execute time. Fix Issue 39. Thanks to Zuck for his contribution.
Remove compilation warning due to missing includes in examples.
2009-11-02 14:05:03 +00:00
Romuald Conty
edec0ae3da Attempt to fix Issue 44. 2009-11-02 11:50:40 +00:00
Romuald Conty
c6a7e2bf47 Rename nfc-mftool to nfc-mfclassic.
Rename nfc-mfultool to nfc-mfultralight.
Remove compilation warnings due to missing includes.
"make distclean" now clean Makefile.in.
2009-11-02 11:34:58 +00:00
Romuald Conty
cd43b758d4 Fix Issue 36. Thanks to Roger Brown. 2009-11-02 08:19:33 +00:00
Romuald Conty
5a7c561d48 Add C++ compatibility, this fix Issue 16. 2009-11-02 07:46:29 +00:00
Romuald Conty
cc5545e8b4 Include missing examples headers when "make install". 2009-10-29 16:44:58 +00:00
Romuald Conty
4962f932fb Update nfc-mftool output with new available action. 2009-10-27 11:54:44 +00:00
Romuald Conty
b791951a45 Fix tag re-selection with UID lenght > 4 bytes (like DESFire or Ultralight). 2009-10-27 11:53:28 +00:00
Romuald Conty
30835317c2 Add new action in nfc-mftool. Its now possible to extract payload (data blocks) from a MFD
Fix minor bug message in nfc-mftool.
2009-10-26 13:37:12 +00:00
Romuald Conty
1a72b81065 Cleanup nfc-mftool's output. 2009-10-21 15:05:17 +00:00
Romuald Conty
7b1999d8fb Add (dirty) code to wakeup for PN532C106. 2009-10-20 15:37:42 +00:00
Romuald Conty
91aceadf4f Put debug and error messages in stderr. 2009-10-20 15:36:22 +00:00
Roel Verdult
1a7103c4c4 added support for WUPA and 7,10 byte UID in nfc_initiator_select_tag() 2009-10-19 13:08:29 +00:00
Romuald Conty
d3ddf40484 Fix typo.
Add doxygen detection and --enable-doc flag to ./configure.
2009-10-13 12:43:52 +00:00
Romuald Conty
30b0a20973 Reformat copyright banner.
Add @file doxygen comment to each file.
Partially Issue 40.
2009-10-12 14:52:26 +00:00
Romuald Conty
32cd8559b4 Remove not needed #include in libnfc.h.
Minor change in version format.
2009-10-06 16:01:06 +00:00
Francois Kooman
0cc811d1a6 - add pn532_uart to CMake build file
- suppress warnings in Windows builds
- use version 1.3.0 in CMake files as that will be the new version
2009-10-06 11:48:18 +00:00
Romuald Conty
b9f834dd57 Add PN532 UART driver. 2009-10-06 10:38:57 +00:00
Romuald Conty
4f7ad56d1b Attempt to fix CMake compilation. 2009-10-06 10:01:18 +00:00
Romuald Conty
ab727defb7 Update man page for nfc-mftool.
Add man page for nfc-mfultool. (Fix Issue 25)
2009-10-06 09:15:25 +00:00
Romuald Conty
6aae96e1e1 Move examples into src/examples subdirectory.
Change examples names to nfc-* (or nfcip-*).
2009-10-06 08:32:50 +00:00
Romuald Conty
de537473a0 Fix compilation bug introduced in r137. 2009-10-05 15:20:42 +00:00
Romuald Conty
881ef6c319 Examples help messages now use argv[0] to determine their name.
MIFARE examples (mftool and mfultool) have now a better help message.
2009-10-05 15:01:08 +00:00
Roel Verdult
4e0750241c mftool default-keys patch 2009-10-05 12:47:00 +00:00
Romuald Conty
88a4ae8043 Code cleanup, it removes some warnings and should fix Issue 35. 2009-10-05 09:12:48 +00:00
Romuald Conty
4426599638 Fix remaining length parmeters from uint32_t to size_t (Should fix Issue 32 and fix Issue 37) 2009-10-05 08:43:43 +00:00
Romuald Conty
e1a58e18d9 Changed remaining length parmeters from uint32_t to size_t (Should fix Issue 32). 2009-10-02 13:41:49 +00:00
Romuald Conty
979f1fa518 WARNING: API changed ! Some variable name have been changed to match with coding convention.
Changed length parmeters from uint32_t to size_t (Fix Issue 32).
Code cleanup.
2009-10-02 09:52:02 +00:00
Roel Verdult
5a311cfbfe removed const-warning 2009-09-29 15:26:10 +00:00
Roel Verdult
5aab7f9da0 Added windows (GNU) Makefile, removed ugly dll-directives, fixed rs232 under windows 2009-09-29 15:19:15 +00:00
Romuald Conty
b3c54f3fce Add missing include in dev_pn531.c. Fix Issue 28 2009-09-27 16:11:15 +00:00
Roel Verdult
119b57ff35 Finally removed all dirty globals, it 'should' be thread-safe now 2009-09-25 11:09:50 +00:00
Roel Verdult
18003a21ab bugfix: mftool authenticated only with KEYA 2009-09-25 08:07:12 +00:00
Romuald Conty
9205db8599 Add few Doxygen comments. 2009-09-24 14:33:42 +00:00
Roel Verdult
580ae9537b fix typo of B460800 2009-09-21 18:15:17 +00:00
Roel Verdult
c452264a11 MacOS doesn't have B460800 2009-09-21 18:13:24 +00:00
Romuald Conty
047b7d2006 Add rs232_get_speed function. (Thanks to Zuck)
Add missing RS232 functions for Windows. Not yet tested (Thanks to Zuck)
Add comment about timing problem using ARYGON readers.
2009-09-21 14:57:55 +00:00
Romuald Conty
e71116be0a Fix rs232 flush on opening serial port. 2009-09-17 14:41:37 +00:00
Romuald Conty
2761b66d6a Fix delay for ARYGON devices at 9600 bauds. 2009-09-17 09:57:16 +00:00
Romuald Conty
84fd09c281 Flush input hardware buffer on serial port opening (WARNING: Had to be done in Windows part.)
Make sure that returned RX buffer length of rs232_receive() is set in each case. (WARNING: Had to be done in Windows part.)
Clean up dev_arygon.c to fit with coding conventions.
2009-09-17 08:48:05 +00:00
Romuald Conty
61760cc853 Allow ARYGON APDB µC equipped (APDB2UA33) to work with libnfc. (WARNING: some stability issues remains and it works only on POSIX). 2009-09-14 15:05:02 +00:00
Romuald Conty
0977dd1c0b Fix CMake pkg-config generation: "Requires:" is now dynamic.
Fix devices.h, #endif should not be followed by the name of the block.
Fix CMake libnfc_usb compilation.
Rename tools to examples in CMake file.
(This patch comes from Fkooman, thanks !)
2009-09-14 08:47:31 +00:00
Romuald Conty
6634d185bb Add ./configure option to disable libusb (removes PN531USB and PN533USB support).
Enhance "./configure --help" options descriptions.
2009-09-10 10:39:25 +00:00
Romuald Conty
3ec00eb06c libusb dependency can be disabled using CMake files - but it remove PN531USB and PN533USB support - this is useful for Windows newer than XP. (Thanks to Fkooman) 2009-09-10 09:28:17 +00:00
Romuald Conty
9e60b6e392 Add 10ms delay for ARYGON-APDB (PN532 based): some stability issues when reading a tag many times. 2009-09-09 13:43:16 +00:00
Romuald Conty
a58ac6926d Update CMake files in order to be able to compile under Windows 64bits. (Thanks to Fkooman) 2009-09-09 12:32:41 +00:00
Romuald Conty
831dbd31a4 Update CMake files in order to correcly find libraries on Windows 64bits platform. (Thanks to Fkooman)
Add Windows README file. (Thanks to Fkooman)
2009-09-09 07:51:11 +00:00
Romuald Conty
7924d10fad Prevent from exporting messages macros outside of libnfc. 2009-09-08 10:25:59 +00:00
Romuald Conty
b73d9f03fa CMake: reenable the broken tools in Windows.
Add some more exports to bitutils to make compilation succeed. (Thanks to Fkooman)
2009-09-08 08:17:37 +00:00
Romuald Conty
67aa84ad76 Code cleanup. 2009-09-08 08:14:36 +00:00
Romuald Conty
30c2fc4c93 Remove getopt dependency (to be able to compile under Windows). This fix Issue 12.
Some code cleanup.
2009-09-07 10:15:34 +00:00
Romuald Conty
36a4eb208f CMake: Make disable serial probe configurable in GUI.
CMake: Add sources of getopt tools to all builds except windows. (Thanks to Fkooman)
2009-09-07 08:44:24 +00:00
Romuald Conty
7e4512fa68 Better approach to handle C++ on Windows. Thanks to Fkooman. 2009-09-04 14:04:45 +00:00
Romuald Conty
dbf48890ac Fix some some buffer synchronization problems under POSIX system: Issue 17. Thanks to zuck. 2009-09-04 13:48:06 +00:00
Romuald Conty
be55ba2955 WARNING: API changed: nfc_connect() now take one argument. Have a look at nfc-list example (list.c) or at directly at function Doxygen comment (libnfc.h).
Add configure option: --disable-serial-autoprobe to fix Issue 2 (Autotools and CMake).
Fix Issue 11: it is now possible to specify a wanted device using new struct "nfc_device_desc_t".
Code cleanup.
2009-09-04 13:24:34 +00:00
Romuald Conty
ecb406b4ea Dirty hack to export symbols used by examples. IMHO libnfc should not export theses functions, they aren't related to NFC. 2009-09-04 08:37:03 +00:00
Romuald Conty
63bad72a4c Fix CMake files to compile NFCIP examples and fix include directory. 2009-09-04 08:34:08 +00:00
Romuald Conty
4457a3e327 Fix current code to compile under Windows. Thanks to Fkooman 2009-09-04 08:32:32 +00:00
Romuald Conty
bd4a48990e Attempt to fix Issue 14 and Issue 16: allow DLL creation and add C++ compatibility. (WARNING: this fix couldnt be tested here.) 2009-09-03 15:24:12 +00:00
Romuald Conty
70ede60e30 Add NFCIP (NDEP) as experimental feature (Thanks to Fkooman). 2009-09-03 13:47:26 +00:00
Romuald Conty
e92b8ab76f ARYGON APDB1UA33N works with the revision. 2009-09-03 12:26:54 +00:00
Romuald Conty
d799098753 Put debug message at right place. 2009-09-03 11:44:56 +00:00
Romuald Conty
d6868037c8 Add CMake configure option to not compile PC/SC support (defaults ON).
Sync variables in CMake file with current pkg-config file variables.
2009-09-03 09:21:52 +00:00
Romuald Conty
73ad4d0f83 Disable forced speed in rs232.c 2009-09-03 09:05:27 +00:00
Romuald Conty
f5c401fb8c Remove DOS line endings. 2009-09-02 20:15:21 +00:00
Romuald Conty
a552a596fb Add alternative build system (CMake). 2009-09-02 16:43:22 +00:00