[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/14] mips: remove isa_mem_base usage
From: |
Leon Alrae |
Subject: |
[Qemu-devel] [PULL 04/14] mips: remove isa_mem_base usage |
Date: |
Fri, 13 Feb 2015 10:02:02 +0000 |
From: Hervé Poussineau <address@hidden>
Signed-off-by: Hervé Poussineau <address@hidden>
Signed-off-by: Leon Alrae <address@hidden>
---
hw/mips/mips_r4k.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c
index 5b982f2..3e90e27 100644
--- a/hw/mips/mips_r4k.c
+++ b/hw/mips/mips_r4k.c
@@ -165,7 +165,8 @@ void mips_r4k_init(MachineState *machine)
MemoryRegion *ram = g_new(MemoryRegion, 1);
MemoryRegion *bios;
MemoryRegion *iomem = g_new(MemoryRegion, 1);
- MemoryRegion *isa = g_new(MemoryRegion, 1);
+ MemoryRegion *isa_io = g_new(MemoryRegion, 1);
+ MemoryRegion *isa_mem = g_new(MemoryRegion, 1);
int bios_size;
MIPSCPU *cpu;
CPUMIPSState *env;
@@ -267,20 +268,20 @@ void mips_r4k_init(MachineState *machine)
cpu_mips_irq_init_cpu(env);
cpu_mips_clock_init(env);
+ /* ISA bus: IO space at 0x14000000, mem space at 0x10000000 */
+ memory_region_init_alias(isa_io, NULL, "isa-io",
+ get_system_io(), 0, 0x00010000);
+ memory_region_init(isa_mem, NULL, "isa-mem", 0x01000000);
+ memory_region_add_subregion(get_system_memory(), 0x14000000, isa_io);
+ memory_region_add_subregion(get_system_memory(), 0x10000000, isa_mem);
+ isa_bus = isa_bus_new(NULL, isa_mem, get_system_io());
+
/* The PIC is attached to the MIPS CPU INT0 pin */
- isa_bus = isa_bus_new(NULL, get_system_memory(), get_system_io());
i8259 = i8259_init(isa_bus, env->irq[2]);
isa_bus_irqs(isa_bus, i8259);
rtc_init(isa_bus, 2000, NULL);
- /* Register 64 KB of ISA IO space at 0x14000000 */
- memory_region_init_alias(isa, NULL, "isa_mmio",
- get_system_io(), 0, 0x00010000);
- memory_region_add_subregion(get_system_memory(), 0x14000000, isa);
-
- isa_mem_base = 0x10000000;
-
pit = pit_init(isa_bus, 0x40, 0, NULL);
for(i = 0; i < MAX_SERIAL_PORTS; i++) {
--
2.1.0
- [Qemu-devel] [PULL 00/14] target-mips queue, Leon Alrae, 2015/02/13
- [Qemu-devel] [PULL 04/14] mips: remove isa_mem_base usage,
Leon Alrae <=
- [Qemu-devel] [PULL 05/14] piix4: use PCI address space instead of system memory, Leon Alrae, 2015/02/13
- [Qemu-devel] [PULL 03/14] jazz: remove usage of isa_mem_base, Leon Alrae, 2015/02/13
- [Qemu-devel] [PULL 13/14] target-mips: pass 0 instead of -1 as rs in microMIPS LUI instruction, Leon Alrae, 2015/02/13
- [Qemu-devel] [PULL 07/14] isa: remove isa_mem_base variable, Leon Alrae, 2015/02/13
- [Qemu-devel] [PULL 02/14] jazz: do not explode QEMUMachineInitArgs structure, Leon Alrae, 2015/02/13
- [Qemu-devel] [PULL 06/14] gt64xxx: remove isa_mem_base usage, Leon Alrae, 2015/02/13
- [Qemu-devel] [PULL 01/14] isa: add memory space parameter to isa_bus_new, Leon Alrae, 2015/02/13
- [Qemu-devel] [PULL 11/14] target-mips: use CP0EnLo_XI instead of magic number, Leon Alrae, 2015/02/13
- [Qemu-devel] [PULL 12/14] target-mips: fix broken snapshotting, Leon Alrae, 2015/02/13
- [Qemu-devel] [PULL 08/14] target-mips: Make CP0.Status.CU1 read-only for the 5Kc and 5KEc processors, Leon Alrae, 2015/02/13