| Message ID | 20200704144943.18292-13-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:56 AM Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > > "hcd-musb.h" is only required by USB device implementions. > As we keep these implementations in the hw/usb/ directory, > move the header there. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > {include/hw => hw}/usb/hcd-musb.h | 0 > hw/usb/hcd-musb.c | 2 +- > hw/usb/tusb6010.c | 2 +- > 3 files changed, 2 insertions(+), 2 deletions(-) > rename {include/hw => hw}/usb/hcd-musb.h (100%) > > diff --git a/include/hw/usb/hcd-musb.h b/hw/usb/hcd-musb.h > similarity index 100% > rename from include/hw/usb/hcd-musb.h > rename to hw/usb/hcd-musb.h > diff --git a/hw/usb/hcd-musb.c b/hw/usb/hcd-musb.c > index 85f5ff5bd4..b8d8766a4a 100644 > --- a/hw/usb/hcd-musb.c > +++ b/hw/usb/hcd-musb.c > @@ -23,9 +23,9 @@ > #include "qemu/osdep.h" > #include "qemu/timer.h" > #include "hw/usb.h" > -#include "hw/usb/hcd-musb.h" > #include "hw/irq.h" > #include "hw/hw.h" > +#include "hcd-musb.h" > > /* Common USB registers */ > #define MUSB_HDRC_FADDR 0x00 /* 8-bit */ > diff --git a/hw/usb/tusb6010.c b/hw/usb/tusb6010.c > index 27eb28d3e4..9f9b81b09d 100644 > --- a/hw/usb/tusb6010.c > +++ b/hw/usb/tusb6010.c > @@ -23,11 +23,11 @@ > #include "qemu/module.h" > #include "qemu/timer.h" > #include "hw/usb.h" > -#include "hw/usb/hcd-musb.h" > #include "hw/arm/omap.h" > #include "hw/hw.h" > #include "hw/irq.h" > #include "hw/sysbus.h" > +#include "hcd-musb.h" > > #define TYPE_TUSB6010 "tusb6010" > #define TUSB(obj) OBJECT_CHECK(TUSBState, (obj), TYPE_TUSB6010) > -- > 2.21.3 > >
diff --git a/include/hw/usb/hcd-musb.h b/hw/usb/hcd-musb.h similarity index 100% rename from include/hw/usb/hcd-musb.h rename to hw/usb/hcd-musb.h diff --git a/hw/usb/hcd-musb.c b/hw/usb/hcd-musb.c index 85f5ff5bd4..b8d8766a4a 100644 --- a/hw/usb/hcd-musb.c +++ b/hw/usb/hcd-musb.c @@ -23,9 +23,9 @@ #include "qemu/osdep.h" #include "qemu/timer.h" #include "hw/usb.h" -#include "hw/usb/hcd-musb.h" #include "hw/irq.h" #include "hw/hw.h" +#include "hcd-musb.h" /* Common USB registers */ #define MUSB_HDRC_FADDR 0x00 /* 8-bit */ diff --git a/hw/usb/tusb6010.c b/hw/usb/tusb6010.c index 27eb28d3e4..9f9b81b09d 100644 --- a/hw/usb/tusb6010.c +++ b/hw/usb/tusb6010.c @@ -23,11 +23,11 @@ #include "qemu/module.h" #include "qemu/timer.h" #include "hw/usb.h" -#include "hw/usb/hcd-musb.h" #include "hw/arm/omap.h" #include "hw/hw.h" #include "hw/irq.h" #include "hw/sysbus.h" +#include "hcd-musb.h" #define TYPE_TUSB6010 "tusb6010" #define TUSB(obj) OBJECT_CHECK(TUSBState, (obj), TYPE_TUSB6010)
"hcd-musb.h" is only required by USB device implementions. As we keep these implementations in the hw/usb/ directory, move the header there. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- {include/hw => hw}/usb/hcd-musb.h | 0 hw/usb/hcd-musb.c | 2 +- hw/usb/tusb6010.c | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename {include/hw => hw}/usb/hcd-musb.h (100%)