Changeset 9f583151 in mainline

Timestamp:

2011-11-05T18:35:34Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

e04182d

Parents:

5153b58

Message:

usbmid: Refactor interface creation loop.

Location:

uspace/drv/bus/usb/usbmid

Files:

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

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

@@ -57 +57 @@
 {
         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);
+        }
 }
 

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

@@ -51 +51 @@
         ddf_fun_t *fun;
         /** Interface descriptor. */
-        usb_standard_interface_descriptor_t *interface;
+        const usb_standard_interface_descriptor_t *interface;
         /** Interface number. */
         int interface_no;