Changeset 2dc5a9f in mainline

Timestamp:

2013-01-26T18:59:37Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

f4138ac

Parents:

b208b3b

Message:

libusbdev: Make pipes_destroy a member function.

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

@@ -158 +158 @@
     const usb_endpoint_description_t **, const uint8_t *, size_t, int, int,
     usb_endpoint_mapping_t **, size_t *);
-void usb_device_destroy_pipes(usb_endpoint_mapping_t *, size_t);
+void usb_device_destroy_pipes(usb_device_t *);
 
 usb_pipe_t *usb_device_get_default_pipe(usb_device_t *);

uspace/lib/usbdev/src/devdrv.c

@@ -54 +54 @@
 }
 
-/** Destroy existing pipes of a USB device.
- *
- * @param dev Device where to destroy the pipes.
- */
-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;
-}
-
 /** Change interface setting of a device.
  * This function selects new alternate setting of an interface by issuing
@@ -95 +84 @@
 
         /* Destroy existing pipes. */
-        destroy_current_pipes(dev);
+        usb_device_destroy_pipes(dev);
 
         /* Change the interface itself. */
@@ -257 +246 @@
 /** Destroy pipes previously created by usb_device_create_pipes.
  *
- * @param[in] pipes Endpoint mapping to be destroyed.
- * @param[in] pipes_count Number of endpoints.
- */
-void usb_device_destroy_pipes(usb_endpoint_mapping_t *pipes, size_t pipes_count)
-{
+ * @param[in] usb_dev USB device.
+ */
+void usb_device_destroy_pipes(usb_device_t *usb_dev)
+{
+        assert(usb_dev);
+        assert(usb_dev->pipes || usb_dev->pipes_count == 0);
         /* Destroy the pipes. */
-        for (size_t i = 0; i < pipes_count; ++i) {
-                assert(pipes);
+        for (size_t i = 0; i < usb_dev->pipes_count; ++i) {
                 usb_log_debug2("Unregistering pipe %zu: %spresent.\n",
-                    i, pipes[i].present ? "" : "not ");
-                if (pipes[i].present)
-                        usb_pipe_unregister(&pipes[i].pipe);
-        }
-        free(pipes);
+                    i, usb_dev->pipes[i].present ? "" : "not ");
+                if (usb_dev->pipes[i].present)
+                        usb_pipe_unregister(&usb_dev->pipes[i].pipe);
+        }
+        free(usb_dev->pipes);
+        usb_dev->pipes = NULL;
+        usb_dev->pipes_count = 0;
 }
 
@@ -424 +415 @@
                 usb_dev_session_close(dev->bus_session);
                 /* Destroy existing pipes. */
-                destroy_current_pipes(dev);
+                usb_device_destroy_pipes(dev);
                 /* Ignore errors and hope for the best. */
                 usb_hc_connection_deinitialize(&dev->hc_conn);