diff options
| author | Paul Brook <paul@codesourcery.com> | 2009-05-13 17:56:25 +0100 |
|---|---|---|
| committer | Paul Brook <paul@codesourcery.com> | 2009-05-13 17:56:25 +0100 |
| commit | fbe1b5953d061c77c07b91e4eb555c92195308d0 (patch) | |
| tree | 1475976bd828788075a1e32017b6f75a93344965 /hw/mips_jazz.c | |
| parent | 1481e16abbab14a2e19410770f97cb764bb9be16 (diff) | |
| download | focaccia-qemu-fbe1b5953d061c77c07b91e4eb555c92195308d0.tar.gz focaccia-qemu-fbe1b5953d061c77c07b91e4eb555c92195308d0.zip | |
Remove vga_ram_size
The vga_ram_size argument to machine init functions always has the same value, and is ignored by many machines (including SPARC32 which has an obsolete ifdef for VGA_RAM_SIZE). Remove it and push VGA_RAM_SIZE into vga_int.h. Signed-off-by: Paul Brook <paul@codesourcery.com>
Diffstat (limited to 'hw/mips_jazz.c')
| -rw-r--r-- | hw/mips_jazz.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c index 5ea4bba8cc..5cc709a52f 100644 --- a/hw/mips_jazz.c +++ b/hw/mips_jazz.c @@ -119,7 +119,7 @@ static void audio_init(qemu_irq *pic) #define MAGNUM_BIOS_SIZE (BIOS_SIZE < MAGNUM_BIOS_SIZE_MAX ? BIOS_SIZE : MAGNUM_BIOS_SIZE_MAX) static -void mips_jazz_init (ram_addr_t ram_size, int vga_ram_size, +void mips_jazz_init (ram_addr_t ram_size, const char *cpu_model, enum jazz_model_e jazz_model) { @@ -198,10 +198,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(vga_ram_size, 0x40000000, 0x60000000, 0, rc4030[3]); + g364fb_mm_init(0x40000000, 0x60000000, 0, rc4030[3]); break; case JAZZ_PICA61: - isa_vga_mm_init(vga_ram_size, 0x40000000, 0x60000000, 0); + isa_vga_mm_init(0x40000000, 0x60000000, 0); break; default: break; @@ -282,21 +282,21 @@ void mips_jazz_init (ram_addr_t ram_size, int vga_ram_size, } static -void mips_magnum_init (ram_addr_t ram_size, int vga_ram_size, +void mips_magnum_init (ram_addr_t ram_size, const char *boot_device, const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename, const char *cpu_model) { - mips_jazz_init(ram_size, vga_ram_size, cpu_model, JAZZ_MAGNUM); + mips_jazz_init(ram_size, cpu_model, JAZZ_MAGNUM); } static -void mips_pica61_init (ram_addr_t ram_size, int vga_ram_size, +void mips_pica61_init (ram_addr_t ram_size, const char *boot_device, const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename, const char *cpu_model) { - mips_jazz_init(ram_size, vga_ram_size, cpu_model, JAZZ_PICA61); + mips_jazz_init(ram_size, cpu_model, JAZZ_PICA61); } QEMUMachine mips_magnum_machine = { |