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

examples/nfc-utils: decode more ATS info

Browse source
This commit is contained in:
Romuald Conty 2010-10-14 14:48:59 +00:00
parent 507a23b708
commit 7294e4fbaf
2 changed files with 27 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
examples/nfc-utils.c
View file

@ -113,6 +113,33 @@ print_nfc_iso14443a_info (const nfc_iso14443a_info_t nai)
printf (" ATS (ATR): "); printf (" ATS (ATR): ");
print_hex (nai.abtAts, nai.szAtsLen); print_hex (nai.abtAts, nai.szAtsLen);
} }
if (nai.szAtsLen) {
// Decode ATS according to ISO/IEC 14443-4 (5.2 Answer to select)
printf (" T0: " );
size_t offset = 1;
if (nai.abtAts[0] & 0x10) { // TA
printf ("TA=%02x ", nai.abtAts[offset]);
offset++;
}
if (nai.abtAts[0] & 0x20) { // TB
printf ("TB=%02x ", nai.abtAts[offset]);
offset++;
}
if (nai.abtAts[0] & 0x40) { // TC
printf ("TC=%02x ", nai.abtAts[offset]);
offset++;
}
printf ("\n");
if (nai.szAtsLen > offset) {
// XXX More decoding can be done following ISO/IEC 7816-4 (8.1.1 Historical bytes)
printf (" T1: %02x\n", nai.abtAts[offset] );
offset++;
if (nai.szAtsLen > offset) {
printf (" Tk: " );
print_hex (nai.abtAts + offset, (nai.szAtsLen - offset));
}
}
}
if ((nai.btSak & SAK_ISO14443_4_COMPLIANT) || (nai.btSak & SAK_ISO18092_COMPLIANT)) { if ((nai.btSak & SAK_ISO14443_4_COMPLIANT) || (nai.btSak & SAK_ISO18092_COMPLIANT)) {
printf (" Compliant with: "); printf (" Compliant with: ");
if (nai.btSak & SAK_ISO14443_4_COMPLIANT) if (nai.btSak & SAK_ISO14443_4_COMPLIANT)

1
libnfc/chips/pn53x.c
View file

@ -931,7 +931,6 @@ pn53x_InJumpForDEP (nfc_device_t * pnd,
offset = 5; // 2 bytes for command, 1 byte for DEP mode (Active/Passive), 1 byte for baud rate, 1 byte for following parameters flag offset = 5; // 2 bytes for command, 1 byte for DEP mode (Active/Passive), 1 byte for baud rate, 1 byte for following parameters flag
abtCmd[2] = (ndm == NDM_ACTIVE) ? 0x01 : 0x00; abtCmd[2] = (ndm == NDM_ACTIVE) ? 0x01 : 0x00;
// FIXME Baud rate in D.E.P. mode is hard-wired as 106kbps
switch (nbr) { switch (nbr) {
case NBR_106: case NBR_106:
abtCmd[3] = 0x00; // baud rate is 106 kbps abtCmd[3] = 0x00; // baud rate is 106 kbps