Changeset 12807 in vbox for trunk/src

Timestamp:

Sep 29, 2008 3:03:55 PM (17 years ago)

Author:

vboxsync

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

37159

Message:

PDM - VMMDevHeap: PDM_DEVHLP_VERSION minor increment, GCPhysVMMDevHeap init, spaces and doxygen.

Location:

trunk/src/VBox/VMM

Files:

• PDM.cpp (modified) (8 diffs)
• PDMDevice.cpp (modified) (4 diffs)
• PDMInternal.h (modified) (1 diff)

trunk/src/VBox/VMM/PDM.cpp

@@ -184 +184 @@
      */
     pVM->pdm.s.offVM = RT_OFFSETOF(VM, pdm.s);
+    pVM->pdm.s.GCPhysVMMDevHeap = NIL_RTGCPHYS;
 
     int rc = TMR3TimerCreateInternal(pVM, TMCLOCK_VIRTUAL, pdmR3PollerTimer, NULL, "PDM Poller", &pVM->pdm.s.pTimerPollers);
@@ -1188 +1189 @@
 }
 
+
 /**
  * Registers the VMM device heap
@@ -1209 +1211 @@
 }
 
+
 /**
  * Unregisters the VMM device heap
@@ -1228 +1231 @@
 }
 
+
 /**
  * Allocates memory from the VMM device heap
@@ -1242 +1246 @@
     Log(("PDMR3VMMDevHeapAlloc %x\n", cbSize));
 
-    /* @todo not a real heap as there's currently only one user. */
+    /** @todo not a real heap as there's currently only one user. */
     *ppv = pVM->pdm.s.pvVMMDevHeap;
     pVM->pdm.s.cbVMMDevHeapLeft = 0;
@@ -1248 +1252 @@
 }
 
+
 /**
  * Frees memory from the VMM device heap
@@ -1253 +1258 @@
  * @returns VBox status code.
  * @param   pVM             VM handle.
- * @param   pv              Ring-3 pointer. 
+ * @param   pv              Ring-3 pointer.
  */
 PDMR3DECL(int) PDMR3VMMDevHeapFree(PVM pVM, RTR3PTR pv)
@@ -1259 +1264 @@
     Log(("PDMR3VMMDevHeapFree %VHv\n", pv));
 
-    /* @todo not a real heap as there's currently only one user. */
+    /** @todo not a real heap as there's currently only one user. */
     pVM->pdm.s.cbVMMDevHeapLeft = pVM->pdm.s.cbVMMDevHeap;
     return VINF_SUCCESS;

trunk/src/VBox/VMM/PDMDevice.cpp

@@ -3677 +3677 @@
 
 
+
+
+
 /** @copydoc PDMDEVHLP::pfnGetVM */
 static DECLCALLBACK(PVM) pdmR3DevHlp_Untrusted_GetVM(PPDMDEVINS pDevIns)
@@ -4030 +4033 @@
 }
 
-/**
- * @copydoc PDMDEVHLP::pfnRegisterVMMDevHeap
- */
+
+/** @copydoc PDMDEVHLP::pfnRegisterVMMDevHeap */
 static DECLCALLBACK(int) pdmR3DevHlp_Untrusted_RegisterVMMDevHeap(PPDMDEVINS pDevIns, RTGCPHYS GCPhys, RTR3PTR pvHeap, unsigned cbSize)
 {
@@ -4040 +4042 @@
 }
 
-/**
- * @copydoc PDMDEVHLP::pfnUnregisterVMMDevHeap
- */
+
+/** @copydoc PDMDEVHLP::pfnUnregisterVMMDevHeap */
 static DECLCALLBACK(int) pdmR3DevHlp_Untrusted_UnregisterVMMDevHeap(PPDMDEVINS pDevIns, RTGCPHYS GCPhys)
 {
@@ -4049 +4050 @@
     return VERR_ACCESS_DENIED;
 }
+
+
 
 

trunk/src/VBox/VMM/PDMInternal.h

@@ -844 +844 @@
     R3PTRTYPE(PPDMASYNCCOMPLETIONTEMPLATE) pAsyncCompletionTemplates;
 
-    /** PDM VMM device heap
+    /** @name   VMM device heap
      * @{ */
+    /** Pointer to the heap base (MMIO2 ring-3 mapping). NULL if not registered. */
     RTR3PTR                         pvVMMDevHeap;
+    /** The heap size. */
     RTUINT                          cbVMMDevHeap;
+    /** Free space. */
     RTUINT                          cbVMMDevHeapLeft;
+    /** The current mapping. NIL_RTGCPHYS if not mapped or registered. */
     RTGCPHYS                        GCPhysVMMDevHeap;
     /** @} */