[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v4 07/24] q800: move GLUE device into separate q800-glue.c fi
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [PATCH v4 07/24] q800: move GLUE device into separate q800-glue.c file |
Date: |
Wed, 21 Jun 2023 11:46:44 +0200 |
User-agent: |
Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 |
On 21/6/23 10:53, Mark Cave-Ayland wrote:
This will allow the q800-glue.h header to be included separately so that the
GLUE device can be referenced externally.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
---
MAINTAINERS | 2 +
hw/m68k/meson.build | 2 +-
hw/m68k/q800-glue.c | 252 ++++++++++++++++++++++++++++++++++++
hw/m68k/q800.c | 238 +---------------------------------
include/hw/m68k/q800-glue.h | 50 +++++++
5 files changed, 306 insertions(+), 238 deletions(-)
create mode 100644 hw/m68k/q800-glue.c
create mode 100644 include/hw/m68k/q800-glue.h
diff --git a/hw/m68k/q800-glue.c b/hw/m68k/q800-glue.c
new file mode 100644
index 0000000000..e81f9438f1
--- /dev/null
+++ b/hw/m68k/q800-glue.c
@@ -0,0 +1,252 @@
+/*
+ * QEMU q800 logic GLUE (General Logic Unit)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "qemu/osdep.h"
+#include "cpu.h"
+#include "hw/m68k/q800-glue.h"
+#include "hw/boards.h"
"hw/boards.h" shouldn't be necessary here.
+#include "hw/irq.h"
+#include "hw/nmi.h"
+#include "hw/qdev-properties.h"
+#include "migration/vmstate.h"
diff --git a/include/hw/m68k/q800-glue.h b/include/hw/m68k/q800-glue.h
new file mode 100644
index 0000000000..c1817b01a5
--- /dev/null
+++ b/include/hw/m68k/q800-glue.h
@@ -0,0 +1,50 @@
+/*
+ * QEMU q800 logic glue
"QEMU q800 logic GLUE (General Logic Unit)" similar to .c?
(could be changed when applying, no need to respin)
Otherwise,
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
- Re: [PATCH v4 03/24] q800: introduce Q800MachineState, (continued)
- [PATCH v4 04/24] q800: rename q800_init() to q800_machine_init(), Mark Cave-Ayland, 2023/06/21
- [PATCH v4 05/24] q800: move CPU object into Q800MachineState, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 06/24] q800: move ROM memory region to Q800MachineState, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 08/24] q800-glue.c: switch TypeInfo registration to use DEFINE_TYPES() macro, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 07/24] q800: move GLUE device into separate q800-glue.c file, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 09/24] q800: move GLUE device to Q800MachineState, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 10/24] q800: introduce mac-io container memory region, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 11/24] q800: reimplement mac-io region aliasing using IO memory region, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 12/24] q800: move VIA1 device to Q800MachineState, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 13/24] q800: move VIA2 device to Q800MachineState, Mark Cave-Ayland, 2023/06/21