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

Timestamp:

2018-01-16T21:19:37Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

1d218bf

Parents:

4603b35

Message:

usbhub: aggregate requests for default address

File:

• uspace/drv/bus/usb/usbhub/port.c (modified) (2 diffs)

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

@@ -243 +243 @@
         }
 
-        /* Reserve default address
-         * TODO: Make the request synchronous.
-         */
-        while ((err = usbhc_reserve_default_address(exch)) == EAGAIN) {
-                fibril_condvar_wait_timeout(&port->state_cv, &port->guard, 500000);
-                if (port->state != PORT_CONNECTED) {
-                        assert(port->state == PORT_ERROR);
-                        port_change_state(port, PORT_DISABLED);
-                        goto out_exch;
-                }
-        }
+        /* Reserve default address */
+        err = usb_hub_reserve_default_address(port->hub, exch, &port->guard);
         if (err != EOK) {
                 port_log(error, port, "Failed to reserve default address: %s", str_error(err));
+                port_change_state(port, PORT_DISABLED);
+                goto out_exch;
+        }
+
+        /* Reservation of default address could have blocked */
+        if (port->state != PORT_CONNECTED) {
+                assert(port->state == PORT_ERROR);
+                port_change_state(port, PORT_DISABLED);
                 goto out_exch;
         }
@@ -282 +281 @@
         if (port->state != PORT_ENABLED)
                 usb_hub_clear_port_feature(port->hub, port->port_number, USB_HUB_FEATURE_C_PORT_ENABLE);
-
 out_address:
-        if ((err = usbhc_release_default_address(exch)))
-                port_log(error, port, "Failed to release default address: %s", str_error(err));
-
+        usb_hub_release_default_address(port->hub, exch);
 out_exch:
         usb_device_bus_exchange_end(exch);
-
 out:
         assert(port->state == PORT_ENABLED || port->state == PORT_DISABLED);