Changeset 4c25c2fb in mainline for uspace/drv

Timestamp:

2018-01-15T15:02:57Z (8 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/drv/bus/usb

Files:

• ehci/hw_struct/queue_head.c (modified) (1 diff)
• xhci/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);