Revision 3023f332 hw/cirrus_vga.c
| b/hw/cirrus_vga.c | ||
|---|---|---|
| 774 | 774 |
s->cirrus_blt_width, s->cirrus_blt_height); |
| 775 | 775 |
|
| 776 | 776 |
if (notify) |
| 777 |
qemu_console_copy(s->console,
|
|
| 777 |
qemu_console_copy(s->ds,
|
|
| 778 | 778 |
sx, sy, dx, dy, |
| 779 | 779 |
s->cirrus_blt_width / depth, |
| 780 | 780 |
s->cirrus_blt_height); |
| ... | ... | |
| 3290 | 3290 |
* |
| 3291 | 3291 |
***************************************/ |
| 3292 | 3292 |
|
| 3293 |
void isa_cirrus_vga_init(DisplayState *ds, uint8_t *vga_ram_base,
|
|
| 3293 |
void isa_cirrus_vga_init(uint8_t *vga_ram_base, |
|
| 3294 | 3294 |
ram_addr_t vga_ram_offset, int vga_ram_size) |
| 3295 | 3295 |
{
|
| 3296 | 3296 |
CirrusVGAState *s; |
| ... | ... | |
| 3298 | 3298 |
s = qemu_mallocz(sizeof(CirrusVGAState)); |
| 3299 | 3299 |
|
| 3300 | 3300 |
vga_common_init((VGAState *)s, |
| 3301 |
ds, vga_ram_base, vga_ram_offset, vga_ram_size);
|
|
| 3301 |
vga_ram_base, vga_ram_offset, vga_ram_size); |
|
| 3302 | 3302 |
cirrus_init_common(s, CIRRUS_ID_CLGD5430, 0); |
| 3303 |
s->console = graphic_console_init(s->ds, s->update, s->invalidate,
|
|
| 3304 |
s->screen_dump, s->text_update, s);
|
|
| 3303 |
s->ds = graphic_console_init(s->update, s->invalidate,
|
|
| 3304 |
s->screen_dump, s->text_update, s); |
|
| 3305 | 3305 |
/* XXX ISA-LFB support */ |
| 3306 | 3306 |
} |
| 3307 | 3307 |
|
| ... | ... | |
| 3339 | 3339 |
s->cirrus_mmio_io_addr); |
| 3340 | 3340 |
} |
| 3341 | 3341 |
|
| 3342 |
void pci_cirrus_vga_init(PCIBus *bus, DisplayState *ds, uint8_t *vga_ram_base,
|
|
| 3342 |
void pci_cirrus_vga_init(PCIBus *bus, uint8_t *vga_ram_base, |
|
| 3343 | 3343 |
ram_addr_t vga_ram_offset, int vga_ram_size) |
| 3344 | 3344 |
{
|
| 3345 | 3345 |
PCICirrusVGAState *d; |
| ... | ... | |
| 3366 | 3366 |
/* setup VGA */ |
| 3367 | 3367 |
s = &d->cirrus_vga; |
| 3368 | 3368 |
vga_common_init((VGAState *)s, |
| 3369 |
ds, vga_ram_base, vga_ram_offset, vga_ram_size);
|
|
| 3369 |
vga_ram_base, vga_ram_offset, vga_ram_size); |
|
| 3370 | 3370 |
cirrus_init_common(s, device_id, 1); |
| 3371 | 3371 |
|
| 3372 |
s->console = graphic_console_init(s->ds, s->update, s->invalidate,
|
|
| 3373 |
s->screen_dump, s->text_update, s);
|
|
| 3372 |
s->ds = graphic_console_init(s->update, s->invalidate,
|
|
| 3373 |
s->screen_dump, s->text_update, s); |
|
| 3374 | 3374 |
|
| 3375 | 3375 |
s->pci_dev = (PCIDevice *)d; |
| 3376 | 3376 |
|
Also available in: Unified diff