Changeset 12772 in vbox for trunk/include

Timestamp:

Sep 26, 2008 4:13:09 PM (16 years ago)

Author:

vboxsync

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

37112

Message:

#1865: IOM.

Location:

trunk/include/VBox

Files:

• iom.h (modified) (3 diffs)
• mm.h (modified) (2 diffs)

trunk/include/VBox/iom.h

@@ -43 +43 @@
 
 /** @def IOM_NO_PDMINS_CHECKS
- * Untill all devices have been fully adjusted to PDM style, the pPdmIns parameter
- * is not checked by IOM.
+ * Until all devices have been fully adjusted to PDM style, the pPdmIns
+ * parameter is not checked by IOM.
+ * @todo Check this again, now.
  */
 #define IOM_NO_PDMINS_CHECKS
@@ -239 +240 @@
                                       R3PTRTYPE(PFNIOMIOPORTOUTSTRING) pfnOutStringCallback, R3PTRTYPE(PFNIOMIOPORTINSTRING) pfnInStringCallback,
                                       const char *pszDesc);
-IOMR3DECL(int)  IOMR3IOPortRegisterGC(PVM pVM, PPDMDEVINS pDevIns, RTIOPORT PortStart, RTUINT cPorts, RTRCPTR pvUser,
+IOMR3DECL(int)  IOMR3IOPortRegisterRC(PVM pVM, PPDMDEVINS pDevIns, RTIOPORT PortStart, RTUINT cPorts, RTRCPTR pvUser,
                                       RCPTRTYPE(PFNIOMIOPORTOUT) pfnOutCallback, RCPTRTYPE(PFNIOMIOPORTIN) pfnInCallback,
                                       RCPTRTYPE(PFNIOMIOPORTOUTSTRING) pfnOutStrCallback, RCPTRTYPE(PFNIOMIOPORTINSTRING) pfnInStrCallback,
@@ -257 +258 @@
                                     R0PTRTYPE(PFNIOMMMIOREAD)  pfnReadCallback,
                                     R0PTRTYPE(PFNIOMMMIOFILL)  pfnFillCallback);
-IOMR3DECL(int)  IOMR3MMIORegisterGC(PVM pVM, PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTUINT cbRange, RTGCPTR pvUser,
+IOMR3DECL(int)  IOMR3MMIORegisterRC(PVM pVM, PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTUINT cbRange, RTGCPTR pvUser,
                                     RCPTRTYPE(PFNIOMMMIOWRITE) pfnWriteCallback,
                                     RCPTRTYPE(PFNIOMMMIOREAD)  pfnReadCallback,

trunk/include/VBox/mm.h

@@ -307 +307 @@
 
 
-/** @def MMHYPER_GC_ASSERT_GCPTR
+/** @def MMHYPER_RC_ASSERT_RCPTR
  * Asserts that an address is either NULL or inside the hypervisor memory area.
  * This assertion only works while IN_GC, it's a NOP everywhere else.
@@ -313 +313 @@
  */
 #ifdef IN_GC
-# define MMHYPER_GC_ASSERT_GCPTR(pVM, GCPtr)   Assert(MMHyperIsInsideArea((pVM), (GCPtr)) || !(GCPtr))
-#else
-# define MMHYPER_GC_ASSERT_GCPTR(pVM, GCPtr)   do { } while (0)
+# define MMHYPER_RC_ASSERT_RCPTR(pVM, RCPtr)   Assert(MMHyperIsInsideArea((pVM), (RTRCUINTPTR)(RCPtr)) || !(RCPtr))
+#else
+# define MMHYPER_RC_ASSERT_RCPTR(pVM, RCPtr)   do { } while (0)
 #endif