Changes in uspace/lib/usbdev/src/altiface.c [b208b3b:77ad86c] in mainline

File:

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

uspace/lib/usbdev/src/altiface.c

@@ -34 +34 @@
  */
 
-#include <usb/dev/alternate_ifaces.h>
+#include <usb/dev/driver.h>
+#include <usb/dev/request.h>
+#include <usb/debug.h>
 #include <usb/dev/dp.h>
-#include <malloc.h>
 #include <errno.h>
+#include <str_error.h>
 #include <assert.h>
 
@@ -103 +105 @@
         }
 
-        const size_t alt_count =usb_interface_count_alternates(config_descr,
-            config_descr_size, interface_number);
+        alternates->alternative_count
+            = usb_interface_count_alternates(config_descr, config_descr_size,
+                interface_number);
 
-        if (alt_count == 0) {
+        if (alternates->alternative_count == 0) {
                 return ENOENT;
         }
 
-        usb_alternate_interface_descriptors_t *alts = calloc(alt_count,
+        alternates->alternatives = calloc(alternates->alternative_count,
             sizeof(usb_alternate_interface_descriptors_t));
-        if (alts == NULL) {
+        if (alternates->alternatives == NULL) {
                 return ENOMEM;
         }
@@ -125 +128 @@
         };
 
+        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);
 
-        usb_alternate_interface_descriptors_t *iterator = alts;
-        for (; iface_ptr != NULL && iterator < &alts[alt_count]; ++iterator) {
+        while (iface_ptr != NULL && iterator < end) {
                 const usb_standard_interface_descriptor_t *iface = iface_ptr;
 
@@ -152 +159 @@
                     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;