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 /include/linux/usb/storage.h | |
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 'include/linux/usb/storage.h')
-rw-r--r-- | include/linux/usb/storage.h | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/include/linux/usb/storage.h b/include/linux/usb/storage.h index d7fc910f1dc..87a94bf34d4 100644 --- a/include/linux/usb/storage.h +++ b/include/linux/usb/storage.h | |||
@@ -45,4 +45,43 @@ | |||
45 | 45 | ||
46 | #define USB_PR_DEVICE 0xff /* Use device's value */ | 46 | #define USB_PR_DEVICE 0xff /* Use device's value */ |
47 | 47 | ||
48 | /* | ||
49 | * Bulk only data structures | ||
50 | */ | ||
51 | |||
52 | /* command block wrapper */ | ||
53 | struct bulk_cb_wrap { | ||
54 | __le32 Signature; /* contains 'USBC' */ | ||
55 | __u32 Tag; /* unique per command id */ | ||
56 | __le32 DataTransferLength; /* size of data */ | ||
57 | __u8 Flags; /* direction in bit 0 */ | ||
58 | __u8 Lun; /* LUN normally 0 */ | ||
59 | __u8 Length; /* of of the CDB */ | ||
60 | __u8 CDB[16]; /* max command */ | ||
61 | }; | ||
62 | |||
63 | #define US_BULK_CB_WRAP_LEN 31 | ||
64 | #define US_BULK_CB_SIGN 0x43425355 /*spells out USBC */ | ||
65 | #define US_BULK_FLAG_IN 1 | ||
66 | #define US_BULK_FLAG_OUT 0 | ||
67 | |||
68 | /* command status wrapper */ | ||
69 | struct bulk_cs_wrap { | ||
70 | __le32 Signature; /* should = 'USBS' */ | ||
71 | __u32 Tag; /* same as original command */ | ||
72 | __le32 Residue; /* amount not transferred */ | ||
73 | __u8 Status; /* see below */ | ||
74 | __u8 Filler[18]; | ||
75 | }; | ||
76 | |||
77 | #define US_BULK_CS_WRAP_LEN 13 | ||
78 | #define US_BULK_CS_SIGN 0x53425355 /* spells out 'USBS' */ | ||
79 | #define US_BULK_STAT_OK 0 | ||
80 | #define US_BULK_STAT_FAIL 1 | ||
81 | #define US_BULK_STAT_PHASE 2 | ||
82 | |||
83 | /* bulk-only class specific requests */ | ||
84 | #define US_BULK_RESET_REQUEST 0xff | ||
85 | #define US_BULK_GET_MAX_LUN 0xfe | ||
86 | |||
48 | #endif | 87 | #endif |