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

Timestamp:

2018-01-20T03:02:36Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60d3f35

Parents:

3cdaa7f

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-20 03:02:32)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-20 03:02:36)

Message:

libdrv: usb iface callbacks joined

In addition to handle and current interface, it is good for the device
to know its address and speed. Also, it is expected to add some other
fields (stats, info tied to devices of specific speed and so on) in the
future. Instead of adding yet another call, join those two and let HC
fill a description structure.

File:

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

uspace/lib/usbhost/src/ddf_helpers.c

@@ -224 +224 @@
 }
 
-/** Gets handle of the respective device.
+/**
+ * Gets description of the device that is calling.
  *
  * @param[in] fun Device function.
- * @param[out] handle Place to write the handle.
+ * @param[out] desc Device descriptor to be filled.
  * @return Error code.
  */
-static int get_my_device_handle(ddf_fun_t *fun, devman_handle_t *handle)
-{
-        assert(fun);
-        if (handle)
-                *handle = ddf_fun_get_handle(fun);
+static int get_device_description(ddf_fun_t *fun, usb_device_desc_t *desc)
+{
+        assert(fun);
+        device_t *dev = ddf_fun_data_get(fun);
+        assert(dev);
+
+        if (!desc)
+                return EOK;
+
+        *desc = (usb_device_desc_t) {
+                .address = dev->address,
+                .speed = dev->speed,
+                .handle = ddf_fun_get_handle(fun),
+                .iface = -1,
+        };
         return EOK;
 }
@@ -290 +301 @@
 /** USB device interface */
 static usb_iface_t usb_iface = {
-        .get_my_device_handle = get_my_device_handle,
+        .get_my_description = get_device_description,
 };