diff options
author | Michal Nazarewicz <mina86@mina86.com> | 2010-10-07 08:46:15 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-22 13:22:07 -0400 |
commit | 0a6a717ceff67f887b16783ce891f5dcf846f1fc (patch) | |
tree | 0c8ed32e970e9cbbb4cc64981cba9ae2694f6377 /drivers/usb/gadget/storage_common.c | |
parent | 0a2b8a0d1101179fdebc974a7c72b514aede9d9d (diff) |
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 'drivers/usb/gadget/storage_common.c')
-rw-r--r-- | drivers/usb/gadget/storage_common.c | 34 |
1 files changed, 2 insertions, 32 deletions
diff --git a/drivers/usb/gadget/storage_common.c b/drivers/usb/gadget/storage_common.c index 0a7df3db71f..3b513bafaf2 100644 --- a/drivers/usb/gadget/storage_common.c +++ b/drivers/usb/gadget/storage_common.c | |||
@@ -53,8 +53,9 @@ | |||
53 | */ | 53 | */ |
54 | 54 | ||
55 | 55 | ||
56 | #include <asm/unaligned.h> | ||
57 | #include <linux/usb/storage.h> | 56 | #include <linux/usb/storage.h> |
57 | #include <scsi/scsi.h> | ||
58 | #include <asm/unaligned.h> | ||
58 | 59 | ||
59 | 60 | ||
60 | /* | 61 | /* |
@@ -153,10 +154,6 @@ | |||
153 | 154 | ||
154 | /*-------------------------------------------------------------------------*/ | 155 | /*-------------------------------------------------------------------------*/ |
155 | 156 | ||
156 | /* SCSI device types */ | ||
157 | #define TYPE_DISK 0x00 | ||
158 | #define TYPE_CDROM 0x05 | ||
159 | |||
160 | /* Bulk-only data structures */ | 157 | /* Bulk-only data structures */ |
161 | 158 | ||
162 | /* Command Block Wrapper */ | 159 | /* Command Block Wrapper */ |
@@ -208,33 +205,6 @@ struct interrupt_data { | |||
208 | /* Length of a SCSI Command Data Block */ | 205 | /* Length of a SCSI Command Data Block */ |
209 | #define MAX_COMMAND_SIZE 16 | 206 | #define MAX_COMMAND_SIZE 16 |
210 | 207 | ||
211 | /* SCSI commands that we recognize */ | ||
212 | #define SC_FORMAT_UNIT 0x04 | ||
213 | #define SC_INQUIRY 0x12 | ||
214 | #define SC_MODE_SELECT_6 0x15 | ||
215 | #define SC_MODE_SELECT_10 0x55 | ||
216 | #define SC_MODE_SENSE_6 0x1a | ||
217 | #define SC_MODE_SENSE_10 0x5a | ||
218 | #define SC_PREVENT_ALLOW_MEDIUM_REMOVAL 0x1e | ||
219 | #define SC_READ_6 0x08 | ||
220 | #define SC_READ_10 0x28 | ||
221 | #define SC_READ_12 0xa8 | ||
222 | #define SC_READ_CAPACITY 0x25 | ||
223 | #define SC_READ_FORMAT_CAPACITIES 0x23 | ||
224 | #define SC_READ_HEADER 0x44 | ||
225 | #define SC_READ_TOC 0x43 | ||
226 | #define SC_RELEASE 0x17 | ||
227 | #define SC_REQUEST_SENSE 0x03 | ||
228 | #define SC_RESERVE 0x16 | ||
229 | #define SC_SEND_DIAGNOSTIC 0x1d | ||
230 | #define SC_START_STOP_UNIT 0x1b | ||
231 | #define SC_SYNCHRONIZE_CACHE 0x35 | ||
232 | #define SC_TEST_UNIT_READY 0x00 | ||
233 | #define SC_VERIFY 0x2f | ||
234 | #define SC_WRITE_6 0x0a | ||
235 | #define SC_WRITE_10 0x2a | ||
236 | #define SC_WRITE_12 0xaa | ||
237 | |||
238 | /* SCSI Sense Key/Additional Sense Code/ASC Qualifier values */ | 208 | /* SCSI Sense Key/Additional Sense Code/ASC Qualifier values */ |
239 | #define SS_NO_SENSE 0 | 209 | #define SS_NO_SENSE 0 |
240 | #define SS_COMMUNICATION_FAILURE 0x040800 | 210 | #define SS_COMMUNICATION_FAILURE 0x040800 |