Revision 03a3e7ba

b/hw/cirrus_vga.c
3125 3125
{
3126 3126
    CirrusVGAState *s = opaque;
3127 3127

  
3128
    vga_reset(s);
3128
    vga_common_reset(&s->vga);
3129 3129
    unmap_linear_vram(s);
3130 3130
    s->vga.sr[0x06] = 0x0f;
3131 3131
    if (s->device_id == CIRRUS_ID_CLGD5446) {
b/hw/vga.c
1873 1873
    s->full_update = 1;
1874 1874
}
1875 1875

  
1876
void vga_reset(void *opaque)
1876
void vga_common_reset(VGACommonState *s)
1877 1877
{
1878
    VGAState *s = (VGAState *) opaque;
1879

  
1880 1878
    s->lfb_addr = 0;
1881 1879
    s->lfb_end = 0;
1882 1880
    s->map_addr = 0;
......
1942 1940
    }
1943 1941
}
1944 1942

  
1943
static void vga_reset(void *opaque)
1944
{
1945
    VGAState *s = (VGAState *) opaque;
1946
    vga_common_reset(s);
1947
}
1948

  
1945 1949
#define TEXTMODE_X(x)	((x) % width)
1946 1950
#define TEXTMODE_Y(x)	((x) / width)
1947 1951
#define VMEM2CHTYPE(v)	((v & 0xff0007ff) | \
b/hw/vga_int.h
192 192

  
193 193
void vga_common_init(VGAState *s, int vga_ram_size);
194 194
void vga_init(VGAState *s);
195
void vga_reset(void *s);
195
void vga_common_reset(VGACommonState *s);
196 196

  
197 197
void vga_dirty_log_start(VGAState *s);
198 198

  

Also available in: Unified diff