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

Timestamp:

2018-01-20T18:53:23Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

26beeda

Parents:

24fcb8b

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-20 18:52:27)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-20 18:53:23)

Message:

usbhub: handle superspeed hubs

File:

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

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

@@ -318 +318 @@
             usb_device_get_default_pipe(hub_dev->usb_device);
 
+        usb_descriptor_type_t desc_type = hub_dev->speed >= USB_SPEED_SUPER
+                ? USB_DESCTYPE_SSPEED_HUB : USB_DESCTYPE_HUB;
+
         usb_hub_descriptor_header_t descriptor;
         size_t received_size;
         int opResult = usb_request_get_descriptor(control_pipe,
             USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_DEVICE,
-            USB_DESCTYPE_HUB, 0, 0, &descriptor,
+            desc_type, 0, 0, &descriptor,
             sizeof(usb_hub_descriptor_header_t), &received_size);
         if (opResult != EOK) {
@@ -334 +337 @@
         hub_dev->port_count = descriptor.port_count;
         hub_dev->control_pipe = control_pipe;
+
+        if ((opResult = usb_hub_set_depth(hub_dev))) {
+                usb_log_error("(%p): Failed to set hub depth: %s.",
+                    hub_dev, str_error(opResult));
+                return opResult;
+        }
 
         hub_dev->ports = calloc(hub_dev->port_count, sizeof(usb_hub_port_t));
@@ -458 +467 @@
                 }
         }
+}
+
+/**
+ * Set feature on the real hub port.
+ *
+ * @param port Port structure.
+ * @param feature Feature selector.
+ */
+int usb_hub_set_depth(const usb_hub_dev_t *hub)
+{
+        assert(hub);
+
+        /* Slower hubs do not care about depth */
+        if (hub->speed < USB_SPEED_SUPER)
+                return EOK;
+
+        const usb_device_request_setup_packet_t set_request = {
+                .request_type = USB_HUB_REQ_TYPE_SET_HUB_DEPTH,
+                .request = USB_HUB_REQUEST_SET_HUB_DEPTH,
+                .value = uint16_host2usb(usb_device_get_depth(hub->usb_device)),
+                .index = 0,
+                .length = 0,
+        };
+        return usb_pipe_control_write(hub->control_pipe, &set_request,
+            sizeof(set_request), NULL, 0);
 }