Changeset 4c25c2f in mainline

Timestamp:

2018-01-15T15:02:57Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

745a3f1

Parents:

01d9707

Message:

usbhost: move managing TT to the library

Location:

uspace

Files:

• drv/bus/usb/ehci/hw_struct/queue_head.c (modified) (1 diff)
• drv/bus/usb/xhci/bus.c (modified) (1 diff)
• lib/drv/include/usb_iface.h (modified) (1 diff)
• lib/usbhost/include/usb/host/bus.h (modified) (1 diff)
• lib/usbhost/include/usb/host/hcd.h (modified) (1 diff)
• lib/usbhost/src/bus.c (modified) (2 diffs)
• lib/usbhost/src/hcd.c (modified) (1 diff)
• lib/usbhost/src/usb2_bus.c (modified) (1 diff)

uspace/drv/bus/usb/ehci/hw_struct/queue_head.c

@@ -83 +83 @@
         uint32_t ep_cap = QH_EP_CAP_C_MASK_SET(3 << 2) |
                     QH_EP_CAP_MULTI_SET(ep->packets_per_uframe);
-        if (ep->device->speed != USB_SPEED_HIGH) {
+        if (usb_speed_is_11(ep->device->speed)) {
+                assert(ep->device->tt.dev != NULL);
                 ep_cap |=
                     QH_EP_CAP_TT_PORT_SET(ep->device->tt.port) |
-                    QH_EP_CAP_TT_ADDR_SET(ep->device->tt.address);
+                    QH_EP_CAP_TT_ADDR_SET(ep->device->tt.dev->address);
         }
         if (ep->transfer_type == USB_TRANSFER_INTERRUPT) {

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

@@ -149 +149 @@
         xhci_device_t *xhci_dev = xhci_device_get(dev);
 
-        hcd_setup_device_tt(dev);
-
         /* Calculate route string */
         xhci_device_t *xhci_hub = xhci_device_get(dev->hub);

uspace/lib/drv/include/usb_iface.h

@@ -67 +67 @@
 typedef int16_t usb_address_t;
 
-/** USB address for the purposes of Transaction Translation.
- */
-typedef struct {
-        usb_address_t address;
-        unsigned port;
-} usb_tt_address_t;
-
 /** USB transfer type. */
 typedef enum {

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

@@ -71 +71 @@
 
         /* Transaction translator */
-        usb_tt_address_t tt;
+        struct {
+                device_t *dev;
+                unsigned port;
+        } tt;
 
         /* The following are not set by the library */

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

@@ -114 +114 @@
  */
 extern int hcd_get_ep0_max_packet_size(uint16_t *, bus_t *, device_t *);
-extern void hcd_setup_device_tt(device_t *);
 
 /** How many toggles need to be reset */

uspace/lib/usbhost/src/bus.c

@@ -97 +97 @@
 
 /**
+ * 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.
+ */
+static void device_setup_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.dev = dev->hub;
+                dev->tt.port = dev->port;
+        }
+        else {
+                /* Inherit hub's TT */
+                dev->tt = dev->hub->tt;
+        }
+}
+
+/**
  * Invoke the device_enumerate bus operation.
  *
@@ -111 +135 @@
         if (dev->online)
                 return EINVAL;
+
+        device_setup_tt(dev);
 
         const int r = ops->device_enumerate(dev);

uspace/lib/usbhost/src/hcd.c

@@ -426 +426 @@
         }
         return EOK;
-}
-
-/**
- * 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;
-        }
 }
 

uspace/lib/usbhost/src/usb2_bus.c

@@ -196 +196 @@
         usb_log_debug("Found new %s speed USB device.", usb_str_speed(dev->speed));
 
-        if (!dev->hub) {
-                /* The device is the roothub */
-                dev->tt = (usb_tt_address_t) {
-                        .address = -1,
-                        .port = 0,
-                };
-        } else {
-                hcd_setup_device_tt(dev);
-        }
-
         /* Assign an address to the device */
         if ((err = address_device(dev))) {