Changeset b361bdd in mainline

Timestamp:

2011-07-03T10:36:22Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3f08fd2b

Parents:

ec62681

Message:

More redundant arguments.

Location:

uspace/drv/bus/usb/usbmast

Files:

• mast.c (modified) (2 diffs)
• mast.h (modified) (1 diff)

uspace/drv/bus/usb/usbmast/mast.c

@@ -154 +154 @@
  *
  * @param dev Device to be reseted.
- * @param bulk_in_idx Index of bulk in pipe.
- * @param bulk_out_idx Index of bulk out pipe.
- */
-void usb_massstor_reset_recovery(usb_device_t *dev,
-    size_t bulk_in_idx, size_t bulk_out_idx)
+ */
+void usb_massstor_reset_recovery(usb_device_t *dev)
 {
         /* We would ignore errors here because if this fails
@@ -164 +161 @@
          */
         usb_massstor_reset(dev);
-        usb_pipe_clear_halt(&dev->ctrl_pipe, dev->pipes[bulk_in_idx].pipe);
-        usb_pipe_clear_halt(&dev->ctrl_pipe, dev->pipes[bulk_out_idx].pipe);
+        usb_pipe_clear_halt(&dev->ctrl_pipe, dev->pipes[BULK_IN_EP].pipe);
+        usb_pipe_clear_halt(&dev->ctrl_pipe, dev->pipes[BULK_OUT_EP].pipe);
 }
 

uspace/drv/bus/usb/usbmast/mast.h

@@ -66 +66 @@
     size_t, void *, size_t, size_t *);
 int usb_massstor_reset(usb_device_t *);
-void usb_massstor_reset_recovery(usb_device_t *, size_t, size_t);
+void usb_massstor_reset_recovery(usb_device_t *);
 int usb_massstor_get_max_lun(usb_device_t *);
 size_t usb_masstor_get_lun_count(usb_device_t *);