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

Timestamp:

Oct 13, 2010 8:25:53 AM (14 years ago)

Author:

vboxsync

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

66618

Message:

VGA: Cleaned up saved state and VBE registers management a bit.

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA.cpp (modified) (6 diffs)
• DevVGA.h (modified) (2 diffs)
• DevVGASavedState.h (modified) (1 diff)

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

@@ -810 +810 @@
                 break;
             default:
+                Assert(s->vbe_index < VBE_DISPI_INDEX_NB_SAVED);
                 val = s->vbe_regs[s->vbe_index];
                 break;
           }
-      } else if (s->vbe_index == VBE_DISPI_INDEX_VBOX_VIDEO) {
-        /* Reading from the port means that the old additions are requesting the number of monitors. */
-        val = 1;
       } else {
-        val = s->vbe_regs[s->vbe_index];
+          switch(s->vbe_index) {
+          case VBE_DISPI_INDEX_VBOX_VIDEO:
+              /* Reading from the port means that the old additions are requesting the number of monitors. */
+              val = 1;
+              break;
+          default:
+              Assert(s->vbe_index < VBE_DISPI_INDEX_NB_SAVED);
+              val = s->vbe_regs[s->vbe_index];
+              break;
+          }
       }
     } else {
@@ -828 +835 @@
 }
 
-#define VBE_PITCH_ALIGN     8       /* Align pitch to 64 bits. */
+#define VBE_PITCH_ALIGN     4       /* Align pitch to 32 bits - Qt requires that. */
 
 /* Calculate scanline pitch based on bit depth and width in pixels. */
@@ -2711 +2718 @@
     qemu_put_byte(f, 1);
     qemu_put_be16s(f, &s->vbe_index);
-    for(i = 0; i < VBE_DISPI_INDEX_NB; i++)
+    for(i = 0; i < VBE_DISPI_INDEX_NB_SAVED; i++)
         qemu_put_be16s(f, &s->vbe_regs[i]);
     qemu_put_be32s(f, &s->vbe_start_addr);
@@ -2766 +2773 @@
 # endif /* VBOX */
     qemu_get_be16s(f, &s->vbe_index);
-    for(i = 0; i < VBE_DISPI_INDEX_NB; i++)
+    for(i = 0; i < VBE_DISPI_INDEX_NB_SAVED; i++)
         qemu_get_be16s(f, &s->vbe_regs[i]);
     qemu_get_be32s(f, &s->vbe_start_addr);
@@ -4868 +4875 @@
     pHlp->pfnPrintf(pHlp, " Display start addr: %d, %d\n",
                     s->vbe_regs[VBE_DISPI_INDEX_X_OFFSET], s->vbe_regs[VBE_DISPI_INDEX_Y_OFFSET]);
+    pHlp->pfnPrintf(pHlp, " Linear scanline pitch: 0x%04x\n", s->vbe_line_offset);
+    pHlp->pfnPrintf(pHlp, " Linear display start : 0x%04x\n", s->vbe_start_addr);
     pHlp->pfnPrintf(pHlp, " Selected bank: 0x%04x\n", s->vbe_regs[VBE_DISPI_INDEX_BANK]);
 }
@@ -5742 +5751 @@
     int         rc;
 
-    if (    uVersion != VGA_SAVEDSTATE_VERSION
-#ifdef VBOX_WITH_WDDM
-        &&  uVersion != VGA_SAVEDSTATE_VERSION_PRE_WDDM
-#endif
-        &&  uVersion != VGA_SAVEDSTATE_VERSION_HOST_HEAP
-        &&  uVersion != VGA_SAVEDSTATE_VERSION_WITH_CONFIG
-        &&  uVersion != VGA_SAVEDSTATE_VERSION_HGSMI
-        &&  uVersion != VGA_SAVEDSTATE_VERSION_PRE_HGSMI
-        &&  uVersion != VGA_SAVEDSTATE_VERSION_ANCIENT)
+    if (uVersion < VGA_SAVEDSTATE_VERSION_ANCIENT || uVersion > VGA_SAVEDSTATE_VERSION)
         return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
 

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

@@ -83 +83 @@
 #define VBE_DISPI_INDEX_Y_OFFSET        0x9
 #define VBE_DISPI_INDEX_VBOX_VIDEO      0xa
-#define VBE_DISPI_INDEX_NB              0xb
+#define VBE_DISPI_INDEX_NB_SAVED        0xb /* Number of saved registers (vbe_regs array) */
+#define VBE_DISPI_INDEX_NB              0xb /* Total number of VBE registers */
 
 #define VBE_DISPI_ID0                   0xB0C0
@@ -113 +114 @@
 #define VGA_STATE_COMMON_BOCHS_VBE              \
     uint16_t vbe_index;                         \
-    uint16_t vbe_regs[VBE_DISPI_INDEX_NB];      \
+    uint16_t vbe_regs[VBE_DISPI_INDEX_NB_SAVED];\
     uint32_t vbe_start_addr;                    \
     uint32_t vbe_line_offset;                   \

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

@@ -20 +20 @@
 
 
-#ifndef ___Graphics_DevVGASavedState_h
-#define ___Graphics_DevVGASavedState_h
+#ifndef Graphics_DevVGASavedState_h
+#define Graphics_DevVGASavedState_h
 
-#ifdef VBOX_WITH_WDDM
 #define VGA_SAVEDSTATE_VERSION              7
+#define VGA_SAVEDSTATE_VERSION_WDDM         7
 #define VGA_SAVEDSTATE_VERSION_PRE_WDDM     6
-#else
-#define VGA_SAVEDSTATE_VERSION              6
-#endif
 #define VGA_SAVEDSTATE_VERSION_HOST_HEAP    5
 #define VGA_SAVEDSTATE_VERSION_WITH_CONFIG  4