usb/storage: a couple defines from drivers/usb/storage/transport.h to include/linux/usb/storage.h

This moves the BOT data structures for CBW and CSW from drivers internal
header file to global include able file in include/.
The storage gadget is using the same name for CSW but a different for
CBW so I fix it up properly. The same goes for the ub driver and keucr
driver in staging.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 39 insertions, 0 deletions

diff --git a/include/linux/usb/storage.h b/include/linux/usb/storage.h
index d7fc910f1dc..87a94bf34d4 100644
--- a/include/linux/usb/storage.h
+++ b/include/linux/usb/storage.h
@@ -45,4 +45,43 @@
 
 #define USB_PR_DEVICE   0xff            /* Use device's value */
 
+ /*
+  * Bulk only data structures
+  */
+
+/* command block wrapper */
+struct bulk_cb_wrap {
+        __le32  Signature;              /* contains 'USBC' */
+        __u32   Tag;                    /* unique per command id */
+        __le32  DataTransferLength;     /* size of data */
+        __u8    Flags;                  /* direction in bit 0 */
+        __u8    Lun;                    /* LUN normally 0 */
+        __u8    Length;                 /* of of the CDB */
+        __u8    CDB[16];                /* max command */
+};
+
+#define US_BULK_CB_WRAP_LEN     31
+#define US_BULK_CB_SIGN         0x43425355      /*spells out USBC */
+#define US_BULK_FLAG_IN         1
+#define US_BULK_FLAG_OUT        0
+
+/* command status wrapper */
+struct bulk_cs_wrap {
+        __le32  Signature;      /* should = 'USBS' */
+        __u32   Tag;            /* same as original command */
+        __le32  Residue;        /* amount not transferred */
+        __u8    Status;         /* see below */
+        __u8    Filler[18];
+};
+
+#define US_BULK_CS_WRAP_LEN     13
+#define US_BULK_CS_SIGN         0x53425355      /* spells out 'USBS' */
+#define US_BULK_STAT_OK         0
+#define US_BULK_STAT_FAIL       1
+#define US_BULK_STAT_PHASE      2
+
+/* bulk-only class specific requests */
+#define US_BULK_RESET_REQUEST   0xff
+#define US_BULK_GET_MAX_LUN     0xfe
+
 #endif