Changeset 96ec0a9 in mainline

Timestamp:

2011-10-29T21:13:56Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

7d9cd62

Parents:

e27c2476

Message:

libusbdev: Add function do properly destroy alternative interfaces.

Location:

uspace/lib/usbdev

Files:

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

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

@@ -174 +174 @@
     usb_device_t **, const char **);
 void usb_device_deinit(usb_device_t *);
+
 void * usb_device_data_alloc(usb_device_t *, size_t);
 
@@ -179 +180 @@
 int usb_alternate_interfaces_create(const uint8_t *, size_t, int,
     usb_alternate_interfaces_t **);
-
+void usb_alternate_interfaces_destroy(usb_alternate_interfaces_t *);
 #endif
 /**

uspace/lib/usbdev/src/altiface.c

@@ -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);
@@ -176 +175 @@
 }
 
-
+void usb_alternate_interfaces_destroy(usb_alternate_interfaces_t *alternate)
+{
+        if (!alternate)
+                return;
+        free(alternate->alternatives);
+        free(alternate);
+}
 /**
  * @}