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

Timestamp:

Feb 16, 2012 1:33:48 PM (13 years ago)

Author:

vboxsync

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

76299

Message:

Let VGA BIOS get out of VBE mode only through VGA registers.

Location:

trunk/src/VBox/Devices/Graphics

Files:

• BIOS/vgabios.c (modified) (1 diff)
• DevVGA.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/Graphics/BIOS/vgabios.c

@@ -844 +844 @@
 #ifdef VBE
  if (vbe_has_vbe_display()) {
-   dispi_set_enable(VBE_DISPI_DISABLED);
+   // Force controller into VGA mode
+   outb(VGAREG_SEQU_ADDRESS,7);
+   outb(VGAREG_SEQU_DATA,0x00);
   }
 #endif // def VBE

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

@@ -350 +350 @@
     (uint8_t)~0xff,
     (uint8_t)~0xff,
-    (uint8_t)~0x00,
+    (uint8_t)~0x01,
 };
 
@@ -725 +725 @@
         Log2(("vga: write SR%x = 0x%02x\n", s->sr_index, val));
         s->sr[s->sr_index] = val & sr_mask[s->sr_index];
+        /* Allow SR07 to disable VBE. */
+        if (s->sr_index == 0x07 && !(val & 1))
+        {
+            s->vbe_regs[VBE_DISPI_INDEX_ENABLE] = VBE_DISPI_DISABLED;
+            s->bank_offset = 0;
+        }
         if (s->fRealRetrace && s->sr_index == 0x01)
             vga_update_retrace_state(s);
@@ -1091 +1097 @@
                     s->sr[4] |= 0x08; /* set chain 4 mode */
                     s->sr[2] |= 0x0f; /* activate all planes */
+                    /* Indicate non-VGA mode in SR07. */
+                    s->sr[7] |= 1;
                 }
                 s->gr[0x05] = (s->gr[0x05] & ~0x60) | (shift_control << 5);
@@ -4142 +4150 @@
  * @param   pszTitle            The title text, NULL if none.
  */
-static void vgaInfoTextPrintSeparatorLine(PCDBGFINFOHLP pHlp, uint32_t cCols, const char *pszTitle)
+static void vgaInfoTextPrintSeparatorLine(PCDBGFINFOHLP pHlp, size_t cCols, const char *pszTitle)
 {
     if (pszTitle)
@@ -4154 +4162 @@
         else
         {
-            uint32_t cchLeft = (cCols - cchTitle - 2) / 2;
+            size_t cchLeft = (cCols - cchTitle - 2) / 2;
             cCols -= cchLeft + cchTitle + 2;
             while (cchLeft-- > 0)