diff options
| author | balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-06-02 02:04:56 +0000 |
|---|---|---|
| committer | balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-06-02 02:04:56 +0000 |
| commit | 167bc3d2fa100590b5a9d8fd9f19ae0207197447 (patch) | |
| tree | 5de338e6c04d77b6f9fb1d03035a28038309ae57 | |
| parent | ab7d91318bfc192ec38edaaabae06daa34b89a4d (diff) | |
MusicPal: Restore display size after invalidation (Jan Kiszka).
Make sure that the MusicPal display is set to the correct size again
after some other console may have used a different size.
Signed-off-by: Jan Kiszka <jan.kiszka@web.de>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4646 c046a42c-6fe2-441c-8c8c-71466251a162
| -rw-r--r-- | hw/musicpal.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/hw/musicpal.c b/hw/musicpal.c index 56eb2dc879..211c84936c 100644 --- a/hw/musicpal.c +++ b/hw/musicpal.c @@ -759,6 +759,7 @@ typedef struct musicpal_lcd_state { int page_off; DisplayState *ds; uint8_t video_ram[128*64/8]; + int invalidate; } musicpal_lcd_state; static uint32_t lcd_brightness; @@ -817,6 +818,11 @@ static void lcd_refresh(void *opaque) musicpal_lcd_state *s = opaque; int x, y, col; + if (s->invalidate && (s->ds->width != 128*3 || s->ds->height != 64*3)) { + dpy_resize(s->ds, 128*3, 64*3); + s->invalidate = 0; + } + switch (s->ds->depth) { case 0: return; @@ -843,6 +849,13 @@ static void lcd_refresh(void *opaque) dpy_update(s->ds, 0, 0, 128*3, 64*3); } +static void lcd_invalidate(void *opaque) +{ + musicpal_lcd_state *s = opaque; + + s->invalidate = 1; +} + static uint32_t musicpal_lcd_read(void *opaque, target_phys_addr_t offset) { musicpal_lcd_state *s = opaque; @@ -919,12 +932,12 @@ static void musicpal_lcd_init(DisplayState *ds, uint32_t base) return; s->base = base; s->ds = ds; + s->invalidate = 1; iomemtype = cpu_register_io_memory(0, musicpal_lcd_readfn, musicpal_lcd_writefn, s); cpu_register_physical_memory(base, MP_LCD_SIZE, iomemtype); - graphic_console_init(ds, lcd_refresh, NULL, NULL, NULL, s); - dpy_resize(ds, 128*3, 64*3); + graphic_console_init(ds, lcd_refresh, lcd_invalidate, NULL, NULL, s); } /* PIC register offsets */ |