aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>2023-06-21 09:53:39 +0100
committerLaurent Vivier <laurent@vivier.eu>2023-06-22 09:23:23 +0200
commit7527c52fd0472dbe06cc1f2f3b7979e202995ea2 (patch)
tree7056e9d7bfbf7c0a5a6c564477c4e74531d0d7c2
parent1ecc6ec1ffbf5c209233be137f04344ec4eac6b5 (diff)
q800: introduce mac-io container memory region
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> Message-Id: <20230621085353.113233-11-mark.cave-ayland@ilande.co.uk> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
-rw-r--r--hw/m68k/q800.c6
-rw-r--r--include/hw/m68k/q800.h1
2 files changed, 7 insertions, 0 deletions
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
@@ -178,6 +178,12 @@ static void q800_machine_init(MachineState *machine)
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")