net: reorganize headers

[qemu.git] / hw / cirrus_vga_rop2.h

diff --git a/hw/cirrus_vga_rop2.h b/hw/cirrus_vga_rop2.h
index 91f0db83d80e22c661e518f44099bdd4ea3daa98..d28bcc6f2580513cd2c3d1891fa15393b133bc08 100644 (file)
--- a/hw/cirrus_vga_rop2.h
+++ b/hw/cirrus_vga_rop2.h
@@ -23,18 +23,18 @@
  */
 
 #if DEPTH == 8
-#define PUTPIXEL()    ROP_OP(d[0], col)
+#define PUTPIXEL()    ROP_OP(&d[0], col)
 #elif DEPTH == 16
-#define PUTPIXEL()    ROP_OP(((uint16_t *)d)[0], col);
+#define PUTPIXEL()    ROP_OP_16((uint16_t *)&d[0], col)
 #elif DEPTH == 24
-#define PUTPIXEL()    ROP_OP(d[0], col); \
-                      ROP_OP(d[1], (col >> 8)); \
-                      ROP_OP(d[2], (col >> 16))
+#define PUTPIXEL()    ROP_OP(&d[0], col);        \
+                      ROP_OP(&d[1], (col >> 8)); \
+                      ROP_OP(&d[2], (col >> 16))
 #elif DEPTH == 32
-#define PUTPIXEL()    ROP_OP(((uint32_t *)d)[0], col)
+#define PUTPIXEL()    ROP_OP_32(((uint32_t *)&d[0]), col)
 #else
 #error unsupported DEPTH
-#endif               
+#endif
 
 static void
 glue(glue(glue(cirrus_patternfill_, ROP_NAME), _),DEPTH)
@@ -48,9 +48,9 @@ glue(glue(glue(cirrus_patternfill_, ROP_NAME), _),DEPTH)
     unsigned int col;
     const uint8_t *src1;
 #if DEPTH == 24
-    int skipleft = s->gr[0x2f] & 0x1f;
+    int skipleft = s->vga.gr[0x2f] & 0x1f;
 #else
-    int skipleft = (s->gr[0x2f] & 0x07) * (DEPTH / 8);
+    int skipleft = (s->vga.gr[0x2f] & 0x07) * (DEPTH / 8);
 #endif
 
 #if DEPTH == 8
@@ -105,10 +105,10 @@ glue(glue(glue(cirrus_colorexpand_transp_, ROP_NAME), _),DEPTH)
     unsigned bitmask;
     unsigned index;
 #if DEPTH == 24
-    int dstskipleft = s->gr[0x2f] & 0x1f;
+    int dstskipleft = s->vga.gr[0x2f] & 0x1f;
     int srcskipleft = dstskipleft / 3;
 #else
-    int srcskipleft = s->gr[0x2f] & 0x07;
+    int srcskipleft = s->vga.gr[0x2f] & 0x07;
     int dstskipleft = srcskipleft * (DEPTH / 8);
 #endif
 
@@ -153,7 +153,7 @@ glue(glue(glue(cirrus_colorexpand_, ROP_NAME), _),DEPTH)
     unsigned bits;
     unsigned int col;
     unsigned bitmask;
-    int srcskipleft = s->gr[0x2f] & 0x07;
+    int srcskipleft = s->vga.gr[0x2f] & 0x07;
     int dstskipleft = srcskipleft * (DEPTH / 8);
 
     colors[0] = s->cirrus_blt_bgcol;
@@ -188,10 +188,10 @@ glue(glue(glue(cirrus_colorexpand_pattern_transp_, ROP_NAME), _),DEPTH)
     unsigned int bits, bits_xor;
     unsigned int col;
 #if DEPTH == 24
-    int dstskipleft = s->gr[0x2f] & 0x1f;
+    int dstskipleft = s->vga.gr[0x2f] & 0x1f;
     int srcskipleft = dstskipleft / 3;
 #else
-    int srcskipleft = s->gr[0x2f] & 0x07;
+    int srcskipleft = s->vga.gr[0x2f] & 0x07;
     int dstskipleft = srcskipleft * (DEPTH / 8);
 #endif
 
@@ -232,7 +232,7 @@ glue(glue(glue(cirrus_colorexpand_pattern_, ROP_NAME), _),DEPTH)
     int x, y, bitpos, pattern_y;
     unsigned int bits;
     unsigned int col;
-    int srcskipleft = s->gr[0x2f] & 0x07;
+    int srcskipleft = s->vga.gr[0x2f] & 0x07;
     int dstskipleft = srcskipleft * (DEPTH / 8);
 
     colors[0] = s->cirrus_blt_bgcol;