vbox的更動 4539 路徑 trunk/src/VBox/Devices/Graphics

時間撮記:

2007-9-5 下午04:53:45 (17 年 以前)

作者:

vboxsync

訊息:

Modified double-scan and non-zero starting row scan count handling. Fixes mode 6 (CGA),
although modes 4 and 5 remain broken.

檔案:

• trunk/src/VBox/Devices/Graphics/DevVGA.cpp (修改) (4 筆差異)

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

@@ -1853 +1853 @@
 #endif /* !VBOX */
 {
-    int y1, y, update, page_min, page_max, linesize, y_start, double_scan, mask;
+    int y1, y2, y, update, page_min, page_max, linesize, y_start, double_scan, mask;
     int width, height, shift_control, line_offset, page0, page1, bwidth;
-    int disp_width, multi_scan, multi_run;
+    int disp_width, multi_run;
     uint8_t *d;
     uint32_t v, addr1, addr;
@@ -1870 +1870 @@
     shift_control = (s->gr[0x05] >> 5) & 3;
     double_scan = (s->cr[0x09] >> 7);
-    if (shift_control != 1) {
-        multi_scan = (((s->cr[0x09] & 0x1f) + 1) << double_scan) - 1;
-    } else {
-        /* in CGA modes, multi_scan is ignored */
-        /* XXX: is it correct ? */
-        multi_scan = double_scan;
-    }
-    multi_run = multi_scan;
+    multi_run = double_scan;
     if (shift_control != s->shift_control ||
         double_scan != s->double_scan) {
@@ -1983 +1976 @@
 
     y1 = 0;
+    y2 = s->cr[0x09] & 0x1F;    /* starting row scan count */
     for(y = 0; y < height; y++) {
         addr = addr1;
@@ -2044 +2038 @@
         }
         if (!multi_run) {
-            mask = (s->cr[0x17] & 3) ^ 3;
-            if ((y1 & mask) == mask)
+//            mask = (s->cr[0x17] & 3) ^ 3;
+//            if ((y & mask) == mask)
+//                addr1 += line_offset;
+            y1++;
+            multi_run = double_scan;
+
+            if (y2 == 0) {
+                y2 = s->cr[0x09] & 0x1F;
                 addr1 += line_offset;
-            y1++;
-            multi_run = multi_scan;
+            } else {
+                --y2;
+            }
         } else {
             multi_run--;