Changeset de3432b in mainline for uspace/drv/bus/usb/usbmast/bo_trans.h

Timestamp:

2011-07-24T18:09:09Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1bfae13, 358dc13, eff10e03

Parents:

582fe388

Message:

Allow simpler passing around / processing of SCSI commands by creating
scsi_cmd_t structure which holds input and output arguments of a SCSI
command and is loosely modeled after the SAM-4 Execute Command procedure
call.

File:

• uspace/drv/bus/usb/usbmast/bo_trans.h (modified) (1 diff)

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

@@ -52 +52 @@
 } cmd_status_t;
 
-extern int usb_massstor_data_in(usbmast_fun_t *, uint32_t, const void *,
-    size_t, void *, size_t, size_t *, cmd_status_t *);
-extern int usb_massstor_data_out(usbmast_fun_t *, uint32_t, const void *,
-    size_t, const void *, size_t, size_t *, cmd_status_t *);
+/** SCSI command.
+ *
+ * Contains (a subset of) the input and output arguments of SCSI
+ * Execute Command procedure call (see SAM-4 chapter 5.1)
+ */
+typedef struct {
+        /*
+         * Related to IN fields
+         */
+
+        /** Command Descriptor Block */
+        void *cdb;
+        /** CDB size in bytes */
+        size_t cdb_size;
+
+        /** Outgoing data */
+        const void *data_out;
+        /** Size of outgoing data in bytes */
+        size_t data_out_size;
+
+        /*
+         * Related to OUT fields
+         */
+
+        /** Buffer for incoming data */
+        void *data_in;
+        /** Size of input buffer in bytes */
+        size_t data_in_size;
+
+        /** Number of bytes actually received */
+        size_t rcvd_size;
+
+        /** Status */
+        cmd_status_t status;
+} scsi_cmd_t;
+
+extern int usb_massstor_cmd(usbmast_fun_t *, uint32_t, scsi_cmd_t *);
 extern int usb_massstor_reset(usbmast_dev_t *);
 extern void usb_massstor_reset_recovery(usbmast_dev_t *);