Changes in uspace/drv/bus/usb/usbmid/usbmid.c [4c3fef4:d5c1051] in mainline

File:

• uspace/drv/bus/usb/usbmid/usbmid.c (modified) (3 diffs)

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

@@ -45 +45 @@
 #include "usbmid.h"
 
-/**
- * Get USB device description by calling HC and altering the interface field.
+/** Get USB device handle by calling the parent usb_device_t.
  *
  * @param[in] fun Device function the operation is running on.
- * @param[out] desc Device descriptor.
+ * @param[out] handle Device handle.
  * @return Error code.
  */
-static int usb_iface_description(ddf_fun_t *fun, usb_device_desc_t *desc)
+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)
 {
         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);
 
-        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;
-        }
-
-        usb_device_bus_exchange_end(exch);
+        if (iface_no)
+                *iface_no = iface->interface_no;
 
         return EOK;
@@ -78 +74 @@
 /** DDF interface of the child - USB functions. */
 static usb_iface_t child_usb_iface = {
-        .get_my_description = usb_iface_description,
+        .get_my_device_handle = usb_iface_device_handle,
+        .get_my_interface = usb_iface_iface_no,
 };
 
@@ -120 +117 @@
          * class name something humanly understandable.
          */
-        rc = asprintf(&child_name, "%s%hhu",
+        int ret = asprintf(&child_name, "%s%hhu",
             usb_str_class(interface_descriptor->interface_class),
             interface_descriptor->interface_number);
-        if (rc < 0) {
+        if (ret < 0) {
                 return ENOMEM;
         }