Revision be20f9e9 hw/vmware_vga.c
| b/hw/vmware_vga.c | ||
|---|---|---|
| 1207 | 1207 |
} |
| 1208 | 1208 |
}; |
| 1209 | 1209 |
|
| 1210 |
static void vmsvga_init(struct vmsvga_state_s *s, int vga_ram_size) |
|
| 1210 |
static void vmsvga_init(struct vmsvga_state_s *s, int vga_ram_size, |
|
| 1211 |
MemoryRegion *address_space) |
|
| 1211 | 1212 |
{
|
| 1212 | 1213 |
s->scratch_size = SVGA_SCRATCH_SIZE; |
| 1213 | 1214 |
s->scratch = g_malloc(s->scratch_size * 4); |
| ... | ... | |
| 1223 | 1224 |
s->fifo_ptr = memory_region_get_ram_ptr(&s->fifo_ram); |
| 1224 | 1225 |
|
| 1225 | 1226 |
vga_common_init(&s->vga, vga_ram_size); |
| 1226 |
vga_init(&s->vga); |
|
| 1227 |
vga_init(&s->vga, address_space);
|
|
| 1227 | 1228 |
vmstate_register(NULL, 0, &vmstate_vga_common, &s->vga); |
| 1228 | 1229 |
|
| 1229 | 1230 |
vmsvga_reset(s); |
| ... | ... | |
| 1293 | 1294 |
"vmsvga-io", 0x10); |
| 1294 | 1295 |
pci_register_bar(&s->card, 0, PCI_BASE_ADDRESS_SPACE_IO, &s->io_bar); |
| 1295 | 1296 |
|
| 1296 |
vmsvga_init(&s->chip, VGA_RAM_SIZE); |
|
| 1297 |
vmsvga_init(&s->chip, VGA_RAM_SIZE, pci_address_space(dev));
|
|
| 1297 | 1298 |
|
| 1298 | 1299 |
pci_register_bar(&s->card, 1, PCI_BASE_ADDRESS_MEM_PREFETCH, iomem); |
| 1299 | 1300 |
pci_register_bar(&s->card, 2, PCI_BASE_ADDRESS_MEM_PREFETCH, |
| ... | ... | |
| 1301 | 1302 |
|
| 1302 | 1303 |
if (!dev->rom_bar) {
|
| 1303 | 1304 |
/* compatibility with pc-0.13 and older */ |
| 1304 |
vga_init_vbe(&s->chip.vga); |
|
| 1305 |
vga_init_vbe(&s->chip.vga, pci_address_space(dev));
|
|
| 1305 | 1306 |
} |
| 1306 | 1307 |
|
| 1307 | 1308 |
return 0; |
Also available in: Unified diff