From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:52243) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gfTmK-0004eY-7C for qemu-devel@nongnu.org; Fri, 04 Jan 2019 13:01:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gfTmG-00054t-7D for qemu-devel@nongnu.org; Fri, 04 Jan 2019 13:01:04 -0500 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Fri, 4 Jan 2019 18:58:38 +0100 Message-Id: <20190104175847.6290-8-philmd@redhat.com> In-Reply-To: <20190104175847.6290-1-philmd@redhat.com> References: <20190104175847.6290-1-philmd@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 07/16] hw/devices: Move Gamepad declarations into a new header List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Thomas Huth Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Edgar E. Iglesias" , Magnus Damm , David Gibson , Andrew Jeffery , qemu-arm@nongnu.org, qemu-ppc@nongnu.org, Joel Stanley , Peter Maydell , Andrzej Zaborowski , Igor Mitsyanko , Beniamino Galvani , Michael Walle , Richard Henderson , Jan Kiszka , Jason Wang , Gerd Hoffmann , Peter Chubb , Aurelien Jarno , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Bastian Koppelmann , Rob Herring , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- MAINTAINERS | 1 + hw/arm/stellaris.c | 2 +- hw/input/stellaris_input.c | 2 +- include/hw/devices.h | 3 --- include/hw/input/gamepad.h | 11 +++++++++++ 5 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 include/hw/input/gamepad.h diff --git a/MAINTAINERS b/MAINTAINERS index 63ed6636ef..f571b29077 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -714,6 +714,7 @@ M: Peter Maydell L: qemu-arm@nongnu.org S: Maintained F: hw/*/stellaris* +F: include/hw/input/gamepad.h =20 Versatile Express M: Peter Maydell diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c index 6c69ce79b2..0b4b382cdc 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" =20 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" =20 typedef struct { diff --git a/include/hw/devices.h b/include/hw/devices.h index 8b649541b1..d9c06de7ab 100644 --- a/include/hw/devices.h +++ b/include/hw/devices.h @@ -25,7 +25,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); =20 -/* 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..5cd33a55bd --- /dev/null +++ b/include/hw/input/gamepad.h @@ -0,0 +1,11 @@ +#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 --=20 2.17.2