forked/libnfc
1
0
Fork 0
mirror of https://github.com/nfc-tools/libnfc.git synced 2026-04-12 01:26:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge r486-498 from trunk.

Browse Source
This commit is contained in:
Romain Tartiere
2010-07-31 14:23:33 +00:00
parent 79aeaa6287 b60d045537
commit d0357cf3aa
10 changed files with 71 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libnfc/drivers/pn53x_usb.c
View File

@@ -30,8 +30,6 @@
Thanks to d18c7db and Okko for example code
*/
#if defined (DRIVER_PN531_USB_ENABLED) || defined (DRIVER_PN533_USB_ENABLED)
#include <stdio.h>
#include <stdlib.h>
#include <usb.h>
@@ -282,6 +280,12 @@ bool pn53x_usb_transceive(nfc_device_t* pnd, const byte_t* pbtTx, const size_t s
#ifdef DEBUG
PRINT_HEX("RX", abtRx,ret);
#endif
uint8_t ack_frame[] = { 0x00, 0x00, 0xff, 0x00, 0xff, 0x00 };
if ((ret != 6) || (memcmp (abtRx, ack_frame, 6))) {
DBG ("%s", "===> No ACK!!!!!!");
return false;
}
if (!pn53x_transceive_callback (pnd, abtRx, ret))
return false;
@@ -297,6 +301,8 @@ bool pn53x_usb_transceive(nfc_device_t* pnd, const byte_t* pbtTx, const size_t s
PRINT_HEX("RX", abtRx,ret);
#endif
usb_bulk_write(pus->pudh, pus->uiEndPointOut, (char *)ack_frame, 6, USB_TIMEOUT);
// When the answer should be ignored, just return a succesful result
if(pbtRx == NULL || pszRxLen == NULL) return true;
@@ -322,5 +328,3 @@ bool pn53x_usb_transceive(nfc_device_t* pnd, const byte_t* pbtTx, const size_t s
return true;
}
#endif // DRIVER_PN531_USB_ENABLED || DRIVER_PN533_USB_ENABLED