diff options
| author | pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-04-10 02:24:36 +0000 |
|---|---|---|
| committer | pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-04-10 02:24:36 +0000 |
| commit | b584726df971c1238a5249cc21121cf2ebbcaf55 (patch) | |
| tree | 32b73d21de064d8b3c28750d35608cac701d1863 /hw/mips_jazz.c | |
| parent | a8b01dd87f3f1cb93d51ce87b13f57fe5415e33e (diff) | |
| download | qemu-b584726df971c1238a5249cc21121cf2ebbcaf55.tar.gz | |
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_jazz.c')
| -rw-r--r-- | hw/mips_jazz.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c index 907e8114bb..39b42fda0c 100644 --- a/hw/mips_jazz.c +++ b/hw/mips_jazz.c @@ -142,7 +142,6 @@ void mips_jazz_init (ram_addr_t ram_size, int vga_ram_size, qemu_irq esp_reset; ram_addr_t ram_offset; ram_addr_t bios_offset; - ram_addr_t vga_ram_offset; /* init CPUs */ if (cpu_model == NULL) { @@ -164,7 +163,6 @@ void mips_jazz_init (ram_addr_t ram_size, int vga_ram_size, ram_offset = qemu_ram_alloc(ram_size); cpu_register_physical_memory(0, ram_size, ram_offset | IO_MEM_RAM); - vga_ram_offset = qemu_ram_alloc(vga_ram_size); bios_offset = qemu_ram_alloc(MAGNUM_BIOS_SIZE); cpu_register_physical_memory(0x1fc00000LL, MAGNUM_BIOS_SIZE, bios_offset | IO_MEM_ROM); @@ -205,12 +203,10 @@ void mips_jazz_init (ram_addr_t ram_size, int vga_ram_size, /* Video card */ switch (jazz_model) { case JAZZ_MAGNUM: - g364fb_mm_init(phys_ram_base + vga_ram_offset, ram_size, vga_ram_size, - 0x40000000, 0x60000000, 0, rc4030[3]); + g364fb_mm_init(vga_ram_size, 0x40000000, 0x60000000, 0, rc4030[3]); break; case JAZZ_PICA61: - isa_vga_mm_init(phys_ram_base + vga_ram_offset, ram_size, vga_ram_size, - 0x40000000, 0x60000000, 0); + isa_vga_mm_init(vga_ram_size, 0x40000000, 0x60000000, 0); break; default: break; |