Changeset 229629d in mainline

Timestamp:

2011-10-13T21:24:40Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

344a0ac

Parents:

359d96f

Message:

usbmid: Use new usb_mid_t to store all the interfaces and functions.

Location:

uspace/drv/bus/usb/usbmid

Files:

• explore.c (modified) (2 diffs)
• usbmid.h (modified) (1 diff)

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

@@ -163 +163 @@
         }
 
+        usb_mid_t *usb_mid = malloc(sizeof(usb_mid_t));
+        if (!usb_mid) {
+                usb_log_error("Failed to create USB MID structure.\n");
+                return false;
+        }
+
         /* Create control function */
-        ddf_fun_t *ctl_fun = ddf_fun_create(dev->ddf_dev, fun_exposed, "ctl");
-        if (ctl_fun == NULL) {
+        usb_mid->ctl_fun = ddf_fun_create(dev->ddf_dev, fun_exposed, "ctl");
+        if (usb_mid->ctl_fun == NULL) {
                 usb_log_error("Failed to create control function.\n");
-                return false;
-        }
-
-        ctl_fun->ops = &mid_device_ops;
-
-        rc = ddf_fun_bind(ctl_fun);
+                free(usb_mid);
+                return false;
+        }
+
+        usb_mid->ctl_fun->ops = &mid_device_ops;
+
+        rc = ddf_fun_bind(usb_mid->ctl_fun);
         if (rc != EOK) {
-                ddf_fun_destroy(ctl_fun);
                 usb_log_error("Failed to bind control function: %s.\n",
                     str_error(rc));
-                return false;
-        }
+                ddf_fun_destroy(usb_mid->ctl_fun);
+                free(usb_mid);
+                return false;
+        }
+
 
         /* Create interface children. */
-        list_t interface_list;
-        list_initialize(&interface_list);
+        list_initialize(&usb_mid->interface_list);
         create_interfaces(config_descriptor_raw, config_descriptor_size,
-            &interface_list);
-
-        list_foreach(interface_list, link) {
+            &usb_mid->interface_list);
+
+        list_foreach(usb_mid->interface_list, link) {
                 usbmid_interface_t *iface = list_get_instance(link,
                     usbmid_interface_t, link);
@@ -201 +209 @@
                 }
         }
+        dev->driver_data = usb_mid;
 
         return true;

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

@@ -58 +58 @@
 } usbmid_interface_t;
 
+/** Container to hold all the function pointers */
+typedef struct usb_mid {
+        ddf_fun_t *ctl_fun;
+        list_t interface_list;
+} usb_mid_t;
+
 bool usbmid_explore_device(usb_device_t *);
 int usbmid_spawn_interface_child(usb_device_t *, usbmid_interface_t *,