Changeset 9e2132a in mainline

Timestamp:

2012-12-30T20:14:13Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

17bbb28

Parents:

6df4adc4

Message:

usbmid: Don't use ddf_fun_data_implant.

Remove unused pointer to interface descriptor.

Location:

uspace/drv/bus/usb/usbmid

Files:

• explore.c (modified) (2 diffs)
• usbmid.c (modified) (5 diffs)
• usbmid.h (modified) (2 diffs)

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

@@ -111 +111 @@
                 }
 
-                usbmid_interface_t *iface = malloc(sizeof(usbmid_interface_t));
-                if (iface == NULL) {
-                        //TODO: Do something about that failure.
-                        break;
-                }
-
-                link_initialize(&iface->link);
-                iface->fun = NULL;
-                iface->interface_no = interface->interface_number;
-                iface->interface = interface;
-
-                list_append(&iface->link, list);
 
                 usb_log_info("Creating child for interface %d (%s).\n",
@@ -128 +116 @@
                     usb_str_class(interface->interface_class));
 
-                const int rc = usbmid_spawn_interface_child(usb_dev, iface,
+                usbmid_interface_t *iface = NULL;
+                const int rc = usbmid_spawn_interface_child(usb_dev, &iface,
                     &usb_dev->descriptors.device, interface);
                 if (rc != EOK) {
+                        //TODO: Do something about that failure.
                         usb_log_error("Failed to create interface child for "
                             "%d (%s): %s.\n", interface->interface_number,
                             usb_str_class(interface->interface_class),
                             str_error(rc));
+                } else {
+                        list_append(&iface->link, list);
                 }
         }

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

@@ -30 +30 @@
  * @{
  */
-
-/* XXX Fix this */
-#define _DDF_DATA_IMPLANT
 
 /**
@@ -81 +78 @@
                 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;
 }
@@ -98 +91 @@
  */
 int usbmid_spawn_interface_child(usb_device_t *parent,
-    usbmid_interface_t *iface,
+    usbmid_interface_t **iface_ret,
     const usb_standard_device_descriptor_t *device_descriptor,
     const usb_standard_interface_descriptor_t *interface_descriptor)
@@ -145 +138 @@
         }
         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);
@@ -152 +152 @@
                 return rc;
         }
-
-        iface->fun = child;
-        ddf_fun_data_implant(child, iface);
-        ddf_fun_set_ops(child, &child_device_ops);
+        *iface_ret = iface;
 
         return EOK;

uspace/drv/bus/usb/usbmid/usbmid.h

@@ -50 +50 @@
         /** Function container. */
         ddf_fun_t *fun;
-        /** Interface descriptor. */
-        const usb_standard_interface_descriptor_t *interface;
         /** Interface number. */
         int interface_no;
@@ -65 +63 @@
 
 int usbmid_explore_device(usb_device_t *);
-int usbmid_spawn_interface_child(usb_device_t *, usbmid_interface_t *,
+int usbmid_spawn_interface_child(usb_device_t *, usbmid_interface_t **,
     const usb_standard_device_descriptor_t *,
     const usb_standard_interface_descriptor_t *);