Changeset 55421 in vbox for trunk/src/VBox/Additions

Timestamp:

Apr 24, 2015 12:00:21 PM (10 years ago)

Author:

vboxsync

Message:

HGSMI: cleanup, logging, comments, move legacy host heap support from common code to the host code.

Location:

trunk/src/VBox/Additions

Files:

• WINNT/Graphics/Video/disp/xpdm/VBoxDispVBVA.cpp (modified) (1 diff)
• WINNT/Graphics/Video/mp/wddm/VBoxMPShgsmi.cpp (modified) (1 diff)
• WINNT/Graphics/Video/mp/wddm/VBoxMPShgsmi.h (modified) (1 diff)
• WINNT/Graphics/Video/mp/wddm/VBoxMPVdma.cpp (modified) (1 diff)
• common/VBoxVideo/HGSMIBase.cpp (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispVBVA.cpp

@@ -425 +425 @@
 
         rc = HGSMIHeapSetup(&pDev->hgsmi.ctx.heapCtx,
-                            HGSMI_HEAP_TYPE_MA,
                             (uint8_t *)pDev->memInfo.VideoRamBase+pDev->layout.offDisplayInfo+sizeof(HGSMIHOSTFLAGS),
                             pDev->layout.cbDisplayInfo-sizeof(HGSMIHOSTFLAGS),

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPShgsmi.cpp

@@ -186 +186 @@
 }
 
-int VBoxSHGSMIInit(PVBOXSHGSMI pHeap, uint32_t u32HeapType, void *pvBase, HGSMISIZE cbArea, HGSMIOFFSET offBase,
+int VBoxSHGSMIInit(PVBOXSHGSMI pHeap, void *pvBase, HGSMISIZE cbArea, HGSMIOFFSET offBase,
                    const HGSMIENV *pEnv)
 {
     KeInitializeSpinLock(&pHeap->HeapLock);
-    return HGSMIHeapSetup(&pHeap->Heap, u32HeapType, pvBase, cbArea, offBase, pEnv);
+    return HGSMIHeapSetup(&pHeap->Heap, pvBase, cbArea, offBase, pEnv);
 }
 

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPShgsmi.h

@@ -60 +60 @@
 }
 
-int VBoxSHGSMIInit(PVBOXSHGSMI pHeap, uint32_t u32HeapType, void *pvBase, HGSMISIZE cbArea, HGSMIOFFSET offBase, const HGSMIENV *pEnv);
+int VBoxSHGSMIInit(PVBOXSHGSMI pHeap, void *pvBase, HGSMISIZE cbArea, HGSMIOFFSET offBase, const HGSMIENV *pEnv);
 void VBoxSHGSMITerm(PVBOXSHGSMI pHeap);
 void* VBoxSHGSMIHeapAlloc(PVBOXSHGSMI pHeap, HGSMISIZE cbData, uint8_t u8Channel, uint16_t u16ChannelInfo);

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPVdma.cpp

@@ -1628 +1628 @@
         /* Setup a HGSMI heap within the adapter information area. */
         rc = VBoxSHGSMIInit(&pInfo->CmdHeap,
-                             HGSMI_HEAP_TYPE_MA,
                              pvBuffer,
                              cbBuffer,

trunk/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp

@@ -341 +341 @@
     pCtx->port = (RTIOPORT)VGA_PORT_HGSMI_GUEST;
 #ifdef VBOX_WDDM_MINIPORT
-    return VBoxSHGSMIInit(&pCtx->heapCtx, HGSMI_HEAP_TYPE_MA, pvGuestHeapMemory,
+    return VBoxSHGSMIInit(&pCtx->heapCtx, pvGuestHeapMemory,
                           cbGuestHeapMemory, offVRAMGuestHeapMemory, pEnv);
 #else
-    return HGSMIHeapSetup(&pCtx->heapCtx, HGSMI_HEAP_TYPE_MA, pvGuestHeapMemory,
+    return HGSMIHeapSetup(&pCtx->heapCtx, pvGuestHeapMemory,
                           cbGuestHeapMemory, offVRAMGuestHeapMemory, pEnv);
 #endif