Changeset 4682 in vbox for trunk/src/VBox/Devices/Graphics

Timestamp:

Sep 10, 2007 5:29:10 PM (17 years ago)

Author:

vboxsync

Message:

Fixed video modes 4 and 5. Address calculations weren't taking word mode into account,
every other address needs to be skipped (same as text modes).

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA.cpp (modified) (3 diffs)
• DevVGATmpl.h (modified) (4 diffs)

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

@@ -1043 +1043 @@
             addr = ((addr & ~1) << 1) | plane;
 #else
-            /* 'addr' is offset in a plane, bit 0 select the plane. 
+            /* 'addr' is offset in a plane, bit 0 selects the plane.
              * Mask the bit 0, convert plane index to vram offset,
              * that is multiply by the number of planes,
@@ -1344 +1344 @@
         line_offset <<= 3;
 #ifdef VBOX
-        if ((s->gr[0x06] & 1) == 0)
+        if (!(s->cr[0x14] & 0x40) && !(s->cr[0x17] & 0x40))
         {
-            /* Text mode. Every second byte of a plane is used. */
+            /* Word mode. Used for odd/even modes. */
             line_offset *= 2;
         }
@@ -1979 +1979 @@
     for(y = 0; y < height; y++) {
         addr = addr1;
+        /* CGA/MDA compatibility. Note that these addresses are all 
+         * shifted left by two compared to VGA specs.
+         */
         if (!(s->cr[0x17] & 1)) {
-            int shift;
-            /* CGA compatibility handling */
-            shift = 14 + ((s->cr[0x17] >> 6) & 1);
-            addr = (addr & ~(1 << shift)) | ((y1 & 1) << shift);
+            addr = (addr & ~(1 << 15)) | ((y1 & 1) << 15);
         }
         if (!(s->cr[0x17] & 2)) {
-            addr = (addr & ~0x8000) | ((y1 & 2) << 14);
+            addr = (addr & ~(1 << 16)) | ((y1 & 2) << 15);
         }
 #ifndef VBOX

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

@@ -170 +170 @@
                                          const uint8_t *s, int width)
 {
-    uint32_t plane_mask, *palette, data, v;
+    uint32_t plane_mask, *palette, data, v, src_inc, dwb_mode;
     int x;
 
     palette = s1->last_palette;
     plane_mask = mask16[s1->ar[0x12] & 0xf];
+    dwb_mode = (s1->cr[0x14] & 0x40) ? 2 : (s1->cr[0x17] & 0x40) ? 0 : 1;
+    src_inc = 4 << dwb_mode;
     width >>= 3;
     for(x = 0; x < width; x++) {
@@ -193 +195 @@
         ((PIXEL_TYPE *)d)[7] = palette[(v >> 0) & 0xf];
         d += BPP * 8;
-        s += 4;
+        s += src_inc;
     }
 }
@@ -212 +214 @@
                                            const uint8_t *s, int width)
 {
-    uint32_t plane_mask, *palette, data, v;
+    uint32_t plane_mask, *palette, data, v, src_inc, dwb_mode;
     int x;
 
     palette = s1->last_palette;
     plane_mask = mask16[s1->ar[0x12] & 0xf];
+    dwb_mode = (s1->cr[0x14] & 0x40) ? 2 : (s1->cr[0x17] & 0x40) ? 0 : 1;
+    src_inc = 4 << dwb_mode;
     width >>= 3;
     for(x = 0; x < width; x++) {
@@ -235 +239 @@
         PUT_PIXEL2(d, 7, palette[(v >> 0) & 0xf]);
         d += BPP * 16;
-        s += 4;
+        s += src_inc;
     }
 }