Changeset 8a01a0b in mainline

Timestamp:

2011-12-14T21:23:59Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

6883abfa

Parents:

0cfb05e

Message:

libusbdev: Remove unused parameters and variables.

Location:

uspace/lib/usbdev

Files:

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

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

@@ -176 +176 @@
     const usb_endpoint_description_t **, const uint8_t *, size_t, int, int,
     usb_endpoint_mapping_t **, size_t *);
-int usb_device_destroy_pipes(const ddf_dev_t *, usb_endpoint_mapping_t *, size_t);
+int usb_device_destroy_pipes(usb_endpoint_mapping_t *, size_t);
 
 void * usb_device_data_alloc(usb_device_t *, size_t);

uspace/lib/usbdev/src/devdrv.c

@@ -205 +205 @@
 static int destroy_current_pipes(usb_device_t *dev)
 {
-        int rc = usb_device_destroy_pipes(dev->ddf_dev,
-            dev->pipes, dev->pipes_count);
+        const int rc = usb_device_destroy_pipes(dev->pipes, dev->pipes_count);
         if (rc != EOK) {
                 return rc;
@@ -423 +422 @@
  * @param[in] pipes_count Number of endpoints.
  */
-int usb_device_destroy_pipes(const ddf_dev_t *dev,
-    usb_endpoint_mapping_t *pipes, size_t pipes_count)
-{
-        assert(dev != NULL);
-
+int usb_device_destroy_pipes(usb_endpoint_mapping_t *pipes, size_t pipes_count)
+{
         if (pipes_count == 0) {
                 assert(pipes == NULL);
@@ -434 +430 @@
         assert(pipes != NULL);
 
-        int rc;
-
-        /* Prepare connection to HC to allow endpoint unregistering. */
-        usb_hc_connection_t hc_conn;
-        rc = usb_hc_connection_initialize_from_device(&hc_conn, dev);
-        if (rc != EOK) {
-                return rc;
-        }
-        /* Open connection to hc for pipe unregister. */
-        rc = usb_hc_connection_open(&hc_conn);
-        if (rc != EOK) {
-                return rc;
-        }
-
         /* Destroy the pipes. */
-        size_t i;
-        for (i = 0; i < pipes_count; i++) {
-                usb_log_debug2("Unregistering pipe %zu (%spresent).\n",
+        for (size_t i = 0; i < pipes_count; ++i) {
+                usb_log_debug2("Unregistering pipe %zu: %spresent.\n",
                     i, pipes[i].present ? "" : "not ");
                 if (pipes[i].present)
@@ -457 +438 @@
         }
 
-        usb_hc_connection_close(&hc_conn);
         free(pipes);