usb/uas: move UAS structs / defines into a header file

BugLink: http://bugs.launchpad.net/bugs/901215

The protocol specific structures and defines which are used by UAS are
moved into a header files by this patch so it can be accessed by the UAS
gadget as well.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
(cherry picked from commit 348748b0e8cccc675e2f3a1456460ffcd540e1a1)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Herton Krzesinski <herton.krzesinski@canonical.com>

1 files changed, 1 insertions, 55 deletions

diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c
index 012e61ad3db..28fa254ae8d 100644
--- a/drivers/usb/storage/uas.c
+++ b/drivers/usb/storage/uas.c
@@ -14,6 +14,7 @@
 #include <linux/usb.h>
 #include <linux/usb/hcd.h>
 #include <linux/usb/storage.h>
+#include <linux/usb/uas.h>
 
 #include <scsi/scsi.h>
 #include <scsi/scsi_dbg.h>
@@ -22,49 +23,6 @@
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_tcq.h>
 
-/* Common header for all IUs */
-struct iu {
-        __u8 iu_id;
-        __u8 rsvd1;
-        __be16 tag;
-};
-
-enum {
-        IU_ID_COMMAND           = 0x01,
-        IU_ID_STATUS            = 0x03,
-        IU_ID_RESPONSE          = 0x04,
-        IU_ID_TASK_MGMT         = 0x05,
-        IU_ID_READ_READY        = 0x06,
-        IU_ID_WRITE_READY       = 0x07,
-};
-
-struct command_iu {
-        __u8 iu_id;
-        __u8 rsvd1;
-        __be16 tag;
-        __u8 prio_attr;
-        __u8 rsvd5;
-        __u8 len;
-        __u8 rsvd7;
-        struct scsi_lun lun;
-        __u8 cdb[16];   /* XXX: Overflow-checking tools may misunderstand */
-};
-
-/*
- * Also used for the Read Ready and Write Ready IUs since they have the
- * same first four bytes
- */
-struct sense_iu {
-        __u8 iu_id;
-        __u8 rsvd1;
-        __be16 tag;
-        __be16 status_qual;
-        __u8 status;
-        __u8 rsvd7[7];
-        __be16 len;
-        __u8 sense[SCSI_SENSE_BUFFERSIZE];
-};
-
 /*
  * The r00-r01c specs define this version of the SENSE IU data structure.
  * It's still in use by several different firmware releases.
@@ -79,18 +37,6 @@ struct sense_iu_old {
         __u8 sense[SCSI_SENSE_BUFFERSIZE];
 };
 
-enum {
-        CMD_PIPE_ID             = 1,
-        STATUS_PIPE_ID          = 2,
-        DATA_IN_PIPE_ID         = 3,
-        DATA_OUT_PIPE_ID        = 4,
-
-        UAS_SIMPLE_TAG          = 0,
-        UAS_HEAD_TAG            = 1,
-        UAS_ORDERED_TAG         = 2,
-        UAS_ACA                 = 4,
-};
-
 struct uas_dev_info {
         struct usb_interface *intf;
         struct usb_device *udev;