Changeset eeca8a6 in mainline for uspace/lib/usbhost/src/ddf_helpers.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/lib/usbhost/src/ddf_helpers.c (modified) (11 diffs)

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;
 }