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

Also use pn53x_transceive_callback() in the arygon driver.

Browse source 
While here, remove unneeded header in pn532_uart.c.
This commit is contained in:
Romain Tartiere 2010-08-08 15:25:06 +00:00
parent d0357cf3aa
commit 8fef257d16
2 changed files with 4 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
libnfc/drivers/arygon.c
View file

@ -219,9 +219,6 @@ bool arygon_transceive(nfc_device_t* pnd, const byte_t* pbtTx, const size_t szTx
size_t szRxBufLen = BUFFER_LENGTH; size_t szRxBufLen = BUFFER_LENGTH;
size_t szPos; size_t szPos;
const byte_t pn53x_ack_frame[] = { 0x00,0x00,0xff,0x00,0xff,0x00 };
const byte_t pn53x_nack_frame[] = { 0x00,0x00,0xff,0xff,0x00,0x00 };
// Packet length = data length (len) + checksum (1) + end of stream marker (1) // Packet length = data length (len) + checksum (1) + end of stream marker (1)
abtTxBuf[4] = szTxLen; abtTxBuf[4] = szTxLen;
// Packet length checksum // Packet length checksum
@ -247,6 +244,7 @@ bool arygon_transceive(nfc_device_t* pnd, const byte_t* pbtTx, const size_t szTx
return false; return false;
} }
szRxBufLen = 6;
if (!uart_receive((serial_port)pnd->nds,abtRxBuf,&szRxBufLen)) { if (!uart_receive((serial_port)pnd->nds,abtRxBuf,&szRxBufLen)) {
ERR("%s", "Unable to receive data. (RX)"); ERR("%s", "Unable to receive data. (RX)");
return false; return false;
@ -256,31 +254,14 @@ bool arygon_transceive(nfc_device_t* pnd, const byte_t* pbtTx, const size_t szTx
PRINT_HEX("RX", abtRxBuf,szRxBufLen); PRINT_HEX("RX", abtRxBuf,szRxBufLen);
#endif #endif
if(szRxBufLen >= sizeof(pn53x_ack_frame)) { if (!pn53x_transceive_callback(pnd, abtRxBuf, szRxBufLen))
return false;
// Check if PN53x reply ACK szRxBufLen = BUFFER_LENGTH;
if(0!=memcmp(pn53x_ack_frame, abtRxBuf, sizeof(pn53x_ack_frame))) {
DBG("%s", "PN53x doesn't respond ACK frame.");
if (0==memcmp(pn53x_nack_frame, abtRxBuf, sizeof(pn53x_nack_frame))) {
ERR("%s", "PN53x reply NACK frame.");
// FIXME Handle NACK frame i.e. resend frame, PN53x doesn't received it correctly
}
return false;
}
szRxBufLen -= sizeof(pn53x_ack_frame);
if(szRxBufLen) {
memmove(abtRxBuf, abtRxBuf+sizeof(pn53x_ack_frame), szRxBufLen);
}
}
if(szRxBufLen == 0) {
// There was no more data than ACK frame, we need to wait next frame
DBG("%s", "There was no more data than ACK frame, we need to wait next frame");
while (!uart_receive((serial_port)pnd->nds,abtRxBuf,&szRxBufLen)) { while (!uart_receive((serial_port)pnd->nds,abtRxBuf,&szRxBufLen)) {
delay_ms(10); delay_ms(10);
} }
}
#ifdef DEBUG #ifdef DEBUG
PRINT_HEX("RX", abtRxBuf,szRxBufLen); PRINT_HEX("RX", abtRxBuf,szRxBufLen);

1
libnfc/drivers/pn532_uart.c
View file

@ -27,7 +27,6 @@
#endif // HAVE_CONFIG_H #endif // HAVE_CONFIG_H
#include "../drivers.h" #include "../drivers.h"
#include "../chips/pn53x.h"
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>