Changeset 64119 in vbox for trunk/src

Timestamp:

Sep 30, 2016 8:39:11 PM (8 years ago)

Author:

vboxsync

Message:

PGM,IOM: doc fixes

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• IOM.cpp (modified) (1 diff)
• PGMPhys.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/VMMR3/IOM.cpp

@@ -1855 +1855 @@
  * @param   pVM             Pointer to the cross context VM structure.
  * @param   pvUser          The pvUserR3 argument of PGMR3PhysMMIOExPreRegister.
- * @param   GCPhys          The mapping address.
  * @remarks Called while owning the PGM lock.
  */

trunk/src/VBox/VMM/VMMR3/PGMPhys.cpp

@@ -2687 +2687 @@
  *                          region. Otherwise it can be any number safe
  *                          UINT8_MAX.
- * @param   cb              The size of the region.  Must be page aligned.
- * @param   fFlags          Reserved for future use, must be zero.
- * @param   ppv             Where to store the pointer to the ring-3 mapping of
- *                          the memory.
+ * @param   cbRegion        The size of the region.  Must be page aligned.
+ * @param   hType           The physical handler callback type.
+ * @param   pvUserR3        User parameter for ring-3 context callbacks.
+ * @param   pvUserR0        User parameter for ring-0 context callbacks.
+ * @param   pvUserRC        User parameter for raw-mode context callbacks.
  * @param   pszDesc         The description.
  *
@@ -2698 +2699 @@
  *          PGMR3PhysMMIOExMap, PGMR3PhysMMIOExUnmap, PGMR3PhysMMIOExDeregister.
  */
-VMMR3DECL(int) PGMR3PhysMMIOExPreRegister(PVM pVM, PPDMDEVINS pDevIns, uint32_t iRegion, RTGCPHYS cb, PGMPHYSHANDLERTYPE hType,
+VMMR3DECL(int) PGMR3PhysMMIOExPreRegister(PVM pVM, PPDMDEVINS pDevIns, uint32_t iRegion, RTGCPHYS cbRegion, PGMPHYSHANDLERTYPE hType,
                                           RTR3PTR pvUserR3, RTR0PTR pvUserR0, RTRCPTR pvUserRC, const char *pszDesc)
 {
@@ -2710 +2711 @@
     AssertReturn(*pszDesc, VERR_INVALID_PARAMETER);
     AssertReturn(pgmR3PhysMMIOExFind(pVM, pDevIns, iRegion) == NULL, VERR_ALREADY_EXISTS);
-    AssertReturn(!(cb & PAGE_OFFSET_MASK), VERR_INVALID_PARAMETER);
-    AssertReturn(cb, VERR_INVALID_PARAMETER);
-
-    const uint32_t cPages = cb >> PAGE_SHIFT;
-    AssertLogRelReturn(((RTGCPHYS)cPages << PAGE_SHIFT) == cb, VERR_INVALID_PARAMETER);
+    AssertReturn(!(cbRegion & PAGE_OFFSET_MASK), VERR_INVALID_PARAMETER);
+    AssertReturn(cbRegion, VERR_INVALID_PARAMETER);
+
+    const uint32_t cPages = cbRegion >> PAGE_SHIFT;
+    AssertLogRelReturn(((RTGCPHYS)cPages << PAGE_SHIFT) == cbRegion, VERR_INVALID_PARAMETER);
     AssertLogRelReturn(cPages <= PGM_MMIO2_MAX_PAGE_COUNT, VERR_OUT_OF_RANGE);
 
@@ -2738 +2739 @@
          */
         PPGMREGMMIORANGE pNew;
-        rc = pgmR3PhysMMIOExCreate(pVM, pDevIns, iRegion, cb, pszDesc, &pNew);
+        rc = pgmR3PhysMMIOExCreate(pVM, pDevIns, iRegion, cbRegion, pszDesc, &pNew);
         if (RT_SUCCESS(rc))
         {