Changeset 17623 in vbox

Timestamp:

Mar 10, 2009 12:41:29 PM (16 years ago)

Author:

vboxsync

Message:

HGSMI: the windows guest display drivers.

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Display

Files:

• driver.h (modified) (1 diff)
• enable.c (modified) (1 diff)
• screen.c (modified) (3 diffs)
• vbox.c (modified) (6 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Display/driver.h

@@ -180 +180 @@
 extern HSEMAPHORE ghsemHwBuffer;
 #endif /* !VBOX_WITH_HGSMI */
+
+
+#ifdef VBOX_WITH_HGSMI
+#define VBE_DISPI_IOPORT_INDEX          0x01CE
+#define VBE_DISPI_IOPORT_DATA           0x01CF
+#define VBE_DISPI_INDEX_VBVA_GUEST      0xc
+#endif /* VBOX_WITH_HGSMI */
 
 extern BOOL  g_bOnNT40;

trunk/src/VBox/Additions/WINNT/Graphics/Display/enable.c

@@ -1160 +1160 @@
             DISPDBG((3, "DN_DEVICE_ORIGIN: %d, %d (PSO = %p)\n", ppdev->ptlDevOrg.x, 
                      ppdev->ptlDevOrg.y, pso));
-            if (ppdev->bHGSMISupported)
-            {
-                VBoxProcessDisplayInfo(ppdev);
-            }
+            VBoxProcessDisplayInfo(ppdev);
 #endif /* VBOX_WITH_HGSMI */
             break;

trunk/src/VBox/Additions/WINNT/Graphics/Display/screen.c

@@ -35 +35 @@
 #include <VBox/HGSMI/HGSMI.h>
 #include <VBox/HGSMI/HGSMIChSetup.h>
-
-#define VBE_DISPI_IOPORT_INDEX          0x01CE
-#define VBE_DISPI_IOPORT_DATA           0x01CF
-#define VBE_DISPI_INDEX_VBVA_GUEST      0xc
 #endif
 
@@ -322 +318 @@
     }
 }
-#else
-static void vboxUpdateDisplayInfo (PPDEV ppdev)
-{
-    if (ppdev->bHGSMISupported)
-    {
-        /* Inform the host about this display layout. */
-        DISPDBG((1, "Update: %d,%d\n", ppdev->ptlDevOrg.x, ppdev->ptlDevOrg.y));
-        VBoxProcessDisplayInfo(ppdev);
-    }
-}
-#endif /* VBOX_WITH_HGSMI */
+#endif /* !VBOX_WITH_HGSMI */
 
 
@@ -493 +479 @@
     DISPDBG((1, "DISP bInitSURF success\n"));
 
+#ifndef VBOX_WITH_HGSMI
     /* Update the display information. */
     vboxUpdateDisplayInfo (ppdev);
+#else
+    /* Inform the host about this screen layout. */
+    DISPDBG((1, "bInitSURF: %d,%d\n", ppdev->ptlDevOrg.x, ppdev->ptlDevOrg.y));
+    VBoxProcessDisplayInfo (ppdev);
+#endif /* VBOX_WITH_HGSMI */
     
     return(TRUE);

trunk/src/VBox/Additions/WINNT/Graphics/Display/vbox.c

@@ -340 +340 @@
 #else /* VBOX_WITH_HGSMI */
 
+static void vboxHGSMIBufferSubmit (PPDEV ppdev, void *p)
+{
+    HGSMIOFFSET offBuffer = HGSMIHeapBufferOffset (&ppdev->hgsmiDisplayHeap, p);
+
+    ASMOutU16 (VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_VBVA_GUEST);
+    ASMOutU32 (VBE_DISPI_IOPORT_DATA, offBuffer);
+}
+
+static BOOL vboxVBVAInformHost (PPDEV ppdev, BOOL bEnable)
+{
+    BOOL bRc = FALSE;
+
+    if (ppdev->bHGSMISupported)
+    {
+        void *p = HGSMIHeapAlloc (&ppdev->hgsmiDisplayHeap,
+                                  sizeof (VBVAENABLE),
+                                  HGSMI_CH_VBVA,
+                                  VBVA_ENABLE);
+        if (!p)
+        {
+            DISPDBG((0, "VBoxDISP::vboxVBVAInformHost: HGSMIHeapAlloc failed\n"));
+        }
+        else
+        {
+            VBVAENABLE *pEnable = (VBVAENABLE *)p;
+
+            pEnable->u32Flags    = bEnable? VBVA_F_ENABLE: VBVA_F_DISABLE;
+            pEnable->u32Reserved = 0;
+
+            vboxHGSMIBufferSubmit (ppdev, p);
+
+            HGSMIHeapFree (&ppdev->hgsmiDisplayHeap, p);
+
+            bRc = TRUE;
+        }
+    }
+
+    return bRc;
+}
+
 /*
  * Public hardware buffer methods.
@@ -353 +393 @@
         VBVABUFFER *pVBVA = (VBVABUFFER *)((uint8_t *)ppdev->pjScreen + ppdev->layout.offVBVABuffer);
         
-        pVBVA->u32HostEvents = 0;
+        pVBVA->u32HostEvents      = 0;
         pVBVA->u32SupportedOrders = 0;
-        pVBVA->off32Data;
-        pVBVA->off32Free;
+        pVBVA->off32Data          = 0;
+        pVBVA->off32Free          = 0;
         RtlZeroMemory (pVBVA->aRecords, sizeof (pVBVA->aRecords));
-        pVBVA->indexRecordFirst;
-        pVBVA->indexRecordFree;
-        pVBVA->cbPartialWriteThreshold;
-        pVBVA->cbData      = ppdev->layout.cbVBVABuffer - sizeof (VBVABUFFER) + sizeof (pVBVA->au8Data);
+        pVBVA->indexRecordFirst   = 0;
+        pVBVA->indexRecordFree    = 0;
+        pVBVA->cbPartialWriteThreshold = 256;
+        pVBVA->cbData             = ppdev->layout.cbVBVABuffer - sizeof (VBVABUFFER) + sizeof (pVBVA->au8Data);
 
         ppdev->fHwBufferOverflow = FALSE;
@@ -367 +407 @@
         ppdev->pVBVA             = pVBVA;
         
-#if 0
-        /* @todo inform host that VBVA mode has been entered. */
-        bRC = vboxVBVAInformHost (ppdev);
-#else
-        /* All have been initialized. */
-        bRc = TRUE;
-#endif
+        bRc = vboxVBVAInformHost (ppdev, TRUE);
     }
 
@@ -392 +426 @@
     ppdev->pVBVA             = NULL;
 
+    vboxVBVAInformHost (ppdev, FALSE);
+
     return;
 }
@@ -477 +513 @@
 static void vboxHwBufferFlush (PPDEV ppdev)
 {
-    VBVA_ASSERT (ppdev->pVBVA);
-
-#if 0
-    /* @todo issue the flush command */
+    /* Issue the flush command. */
     void *p = HGSMIHeapAlloc (&ppdev->hgsmiDisplayHeap,
                               sizeof (VBVA_FLUSH),
                               HGSMI_CH_VBVA,
-                              HGSMI_CC_VBVA_FLUSH);
-........
+                              VBVA_FLUSH);
     if (!p)
     {
-        DISPDBG((0, "VBoxDISP::vboxInitVBoxVideo: HGSMIHeapAlloc failed\n"));
-        rc = VERR_NO_MEMORY;
+        DISPDBG((0, "VBoxDISP::vboxHwBufferFlush: HGSMIHeapAlloc failed\n"));
     }
     else
     {
-        HGSMIOFFSET offBuffer = HGSMIHeapBufferOffset (&ppdev->hgsmiDisplayHeap,
-                                                       p);
-
-        ((HGSMI_BUFFER_LOCATION *)p)->offLocation = ppdev->layout.offDisplayInformation;
-        ((HGSMI_BUFFER_LOCATION *)p)->cbLocation = sizeof (HGSMIHOSTFLAGS);
-
-        /* Submit the buffer to the host. */
-        ASMOutU16 (VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_VBVA_GUEST);
-        ASMOutU32 (VBE_DISPI_IOPORT_DATA, offBuffer);
+        VBVAFLUSH *pFlush = (VBVAFLUSH *)p;
+
+        pFlush->u32Reserved = 0;
+
+        vboxHGSMIBufferSubmit (ppdev, p);
 
         HGSMIHeapFree (&ppdev->hgsmiDisplayHeap, p);
     }
-#endif
 
     return;
@@ -629 +655 @@
 }
 
-void VBoxProcessDisplayInfo(PPDEV ppdev)
-{
-#if 0
-    DWORD returnedDataLength;
-
-    DISPDBG((1, "Process: %d,%d\n", ppdev->ptlDevOrg.x, ppdev->ptlDevOrg.y));
-
-    EngDeviceIoControl(ppdev->hDriver,
-                       IOCTL_VIDEO_INTERPRET_DISPLAY_MEMORY,
-                       NULL,
-                       0,
-                       NULL,
-                       0,
-                       &returnedDataLength);
-#endif
+void VBoxProcessDisplayInfo (PPDEV ppdev)
+{
+    if (ppdev->bHGSMISupported)
+    {
+        /* Issue the screen info command. */
+        void *p = HGSMIHeapAlloc (&ppdev->hgsmiDisplayHeap,
+                                  sizeof (VBVAINFOSCREEN),
+                                  HGSMI_CH_VBVA,
+                                  VBVA_INFO_SCREEN);
+        if (!p)
+        {
+            DISPDBG((0, "VBoxDISP::vboxHwBufferFlush: HGSMIHeapAlloc failed\n"));
+        }
+        else
+        {
+            VBVAINFOSCREEN *pScreen = (VBVAINFOSCREEN *)p;
+
+            pScreen->i32OriginX      = ppdev->ptlDevOrg.x;
+            pScreen->i32OriginY      = ppdev->ptlDevOrg.y;
+            pScreen->u32LineSize     = ppdev->lDeltaScreen > 0?ppdev->lDeltaScreen: -ppdev->lDeltaScreen;
+            pScreen->u32Width        = ppdev->cxScreen;
+            pScreen->u32Height       = ppdev->cyScreen;
+            pScreen->u16BitsPerPixel = (uint16_t)ppdev->ulBitCount;
+            pScreen->u16Flags        = VBVA_SCREEN_F_ACTIVE;
+
+            vboxHGSMIBufferSubmit (ppdev, p);
+
+            HGSMIHeapFree (&ppdev->hgsmiDisplayHeap, p);
+        }
+    }
+
+    return;
 }
 #endif /* VBOX_WITH_HGSMI */