Changeset 9f685aa in mainline

Timestamp:

2018-01-22T20:06:41Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

34d750c

Parents:

effbef3

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-22 20:04:03)

git-committer:

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

Message:

usbhub: turns out MTT is a bit different

Location:

uspace/drv/bus/usb/usbhub

Files:

• main.c (modified) (1 diff)
• usbhub.c (modified) (6 diffs)
• usbhub.h (modified) (2 diffs)

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

@@ -52 +52 @@
 };
 
-/** Hub endpoints, excluding control endpoint. */
-static const usb_endpoint_description_t *usb_hub_endpoints[] = {
-        &hub_status_change_endpoint_description,
-        NULL,
-};
 /** Static usb hub driver information. */
 static const usb_driver_t usb_hub_driver = {

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

@@ -58 +58 @@
 #define HUB_FNC_NAME "hub"
 
+#define HUB_STATUS_CHANGE_EP(protocol) { \
+        .transfer_type = USB_TRANSFER_INTERRUPT, \
+        .direction = USB_DIRECTION_IN, \
+        .interface_class = USB_CLASS_HUB, \
+        .interface_subclass = 0, \
+        .interface_protocol = (protocol), \
+        .flags = 0 \
+}
+
 /** Hub status-change endpoint description.
  *
  * For more information see section 11.15.1 of USB 1.1 specification.
  */
-const usb_endpoint_description_t hub_status_change_endpoint_description =
-{
-        .transfer_type = USB_TRANSFER_INTERRUPT,
-        .direction = USB_DIRECTION_IN,
-        .interface_class = USB_CLASS_HUB,
-        .interface_subclass = 0,
-        .interface_protocol = -1,
-        .flags = 0
+static const usb_endpoint_description_t
+        status_change_single_tt_only = HUB_STATUS_CHANGE_EP(0),
+        status_change_mtt_available = HUB_STATUS_CHANGE_EP(1);
+
+const usb_endpoint_description_t *usb_hub_endpoints [] = {
+        &status_change_single_tt_only,
+        &status_change_mtt_available,
 };
+
 
 /** Standard get hub global status request */
@@ -135 +144 @@
                     str_error(opResult));
                 return opResult;
+        }
+
+        const usb_endpoint_description_t *status_change = hub_dev->mtt_available
+            ? &status_change_mtt_available
+            : &status_change_single_tt_only;
+
+        usb_endpoint_mapping_t *status_change_mapping
+                = usb_device_get_mapped_ep_desc(hub_dev->usb_device, status_change);
+        if (!status_change_mapping) {
+                usb_log_error("Failed to map the Status Change Endpoint of a hub.");
+                return EIO;
         }
 
@@ -168 +188 @@
 
         polling->device = hub_dev->usb_device;
-        polling->ep_mapping = usb_device_get_mapped_ep_desc(hub_dev->usb_device,
-            &hub_status_change_endpoint_description);
+        polling->ep_mapping = status_change_mapping;
         polling->request_size = ((hub_dev->port_count + 1 + 7) / 8);
         polling->buffer = malloc(polling->request_size);
@@ -339 +358 @@
         /* Get hub descriptor. */
         usb_log_debug("(%p): Retrieving descriptor.", hub_dev);
-        usb_pipe_t *control_pipe =
-            usb_device_get_default_pipe(hub_dev->usb_device);
+        usb_pipe_t *control_pipe = usb_device_get_default_pipe(hub_dev->usb_device);
 
         usb_descriptor_type_t desc_type = hub_dev->speed >= USB_SPEED_SUPER
@@ -383 +401 @@
         hub_dev->per_port_power =
             descriptor.characteristics & HUB_CHAR_POWER_PER_PORT_FLAG;
+
+        const uint8_t protocol = usb_device_descriptors(hub_dev->usb_device)
+                ->device.device_protocol;
+        hub_dev->mtt_available = (protocol == 2);
 
         usb_hub_power_ports(hub_dev);
@@ -434 +456 @@
         }
 
-        /* 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;
 }

uspace/drv/bus/usb/usbhub/usbhub.h

@@ -72 +72 @@
         /** Each port is switched individually. */
         bool per_port_power;
+        /** Whether MTT is available */
+        bool mtt_available;
 
         /** Default address management */
@@ -79 +81 @@
 };
 
-extern const usb_endpoint_description_t hub_status_change_endpoint_description;
+extern const usb_endpoint_description_t *usb_hub_endpoints [];
 
 int usb_hub_device_add(usb_device_t *);