Changeset 34024 in vbox for trunk/src/VBox/Devices/Graphics/DevVGATmpl.h

Timestamp:

Nov 12, 2010 9:47:37 AM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

67690

Message:

VGA: Added support for double scanned text modes.

File:

• trunk/src/VBox/Devices/Graphics/DevVGATmpl.h (modified) (7 diffs)

trunk/src/VBox/Devices/Graphics/DevVGATmpl.h

@@ -59 +59 @@
                                                      int font_data,
                                                      uint32_t xorcol,
-                                                     uint32_t bgcol)
+                                                     uint32_t bgcol,
+                                                     int dscan,
+                                                     int linesize)
 {
 #if BPP == 1
         ((uint32_t *)d)[0] = (dmask16[(font_data >> 4)] & xorcol) ^ bgcol;
         ((uint32_t *)d)[1] = (dmask16[(font_data >> 0) & 0xf] & xorcol) ^ bgcol;
+        if (dscan) {
+            uint8_t *c = d + linesize;
+            ((uint32_t *)c)[0] = ((uint32_t *)d)[0];
+            ((uint32_t *)c)[1] = ((uint32_t *)d)[1];
+        }
 #elif BPP == 2
         ((uint32_t *)d)[0] = (dmask4[(font_data >> 6)] & xorcol) ^ bgcol;
@@ -69 +76 @@
         ((uint32_t *)d)[2] = (dmask4[(font_data >> 2) & 3] & xorcol) ^ bgcol;
         ((uint32_t *)d)[3] = (dmask4[(font_data >> 0) & 3] & xorcol) ^ bgcol;
+        if (dscan)
+            memcpy(d + linesize, d, 4 * sizeof(uint32_t));
 #else
         ((uint32_t *)d)[0] = (-((font_data >> 7)) & xorcol) ^ bgcol;
@@ -78 +87 @@
         ((uint32_t *)d)[6] = (-((font_data >> 1) & 1) & xorcol) ^ bgcol;
         ((uint32_t *)d)[7] = (-((font_data >> 0) & 1) & xorcol) ^ bgcol;
+        if (dscan)
+            memcpy(d + linesize, d, 8 * sizeof(uint32_t));
 #endif
 }
@@ -83 +94 @@
 static void glue(vga_draw_glyph8_, DEPTH)(uint8_t *d, int linesize,
                                           const uint8_t *font_ptr, int h,
-                                          uint32_t fgcol, uint32_t bgcol)
+                                          uint32_t fgcol, uint32_t bgcol, int dscan)
 {
     uint32_t xorcol;
@@ -91 +102 @@
     do {
         font_data = font_ptr[0];
-        glue(vga_draw_glyph_line_, DEPTH)(d, font_data, xorcol, bgcol);
+        glue(vga_draw_glyph_line_, DEPTH)(d, font_data, xorcol, bgcol, dscan, linesize);
         font_ptr += 4;
-        d += linesize;
+        d += linesize << dscan;
     } while (--h);
 }
@@ -99 +110 @@
 static void glue(vga_draw_glyph16_, DEPTH)(uint8_t *d, int linesize,
                                           const uint8_t *font_ptr, int h,
-                                          uint32_t fgcol, uint32_t bgcol)
+                                          uint32_t fgcol, uint32_t bgcol, int dscan)
 {
     uint32_t xorcol;
@@ -109 +120 @@
         glue(vga_draw_glyph_line_, DEPTH)(d,
                                           expand4to8[font_data >> 4],
-                                          xorcol, bgcol);
+                                          xorcol, bgcol, dscan, linesize);
         glue(vga_draw_glyph_line_, DEPTH)(d + 8 * BPP,
                                           expand4to8[font_data & 0x0f],
-                                          xorcol, bgcol);
+                                          xorcol, bgcol, dscan, linesize);
         font_ptr += 4;
-        d += linesize;
+        d += linesize << dscan;
     } while (--h);
 }