qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [5338] Fix dots per clock value, cleanup and "optimize"


From: malc
Subject: [Qemu-devel] [5338] Fix dots per clock value, cleanup and "optimize"
Date: Sun, 28 Sep 2008 02:43:19 +0000

Revision: 5338
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5338
Author:   malc
Date:     2008-09-28 02:43:18 +0000 (Sun, 28 Sep 2008)

Log Message:
-----------
Fix dots per clock value, cleanup and "optimize"

Modified Paths:
--------------
    trunk/hw/vga.c

Modified: trunk/hw/vga.c
===================================================================
--- trunk/hw/vga.c      2008-09-28 00:42:15 UTC (rev 5337)
+++ trunk/hw/vga.c      2008-09-28 02:43:18 UTC (rev 5338)
@@ -192,7 +192,7 @@
 
     clocking_mode = (s->sr[0x01] >> 3) & 1;
     clock_sel = (s->msr >> 2) & 3;
-    dots = (s->msr & 1) ? 9 : 8;
+    dots = (s->msr & 1) ? 8 : 9;
 
     chars_per_sec = hz[clock_sel] / dots;
 
@@ -213,12 +213,10 @@
     r->hend = r->hstart + hretr_end_char + 1;
     r->htotal = htotal_chars;
 
+#if 0
     printf("hz=%f\n",
-           (double) ticks_per_sec / (r->ticks_per_char * r->total_chars));
-#if 0 /* def DEBUG_RETRACE */
-    printf("hz=%f\n",
-           (double) ticks_per_sec / (r->ticks_per_char * r->total_chars));
     printf (
+        "hz=%f\n"
         "htotal = %d\n"
         "hretr_start = %d\n"
         "hretr_skew = %d\n"
@@ -232,6 +230,7 @@
         "dots = %d\n"
         "ticks/char = %lld\n"
         "\n",
+        (double) ticks_per_sec / (r->ticks_per_char * r->total_chars),
         htotal_chars,
         hretr_start_char,
         hretr_skew_chars,
@@ -265,13 +264,13 @@
 
         if (cur_line >= r->vstart && cur_line <= r->vend) {
             val |= ST01_V_RETRACE | ST01_DISP_ENABLE;
+        } else {
+            cur_line_char = cur_char % r->htotal;
+            if (cur_line_char >= r->hstart && cur_line_char <= r->hend) {
+                val |= ST01_DISP_ENABLE;
+            }
         }
 
-        cur_line_char = cur_char % r->htotal;
-        if (cur_line_char >= r->hstart && cur_line_char <= r->hend) {
-            val |= ST01_DISP_ENABLE;
-        }
-
         return val;
     } else {
         return s->st01 ^ (ST01_V_RETRACE | ST01_DISP_ENABLE);






reply via email to

[Prev in Thread] Current Thread [Next in Thread]