Changeset 50542 in vbox

Timestamp:

Feb 21, 2014 2:13:48 PM (11 years ago)

Author:

vboxsync

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

92394

Message:

Use HGSMI memory allocator

Location:

trunk

Files:

trunk/include/VBox/HGSMI/HGSMI.h

-              r50518
+              r50542
 /* Heap types. */
 #define HGSMI_HEAP_TYPE_NULL    0 /* Heap not initialized. */
 #define HGSMI_HEAP_TYPE_POINTER 1 /* RTHEAPSIMPLE. Obsolete. */
 #define HGSMI_HEAP_TYPE_OFFSET  2 /* RTHEAPOFFSET. Obsolete. */
+#define HGSMI_HEAP_TYPE_POINTER 1 /* Deprecated. RTHEAPSIMPLE. */
+#define HGSMI_HEAP_TYPE_OFFSET  2 /* Deprecated. RTHEAPOFFSET. */
 #define HGSMI_HEAP_TYPE_MA      3 /* Memory allocator. */

r50482	r50542
425	425
426	426	rc = HGSMIHeapSetup(&pDev->hgsmi.ctx.heapCtx,
427		HGSMI_HEAP_TYPE_~~POINTER~~,
	427	HGSMI_HEAP_TYPE_MA,
428	428	(uint8_t *)pDev->memInfo.VideoRamBase+pDev->layout.offDisplayInfo+sizeof(HGSMIHOSTFLAGS),
429	429	pDev->layout.cbDisplayInfo-sizeof(HGSMIHOSTFLAGS),

r50482	r50542
1505	1505	/* Setup a HGSMI heap within the adapter information area. */
1506	1506	rc = VBoxSHGSMIInit(&pInfo->CmdHeap,
1507		HGSMI_HEAP_TYPE_~~POINTER~~,
	1507	HGSMI_HEAP_TYPE_MA,
1508	1508	pvBuffer,
1509	1509	cbBuffer,

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

r50518	r50542
1163	1163	{
1164	1164	rc = HGSMIHeapSetup (&pIns->hostHeap,
1165		HGSMI_HEAP_TYPE_~~OFFSET~~,
	1165	HGSMI_HEAP_TYPE_MA,
1166	1166	pIns->area.pu8Base+offHeap,
1167	1167	cbHeap,

Note: See TracChangeset for help on using the changeset viewer.