Windows: Add support for AMD USB 3.0 root hubs
authorMarkus Heidelberg <markus.heidelberg@web.de>
Fri, 20 Dec 2013 19:37:32 +0000 (20:37 +0100)
committerPete Batard <pete@akeo.ie>
Wed, 19 Feb 2014 00:31:43 +0000 (00:31 +0000)
* 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
libusb/version_nano.h

index 0e83c32..e130bc9 100644 (file)
@@ -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"};
index 2132f37..227e258 100644 (file)
@@ -1 +1 @@
-#define LIBUSB_NANO 10868
+#define LIBUSB_NANO 10869