| Message ID | 20200704144943.18292-11-f4bug@amsat.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hw/usb: Give it love, reduce 'hw/usb.h' inclusion out of hw/usb/ | expand |
On Sat, Jul 4, 2020 at 7:53 AM Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > > Move definitions only useful for hcd-ehci.c to this source file. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > hw/usb/hcd-ehci.h | 11 ----------- > hw/usb/hcd-ehci.c | 12 ++++++++++++ > 2 files changed, 12 insertions(+), 11 deletions(-) > > diff --git a/hw/usb/hcd-ehci.h b/hw/usb/hcd-ehci.h > index 57b38cfc05..4577f5e31d 100644 > --- a/hw/usb/hcd-ehci.h > +++ b/hw/usb/hcd-ehci.h > @@ -24,17 +24,6 @@ > #include "hw/pci/pci.h" > #include "hw/sysbus.h" > > -#ifndef EHCI_DEBUG > -#define EHCI_DEBUG 0 > -#endif > - > -#if EHCI_DEBUG > -#define DPRINTF printf > -#else > -#define DPRINTF(...) > -#endif > - > -#define MMIO_SIZE 0x1000 > #define CAPA_SIZE 0x10 > > #define NB_PORTS 6 /* Max. Number of downstream ports */ > diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c > index 256fb91e0c..a0beee527c 100644 > --- a/hw/usb/hcd-ehci.c > +++ b/hw/usb/hcd-ehci.c > @@ -36,6 +36,18 @@ > #include "qemu/error-report.h" > #include "sysemu/runstate.h" > > +#ifndef EHCI_DEBUG > +#define EHCI_DEBUG 0 > +#endif > + > +#if EHCI_DEBUG > +#define DPRINTF printf > +#else > +#define DPRINTF(...) > +#endif > + > +#define MMIO_SIZE 0x1000 > + > #define FRAME_TIMER_FREQ 1000 > #define FRAME_TIMER_NS (NANOSECONDS_PER_SECOND / FRAME_TIMER_FREQ) > #define UFRAME_TIMER_NS (FRAME_TIMER_NS / 8) > -- > 2.21.3 > >
diff --git a/hw/usb/hcd-ehci.h b/hw/usb/hcd-ehci.h index 57b38cfc05..4577f5e31d 100644 --- a/hw/usb/hcd-ehci.h +++ b/hw/usb/hcd-ehci.h @@ -24,17 +24,6 @@ #include "hw/pci/pci.h" #include "hw/sysbus.h" -#ifndef EHCI_DEBUG -#define EHCI_DEBUG 0 -#endif - -#if EHCI_DEBUG -#define DPRINTF printf -#else -#define DPRINTF(...) -#endif - -#define MMIO_SIZE 0x1000 #define CAPA_SIZE 0x10 #define NB_PORTS 6 /* Max. Number of downstream ports */ diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c index 256fb91e0c..a0beee527c 100644 --- a/hw/usb/hcd-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -36,6 +36,18 @@ #include "qemu/error-report.h" #include "sysemu/runstate.h" +#ifndef EHCI_DEBUG +#define EHCI_DEBUG 0 +#endif + +#if EHCI_DEBUG +#define DPRINTF printf +#else +#define DPRINTF(...) +#endif + +#define MMIO_SIZE 0x1000 + #define FRAME_TIMER_FREQ 1000 #define FRAME_TIMER_NS (NANOSECONDS_PER_SECOND / FRAME_TIMER_FREQ) #define UFRAME_TIMER_NS (FRAME_TIMER_NS / 8)
Move definitions only useful for hcd-ehci.c to this source file. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- hw/usb/hcd-ehci.h | 11 ----------- hw/usb/hcd-ehci.c | 12 ++++++++++++ 2 files changed, 12 insertions(+), 11 deletions(-)