Changeset a4e18e1 in mainline for uspace/drv/usbmid/usbmid.c

Timestamp:

2011-04-07T15:04:16Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

36cd378

Parents:

9d06563 (diff), a82889e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

partial merge form usb/development

File:

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

uspace/drv/usbmid/usbmid.c

@@ -79 +79 @@
 };
 
-/** Create new interface for USB MID device.
- *
- * @param fun Backing generic DDF device function (representing interface).
- * @param iface_no Interface number.
- * @return New interface.
- * @retval NULL Error occured.
- */
-usbmid_interface_t *usbmid_interface_create(ddf_fun_t *fun, int iface_no)
-{
-        usbmid_interface_t *iface = malloc(sizeof(usbmid_interface_t));
-        if (iface == NULL) {
-                usb_log_error("Out of memory (wanted %zuB).\n",
-                    sizeof(usbmid_interface_t));
-                return NULL;
-        }
-
-        iface->fun = fun;
-        iface->interface_no = iface_no;
-
-        return iface;
-}
-
 
 /** Spawn new child device from one interface.
  *
  * @param parent Parent MID device.
+ * @param iface Interface information.
  * @param device_descriptor Device descriptor.
  * @param interface_descriptor Interface descriptor.
@@ -110 +89 @@
  */
 int usbmid_spawn_interface_child(usb_device_t *parent,
+    usbmid_interface_t *iface,
     const usb_standard_device_descriptor_t *device_descriptor,
     const usb_standard_interface_descriptor_t *interface_descriptor)
@@ -115 +95 @@
         ddf_fun_t *child = NULL;
         char *child_name = NULL;
-        usbmid_interface_t *child_as_interface = NULL;
         int rc;
 
@@ -137 +116 @@
         }
 
+        iface->fun = child;
 
-
-        child_as_interface = usbmid_interface_create(child,
-            (int) interface_descriptor->interface_number);
-        if (child_as_interface == NULL) {
-                rc = ENOMEM;
-                goto error_leave;
-        }
-
-        child->driver_data = child_as_interface;
+        child->driver_data = iface;
         child->ops = &child_device_ops;
 
@@ -172 +144 @@
                 free(child_name);
         }
-        if (child_as_interface != NULL) {
-                free(child_as_interface);
-        }
 
         return rc;