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

Timestamp:

2011-10-30T19:50:54Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

3ce78580, 48902fa

Parents:

4c3ad56 (diff), 45bf63c (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/lib/usbdev/src/altiface.c (modified) (10 diffs)

uspace/lib/usbdev/src/altiface.c

@@ -48 +48 @@
  * @return Number of alternate interfaces for @p interface_no interface.
  */
-size_t usb_interface_count_alternates(uint8_t *config_descr,
+size_t usb_interface_count_alternates(const uint8_t *config_descr,
     size_t config_descr_size, uint8_t interface_no)
 {
@@ -54 +54 @@
         assert(config_descr_size > 0);
 
-        usb_dp_parser_t dp_parser = {
+        const usb_dp_parser_t dp_parser = {
                 .nesting = usb_dp_standard_descriptor_nesting
         };
-        usb_dp_parser_data_t dp_data = {
+        const usb_dp_parser_data_t dp_data = {
                 .data = config_descr,
                 .size = config_descr_size,
@@ -65 +65 @@
         size_t alternate_count = 0;
 
-        uint8_t *iface_ptr = usb_dp_get_nested_descriptor(&dp_parser,
+        const uint8_t *iface_ptr = usb_dp_get_nested_descriptor(&dp_parser,
             &dp_data, config_descr);
         while (iface_ptr != NULL) {
@@ -90 +90 @@
  * @return Error code.
  */
-int usb_alternate_interfaces_create(uint8_t *config_descr,
+int usb_alternate_interfaces_create(const uint8_t *config_descr,
     size_t config_descr_size, int interface_number,
     usb_alternate_interfaces_t **alternates_ptr)
@@ -98 +98 @@
         assert(config_descr_size > 0);
 
+        *alternates_ptr = NULL;
         if (interface_number < 0) {
-                alternates_ptr = NULL;
                 return EOK;
         }
@@ -105 +105 @@
         usb_alternate_interfaces_t *alternates
             = malloc(sizeof(usb_alternate_interfaces_t));
-
         if (alternates == NULL) {
                 return ENOMEM;
@@ -119 +118 @@
         }
 
-        alternates->alternatives = malloc(alternates->alternative_count
-            * sizeof(usb_alternate_interface_descriptors_t));
+        alternates->alternatives = calloc(alternates->alternative_count,
+            sizeof(usb_alternate_interface_descriptors_t));
         if (alternates->alternatives == NULL) {
                 free(alternates);
@@ -140 +139 @@
             = &alternates->alternatives[0];
 
-        uint8_t *iface_ptr = usb_dp_get_nested_descriptor(&dp_parser,
+        const uint8_t *iface_ptr = usb_dp_get_nested_descriptor(&dp_parser,
             &dp_data, dp_data.data);
         while (iface_ptr != NULL) {
@@ -160 +159 @@
                     dp_data.data, iface_ptr);
                 if (iface_ptr == NULL) {
-                        uint8_t *next = dp_data.data + dp_data.size;
+                        const uint8_t *next = dp_data.data + dp_data.size;
                         cur_alt_iface->nested_descriptors_size
                             = next - cur_alt_iface->nested_descriptors;
@@ -176 +175 @@
 }
 
-
+void usb_alternate_interfaces_destroy(usb_alternate_interfaces_t *alternate)
+{
+        if (!alternate)
+                return;
+        free(alternate->alternatives);
+        free(alternate);
+}
 /**
  * @}