Changes in uspace/drv/bus/usb/usbmid/usbmid.c [58563585:56fd7cf] in mainline

File:

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

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

@@ -31 +31 @@
  */
 
+/* XXX Fix this */
+#define _DDF_DATA_IMPLANT
+
 /**
  * @file
  * Helper functions.
  */
-
 #include <errno.h>
 #include <str_error.h>
 #include <stdlib.h>
 #include <usb_iface.h>
+#include <usb/ddfiface.h>
 #include <usb/dev/pipes.h>
 #include <usb/classes/classes.h>
@@ -45 +48 @@
 #include "usbmid.h"
 
-/** Get USB device handle by calling the parent usb_device_t.
- *
- * @param[in] fun Device function the operation is running on.
- * @param[out] handle Device handle.
- * @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)
+/** Callback for DDF USB interface. */
+static int usb_iface_get_interface_impl(ddf_fun_t *fun, int *iface_no)
 {
         usbmid_interface_t *iface = ddf_fun_data_get(fun);
         assert(iface);
 
-        if (iface_no)
+        if (iface_no != NULL) {
                 *iface_no = iface->interface_no;
+        }
 
         return EOK;
 }
 
-/** DDF interface of the child - USB functions. */
+/** DDF interface of the child - interface function. */
 static usb_iface_t child_usb_iface = {
-        .get_my_device_handle = usb_iface_device_handle,
-        .get_my_interface = usb_iface_iface_no,
+        .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,
 };
 
@@ -91 +81 @@
                 return ret;
         }
+        /* NOTE: usbmid->interface points somewhere, but we did not
+         * allocate that space, so don't touch */
         ddf_fun_destroy(mid_iface->fun);
+        /* NOTE: mid_iface is invalid at this point, it was assigned to
+         * mid_iface->fun->driver_data and freed in ddf_fun_destroy */
         return EOK;
 }
@@ -104 +98 @@
  */
 int usbmid_spawn_interface_child(usb_device_t *parent,
-    usbmid_interface_t **iface_ret,
+    usbmid_interface_t *iface,
     const usb_standard_device_descriptor_t *device_descriptor,
     const usb_standard_interface_descriptor_t *interface_descriptor)
@@ -125 +119 @@
 
         /* Create the device. */
-        child = usb_device_ddf_fun_create(parent, fun_inner, child_name);
+        child = ddf_fun_create(parent->ddf_dev, fun_inner, child_name);
         free(child_name);
         if (child == NULL) {
@@ -141 +135 @@
         }
 
-        list_foreach(match_ids.ids, link, match_id_t, match_id) {
+        list_foreach(match_ids.ids, link) {
+                match_id_t *match_id = list_get_instance(link, match_id_t, link);
                 rc = ddf_fun_add_match_id(child, match_id->id, match_id->score);
                 if (rc != EOK) {
@@ -150 +145 @@
         }
         clean_match_ids(&match_ids);
-        ddf_fun_set_ops(child, &child_device_ops);
-
-        usbmid_interface_t *iface = ddf_fun_data_alloc(child, sizeof(*iface));
-
-        iface->fun = child;
-        iface->interface_no = interface_descriptor->interface_number;
-        link_initialize(&iface->link);
 
         rc = ddf_fun_bind(child);
@@ -164 +152 @@
                 return rc;
         }
-        *iface_ret = iface;
+
+        iface->fun = child;
+        ddf_fun_data_implant(child, iface);
+        ddf_fun_set_ops(child, &child_device_ops);
 
         return EOK;