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

Add convenience library infrastructure and move the print_nfc_iso14443a_info() function away from bitutils.

Browse source
This commit is contained in:
Romain Tartiere 2010-04-09 21:57:03 +00:00
parent 2714180227
commit ee3715e267
6 changed files with 51 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
examples/Makefile.am
View file

@ -8,8 +8,13 @@ nfcincludedir = $(includedir)/nfc
AM_CFLAGS = -I$(top_srcdir)/libnfc
noinst_LIBRARIES = libnfcutils.a
libnfcutils_a_SOURCES = nfc-utils.c
nfc_poll_SOURCES = nfc-poll.c
nfc_poll_LDADD = $(top_builddir)/libnfc/libnfc.la
nfc_poll_LDADD = $(top_builddir)/libnfc/libnfc.la \
$(top_builddir)/examples/libnfcutils.a
nfc_anticol_SOURCES = nfc-anticol.c
nfc_anticol_LDADD = $(top_builddir)/libnfc/libnfc.la

1
examples/nfc-poll.c
View file

@ -35,6 +35,7 @@
#include <nfc/nfc-types.h>
#include <nfc/nfc-messages.h>
#include "bitutils.h"
#include "nfc-utils.h"
#define MAX_DEVICE_COUNT 16

15
examples/nfc-utils.c Normal file
View file

@ -0,0 +1,15 @@
#include <nfc/nfc.h>
#include "bitutils.h"
#include "nfc-utils.h"
void print_nfc_iso14443a_info(const nfc_iso14443a_info_t nai)
{
printf(" ATQA (SENS_RES): "); print_hex(nai.abtAtqa,2);
printf(" UID (NFCID%c): ",(nai.abtUid[0]==0x08?'3':'1')); print_hex(nai.abtUid, nai.szUidLen);
printf(" SAK (SEL_RES): "); print_hex(&nai.btSak,1);
if (nai.szAtsLen) {
printf(" ATS (ATR): ");
print_hex(nai.abtAts, nai.szAtsLen);
}
}

29
examples/nfc-utils.h Normal file
View file

@ -0,0 +1,29 @@
/**
* Public platform independent Near Field Communication (NFC) library
*
* Copyright (C) 2010, Romuald Conty
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published by the
* Free Software Foundation, either version 3 of the License, or (at your
* option) any later version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*
* @file nfc-utils.h
* @brief
*/
#ifndef _EXAMPLES_NFC_UTILS_H_
#define _EXAMPLES_NFC_UTILS_H_
void print_nfc_iso14443a_info(const nfc_iso14443a_info_t nai);
#endif

11
libnfc/bitutils.c
View file

@ -211,14 +211,3 @@ void print_hex_par(const byte_t* pbtData, const size_t szBits, const byte_t* pbt
}
printf("\n");
}
void print_nfc_iso14443a_info(const nfc_iso14443a_info_t nai)
{
printf(" ATQA (SENS_RES): "); print_hex(nai.abtAtqa,2);
printf(" UID (NFCID%c): ",(nai.abtUid[0]==0x08?'3':'1')); print_hex(nai.abtUid, nai.szUidLen);
printf(" SAK (SEL_RES): "); print_hex(&nai.btSak,1);
if (nai.szAtsLen) {
printf(" ATS (ATR): ");
print_hex(nai.abtAts, nai.szAtsLen);
}
}

2
libnfc/bitutils.h
View file

@ -65,7 +65,5 @@ NFC_EXPORT void print_hex(const byte_t* pbtData, const size_t szLen);
NFC_EXPORT void print_hex_bits(const byte_t* pbtData, const size_t szBits);
NFC_EXPORT void print_hex_par(const byte_t* pbtData, const size_t szBits, const byte_t* pbtDataPar);
NFC_EXPORT void print_nfc_iso14443a_info(const nfc_iso14443a_info_t nai);
#endif // _LIBNFC_BITUTILS_H_