pc: split out vga initialization from pc_init1() into pc_vga_init().
Split out vga initialization which is independent of piix from pc_init1() as pc_vga_init(). Later it will be used. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Acked-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
parent
3d53f5c36f
commit
765d79084b
41
hw/pc.c
41
hw/pc.c
@ -929,6 +929,28 @@ static void pc_memory_init(ram_addr_t ram_size,
|
||||
}
|
||||
}
|
||||
|
||||
static void pc_vga_init(PCIBus *pci_bus)
|
||||
{
|
||||
if (cirrus_vga_enabled) {
|
||||
if (pci_bus) {
|
||||
pci_cirrus_vga_init(pci_bus);
|
||||
} else {
|
||||
isa_cirrus_vga_init();
|
||||
}
|
||||
} else if (vmsvga_enabled) {
|
||||
if (pci_bus)
|
||||
pci_vmsvga_init(pci_bus);
|
||||
else
|
||||
fprintf(stderr, "%s: vmware_vga: no PCI bus\n", __FUNCTION__);
|
||||
} else if (std_vga_enabled) {
|
||||
if (pci_bus) {
|
||||
pci_vga_init(pci_bus, 0, 0);
|
||||
} else {
|
||||
isa_vga_init();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* PC hardware initialisation */
|
||||
static void pc_init1(ram_addr_t ram_size,
|
||||
const char *boot_device,
|
||||
@ -987,24 +1009,7 @@ static void pc_init1(ram_addr_t ram_size,
|
||||
|
||||
register_ioport_write(0xf0, 1, 1, ioportF0_write, NULL);
|
||||
|
||||
if (cirrus_vga_enabled) {
|
||||
if (pci_enabled) {
|
||||
pci_cirrus_vga_init(pci_bus);
|
||||
} else {
|
||||
isa_cirrus_vga_init();
|
||||
}
|
||||
} else if (vmsvga_enabled) {
|
||||
if (pci_enabled)
|
||||
pci_vmsvga_init(pci_bus);
|
||||
else
|
||||
fprintf(stderr, "%s: vmware_vga: no PCI bus\n", __FUNCTION__);
|
||||
} else if (std_vga_enabled) {
|
||||
if (pci_enabled) {
|
||||
pci_vga_init(pci_bus, 0, 0);
|
||||
} else {
|
||||
isa_vga_init();
|
||||
}
|
||||
}
|
||||
pc_vga_init(pci_enabled? pci_bus: NULL);
|
||||
|
||||
rtc_state = rtc_init(2000);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user