diff options
author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2012-02-25 12:28:09 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-28 14:05:18 -0500 |
commit | 7ac4704c099125214a4f0a4bd54ce94d15be2ffb (patch) | |
tree | 5d65763023c4446fe9b81a7c19562c28d22e3d64 /drivers/staging | |
parent | 0d8520a1d7f43328bc7085d4244d93c595064157 (diff) |
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>
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/keucr/transport.h | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/drivers/staging/keucr/transport.h b/drivers/staging/keucr/transport.h index 4ae57d0145b2..2a11a98375d7 100644 --- a/drivers/staging/keucr/transport.h +++ b/drivers/staging/keucr/transport.h | |||
@@ -3,43 +3,6 @@ | |||
3 | 3 | ||
4 | #include <linux/blkdev.h> | 4 | #include <linux/blkdev.h> |
5 | 5 | ||
6 | /* Bulk only data structures */ | ||
7 | |||
8 | /* command block wrapper */ | ||
9 | struct bulk_cb_wrap { | ||
10 | __le32 Signature; /* contains 'USBC' */ | ||
11 | __u32 Tag; /* unique per command id */ | ||
12 | __le32 DataTransferLength; /* size of data */ | ||
13 | __u8 Flags; /* direction in bit 0 */ | ||
14 | __u8 Lun; /* LUN normally 0 */ | ||
15 | __u8 Length; /* of of the CDB */ | ||
16 | __u8 CDB[16]; /* max command */ | ||
17 | }; | ||
18 | |||
19 | #define US_BULK_CB_WRAP_LEN 31 | ||
20 | #define US_BULK_CB_SIGN 0x43425355 /*spells out USBC */ | ||
21 | #define US_BULK_FLAG_IN 1 | ||
22 | #define US_BULK_FLAG_OUT 0 | ||
23 | |||
24 | /* command status wrapper */ | ||
25 | struct bulk_cs_wrap { | ||
26 | __le32 Signature; /* should = 'USBS' */ | ||
27 | __u32 Tag; /* same as original command */ | ||
28 | __le32 Residue; /* amount not transferred */ | ||
29 | __u8 Status; /* see below */ | ||
30 | __u8 Filler[18]; | ||
31 | }; | ||
32 | |||
33 | #define US_BULK_CS_WRAP_LEN 13 | ||
34 | #define US_BULK_CS_SIGN 0x53425355 /* spells out 'USBS' */ | ||
35 | #define US_BULK_STAT_OK 0 | ||
36 | #define US_BULK_STAT_FAIL 1 | ||
37 | #define US_BULK_STAT_PHASE 2 | ||
38 | |||
39 | /* bulk-only class specific requests */ | ||
40 | #define US_BULK_RESET_REQUEST 0xff | ||
41 | #define US_BULK_GET_MAX_LUN 0xfe | ||
42 | |||
43 | /* usb_stor_bulk_transfer_xxx() return codes, in order of severity */ | 6 | /* usb_stor_bulk_transfer_xxx() return codes, in order of severity */ |
44 | #define USB_STOR_XFER_GOOD 0 /* good transfer */ | 7 | #define USB_STOR_XFER_GOOD 0 /* good transfer */ |
45 | #define USB_STOR_XFER_SHORT 1 /* transferred less than expected */ | 8 | #define USB_STOR_XFER_SHORT 1 /* transferred less than expected */ |