Changeset 2cf28b9 in mainline for uspace/drv/bus/usb/xhci/rh.c

Timestamp:

2017-10-25T15:22:45Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

62558202

Parents:

f668d60

Message:

xhci: connecting devices deeper than to roothub

It still does not work, because the address command fails, but there should not be any fundamental problem.

File:

• uspace/drv/bus/usb/xhci/rh.c (modified) (5 diffs)

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

@@ -69 +69 @@
         rh->max_ports = XHCI_REG_RD(hc->cap_regs, XHCI_CAP_MAX_PORTS);
         rh->devices = (xhci_device_t **) calloc(rh->max_ports, sizeof(xhci_device_t *));
-        hc->rh.hc_device = device;
-
-        return device_init(&hc->rh.device);
+        rh->hc_device = device;
+
+        const int err = device_init(&rh->device.base);
+        if (err)
+                return err;
+
+        /* Initialize route string */
+        rh->device.route_str = 0;
+        rh->device.tier = 0;
+
+        return EOK;
 }
 
@@ -81 +89 @@
         assert(rh);
         assert(rh->hc_device);
+
+        assert(rh->devices[port_id - 1] == NULL);
 
         xhci_bus_t *bus = &rh->hc->bus;
@@ -94 +104 @@
         xhci_dev->hc = rh->hc;
         xhci_dev->usb3 = port_speed->major == 3;
-
-        dev->hub = &rh->device;
+        xhci_dev->rh_port = port_id;
+
+        dev->hub = &rh->device.base;
         dev->port = port_id;
         dev->speed = port_speed->usb_speed;
@@ -113 +124 @@
         }
 
-        fibril_mutex_lock(&rh->device.guard);
-        list_append(&dev->link, &rh->device.devices);
-        if (!rh->devices[port_id - 1]) {
-                /* Only save the device if it's the first one connected to this port. */
-                rh->devices[port_id - 1] = xhci_dev;
-        }
-        fibril_mutex_unlock(&rh->device.guard);
+        fibril_mutex_lock(&rh->device.base.guard);
+        list_append(&dev->link, &rh->device.base.devices);
+        rh->devices[port_id - 1] = xhci_dev;
+        fibril_mutex_unlock(&rh->device.base.guard);
 
         return EOK;
@@ -185 +193 @@
         fibril_mutex_unlock(&dev->base.guard);
 
-        fibril_mutex_lock(&rh->device.guard);
+        fibril_mutex_lock(&rh->device.base.guard);
         list_remove(&dev->base.link);
-        fibril_mutex_unlock(&rh->device.guard);
-
         rh->devices[port_id - 1] = NULL;
+        fibril_mutex_unlock(&rh->device.base.guard);
+
         usb_log_debug2("Aborting all active transfers to '%s'.", ddf_fun_get_name(dev->base.fun));