Changeset 4603b35 in mainline for uspace/lib/usbhost/src/ddf_helpers.c

Timestamp:

2018-01-16T20:23:54Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

51a51be

Parents:

eeca8a6

Message:

libdrv: merged usbhc default address reservation operations

File:

• uspace/lib/usbhost/src/ddf_helpers.c (modified) (4 diffs)

uspace/lib/usbhost/src/ddf_helpers.c

@@ -114 +114 @@
 
 /**
- * DDF usbhc_iface callback. Calls the bus operation directly.
+ * DDF usbhc_iface callback. Calls the respective bus operation directly.
  *
  * @param fun DDF function of the device (hub) requesting the address.
  */
-static int reserve_default_address(ddf_fun_t *fun)
+static int default_address_reservation(ddf_fun_t *fun, bool reserve)
 {
         assert(fun);
@@ -127 +127 @@
         assert(dev);
 
-        usb_log_debug("Device %d requested default address", dev->address);
-        return bus_reserve_default_address(hcd->bus, dev);
-}
-
-/**
- * DDF usbhc_iface callback. Calls the bus operation directly.
- *
- * @param fun DDF function of the device (hub) releasing the address.
- */
-static int release_default_address(ddf_fun_t *fun)
-{
-        assert(fun);
-        hc_device_t *hcd = dev_to_hcd(ddf_fun_get_dev(fun));
-        device_t *dev = ddf_fun_data_get(fun);
-        assert(hcd);
-        assert(hcd->bus);
-        assert(dev);
-
-        usb_log_debug("Device %d released default address", dev->address);
-        bus_release_default_address(hcd->bus, dev);
-
-        return EOK;
+        usb_log_debug("Device %d %s default address", dev->address, reserve ? "requested" : "releasing");
+        if (reserve) {
+                return bus_reserve_default_address(hcd->bus, dev);
+        } else {
+                bus_release_default_address(hcd->bus, dev);
+                return EOK;
+        }
 }
 
@@ -169 +154 @@
         int err;
 
-        usb_log_debug("Hub %d reported a new %s device on port: %u",
+        usb_log_debug("Hub %d reported a new %s speed device on port: %u",
             hub->address, usb_str_speed(speed), port);
 
@@ -310 +295 @@
 /** USB host controller interface */
 static usbhc_iface_t usbhc_iface = {
-        .reserve_default_address = reserve_default_address,
-        .release_default_address = release_default_address,
+        .default_address_reservation = default_address_reservation,
 
         .device_enumerate = device_enumerate,