jarjar/libnfc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor FIXME or XXX removes

Browse Source
This commit is contained in:
Romuald Conty
2010-10-18 12:22:04 +00:00
parent 65da34398d
commit c6c43afc87
5 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libnfc/drivers/arygon.c
+2 -2
View File
@@ -253,7 +253,7 @@ arygon_transceive (nfc_device_t * pnd, const byte_t * pbtTx, const size_t szTx,
#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_check_ack_frame_callback (pnd, abtRxBuf, szRxBufLen))
return false;
szRxBufLen -= sizeof (ack_frame);
@@ -270,7 +270,7 @@ arygon_transceive (nfc_device_t * pnd, const byte_t * pbtTx, const size_t szTx,
#endif
}
if (!pn53x_transceive_check_error_frame_callback (pnd, abtRxBuf, szRxBufLen))
if (!pn53x_check_error_frame_callback (pnd, abtRxBuf, szRxBufLen))
return false;
// When the answer should be ignored, just return a successful result
libnfc/drivers/pn532_uart.c
+2 -2
View File
@@ -232,7 +232,7 @@ pn532_uart_transceive (nfc_device_t * pnd, const byte_t * pbtTx, const size_t sz
#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_check_ack_frame_callback (pnd, abtRxBuf, szRxBufLen))
return false;
szRxBufLen -= sizeof (ack_frame);
memmove (abtRxBuf, abtRxBuf + sizeof (ack_frame), szRxBufLen);
@@ -258,7 +258,7 @@ pn532_uart_transceive (nfc_device_t * pnd, const byte_t * pbtTx, const size_t sz
return false;
}
if (!pn53x_transceive_check_error_frame_callback (pnd, abtRxBuf, szRxBufLen))
if (!pn53x_check_error_frame_callback (pnd, abtRxBuf, szRxBufLen))
return false;
// When the answer should be ignored, just return a successful result
libnfc/drivers/pn53x_usb.c
+4 -4
View File
@@ -229,7 +229,7 @@ pn53x_usb_connect (const nfc_device_desc_t * pndd, const char *target_name, int
PRINT_HEX ("RX", abtRx, ret);
#endif
if (ret == 6) { // we got the ACK/NACK properly
if (!pn53x_transceive_check_ack_frame_callback (pnd, abtRx, ret)) {
if (!pn53x_check_ack_frame_callback (pnd, abtRx, ret)) {
DBG ("usb_bulk_read failed getting ACK");
usb_close (us.pudh);
// we failed to use the specified device
@@ -312,7 +312,7 @@ pn53x_usb_transceive (nfc_device_t * pnd, const byte_t * pbtTx, const size_t szT
#endif
ret = usb_bulk_write (pus->pudh, pus->uiEndPointOut, (char *) abtTx, szTx + 7, USB_TIMEOUT);
// XXX This little hack is a well know problem of libusb, see http://www.libusb.org/ticket/6 for more details
// HACK This little hack is a well know problem of USB, see http://www.libusb.org/ticket/6 for more details
if ((ret % pus->wMaxPacketSize) == 0) {
usb_bulk_write (pus->pudh, pus->uiEndPointOut, "\0", 0, USB_TIMEOUT);
}
@@ -335,7 +335,7 @@ pn53x_usb_transceive (nfc_device_t * pnd, const byte_t * pbtTx, const size_t szT
PRINT_HEX ("RX", abtRx, ret);
#endif
if (!pn53x_transceive_check_ack_frame_callback (pnd, abtRx, ret))
if (!pn53x_check_ack_frame_callback (pnd, abtRx, ret))
return false;
ret = usb_bulk_read (pus->pudh, pus->uiEndPointIn, (char *) abtRx, BUFFER_LENGTH, USB_TIMEOUT);
@@ -355,7 +355,7 @@ pn53x_usb_transceive (nfc_device_t * pnd, const byte_t * pbtTx, const size_t szT
#endif
usb_bulk_write (pus->pudh, pus->uiEndPointOut, (char *) ack_frame, 6, USB_TIMEOUT);
if (!pn53x_transceive_check_error_frame_callback (pnd, abtRx, ret))
if (!pn53x_check_error_frame_callback (pnd, abtRx, ret))
return false;
// When the answer should be ignored, just return a succesful result