Changeset 2aaba7e in mainline

Timestamp:

2018-01-20T18:23:39Z (7 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

Files:

• drv/bus/usb/xhci/device.c (modified) (1 diff)
• drv/bus/usb/xhci/device.h (modified) (1 diff)
• drv/bus/usb/xhci/rh.c (modified) (2 diffs)
• lib/drv/generic/remote_usb.c (modified) (2 diffs)
• lib/drv/include/usb_iface.h (modified) (1 diff)
• lib/usbhost/include/usb/host/bus.h (modified) (1 diff)
• lib/usbhost/src/ddf_helpers.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;
 

uspace/lib/drv/generic/remote_usb.c

@@ -77 +77 @@
         usb_device_desc_t tmp_desc;
 
-        const int ret = async_req_1_4(exch, DEV_IFACE_ID(USB_DEV_IFACE),
+        const int ret = async_req_1_5(exch, DEV_IFACE_ID(USB_DEV_IFACE),
             IPC_M_USB_GET_MY_DESCRIPTION,
             (sysarg_t *) &tmp_desc.address,
+            (sysarg_t *) &tmp_desc.depth,
             (sysarg_t *) &tmp_desc.speed,
             &tmp_desc.handle,
@@ -117 +118 @@
                 async_answer_0(callid, ret);
         } else {
-                async_answer_4(callid, EOK,
+                async_answer_5(callid, EOK,
                     (sysarg_t) desc.address,
+                    (sysarg_t) desc.depth,
                     (sysarg_t) desc.speed,
                     desc.handle,

uspace/lib/drv/include/usb_iface.h

@@ -45 +45 @@
 
 typedef struct {
-        usb_address_t address;
-        usb_speed_t speed;
-        devman_handle_t handle;
-        int iface;
+        usb_address_t address;          /** Current USB address */
+        uint8_t depth;                  /** Depth in the hub hiearchy */
+        usb_speed_t speed;              /** Speed of the device */
+        devman_handle_t handle;         /** Handle to DDF function of the HC driver */
+        int iface;                      /** Interface set by multi interface driver, -1 if none */
 } usb_device_desc_t;
 

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

@@ -68 +68 @@
         /* Invalid for the roothub device */
         unsigned port;
+
+        /** Hub under which this device is connected */
         struct device *hub;
+
+        /** USB Tier of the device */
+        uint8_t tier;
 
         /* Transaction translator */

uspace/lib/usbhost/src/ddf_helpers.c

@@ -164 +164 @@
 
         dev->hub = hub;
+        dev->tier = hub->tier + 1;
         dev->port = port;
         dev->speed = speed;
@@ -242 +243 @@
         *desc = (usb_device_desc_t) {
                 .address = dev->address,
+                .depth = dev->tier,
                 .speed = dev->speed,
                 .handle = ddf_fun_get_handle(fun),