diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-07-10 12:17:06 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-07-18 14:42:35 +0200 |
| commit | 9451a44433577363f9b0a91bd656aecb51c76e8f (patch) | |
| tree | 6397cfa2cb7ab0d2a336fe8f046ca1876f87a173 /include/usb | |
| parent | f0a1a84d7d50c7f74e2403625eb91cd56464fe33 (diff) | |
| download | barebox-9451a44433577363f9b0a91bd656aecb51c76e8f.tar.gz barebox-9451a44433577363f9b0a91bd656aecb51c76e8f.tar.xz | |
USB: Remove conflicting USB_SPEED_* definitions
We have USB_SPEED_* definitions as macros in usb_defs.h and as an enum
in ch9.h. The defines in usb.h correspond to hardware bits in the
ehci controller. Get rid of them and keep the hardware independent
enums.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'include/usb')
| -rw-r--r-- | include/usb/usb.h | 2 | ||||
| -rw-r--r-- | include/usb/usb_defs.h | 6 |
2 files changed, 0 insertions, 8 deletions
diff --git a/include/usb/usb.h b/include/usb/usb.h index a0bc1d2643..ff5242b8af 100644 --- a/include/usb/usb.h +++ b/include/usb/usb.h @@ -301,8 +301,6 @@ void usb_rescan(int force); #define usb_pipe_endpdev(pipe) (((pipe) >> 8) & 0x7ff) #define usb_pipeendpoint(pipe) (((pipe) >> 15) & 0xf) #define usb_pipedata(pipe) (((pipe) >> 19) & 1) -#define usb_pipespeed(pipe) (((pipe) >> 26) & 3) -#define usb_pipeslow(pipe) (usb_pipespeed(pipe) == USB_SPEED_LOW) #define usb_pipetype(pipe) (((pipe) >> 30) & 3) #define usb_pipeisoc(pipe) (usb_pipetype((pipe)) == PIPE_ISOCHRONOUS) #define usb_pipeint(pipe) (usb_pipetype((pipe)) == PIPE_INTERRUPT) diff --git a/include/usb/usb_defs.h b/include/usb/usb_defs.h index 13eb330ec5..ace20e430d 100644 --- a/include/usb/usb_defs.h +++ b/include/usb/usb_defs.h @@ -76,12 +76,6 @@ #define USB_DIR_OUT 0 #define USB_DIR_IN 0x80 -/* USB device speeds */ -#define USB_SPEED_FULL 0x0 /* 12Mbps */ -#define USB_SPEED_LOW 0x1 /* 1.5Mbps */ -#define USB_SPEED_HIGH 0x2 /* 480Mbps */ -#define USB_SPEED_RESERVED 0x3 - /* Descriptor types */ #define USB_DT_DEVICE 0x01 #define USB_DT_CONFIG 0x02 |