Changeset ec62681 in mainline

Timestamp:

2011-07-03T10:33:48Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b361bdd

Parents:

64e6945d

Message:

Remove redundant arguments.

Location:

uspace/drv/bus/usb/usbmast

Files:

• inquiry.c (modified) (2 diffs)
• main.c (modified) (2 diffs)
• mast.c (modified) (3 diffs)
• mast.h (modified) (2 diffs)

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

@@ -66 +66 @@
  */
 int usb_massstor_inquiry(usb_device_t *dev,
-    size_t bulk_in_idx, size_t bulk_out_idx,
     usb_massstor_inquiry_result_t *inquiry_result)
 {
@@ -81 +80 @@
         int rc;
 
-        rc = usb_massstor_data_in(dev, bulk_in_idx, bulk_out_idx,
-            0xDEADBEEF, 0, (uint8_t *) &inquiry, sizeof(inquiry),
-            &inq_data, sizeof(inq_data), &response_len);
+        rc = usb_massstor_data_in(dev, 0xDEADBEEF, 0, (uint8_t *) &inquiry,
+            sizeof(inquiry), &inq_data, sizeof(inq_data), &response_len);
 
         if (rc != EOK) {

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

@@ -44 +44 @@
 
 #define NAME "usbmast"
-
-#define BULK_IN_EP 0
-#define BULK_OUT_EP 1
 
 #define GET_BULK_IN(dev) ((dev)->pipes[BULK_IN_EP].pipe)
@@ -111 +108 @@
         usb_log_debug("Inquire...\n");
         usb_massstor_inquiry_result_t inquiry;
-        rc = usb_massstor_inquiry(dev, BULK_IN_EP, BULK_OUT_EP, &inquiry);
+        rc = usb_massstor_inquiry(dev, &inquiry);
         if (rc != EOK) {
                 usb_log_warning("Failed to inquire device `%s': %s.\n",

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

@@ -53 +53 @@
 /** Request data from mass storage device.
  *
- * @param bulk_in_pipe Bulk in pipe to the device.
- * @param bulk_out_pipe Bulk out pipe to the device.
  * @param tag Command block wrapper tag (automatically compared with answer).
  * @param lun LUN index.
@@ -65 +63 @@
  */
 int usb_massstor_data_in(usb_device_t *dev,
-    size_t bulk_in_pipe_index, size_t bulk_out_pipe_index,
     uint32_t tag, uint8_t lun, void *cmd, size_t cmd_size,
     void *in_buffer, size_t in_buffer_size, size_t *received_size)
@@ -71 +68 @@
         int rc;
         size_t act_size;
-        usb_pipe_t *bulk_in_pipe = dev->pipes[bulk_in_pipe_index].pipe;
-        usb_pipe_t *bulk_out_pipe = dev->pipes[bulk_out_pipe_index].pipe;
+        usb_pipe_t *bulk_in_pipe = dev->pipes[BULK_IN_EP].pipe;
+        usb_pipe_t *bulk_out_pipe = dev->pipes[BULK_OUT_EP].pipe;
 
         /* Prepare CBW - command block wrapper */

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

@@ -43 +43 @@
 #include <usb/dev/driver.h>
 
+#define BULK_IN_EP 0
+#define BULK_OUT_EP 1
+
 /** Result of SCSI INQUIRY command.
  * This is already parsed structure, not the original buffer returned by
@@ -60 +63 @@
 } usb_massstor_inquiry_result_t;
 
-int usb_massstor_data_in(usb_device_t *dev, size_t, size_t,
-    uint32_t, uint8_t, void *, size_t, void *, size_t, size_t *);
+int usb_massstor_data_in(usb_device_t *dev, uint32_t, uint8_t, void *,
+    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);
 int usb_massstor_get_max_lun(usb_device_t *);
 size_t usb_masstor_get_lun_count(usb_device_t *);
-int usb_massstor_inquiry(usb_device_t *, size_t, size_t,
-    usb_massstor_inquiry_result_t *);
+int usb_massstor_inquiry(usb_device_t *, usb_massstor_inquiry_result_t *);
 const char *usb_str_masstor_scsi_peripheral_device_type(unsigned);