Changeset eeca8a6 in mainline for uspace/lib/usbhost/src

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/lib/usbhost/src

Files:

• bus.c (modified) (3 diffs)
• ddf_helpers.c (modified) (11 diffs)
• usb2_bus.c (modified) (1 diff)

uspace/lib/usbhost/src/bus.c

@@ -60 +60 @@
         fibril_mutex_initialize(&bus->guard);
         bus->device_size = device_size;
-        bus->default_address_speed = USB_SPEED_MAX;
 }
 
@@ -495 +494 @@
  * The speed is then used for devices enumerated while the address is reserved.
  */
-int bus_reserve_default_address(bus_t *bus, usb_speed_t speed)
+int bus_reserve_default_address(bus_t *bus, device_t *dev)
 {
         assert(bus);
 
+        int err;
         fibril_mutex_lock(&bus->guard);
-        if (bus->default_address_speed != USB_SPEED_MAX) {
-                fibril_mutex_unlock(&bus->guard);
-                return EAGAIN;
+        if (bus->default_address_owner != NULL) {
+                err = (bus->default_address_owner == dev) ? EINVAL : EAGAIN;
         } else {
-                bus->default_address_speed = speed;
-                fibril_mutex_unlock(&bus->guard);
-                return EOK;
-        }
+                bus->default_address_owner = dev;
+                err = EOK;
+        }
+        fibril_mutex_unlock(&bus->guard);
+        return err;
 }
 
@@ -513 +513 @@
  * Release the default address.
  */
-void bus_release_default_address(bus_t *bus)
+void bus_release_default_address(bus_t *bus, device_t *dev)
 {
         assert(bus);
-        bus->default_address_speed = USB_SPEED_MAX;
+
+        fibril_mutex_lock(&bus->guard);
+        if (bus->default_address_owner != dev) {
+                usb_log_error("Device %d tried to release address, which is not reserved for it.", dev->address);
+        } else {
+                bus->default_address_owner = NULL;
+        }
+        fibril_mutex_unlock(&bus->guard);
 }
 

uspace/lib/usbhost/src/ddf_helpers.c

@@ -117 +117 @@
  *
  * @param fun DDF function of the device (hub) requesting the address.
- * @param speed An USB speed of the device for which the address is reserved.
- */
-static int reserve_default_address(ddf_fun_t *fun, usb_speed_t speed)
+ */
+static int reserve_default_address(ddf_fun_t *fun)
 {
         assert(fun);
@@ -128 +127 @@
         assert(dev);
 
-        usb_log_debug("Device %d requested default address at %s speed",
-            dev->address, usb_str_speed(speed));
-        return bus_reserve_default_address(hcd->bus, speed);
+        usb_log_debug("Device %d requested default address", dev->address);
+        return bus_reserve_default_address(hcd->bus, dev);
 }
 
@@ -148 +146 @@
 
         usb_log_debug("Device %d released default address", dev->address);
-        bus_release_default_address(hcd->bus);
+        bus_release_default_address(hcd->bus, dev);
 
         return EOK;
@@ -157 +155 @@
  *
  * @param fun DDF function of the device (hub) requesting the address.
- */
-static int device_enumerate(ddf_fun_t *fun, unsigned port)
+ * @param speed USB speed of the new device
+ */
+static int device_enumerate(ddf_fun_t *fun, unsigned port, usb_speed_t speed)
 {
         assert(fun);
@@ -170 +169 @@
         int err;
 
-        usb_log_debug("Hub %d reported a new USB device on port: %u",
-            hub->address, port);
-
-        device_t *dev = hcd_ddf_fun_create(hcd);
+        usb_log_debug("Hub %d reported a new %s device on port: %u",
+            hub->address, usb_str_speed(speed), port);
+
+        device_t *dev = hcd_ddf_fun_create(hcd, speed);
         if (!dev) {
                 usb_log_error("Failed to create USB device function.");
@@ -181 +180 @@
         dev->hub = hub;
         dev->port = port;
+        dev->speed = speed;
 
         if ((err = bus_device_enumerate(dev))) {
@@ -380 +380 @@
 }
 
-device_t *hcd_ddf_fun_create(hc_device_t *hc)
+device_t *hcd_ddf_fun_create(hc_device_t *hc, usb_speed_t speed)
 {
         /* Create DDF function for the new device */
@@ -398 +398 @@
         bus_device_init(dev, hc->bus);
         dev->fun = fun;
+        dev->speed = speed;
         return dev;
 }
@@ -464 +465 @@
         assert(hcd);
 
-        if ((err = bus_reserve_default_address(hcd->bus, USB_SPEED_MAX))) {
-                usb_log_error("Failed to reserve default address for roothub setup: %s", str_error(err));
-                return err;
-        }
-
-        device_t *dev = hcd_ddf_fun_create(hcd);
+        device_t *dev = hcd_ddf_fun_create(hcd, USB_SPEED_MAX);
         if (!dev) {
                 usb_log_error("Failed to create function for the root hub.");
-                goto err_default_address;
+                return ENOMEM;
         }
 
@@ -488 +484 @@
         }
 
-        bus_release_default_address(hcd->bus);
         return EOK;
 
@@ -495 +490 @@
 err_usb_dev:
         hcd_ddf_fun_destroy(dev);
-err_default_address:
-        bus_release_default_address(hcd->bus);
         return err;
 }

uspace/lib/usbhost/src/usb2_bus.c

@@ -190 +190 @@
         usb2_bus_t *bus = bus_to_usb2_bus(dev->bus);
 
-        /* The speed of the new device was reported by the hub when reserving
-         * default address.
-         */
-        dev->speed = bus->base.default_address_speed;
         usb_log_debug("Found new %s speed USB device.", usb_str_speed(dev->speed));