Changeset c280d7e in mainline for uspace/drv/bus/usb/usbmid/usbmid.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/drv/bus/usb/usbmid/usbmid.c (modified) (2 diffs)

uspace/drv/bus/usb/usbmid/usbmid.c

@@ -45 +45 @@
 #include "usbmid.h"
 
-/** Get USB device handle by calling the parent usb_device_t.
+/**
+ * Get USB device description by calling HC and altering the interface field.
  *
  * @param[in] fun Device function the operation is running on.
- * @param[out] handle Device handle.
+ * @param[out] desc Device descriptor.
  * @return Error code.
  */
-static int usb_iface_device_handle(ddf_fun_t *fun, devman_handle_t *handle)
-{
-        assert(fun);
-        assert(handle);
-        usb_device_t *usb_dev = usb_device_get(ddf_fun_get_dev(fun));
-        *handle = usb_device_get_devman_handle(usb_dev);
-        return EOK;
-}
-
-/** Callback for DDF USB get interface. */
-static int usb_iface_iface_no(ddf_fun_t *fun, int *iface_no)
+static int usb_iface_description(ddf_fun_t *fun, usb_device_desc_t *desc)
 {
         usbmid_interface_t *iface = ddf_fun_data_get(fun);
         assert(iface);
+        usb_device_t *usb_dev = ddf_dev_data_get(ddf_fun_get_dev(fun));
+        assert(usb_dev);
 
-        if (iface_no)
-                *iface_no = iface->interface_no;
+        async_exch_t *exch = usb_device_bus_exchange_begin(usb_dev);
+        if (!exch)
+                return EPARTY;
+
+        usb_device_desc_t tmp_desc;
+        const int ret = usb_get_my_description(exch, &tmp_desc);
+
+        if (ret == EOK && desc) {
+                *desc = tmp_desc;
+                desc->iface = iface->interface_no;
+        }
 
         return EOK;
@@ -74 +76 @@
 /** DDF interface of the child - USB functions. */
 static usb_iface_t child_usb_iface = {
-        .get_my_device_handle = usb_iface_device_handle,
-        .get_my_interface = usb_iface_iface_no,
+        .get_my_description = usb_iface_description,
 };