forked/libnfc
1
0
Fork 0
mirror of https://github.com/nfc-tools/libnfc.git synced 2026-03-02 13:51:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

removes the libusb-win32 workaround: libusb-win32 project released a new stable version which fixes the infinite timeout issue. (Thanks to Ergeerts Glenn)

Browse Source
This commit is contained in:
Romuald Conty
2011-08-08 10:02:47 +00:00
parent 752c247761
commit fa7084fa77
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libnfc/drivers/pn53x_usb.c
View File

@@ -40,13 +40,12 @@ Thanks to d18c7db and Okko for example code
#ifndef _WIN32
// Under POSIX system, we use libusb (>= 0.1.12)
#include <usb.h>
#define USB_INFINITE_TIMEOUT 0
#define USB_TIMEDOUT ETIMEDOUT
#define _usb_strerror( X ) strerror(-X)
#else
// Under Windows we use libusb-win32 (>= 1.2.4)
// Under Windows we use libusb-win32 (>= 1.2.5)
#include <lusb0_usb.h>
// libusb-win32's bug workaround: 0 as timeout does not means infite as expected
#define USB_INFINITE_TIMEOUT 100
#define USB_TIMEDOUT 116
#define _usb_strerror( X ) usb_strerror()
#endif
@@ -61,6 +60,8 @@ Thanks to d18c7db and Okko for example code
#define PN53X_USB_DRIVER_NAME "PN53x USB"
#define USB_INFINITE_TIMEOUT 0
#define DRIVER_DATA(pnd) ((struct pn53x_usb_data*)(pnd->driver_data))
typedef enum {
@@ -105,7 +106,7 @@ pn53x_usb_bulk_read_ex (struct pn53x_usb_data *data, byte_t abtRx[], const size_
if (res > 0) {
PRINT_HEX ("RX", abtRx, res);
} else if (res < 0) {
if (-res != ETIMEDOUT) {
if (-res != USB_TIMEDOUT) {
ERR ("Unable to read from USB (%s)", _usb_strerror (res));
}
}
@@ -481,7 +482,7 @@ pn53x_usb_receive (nfc_device_t * pnd, byte_t * pbtData, const size_t szDataLen)
read:
res = pn53x_usb_bulk_read_ex (DRIVER_DATA (pnd), abtRxBuf, sizeof (abtRxBuf), delayed_reply ? 250 : USB_INFINITE_TIMEOUT);
if (delayed_reply && (res == -ETIMEDOUT)) {
if (delayed_reply && (res == -USB_TIMEDOUT)) {
if (DRIVER_DATA (pnd)->abort_flag) {
DRIVER_DATA (pnd)->abort_flag = false;
pn53x_usb_ack (pnd);