Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 348748b0 authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Sarah Sharp
Browse files

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



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: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
parent c898add5

drivers/usb/storage/uas.c

+1 −55
Original line number Diff line number Diff line
@@ -15,6 +15,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>
@@ -23,49 +24,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.
@@ -80,18 +38,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;

include/linux/usb/uas.h

0 → 100644
+61 −0
Original line number Diff line number Diff line 
#ifndef __USB_UAS_H__

#define __USB_UAS_H__



#include <scsi/scsi.h>

#include <scsi/scsi_cmnd.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];

};



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,

};

#endif