| Message ID | 20190204231815.29661-7-philmd@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | hw: Remove "hw/devices.h" | expand |
Philippe Mathieu-Daudé <philmd@redhat.com> writes: > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > MAINTAINERS | 1 + > hw/arm/stellaris.c | 2 +- > hw/input/stellaris_input.c | 2 +- > include/hw/devices.h | 3 --- > include/hw/input/gamepad.h | 21 +++++++++++++++++++++ > 5 files changed, 24 insertions(+), 5 deletions(-) > create mode 100644 include/hw/input/gamepad.h > > diff --git a/MAINTAINERS b/MAINTAINERS > index daae4a3beb..a38086f767 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -729,6 +729,7 @@ M: Peter Maydell <peter.maydell@linaro.org> > L: qemu-arm@nongnu.org > S: Maintained > F: hw/*/stellaris* > +F: include/hw/input/gamepad.h > > Versatile Express > M: Peter Maydell <peter.maydell@linaro.org> > diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c > index 442529cc65..24c20bf612 100644 > --- a/hw/arm/stellaris.c > +++ b/hw/arm/stellaris.c > @@ -12,7 +12,6 @@ > #include "hw/sysbus.h" > #include "hw/ssi/ssi.h" > #include "hw/arm/arm.h" > -#include "hw/devices.h" > #include "qemu/timer.h" > #include "hw/i2c/i2c.h" > #include "net/net.h" > @@ -22,6 +21,7 @@ > #include "sysemu/sysemu.h" > #include "hw/arm/armv7m.h" > #include "hw/char/pl011.h" > +#include "hw/input/gamepad.h" > #include "hw/misc/unimp.h" > #include "cpu.h" > > diff --git a/hw/input/stellaris_input.c b/hw/input/stellaris_input.c > index 99168bfeef..20c87d86f4 100644 > --- a/hw/input/stellaris_input.c > +++ b/hw/input/stellaris_input.c > @@ -8,7 +8,7 @@ > */ > #include "qemu/osdep.h" > #include "hw/hw.h" > -#include "hw/devices.h" > +#include "hw/input/gamepad.h" > #include "ui/console.h" > > typedef struct { > diff --git a/include/hw/devices.h b/include/hw/devices.h > index e400f9eac0..7a630da47f 100644 > --- a/include/hw/devices.h > +++ b/include/hw/devices.h > @@ -26,7 +26,4 @@ void *tsc2005_init(qemu_irq pintdav); > uint32_t tsc2005_txrx(void *opaque, uint32_t value, int len); > void tsc2005_set_transform(void *opaque, MouseTransformInfo *info); > > -/* stellaris_input.c */ > -void stellaris_gamepad_init(int n, qemu_irq *irq, const int *keycode); > - > #endif > diff --git a/include/hw/input/gamepad.h b/include/hw/input/gamepad.h > new file mode 100644 > index 0000000000..112bad5e4c > --- /dev/null > +++ b/include/hw/input/gamepad.h > @@ -0,0 +1,21 @@ > +/* > + * Gamepad style buttons connected to IRQ/GPIO lines > + * > + * Copyright (c) 2007 CodeSourcery. > + * Written by Paul Brook > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or later. > + * See the COPYING file in the top-level directory. > + */ > + > +#ifndef HW_INPUT_GAMEPAD_H > +#define HW_INPUT_GAMEPAD_H > + > +/* Gamepad devices that have nowhere better to go. */ Are there any gamepad devices that have a better place to go? git-grep gamepad suggests no. Drop the comment? > + > +#include "hw/irq.h" > + > +/* stellaris_input.c */ > +void stellaris_gamepad_init(int n, qemu_irq *irq, const int *keycode); > + > +#endif
diff --git a/MAINTAINERS b/MAINTAINERS index daae4a3beb..a38086f767 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -729,6 +729,7 @@ M: Peter Maydell <peter.maydell@linaro.org> L: qemu-arm@nongnu.org S: Maintained F: hw/*/stellaris* +F: include/hw/input/gamepad.h Versatile Express M: Peter Maydell <peter.maydell@linaro.org> diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c index 442529cc65..24c20bf612 100644 --- a/hw/arm/stellaris.c +++ b/hw/arm/stellaris.c @@ -12,7 +12,6 @@ #include "hw/sysbus.h" #include "hw/ssi/ssi.h" #include "hw/arm/arm.h" -#include "hw/devices.h" #include "qemu/timer.h" #include "hw/i2c/i2c.h" #include "net/net.h" @@ -22,6 +21,7 @@ #include "sysemu/sysemu.h" #include "hw/arm/armv7m.h" #include "hw/char/pl011.h" +#include "hw/input/gamepad.h" #include "hw/misc/unimp.h" #include "cpu.h" diff --git a/hw/input/stellaris_input.c b/hw/input/stellaris_input.c index 99168bfeef..20c87d86f4 100644 --- a/hw/input/stellaris_input.c +++ b/hw/input/stellaris_input.c @@ -8,7 +8,7 @@ */ #include "qemu/osdep.h" #include "hw/hw.h" -#include "hw/devices.h" +#include "hw/input/gamepad.h" #include "ui/console.h" typedef struct { diff --git a/include/hw/devices.h b/include/hw/devices.h index e400f9eac0..7a630da47f 100644 --- a/include/hw/devices.h +++ b/include/hw/devices.h @@ -26,7 +26,4 @@ void *tsc2005_init(qemu_irq pintdav); uint32_t tsc2005_txrx(void *opaque, uint32_t value, int len); void tsc2005_set_transform(void *opaque, MouseTransformInfo *info); -/* stellaris_input.c */ -void stellaris_gamepad_init(int n, qemu_irq *irq, const int *keycode); - #endif diff --git a/include/hw/input/gamepad.h b/include/hw/input/gamepad.h new file mode 100644 index 0000000000..112bad5e4c --- /dev/null +++ b/include/hw/input/gamepad.h @@ -0,0 +1,21 @@ +/* + * Gamepad style buttons connected to IRQ/GPIO lines + * + * Copyright (c) 2007 CodeSourcery. + * Written by Paul Brook + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ + +#ifndef HW_INPUT_GAMEPAD_H +#define HW_INPUT_GAMEPAD_H + +/* Gamepad devices that have nowhere better to go. */ + +#include "hw/irq.h" + +/* stellaris_input.c */ +void stellaris_gamepad_init(int n, qemu_irq *irq, const int *keycode); + +#endif
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- MAINTAINERS | 1 + hw/arm/stellaris.c | 2 +- hw/input/stellaris_input.c | 2 +- include/hw/devices.h | 3 --- include/hw/input/gamepad.h | 21 +++++++++++++++++++++ 5 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 include/hw/input/gamepad.h