Changeset eeca8a6 in mainline for uspace/drv/bus/usb/usbhub/port.c

Timestamp:

2018-01-16T19:22:58Z (7 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

File:

• uspace/drv/bus/usb/usbhub/port.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);