GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-09-03 17:53:11 +00:00
Code Issues Releases Wiki Activity

Use no cancel transfer functions on windows in callback_wait

Browse Source
This commit is contained in:
Con Kolivas 2013-11-04 12:01:58 +11:00
parent c030439d0b
commit 8f6acad8ec
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usbutils.c
View File

@ -2367,12 +2367,17 @@ static int usb_transfer_toerr(int ret)
} }
/* Wait for callback function to tell us it has finished the USB transfer, but /* Wait for callback function to tell us it has finished the USB transfer, but
* 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 allocated
static int callback_wait(struct usb_transfer *ut, int *transferred, unsigned int timeout) * timeout on linux. Windows' cancel transfer breaks so we use libusb's own
* timeouts and simply wait. */
static int callback_wait(struct usb_transfer *ut, int *transferred, __maybe_unused unsigned int timeout)
{ {
struct libusb_transfer *transfer= ut->transfer; struct libusb_transfer *transfer= ut->transfer;
int ret; int ret;
#ifdef WIN32
cgsem_wait(&ut->cgsem);
#else
ret = cgsem_mswait(&ut->cgsem, timeout); ret = cgsem_mswait(&ut->cgsem, timeout);
if (ret == ETIMEDOUT) { if (ret == ETIMEDOUT) {
/* We are emulating a timeout ourself here */ /* We are emulating a timeout ourself here */
@ -2381,6 +2386,7 @@ static int callback_wait(struct usb_transfer *ut, int *transferred, unsigned int
/* Now wait for the callback function to be invoked. */ /* Now wait for the callback function to be invoked. */
cgsem_wait(&ut->cgsem); cgsem_wait(&ut->cgsem);
} }
#endif
ret = transfer->status; ret = transfer->status;
ret = usb_transfer_toerr(ret); ret = usb_transfer_toerr(ret);