Changeset 12561 in vbox for trunk/include/VBox/pdmdev.h

Timestamp:

Sep 18, 2008 11:54:34 AM (16 years ago)

Author:

vboxsync

Message:

IOM: Made some minor adjustments to the MMIO CPU registration context stuff and added some TODOs for what needs to be done.

File:

• trunk/include/VBox/pdmdev.h (modified) (13 diffs)

trunk/include/VBox/pdmdev.h

@@ -1726 +1726 @@
      * @param   pDevIns             The device instance to register the MMIO with.
      * @param   GCPhysStart         First physical address in the range.
-     * @param   enmCtx              CPU id or MMIO_REGCTX_GLOBAL if it's a global registration (applies to all CPUs)
+     * @param   enmCtx              CPU id or IOMMMIOCTX_GLOBAL if it's a global
+     *                              registration (applies to all CPUs).
      * @param   cbRange             The size of the range (in bytes).
      * @param   pvUser              User argument.
@@ -1734 +1735 @@
      * @param   pszDesc             Pointer to description string. This must not be freed.
      */
-    DECLR3CALLBACKMEMBER(int, pfnMMIORegister,(PPDMDEVINS pDevIns, MMIO_REGISTRATION_CTX enmCtx, RTGCPHYS GCPhysStart, RTUINT cbRange, RTHCPTR pvUser,
+    DECLR3CALLBACKMEMBER(int, pfnMMIORegister,(PPDMDEVINS pDevIns, IOMMMIOCTX enmCtx, RTGCPHYS GCPhysStart, RTUINT cbRange, RTHCPTR pvUser,
                                                PFNIOMMMIOWRITE pfnWrite, PFNIOMMMIOREAD pfnRead, PFNIOMMMIOFILL pfnFill,
                                                const char *pszDesc));
@@ -1747 +1748 @@
      * @returns VBox status.
      * @param   pDevIns             The device instance to register the MMIO with.
-     * @param   enmCtx              CPU id or MMIO_REGCTX_GLOBAL if it's a global registration (applies to all CPUs)
+     * @param   enmCtx              CPU id or IOMMMIOCTX_GLOBAL if it's a global
+     *                              registration (applies to all CPUs).
      * @param   GCPhysStart         First physical address in the range.
      * @param   cbRange             The size of the range (in bytes).
@@ -1757 +1759 @@
      * @todo    Remove pszDesc in the next major revision of PDMDEVHLP.
      */
-    DECLR3CALLBACKMEMBER(int, pfnMMIORegisterGC,(PPDMDEVINS pDevIns, MMIO_REGISTRATION_CTX enmCtx, RTGCPHYS GCPhysStart, RTUINT cbRange, RTGCPTR pvUser,
+    DECLR3CALLBACKMEMBER(int, pfnMMIORegisterGC,(PPDMDEVINS pDevIns, IOMMMIOCTX enmCtx, RTGCPHYS GCPhysStart, RTUINT cbRange, RTGCPTR pvUser,
                                                  const char *pszWrite, const char *pszRead, const char *pszFill,
                                                  const char *pszDesc));
@@ -1769 +1771 @@
      * @returns VBox status.
      * @param   pDevIns             The device instance to register the MMIO with.
-     * @param   enmCtx              CPU id or MMIO_REGCTX_GLOBAL if it's a global registration (applies to all CPUs)
+     * @param   enmCtx              CPU id or IOMMMIOCTX_GLOBAL if it's a global
+     *                              registration (applies to all CPUs).
      * @param   GCPhysStart         First physical address in the range.
      * @param   cbRange             The size of the range (in bytes).
@@ -1779 +1782 @@
      * @todo    Remove pszDesc in the next major revision of PDMDEVHLP.
      */
-    DECLR3CALLBACKMEMBER(int, pfnMMIORegisterR0,(PPDMDEVINS pDevIns, MMIO_REGISTRATION_CTX enmCtx, RTGCPHYS GCPhysStart, RTUINT cbRange, RTR0PTR pvUser,
+    DECLR3CALLBACKMEMBER(int, pfnMMIORegisterR0,(PPDMDEVINS pDevIns, IOMMMIOCTX enmCtx, RTGCPHYS GCPhysStart, RTUINT cbRange, RTR0PTR pvUser,
                                                  const char *pszWrite, const char *pszRead, const char *pszFill,
                                                  const char *pszDesc));
@@ -1790 +1793 @@
      * @returns VBox status.
      * @param   pDevIns             The device instance owning the MMIO region(s).
-     * @param   enmCtx              CPU id or MMIO_REGCTX_GLOBAL if it's a global registration (applies to all CPUs)
+     * @param   enmCtx              CPU id or IOMMMIOCTX_GLOBAL if it's a global registration (applies to all CPUs)
      * @param   GCPhysStart         First physical address in the range.
      * @param   cbRange             The size of the range (in bytes).
      */
-    DECLR3CALLBACKMEMBER(int, pfnMMIODeregister,(PPDMDEVINS pDevIns, MMIO_REGISTRATION_CTX enmCtx, RTGCPHYS GCPhysStart, RTUINT cbRange));
+    DECLR3CALLBACKMEMBER(int, pfnMMIODeregister,(PPDMDEVINS pDevIns, IOMMMIOCTX enmCtx, RTGCPHYS GCPhysStart, RTUINT cbRange));
 
     /**
@@ -3114 +3117 @@
                                       const char *pszDesc)
 {
-    return pDevIns->pDevHlp->pfnMMIORegister(pDevIns, MMIO_REGCTX_GLOBAL, GCPhysStart, cbRange, pvUser, pfnWrite, pfnRead, pfnFill, pszDesc);
+    return pDevIns->pDevHlp->pfnMMIORegister(pDevIns, IOMMMIOCTX_GLOBAL, GCPhysStart, cbRange, pvUser, pfnWrite, pfnRead, pfnFill, pszDesc);
 }
 
@@ -3123 +3126 @@
                                         const char *pszWrite, const char *pszRead, const char *pszFill)
 {
-    return pDevIns->pDevHlp->pfnMMIORegisterGC(pDevIns, MMIO_REGCTX_GLOBAL, GCPhysStart, cbRange, pvUser, pszWrite, pszRead, pszFill, NULL);
+    return pDevIns->pDevHlp->pfnMMIORegisterGC(pDevIns, IOMMMIOCTX_GLOBAL, GCPhysStart, cbRange, pvUser, pszWrite, pszRead, pszFill, NULL);
 }
 
@@ -3132 +3135 @@
                                         const char *pszWrite, const char *pszRead, const char *pszFill)
 {
-    return pDevIns->pDevHlp->pfnMMIORegisterR0(pDevIns, MMIO_REGCTX_GLOBAL, GCPhysStart, cbRange, pvUser, pszWrite, pszRead, pszFill, NULL);
+    return pDevIns->pDevHlp->pfnMMIORegisterR0(pDevIns, IOMMMIOCTX_GLOBAL, GCPhysStart, cbRange, pvUser, pszWrite, pszRead, pszFill, NULL);
 }
 
@@ -3142 +3145 @@
                                       const char *pszDesc)
 {
-    return pDevIns->pDevHlp->pfnMMIORegister(pDevIns, (MMIO_REGISTRATION_CTX)idCPU, GCPhysStart, cbRange, pvUser, pfnWrite, pfnRead, pfnFill, pszDesc);
+    return pDevIns->pDevHlp->pfnMMIORegister(pDevIns, (IOMMMIOCTX)(IOMMMIOCTX_CPU_BASE + idCPU), GCPhysStart, cbRange, pvUser, pfnWrite, pfnRead, pfnFill, pszDesc);
 }
 
@@ -3151 +3154 @@
                                         const char *pszWrite, const char *pszRead, const char *pszFill)
 {
-    return pDevIns->pDevHlp->pfnMMIORegisterGC(pDevIns, (MMIO_REGISTRATION_CTX)idCPU, GCPhysStart, cbRange, pvUser, pszWrite, pszRead, pszFill, NULL);
+    return pDevIns->pDevHlp->pfnMMIORegisterGC(pDevIns, (IOMMMIOCTX)(IOMMMIOCTX_CPU_BASE + idCPU), GCPhysStart, cbRange, pvUser, pszWrite, pszRead, pszFill, NULL);
 }
 
@@ -3160 +3163 @@
                                         const char *pszWrite, const char *pszRead, const char *pszFill)
 {
-    return pDevIns->pDevHlp->pfnMMIORegisterR0(pDevIns, (MMIO_REGISTRATION_CTX)idCPU, GCPhysStart, cbRange, pvUser, pszWrite, pszRead, pszFill, NULL);
+    return pDevIns->pDevHlp->pfnMMIORegisterR0(pDevIns, (IOMMMIOCTX)(IOMMMIOCTX_CPU_BASE + idCPU), GCPhysStart, cbRange, pvUser, pszWrite, pszRead, pszFill, NULL);
 }