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

Timestamp:

2011-07-26T21:17:29Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

051e6ac, 0837ab4

Parents:

2f02ee25 (diff), 75aa59a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

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

@@ -47 +47 @@
 #define BULK_OUT_EP 1
 
-extern int usb_massstor_data_in(usbmast_fun_t *, uint32_t, const void *,
-    size_t, void *, size_t, size_t *);
-extern int usb_massstor_data_out(usbmast_fun_t *, uint32_t, const void *,
-    size_t, const void *, size_t, size_t *);
+typedef enum cmd_status {
+        CMDS_GOOD,
+        CMDS_FAILED
+} 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 *);