Revision 3023f332 hw/pl110.c
| b/hw/pl110.c | ||
|---|---|---|
| 29 | 29 |
|
| 30 | 30 |
typedef struct {
|
| 31 | 31 |
DisplayState *ds; |
| 32 |
QEMUConsole *console; |
|
| 33 | 32 |
|
| 34 | 33 |
/* The Versatile/PB uses a slightly modified PL110 controller. */ |
| 35 | 34 |
int versatile; |
| ... | ... | |
| 271 | 270 |
{
|
| 272 | 271 |
if (width != s->cols || height != s->rows) {
|
| 273 | 272 |
if (pl110_enabled(s)) {
|
| 274 |
qemu_console_resize(s->console, width, height);
|
|
| 273 |
qemu_console_resize(s->ds, width, height);
|
|
| 275 | 274 |
} |
| 276 | 275 |
} |
| 277 | 276 |
s->cols = width; |
| ... | ... | |
| 386 | 385 |
s->cr = val; |
| 387 | 386 |
s->bpp = (val >> 1) & 7; |
| 388 | 387 |
if (pl110_enabled(s)) {
|
| 389 |
qemu_console_resize(s->console, s->cols, s->rows);
|
|
| 388 |
qemu_console_resize(s->ds, s->cols, s->rows);
|
|
| 390 | 389 |
} |
| 391 | 390 |
break; |
| 392 | 391 |
case 10: /* LCDICR */ |
| ... | ... | |
| 410 | 409 |
pl110_write |
| 411 | 410 |
}; |
| 412 | 411 |
|
| 413 |
void *pl110_init(DisplayState *ds, uint32_t base, qemu_irq irq, |
|
| 414 |
int versatile) |
|
| 412 |
void *pl110_init(uint32_t base, qemu_irq irq, int versatile) |
|
| 415 | 413 |
{
|
| 416 | 414 |
pl110_state *s; |
| 417 | 415 |
int iomemtype; |
| ... | ... | |
| 420 | 418 |
iomemtype = cpu_register_io_memory(0, pl110_readfn, |
| 421 | 419 |
pl110_writefn, s); |
| 422 | 420 |
cpu_register_physical_memory(base, 0x00001000, iomemtype); |
| 423 |
s->ds = ds; |
|
| 424 | 421 |
s->versatile = versatile; |
| 425 | 422 |
s->irq = irq; |
| 426 |
s->console = graphic_console_init(ds, pl110_update_display,
|
|
| 427 |
pl110_invalidate_display,
|
|
| 428 |
NULL, NULL, s);
|
|
| 423 |
s->ds = graphic_console_init(pl110_update_display,
|
|
| 424 |
pl110_invalidate_display, |
|
| 425 |
NULL, NULL, s); |
|
| 429 | 426 |
/* ??? Save/restore. */ |
| 430 | 427 |
return s; |
| 431 | 428 |
} |
Also available in: Unified diff