OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Introduce vga_common_reset() to be able to typcheck vga_reset()

Browse Source 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Juan Quintela 2009-08-24 18:42:45 +02:00 committed by Anthony Liguori
parent 63124a0d88
commit 03a3e7ba5a
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/cirrus_vga.c
View File

@ -3125,7 +3125,7 @@ static void cirrus_reset(void *opaque)
{ {
CirrusVGAState *s = opaque; CirrusVGAState *s = opaque;
vga_reset(s); vga_common_reset(&s->vga);
unmap_linear_vram(s); unmap_linear_vram(s);
s->vga.sr[0x06] = 0x0f; s->vga.sr[0x06] = 0x0f;
if (s->device_id == CIRRUS_ID_CLGD5446) { if (s->device_id == CIRRUS_ID_CLGD5446) {

10
hw/vga.c
View File

@ -1873,10 +1873,8 @@ static void vga_invalidate_display(void *opaque)
s->full_update = 1; 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_addr = 0;
s->lfb_end = 0; s->lfb_end = 0;
s->map_addr = 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_X(x) ((x) % width)
#define TEXTMODE_Y(x) ((x) / width) #define TEXTMODE_Y(x) ((x) / width)
#define VMEM2CHTYPE(v) ((v & 0xff0007ff) | \ #define VMEM2CHTYPE(v) ((v & 0xff0007ff) | \

2
hw/vga_int.h
View File

@ -192,7 +192,7 @@ static inline int c6_to_8(int v)
void vga_common_init(VGAState *s, int vga_ram_size); void vga_common_init(VGAState *s, int vga_ram_size);
void vga_init(VGAState *s); void vga_init(VGAState *s);
void vga_reset(void *s); void vga_common_reset(VGACommonState *s);
void vga_dirty_log_start(VGAState *s); void vga_dirty_log_start(VGAState *s);