summaryrefslogtreecommitdiff
path: root/hw/pc.h
diff options
context:
space:
mode:
authorPaul Brook <paul@codesourcery.com>2009-05-13 17:56:25 +0100
committerPaul Brook <paul@codesourcery.com>2009-05-13 17:56:25 +0100
commitfbe1b5953d061c77c07b91e4eb555c92195308d0 (patch)
tree1475976bd828788075a1e32017b6f75a93344965 /hw/pc.h
parent1481e16abbab14a2e19410770f97cb764bb9be16 (diff)
downloadqemu-fbe1b5953d061c77c07b91e4eb555c92195308d0.tar.gz
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/pc.h')
-rw-r--r--hw/pc.h16
1 files changed, 5 insertions, 11 deletions
diff --git a/hw/pc.h b/hw/pc.h
index 7567d28c56..acdd7eeddd 100644
--- a/hw/pc.h
+++ b/hw/pc.h
@@ -138,21 +138,15 @@ enum vga_retrace_method {
extern enum vga_retrace_method vga_retrace_method;
-#if !defined(TARGET_SPARC) || defined(TARGET_SPARC64)
-#define VGA_RAM_SIZE (8192 * 1024)
-#else
-#define VGA_RAM_SIZE (9 * 1024 * 1024)
-#endif
-
-int isa_vga_init(int vga_ram_size);
-int pci_vga_init(PCIBus *bus, int vga_ram_size,
+int isa_vga_init(void);
+int pci_vga_init(PCIBus *bus,
unsigned long vga_bios_offset, int vga_bios_size);
-int isa_vga_mm_init(int vga_ram_size, target_phys_addr_t vram_base,
+int isa_vga_mm_init(target_phys_addr_t vram_base,
target_phys_addr_t ctrl_base, int it_shift);
/* cirrus_vga.c */
-void pci_cirrus_vga_init(PCIBus *bus, int vga_ram_size);
-void isa_cirrus_vga_init(int vga_ram_size);
+void pci_cirrus_vga_init(PCIBus *bus);
+void isa_cirrus_vga_init(void);
/* ide.c */
void isa_ide_init(int iobase, int iobase2, qemu_irq irq,