summaryrefslogtreecommitdiff
path: root/include/scsi
diff options
context:
space:
mode:
authorMichal Nazarewicz <mina86@mina86.com>2010-10-07 14:46:15 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2010-10-22 10:22:07 -0700
commit0a6a717ceff67f887b16783ce891f5dcf846f1fc (patch)
tree0c8ed32e970e9cbbb4cc64981cba9ae2694f6377 /include/scsi
parent0a2b8a0d1101179fdebc974a7c72b514aede9d9d (diff)
downloadlinux-3.10-0a6a717ceff67f887b16783ce891f5dcf846f1fc.tar.gz
linux-3.10-0a6a717ceff67f887b16783ce891f5dcf846f1fc.tar.bz2
linux-3.10-0a6a717ceff67f887b16783ce891f5dcf846f1fc.zip
USB: gadget: storage: reuse definitions from scsi.h header file
This commit changes storage_common.h, file_storage.c and f_mass_storage.c to use definitions of SCSI commands from scsi/scsi.h file instead of redefining the commands in storage_common.c. scsi/scsi.h header file was missing READ_FORMAT_CAPACITIES and READ_HEADER so this commit also add those to the header. Signed-off-by: Michal Nazarewicz <mina86@mina86.com> Cc: Alan Stern <stern@rowland.harvard.edu> Cc: James Bottomley <James.Bottomley@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/scsi')
-rw-r--r--include/scsi/scsi.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
index 8fcb6e0e9e7..1418e9010f3 100644
--- a/include/scsi/scsi.h
+++ b/include/scsi/scsi.h
@@ -67,6 +67,7 @@ struct scsi_cmnd;
#define SEND_DIAGNOSTIC 0x1d
#define ALLOW_MEDIUM_REMOVAL 0x1e
+#define READ_FORMAT_CAPACITIES 0x23
#define SET_WINDOW 0x24
#define READ_CAPACITY 0x25
#define READ_10 0x28
@@ -96,6 +97,7 @@ struct scsi_cmnd;
#define WRITE_SAME 0x41
#define UNMAP 0x42
#define READ_TOC 0x43
+#define READ_HEADER 0x44
#define LOG_SELECT 0x4c
#define LOG_SENSE 0x4d
#define XDWRITEREAD_10 0x53