From 886decee7a33270cc55db11f3a1c22dc45270168 Mon Sep 17 00:00:00 2001 From: Markus Heidelberg Date: Fri, 20 Dec 2013 20:37:32 +0100 Subject: Windows: Add support for AMD USB 3.0 root hubs * The driver has to be updated to version 1.0.0.66 (2011-10-25) or later * Older versions can fail with the following warning: could not get node connection information for device [..]: [87] The parameter is incorrect. * Also Remove duplicated "API" string in debug output * Closes #1 --- libusb/os/windows_usb.c | 4 ++-- libusb/version_nano.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libusb/os/windows_usb.c b/libusb/os/windows_usb.c index 0e83c32..e130bc9 100644 --- a/libusb/os/windows_usb.c +++ b/libusb/os/windows_usb.c @@ -1246,7 +1246,7 @@ static void get_api_type(struct libusb_context *ctx, HDEVINFO *dev_info, for (k=0; k<3; k++) { j = get_sub_api(lookup[k].list, i); if (j >= 0) { - usbi_dbg("matched %s name against %s API", + usbi_dbg("matched %s name against %s", lookup[k].designation, (i!=USB_API_WINUSBX)?usb_api_backend[i].designation:sub_api_name[j]); *api = i; *sub_api = j; @@ -2395,7 +2395,7 @@ static int common_configure_endpoints(int sub_api, struct libusb_device_handle * return LIBUSB_SUCCESS; } // These names must be uppercase -const char* hub_driver_names[] = {"USBHUB", "USBHUB3", "USB3HUB", "NUSB3HUB", "RUSB3HUB", "FLXHCIH", "TIHUB3", "ETRONHUB3", "VIAHUB3", "ASMTHUB3", "IUSB3HUB", "VUSB3HUB"}; +const char* hub_driver_names[] = {"USBHUB", "USBHUB3", "USB3HUB", "NUSB3HUB", "RUSB3HUB", "FLXHCIH", "TIHUB3", "ETRONHUB3", "VIAHUB3", "ASMTHUB3", "IUSB3HUB", "VUSB3HUB", "AMDHUB30"}; const char* composite_driver_names[] = {"USBCCGP"}; const char* winusbx_driver_names[] = WINUSBX_DRV_NAMES; const char* hid_driver_names[] = {"HIDUSB", "MOUHID", "KBDHID"}; diff --git a/libusb/version_nano.h b/libusb/version_nano.h index 2132f37..227e258 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 10868 +#define LIBUSB_NANO 10869 -- cgit v1.2.1