[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 09/23] q800: introduce mac-io container memory region
From: |
Mark Cave-Ayland |
Subject: |
[PATCH v3 09/23] q800: introduce mac-io container memory region |
Date: |
Sun, 4 Jun 2023 14:14:36 +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>
---
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 7aa391a322..6682c81ac8 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 v3 01/23] q800: fix up minor spacing issues in hw_compat_q800 GlobalProperty array, (continued)
- [PATCH v3 01/23] q800: fix up minor spacing issues in hw_compat_q800 GlobalProperty array, Mark Cave-Ayland, 2023/06/04
- [PATCH v3 04/23] q800: rename q800_init() to q800_machine_init(), Mark Cave-Ayland, 2023/06/04
- [PATCH v3 05/23] q800: move CPU object into Q800MachineState, Mark Cave-Ayland, 2023/06/04
- [PATCH v3 06/23] q800: move ROM memory region to Q800MachineState, Mark Cave-Ayland, 2023/06/04
- [PATCH v3 07/23] q800: move GLUE device into separate q800-glue.c file, Mark Cave-Ayland, 2023/06/04
- [PATCH v3 08/23] q800: move GLUE device to Q800MachineState, Mark Cave-Ayland, 2023/06/04
- [PATCH v3 09/23] q800: introduce mac-io container memory region,
Mark Cave-Ayland <=
- [PATCH v3 10/23] q800: reimplement mac-io region aliasing using IO memory region, Mark Cave-Ayland, 2023/06/04
- Re: [PATCH v3 10/23] q800: reimplement mac-io region aliasing using IO memory region, Philippe Mathieu-Daudé, 2023/06/05
- [PATCH v3 11/23] q800: move VIA1 device to Q800MachineState, Mark Cave-Ayland, 2023/06/04
- [PATCH v3 16/23] q800: move escc_orgate device to Q800MachineState, Mark Cave-Ayland, 2023/06/04
- [PATCH v3 15/23] q800: move ESCC device to Q800MachineState, Mark Cave-Ayland, 2023/06/04
- [PATCH v3 12/23] q800: move VIA2 device to Q800MachineState, Mark Cave-Ayland, 2023/06/04