Changeset 904dcc6 in mainline

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.

Location:

uspace/lib/usbdev

Files:

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

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

@@ -87 +87 @@
         int interface_no;
 
-        /** Alternative interfaces.
-         * Set to NULL when the driver controls whole device
-         * (i.e. more (or any) interfaces).
-         */
-        usb_alternate_interfaces_t *alternate_interfaces;
+        /** Alternative interfaces. */
+        usb_alternate_interfaces_t alternate_interfaces;
 
         /** Some useful descriptors. */
@@ -178 +175 @@
 
 size_t usb_interface_count_alternates(const uint8_t *, size_t, uint8_t);
-int usb_alternate_interfaces_create(const uint8_t *, size_t, int,
-    usb_alternate_interfaces_t **);
-void usb_alternate_interfaces_destroy(usb_alternate_interfaces_t *);
+int usb_alternate_interfaces_init(usb_alternate_interfaces_t *,
+    const uint8_t *, size_t, int);
+void usb_alternate_interfaces_deinit(usb_alternate_interfaces_t *);
 #endif
 /**

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);
 }
 /**

uspace/lib/usbdev/src/devdrv.c

@@ -536 +536 @@
         usb_dev->driver_data = NULL;
         usb_dev->descriptors.configuration = NULL;
-        usb_dev->alternate_interfaces = NULL;
         usb_dev->pipes_count = 0;
         usb_dev->pipes = NULL;
@@ -560 +559 @@
         /* Create alternate interfaces. We will silently ignore failure. */
         //TODO Why ignore?
-        usb_alternate_interfaces_create(usb_dev->descriptors.configuration,
-            usb_dev->descriptors.configuration_size, usb_dev->interface_no,
-            &usb_dev->alternate_interfaces);
+        usb_alternate_interfaces_init(&usb_dev->alternate_interfaces,
+            usb_dev->descriptors.configuration,
+            usb_dev->descriptors.configuration_size, usb_dev->interface_no);
 
         rc = initialize_other_pipes(endpoints, usb_dev, 0);
@@ -569 +568 @@
                 free(usb_dev->descriptors.configuration);
                 /* Alternate interfaces may be allocated */
-                usb_alternate_interfaces_destroy(usb_dev->alternate_interfaces);
+                usb_alternate_interfaces_deinit(&usb_dev->alternate_interfaces);
                 *errstr_ptr = "pipes initialization";
                 return rc;
@@ -591 +590 @@
                 destroy_current_pipes(dev);
 
-                usb_alternate_interfaces_destroy(dev->alternate_interfaces);
+                usb_alternate_interfaces_deinit(&dev->alternate_interfaces);
                 free(dev->descriptors.configuration);
                 free(dev->driver_data);