Revision fbe1b595 hw/pc.c
b/hw/pc.c | ||
---|---|---|
836 | 836 |
} |
837 | 837 |
|
838 | 838 |
/* PC hardware initialisation */ |
839 |
static void pc_init1(ram_addr_t ram_size, int vga_ram_size,
|
|
839 |
static void pc_init1(ram_addr_t ram_size, |
|
840 | 840 |
const char *boot_device, |
841 | 841 |
const char *kernel_filename, const char *kernel_cmdline, |
842 | 842 |
const char *initrd_filename, |
... | ... | |
999 | 999 |
|
1000 | 1000 |
if (cirrus_vga_enabled) { |
1001 | 1001 |
if (pci_enabled) { |
1002 |
pci_cirrus_vga_init(pci_bus, vga_ram_size);
|
|
1002 |
pci_cirrus_vga_init(pci_bus); |
|
1003 | 1003 |
} else { |
1004 |
isa_cirrus_vga_init(vga_ram_size);
|
|
1004 |
isa_cirrus_vga_init(); |
|
1005 | 1005 |
} |
1006 | 1006 |
} else if (vmsvga_enabled) { |
1007 | 1007 |
if (pci_enabled) |
1008 |
pci_vmsvga_init(pci_bus, vga_ram_size);
|
|
1008 |
pci_vmsvga_init(pci_bus); |
|
1009 | 1009 |
else |
1010 | 1010 |
fprintf(stderr, "%s: vmware_vga: no PCI bus\n", __FUNCTION__); |
1011 | 1011 |
} else if (std_vga_enabled) { |
1012 | 1012 |
if (pci_enabled) { |
1013 |
pci_vga_init(pci_bus, vga_ram_size, 0, 0);
|
|
1013 |
pci_vga_init(pci_bus, 0, 0); |
|
1014 | 1014 |
} else { |
1015 |
isa_vga_init(vga_ram_size);
|
|
1015 |
isa_vga_init(); |
|
1016 | 1016 |
} |
1017 | 1017 |
} |
1018 | 1018 |
|
... | ... | |
1162 | 1162 |
} |
1163 | 1163 |
} |
1164 | 1164 |
|
1165 |
static void pc_init_pci(ram_addr_t ram_size, int vga_ram_size,
|
|
1165 |
static void pc_init_pci(ram_addr_t ram_size, |
|
1166 | 1166 |
const char *boot_device, |
1167 | 1167 |
const char *kernel_filename, |
1168 | 1168 |
const char *kernel_cmdline, |
1169 | 1169 |
const char *initrd_filename, |
1170 | 1170 |
const char *cpu_model) |
1171 | 1171 |
{ |
1172 |
pc_init1(ram_size, vga_ram_size, boot_device,
|
|
1172 |
pc_init1(ram_size, boot_device, |
|
1173 | 1173 |
kernel_filename, kernel_cmdline, |
1174 | 1174 |
initrd_filename, 1, cpu_model); |
1175 | 1175 |
} |
1176 | 1176 |
|
1177 |
static void pc_init_isa(ram_addr_t ram_size, int vga_ram_size,
|
|
1177 |
static void pc_init_isa(ram_addr_t ram_size, |
|
1178 | 1178 |
const char *boot_device, |
1179 | 1179 |
const char *kernel_filename, |
1180 | 1180 |
const char *kernel_cmdline, |
1181 | 1181 |
const char *initrd_filename, |
1182 | 1182 |
const char *cpu_model) |
1183 | 1183 |
{ |
1184 |
pc_init1(ram_size, vga_ram_size, boot_device,
|
|
1184 |
pc_init1(ram_size, boot_device, |
|
1185 | 1185 |
kernel_filename, kernel_cmdline, |
1186 | 1186 |
initrd_filename, 0, cpu_model); |
1187 | 1187 |
} |
Also available in: Unified diff