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

Timestamp:

Apr 13, 2007 2:39:03 PM (18 years ago)

Author:

vboxsync

Message:

Added VBE_DISPI_INDEX_CMONITOR indexed register to pass the MonitorCount VM setting
to the guest where the guest driver can read it.

Location:

trunk/src/VBox/Devices/Graphics

Files:

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

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

@@ -56 +56 @@
 /** The minimum amount of VRAM. */
 #define VGA_VRAM_MIN        (_1M)
+/** The maximum number of monitors. */
+#define VGA_MONITORS_MAX    64
 
 /** The size of the VGA GC mapping.
@@ -584 +586 @@
                 break;
           }
+      } else if (s->vbe_index == VBE_DISPI_INDEX_CMONITORS) {
+            val = s->monitor_count;
       } else {
         val = s->vbe_regs[s->vbe_index];
@@ -4286 +4290 @@
 #ifdef CONFIG_BOCHS_VBE
     pData->vbe_regs[VBE_DISPI_INDEX_ID] = VBE_DISPI_ID0;
+    pData->vbe_regs[VBE_DISPI_INDEX_CMONITORS] = pData->monitor_count;
     pData->vbe_bank_mask    = ((pData->vram_size >> 16) - 1);
 #endif /* CONFIG_BOCHS_VBE */
@@ -4513 +4518 @@
     }
     Log(("VGA: VRamSize=%#x\n", pData->vram_size));
+
+    rc = CFGMR3QueryU32(pCfgHandle, "MonitorCount", &pData->monitor_count);
+    if (VBOX_FAILURE(rc) || !pData->monitor_count)
+        pData->monitor_count = 1;
+    else if (pData->monitor_count > VGA_MONITORS_MAX)
+    {
+        AssertMsgFailed(("monitor_count=%d max=%d\n", pData->monitor_count, VGA_MONITORS_MAX));
+        pData->monitor_count = 1;
+    }
+    pData->vbe_regs[VBE_DISPI_INDEX_CMONITORS] = pData->monitor_count;
+    Log(("VGA: MonitorCount=%d\n", pData->monitor_count));
 
     pData->fGCEnabled = true;

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

@@ -74 +74 @@
 #define VBE_DISPI_INDEX_X_OFFSET        0x8
 #define VBE_DISPI_INDEX_Y_OFFSET        0x9
-#define VBE_DISPI_INDEX_NB              0xa
+#define VBE_DISPI_INDEX_CMONITORS       0xa
+#define VBE_DISPI_INDEX_NB              0xb
 
 #define VBE_DISPI_ID0                   0xB0C0
@@ -276 +277 @@
     uint32_t                    cMilliesRefreshInterval;
 
+    /** Number of virtual monitors */
+    uint32_t                    monitor_count;
+    uint32_t                    Padding0;   /* May be removed if more data is added */
+
     /** Size of the buffer*/
     uint32_t                    cbExtVRAM;
@@ -283 +288 @@
     uint32_t                    Alignment0;
 #endif
+
     /** The PCI device. */
     PCIDEVICE                   Dev;