projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'u-boot-stm32-20190723' of https://gitlab.denx.de/u-boot/custodians/u-boot-stm
[oweals/u-boot.git]
/
drivers
/
usb
/
host
/
ohci.h
diff --git
a/drivers/usb/host/ohci.h
b/drivers/usb/host/ohci.h
index db0924c943a19fab809449035313febc9cdbb217..f9f02cb09c5f379cfdf33d311e52d58f17ea27b5 100644
(file)
--- a/
drivers/usb/host/ohci.h
+++ b/
drivers/usb/host/ohci.h
@@
-27,7
+27,7
@@
#define ED_ALIGNMENT 16
#endif
#define ED_ALIGNMENT 16
#endif
-#if
defined CONFIG_DM_USB
&& ARCH_DMA_MINALIGN > 32
+#if
CONFIG_IS_ENABLED(DM_USB)
&& ARCH_DMA_MINALIGN > 32
#define TD_ALIGNMENT ARCH_DMA_MINALIGN
#else
#define TD_ALIGNMENT 32
#define TD_ALIGNMENT ARCH_DMA_MINALIGN
#else
#define TD_ALIGNMENT 32
@@
-115,9
+115,7
@@
struct td {
__u32 hwNextTD; /* Next TD Pointer */
__u32 hwBE; /* Memory Buffer End Pointer */
__u32 hwNextTD; /* Next TD Pointer */
__u32 hwBE; /* Memory Buffer End Pointer */
-/* #ifndef CONFIG_MPC5200 /\* this seems wrong *\/ */
__u16 hwPSW[MAXPSW];
__u16 hwPSW[MAXPSW];
-/* #endif */
__u8 unused;
__u8 index;
struct ed *ed;
__u8 unused;
__u8 index;
struct ed *ed;
@@
-141,13
+139,8
@@
typedef struct td td_t;
#define NUM_INTS 32 /* part of the OHCI standard */
struct ohci_hcca {
__u32 int_table[NUM_INTS]; /* Interrupt ED table */
#define NUM_INTS 32 /* part of the OHCI standard */
struct ohci_hcca {
__u32 int_table[NUM_INTS]; /* Interrupt ED table */
-#if defined(CONFIG_MPC5200)
- __u16 pad1; /* set to 0 on each frame_no change */
- __u16 frame_no; /* current frame number */
-#else
__u16 frame_no; /* current frame number */
__u16 pad1; /* set to 0 on each frame_no change */
__u16 frame_no; /* current frame number */
__u16 pad1; /* set to 0 on each frame_no change */
-#endif
__u32 done_head; /* info returned for an interrupt */
u8 reserved_for_hc[116];
} __attribute__((aligned(256)));
__u32 done_head; /* info returned for an interrupt */
u8 reserved_for_hc[116];
} __attribute__((aligned(256)));
@@
-366,7
+359,7
@@
typedef struct
} urb_priv_t;
#define URB_DEL 1
} urb_priv_t;
#define URB_DEL 1
-#define NUM_EDS
8
/* num of preallocated endpoint descriptors */
+#define NUM_EDS
32
/* num of preallocated endpoint descriptors */
#define NUM_TD 64 /* we need more TDs than EDs */
#define NUM_TD 64 /* we need more TDs than EDs */
@@
-413,7
+406,7
@@
typedef struct ohci {
const char *slot_name;
} ohci_t;
const char *slot_name;
} ohci_t;
-#if
def CONFIG_DM_USB
+#if
CONFIG_IS_ENABLED(DM_USB)
extern struct dm_usb_ops ohci_usb_ops;
int ohci_register(struct udevice *dev, struct ohci_regs *regs);
extern struct dm_usb_ops ohci_usb_ops;
int ohci_register(struct udevice *dev, struct ohci_regs *regs);