Commit b959655f18d9a6bd8d3ccdbd764421a671f31ce2
1 parent
2ea4b44832
Exists in
master
and in
55 other branches
usb: ehci: Split out struct ehci_ctrl definition
Move the struct ehci_ctrl defition from ehci-hcd.c into ehci.h so it can be re-used by drivers. In particular, the mv_udc driver can benefit from this move. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Fabio Estevam <fabio.estevam@freescale.com> Cc: Lei Wen <leiwen@marvell.com> Cc: Otavio Salvador <otavio@ossystems.com.br> Cc: Stefano Babic <sbabic@denx.de>
Showing 2 changed files with 14 additions and 10 deletions Side-by-side Diff
drivers/usb/host/ehci-hcd.c
| ... | ... | @@ -36,16 +36,7 @@ |
| 36 | 36 | #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 |
| 37 | 37 | #endif |
| 38 | 38 | |
| 39 | -static struct ehci_ctrl { | |
| 40 | - struct ehci_hccr *hccr; /* R/O registers, not need for volatile */ | |
| 41 | - struct ehci_hcor *hcor; | |
| 42 | - int rootdev; | |
| 43 | - uint16_t portreset; | |
| 44 | - struct QH qh_list __aligned(USB_DMA_MINALIGN); | |
| 45 | - struct QH periodic_queue __aligned(USB_DMA_MINALIGN); | |
| 46 | - uint32_t *periodic_list; | |
| 47 | - int ntds; | |
| 48 | -} ehcic[CONFIG_USB_MAX_CONTROLLER_COUNT]; | |
| 39 | +static struct ehci_ctrl ehcic[CONFIG_USB_MAX_CONTROLLER_COUNT]; | |
| 49 | 40 | |
| 50 | 41 | #define ALIGN_END_ADDR(type, ptr, size) \ |
| 51 | 42 | ((uint32_t)(ptr) + roundup((size) * sizeof(type), USB_DMA_MINALIGN)) |
drivers/usb/host/ehci.h
| ... | ... | @@ -22,6 +22,8 @@ |
| 22 | 22 | #ifndef USB_EHCI_H |
| 23 | 23 | #define USB_EHCI_H |
| 24 | 24 | |
| 25 | +#include <usb.h> | |
| 26 | + | |
| 25 | 27 | #if !defined(CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS) |
| 26 | 28 | #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 2 |
| 27 | 29 | #endif |
| ... | ... | @@ -250,6 +252,17 @@ |
| 250 | 252 | uint32_t fill[4]; |
| 251 | 253 | void *buffer; |
| 252 | 254 | }; |
| 255 | +}; | |
| 256 | + | |
| 257 | +struct ehci_ctrl { | |
| 258 | + struct ehci_hccr *hccr; /* R/O registers, not need for volatile */ | |
| 259 | + struct ehci_hcor *hcor; | |
| 260 | + int rootdev; | |
| 261 | + uint16_t portreset; | |
| 262 | + struct QH qh_list __aligned(USB_DMA_MINALIGN); | |
| 263 | + struct QH periodic_queue __aligned(USB_DMA_MINALIGN); | |
| 264 | + uint32_t *periodic_list; | |
| 265 | + int ntds; | |
| 253 | 266 | }; |
| 254 | 267 | |
| 255 | 268 | /* Low level init functions */ |