Changeset 7aaed09 in mainline for uspace/drv/bus/usb/usbmid/explore.c

Timestamp:

2011-12-18T14:02:30Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c868e2d

Parents:

3b71e84d (diff), 1761268 (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) (7 diffs)

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

@@ -54 +54 @@
  * @return Interface @p interface_no is already present in the list.
  */
-static bool interface_in_list(list_t *list, int interface_no)
+static bool interface_in_list(const list_t *list, int interface_no)
 {
         list_foreach(*list, l) {
-                usbmid_interface_t *iface
-                    = list_get_instance(l, usbmid_interface_t, link);
+                usbmid_interface_t *iface = usbmid_interface_from_link(l);
                 if (iface->interface_no == interface_no) {
                         return true;
@@ -82 +81 @@
         };
 
-        usb_dp_parser_t parser = {
+        static const usb_dp_parser_t parser = {
                 .nesting = usb_dp_standard_descriptor_nesting
         };
 
         const uint8_t *interface_ptr =
-            usb_dp_get_nested_descriptor(&parser, &data, data.data);
-        if (interface_ptr == NULL) {
-                return;
-        }
-
-        do {
-                if (interface_ptr[1] != USB_DESCTYPE_INTERFACE) {
-                        goto next_descriptor;
-                }
-
-                usb_standard_interface_descriptor_t *interface
+            usb_dp_get_nested_descriptor(&parser, &data, config_descriptor);
+
+        /* Walk all descriptors nested in the current configuration decriptor;
+         * i.e. all interface descriptors. */
+        for (;interface_ptr != NULL;
+            interface_ptr = usb_dp_get_sibling_descriptor(
+                &parser, &data, config_descriptor, interface_ptr))
+        {
+                /* The second byte is DESCTYPE byte in all desriptors. */
+                if (interface_ptr[1] != USB_DESCTYPE_INTERFACE)
+                        continue;
+
+                const usb_standard_interface_descriptor_t *interface
                     = (usb_standard_interface_descriptor_t *) interface_ptr;
 
                 /* Skip alternate interfaces. */
-                if (!interface_in_list(list, interface->interface_number)) {
-                        usbmid_interface_t *iface
-                            = malloc(sizeof(usbmid_interface_t));
-                        if (iface == NULL) {
-                                break;
-                        }
-                        link_initialize(&iface->link);
-                        iface->fun = NULL;
-                        iface->interface_no = interface->interface_number;
-                        iface->interface = interface;
-
-                        list_append(&iface->link, list);
-                }
-
-                /* TODO: add the alternatives and create match ids from them
-                 * as well.
-                 */
-
-next_descriptor:
-                interface_ptr = usb_dp_get_sibling_descriptor(&parser, &data,
-                    data.data, interface_ptr);
-
-        } while (interface_ptr != NULL);
-
+                if (interface_in_list(list, interface->interface_number)) {
+                        /* TODO: add the alternatives and create match ids
+                         * for them. */
+                        continue;
+                }
+                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);
+        }
 }
 
@@ -139 +134 @@
         int rc;
 
-        int dev_class = dev->descriptors.device.device_class;
+        unsigned dev_class = dev->descriptors.device.device_class;
         if (dev_class != USB_CLASS_USE_INTERFACE) {
                 usb_log_warning(
-                    "Device class: %d (%s), but expected class 0.\n",
-                    dev_class, usb_str_class(dev_class));
+                    "Device class: %u (%s), but expected class %u.\n",
+                    dev_class, usb_str_class(dev_class),
+                    USB_CLASS_USE_INTERFACE);
                 usb_log_error("Not multi interface device, refusing.\n");
                 return false;
         }
 
-        /* Short cuts to save on typing ;-). */
+        /* Shortcuts to save on typing ;-). */
         const void *config_descriptor_raw = dev->descriptors.configuration;
         size_t config_descriptor_size = dev->descriptors.configuration_size;
@@ -163 +159 @@
         }
 
+        /* Create driver soft-state. */
         usb_mid_t *usb_mid = usb_device_data_alloc(dev, sizeof(usb_mid_t));
         if (!usb_mid) {
@@ -169 +166 @@
         }
 
-        /* Create control function */
+        /* Create control function. */
         usb_mid->ctl_fun = ddf_fun_create(dev->ddf_dev, fun_exposed, "ctl");
         if (usb_mid->ctl_fun == NULL) {
@@ -175 +172 @@
                 return false;
         }
-
         usb_mid->ctl_fun->ops = &mid_device_ops;
 
+        /* Bind control function. */
         rc = ddf_fun_bind(usb_mid->ctl_fun);
         if (rc != EOK) {
@@ -192 +189 @@
             &usb_mid->interface_list);
 
+        /* Start child function for every interface. */
         list_foreach(usb_mid->interface_list, link) {
-                usbmid_interface_t *iface = list_get_instance(link,
-                    usbmid_interface_t, link);
+                usbmid_interface_t *iface = usbmid_interface_from_link(link);
 
                 usb_log_info("Creating child for interface %d (%s).\n",
-                    (int) iface->interface_no,
+                    iface->interface_no,
                     usb_str_class(iface->interface->interface_class));