Changeset 20a3465 in mainline for uspace/drv/bus/usb/usbmid/explore.c

Timestamp:

2011-10-30T19:50:54Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

3ce78580, 48902fa

Parents:

4c3ad56 (diff), 45bf63c (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:

Merge mainline changes

File:

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

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

@@ -73 +73 @@
  * @param list List where to add the interfaces.
  */
-static void create_interfaces(uint8_t *config_descriptor,
+static void create_interfaces(const uint8_t *config_descriptor,
     size_t config_descriptor_size, list_t *list)
 {
-        usb_dp_parser_data_t data = {
+        const usb_dp_parser_data_t data = {
                 .data = config_descriptor,
                 .size = config_descriptor_size,
@@ -86 +86 @@
         };
 
-        uint8_t *interface_ptr = usb_dp_get_nested_descriptor(&parser, &data,
-            data.data);
+        const uint8_t *interface_ptr =
+            usb_dp_get_nested_descriptor(&parser, &data, data.data);
         if (interface_ptr == NULL) {
                 return;
@@ -149 +149 @@
 
         /* Short cuts to save on typing ;-). */
-        uint8_t *config_descriptor_raw = dev->descriptors.configuration;
+        const void *config_descriptor_raw = dev->descriptors.configuration;
         size_t config_descriptor_size = dev->descriptors.configuration_size;
-        usb_standard_configuration_descriptor_t *config_descriptor =
-            (usb_standard_configuration_descriptor_t *) config_descriptor_raw;
+        const usb_standard_configuration_descriptor_t *config_descriptor =
+            config_descriptor_raw;
 
         /* Select the first configuration */
@@ -163 +163 @@
         }
 
+        usb_mid_t *usb_mid = usb_device_data_alloc(dev, 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);
+        usb_mid->ctl_fun->ops = &mid_device_ops;
+
+        rc = ddf_fun_bind(usb_mid->ctl_fun);
         if (rc != EOK) {
                 usb_log_error("Failed to bind control function: %s.\n",
                     str_error(rc));
-                return false;
-        }
+                ddf_fun_destroy(usb_mid->ctl_fun);
+                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);