Changeset eeca8a6 in mainline for uspace/drv/bus/usb

Timestamp:

2018-01-16T19:22:58Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

4603b35

Parents:

47e9494

Message:

usb: speed moved from default address reservation to enumeration callback

Location:

uspace/drv/bus/usb

Files:

• usbhub/port.c (modified) (2 diffs)
• xhci/rh.c (modified) (2 diffs)

uspace/drv/bus/usb/usbhub/port.c

@@ -246 +246 @@
          * TODO: Make the request synchronous.
          */
-        while ((err = usbhc_reserve_default_address(exch, port->speed)) == EAGAIN) {
+        while ((err = usbhc_reserve_default_address(exch)) == EAGAIN) {
                 fibril_condvar_wait_timeout(&port->state_cv, &port->guard, 500000);
                 if (port->state != PORT_CONNECTED) {
@@ -271 +271 @@
         port_log(debug, port, "Port reset, enumerating device.");
 
-        if ((err = usbhc_device_enumerate(exch, port->port_number))) {
+        if ((err = usbhc_device_enumerate(exch, port->port_number, port->speed))) {
                 port_log(error, port, "Failed to enumerate device: %s", str_error(err));
                 port_change_state(port, PORT_DISABLED);

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

@@ -169 +169 @@
         }
 
-        device_t *dev = hcd_ddf_fun_create(&rh->hc->base);
+        const xhci_port_speed_t *port_speed = xhci_rh_get_port_speed(rh, port_id);
+
+        device_t *dev = hcd_ddf_fun_create(&rh->hc->base, port_speed->usb_speed);
         if (!dev) {
                 usb_log_error("Failed to create USB device function.");
@@ -175 +177 @@
         }
 
-        const xhci_port_speed_t *port_speed = xhci_rh_get_port_speed(rh, port_id);
+        dev->hub = &rh->device.base;
+        dev->port = port_id;
+
         xhci_device_t *xhci_dev = xhci_device_get(dev);
         xhci_dev->usb3 = port_speed->major == 3;
         xhci_dev->rh_port = port_id;
-
-        dev->hub = &rh->device.base;
-        dev->port = port_id;
-        dev->speed = port_speed->usb_speed;
 
         if ((err = bus_device_enumerate(dev))) {