Changeset 66ee26a in mainline for uspace/lib/usbdev/src/devdrv.c

Timestamp:

2011-12-14T21:57:55Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

da2f1c9e

Parents:

64e3dad

Message:

libusbdev: Remove wrapper.

File:

• uspace/lib/usbdev/src/devdrv.c (modified) (5 diffs)

uspace/lib/usbdev/src/devdrv.c

@@ -57 +57 @@
 static const usb_driver_t *driver = NULL;
 
-
 /** Main routine of USB device driver.
  *
@@ -76 +75 @@
         return ddf_driver_main(&generic_driver);
 }
-
+/*----------------------------------------------------------------------------*/
 /** Count number of pipes the driver expects.
  *
@@ -88 +87 @@
         for (count = 0; endpoints != NULL && endpoints[count] != NULL; ++count);
         return count;
-}
-
-/** Initialize endpoint pipes, excluding default control one.
- *
- * @param drv The device driver.
- * @param dev Device to be initialized.
- * @return Error code.
- */
-static int initialize_other_pipes(const usb_endpoint_description_t **endpoints,
-    usb_device_t *dev, int alternate_setting)
-{
-        assert(dev);
-
-        usb_endpoint_mapping_t *pipes = NULL;
-        size_t pipes_count = 0;
-
-        const int rc = usb_device_create_pipes(&dev->wire, endpoints,
-            dev->descriptors.configuration, dev->descriptors.configuration_size,
-            dev->interface_no, alternate_setting, &pipes, &pipes_count);
-
-        if (rc == EOK) {
-                dev->pipes = pipes;
-                dev->pipes_count = pipes_count;
-        }
-
-        return rc;
 }
 /*----------------------------------------------------------------------------*/
@@ -241 +214 @@
 
         /* Create new pipes. */
-        rc = initialize_other_pipes(endpoints, dev, (int) alternate_setting);
+        rc = usb_device_create_pipes(&dev->wire, endpoints,
+            dev->descriptors.configuration, dev->descriptors.configuration_size,
+            dev->interface_no, (int)alternate_setting,
+            &dev->pipes, &dev->pipes_count);
 
         return rc;
@@ -487 +463 @@
             (rc == EOK) ? usb_dev->alternate_interfaces.current : 0;
 
-        /* TODO Add comment here. */
-        rc = initialize_other_pipes(endpoints, usb_dev, alternate_iface);
+        /* Create and register other pipes than default control (EP 0) */
+        rc = usb_device_create_pipes(&usb_dev->wire, endpoints,
+            usb_dev->descriptors.configuration,
+            usb_dev->descriptors.configuration_size,
+            usb_dev->interface_no, (int)alternate_iface,
+            &usb_dev->pipes, &usb_dev->pipes_count);
         if (rc != EOK) {
                 usb_hc_connection_close(&usb_dev->hc_conn);