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

Timestamp:

2011-11-05T13:54:01Z (14 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/devdrv.c (modified) (4 diffs)

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);