summaryrefslogtreecommitdiffstats
path: root/include/usb/usb.h
diff options
context:
space:
mode:
authorSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>2014-07-23 15:51:50 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2014-07-24 08:57:57 +0200
commit6931e9007c7f189c0a66d4a66d2aa1a936a4d385 (patch)
treeaf4b458fe4bd86823e3e25deeede23f9fe69bba3 /include/usb/usb.h
parentf261bce3a699fd11f7f2d0bbbde26ec26ed1d55f (diff)
downloadbarebox-6931e9007c7f189c0a66d4a66d2aa1a936a4d385.tar.gz
barebox-6931e9007c7f189c0a66d4a66d2aa1a936a4d385.tar.xz
USB: Use descriptors from ch11.h
Use the descriptors from ch11.h instead of duplicating them in usb.h. usb_hub_descriptor now contains a union .u to differentiate HS hub descriptor from SS hub descriptor. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'include/usb/usb.h')
-rw-r--r--include/usb/usb.h27
1 files changed, 1 insertions, 26 deletions
diff --git a/include/usb/usb.h b/include/usb/usb.h
index 41f92c2df0..82acf20b12 100644
--- a/include/usb/usb.h
+++ b/include/usb/usb.h
@@ -24,6 +24,7 @@
#include <driver.h>
#include <usb/ch9.h>
+#include <usb/ch11.h>
#include <usb/usb_defs.h>
#include <asm/byteorder.h>
@@ -311,32 +312,6 @@ void usb_rescan(void);
/*************************************************************************
* Hub Stuff
*/
-struct usb_port_status {
- unsigned short wPortStatus;
- unsigned short wPortChange;
-} __attribute__ ((packed));
-
-struct usb_hub_status {
- unsigned short wHubStatus;
- unsigned short wHubChange;
-} __attribute__ ((packed));
-
-
-/* Hub descriptor */
-struct usb_hub_descriptor {
- unsigned char bLength;
- unsigned char bDescriptorType;
- unsigned char bNbrPorts;
- unsigned short wHubCharacteristics;
- unsigned char bPwrOn2PwrGood;
- unsigned char bHubContrCurrent;
- unsigned char DeviceRemovable[(USB_MAXCHILDREN+1+7)/8];
- unsigned char PortPowerCtrlMask[(USB_MAXCHILDREN+1+7)/8];
- /* DeviceRemovable and PortPwrCtrlMask want to be variable-length
- bitmaps that hold max 255 entries. (bit0 is ignored) */
-} __attribute__ ((packed));
-
-
struct usb_hub_device {
struct usb_device *pusb_dev;
struct usb_hub_descriptor desc;