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

Revert "Use no cancel transfer functions on windows in callback_wait"

Browse Source 
This reverts commit 8f6acad8ec11fa68e31447e4de9e2ce49c2bf16a.
This commit is contained in:
Con Kolivas 2013-11-05 19:11:20 +11:00
parent 757fcb3df6
commit 21f18956a8
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usbutils.c
View File

@ -2365,17 +2365,12 @@ static int usb_transfer_toerr(int ret)
}
/* 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 allocated
* 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)
* 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)
{
struct libusb_transfer *transfer= ut->transfer;
int ret;
#ifdef WIN32
cgsem_wait(&ut->cgsem);
#else
ret = cgsem_mswait(&ut->cgsem, timeout);
if (ret == ETIMEDOUT) {
/* We are emulating a timeout ourself here */
@ -2384,7 +2379,6 @@ static int callback_wait(struct usb_transfer *ut, int *transferred, __maybe_unus
/* Now wait for the callback function to be invoked. */
cgsem_wait(&ut->cgsem);
}
#endif
ret = transfer->status;
ret = usb_transfer_toerr(ret);