Changeset 1481 in vbox

Timestamp:

Mar 14, 2007 6:28:14 PM (18 years ago)

Author:

vboxsync

Message:

No longer require contiguous memory for the VM structure.
Did long overdue IOCtl cleanup wrt R3/R0 pointers.

Location:

trunk/src/VBox/Devices/Network

Files:

• SrvIntNetR0.cpp (modified) (1 diff)
• testcase/tstIntNetR0.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Network/SrvIntNetR0.cpp

@@ -1040 +1040 @@
         cbSend = RT_ALIGN(RT_MAX(cbSend, sizeof(INTNETHDR) * 4), sizeof(INTNETHDR));
         const unsigned cbBuf = RT_ALIGN(sizeof(*pIf->pIntBuf), sizeof(INTNETHDR)) + cbRecv + cbSend;
-        rc = SUPR0MemAlloc(pIf->pSession, cbBuf, (void **)&pIf->pIntBufDefault, (void **)&pIf->pIntBufDefaultR3);
+        rc = SUPR0MemAlloc(pIf->pSession, cbBuf, (PRTR0PTR)&pIf->pIntBufDefault, (PRTR3PTR)&pIf->pIntBufDefaultR3);
         if (VBOX_SUCCESS(rc))
         {

trunk/src/VBox/Devices/Network/testcase/tstIntNetR0.cpp

@@ -160 +160 @@
 }
 
-INTNETR3DECL(int) SUPR0MemAlloc(PSUPDRVSESSION pSession, unsigned cb, void **ppvR0, void **ppvR3)
+INTNETR3DECL(int) SUPR0MemAlloc(PSUPDRVSESSION pSession, uint32_t cb, PRTR0PTR ppvR0, PRTR3PTR ppvR3)
 {
     if (pSession != g_pSession)
@@ -171 +171 @@
     if (!pv)
         return VERR_NO_MEMORY;
-    *ppvR0 = pv;
+    *ppvR0 = (RTR0PTR)pv;
     if (ppvR3)
         *ppvR3 = pv;