Changeset 0f79283b in mainline for uspace/drv/bus/usb/xhci/rh.c

Timestamp:

2018-01-18T12:39:27Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

2bff2cc2

Parents:

babcc423

Message:

usb: remove speed storing (and fix that misuse in xhci rh)

File:

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

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

@@ -136 +136 @@
         }
 
-        device_t *dev = hcd_ddf_fun_create(&port->rh->hc->base, port->base.speed);
+        /*
+         * We cannot know in advance, whether the speed in the status register
+         * is valid - it depends on the protocol. So we read it later, but then
+         * we have to check if the port is still enabled.
+         */
+        uint32_t status = XHCI_REG_RD_FIELD(&port->regs->portsc, 32);
+
+        bool enabled = !!(status & XHCI_REG_MASK(XHCI_PORT_PED));
+        if (!enabled)
+                return ENOENT;
+
+        unsigned psiv = (status & XHCI_REG_MASK(XHCI_PORT_PS)) >> XHCI_REG_SHIFT(XHCI_PORT_PS);
+        const usb_speed_t speed = port->rh->hc->speeds[psiv].usb_speed;
+
+        device_t *dev = hcd_ddf_fun_create(&port->rh->hc->base, speed);
         if (!dev) {
                 usb_log_error("Failed to create USB device function.");
@@ -223 +237 @@
 
                         if (enabled) {
-                                unsigned psiv = (status & XHCI_REG_MASK(XHCI_PORT_PS)) >> XHCI_REG_SHIFT(XHCI_PORT_PS);
-                                const usb_speed_t speed = rh->hc->speeds[psiv].usb_speed;
-                                usb_port_enabled(&port->base, speed);
+                                usb_port_enabled(&port->base);
                         } else {
                                 usb_port_disabled(&port->base, &rh_remove_device);