GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-02-06 03:54:25 +00:00
Code Issues Releases Wiki Activity

Treat any unexpected timeouts waiting for async transfers as though there may be a usb halt condition and attempt to clear the halt before cancelling the tranfer.

Browse Source
This commit is contained in:
Con Kolivas 2013-10-03 11:50:45 +10:00
parent c5d61b4cb3
commit 603bba67b9
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
usbutils.c
View File

@ -2228,6 +2228,7 @@ static void LIBUSB_CALL bulk_callback(struct libusb_transfer *transfer)
* use our own timer to cancel the request if we go beyond the timeout. */ * use our own timer to cancel the request if we go beyond the timeout. */
static int callback_wait(struct usb_transfer *ut, int *transferred, unsigned int timeout) static int callback_wait(struct usb_transfer *ut, int *transferred, unsigned int timeout)
{ {
struct libusb_transfer *transfer= ut->transfer;
struct timespec ts_now, ts_end; struct timespec ts_now, ts_end;
struct timeval tv_now; struct timeval tv_now;
int ret; int ret;
@ -2239,15 +2240,22 @@ static int callback_wait(struct usb_transfer *ut, int *transferred, unsigned int
timeraddspec(&ts_end, &ts_now); timeraddspec(&ts_end, &ts_now);
ret = pthread_cond_timedwait(&ut->cond, &ut->mutex, &ts_end); ret = pthread_cond_timedwait(&ut->cond, &ut->mutex, &ts_end);
if (ret) { if (ret) {
libusb_cancel_transfer(ut->transfer); /* Assume that if we timed out on the conditional then the
* transfer has stalled for some reason and attempt to clear
* a halt as a solution. Then cancel the transaction, treating
* it the same as a timeout. */
libusb_clear_halt(transfer->dev_handle, transfer->endpoint);
libusb_cancel_transfer(transfer);
/* Now wait for the callback function to be invoked. */
pthread_cond_wait(&ut->cond, &ut->mutex); pthread_cond_wait(&ut->cond, &ut->mutex);
/* Fake the timed out message since it's effectively that */ /* Fake the timed out message since it's effectively that */
ret = LIBUSB_TRANSFER_TIMED_OUT; ret = LIBUSB_TRANSFER_TIMED_OUT;
} else } else
ret = ut->transfer->status; ret = transfer->status;
/* No need to sort out mutexes here since they won't be reused */ /* No need to sort out mutexes here since they won't be reused */
*transferred = ut->transfer->actual_length; *transferred = transfer->actual_length;
libusb_free_transfer(ut->transfer); libusb_free_transfer(transfer);
return ret; return ret;
} }