forked/libnfc
1
0
Fork 0
mirror of https://github.com/nfc-tools/libnfc.git synced 2026-05-29 16:46:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change some nfc_target_type_t to insist on the ISO/IEC 14443-4 compliance

Browse Source
This commit is contained in:
Romuald Conty
2010-10-13 11:49:34 +00:00
parent 0fe30e3db7
commit c53c512831
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libnfc/chips/pn53x.c
View File

@@ -377,7 +377,7 @@ pn53x_decode_target_data (const byte_t * pbtRawData, size_t szDataLen, nfc_chip_
switch (ntt) {
case NTT_MIFARE:
case NTT_GENERIC_PASSIVE_106:
case NTT_ISO14443A_106:
case NTT_ISO14443_4A_106:
// We skip the first byte: its the target number (Tg)
pbtRawData++;
@@ -415,8 +415,8 @@ pn53x_decode_target_data (const byte_t * pbtRawData, size_t szDataLen, nfc_chip_
}
break;
case NTT_ISO14443B_106:
case NTT_ISO14443B_TCL_106:
case NTT_ISO14443_4B_106:
case NTT_ISO14443_4B_TCL_106:
// We skip the first byte: its the target number (Tg)
pbtRawData++;
@@ -1073,7 +1073,7 @@ pn53x_target_init (nfc_device_t * pnd, const nfc_target_mode_t ntm, const nfc_ta
switch(nt.ntt) {
case NTT_MIFARE:
case NTT_GENERIC_PASSIVE_106:
case NTT_ISO14443A_106: {
case NTT_ISO14443_4A_106: {
// Set ATQA (SENS_RES)
abtMifareParams[0] = nt.nti.nai.abtAtqa[1];
abtMifareParams[1] = nt.nti.nai.abtAtqa[0];

2
libnfc/nfc.c
View File

@@ -350,7 +350,7 @@ nfc_initiator_select_passive_target (nfc_device_t * pnd,
break;
case NM_ISO14443B_106:
if (!pn53x_decode_target_data (abtTargetsData + 1, szTargetsData - 1, pnd->nc, NTT_ISO14443B_106, pnti)) {
if (!pn53x_decode_target_data (abtTargetsData + 1, szTargetsData - 1, pnd->nc, NTT_ISO14443_4B_106, pnti)) {
return false;
}
break;