Revision c60e08d9 hw/pl110.c
b/hw/pl110.c | ||
---|---|---|
30 | 30 |
typedef struct { |
31 | 31 |
uint32_t base; |
32 | 32 |
DisplayState *ds; |
33 |
QEMUConsole *console; |
|
34 |
|
|
33 | 35 |
/* The Versatile/PB uses a slightly modified PL110 controller. */ |
34 | 36 |
int versatile; |
35 | 37 |
uint32_t timing[4]; |
... | ... | |
270 | 272 |
{ |
271 | 273 |
if (width != s->cols || height != s->rows) { |
272 | 274 |
if (pl110_enabled(s)) { |
273 |
dpy_resize(s->ds, width, height);
|
|
275 |
qemu_console_resize(s->console, width, height);
|
|
274 | 276 |
} |
275 | 277 |
} |
276 | 278 |
s->cols = width; |
... | ... | |
387 | 389 |
s->cr = val; |
388 | 390 |
s->bpp = (val >> 1) & 7; |
389 | 391 |
if (pl110_enabled(s)) { |
390 |
dpy_resize(s->ds, s->cols, s->rows);
|
|
392 |
qemu_console_resize(s->console, s->cols, s->rows);
|
|
391 | 393 |
} |
392 | 394 |
break; |
393 | 395 |
case 10: /* LCDICR */ |
... | ... | |
425 | 427 |
s->ds = ds; |
426 | 428 |
s->versatile = versatile; |
427 | 429 |
s->irq = irq; |
428 |
graphic_console_init(ds, pl110_update_display, pl110_invalidate_display, |
|
429 |
NULL, NULL, s); |
|
430 |
s->console = graphic_console_init(ds, pl110_update_display, |
|
431 |
pl110_invalidate_display, |
|
432 |
NULL, NULL, s); |
|
430 | 433 |
/* ??? Save/restore. */ |
431 | 434 |
return s; |
432 | 435 |
} |
Also available in: Unified diff