[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 04/12] hw/devices: Move TC6393XB declarations int
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH v3 04/12] hw/devices: Move TC6393XB declarations into a new header |
Date: |
Fri, 12 Apr 2019 18:54:08 +0200 |
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
MAINTAINERS | 1 +
hw/arm/tosa.c | 2 +-
hw/display/tc6393xb.c | 2 +-
include/hw/devices.h | 6 ------
include/hw/display/tc6393xb.h | 24 ++++++++++++++++++++++++
5 files changed, 27 insertions(+), 8 deletions(-)
create mode 100644 include/hw/display/tc6393xb.h
diff --git a/MAINTAINERS b/MAINTAINERS
index 56139ac8ab0..ccf8097f413 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -714,6 +714,7 @@ F: hw/misc/mst_fpga.c
F: hw/misc/max111x.c
F: include/hw/arm/pxa.h
F: include/hw/arm/sharpsl.h
+F: include/hw/display/tc6393xb.h
SABRELITE / i.MX6
M: Peter Maydell <address@hidden>
diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c
index eef9d427e76..9a1247797fe 100644
--- a/hw/arm/tosa.c
+++ b/hw/arm/tosa.c
@@ -16,10 +16,10 @@
#include "hw/hw.h"
#include "hw/arm/pxa.h"
#include "hw/arm/arm.h"
-#include "hw/devices.h"
#include "hw/arm/sharpsl.h"
#include "hw/pcmcia.h"
#include "hw/boards.h"
+#include "hw/display/tc6393xb.h"
#include "hw/i2c/i2c.h"
#include "hw/ssi/ssi.h"
#include "hw/sysbus.h"
diff --git a/hw/display/tc6393xb.c b/hw/display/tc6393xb.c
index 6d133d9a66c..0b7c59cde7d 100644
--- a/hw/display/tc6393xb.c
+++ b/hw/display/tc6393xb.c
@@ -14,7 +14,7 @@
#include "qapi/error.h"
#include "qemu/host-utils.h"
#include "hw/hw.h"
-#include "hw/devices.h"
+#include "hw/display/tc6393xb.h"
#include "hw/block/flash.h"
#include "ui/console.h"
#include "ui/pixel_ops.h"
diff --git a/include/hw/devices.h b/include/hw/devices.h
index 0850f697451..1e2141caad1 100644
--- a/include/hw/devices.h
+++ b/include/hw/devices.h
@@ -50,10 +50,4 @@ void *tahvo_init(qemu_irq irq, int betty);
void retu_key_event(void *retu, int state);
-/* tc6393xb.c */
-typedef struct TC6393xbState TC6393xbState;
-TC6393xbState *tc6393xb_init(struct MemoryRegion *sysmem,
- uint32_t base, qemu_irq irq);
-qemu_irq tc6393xb_l3v_get(TC6393xbState *s);
-
#endif
diff --git a/include/hw/display/tc6393xb.h b/include/hw/display/tc6393xb.h
new file mode 100644
index 00000000000..5c4da91f80d
--- /dev/null
+++ b/include/hw/display/tc6393xb.h
@@ -0,0 +1,24 @@
+/*
+ * Toshiba TC6393XB I/O Controller.
+ * Found in Sharp Zaurus SL-6000 (tosa) or some
+ * Toshiba e-Series PDAs.
+ *
+ * Copyright (c) 2007 Hervé Poussineau
+ *
+ * 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_DISPLAY_TC6393XB_H
+#define HW_DISPLAY_TC6393XB_H
+
+#include "exec/memory.h"
+#include "hw/irq.h"
+
+typedef struct TC6393xbState TC6393xbState;
+
+TC6393xbState *tc6393xb_init(struct MemoryRegion *sysmem,
+ uint32_t base, qemu_irq irq);
+qemu_irq tc6393xb_l3v_get(TC6393xbState *s);
+
+#endif
--
2.20.1
- [Qemu-devel] [PATCH v3 00/12] hw: Remove "hw/devices.h", Philippe Mathieu-Daudé, 2019/04/12
- [Qemu-devel] [PATCH v3 01/12] hw/arm/aspeed: Use TYPE_TMP105/TYPE_PCA9552 instead of hardcoded string, Philippe Mathieu-Daudé, 2019/04/12
- [Qemu-devel] [PATCH v3 03/12] hw/display/tc6393xb: Remove unused functions, Philippe Mathieu-Daudé, 2019/04/12
- [Qemu-devel] [PATCH v3 02/12] hw/arm/nseries: Use TYPE_TMP105 instead of hardcoded string, Philippe Mathieu-Daudé, 2019/04/12
- [Qemu-devel] [PATCH v3 04/12] hw/devices: Move TC6393XB declarations into a new header,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v3 05/12] hw/devices: Move Blizzard declarations into a new header, Philippe Mathieu-Daudé, 2019/04/12
- [Qemu-devel] [PATCH v3 06/12] hw/devices: Move CBus declarations into a new header, Philippe Mathieu-Daudé, 2019/04/12
- [Qemu-devel] [PATCH v3 08/12] hw/devices: Move TI touchscreen declarations into a new header, Philippe Mathieu-Daudé, 2019/04/12
- [Qemu-devel] [PATCH v3 07/12] hw/devices: Move Gamepad declarations into a new header, Philippe Mathieu-Daudé, 2019/04/12
- [Qemu-devel] [PATCH v3 09/12] hw/devices: Move LAN9118 declarations into a new header, Philippe Mathieu-Daudé, 2019/04/12
- [Qemu-devel] [PATCH v3 10/12] hw/net/ne2000-isa: Add guards to the header, Philippe Mathieu-Daudé, 2019/04/12
- [Qemu-devel] [PATCH v3 11/12] hw/net/lan9118: Export TYPE_LAN9118 and use it instead of hardcoded string, Philippe Mathieu-Daudé, 2019/04/12
- [Qemu-devel] [PATCH v3 12/12] hw/devices: Move SMSC 91C111 declaration into a new header, Philippe Mathieu-Daudé, 2019/04/12
- Re: [Qemu-devel] [Qemu-arm] [PATCH v3 00/12] hw: Remove "hw/devices.h", Peter Maydell, 2019/04/29