aboutsummaryrefslogtreecommitdiff
path: root/hw/ppc_chrp.c
diff options
context:
space:
mode:
authorbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2006-08-17 10:45:20 +0000
committerbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2006-08-17 10:45:20 +0000
commit89b6b508929d63b2a3dda18692fcb724afb43336 (patch)
tree225cf51bb0a1212edc82b6c2c422afc152d537ec /hw/ppc_chrp.c
parentd2269f6f64e1b707fc8ea5d43102589c03dd090e (diff)
downloadqemu-89b6b508929d63b2a3dda18692fcb724afb43336.zip
qemu-89b6b508929d63b2a3dda18692fcb724afb43336.tar.gz
qemu-89b6b508929d63b2a3dda18692fcb724afb43336.tar.bz2
vga init changes
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2114 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/ppc_chrp.c')
-rw-r--r--hw/ppc_chrp.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/hw/ppc_chrp.c b/hw/ppc_chrp.c
index 42d5995..9470769 100644
--- a/hw/ppc_chrp.c
+++ b/hw/ppc_chrp.c
@@ -424,9 +424,9 @@ static void ppc_chrp_init(int ram_size, int vga_ram_size, int boot_device,
pic = heathrow_pic_init(&heathrow_pic_mem_index);
set_irq = heathrow_pic_set_irq;
pci_bus = pci_grackle_init(0xfec00000, pic);
- vga_initialize(pci_bus, ds, phys_ram_base + ram_size,
- ram_size, vga_ram_size,
- vga_bios_offset, vga_bios_size);
+ pci_vga_init(pci_bus, ds, phys_ram_base + ram_size,
+ ram_size, vga_ram_size,
+ vga_bios_offset, vga_bios_size);
/* XXX: suppress that */
isa_pic = pic_init(pic_irq_request, NULL);
@@ -474,9 +474,9 @@ static void ppc_chrp_init(int ram_size, int vga_ram_size, int boot_device,
set_irq = openpic_set_irq;
pci_bus = pci_pmac_init(pic);
/* init basic PC hardware */
- vga_initialize(pci_bus, ds, phys_ram_base + ram_size,
- ram_size, vga_ram_size,
- vga_bios_offset, vga_bios_size);
+ pci_vga_init(pci_bus, ds, phys_ram_base + ram_size,
+ ram_size, vga_ram_size,
+ vga_bios_offset, vga_bios_size);
/* XXX: suppress that */
isa_pic = pic_init(pic_irq_request, NULL);