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

Rename nfc_target_type_t as pn53x_target_type_t

Browse source
This commit is contained in:
Romuald Conty 2010-10-13 15:31:48 +00:00
parent c53c512831
commit 695e5c2f37
14 changed files with 99 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

2
examples/nfc-dep-target.c
View file

@ -66,7 +66,7 @@ main (int argc, const char *argv[])
}
const nfc_target_t nt = {
.ntt = NTT_DEP_PASSIVE_106,
.ptt = PTT_DEP_PASSIVE_106,
.nti.ndi.abtNFCID3 = { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xff, 0x00, 0x00 },
.nti.ndi.szGB = 4,
.nti.ndi.abtGB = { 0x12, 0x34, 0x56, 0x78 },

2
examples/nfc-emulate-forum-tag4.c
View file

@ -112,7 +112,7 @@ main (int argc, char *argv[])
printf ("Emulating NDEF tag now, please touch it with a second NFC device\n");
nfc_target_t nt = {
.ntt = NTT_MIFARE,
.ptt = PTT_MIFARE,
.nti.nai.abtAtqa = { 0x00, 0x04 },
.nti.nai.abtUid = { 0x08, 0x00, 0xb0, 0x0b },
.nti.nai.btSak = 0x20,

6
examples/nfc-emulate-tag.c
View file

@ -173,7 +173,7 @@ main (int argc, char *argv[])
// Example of a Mifare Classic Mini
// Note that crypto1 is not implemented in this example
nfc_target_t nt = {
.ntt = NTT_MIFARE,
.ptt = PTT_MIFARE,
.nti.nai.abtAtqa = { 0x00, 0x04 },
.nti.nai.abtUid = { 0x08, 0xab, 0xcd, 0xef },
.nti.nai.btSak = 0x09,
@ -183,7 +183,7 @@ main (int argc, char *argv[])
/*
// Example of a FeliCa
nfc_target_t nt = {
.ntt = NTT_FELICA_212,
.ptt = PTT_FELICA_212,
.nti.nfi.abtId = { 0x01, 0xFE, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF },
.nti.nfi.abtPad = { 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xFF },
.nti.nfi.abtSysCode = { 0xFF, 0xFF },
@ -192,7 +192,7 @@ main (int argc, char *argv[])
/*
// Example of a ISO14443-4 (DESfire)
nfc_target_t nt = {
.ntt = NTT_MIFARE,
.ptt = PTT_MIFARE,
.nti.nai.abtAtqa = { 0x03, 0x44 },
.nti.nai.abtUid = { 0x08, 0xab, 0xcd, 0xef },
.nti.nai.btSak = 0x20,

2
examples/nfc-emulate-uid.c
View file

@ -132,7 +132,7 @@ main (int argc, char *argv[])
// Note: We have to build a "fake" nfc_target_t in order to do exactly the same that was done before the new nfc_target_init() was introduced.
nfc_target_t nt = {
.ntt = NTT_MIFARE,
.ptt = PTT_MIFARE,
.nti.nai.abtAtqa = { 0x04, 0x00 },
.nti.nai.abtUid = { 0xde, 0xad, 0xbe, 0xaf },
.nti.nai.btSak = 0x20,

32
examples/nfc-poll.c
View file

@ -72,7 +72,7 @@ main (int argc, const char *argv[])
const byte_t btPollNr = 20;
const byte_t btPeriod = 2;
const nfc_target_type_t nttArray[5] = {NTT_GENERIC_PASSIVE_106, NTT_GENERIC_PASSIVE_212, NTT_GENERIC_PASSIVE_424, NTT_ISO14443_4B_106, NTT_JEWEL_106};
const pn53x_target_type_t pttArray[5] = {PTT_GENERIC_PASSIVE_106, PTT_GENERIC_PASSIVE_212, PTT_GENERIC_PASSIVE_424, PTT_ISO14443_4B_106, PTT_JEWEL_106};
const size_t szTargetTypes = 5;
nfc_target_t antTargets[2];
@ -106,53 +106,53 @@ main (int argc, const char *argv[])
printf ("Connected to NFC reader: %s\n", pnd->acName);
printf ("PN532 will poll during %ld ms\n", (unsigned long) btPollNr * szTargetTypes * btPeriod * 150);
res = nfc_initiator_poll_targets (pnd, nttArray, szTargetTypes, btPollNr, btPeriod, antTargets, &szTargetFound);
res = nfc_initiator_poll_targets (pnd, pttArray, szTargetTypes, btPollNr, btPeriod, antTargets, &szTargetFound);
if (res) {
uint8_t n;
printf ("%ld target(s) have been found.\n", (unsigned long) szTargetFound);
for (n = 0; n < szTargetFound; n++) {
printf ("T%d: targetType=%02x ", n + 1, antTargets[n].ntt);
switch(antTargets[n].ntt) {
case NTT_JEWEL_106:
printf ("T%d: targetType=%02x ", n + 1, antTargets[n].ptt);
switch(antTargets[n].ptt) {
case PTT_JEWEL_106:
printf ("(Innovision Jewel tag), targetData:\n");
print_nfc_jewel_info (antTargets[n].nti.nji);
break;
case NTT_MIFARE:
case PTT_MIFARE:
printf ("(Mifare card), targetData:\n");
print_nfc_iso14443a_info (antTargets[n].nti.nai);
break;
case NTT_FELICA_212:
case PTT_FELICA_212:
printf ("(FeliCa 212 kbps card), targetData:\n");
print_nfc_felica_info (antTargets[n].nti.nfi);
break;
case NTT_FELICA_424:
case PTT_FELICA_424:
printf ("(FeliCa 212 kbps card), targetData:\n");
print_nfc_felica_info (antTargets[n].nti.nfi);
break;
case NTT_ISO14443_4A_106:
case PTT_ISO14443_4A_106:
printf ("(Passive 106 kbps ISO/IEC 14443-4A card), targetData:\n");
print_nfc_iso14443a_info (antTargets[n].nti.nai);
break;
case NTT_ISO14443_4B_TCL_106:
case PTT_ISO14443_4B_TCL_106:
printf ("(Passive 106 kbps ISO/IEC 14443-4B card), targetData:\n");
print_nfc_iso14443b_info (antTargets[n].nti.nbi);
break;
case NTT_DEP_PASSIVE_106:
case PTT_DEP_PASSIVE_106:
printf ("(DEP passive 106 kbps)\n");
break;
case NTT_DEP_PASSIVE_212:
case PTT_DEP_PASSIVE_212:
printf ("(DEP passive 212 kbps)\n");
break;
case NTT_DEP_PASSIVE_424:
case PTT_DEP_PASSIVE_424:
printf ("(DEP passive 424 kbps)\n");
break;
case NTT_DEP_ACTIVE_106:
case PTT_DEP_ACTIVE_106:
printf ("(DEP active 106 kbps)\n");
break;
case NTT_DEP_ACTIVE_212:
case PTT_DEP_ACTIVE_212:
printf ("(DEP active 212 kbps)\n");
break;
case NTT_DEP_ACTIVE_424:
case PTT_DEP_ACTIVE_424:
printf ("(DEP active 424 kbps)\n");
break;
};

2
examples/nfc-relay.c
View file

@ -127,7 +127,7 @@ main (int argc, char *argv[])
printf ("[+] For example, send a RATS command or use the \"nfc-anticol\" tool\n");
nfc_target_t nt = {
.ntt = NTT_MIFARE,
.ptt = PTT_MIFARE,
.nti.nai.abtAtqa = { 0x04, 0x00 },
.nti.nai.abtUid = { 0xde, 0xad, 0xbe, 0xef },
.nti.nai.btSak = 0x20,

36
examples/nfc-utils.c
View file

@ -212,55 +212,55 @@ print_nfc_dep_info (const nfc_dep_info_t ndi)
}
}
void print_nfc_target_type( const nfc_target_type_t ntt )
void print_nfc_target_type( const pn53x_target_type_t ptt )
{
switch (ntt) {
case NTT_GENERIC_PASSIVE_106:
switch (ptt) {
case PTT_GENERIC_PASSIVE_106:
printf ("Generic passive 106 kbps (ISO/IEC14443-4A, mifare, DEP)\n");
break;
case NTT_GENERIC_PASSIVE_212:
case PTT_GENERIC_PASSIVE_212:
printf ("Generic passive 212 kbps (FeliCa, DEP)\n");
break;
case NTT_GENERIC_PASSIVE_424:
case PTT_GENERIC_PASSIVE_424:
printf ("Generic passive 424 kbps (FeliCa, DEP)\n");
break;
case NTT_ISO14443_4B_106:
case PTT_ISO14443_4B_106:
printf ("Passive 106 kbps ISO/IEC14443-4B\n");
break;
case NTT_JEWEL_106:
case PTT_JEWEL_106:
printf ("Innovision Jewel tag\n");
break;
case NTT_MIFARE:
case PTT_MIFARE:
printf ("mifare card\n");
break;
case NTT_FELICA_212:
case PTT_FELICA_212:
printf ("FeliCa 212 kbps card\n");
break;
case NTT_FELICA_424:
case PTT_FELICA_424:
printf ("FeliCa 424 kbps card\n");
break;
case NTT_ISO14443_4A_106:
case PTT_ISO14443_4A_106:
printf ("Passive 106 kbps ISO/IEC14443-4A\n");
break;
case NTT_ISO14443_4B_TCL_106:
case PTT_ISO14443_4B_TCL_106:
printf ("Passive 106 kbps ISO/IEC14443-4B with TCL flag\n");
break;
case NTT_DEP_PASSIVE_106:
case PTT_DEP_PASSIVE_106:
printf ("DEP passive 106 kbps\n");
break;
case NTT_DEP_PASSIVE_212:
case PTT_DEP_PASSIVE_212:
printf ("DEP passive 212 kbps\n");
break;
case NTT_DEP_PASSIVE_424:
case PTT_DEP_PASSIVE_424:
printf ("DEP passive 424 kbps\n");
break;
case NTT_DEP_ACTIVE_106:
case PTT_DEP_ACTIVE_106:
printf ("DEP active 106 kbps\n");
break;
case NTT_DEP_ACTIVE_212:
case PTT_DEP_ACTIVE_212:
printf ("DEP active 212 kbps\n");
break;
case NTT_DEP_ACTIVE_424:
case PTT_DEP_ACTIVE_424:
printf ("DEP active 424 kbps\n");
break;
}

2
examples/nfc-utils.h
View file

@ -40,7 +40,7 @@ void print_nfc_felica_info (const nfc_felica_info_t nfi);
void print_nfc_jewel_info (const nfc_jewel_info_t nji);
void print_nfc_dep_info (const nfc_dep_info_t ndi);
void print_nfc_target_type( const nfc_target_type_t ntt );
void print_nfc_target_type( const pn53x_target_type_t ptt );
nfc_device_desc_t *parse_device_desc (int argc, const char *argv[], size_t * szFound);

2
examples/pn53x-sam.c
View file

@ -198,7 +198,7 @@ main (int argc, const char *argv[])
size_t szRx;
nfc_target_t nt = {
.ntt = NTT_MIFARE,
.ptt = PTT_MIFARE,
.nti.nai.abtAtqa = { 0x04, 0x00 },
.nti.nai.abtUid = { 0x08, 0xad, 0xbe, 0xaf },
.nti.nai.btSak = 0x20,