summary refs log tree commit diff stats
path: root/hw/cirrus_vga.c
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/cirrus_vga.c
parent1481e16abbab14a2e19410770f97cb764bb9be16 (diff)
downloadfocaccia-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/cirrus_vga.c')
-rw-r--r--hw/cirrus_vga.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c
index 32cf3e41ac..48f89600e7 100644
--- a/hw/cirrus_vga.c
+++ b/hw/cirrus_vga.c
@@ -3239,13 +3239,13 @@ static void cirrus_init_common(CirrusVGAState * s, int device_id, int is_pci)
  *
  ***************************************/
 
-void isa_cirrus_vga_init(int vga_ram_size)
+void isa_cirrus_vga_init(void)
 {
     CirrusVGAState *s;
 
     s = qemu_mallocz(sizeof(CirrusVGAState));
 
-    vga_common_init(&s->vga, vga_ram_size);
+    vga_common_init(&s->vga, VGA_RAM_SIZE);
     cirrus_init_common(s, CIRRUS_ID_CLGD5430, 0);
     s->vga.ds = graphic_console_init(s->vga.update, s->vga.invalidate,
                                      s->vga.screen_dump, s->vga.text_update,
@@ -3301,7 +3301,7 @@ static void pci_cirrus_write_config(PCIDevice *d,
     cirrus_update_memory_access(s);
 }
 
-void pci_cirrus_vga_init(PCIBus *bus, int vga_ram_size)
+void pci_cirrus_vga_init(PCIBus *bus)
 {
     PCICirrusVGAState *d;
     uint8_t *pci_conf;
@@ -3323,7 +3323,7 @@ void pci_cirrus_vga_init(PCIBus *bus, int vga_ram_size)
 
     /* setup VGA */
     s = &d->cirrus_vga;
-    vga_common_init(&s->vga, vga_ram_size);
+    vga_common_init(&s->vga, VGA_RAM_SIZE);
     cirrus_init_common(s, device_id, 1);
 
     s->vga.ds = graphic_console_init(s->vga.update, s->vga.invalidate,