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

Timestamp:

2017-10-25T14:36:20Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

2cf28b9

Parents:

47ab89e

Message:

xhci: moved speed back to HC, keeping usb speed → port speed mapping

File:

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

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

@@ -74 +74 @@
 }
 
-static usb_speed_t port_speed_to_usb_speed(const xhci_port_speed_t *port_speed)
-{
-        assert(port_speed->major > 0 && port_speed->major <= USB_SPEED_SUPER);
-
-        switch (port_speed->major) {
-                case 3: return USB_SPEED_SUPER;
-                case 2: return USB_SPEED_HIGH;
-                case 1: return port_speed->minor ? USB_SPEED_FULL : USB_SPEED_LOW;
-        }
-
-        assert(false);
-}
-
 /** Create a device node for device directly connected to RH.
  */
@@ -110 +97 @@
         dev->hub = &rh->device;
         dev->port = port_id;
-        dev->speed = port_speed_to_usb_speed(port_speed);
+        dev->speed = port_speed->usb_speed;
 
         if ((err = xhci_bus_enumerate_device(bus, rh->hc, dev))) {
@@ -404 +391 @@
 
         unsigned psiv = XHCI_REG_RD(port_regs, XHCI_PORT_PS);
-        return &rh->speeds[psiv];
+        return &rh->hc->speeds[psiv];
 }