RPCS3/archived-libusb
1
0
Fork 0
mirror of https://github.com/RPCS3/libusb.git synced 2026-01-31 01:25:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Windows: WinUSB: Do not assume that driver implements CancelIoEx()

Browse Source 
Cancelling an individual OVERLAPPED I/O operation is something that a
driver can optionally implement. It appears that the native WinUSB
driver supports this but libusbK does not. Therefore we will attempt
to use it and fall back to the AbortPipe() call if an error occurs.

Closes #400

Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
This commit is contained in:
Chris Dickens
2018-03-12 10:24:04 -07:00
parent 828ec95424
commit 81ce8be59b
3 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
libusb/os/windows_winusb.c
View File

@@ -2053,6 +2053,8 @@ static int winusbx_init(struct libusb_context *ctx)
if (WinUSBX[i].Initialize != NULL) {
WinUSBX[i].initialized = true;
// Assume driver supports CancelIoEx() if it is available
WinUSBX[i].CancelIoEx_supported = (pCancelIoEx != NULL);
usbi_dbg("initalized sub API %s", winusbx_driver_names[i]);
} else {
usbi_warn(ctx, "Failed to initalize sub API %s", winusbx_driver_names[i]);
@@ -2642,23 +2644,23 @@ static int winusbx_abort_transfers(int sub_api, struct usbi_transfer *itransfer)
}
usbi_dbg("will use interface %d", current_interface);
handle = handle_priv->interface_handle[current_interface].dev_handle;
if (WinUSBX[sub_api].CancelIoEx_supported) {
// Try to use CancelIoEx if available to cancel just a single transfer
handle = handle_priv->interface_handle[current_interface].dev_handle;
if (pCancelIoEx(handle, transfer_priv->pollable_fd.overlapped))
return LIBUSB_SUCCESS;
else if (GetLastError() == ERROR_NOT_FOUND)
return LIBUSB_ERROR_NOT_FOUND;
if (pCancelIoEx != NULL) {
// Use CancelIoEx if available to cancel just a single transfer
if (!pCancelIoEx(handle, transfer_priv->pollable_fd.overlapped)) {
usbi_err(ctx, "CancelIoEx failed: %s", windows_error_str(0));
return LIBUSB_ERROR_NO_DEVICE;
}
} else {
if (!CancelIo(handle)) {
usbi_err(ctx, "CancelIo failed: %s", windows_error_str(0));
handle = handle_priv->interface_handle[current_interface].api_handle;
if (!WinUSBX[sub_api].AbortPipe(handle, transfer->endpoint)) {
usbi_err(ctx, "AbortPipe failed: %s", windows_error_str(0));
return LIBUSB_ERROR_NO_DEVICE;
}
}
// Not every driver implements the necessary functionality for CancelIoEx
usbi_warn(ctx, "CancelIoEx not supported for sub API %s", winusbx_driver_names[sub_api]);
WinUSBX[sub_api].CancelIoEx_supported = false;
}
handle = handle_priv->interface_handle[current_interface].api_handle;
if (!WinUSBX[sub_api].AbortPipe(handle, transfer->endpoint)) {
usbi_err(ctx, "AbortPipe failed: %s", windows_error_str(0));
return LIBUSB_ERROR_NO_DEVICE;
}
return LIBUSB_SUCCESS;

1
libusb/os/windows_winusb.h
View File

@@ -603,6 +603,7 @@ typedef BOOL(WINAPI *WinUsb_IsoWritePipe_t)(
struct winusb_interface {
bool initialized;
bool CancelIoEx_supported;
WinUsb_AbortPipe_t AbortPipe;
WinUsb_ControlTransfer_t ControlTransfer;
WinUsb_FlushPipe_t FlushPipe;

2
libusb/version_nano.h
View File

@@ -1 +1 @@
#define LIBUSB_NANO 11303
#define LIBUSB_NANO 11304