Revision 46e50e9d hw/vga.c
| b/hw/vga.c | ||
|---|---|---|
| 1747 | 1747 |
} |
| 1748 | 1748 |
|
| 1749 | 1749 |
|
| 1750 |
int vga_initialize(DisplayState *ds, uint8_t *vga_ram_base, |
|
| 1751 |
unsigned long vga_ram_offset, int vga_ram_size, |
|
| 1752 |
int is_pci) |
|
| 1750 |
int vga_initialize(PCIBus *bus, DisplayState *ds, uint8_t *vga_ram_base, |
|
| 1751 |
unsigned long vga_ram_offset, int vga_ram_size) |
|
| 1753 | 1752 |
{
|
| 1754 | 1753 |
VGAState *s; |
| 1755 | 1754 |
|
| ... | ... | |
| 1805 | 1804 |
cpu_register_physical_memory(isa_mem_base + 0x000a0000, 0x20000, |
| 1806 | 1805 |
vga_io_memory); |
| 1807 | 1806 |
|
| 1808 |
if (is_pci) {
|
|
| 1807 |
if (bus) {
|
|
| 1809 | 1808 |
PCIDevice *d; |
| 1810 | 1809 |
uint8_t *pci_conf; |
| 1811 | 1810 |
|
| 1812 |
d = pci_register_device("VGA",
|
|
| 1811 |
d = pci_register_device(bus, "VGA",
|
|
| 1813 | 1812 |
sizeof(PCIDevice), |
| 1814 |
0, -1, |
|
| 1815 |
NULL, NULL); |
|
| 1813 |
-1, NULL, NULL); |
|
| 1816 | 1814 |
pci_conf = d->config; |
| 1817 | 1815 |
pci_conf[0x00] = 0x34; // dummy VGA (same as Bochs ID) |
| 1818 | 1816 |
pci_conf[0x01] = 0x12; |
Also available in: Unified diff