shadps4-emu/archived-ext-libusb
1
0
Fork 0
mirror of https://github.com/shadps4-emu/ext-libusb.git synced 2026-01-31 00:55:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

windows: get usb device until usb configuration is set

Browse Source 
There are low possiblity to open device before windows complete usb
configuration. Then claim interface will be always failure.
this patch workaround this problem, make sure return device until
windows finish usb configuration.

Closes #505

Signed-off-by: Frank Li <Frank.Li@nxp.com>
Signed-off-by: Tom Zheng <haidong.zheng@nxp.com>
Signed-off-by: Nathan Hjelm <hjelmn@me.com>
This commit is contained in:
haidong.zheng
2018-12-12 11:07:18 +08:00
committed by Nathan Hjelm
parent 0b381a81be
commit eb164d7529
2 changed files with 40 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
libusb/os/windows_winusb.c
View File

@@ -793,6 +793,7 @@ static int init_device(struct libusb_device *dev, struct libusb_device *parent_d
DWORD size;
uint8_t bus_number, depth;
int r;
int ginfotimeout;
priv = _device_priv(dev);
@@ -850,23 +851,46 @@ static int init_device(struct libusb_device *dev, struct libusb_device *parent_d
memset(&conn_info, 0, sizeof(conn_info));
conn_info.ConnectionIndex = (ULONG)port_number;
// coverity[tainted_data_argument]
if (!DeviceIoControl(hub_handle, IOCTL_USB_GET_NODE_CONNECTION_INFORMATION_EX, &conn_info, sizeof(conn_info),
&conn_info, sizeof(conn_info), &size, NULL)) {
usbi_warn(ctx, "could not get node connection information for device '%s': %s",
priv->dev_id, windows_error_str(0));
CloseHandle(hub_handle);
return LIBUSB_ERROR_NO_DEVICE;
ginfotimeout = 20;
do {
if (!DeviceIoControl(hub_handle, IOCTL_USB_GET_NODE_CONNECTION_INFORMATION_EX, &conn_info, sizeof(conn_info),
&conn_info, sizeof(conn_info), &size, NULL)) {
usbi_warn(ctx, "could not get node connection information for device '%s': %s",
priv->dev_id, windows_error_str(0));
CloseHandle(hub_handle);
return LIBUSB_ERROR_NO_DEVICE;
}
if (conn_info.ConnectionStatus == NoDeviceConnected) {
usbi_err(ctx, "device '%s' is no longer connected!", priv->dev_id);
CloseHandle(hub_handle);
return LIBUSB_ERROR_NO_DEVICE;
}
memcpy(&priv->dev_descriptor, &(conn_info.DeviceDescriptor), sizeof(USB_DEVICE_DESCRIPTOR));
dev->num_configurations = priv->dev_descriptor.bNumConfigurations;
priv->active_config = conn_info.CurrentConfigurationValue;
if (priv->active_config == 0) {
usbi_dbg("0x%x:0x%x found %u configurations (active conf: %u) \n",
priv->dev_descriptor.idVendor,
priv->dev_descriptor.idProduct,
dev->num_configurations,
priv->active_config);
}
if (priv->active_config == 0)
Sleep(50);
} while (priv->active_config == 0 && --ginfotimeout >= 0);
if (priv->active_config == 0) {
usbi_dbg("after try 0x%x:0x%x found %u configurations (active conf: %u) \n",
priv->dev_descriptor.idVendor,
priv->dev_descriptor.idProduct,
dev->num_configurations,
priv->active_config);
usbi_dbg("Force this device active config to 1 in libusb! \nNOTICE: Should not reach this place!!!!!! \n");
priv->active_config = 1;
}
if (conn_info.ConnectionStatus == NoDeviceConnected) {
usbi_err(ctx, "device '%s' is no longer connected!", priv->dev_id);
CloseHandle(hub_handle);
return LIBUSB_ERROR_NO_DEVICE;
}
memcpy(&priv->dev_descriptor, &(conn_info.DeviceDescriptor), sizeof(USB_DEVICE_DESCRIPTOR));
dev->num_configurations = priv->dev_descriptor.bNumConfigurations;
priv->active_config = conn_info.CurrentConfigurationValue;
usbi_dbg("found %u configurations (active conf: %u)", dev->num_configurations, priv->active_config);
// Cache as many config descriptors as we can

2
libusb/version_nano.h
View File

@@ -1 +1 @@
#define LIBUSB_NANO 11362
#define LIBUSB_NANO 11363