X-Git-Url: http://git.maemo.org/git/?p=qemu;a=blobdiff_plain;f=hw%2Fpc.h;fp=hw%2Fpc.h;h=acdd7eeddd96b7ff3cf236ccc1e306f78cf543ea;hp=50e6c39239ea34bc39821cfc2c8a2722456cbf50;hb=a03c3bde4e288e790eccfb8cd45abd8ecbf467dc;hpb=e2ffa1bf065fa199f27d661d495573e9d6059bf1 diff --git a/hw/pc.h b/hw/pc.h index 50e6c39..acdd7ee 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -119,7 +119,7 @@ extern int no_hpet; /* pcspk.c */ void pcspk_init(PITState *); -int pcspk_audio_init(AudioState *, qemu_irq *pic); +int pcspk_audio_init(qemu_irq *pic); /* piix_pci.c */ PCIBus *i440fx_init(PCIDevice **pi440fx_state, qemu_irq *pic); @@ -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,