From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:51975) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gfTlS-0003aY-Nz for qemu-devel@nongnu.org; Fri, 04 Jan 2019 13:00:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gfTlR-0004d3-Mp for qemu-devel@nongnu.org; Fri, 04 Jan 2019 13:00:10 -0500 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Fri, 4 Jan 2019 18:58:36 +0100 Message-Id: <20190104175847.6290-6-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 05/16] hw/devices: Move Blizzard 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/nseries.c | 1 + hw/display/blizzard.c | 2 +- include/hw/devices.h | 7 ------- include/hw/display/blizzard.h | 21 +++++++++++++++++++++ 5 files changed, 24 insertions(+), 8 deletions(-) create mode 100644 include/hw/display/blizzard.h diff --git a/MAINTAINERS b/MAINTAINERS index dff4b98401..156ce9a698 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -640,6 +640,7 @@ M: Peter Maydell L: qemu-arm@nongnu.org S: Odd Fixes F: hw/arm/nseries.c +F: include/hw/display/blizzard.h =20 Palm M: Andrzej Zaborowski diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c index 906b7ca22d..9521be1cef 100644 --- a/hw/arm/nseries.c +++ b/hw/arm/nseries.c @@ -31,6 +31,7 @@ #include "hw/boards.h" #include "hw/i2c/i2c.h" #include "hw/devices.h" +#include "hw/display/blizzard.h" #include "hw/block/flash.h" #include "hw/hw.h" #include "hw/bt.h" diff --git a/hw/display/blizzard.c b/hw/display/blizzard.c index 291abe6fca..471bd0ed99 100644 --- a/hw/display/blizzard.c +++ b/hw/display/blizzard.c @@ -21,7 +21,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "ui/console.h" -#include "hw/devices.h" +#include "hw/display/blizzard.h" #include "ui/pixel_ops.h" =20 typedef void (*blizzard_fn_t)(uint8_t *, const uint8_t *, unsigned int); diff --git a/include/hw/devices.h b/include/hw/devices.h index 5ad134232c..25f895b330 100644 --- a/include/hw/devices.h +++ b/include/hw/devices.h @@ -28,13 +28,6 @@ void tsc2005_set_transform(void *opaque, MouseTransfor= mInfo *info); /* stellaris_input.c */ void stellaris_gamepad_init(int n, qemu_irq *irq, const int *keycode); =20 -/* blizzard.c */ -void *s1d13745_init(qemu_irq gpio_int); -void s1d13745_write(void *opaque, int dc, uint16_t value); -void s1d13745_write_block(void *opaque, int dc, - void *buf, size_t len, int pitch); -uint16_t s1d13745_read(void *opaque, int dc); - /* cbus.c */ typedef struct { qemu_irq clk; diff --git a/include/hw/display/blizzard.h b/include/hw/display/blizzard.= h new file mode 100644 index 0000000000..8132557da1 --- /dev/null +++ b/include/hw/display/blizzard.h @@ -0,0 +1,21 @@ +/* + * Epson S1D13744/S1D13745 (Blizzard/Hailstorm/Tornado) LCD/TV controlle= r. + * + * Copyright (C) 2008 Nokia Corporation + * Written by Andrzej Zaborowski + * + * This work is licensed under the terms of the GNU GPL, version 2 or la= ter. + * See the COPYING file in the top-level directory. + */ +#ifndef HW_DISPLAY_BLIZZARD_H +#define HW_DISPLAY_BLIZZARD_H + +#include "hw/irq.h" + +void *s1d13745_init(qemu_irq gpio_int); +void s1d13745_write(void *opaque, int dc, uint16_t value); +void s1d13745_write_block(void *opaque, int dc, + void *buf, size_t len, int pitch); +uint16_t s1d13745_read(void *opaque, int dc); + +#endif --=20 2.17.2