[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 10/24] q800: introduce mac-io container memory region
From: |
Mark Cave-Ayland |
Subject: |
[PATCH v4 10/24] q800: introduce mac-io container memory region |
Date: |
Wed, 21 Jun 2023 09:53:39 +0100 |
Move all devices from the IO region to within the container in preparation
for updating the IO aliasing mechanism.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/m68k/q800.c | 6 ++++++
include/hw/m68k/q800.h | 1 +
2 files changed, 7 insertions(+)
diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index 505e50d4af..359bdf3443 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -177,6 +177,12 @@ static void q800_machine_init(MachineState *machine)
/* RAM */
memory_region_add_subregion(get_system_memory(), 0, machine->ram);
+ /*
+ * Create container for all IO devices
+ */
+ memory_region_init(&m->macio, OBJECT(machine), "mac-io", IO_SLICE);
+ memory_region_add_subregion(get_system_memory(), IO_BASE, &m->macio);
+
/*
* Memory from IO_BASE to IO_BASE + IO_SLICE is repeated
* from IO_BASE + IO_SLICE to IO_BASE + IO_SIZE
diff --git a/include/hw/m68k/q800.h b/include/hw/m68k/q800.h
index fda42e0a1c..17067dfad7 100644
--- a/include/hw/m68k/q800.h
+++ b/include/hw/m68k/q800.h
@@ -39,6 +39,7 @@ struct Q800MachineState {
M68kCPU cpu;
MemoryRegion rom;
GLUEState glue;
+ MemoryRegion macio;
};
#define TYPE_Q800_MACHINE MACHINE_TYPE_NAME("q800")
--
2.30.2
- [PATCH v4 00/24] q800: add support for booting MacOS Classic - part 1, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 01/24] q800: fix up minor spacing issues in hw_compat_q800 GlobalProperty array, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 02/24] q800: add missing space after parent object in GLUEState, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 03/24] q800: introduce Q800MachineState, Mark Cave-Ayland, 2023/06/21
- [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 <=
- [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
- [PATCH v4 14/24] hw/net/dp8393x.c: move TYPE_DP8393X and dp8393xState into dp8393x.h, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 15/24] q800: move dp8393x device to Q800MachineState, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 16/24] q800: move ESCC device to Q800MachineState, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 18/24] q800: move ESP device to Q800MachineState, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 17/24] q800: move escc_orgate device to Q800MachineState, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 19/24] q800: move SWIM device to Q800MachineState, Mark Cave-Ayland, 2023/06/21
- [PATCH v4 20/24] q800: move mac-nubus-bridge device to Q800MachineState, Mark Cave-Ayland, 2023/06/21