Changeset 2aaba7e in mainline for uspace/drv

Timestamp:

2018-01-20T18:23:39Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

21885c92

Parents:

6271a34

git-author:

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

git-committer:

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

Message:

libusbhost: manage (and report) depth of the device

Location:

uspace/drv/bus/usb/xhci

Files:

• device.c (modified) (1 diff)
• device.h (modified) (1 diff)
• rh.c (modified) (2 diffs)

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

@@ -178 +178 @@
         /* Calculate route string */
         xhci_device_t *xhci_hub = xhci_device_get(dev->hub);
-        xhci_dev->tier = xhci_hub->tier + 1;
         xhci_dev->route_str = xhci_hub->route_str;
 
         /* Roothub port is not part of the route string */
-        if (xhci_dev->tier >= 2) {
-                const unsigned offset = 4 * (xhci_dev->tier - 2);
+        if (dev->tier >= 2) {
+                const unsigned offset = 4 * (dev->tier - 2);
                 xhci_dev->route_str |= (dev->port & 0xf) << offset;
                 xhci_dev->rh_port = xhci_hub->rh_port;

uspace/drv/bus/usb/xhci/device.h

@@ -49 +49 @@
         uint8_t rh_port;
 
-        /** USB Tier of the device */
-        uint8_t tier;
-
         /** Route string */
         uint32_t route_str;

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

@@ -98 +98 @@
         /* Initialize route string */
         rh->device.route_str = 0;
-        rh->device.tier = 0;
 
         return EOK;
@@ -157 +156 @@
 
         dev->hub = &port->rh->device.base;
+        dev->tier = 1;
         dev->port = port - port->rh->ports + 1;