Changeset effbef3 in mainline for uspace/drv/bus/usb/usbhub/usbhub.c

Timestamp:

2018-01-22T15:42:45Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9f685aa

Parents:

998773d

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-22 15:41:58)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-22 15:42:45)

Message:

usbhub: work also with MTT hubs (in Single-TT configuration)

File:

• uspace/drv/bus/usb/usbhub/usbhub.c (modified) (3 diffs)

uspace/drv/bus/usb/usbhub/usbhub.c

@@ -68 +68 @@
         .interface_class = USB_CLASS_HUB,
         .interface_subclass = 0,
-        .interface_protocol = 0,
+        .interface_protocol = -1,
         .flags = 0
 };
@@ -423 +423 @@
         /* Set configuration. Use the configuration that was in
          * usb_device->descriptors.configuration i.e. The first one. */
-        const int opResult = usb_request_set_configuration(
+        int opResult = usb_request_set_configuration(
             usb_device_get_default_pipe(usb_device),
             config_descriptor->configuration_number);
@@ -432 +432 @@
                 usb_log_debug("\tUsed configuration %d",
                     config_descriptor->configuration_number);
+        }
+
+        /* Check if this is a MTT hub */
+        const size_t device_protocol =
+            usb_device_descriptors(usb_device)->device.device_protocol;
+        if (device_protocol == 2) {
+                usb_log_debug("This is a MTT hub. MTT not supported, switching to Single-TT.");
+                opResult = usb_request_set_interface(usb_device_get_default_pipe(usb_device), 1, 0);
+                if (opResult != EOK)
+                        usb_log_error("Failed to switch to Single-TT protocol.");
         }
         return opResult;