Hi Becky,
2010/6/17 Becky Bruce <bec...@kernel.crashing.org>:
> This avoids a build warning that you see if anyone in the
> header chain has included io.h (which is coming shortly). I
> also move this to the "ohci.h" header file in the same dir,
> which is cleaner.
As mentioned before, I do not like the undef's. Probably this would
result in a cleaner patch:
sed -i 's...@writel@ohci_wri...@g;s...@readl@ohci_re...@g'
drivers/usb/host/ohci-hcd.c
Kind regards,
Remy
>
> Signed-off-by: Becky Bruce <bec...@kernel.crashing.org>
> ---
> drivers/usb/host/ohci-hcd.c | 11 -----------
> drivers/usb/host/ohci.h | 13 +++++++++++++
> 2 files changed, 13 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
> index b03a600..3ffdc9d 100644
> --- a/drivers/usb/host/ohci-hcd.c
> +++ b/drivers/usb/host/ohci-hcd.c
> @@ -83,17 +83,6 @@
> #define OHCI_CONTROL_INIT \
> (OHCI_CTRL_CBSR & 0x3) | OHCI_CTRL_IE | OHCI_CTRL_PLE
>
> -/*
> - * e.g. PCI controllers need this
> - */
> -#ifdef CONFIG_SYS_OHCI_SWAP_REG_ACCESS
> -# define readl(a) __swap_32(*((volatile u32 *)(a)))
> -# define writel(a, b) (*((volatile u32 *)(b)) = __swap_32((volatile u32)a))
> -#else
> -# define readl(a) (*((volatile u32 *)(a)))
> -# define writel(a, b) (*((volatile u32 *)(b)) = ((volatile u32)a))
> -#endif /* CONFIG_SYS_OHCI_SWAP_REG_ACCESS */
> -
> #define min_t(type, x, y) \
> ({ type __x = (x); type __y = (y); __x < __y ? __x: __y; })
>
> diff --git a/drivers/usb/host/ohci.h b/drivers/usb/host/ohci.h
> index 79aa79d..fa4ecc8 100644
> --- a/drivers/usb/host/ohci.h
> +++ b/drivers/usb/host/ohci.h
> @@ -7,6 +7,19 @@
> * usb-ohci.h
> */
>
> +/*
> + * e.g. PCI controllers need this
> + */
> +#undef readl
> +#undef writel
> +#ifdef CONFIG_SYS_OHCI_SWAP_REG_ACCESS
> +# define readl(a) __swap_32(*((volatile u32 *)(a)))
> +# define writel(a, b) (*((volatile u32 *)(b)) = __swap_32((volatile u32)a))
> +#else
> +# define readl(a) (*((volatile u32 *)(a)))
> +# define writel(a, b) (*((volatile u32 *)(b)) = ((volatile u32)a))
> +#endif /* CONFIG_SYS_OHCI_SWAP_REG_ACCESS */
> +
> /* functions for doing board or CPU specific setup/cleanup */
> extern int usb_board_init(void);
> extern int usb_board_stop(void);
> --
> 1.6.0.6
>
> _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
>
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
