Changes in uspace/drv/bus/usb/usbmid/usbmid.c [317a463:a92ce4ef] in mainline

File:

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

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

@@ -45 +45 @@
 
 /** Callback for DDF USB interface. */
-static int usb_iface_get_interface_impl(ddf_fun_t *fun, int *iface_no)
+static int usb_iface_get_interface_impl(ddf_fun_t *fun, devman_handle_t handle,
+    int *iface_no)
 {
         assert(fun);
@@ -61 +62 @@
 /** DDF interface of the child - interface function. */
 static usb_iface_t child_usb_iface = {
-        .get_hc_handle = usb_iface_get_hc_handle_device_impl,
-        .get_my_address = usb_iface_get_my_address_forward_impl,
-        .get_my_interface = usb_iface_get_interface_impl,
+        .get_hc_handle = usb_iface_get_hc_handle_hub_child_impl,
+        .get_address = usb_iface_get_address_hub_impl,
+        .get_interface = usb_iface_get_interface_impl
 };
 
@@ -109 +110 @@
          * class name something humanly understandable.
          */
-        rc = asprintf(&child_name, "%s%hhu",
+        rc = asprintf(&child_name, "%s%d",
             usb_str_class(interface_descriptor->interface_class),
-            interface_descriptor->interface_number);
+            (int) interface_descriptor->interface_number);
         if (rc < 0) {
                 return ENOMEM;
@@ -122 +123 @@
                 return ENOMEM;
         }
+
+        iface->fun = child;
+
+        child->driver_data = iface;
+        child->ops = &child_device_ops;
 
         rc = usb_device_create_match_ids_from_interface(device_descriptor,
@@ -137 +143 @@
         }
 
-        iface->fun = child;
-        child->driver_data = iface;
-        child->ops = &child_device_ops;
-
         return EOK;
 }