Changeset b6812a1 in mainline

Timestamp:

2013-01-26T17:25:05Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

ad97131

Parents:

6785b538

Message:

libusbdev: Make list of alternate interfaces const.

Location:

uspace/lib/usbdev

Files:

• include/usb/dev/driver.h (modified) (2 diffs)
• src/altiface.c (modified) (3 diffs)

uspace/lib/usbdev/include/usb/dev/driver.h

@@ -59 +59 @@
 typedef struct {
         /** Array of alternate interfaces descriptions. */
-        usb_alternate_interface_descriptors_t *alternatives;
+        const usb_alternate_interface_descriptors_t *alternatives;
         /** Size of @c alternatives array. */
         size_t alternative_count;
@@ -89 +89 @@
          */
         int interface_no;
-
         /** Alternative interfaces. */
         usb_alternate_interfaces_t alternate_interfaces;

uspace/lib/usbdev/src/altiface.c

@@ -105 +105 @@
         }
 
-        alternates->alternative_count
-            = usb_interface_count_alternates(config_descr, config_descr_size,
-                interface_number);
+        const size_t alt_count =usb_interface_count_alternates(config_descr,
+            config_descr_size, interface_number);
 
-        if (alternates->alternative_count == 0) {
+        if (alt_count == 0) {
                 return ENOENT;
         }
 
-        alternates->alternatives = calloc(alternates->alternative_count,
+        usb_alternate_interface_descriptors_t *alts = calloc(alt_count,
             sizeof(usb_alternate_interface_descriptors_t));
-        if (alternates->alternatives == NULL) {
+        if (alts == NULL) {
                 return ENOMEM;
         }
@@ -128 +127 @@
         };
 
-        usb_alternate_interface_descriptors_t *iterator
-            = &alternates->alternatives[0];
-
-        const usb_alternate_interface_descriptors_t *end
-            = &alternates->alternatives[alternates->alternative_count];
 
         const void *iface_ptr =
             usb_dp_get_nested_descriptor(&dp_parser, &dp_data, dp_data.data);
 
-        while (iface_ptr != NULL && iterator < end) {
+        usb_alternate_interface_descriptors_t *iterator = alts;
+        for (; iface_ptr != NULL && iterator < &alts[alt_count]; ++iterator) {
                 const usb_standard_interface_descriptor_t *iface = iface_ptr;
 
@@ -165 +160 @@
         }
 
+        alternates->alternatives = alts;
+        alternates->alternative_count = alt_count;
+
         return EOK;
 }