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

Timestamp:

2011-11-05T13:54:01Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

7fc260ff

Parents:

99a1a56

Message:

libusbdev: Convert usb_alternate_interfaces_t interrface to init/deinit.

File:

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

uspace/lib/usbdev/src/altiface.c

@@ -90 +90 @@
  * @return Error code.
  */
-int usb_alternate_interfaces_create(const uint8_t *config_descr,
-    size_t config_descr_size, int interface_number,
-    usb_alternate_interfaces_t **alternates_ptr)
+int usb_alternate_interfaces_init(usb_alternate_interfaces_t *alternates,
+    const uint8_t *config_descr, size_t config_descr_size, int interface_number)
 {
-        assert(alternates_ptr != NULL);
+        assert(alternates != NULL);
         assert(config_descr != NULL);
         assert(config_descr_size > 0);
 
-        *alternates_ptr = NULL;
+        alternates->alternatives = NULL;
+        alternates->alternative_count = 0;
+        alternates->current = 0;
+
         if (interface_number < 0) {
                 return EOK;
-        }
-
-        usb_alternate_interfaces_t *alternates
-            = malloc(sizeof(usb_alternate_interfaces_t));
-        if (alternates == NULL) {
-                return ENOMEM;
         }
 
@@ -114 +110 @@
 
         if (alternates->alternative_count == 0) {
-                free(alternates);
                 return ENOENT;
         }
@@ -121 +116 @@
             sizeof(usb_alternate_interface_descriptors_t));
         if (alternates->alternatives == NULL) {
-                free(alternates);
                 return ENOMEM;
         }
 
-        alternates->current = 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,
@@ -170 +162 @@
         }
 
-        *alternates_ptr = alternates;
-
         return EOK;
 }
 
-void usb_alternate_interfaces_destroy(usb_alternate_interfaces_t *alternate)
+void usb_alternate_interfaces_deinit(usb_alternate_interfaces_t *alternate)
 {
         if (!alternate)
                 return;
         free(alternate->alternatives);
-        free(alternate);
 }
 /**