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

Mostly revert r521.

Browse source 
It was obviously an April joke: iErrorCode which was renamed iPICCError is
indeed a PCD Error, so I renamed it to iLastError since communications errors are
also to handle at the device driver level (read chip level), although I guess
that some errors would be common to distinct devices.
PICC error are irrelevant because they can either be transmission error
detection (in which case the libnfc should retry the transmission) or
application-level errors the libnfc cannot be aware of.
This commit is contained in:
Romain Tartiere 2010-08-13 09:02:20 +00:00
parent 0502401a29
commit f4bc39bf41
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libnfc/chips/pn53x.c
View file

@ -121,13 +121,13 @@ bool pn53x_transceive(nfc_device_t* pnd, const byte_t* pbtTx, const size_t szTxL
case 0x90: // TgResponseToInitiator
case 0x92: // TgSetGeneralBytes
case 0x94: // TgSetMetaData
pnd->iPICCError = pbtRx[0] & 0x3f;
pnd->iLastError = pbtRx[0] & 0x3f;
break;
default:
pnd->iPICCError = 0;
pnd->iLastError = 0;
}
return (0 == pnd->iPICCError);
return (0 == pnd->iLastError);
}
byte_t pn53x_get_reg(nfc_device_t* pnd, uint16_t ui16Reg)
@ -421,7 +421,7 @@ pn53x_strerror (const nfc_device_t *pnd)
size_t i;
for (i=0; i < (sizeof (sErrorMessages) / sizeof (struct sErrorMessage)); i++) {
if (sErrorMessages[i].iErrorCode == pnd->iPICCError) {
if (sErrorMessages[i].iErrorCode == pnd->iLastError) {
pcRes = sErrorMessages[i].pcErrorMsg;
break;
}