Changeset 34346 in vbox for trunk/src/VBox/Additions/WINNT/Graphics

Timestamp:

Nov 24, 2010 10:19:18 PM (14 years ago)

Author:

vboxsync

Message:

Additions/WINNT/Graphics: more refactoring and the start of a common VBoxVideo header file

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Miniport

Files:

• VBoxVideo.cpp (modified) (4 diffs)
• VBoxVideo.h (modified) (6 diffs)
• VBoxVideoHGSMI.cpp (modified) (22 diffs)
• wddm/VBoxVideoVbva.cpp (modified) (5 diffs)
• wddm/VBoxVideoVdma.cpp (modified) (6 diffs)
• wddm/VBoxVideoVhwa.cpp (modified) (3 diffs)
• wddm/VBoxVideoWddm.cpp (modified) (13 diffs)

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

@@ -3382 +3382 @@
     PDEVICE_EXTENSION PrimaryExtension = (PDEVICE_EXTENSION)HwDeviceExtension;
 
-    hgsmiProcessHostCommandQueue(commonFromDeviceExt(PrimaryExtension));
+    hgsmiProcessHostCommandQueue(&commonFromDeviceExt(PrimaryExtension)->hostCtx);
 }
 
@@ -3391 +3391 @@
     if (PrimaryExtension)
     {
-        if (commonFromDeviceExt(PrimaryExtension)->pHostFlags) /* If HGSMI is enabled at all. */
-        {
-            uint32_t flags = commonFromDeviceExt(PrimaryExtension)->pHostFlags->u32HostFlags;
+        if (commonFromDeviceExt(PrimaryExtension)->hostCtx.pfHostFlags) /* If HGSMI is enabled at all. */
+        {
+            uint32_t flags = commonFromDeviceExt(PrimaryExtension)->hostCtx.pfHostFlags->u32HostFlags;
             if((flags & HGSMIHOSTFLAGS_IRQ) != 0)
             {
@@ -3403 +3403 @@
                 }
                 /* clear the IRQ */
-                HGSMIClearIrq (commonFromDeviceExt(PrimaryExtension));
+                HGSMIClearIrq(&commonFromDeviceExt(PrimaryExtension)->hostCtx);
                 return TRUE;
             }
@@ -3968 +3968 @@
             pInfo->u32MinVBVABufferSize = VBVA_MIN_BUFFER_SIZE;
 
-            pInfo->IOPortGuestCommand = commonFromDeviceExt(pDevExt)->IOPortGuest;
+            pInfo->IOPortGuestCommand = commonFromDeviceExt(pDevExt)->guestCtx.port;
 
             RequestPacket->StatusBlock->Information = sizeof(QUERYHGSMIRESULT);

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

@@ -22 +22 @@
 //#include <iprt/thread.h>
 
-#include <VBox/HGSMI/HGSMI.h>
-#include <VBox/HGSMI/HGSMIChSetup.h>
+#include <VBox/VBoxVideoGuest.h>
 #include <VBox/VBoxVideo.h>
 #include "VBoxHGSMI.h"
@@ -69 +68 @@
                                          * This is mapped by miniport separately.
                                          */
-    volatile HGSMIHOSTFLAGS * pHostFlags; /* HGSMI host flags */
-    volatile bool bHostCmdProcessing;
-
     void *pvAdapterInformation;         /* The pointer to the last 4K of VRAM.
                                          * This is mapped by miniport separately.
@@ -78 +74 @@
     /** Host HGSMI capabilities the guest can handle */
     uint32_t fCaps;
-
-    bool bHGSMI;                        /* Whether HGSMI is enabled. */
-
-    HGSMIAREA areaHostHeap;             /* Host heap VRAM area. */
-
-    HGSMICHANNELINFO channels;
-
-    HGSMIHEAP hgsmiAdapterHeap;
-
-    /* The IO Port Number for host commands. */
-    RTIOPORT IOPortHost;
-
-    /* The IO Port Number for guest commands. */
-    RTIOPORT IOPortGuest;
+    /** Whether HGSMI is enabled. */
+    bool bHGSMI;
+    /** Context information needed to receive commands from the host. */
+    HGSMIHOSTCOMMANDCONTEXT hostCtx;
+    /** Context information needed to submit commands to the host. */
+    HGSMIGUESTCOMMANDCONTEXT guestCtx;
 } VBOXVIDEO_COMMON, *PVBOXVIDEO_COMMON;
 
@@ -125 +113 @@
 uint32_t VBoxVideoCmnPortReadUlong(RTIOPORT Port);
 
-void* vboxHGSMIBufferAlloc(PVBOXVIDEO_COMMON pCommon,
+void* vboxHGSMIBufferAlloc(PHGSMIGUESTCOMMANDCONTEXT pCtx,
                          HGSMISIZE cbData,
                          uint8_t u8Ch,
                          uint16_t u16Op);
-void vboxHGSMIBufferFree (PVBOXVIDEO_COMMON pCommon, void *pvBuffer);
-int vboxHGSMIBufferSubmit (PVBOXVIDEO_COMMON pCommon, void *pvBuffer);
+void vboxHGSMIBufferFree(PHGSMIGUESTCOMMANDCONTEXT pCtx, void *pvBuffer);
+int vboxHGSMIBufferSubmit(PHGSMIGUESTCOMMANDCONTEXT pCtx, void *pvBuffer);
 
 int VBoxMapAdapterMemory (PVBOXVIDEO_COMMON pCommon,
@@ -142 +130 @@
 bool VBoxSyncToVideoIRQ(PVBOXVIDEO_COMMON pCommon, PFNVIDEOIRQSYNC pfnSync,
                         void *pvUser);
-
-/*
- * Host and Guest port IO helpers.
- */
-DECLINLINE(void) VBoxHGSMIHostWrite(PVBOXVIDEO_COMMON pCommon, uint32_t data)
-{
-    VBoxVideoCmnPortWriteUlong(pCommon->IOPortHost, data);
-}
-
-DECLINLINE(uint32_t) VBoxHGSMIHostRead(PVBOXVIDEO_COMMON pCommon)
-{
-    return VBoxVideoCmnPortReadUlong(pCommon->IOPortHost);
-}
-
-DECLINLINE(void) VBoxHGSMIGuestWrite(PVBOXVIDEO_COMMON pCommon, uint32_t data)
-{
-    VBoxVideoCmnPortWriteUlong(pCommon->IOPortGuest, data);
-}
-
-DECLINLINE(uint32_t) VBoxHGSMIGuestRead(PVBOXVIDEO_COMMON pCommon)
-{
-    return VBoxVideoCmnPortReadUlong(pCommon->IOPortGuest);
-}
 
 bool VBoxHGSMIIsSupported (void);
@@ -196 +161 @@
         uint8_t u8Channel);
 
-void hgsmiProcessHostCommandQueue(PVBOXVIDEO_COMMON pCommon);
+void hgsmiProcessHostCommandQueue(PHGSMIHOSTCOMMANDCONTEXT pCtx);
 
-void HGSMIClearIrq (PVBOXVIDEO_COMMON pCommon);
+void HGSMIClearIrq(PHGSMIHOSTCOMMANDCONTEXT pCtx);
 
 } /* extern "C" */

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

@@ -32 +32 @@
 // #include "vboxioctl.h"
 
-void HGSMINotifyHostCmdComplete (PVBOXVIDEO_COMMON pCommon, HGSMIOFFSET offt)
-{
-    VBoxHGSMIHostWrite(pCommon, offt);
-}
-
-void HGSMIClearIrq (PVBOXVIDEO_COMMON pCommon)
-{
-    VBoxHGSMIHostWrite(pCommon, HGSMIOFFSET_VOID);
-}
-
-static void HGSMIHostCmdComplete (PVBOXVIDEO_COMMON pCommon, void * pvMem)
-{
-    HGSMIOFFSET offMem = HGSMIPointerToOffset (&pCommon->areaHostHeap, HGSMIBufferHeaderFromData (pvMem));
+/** Send completion notification to the host for the command located at offset
+ * @a offt into the host command buffer. */
+void HGSMINotifyHostCmdComplete(PHGSMIHOSTCOMMANDCONTEXT pCtx, HGSMIOFFSET offt)
+{
+    VBoxVideoCmnPortWriteUlong(pCtx->port, offt);
+}
+
+/** Acknowlege an IRQ. */
+void HGSMIClearIrq(PHGSMIHOSTCOMMANDCONTEXT pCtx)
+{
+    VBoxVideoCmnPortWriteUlong(pCtx->port, HGSMIOFFSET_VOID);
+}
+
+/** Inform the host that a command has been handled. */
+static void HGSMIHostCmdComplete(PHGSMIHOSTCOMMANDCONTEXT pCtx, void * pvMem)
+{
+    HGSMIBUFFERHEADER *pHdr = HGSMIBufferHeaderFromData(pvMem);
+    HGSMIOFFSET offMem = HGSMIPointerToOffset(&pCtx->areaCtx, pHdr);
     Assert(offMem != HGSMIOFFSET_VOID);
     if(offMem != HGSMIOFFSET_VOID)
     {
-        HGSMINotifyHostCmdComplete (pCommon, offMem);
-    }
-}
-
-static void hgsmiHostCmdProcess(PVBOXVIDEO_COMMON pCommon, HGSMIOFFSET offBuffer)
-{
-    int rc = HGSMIBufferProcess (&pCommon->areaHostHeap,
-                                &pCommon->channels,
-                                offBuffer);
+        HGSMINotifyHostCmdComplete(pCtx, offMem);
+    }
+}
+
+/** Submit an incoming host command to the appropriate handler. */
+static void hgsmiHostCmdProcess(PHGSMIHOSTCOMMANDCONTEXT pCtx,
+                                HGSMIOFFSET offBuffer)
+{
+    int rc = HGSMIBufferProcess(&pCtx->areaCtx, &pCtx->channels, offBuffer);
     Assert(!RT_FAILURE(rc));
     if(RT_FAILURE(rc))
@@ -62 +67 @@
         /* failure means the command was not submitted to the handler for some reason
          * it's our responsibility to notify its completion in this case */
-        HGSMINotifyHostCmdComplete(pCommon, offBuffer);
+        HGSMINotifyHostCmdComplete(pCtx, offBuffer);
     }
     /* if the cmd succeeded it's responsibility of the callback to complete it */
 }
 
-static HGSMIOFFSET hgsmiGetHostBuffer (PVBOXVIDEO_COMMON pCommon)
-{
-    return VBoxHGSMIHostRead(pCommon);
-}
-
-static void hgsmiHostCommandQueryProcess (PVBOXVIDEO_COMMON pCommon)
-{
-    HGSMIOFFSET offset = hgsmiGetHostBuffer (pCommon);
-    Assert(offset != HGSMIOFFSET_VOID);
-    if(offset != HGSMIOFFSET_VOID)
-    {
-        hgsmiHostCmdProcess(pCommon, offset);
-    }
-}
-
-void hgsmiProcessHostCommandQueue(PVBOXVIDEO_COMMON pCommon)
-{
-    while (pCommon->pHostFlags->u32HostFlags & HGSMIHOSTFLAGS_COMMANDS_PENDING)
-    {
-        if (!ASMAtomicCmpXchgBool(&pCommon->bHostCmdProcessing, true, false))
+/** Get the next command from the host. */
+static HGSMIOFFSET hgsmiGetHostBuffer(PHGSMIHOSTCOMMANDCONTEXT pCtx)
+{
+    return VBoxVideoCmnPortReadUlong(pCtx->port);
+}
+
+/** Get and handle the next command from the host. */
+static void hgsmiHostCommandQueryProcess(PHGSMIHOSTCOMMANDCONTEXT pCtx)
+{
+    HGSMIOFFSET offset = hgsmiGetHostBuffer(pCtx);
+    AssertReturnVoid(offset != HGSMIOFFSET_VOID);
+    hgsmiHostCmdProcess(pCtx, offset);
+}
+
+/** Drain the host command queue. */
+void hgsmiProcessHostCommandQueue(PHGSMIHOSTCOMMANDCONTEXT pCtx)
+{
+    while (pCtx->pfHostFlags->u32HostFlags & HGSMIHOSTFLAGS_COMMANDS_PENDING)
+    {
+        if (!ASMAtomicCmpXchgBool(&pCtx->fHostCmdProcessing, true, false))
             return;
-        hgsmiHostCommandQueryProcess(pCommon);
-        ASMAtomicWriteBool(&pCommon->bHostCmdProcessing, false);
-    }
-}
-
-/* Detect whether HGSMI is supported by the host. */
+        hgsmiHostCommandQueryProcess(pCtx);
+        ASMAtomicWriteBool(&pCtx->fHostCmdProcessing, false);
+    }
+}
+
+/** Detect whether HGSMI is supported by the host. */
 bool VBoxHGSMIIsSupported (void)
 {
@@ -112 +117 @@
 typedef FNHGSMICALLFINALIZE *PFNHGSMICALLFINALIZE;
 
-void* vboxHGSMIBufferAlloc(PVBOXVIDEO_COMMON pCommon,
+void* vboxHGSMIBufferAlloc(PHGSMIGUESTCOMMANDCONTEXT pCtx,
                          HGSMISIZE cbData,
                          uint8_t u8Ch,
@@ -120 +125 @@
     /* @todo: add synchronization */
 #endif
-    return HGSMIHeapAlloc (&pCommon->hgsmiAdapterHeap, cbData, u8Ch, u16Op);
-}
-
-void vboxHGSMIBufferFree (PVBOXVIDEO_COMMON pCommon, void *pvBuffer)
+    return HGSMIHeapAlloc (&pCtx->heapCtx, cbData, u8Ch, u16Op);
+}
+
+void vboxHGSMIBufferFree(PHGSMIGUESTCOMMANDCONTEXT pCtx, void *pvBuffer)
 {
 #ifdef VBOX_WITH_WDDM
     /* @todo: add synchronization */
 #endif
-    HGSMIHeapFree (&pCommon->hgsmiAdapterHeap, pvBuffer);
-}
-
-int vboxHGSMIBufferSubmit (PVBOXVIDEO_COMMON pCommon, void *pvBuffer)
+    HGSMIHeapFree (&pCtx->heapCtx, pvBuffer);
+}
+
+int vboxHGSMIBufferSubmit(PHGSMIGUESTCOMMANDCONTEXT pCtx, void *pvBuffer)
 {
     /* Initialize the buffer and get the offset for port IO. */
-    HGSMIOFFSET offBuffer = HGSMIHeapBufferOffset (&pCommon->hgsmiAdapterHeap, pvBuffer);
+    HGSMIOFFSET offBuffer = HGSMIHeapBufferOffset (&pCtx->heapCtx, pvBuffer);
 
     Assert(offBuffer != HGSMIOFFSET_VOID);
@@ -140 +145 @@
     {
         /* Submit the buffer to the host. */
-        VBoxHGSMIGuestWrite(pCommon, offBuffer);
+        VBoxVideoCmnPortWriteUlong(pCtx->port, offBuffer);
         return VINF_SUCCESS;
     }
@@ -158 +163 @@
 
     /* Allocate the IO buffer. */
-    void *p = HGSMIHeapAlloc (&pCommon->hgsmiAdapterHeap, cbData, u8Ch, u16Op);
+    void *p = HGSMIHeapAlloc (&pCommon->guestCtx.heapCtx, cbData, u8Ch, u16Op);
 
     if (!p)
@@ -174 +179 @@
         if (RT_SUCCESS (rc))
         {
-            /* Initialize the buffer and get the offset for port IO. */
-            HGSMIOFFSET offBuffer = HGSMIHeapBufferOffset (&pCommon->hgsmiAdapterHeap,
-                                                           p);
-
-            /* Submit the buffer to the host. */
-            VBoxHGSMIGuestWrite(pCommon, offBuffer);
-
-            if (pfnFinalize)
+            rc = vboxHGSMIBufferSubmit(&pCommon->guestCtx, p);
+
+            if (RT_SUCCESS(rc) && pfnFinalize)
             {
                 rc = pfnFinalize (pCommon, pvContext, p);
@@ -193 +193 @@
 
         /* Free the IO buffer. */
-        HGSMIHeapFree (&pCommon->hgsmiAdapterHeap, p);
+        HGSMIHeapFree (&pCommon->guestCtx.heapCtx, p);
     }
 
@@ -271 +271 @@
     int rc;
     /* Issue the screen info command. */
-    void *p = vboxHGSMIBufferAlloc (pCommon, sizeof(VBVAINFOVIEW) * u32Count,
+    void *p = vboxHGSMIBufferAlloc(&pCommon->guestCtx, sizeof(VBVAINFOVIEW) * u32Count,
                                     HGSMI_CH_VBVA, VBVA_INFO_VIEW);
     Assert(p);
@@ -279 +279 @@
         rc = pfnFill(pvData, pInfo);
         if (RT_SUCCESS(rc))
-            vboxHGSMIBufferSubmit (pCommon, p);
-        vboxHGSMIBufferFree (pCommon, p);
+            vboxHGSMIBufferSubmit (&pCommon->guestCtx, p);
+        vboxHGSMIBufferFree (&pCommon->guestCtx, p);
     }
     else
@@ -403 +403 @@
         /** @note (michael) moved this here as it is done unconditionally in both
          * driver branches.  Feel free to fix if that is ever changed. */
-        pCommon->IOPortHost = (RTIOPORT)VGA_PORT_HGSMI_HOST;
-        pCommon->IOPortGuest = (RTIOPORT)VGA_PORT_HGSMI_GUEST;
+        pCommon->hostCtx.port = (RTIOPORT)VGA_PORT_HGSMI_HOST;
+        pCommon->guestCtx.port = (RTIOPORT)VGA_PORT_HGSMI_GUEST;
 
         /* Map the adapter information. It will be needed for HGSMI IO. */
@@ -423 +423 @@
         {
             /* Setup a HGSMI heap within the adapter information area. */
-            rc = HGSMIHeapSetup (&pCommon->hgsmiAdapterHeap,
+            rc = HGSMIHeapSetup (&pCommon->guestCtx.heapCtx,
                                  pCommon->pvAdapterInformation,
                                  VBVA_ADAPTER_INFORMATION_SIZE - sizeof(HGSMIHOSTFLAGS),
@@ -438 +438 @@
             else
             {
-                pCommon->pHostFlags = (HGSMIHOSTFLAGS*)(((uint8_t*)pCommon->pvAdapterInformation)
+                pCommon->hostCtx.pfHostFlags = (HGSMIHOSTFLAGS*)(((uint8_t*)pCommon->pvAdapterInformation)
                                                             + VBVA_ADAPTER_INFORMATION_SIZE - sizeof(HGSMIHOSTFLAGS));
             }
@@ -497 +497 @@
 
                 /* Init the host hap area. Buffers from the host will be placed there. */
-                HGSMIAreaInitialize (&pCommon->areaHostHeap,
+                HGSMIAreaInitialize (&pCommon->hostCtx.areaCtx,
                                      pCommon->pvMiniportHeap,
                                      pCommon->cbMiniportHeap,
@@ -550 +550 @@
     PVBOXVIDEO_COMMON pCommon = (PVBOXVIDEO_COMMON)pvCommon;
 
-    pCommon->pHostFlags = NULL;
+    pCommon->hostCtx.pfHostFlags = NULL;
     return true;
 }
@@ -557 +557 @@
 {
     VBoxUnmapAdapterMemory(pCommon, &pCommon->pvMiniportHeap);
-    HGSMIHeapDestroy(&pCommon->hgsmiAdapterHeap);
+    HGSMIHeapDestroy(&pCommon->guestCtx.heapCtx);
 
     /* Unmap the adapter information needed for HGSMI IO. */
@@ -734 +734 @@
 DECLCALLBACK(void) hgsmiHostCmdComplete (HVBOXVIDEOHGSMI hHGSMI, struct _VBVAHOSTCMD * pCmd)
 {
-    PVBOXVIDEO_COMMON pCommon = (PVBOXVIDEO_COMMON)hHGSMI;
-    HGSMIHostCmdComplete (pCommon, pCmd);
+    PHGSMIHOSTCOMMANDCONTEXT pCtx = &((PVBOXVIDEO_COMMON)hHGSMI)->hostCtx;
+    HGSMIHostCmdComplete(pCtx, pCmd);
 }
 
@@ -759 +759 @@
         return VERR_INVALID_PARAMETER;
 
-    PVBOXVIDEO_COMMON pCommon = (PVBOXVIDEO_COMMON)hHGSMI;
+    PHGSMIHOSTCOMMANDCONTEXT pCtx = &((PVBOXVIDEO_COMMON)hHGSMI)->hostCtx;
 
     /* pick up the host commands */
-    hgsmiProcessHostCommandQueue(pCommon);
-
-    HGSMICHANNEL * pChannel = HGSMIChannelFindById (&pCommon->channels, u8Channel);
+    hgsmiProcessHostCommandQueue(pCtx);
+
+    HGSMICHANNEL *pChannel = HGSMIChannelFindById (&pCtx->channels, u8Channel);
     if(pChannel)
     {
@@ -855 +855 @@
                             Assert(!pCur->u.pNext);
 #endif
-                            HGSMIHostCmdComplete(pCallbacks->pCommon, pCur);
+                            HGSMIHostCmdComplete(&pCallbacks->pCommon->hostCtx, pCur);
 #if 0  /* pNext is NULL, and the other things have already been asserted */
                             pCur = pNext;
@@ -907 +907 @@
     }
     /* no handlers were found, need to complete the command here */
-    HGSMIHostCmdComplete(pCallbacks->pCommon, pvBuffer);
+    HGSMIHostCmdComplete(&pCallbacks->pCommon->hostCtx, pvBuffer);
     return VINF_SUCCESS;
 }
@@ -918 +918 @@
 {
     VBVA_CHANNELCONTEXTS * pContexts;
-    HGSMICHANNEL * pChannel = HGSMIChannelFindById (&pCommon->channels, u8Channel);
+    HGSMICHANNEL * pChannel = HGSMIChannelFindById (&pCommon->hostCtx.channels, u8Channel);
     if(!pChannel)
     {
@@ -948 +948 @@
             if(!pChannel)
             {
-                rc = HGSMIChannelRegister (&pCommon->channels,
+                rc = HGSMIChannelRegister (&pCommon->hostCtx.channels,
                                            u8Channel,
                                            "VGA Miniport HGSMI channel",

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoVbva.cpp

@@ -22 +22 @@
 {
     int rc = VERR_NO_MEMORY;
-    void *p = vboxHGSMIBufferAlloc (commonFromDeviceExt(pDevExt),
+    void *p = vboxHGSMIBufferAlloc (&commonFromDeviceExt(pDevExt)->guestCtx,
                                   sizeof (VBVAENABLE_EX),
                                   HGSMI_CH_VBVA,
@@ -43 +43 @@
         pEnable->i32Result = VERR_NOT_SUPPORTED;
 
-        vboxHGSMIBufferSubmit (commonFromDeviceExt(pDevExt), p);
+        vboxHGSMIBufferSubmit (&commonFromDeviceExt(pDevExt)->guestCtx, p);
 
         if (bEnable)
@@ -53 +53 @@
             rc = VINF_SUCCESS;
 
-        vboxHGSMIBufferFree (commonFromDeviceExt(pDevExt), p);
+        vboxHGSMIBufferFree (&commonFromDeviceExt(pDevExt)->guestCtx, p);
     }
     return rc;
@@ -143 +143 @@
 {
     /* Issue the flush command. */
-    void *p = vboxHGSMIBufferAlloc (commonFromDeviceExt(pDevExt),
+    void *p = vboxHGSMIBufferAlloc (&commonFromDeviceExt(pDevExt)->guestCtx,
                               sizeof (VBVAFLUSH),
                               HGSMI_CH_VBVA,
@@ -158 +158 @@
         pFlush->u32Reserved = 0;
 
-        vboxHGSMIBufferSubmit (commonFromDeviceExt(pDevExt), p);
-
-        vboxHGSMIBufferFree (commonFromDeviceExt(pDevExt), p);
+        vboxHGSMIBufferSubmit (&commonFromDeviceExt(pDevExt)->guestCtx, p);
+
+        vboxHGSMIBufferFree (&commonFromDeviceExt(pDevExt)->guestCtx, p);
     }
 

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoVdma.cpp

@@ -1030 +1030 @@
 static int vboxWddmVdmaSubmitHgsmi(struct _DEVICE_EXTENSION* pDevExt, PVBOXVDMAINFO pInfo, HGSMIOFFSET offDr)
 {
-    VBoxHGSMIGuestWrite(commonFromDeviceExt(pDevExt), offDr);
+    VBoxVideoCmnPortWriteUlong(commonFromDeviceExt(pDevExt)->guestCtx.port, offDr);
     return VINF_SUCCESS;
 }
@@ -1040 +1040 @@
     int rc = VINF_SUCCESS;
 
-    PVBOXVDMA_CTL pCmd = (PVBOXVDMA_CTL)VBoxSHGSMICommandAlloc(&commonFromDeviceExt(pDevExt)->hgsmiAdapterHeap, sizeof (VBOXVDMA_CTL), HGSMI_CH_VBVA, VBVA_VDMA_CTL);
+    PVBOXVDMA_CTL pCmd = (PVBOXVDMA_CTL)VBoxSHGSMICommandAlloc(&commonFromDeviceExt(pDevExt)->guestCtx.heapCtx, sizeof (VBOXVDMA_CTL), HGSMI_CH_VBVA, VBVA_VDMA_CTL);
     if (pCmd)
     {
@@ -1047 +1047 @@
         pCmd->i32Result = VERR_NOT_SUPPORTED;
 
-        const VBOXSHGSMIHEADER* pHdr = VBoxSHGSMICommandPrepSynch(&commonFromDeviceExt(pDevExt)->hgsmiAdapterHeap, pCmd);
+        const VBOXSHGSMIHEADER* pHdr = VBoxSHGSMICommandPrepSynch(&commonFromDeviceExt(pDevExt)->guestCtx.heapCtx, pCmd);
         Assert(pHdr);
         if (pHdr)
@@ -1053 +1053 @@
             do
             {
-                HGSMIOFFSET offCmd = VBoxSHGSMICommandOffset(&commonFromDeviceExt(pDevExt)->hgsmiAdapterHeap, pHdr);
+                HGSMIOFFSET offCmd = VBoxSHGSMICommandOffset(&commonFromDeviceExt(pDevExt)->guestCtx.heapCtx, pHdr);
                 Assert(offCmd != HGSMIOFFSET_VOID);
                 if (offCmd != HGSMIOFFSET_VOID)
@@ -1061 +1061 @@
                     if (RT_SUCCESS(rc))
                     {
-                        rc = VBoxSHGSMICommandDoneSynch(&commonFromDeviceExt(pDevExt)->hgsmiAdapterHeap, pHdr);
+                        rc = VBoxSHGSMICommandDoneSynch(&commonFromDeviceExt(pDevExt)->guestCtx.heapCtx, pHdr);
                         AssertRC(rc);
                         if (RT_SUCCESS(rc))
@@ -1074 +1074 @@
                     rc = VERR_INVALID_PARAMETER;
                 /* fail to submit, cancel it */
-                VBoxSHGSMICommandCancelSynch(&commonFromDeviceExt(pDevExt)->hgsmiAdapterHeap, pHdr);
+                VBoxSHGSMICommandCancelSynch(&commonFromDeviceExt(pDevExt)->guestCtx.heapCtx, pHdr);
             } while (0);
         }
 
-        VBoxSHGSMICommandFree (&commonFromDeviceExt(pDevExt)->hgsmiAdapterHeap, pCmd);
+        VBoxSHGSMICommandFree (&commonFromDeviceExt(pDevExt)->guestCtx.heapCtx, pCmd);
     }
     else

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoVhwa.cpp

@@ -45 +45 @@
     if(!cRefs)
     {
-        vboxHGSMIBufferFree(commonFromDeviceExt(pDevExt), pCmd);
+        vboxHGSMIBufferFree(&commonFromDeviceExt(pDevExt)->guestCtx, pCmd);
     }
 }
@@ -61 +61 @@
     vbvaVhwaCommandRetain(pDevExt, pCmd);
 
-    vboxHGSMIBufferSubmit(commonFromDeviceExt(pDevExt), pCmd);
+    vboxHGSMIBufferSubmit(&commonFromDeviceExt(pDevExt)->guestCtx, pCmd);
 
     if(!(pCmd->Flags & VBOXVHWACMD_FLAG_HG_ASYNCH)
@@ -100 +100 @@
                               VBVA_VHWA_CMD);
 #else
-    VBOXVHWACMD* pHdr = (VBOXVHWACMD*)vboxHGSMIBufferAlloc(commonFromDeviceExt(pDevExt),
+    VBOXVHWACMD* pHdr = (VBOXVHWACMD*)vboxHGSMIBufferAlloc(&commonFromDeviceExt(pDevExt)->guestCtx,
                               cbCmd + VBOXVHWACMD_HEADSIZE(),
                               HGSMI_CH_VBVA,

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.cpp

@@ -120 +120 @@
 NTSTATUS vboxWddmGhDisplayPostInfoScreenBySDesc (PDEVICE_EXTENSION pDevExt, PVBOXWDDM_SURFACE_DESC pDesc, POINT * pVScreenPos, uint16_t fFlags)
 {
-    void *p = vboxHGSMIBufferAlloc (commonFromDeviceExt(pDevExt),
+    void *p = vboxHGSMIBufferAlloc (&commonFromDeviceExt(pDevExt)->guestCtx,
                                       sizeof (VBVAINFOSCREEN),
                                       HGSMI_CH_VBVA,
@@ -139 +139 @@
         pScreen->u16Flags        = fFlags;
 
-        vboxHGSMIBufferSubmit (commonFromDeviceExt(pDevExt), p);
-
-        vboxHGSMIBufferFree (commonFromDeviceExt(pDevExt), p);
+        vboxHGSMIBufferSubmit (&commonFromDeviceExt(pDevExt)->guestCtx, p);
+
+        vboxHGSMIBufferFree (&commonFromDeviceExt(pDevExt)->guestCtx, p);
     }
 
@@ -163 +163 @@
 
     /* Issue the screen info command. */
-    void *p = vboxHGSMIBufferAlloc (commonFromDeviceExt(pDevExt),
+    void *p = vboxHGSMIBufferAlloc (&commonFromDeviceExt(pDevExt)->guestCtx,
                                       sizeof (VBVAINFOVIEW),
                                       HGSMI_CH_VBVA,
@@ -178 +178 @@
         pView->u32MaxScreenSize = pView->u32ViewSize;
 
-        vboxHGSMIBufferSubmit (commonFromDeviceExt(pDevExt), p);
-
-        vboxHGSMIBufferFree (commonFromDeviceExt(pDevExt), p);
+        vboxHGSMIBufferSubmit (&commonFromDeviceExt(pDevExt)->guestCtx, p);
+
+        vboxHGSMIBufferFree (&commonFromDeviceExt(pDevExt)->guestCtx, p);
     }
 
@@ -281 +281 @@
         return &pDevExt->u.primary.Vdma.CmdHeap;
 #endif
-    if (HGSMIAreaContainsOffset(&commonFromDeviceExt(pDevExt)->hgsmiAdapterHeap.area, offCmd))
-        return &commonFromDeviceExt(pDevExt)->hgsmiAdapterHeap;
+    if (HGSMIAreaContainsOffset(&commonFromDeviceExt(pDevExt)->guestCtx.heapCtx.area, offCmd))
+        return &commonFromDeviceExt(pDevExt)->guestCtx.heapCtx;
     return NULL;
 }
@@ -301 +301 @@
         return VBOXWDDM_HGSMICMD_TYPE_DMACMD;
 #endif
-    if (HGSMIAreaContainsOffset(&commonFromDeviceExt(pDevExt)->hgsmiAdapterHeap.area, offCmd))
+    if (HGSMIAreaContainsOffset(&commonFromDeviceExt(pDevExt)->guestCtx.heapCtx.area, offCmd))
         return VBOXWDDM_HGSMICMD_TYPE_CTL;
     return VBOXWDDM_HGSMICMD_TYPE_UNDEFINED;
@@ -834 +834 @@
     BOOLEAN bOur = FALSE;
     BOOLEAN bNeedDpc = FALSE;
-    if (commonFromDeviceExt(pDevExt)->pHostFlags) /* If HGSMI is enabled at all. */
+    if (commonFromDeviceExt(pDevExt)->hostCtx.pfHostFlags) /* If HGSMI is enabled at all. */
     {
         VBOXSHGSMILIST CtlList;
@@ -850 +850 @@
 #endif
 
-        uint32_t flags = commonFromDeviceExt(pDevExt)->pHostFlags->u32HostFlags;
+        uint32_t flags = commonFromDeviceExt(pDevExt)->hostCtx.pfHostFlags->u32HostFlags;
         bOur = (flags & HGSMIHOSTFLAGS_IRQ);
         do
@@ -857 +857 @@
             {
                 /* read the command offset */
-                HGSMIOFFSET offCmd = VBoxHGSMIGuestRead(commonFromDeviceExt(pDevExt));
+                HGSMIOFFSET offCmd = VBoxVideoCmnPortReadUlong(commonFromDeviceExt(pDevExt)->guestCtx.port);
                 Assert(offCmd != HGSMIOFFSET_VOID);
                 if (offCmd != HGSMIOFFSET_VOID)
@@ -874 +874 @@
                         case VBOXWDDM_HGSMICMD_TYPE_CTL:
                             pList = &CtlList;
-                            pHeap = &commonFromDeviceExt(pDevExt)->hgsmiAdapterHeap;
+                            pHeap = &commonFromDeviceExt(pDevExt)->guestCtx.heapCtx;
                             break;
                         default:
@@ -920 +920 @@
                 break;
 
-            flags = commonFromDeviceExt(pDevExt)->pHostFlags->u32HostFlags;
+            flags = commonFromDeviceExt(pDevExt)->hostCtx.pfHostFlags->u32HostFlags;
         } while (1);
 
@@ -953 +953 @@
         if (bOur)
         {
-            HGSMIClearIrq (commonFromDeviceExt(pDevExt));
+            HGSMIClearIrq(&commonFromDeviceExt(pDevExt)->hostCtx);
 #ifdef DEBUG_misha
             /* this is not entirely correct since host may concurrently complete some commands and raise a new IRQ while we are here,
              * still this allows to check that the host flags are correctly cleared after the ISR */
-            Assert(commonFromDeviceExt(pDevExt)->pHostFlags);
-            uint32_t flags = commonFromDeviceExt(pDevExt)->pHostFlags->u32HostFlags;
+            Assert(commonFromDeviceExt(pDevExt)->HostCtx.pfHostFlags);
+            uint32_t flags = commonFromDeviceExt(pDevExt)->HostCtx.pfHostFlags->u32HostFlags;
             Assert(flags == 0);
 #endif
@@ -1041 +1041 @@
     if (!vboxSHGSMIListIsEmpty(&context.data.CtlList))
     {
-        int rc = VBoxSHGSMICommandPostprocessCompletion (&commonFromDeviceExt(pDevExt)->hgsmiAdapterHeap, &context.data.CtlList);
+        int rc = VBoxSHGSMICommandPostprocessCompletion (&commonFromDeviceExt(pDevExt)->guestCtx.heapCtx, &context.data.CtlList);
         AssertRC(rc);
     }