Revision 3023f332 hw/vga.c
| b/hw/vga.c | ||
|---|---|---|
| 1307 | 1307 |
cw != s->last_cw || cheight != s->last_ch || s->last_depth) {
|
| 1308 | 1308 |
s->last_scr_width = width * cw; |
| 1309 | 1309 |
s->last_scr_height = height * cheight; |
| 1310 |
qemu_console_resize(s->console, s->last_scr_width, s->last_scr_height);
|
|
| 1310 |
qemu_console_resize(s->ds, s->last_scr_width, s->last_scr_height);
|
|
| 1311 | 1311 |
s->last_depth = 0; |
| 1312 | 1312 |
s->last_width = width; |
| 1313 | 1313 |
s->last_height = height; |
| ... | ... | |
| 1682 | 1682 |
s->vram_ptr + (s->start_addr * 4)); |
| 1683 | 1683 |
dpy_resize(s->ds); |
| 1684 | 1684 |
} else {
|
| 1685 |
qemu_console_resize(s->console, disp_width, height);
|
|
| 1685 |
qemu_console_resize(s->ds, disp_width, height);
|
|
| 1686 | 1686 |
} |
| 1687 | 1687 |
} else {
|
| 1688 |
qemu_console_resize(s->console, disp_width, height);
|
|
| 1688 |
qemu_console_resize(s->ds, disp_width, height);
|
|
| 1689 | 1689 |
} |
| 1690 | 1690 |
s->last_scr_width = disp_width; |
| 1691 | 1691 |
s->last_scr_height = height; |
| ... | ... | |
| 2254 | 2254 |
vga_dirty_log_start(s); |
| 2255 | 2255 |
} |
| 2256 | 2256 |
|
| 2257 |
void vga_common_init(VGAState *s, DisplayState *ds, uint8_t *vga_ram_base,
|
|
| 2257 |
void vga_common_init(VGAState *s, uint8_t *vga_ram_base, |
|
| 2258 | 2258 |
ram_addr_t vga_ram_offset, int vga_ram_size) |
| 2259 | 2259 |
{
|
| 2260 | 2260 |
int i, j, v, b; |
| ... | ... | |
| 2285 | 2285 |
s->vram_ptr = vga_ram_base; |
| 2286 | 2286 |
s->vram_offset = vga_ram_offset; |
| 2287 | 2287 |
s->vram_size = vga_ram_size; |
| 2288 |
s->ds = ds; |
|
| 2289 | 2288 |
s->get_bpp = vga_get_bpp; |
| 2290 | 2289 |
s->get_offsets = vga_get_offsets; |
| 2291 | 2290 |
s->get_resolution = vga_get_resolution; |
| ... | ... | |
| 2434 | 2433 |
qemu_register_coalesced_mmio(vram_base + 0x000a0000, 0x20000); |
| 2435 | 2434 |
} |
| 2436 | 2435 |
|
| 2437 |
int isa_vga_init(DisplayState *ds, uint8_t *vga_ram_base,
|
|
| 2436 |
int isa_vga_init(uint8_t *vga_ram_base, |
|
| 2438 | 2437 |
unsigned long vga_ram_offset, int vga_ram_size) |
| 2439 | 2438 |
{
|
| 2440 | 2439 |
VGAState *s; |
| ... | ... | |
| 2443 | 2442 |
if (!s) |
| 2444 | 2443 |
return -1; |
| 2445 | 2444 |
|
| 2446 |
vga_common_init(s, ds, vga_ram_base, vga_ram_offset, vga_ram_size);
|
|
| 2445 |
vga_common_init(s, vga_ram_base, vga_ram_offset, vga_ram_size); |
|
| 2447 | 2446 |
vga_init(s); |
| 2448 | 2447 |
|
| 2449 |
s->console = graphic_console_init(s->ds, s->update, s->invalidate,
|
|
| 2450 |
s->screen_dump, s->text_update, s);
|
|
| 2448 |
s->ds = graphic_console_init(s->update, s->invalidate,
|
|
| 2449 |
s->screen_dump, s->text_update, s); |
|
| 2451 | 2450 |
|
| 2452 | 2451 |
#ifdef CONFIG_BOCHS_VBE |
| 2453 | 2452 |
/* XXX: use optimized standard vga accesses */ |
| ... | ... | |
| 2457 | 2456 |
return 0; |
| 2458 | 2457 |
} |
| 2459 | 2458 |
|
| 2460 |
int isa_vga_mm_init(DisplayState *ds, uint8_t *vga_ram_base,
|
|
| 2459 |
int isa_vga_mm_init(uint8_t *vga_ram_base, |
|
| 2461 | 2460 |
unsigned long vga_ram_offset, int vga_ram_size, |
| 2462 | 2461 |
target_phys_addr_t vram_base, target_phys_addr_t ctrl_base, |
| 2463 | 2462 |
int it_shift) |
| ... | ... | |
| 2468 | 2467 |
if (!s) |
| 2469 | 2468 |
return -1; |
| 2470 | 2469 |
|
| 2471 |
vga_common_init(s, ds, vga_ram_base, vga_ram_offset, vga_ram_size);
|
|
| 2470 |
vga_common_init(s, vga_ram_base, vga_ram_offset, vga_ram_size); |
|
| 2472 | 2471 |
vga_mm_init(s, vram_base, ctrl_base, it_shift); |
| 2473 | 2472 |
|
| 2474 |
s->console = graphic_console_init(s->ds, s->update, s->invalidate,
|
|
| 2475 |
s->screen_dump, s->text_update, s);
|
|
| 2473 |
s->ds = graphic_console_init(s->update, s->invalidate,
|
|
| 2474 |
s->screen_dump, s->text_update, s); |
|
| 2476 | 2475 |
|
| 2477 | 2476 |
#ifdef CONFIG_BOCHS_VBE |
| 2478 | 2477 |
/* XXX: use optimized standard vga accesses */ |
| ... | ... | |
| 2482 | 2481 |
return 0; |
| 2483 | 2482 |
} |
| 2484 | 2483 |
|
| 2485 |
int pci_vga_init(PCIBus *bus, DisplayState *ds, uint8_t *vga_ram_base,
|
|
| 2484 |
int pci_vga_init(PCIBus *bus, uint8_t *vga_ram_base, |
|
| 2486 | 2485 |
unsigned long vga_ram_offset, int vga_ram_size, |
| 2487 | 2486 |
unsigned long vga_bios_offset, int vga_bios_size) |
| 2488 | 2487 |
{
|
| ... | ... | |
| 2497 | 2496 |
return -1; |
| 2498 | 2497 |
s = &d->vga_state; |
| 2499 | 2498 |
|
| 2500 |
vga_common_init(s, ds, vga_ram_base, vga_ram_offset, vga_ram_size);
|
|
| 2499 |
vga_common_init(s, vga_ram_base, vga_ram_offset, vga_ram_size); |
|
| 2501 | 2500 |
vga_init(s); |
| 2502 | 2501 |
|
| 2503 |
s->console = graphic_console_init(s->ds, s->update, s->invalidate,
|
|
| 2504 |
s->screen_dump, s->text_update, s);
|
|
| 2502 |
s->ds = graphic_console_init(s->update, s->invalidate,
|
|
| 2503 |
s->screen_dump, s->text_update, s); |
|
| 2505 | 2504 |
|
| 2506 | 2505 |
s->pci_dev = &d->dev; |
| 2507 | 2506 |
|
Also available in: Unified diff