Changeset b4b534ac in mainline for uspace/lib/usbdev/src/altiface.c

Timestamp:

2016-07-22T08:24:47Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f76d2c2

Parents:

5b18137 (diff), 8351f9a4 (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 from lp:~jan.vesely/helenos/usb

File:

• uspace/lib/usbdev/src/altiface.c (modified) (4 diffs)

uspace/lib/usbdev/src/altiface.c

@@ -34 +34 @@
  */
 
-#include <usb/dev/driver.h>
-#include <usb/dev/request.h>
-#include <usb/debug.h>
+#include <usb/dev/alternate_ifaces.h>
 #include <usb/dev/dp.h>
+#include <assert.h>
 #include <errno.h>
-#include <str_error.h>
-#include <assert.h>
+#include <stdlib.h>
 
 /** Count number of alternate settings of a interface.
@@ -105 +103 @@
         }
 
-        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 +125 @@
         };
 
-        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;
 
@@ -159 +152 @@
                     dp_data.data + dp_data.size : iface_ptr;
 
-                iterator->nested_descriptors_size
-                    = next - iterator->nested_descriptors;
+                iterator->nested_descriptors_size =
+                    next - iterator->nested_descriptors;
+        }
 
-                ++iterator;
-        }
+        alternates->alternatives = alts;
+        alternates->alternative_count = alt_count;
 
         return EOK;