Changeset 6883abfa in mainline

Timestamp:

2011-12-14T21:29:38Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

441633f

Parents:

8a01a0b

Message:

libusbdev: usb_destroy_pipes would only ever return EOK.

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(usb_endpoint_mapping_t *, size_t);
+void 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

@@ -201 +201 @@
  *
  * @param dev Device where to destroy the pipes.
- * @return Error code.
- */
-static int destroy_current_pipes(usb_device_t *dev)
-{
-        const int rc = usb_device_destroy_pipes(dev->pipes, dev->pipes_count);
-        if (rc != EOK) {
-                return rc;
-        }
-
+ */
+static void destroy_current_pipes(usb_device_t *dev)
+{
+        usb_device_destroy_pipes(dev->pipes, dev->pipes_count);
         dev->pipes = NULL;
         dev->pipes_count = 0;
-
-        return EOK;
-}
-
+}
+/*----------------------------------------------------------------------------*/
 /** Change interface setting of a device.
  * This function selects new alternate setting of an interface by issuing
@@ -248 +241 @@
 
         /* Destroy existing pipes. */
-        rc = destroy_current_pipes(dev);
-        if (rc != EOK) {
-                return rc;
-        }
+        destroy_current_pipes(dev);
 
         /* Change the interface itself. */
@@ -422 +412 @@
  * @param[in] pipes_count Number of endpoints.
  */
-int usb_device_destroy_pipes(usb_endpoint_mapping_t *pipes, size_t pipes_count)
-{
-        if (pipes_count == 0) {
-                assert(pipes == NULL);
-                return EOK;
-        }
-        assert(pipes != NULL);
-
+void usb_device_destroy_pipes(usb_endpoint_mapping_t *pipes, size_t pipes_count)
+{
         /* Destroy the pipes. */
         for (size_t i = 0; i < pipes_count; ++i) {
+                assert(pipes);
                 usb_log_debug2("Unregistering pipe %zu: %spresent.\n",
                     i, pipes[i].present ? "" : "not ");
@@ -437 +422 @@
                         usb_pipe_unregister(&pipes[i].pipe);
         }
-
         free(pipes);
-
-        return EOK;
 }