Changeset 34686 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Dec 3, 2010 11:06:34 AM (14 years ago)

Author:

vboxsync

Message:

Additions/common/VBoxVideo and Additions/WINNT/Graphics: modesetting clean-up

Location:

trunk/src/VBox/Additions/WINNT/Graphics

Files:

• Display/Makefile.kmk (modified) (1 diff)
• Miniport/Makefile.kmk (modified) (2 diffs)
• Miniport/VBoxVideo.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Display/Makefile.kmk

@@ -49 +49 @@
         $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp \
         $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp \
+        $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp \
         VBoxDisp.def \
         VBoxDisp.rc

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/Makefile.kmk

@@ -46 +46 @@
         VBoxVideo.rc \
         VBoxVideoHGSMI.cpp \
-        $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp
+        $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp \
+        $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp
 VBoxVideo_LIBS.x86    = \
         $(PATH_SDK_W2K3DDK_LIB)/exsup.lib
@@ -101 +102 @@
         VBoxVideoHGSMI.cpp \
         $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp \
+        $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp \
         VBoxVideo.cpp \
     Helper.cpp \

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideo.cpp

@@ -4159 +4159 @@
         )
 {
-    /* set the mode characteristics */
-    VBoxVideoCmnPortWriteUshort(VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_XRES);
-    VBoxVideoCmnPortWriteUshort(VBE_DISPI_IOPORT_DATA, width);
-    VBoxVideoCmnPortWriteUshort(VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_YRES);
-    VBoxVideoCmnPortWriteUshort(VBE_DISPI_IOPORT_DATA, height);
-    VBoxVideoCmnPortWriteUshort(VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_BPP);
-    VBoxVideoCmnPortWriteUshort(VBE_DISPI_IOPORT_DATA, bpp);
-    /* enable the mode */
-    VBoxVideoCmnPortWriteUshort(VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_ENABLE);
-    VBoxVideoCmnPortWriteUshort(VBE_DISPI_IOPORT_DATA, VBE_DISPI_ENABLED | VBE_DISPI_LFB_ENABLED);
 #ifdef VBOX_WITH_WDDM
     /* encode linear offDisplay to xOffset & yOffset to ensure offset fits USHORT */
@@ -4185 +4175 @@
     Assert(xOffset <= 0xffff);
     Assert(yOffset <= 0xffff);
-    VBoxVideoCmnPortWriteUshort(VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_X_OFFSET);
-    VBoxVideoCmnPortWriteUshort(VBE_DISPI_IOPORT_DATA, (USHORT)xOffset);
-    VBoxVideoCmnPortWriteUshort(VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_Y_OFFSET);
-    VBoxVideoCmnPortWriteUshort(VBE_DISPI_IOPORT_DATA, (USHORT)yOffset);
-#endif
+#else
+    ULONG xOffset = 0, yOffset = 0;
+#endif
+    VBoxVideoSetModeRegisters(width, height, width, bpp, (uint16_t)xOffset,
+                              (uint16_t)yOffset);
     /** @todo read from the port to see if the mode switch was successful */
-
-    /* Tell the host that we now support graphics in the additions.
-     * @todo: Keep old behaviour, because VBoxVideoResetDevice is called on every graphics
-     *        mode switch and causes an OFF/ON sequence which is not handled by frontends
-     *        (for example Qt GUI debug build asserts when seamless is being enabled).
-     */
-    // VBoxVideoSetGraphicsCap(TRUE);
 
     return TRUE;