[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [COMMIT 03a3e7b] Introduce vga_common_reset() to be able
From: |
Anthony Liguori |
Subject: |
[Qemu-commits] [COMMIT 03a3e7b] Introduce vga_common_reset() to be able to typcheckvga_reset() |
Date: |
Fri, 28 Aug 2009 02:20:08 -0000 |
From: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>
diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c
index 6e9cbd4..b2bf0d9 100644
--- a/hw/cirrus_vga.c
+++ b/hw/cirrus_vga.c
@@ -3125,7 +3125,7 @@ static void cirrus_reset(void *opaque)
{
CirrusVGAState *s = opaque;
- vga_reset(s);
+ vga_common_reset(&s->vga);
unmap_linear_vram(s);
s->vga.sr[0x06] = 0x0f;
if (s->device_id == CIRRUS_ID_CLGD5446) {
diff --git a/hw/vga.c b/hw/vga.c
index 98891ff..a12ae8d 100644
--- a/hw/vga.c
+++ b/hw/vga.c
@@ -1873,10 +1873,8 @@ static void vga_invalidate_display(void *opaque)
s->full_update = 1;
}
-void vga_reset(void *opaque)
+void vga_common_reset(VGACommonState *s)
{
- VGAState *s = (VGAState *) opaque;
-
s->lfb_addr = 0;
s->lfb_end = 0;
s->map_addr = 0;
@@ -1942,6 +1940,12 @@ void vga_reset(void *opaque)
}
}
+static void vga_reset(void *opaque)
+{
+ VGAState *s = (VGAState *) opaque;
+ vga_common_reset(s);
+}
+
#define TEXTMODE_X(x) ((x) % width)
#define TEXTMODE_Y(x) ((x) / width)
#define VMEM2CHTYPE(v) ((v & 0xff0007ff) | \
diff --git a/hw/vga_int.h b/hw/vga_int.h
index eb2d6ea..bb28872 100644
--- a/hw/vga_int.h
+++ b/hw/vga_int.h
@@ -192,7 +192,7 @@ static inline int c6_to_8(int v)
void vga_common_init(VGAState *s, int vga_ram_size);
void vga_init(VGAState *s);
-void vga_reset(void *s);
+void vga_common_reset(VGACommonState *s);
void vga_dirty_log_start(VGAState *s);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-commits] [COMMIT 03a3e7b] Introduce vga_common_reset() to be able to typcheckvga_reset(),
Anthony Liguori <=