summaryrefslogtreecommitdiff
path: root/hw/cirrus_vga.c
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2009-08-24 18:42:47 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-08-27 20:46:59 -0500
commita4a2f59cda3c88eb647d651e0e0c5f1933b646b3 (patch)
tree114ea42fce8d066b36ceaffeee509fc6e81c9043 /hw/cirrus_vga.c
parent2191dffcf6ba7df884ac902e829415d55a0b2b68 (diff)
downloadqemu-a4a2f59cda3c88eb647d651e0e0c5f1933b646b3.tar.gz
Everything outside of vga.c should use VGACommonState
Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/cirrus_vga.c')
-rw-r--r--hw/cirrus_vga.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c
index b2bf0d9659..c63da6001c 100644
--- a/hw/cirrus_vga.c
+++ b/hw/cirrus_vga.c
@@ -1078,7 +1078,7 @@ static void cirrus_write_bitblt(CirrusVGAState * s, unsigned reg_value)
*
***************************************/
-static void cirrus_get_offsets(VGAState *s1,
+static void cirrus_get_offsets(VGACommonState *s1,
uint32_t *pline_offset,
uint32_t *pstart_addr,
uint32_t *pline_compare)
@@ -1126,7 +1126,7 @@ static uint32_t cirrus_get_bpp16_depth(CirrusVGAState * s)
return ret;
}
-static int cirrus_get_bpp(VGAState *s1)
+static int cirrus_get_bpp(VGACommonState *s1)
{
CirrusVGAState * s = container_of(s1, CirrusVGAState, vga);
uint32_t ret = 8;
@@ -1164,7 +1164,7 @@ static int cirrus_get_bpp(VGAState *s1)
return ret;
}
-static void cirrus_get_resolution(VGAState *s, int *pwidth, int *pheight)
+static void cirrus_get_resolution(VGACommonState *s, int *pwidth, int *pheight)
{
int width, height;
@@ -2234,7 +2234,7 @@ static inline void cirrus_cursor_compute_yrange(CirrusVGAState *s)
/* NOTE: we do not currently handle the cursor bitmap change, so we
update the cursor only if it moves. */
-static void cirrus_cursor_invalidate(VGAState *s1)
+static void cirrus_cursor_invalidate(VGACommonState *s1)
{
CirrusVGAState *s = container_of(s1, CirrusVGAState, vga);
int size;
@@ -2263,7 +2263,7 @@ static void cirrus_cursor_invalidate(VGAState *s1)
}
}
-static void cirrus_cursor_draw_line(VGAState *s1, uint8_t *d1, int scr_y)
+static void cirrus_cursor_draw_line(VGACommonState *s1, uint8_t *d1, int scr_y)
{
CirrusVGAState *s = container_of(s1, CirrusVGAState, vga);
int w, h, bpp, x1, x2, poffset;