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

drivers/pn53x_usb: fix timeout computing

Browse Source
This commit is contained in:
Romuald Conty 2011-10-03 08:59:21 +00:00
parent a2eb6a1f49
commit b1a30e3e3b
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libnfc/drivers/pn53x_usb.c
View File

@ -123,8 +123,13 @@ int
pn53x_usb_bulk_read (struct pn53x_usb_data *data, byte_t abtRx[], const size_t szRx, struct timeval *timeout) pn53x_usb_bulk_read (struct pn53x_usb_data *data, byte_t abtRx[], const size_t szRx, struct timeval *timeout)
{ {
int timeout_ms = USB_INFINITE_TIMEOUT; int timeout_ms = USB_INFINITE_TIMEOUT;
if (timeout) if (timeout) {
timeout_ms = timeout->tv_sec * 1000 + timeout->tv_usec / 1000; timeout_ms = timeout->tv_sec * 1000 + timeout->tv_usec / 1000;
if (timeout_ms == USB_INFINITE_TIMEOUT) {
// timeout < 1 ms
timeout_ms++;
}
}
int res = usb_bulk_read (data->pudh, data->uiEndPointIn, (char *) abtRx, szRx, timeout_ms); int res = usb_bulk_read (data->pudh, data->uiEndPointIn, (char *) abtRx, szRx, timeout_ms);
if (res > 0) { if (res > 0) {
@ -523,6 +528,10 @@ read:
// No user-provided timeout, we will wait infinitely but we need nfc_abort_command() mecanism. // No user-provided timeout, we will wait infinitely but we need nfc_abort_command() mecanism.
usb_timeout = fixed_timeout; usb_timeout = fixed_timeout;
} }
if ((usb_timeout.tv_sec == 0) && (usb_timeout.tv_usec == 0)) {
pnd->iLastError = ECOMTIMEOUT;
return -1;
}
res = pn53x_usb_bulk_read (DRIVER_DATA (pnd), abtRxBuf, sizeof (abtRxBuf), &usb_timeout); res = pn53x_usb_bulk_read (DRIVER_DATA (pnd), abtRxBuf, sizeof (abtRxBuf), &usb_timeout);
if (res == -USB_TIMEDOUT) { if (res == -USB_TIMEDOUT) {