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

Fix ARYGON driver.

Browse source
This commit is contained in:
Romuald Conty 2010-08-31 12:55:45 +00:00
parent 16330c2f65
commit d49439246c
1 changed files with 44 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
libnfc/drivers/arygon.c
View file

@ -186,6 +186,7 @@ bool arygon_transceive(nfc_device_t* pnd, const byte_t* pbtTx, const size_t szTx
byte_t abtRxBuf[BUFFER_LENGTH]; byte_t abtRxBuf[BUFFER_LENGTH];
size_t szRxBufLen = BUFFER_LENGTH; size_t szRxBufLen = BUFFER_LENGTH;
size_t szPos; size_t szPos;
int res;
// TODO: Move this one level up for libnfc-1.6 // TODO: Move this one level up for libnfc-1.6
uint8_t ack_frame[] = { 0x00, 0x00, 0xff, 0x00, 0xff, 0x00 }; uint8_t ack_frame[] = { 0x00, 0x00, 0xff, 0x00, 0xff, 0x00 };
@ -198,8 +199,7 @@ bool arygon_transceive(nfc_device_t* pnd, const byte_t* pbtTx, const size_t szTx
// Calculate data payload checksum // Calculate data payload checksum
abtTxBuf[szTxLen+6] = 0; abtTxBuf[szTxLen+6] = 0;
for(szPos=0; szPos < szTxLen; szPos++) for(szPos=0; szPos < szTxLen; szPos++) {
{
abtTxBuf[szTxLen+6] -= abtTxBuf[szPos+6]; abtTxBuf[szTxLen+6] -= abtTxBuf[szPos+6];
} }
@ -209,14 +209,20 @@ bool arygon_transceive(nfc_device_t* pnd, const byte_t* pbtTx, const size_t szTx
#ifdef DEBUG #ifdef DEBUG
PRINT_HEX("TX", abtTxBuf,szTxLen+8); PRINT_HEX("TX", abtTxBuf,szTxLen+8);
#endif #endif
if (!uart_send((serial_port)pnd->nds,abtTxBuf,szTxLen+8)) { res = uart_send((serial_port)pnd->nds,abtTxBuf,szTxLen+8);
if (res != 0) {
ERR("%s", "Unable to transmit data. (TX)"); ERR("%s", "Unable to transmit data. (TX)");
pnd->iLastError = res;
return false; return false;
} }
szRxBufLen = 6; #ifdef DEBUG
if (!uart_receive((serial_port)pnd->nds,abtRxBuf,&szRxBufLen)) { bzero(abtRxBuf, sizeof(abtRxBuf));
#endif
res = uart_receive((serial_port)pnd->nds,abtRxBuf,&szRxBufLen);
if (res != 0) {
ERR("%s", "Unable to receive data. (RX)"); ERR("%s", "Unable to receive data. (RX)");
pnd->iLastError = res;
return false; return false;
} }
@ -224,28 +230,35 @@ 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
// WARN: UART is a per byte reception, so you usually receive ACK and next frame the same time
if (!pn53x_transceive_check_ack_frame_callback(pnd, abtRxBuf, szRxBufLen)) if (!pn53x_transceive_check_ack_frame_callback(pnd, abtRxBuf, szRxBufLen))
return false; return false;
szRxBufLen = BUFFER_LENGTH; szRxBufLen -= sizeof(ack_frame);
memmove(abtRxBuf, abtRxBuf+sizeof(ack_frame), szRxBufLen);
while (!uart_receive((serial_port)pnd->nds,abtRxBuf,&szRxBufLen)) { if (szRxBufLen == 0) {
szRxBufLen = BUFFER_LENGTH;
do {
delay_ms(10); delay_ms(10);
} res = uart_receive((serial_port)pnd->nds,abtRxBuf,&szRxBufLen);
} while (res != 0 );
#ifdef DEBUG #ifdef DEBUG
PRINT_HEX("RX", abtRxBuf,szRxBufLen); PRINT_HEX("RX", abtRxBuf,szRxBufLen);
#endif #endif
#ifdef DEBUG
PRINT_HEX("TX", ack_frame, 6);
#endif
if (!uart_send((serial_port)pnd->nds, ack_frame, 6)) {
ERR("%s", "Unable to transmit data. (TX)");
return false;
} }
/*
#ifdef DEBUG
PRINT_HEX("TX", ack_frame, sizeof(ack_frame));
#endif
res = uart_send((serial_port)pnd->nds, ack_frame, sizeof(ack_frame));
if (res != 0) {
ERR("%s", "Unable to transmit data. (TX)");
pnd->iLastError = res;
return false;
}
*/
if (!pn53x_transceive_check_error_frame_callback(pnd, abtRxBuf, szRxBufLen)) if (!pn53x_transceive_check_error_frame_callback(pnd, abtRxBuf, szRxBufLen))
return false; return false;
@ -269,6 +282,7 @@ arygon_check_communication(const nfc_device_spec_t nds)
byte_t abtRx[BUFFER_LENGTH]; byte_t abtRx[BUFFER_LENGTH];
size_t szRxLen; size_t szRxLen;
const byte_t attempted_result[] = { 0x00,0x00,0xff,0x00,0xff,0x00,0x00,0x00,0xff,0x09,0xf7,0xD5,0x01,0x00,'l','i','b','n','f','c',0xbc,0x00}; const byte_t attempted_result[] = { 0x00,0x00,0xff,0x00,0xff,0x00,0x00,0x00,0xff,0x09,0xf7,0xD5,0x01,0x00,'l','i','b','n','f','c',0xbc,0x00};
int res;
/** To be sure that PN532 is alive, we have put a "Diagnose" command to execute a "Communication Line Test" */ /** To be sure that PN532 is alive, we have put a "Diagnose" command to execute a "Communication Line Test" */
const byte_t pncmd_communication_test[] = { DEV_ARYGON_PROTOCOL_TAMA, 0x00,0x00,0xff,0x09,0xf7,0xd4,0x00,0x00,'l','i','b','n','f','c',0xbe,0x00 }; const byte_t pncmd_communication_test[] = { DEV_ARYGON_PROTOCOL_TAMA, 0x00,0x00,0xff,0x09,0xf7,0xd4,0x00,0x00,'l','i','b','n','f','c',0xbe,0x00 };
@ -276,9 +290,15 @@ arygon_check_communication(const nfc_device_spec_t nds)
#ifdef DEBUG #ifdef DEBUG
PRINT_HEX("TX", pncmd_communication_test,sizeof(pncmd_communication_test)); PRINT_HEX("TX", pncmd_communication_test,sizeof(pncmd_communication_test));
#endif #endif
uart_send((serial_port)nds, pncmd_communication_test, sizeof(pncmd_communication_test)); res = uart_send((serial_port)nds, pncmd_communication_test, sizeof(pncmd_communication_test));
if (res != 0) {
ERR("%s", "Unable to transmit data. (TX)");
return false;
}
if(!uart_receive((serial_port)nds,abtRx,&szRxLen)) { res = uart_receive((serial_port)nds,abtRx,&szRxLen);
if (res != 0) {
ERR("%s", "Unable to receive data. (RX)");
return false; return false;
} }
#ifdef DEBUG #ifdef DEBUG