crewID/libnfc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://code.google.com/p/libnfc

Browse source
This commit is contained in:
Romuald Conty 2013-02-01 11:46:26 +01:00
commit 8127a2ca63
13 changed files with 138 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -16,7 +16,7 @@ Changes:
- nfc_emulate_target() now takes timeout parameter
Special thanks to:
- Alex Lian (Windows support refesh)
- Alex Lian (Windows support refresh)
Jan 20, 2013 - 1.7.0-rc2 (release candidate)
--------------------------------------------

18
README
View file

@ -10,7 +10,7 @@ General Information
libnfc is a library which allows userspace application access to NFC devices.
The official web site is:
http://www.libnfc.org/
http://www.nfc-tools.org/
The official forum site is:
http://www.libnfc.org/community/
@ -23,7 +23,7 @@ Important note: this file covers POSIX systems, for Windows please read README-W
Requirements
============
Some NFC drivers depends on third party software:
Some NFC drivers depend on third party software:
* pn53x_usb & acr122_usb:
@ -33,7 +33,7 @@ Some NFC drivers depends on third party software:
- pcsc-lite http://pcsclite.alioth.debian.org/
The regression test suite depend on the cutter framework:
The regression test suite depends on the cutter framework:
http://cutter.sf.net
Installation
@ -69,7 +69,14 @@ Please make sure to include:
And anything else you think is relevant.
* How to reproduce the bug.
* A trace with debug activated.
Reproduce the bug with debug, e.g. if it was:
$ nfc-list -v
run it as:
$ LIBNFC_LOG_LEVEL=3 nfc-list -v
* How to reproduce the bug.
Please include a short test program that exhibits the behavior.
As a last resort, you can also provide a pointer to a larger piece
@ -85,7 +92,8 @@ Patches
=======
Patches can be posted to http://code.google.com/p/libnfc/issues/list or
can be sent directly to libnfc's developers: http://www.libnfc.org/contact
can be sent directly to libnfc's developers:
http://nfc-tools.org/index.php?title=Contact
If the patch fixes a bug, it is usually a good idea to include
all the information described in "How to Report Bugs".

2
README-Windows.txt
View file

@ -1,6 +1,8 @@
*-
* Public platform independent Near Field Communication (NFC) library
* Windows-specific parts:
* Copyright (C) 2010, Glenn Ergeerts
* Copyright (C) 2013, Alex Lian
-*
Requirements

4
debian/changelog vendored
View file

@ -1,8 +1,8 @@
libnfc (1.7.0~rc2-1) unstable; urgency=low
libnfc (1.7.0~rc3-1) unstable; urgency=low
* Upload to Debian. (Closes: #672795)
-- Nobuhiro Iwamatsu <iwamatsu@debian.org> Mon, 21 Jan 2013 14:19:24 +0900
-- Nobuhiro Iwamatsu <iwamatsu@debian.org> Fri, 01 Feb 2013 09:01:53 +0900
libnfc (1.7.0~rc2-0) unstable; urgency=low

66
debian/control vendored
View file

@ -4,7 +4,7 @@ Priority: extra
Maintainer: Nobuhiro Iwamatsu <iwamatsu@debian.org>
Build-Depends: debhelper (>= 8), dh-autoreconf, libtool, pkg-config, libusb-dev
Standards-Version: 3.9.4
Homepage: http://www.libnfc.org/
Homepage: http://www.nfc-tools.org/
Vcs-Git: https://code.googlecode.com/p/libnfc/
Vcs-Browser: http://code.google.com/p/libnfc/source/browse/
@ -14,9 +14,14 @@ Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Near Field Communication (NFC) library
libnfc is a Free Software library for Near Field Communication.
Supported NFC hardware devices are, theorically, all hardware
based on the NXP PN531, PN532 or PN533 NFC controller chip.
libnfc is a library for Near Field Communication. It abstracts the
low-level details of communicating with the devices away behind an
easy-to-use high-level API.
It supports most hardware based on the NXP PN531, PN532 or PN533
controller chips.
.
This package contains the runtime library files needed to run software
using libnfc.
Package: libnfc-dev
Section: libdevel
@ -24,24 +29,57 @@ Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, libnfc4 (= ${binary:Version}), libusb-dev
Description: Near Field Communication library (development files)
libnfc is a free software library for near-field communication.
Description: Near Field Communication (NFC) library (development files)
libnfc is a library for Near Field Communication. It abstracts the
low-level details of communicating with the devices away behind an
easy-to-use high-level API.
It supports most hardware based on the NXP PN531, PN532 or PN533
controller chips.
.
This package contains the header and development files needed to build
programs and packages using libnfc.
Package: libnfc4-dbg
Section: debug
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, libnfc4 (= ${binary:Version})
Description: Near Field Communication (NFC) library (debugging information)
libnfc is a library for Near Field Communication. It abstracts the
low-level details of communicating with the devices away behind an
easy-to-use high-level API.
It supports most hardware based on the NXP PN531, PN532 or PN533
controller chips.
.
This package contains the debugging information.
Package: libnfc-bin
Section: utils
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libnfc4 (>= ${binary:Version})
Description: Near Field Communication binaries
Some binaries are provided with libnfc useful for development
purposes (nfc-list, nfc-mfclassic, nfc-mfultralight, etc.).
Description: Near Field Communication (NFC) binaries
libnfc is a library for Near Field Communication. It abstracts the
low-level details of communicating with the devices away behind an
easy-to-use high-level API.
It supports most hardware based on the NXP PN531, PN532 or PN533
controller chips.
.
This package contains some utils that come along with libnfc, for
development or debugging purposes (including nfc-list, nfc-mfclassic,
nfc-mfultralight, etc).
Package: libnfc-examples
Section: utils
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libnfc4 (>= ${binary:Version})
Description: Near Field Communication examples
Description: Near Field Communication (NFC) examples
libnfc is a library for Near Field Communication. It abstracts the
low-level details of communicating with the devices away behind an
easy-to-use high-level API.
It supports most hardware based on the NXP PN531, PN532 or PN533
controller chips.
.
Some examples are provided with libnfc for debugging and/or
educational purposes (nfc-anticol, nfc-emulate, etc.).
@ -49,6 +87,12 @@ Package: libnfc-pn53x-examples
Section: utils
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libnfc4 (>= ${binary:Version})
Description: Near Field Communication examples for PN53x chips only
Description: Near Field Communication (NFC) examples for PN53x chips only
libnfc is a library for Near Field Communication. It abstracts the
low-level details of communicating with the devices away behind an
easy-to-use high-level API.
It supports most hardware based on the NXP PN531, PN532 or PN533
controller chips.
.
Some PN53x-only examples are provided with libnfc for debugging
and/or educational purposes (pn53x-sam, pn53x-tamashell, etc.).

2
debian/copyright vendored
View file

@ -1,6 +1,6 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: libnfc
Source: http://www.libnfc.org/
Source: http://libnfc.googlecode.com/
Files: *
Copyright: 2009, Roel Verdult <roel@libnfc.org>, Romuald Conty <romuald@libnfc.org>

1
debian/libnfc-examples.install vendored
View file

@ -10,6 +10,7 @@ debian/tmp/usr/bin/nfc-relay
debian/tmp/usr/share/man/man1/nfc-anticol.1
debian/tmp/usr/share/man/man1/nfc-dep-initiator.1
debian/tmp/usr/share/man/man1/nfc-dep-target.1
debian/tmp/usr/share/man/man1/nfc-emulate-forum-tag2.1
debian/tmp/usr/share/man/man1/nfc-emulate-tag.1
debian/tmp/usr/share/man/man1/nfc-emulate-uid.1
debian/tmp/usr/share/man/man1/nfc-mfsetuid.1

54
debian/libnfc4.symbols vendored Normal file
View file

@ -0,0 +1,54 @@
libnfc.so.4 libnfc4 #MINVER#
iso14443a_crc@Base 1.7.0~rc2
iso14443a_crc_append@Base 1.7.0~rc2
iso14443a_locate_historical_bytes@Base 1.7.0~rc2
nfc_abort_command@Base 1.7.0~rc2
nfc_close@Base 1.7.0~rc2
nfc_context_free@Base 1.7.0~rc2
nfc_context_new@Base 1.7.0~rc2
nfc_device_free@Base 1.7.0~rc2
nfc_device_get_connstring@Base 1.7.0~rc2
nfc_device_get_information_about@Base 1.7.0~rc2
nfc_device_get_last_error@Base 1.7.0~rc2
nfc_device_get_name@Base 1.7.0~rc2
nfc_device_get_supported_baud_rate@Base 1.7.0~rc2
nfc_device_get_supported_modulation@Base 1.7.0~rc2
nfc_device_new@Base 1.7.0~rc2
nfc_device_set_property_bool@Base 1.7.0~rc2
nfc_device_set_property_int@Base 1.7.0~rc2
nfc_drivers@Base 1.7.0~rc2
nfc_emulate_target@Base 1.7.0~rc2
nfc_exit@Base 1.7.0~rc2
nfc_idle@Base 1.7.0~rc2
nfc_init@Base 1.7.0~rc2
nfc_initiator_deselect_target@Base 1.7.0~rc2
nfc_initiator_init@Base 1.7.0~rc2
nfc_initiator_init_secure_element@Base 1.7.0~rc2
nfc_initiator_list_passive_targets@Base 1.7.0~rc2
nfc_initiator_poll_dep_target@Base 1.7.0~rc2
nfc_initiator_poll_target@Base 1.7.0~rc2
nfc_initiator_select_dep_target@Base 1.7.0~rc2
nfc_initiator_select_passive_target@Base 1.7.0~rc2
nfc_initiator_target_is_present@Base 1.7.0~rc2
nfc_initiator_transceive_bits@Base 1.7.0~rc2
nfc_initiator_transceive_bits_timed@Base 1.7.0~rc2
nfc_initiator_transceive_bytes@Base 1.7.0~rc2
nfc_initiator_transceive_bytes_timed@Base 1.7.0~rc2
nfc_list_devices@Base 1.7.0~rc2
nfc_open@Base 1.7.0~rc2
nfc_perror@Base 1.7.0~rc2
nfc_strerror@Base 1.7.0~rc2
nfc_strerror_r@Base 1.7.0~rc2
nfc_target_init@Base 1.7.0~rc2
nfc_target_receive_bits@Base 1.7.0~rc2
nfc_target_receive_bytes@Base 1.7.0~rc2
nfc_target_send_bits@Base 1.7.0~rc2
nfc_target_send_bytes@Base 1.7.0~rc2
nfc_version@Base 1.7.0~rc2
pn532_SAMConfiguration@Base 1.7.0~rc2
pn53x_read_register@Base 1.7.0~rc2
pn53x_transceive@Base 1.7.0~rc2
pn53x_write_register@Base 1.7.0~rc2
str_nfc_baud_rate@Base 1.7.0~rc2
str_nfc_modulation_type@Base 1.7.0~rc2
str_nfc_target@Base 1.7.0~rc2

4
debian/rules vendored
View file

@ -27,3 +27,7 @@ override_dh_auto_configure:
%:
dh $@ --with autoreconf
override_dh_strip:
dh_strip -plibnfc4 --dbg-package=libnfc4-dbg
dh_strip --remaining-packages

3
examples/Makefile.am
View file

@ -96,6 +96,7 @@ dist_man_MANS = \
nfc-mfsetuid.1 \
pn53x-diagnose.1 \
pn53x-sam.1 \
pn53x-tamashell.1
pn53x-tamashell.1 \
nfc-emulate-forum-tag2.1
EXTRA_DIST = CMakeLists.txt

2
libnfc/additional-pages.dox
View file

@ -4,7 +4,7 @@
* @section intro_sec Introduction
* This is the developer manual for \b libnfc.
* libnfc is an open source library that allows you to communicate with NFC devices. For more info, see the
* <a href="http://www.libnfc.org">libnfc homepage</a>.
* <a href="http://www.nfc-tools.org">libnfc homepage</a>.
*
* @section quick_start_sec Quick start
* If you are looking for libnfc's public API, you should start with the Modules page which links to the different categories of libnfc's functionality.

2
utils/mifare.c
View file

@ -47,7 +47,7 @@
* @note There are three different types of information (Authenticate, Data and Value).
*
* First an authentication must take place using Key A or B. It requires a 48 bit Key (6 bytes) and the UID.
* They are both used to initialize the internal cipher-state of the PN53X chip (http://libnfc.org/hardware/pn53x-chip).
* They are both used to initialize the internal cipher-state of the PN53X chip.
* After a successful authentication it will be possible to execute other commands (e.g. Read/Write).
* The MIFARE Classic Specification (http://www.nxp.com/acrobat/other/identification/M001053_MF1ICS50_rev5_3.pdf) explains more about this process.
*/

2
windows/mm/libnfc.mm
View file

@ -21,7 +21,7 @@
; #define? COMPANY_PRODUCT_ICON ..\win32\libnfc.ico ;; override from company.mmh
#define? UISAMPLE_DIALOG_FILE_dlgbmp nfcleft.bmp ;; override uisample.mmh
#define? UISAMPLE_BLINE_TEXT www.libnfc.org
#define? UISAMPLE_BLINE_TEXT www.nfc-tools.org
#define? COMPANY_WANT_TO_INSTALL_DOCUMENTATION N
;--- Include MAKEMSI support (with my customisations and MSI branding) ------