[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [4646] MusicPal: Restore display size after invalidation (J
From: |
Andrzej Zaborowski |
Subject: |
[Qemu-devel] [4646] MusicPal: Restore display size after invalidation (Jan Kiszka). |
Date: |
Mon, 02 Jun 2008 02:04:57 +0000 |
Revision: 4646
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4646
Author: balrog
Date: 2008-06-02 02:04:56 +0000 (Mon, 02 Jun 2008)
Log Message:
-----------
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 <address@hidden>
Modified Paths:
--------------
trunk/hw/musicpal.c
Modified: trunk/hw/musicpal.c
===================================================================
--- trunk/hw/musicpal.c 2008-06-02 01:48:27 UTC (rev 4645)
+++ trunk/hw/musicpal.c 2008-06-02 02:04:56 UTC (rev 4646)
@@ -759,6 +759,7 @@
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 @@
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 @@
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 @@
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 */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [4646] MusicPal: Restore display size after invalidation (Jan Kiszka).,
Andrzej Zaborowski <=