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

pn53x: Fix bug in _timed fcts

Browse source
This commit is contained in:
Philippe Teuwen 2011-05-03 13:55:20 +00:00
parent 26071a817b
commit 8169da3701
1 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
libnfc/chips/pn53x.c
View file

@ -859,7 +859,7 @@ pn53x_initiator_transceive_bits_timed (nfc_device_t * pnd, const byte_t * pbtTx,
(void) pbtTxPar; (void) pbtTxPar;
(void) pbtRxPar; (void) pbtRxPar;
unsigned int i; unsigned int i;
uint8_t sz; uint8_t sz, sz2;
// Sorry, no arbitrary parity bits support for now // Sorry, no arbitrary parity bits support for now
if (!pnd->bPar) { if (!pnd->bPar) {
@ -899,6 +899,14 @@ pn53x_initiator_transceive_bits_timed (nfc_device_t * pnd, const byte_t * pbtTx,
for (i=0; i< sz; i++) { for (i=0; i< sz; i++) {
pn53x_read_register (pnd, REG_CIU_FIFODATA, &(pbtRx[i])); pn53x_read_register (pnd, REG_CIU_FIFODATA, &(pbtRx[i]));
} }
// Did we get more data meanwhile?
pn53x_read_register (pnd, REG_CIU_FIFOLEVEL, &sz2);
if (sz2 != 0) {
*pszRxBits += (sz2 & SYMBOL_FIFO_LEVEL) * 8;
for (i=0; i< sz2; i++) {
pn53x_read_register (pnd, REG_CIU_FIFODATA, &(pbtRx[i+sz]));
}
}
// Recv corrected timer value // Recv corrected timer value
*cycles = __pn53x_get_timer (pnd, pbtTx[szTxBits / 8]); *cycles = __pn53x_get_timer (pnd, pbtTx[szTxBits / 8]);
@ -911,7 +919,7 @@ pn53x_initiator_transceive_bytes_timed (nfc_device_t * pnd, const byte_t * pbtTx
size_t * pszRx, uint16_t * cycles) size_t * pszRx, uint16_t * cycles)
{ {
unsigned int i; unsigned int i;
uint8_t sz; uint8_t sz, sz2;
// We can not just send bytes without parity while the PN53X expects we handled them // We can not just send bytes without parity while the PN53X expects we handled them
if (!pnd->bPar) { if (!pnd->bPar) {
@ -946,6 +954,14 @@ pn53x_initiator_transceive_bytes_timed (nfc_device_t * pnd, const byte_t * pbtTx
for (i=0; i<sz; i++) { for (i=0; i<sz; i++) {
pn53x_read_register (pnd, REG_CIU_FIFODATA, &(pbtRx[i])); pn53x_read_register (pnd, REG_CIU_FIFODATA, &(pbtRx[i]));
} }
// Did we get more data meanwhile?
pn53x_read_register (pnd, REG_CIU_FIFOLEVEL, &sz2);
if (sz2 != 0) {
*pszRx += sz2 & SYMBOL_FIFO_LEVEL;
for (i=0; i< sz2; i++) {
pn53x_read_register (pnd, REG_CIU_FIFODATA, &(pbtRx[i+sz]));
}
}
// Recv corrected timer value // Recv corrected timer value
if (pnd->bCrc) { if (pnd->bCrc) {