From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44097) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDJvF-0002qZ-8y for qemu-devel@nongnu.org; Mon, 19 Jan 2015 16:31:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YDJv9-0007mw-PX for qemu-devel@nongnu.org; Mon, 19 Jan 2015 16:31:45 -0500 Received: from smtp2-g21.free.fr ([212.27.42.2]:58470) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDJv9-0007mr-KI for qemu-devel@nongnu.org; Mon, 19 Jan 2015 16:31:39 -0500 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Mon, 19 Jan 2015 22:28:34 +0100 Message-Id: <1421702918-27143-5-git-send-email-hpoussin@reactos.org> In-Reply-To: <1421702918-27143-1-git-send-email-hpoussin@reactos.org> References: <1421702918-27143-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 4/7] mips: remove isa_mem_base usage List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Leon Alrae , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aurelien Jarno Signed-off-by: Herv=C3=A9 Poussineau --- 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 =3D g_new(MemoryRegion, 1); MemoryRegion *bios; MemoryRegion *iomem =3D g_new(MemoryRegion, 1); - MemoryRegion *isa =3D g_new(MemoryRegion, 1); + MemoryRegion *isa_io =3D g_new(MemoryRegion, 1); + MemoryRegion *isa_mem =3D 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); =20 + /* 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 =3D isa_bus_new(NULL, isa_mem, get_system_io()); + /* The PIC is attached to the MIPS CPU INT0 pin */ - isa_bus =3D isa_bus_new(NULL, get_system_memory(), get_system_io()); i8259 =3D i8259_init(isa_bus, env->irq[2]); isa_bus_irqs(isa_bus, i8259); =20 rtc_init(isa_bus, 2000, NULL); =20 - /* 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 =3D 0x10000000; - pit =3D pit_init(isa_bus, 0x40, 0, NULL); =20 for(i =3D 0; i < MAX_SERIAL_PORTS; i++) { --=20 1.7.10.4