Revision 3023f332 hw/g364fb.c
b/hw/g364fb.c | ||
---|---|---|
32 | 32 |
uint8_t palette[256][3]; |
33 | 33 |
/* display refresh support */ |
34 | 34 |
DisplayState *ds; |
35 |
QEMUConsole *console; |
|
36 | 35 |
int graphic_mode; |
37 | 36 |
uint32_t scr_width, scr_height; /* in pixels */ |
38 | 37 |
} G364State; |
... | ... | |
131 | 130 |
full_update = 1; |
132 | 131 |
} |
133 | 132 |
if (s->scr_width != ds_get_width(s->ds) || s->scr_height != ds_get_height(s->ds)) { |
134 |
qemu_console_resize(s->console, s->scr_width, s->scr_height);
|
|
133 |
qemu_console_resize(s->ds, s->scr_width, s->scr_height);
|
|
135 | 134 |
full_update = 1; |
136 | 135 |
} |
137 | 136 |
switch(graphic_mode) { |
... | ... | |
354 | 353 |
g364fb_mem_writel, |
355 | 354 |
}; |
356 | 355 |
|
357 |
int g364fb_mm_init(DisplayState *ds, |
|
358 |
int vram_size, int it_shift, |
|
356 |
int g364fb_mm_init(int vram_size, int it_shift, |
|
359 | 357 |
target_phys_addr_t vram_base, target_phys_addr_t ctrl_base) |
360 | 358 |
{ |
361 | 359 |
G364State *s; |
... | ... | |
371 | 369 |
qemu_register_reset(g364fb_reset, s); |
372 | 370 |
g364fb_reset(s); |
373 | 371 |
|
374 |
s->ds = ds; |
|
375 |
|
|
376 |
s->console = graphic_console_init(ds, g364fb_update_display, |
|
377 |
g364fb_invalidate_display, |
|
378 |
g364fb_screen_dump, NULL, s); |
|
372 |
s->ds = graphic_console_init(g364fb_update_display, |
|
373 |
g364fb_invalidate_display, |
|
374 |
g364fb_screen_dump, NULL, s); |
|
379 | 375 |
|
380 | 376 |
io_vram = cpu_register_io_memory(0, g364fb_mem_read, g364fb_mem_write, s); |
381 | 377 |
cpu_register_physical_memory(vram_base, vram_size, io_vram); |
Also available in: Unified diff