[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 07/30] q800: introduce mac-io container memory region
|
From: |
Mark Cave-Ayland |
|
Subject: |
[PATCH 07/30] q800: introduce mac-io container memory region |
|
Date: |
Wed, 24 May 2023 22:10:41 +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>
---
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 c22a98d616..6399631ed0 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -410,6 +410,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, NULL, "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 de02af53be..156872a124 100644
--- a/include/hw/m68k/q800.h
+++ b/include/hw/m68k/q800.h
@@ -33,6 +33,7 @@ struct Q800MachineState {
M68kCPU *cpu;
MemoryRegion rom;
DeviceState *glue;
+ MemoryRegion macio;
};
#define TYPE_Q800_MACHINE MACHINE_TYPE_NAME("q800")
--
2.30.2
- [PATCH 03/30] q800: rename q800_init() to q800_machine_init(), (continued)
- [PATCH 03/30] q800: rename q800_init() to q800_machine_init(), Mark Cave-Ayland, 2023/05/24
- [PATCH 04/30] q800: move CPU object into Q800MachineState, Mark Cave-Ayland, 2023/05/24
- [PATCH 05/30] q800: move ROM memory region to Q800MachineState, Mark Cave-Ayland, 2023/05/24
- [PATCH 06/30] q800: move GLUE device to Q800MachineState, Mark Cave-Ayland, 2023/05/24
- [PATCH 07/30] q800: introduce mac-io container memory region,
Mark Cave-Ayland <=
- [PATCH 08/30] q800: reimplement mac-io region aliasing using IO memory region, Mark Cave-Ayland, 2023/05/24
- [PATCH 09/30] q800: add djMEMC memory controller, Mark Cave-Ayland, 2023/05/24
- [PATCH 10/30] q800: add machine id register, Mark Cave-Ayland, 2023/05/24
- [PATCH 12/30] q800: add IOSB subsystem, Mark Cave-Ayland, 2023/05/24
- [PATCH 11/30] q800: implement additional machine id bits on VIA1 port A, Mark Cave-Ayland, 2023/05/24