Changes in uspace/drv/usbmid/usbmid.c [ecb107b:fcafa04] in mainline

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.
@@ -89 +110 @@
  */
 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)
@@ -95 +115 @@
         ddf_fun_t *child = NULL;
         char *child_name = NULL;
+        usbmid_interface_t *child_as_interface = NULL;
         int rc;
 
@@ -116 +137 @@
         }
 
-        iface->fun = child;
 
-        child->driver_data = iface;
+
+        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->ops = &child_device_ops;
 
@@ -144 +172 @@
                 free(child_name);
         }
+        if (child_as_interface != NULL) {
+                free(child_as_interface);
+        }
 
         return rc;