aboutsummaryrefslogtreecommitdiff
path: root/hw/mips_r4k.c
diff options
context:
space:
mode:
authorpbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>2009-04-10 02:24:36 +0000
committerpbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>2009-04-10 02:24:36 +0000
commitb584726df971c1238a5249cc21121cf2ebbcaf55 (patch)
tree32b73d21de064d8b3c28750d35608cac701d1863 /hw/mips_r4k.c
parenta8b01dd87f3f1cb93d51ce87b13f57fe5415e33e (diff)
Clean up VGA ram allocation.
Signed-off-by: Paul Brook <paul@codesourcery.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7063 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/mips_r4k.c')
-rw-r--r--hw/mips_r4k.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index 3da3e70723..d7a31f5557 100644
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -155,7 +155,6 @@ void mips_r4k_init (ram_addr_t ram_size, int vga_ram_size,
{
char buf[1024];
ram_addr_t ram_offset;
- ram_addr_t vga_ram_offset;
ram_addr_t bios_offset;
int bios_size;
CPUState *env;
@@ -188,7 +187,6 @@ void mips_r4k_init (ram_addr_t ram_size, int vga_ram_size,
exit(1);
}
ram_offset = qemu_ram_alloc(ram_size);
- vga_ram_offset = qemu_ram_alloc(vga_ram_size);
cpu_register_physical_memory(0, ram_size, ram_offset | IO_MEM_RAM);
@@ -257,8 +255,7 @@ void mips_r4k_init (ram_addr_t ram_size, int vga_ram_size,
}
}
- isa_vga_init(phys_ram_base + vga_ram_offset, ram_size,
- vga_ram_size);
+ isa_vga_init(vga_ram_size);
if (nd_table[0].vlan)
isa_ne2000_init(0x300, i8259[9], &nd_table[0]);