Changeset ff14aede in mainline

Timestamp:

2017-11-20T12:24:05Z (8 years ago)

Author:

Aearsis <Hlavaty.Ondrej@…>

Branches:

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

Children:

888238e9

Parents:

306a36d

Message:

usbhost: move TT management to library

Location:

uspace

Files:

• drv/bus/usb/xhci/bus.c (modified) (1 diff)
• lib/usbhost/include/usb/host/hcd.h (modified) (1 diff)
• lib/usbhost/src/hcd.c (modified) (1 diff)
• lib/usbhost/src/usb2_bus.c (modified) (1 diff)

uspace/drv/bus/usb/xhci/bus.c

@@ -152 +152 @@
         xhci_device_t *xhci_dev = xhci_device_get(dev);
 
-        /* Manage TT */
-        if (dev->hub->speed == USB_SPEED_HIGH && usb_speed_is_11(dev->speed)) {
-                /* For LS devices under HS hub */
-                /* TODO: How about SS hubs? */
-                dev->tt.address = dev->hub->address;
-                dev->tt.port = dev->port;
-        }
-        else {
-                /* Inherit hub's TT */
-                dev->tt = dev->hub->tt;
-        }
+        hcd_setup_device_tt(dev);
 
         /* Calculate route string */

uspace/lib/usbhost/include/usb/host/hcd.h

@@ -103 +103 @@
 
 extern int hcd_get_ep0_max_packet_size(uint16_t *, hcd_t *, device_t *);
+extern void hcd_setup_device_tt(device_t *);
 
 extern int hcd_send_batch(hcd_t *, device_t *, usb_target_t,

uspace/lib/usbhost/src/hcd.c

@@ -107 +107 @@
 }
 
+/**
+ * Setup devices Transaction Translation.
+ *
+ * This applies for Low/Full speed devices under High speed hub only. Other
+ * devices just inherit TT from the hub.
+ *
+ * Roothub must be handled specially.
+ */
+void hcd_setup_device_tt(device_t *dev)
+{
+        if (!dev->hub)
+                return;
+
+        if (dev->hub->speed == USB_SPEED_HIGH && usb_speed_is_11(dev->speed)) {
+                /* For LS devices under HS hub */
+                dev->tt.address = dev->hub->address;
+                dev->tt.port = dev->port;
+        }
+        else {
+                /* Inherit hub's TT */
+                dev->tt = dev->hub->tt;
+        }
+}
 
 /** Prepare generic usb_transfer_batch and schedule it.

uspace/lib/usbhost/src/usb2_bus.c

@@ -199 +199 @@
         usb_log_debug("Found new %s speed USB device.", usb_str_speed(dev->speed));
 
-        if (dev->hub) {
-                /* Manage TT */
-                if (dev->hub->speed == USB_SPEED_HIGH && usb_speed_is_11(dev->speed)) {
-                        /* For LS devices under HS hub */
-                        /* TODO: How about SS hubs? */
-                        dev->tt.address = dev->hub->address;
-                        dev->tt.port = dev->port;
-                }
-                else {
-                        /* Inherit hub's TT */
-                        dev->tt = dev->hub->tt;
-                }
-        }
-        else {
+        if (!dev->hub) {
+                /* The device is the roothub */
                 dev->tt = (usb_tt_address_t) {
                         .address = -1,
                         .port = 0,
                 };
+        } else {
+                hcd_setup_device_tt(dev);
         }