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

fix miss-returned error code (ETGREL -> NFC_ETGRELEASED).

Browse source
This commit is contained in:
Romuald Conty 2012-01-18 18:08:39 +00:00
parent 4c011279ff
commit a3a0002f8d
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libnfc/chips/pn53x.c
View file

@ -197,11 +197,10 @@ pn53x_transceive (struct nfc_device *pnd, const uint8_t *pbtTx, const size_t szT
default: default:
CHIP_DATA(pnd)->last_status_byte = 0; CHIP_DATA(pnd)->last_status_byte = 0;
} }
log_put (LOG_CATEGORY, NFC_PRIORITY_TRACE, "Last command status: %s", pn53x_strerror(pnd));
switch (CHIP_DATA(pnd)->last_status_byte) { switch (CHIP_DATA(pnd)->last_status_byte) {
case 0: case 0:
res = szRx; res = (int)szRx;
break; break;
case ETIMEOUT: case ETIMEOUT:
case ECRC: case ECRC:
@ -236,6 +235,7 @@ pn53x_transceive (struct nfc_device *pnd, const uint8_t *pbtTx, const size_t szT
case ETGREL: case ETGREL:
case ECDISCARDED: case ECDISCARDED:
res = NFC_ETGRELEASED; res = NFC_ETGRELEASED;
break;
default: default:
res = NFC_ECHIP; res = NFC_ECHIP;
break; break;
@ -244,6 +244,12 @@ pn53x_transceive (struct nfc_device *pnd, const uint8_t *pbtTx, const size_t szT
{ EMFAUTH, "Mifare Authentication Error" }, { EMFAUTH, "Mifare Authentication Error" },
*/ */
if (res < 0) {
pnd->last_error = res;
log_put (LOG_CATEGORY, NFC_PRIORITY_TRACE, "Chip error: \"%s\" (%02x), returned error: \"%s\" (%d))", pn53x_strerror (pnd), CHIP_DATA(pnd)->last_status_byte, nfc_strerror (pnd), res);
} else {
pnd->last_error = 0;
}
return res; return res;
} }