Changeset 34024 in vbox for trunk/src/VBox/Devices

Timestamp:

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

Author:

vboxsync

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

67690

Message:

VGA: Added support for double scanned text modes.

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA.cpp (modified) (13 diffs)
• DevVGATmpl.h (modified) (7 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA.cpp

@@ -1479 +1479 @@
 typedef void vga_draw_glyph8_func(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);
 typedef void vga_draw_glyph9_func(uint8_t *d, int linesize,
                                   const uint8_t *font_ptr, int h,
@@ -1721 +1722 @@
  * Text mode update
  * Missing:
- * - double scan
- * - double width
  * - underline
  * - flashing
@@ -1734 +1733 @@
     uint8_t *d1, *d, *src, *s1, *dest, *cursor_ptr;
     const uint8_t *font_ptr, *font_base[2];
-    int dup9, line_offset, depth_index;
+    int dup9, line_offset, depth_index, dscan;
     uint32_t *palette;
     uint32_t *ch_attr_ptr;
@@ -1768 +1767 @@
     line_offset = s->line_offset;
     s1 = s->CTX_SUFF(vram_ptr) + (s->start_addr * 8); /** @todo r=bird: Add comment why we do *8 instead of *4, it's not so obvious... */
+
+    /* double scanning - not for 9-wide modes */
+    dscan = (s->cr[9] >> 7) & 1;
 
     /* total width & height */
@@ -1841 +1843 @@
     cx_min_upd = width;
 
-    for(cy = 0; cy < height; cy++) {
+    for(cy = 0; cy < height; cy = cy + (1 << dscan)) {
         d1 = dest;
         src = s1;
@@ -1868 +1870 @@
                 if (cw != 9) {
                     vga_draw_glyph8(d1, linesize,
-                                    font_ptr, cheight, fgcol, bgcol);
+                                    font_ptr, cheight, fgcol, bgcol, dscan);
                 } else {
                     dup9 = 0;
@@ -1887 +1889 @@
                     if (line_last >= line_start && line_start < cheight) {
                         h = line_last - line_start + 1;
-                        d = d1 + linesize * line_start;
+                        d = d1 + (linesize * line_start << dscan);
                         if (cw != 9) {
                             vga_draw_glyph8(d, linesize,
-                                            cursor_glyph, h, fgcol, bgcol);
+                                            cursor_glyph, h, fgcol, bgcol, dscan);
                         } else {
                             vga_draw_glyph9(d, linesize,
@@ -1918 +1920 @@
             cx_min_upd = width;
         }
-        dest += linesize * cheight;
+        dest += linesize * cheight << dscan;
         s1 += line_offset;
     }
@@ -4099 +4101 @@
 {
     PVGASTATE       s = PDMINS_2_DATA(pDevIns, PVGASTATE);
-    int             is_graph;
+    int             is_graph, double_scan;
     int             w, h, char_height, char_dots;
     int             val, vfreq_hz, hfreq_hz;
@@ -4107 +4109 @@
     is_graph  = s->gr[6] & 1;
     char_dots = (s->sr[0x01] & 1) ? 8 : 9;
+    double_scan = s->cr[9] >> 7;
     pHlp->pfnPrintf(pHlp, "pixel clock: %s\n", clocks[(s->msr >> 2) & 3]);
-    pHlp->pfnPrintf(pHlp, "double scanning %s\n", s->cr[9] & 0x80 ? "on" : "off");
+    pHlp->pfnPrintf(pHlp, "double scanning %s\n", double_scan ? "on" : "off");
     pHlp->pfnPrintf(pHlp, "double clocking %s\n", s->sr[1] & 0x08 ? "on" : "off");
     val = s->cr[0] + 5;
@@ -4127 +4130 @@
         char_height = val;
         pHlp->pfnPrintf(pHlp, "char height %d\n", val);
-        pHlp->pfnPrintf(pHlp, "text mode %dx%d\n", w / char_dots, h / char_height);
+        pHlp->pfnPrintf(pHlp, "text mode %dx%d\n", w / char_dots, h / (char_height << double_scan));
     }
     if (s->fRealRetrace)
@@ -4176 +4179 @@
             uint32_t uCharHeight;
             uint32_t uLines;
+            uint32_t uDblScan;
 
             vga_get_offsets(pThis, &cbLine, &offStart, &uLineCompareIgn);
@@ -4183 +4187 @@
             uVDisp = pThis->cr[0x12] + ((pThis->cr[7] & 2) << 7) + ((pThis->cr[7] & 0x40) << 4) + 1;
             uCharHeight = (pThis->cr[9] & 0x1f) + 1;
-            uLines = uVDisp / uCharHeight;
+            uDblScan = pThis->cr[9] >> 7;
+            uLines = uVDisp / (uCharHeight << uDblScan);
             if (uLines < 25)
                 uLines = 25;

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);
 }