Changeset 71768 in vbox for trunk/src/VBox/Devices/Bus/DevPciIch9.cpp

Timestamp:

Apr 9, 2018 2:10:52 PM (7 years ago)

Author:

vboxsync

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

121871

Message:

Msi: Some R3 prefixes and some clenaup.

File:

• trunk/src/VBox/Devices/Bus/DevPciIch9.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Bus/DevPciIch9.cpp

@@ -791 +791 @@
     int rc;
 
-    rc = MsiInit(pPciDev, pMsiReg);
+    rc = MsiR3Init(pPciDev, pMsiReg);
     if (RT_FAILURE(rc))
         return rc;
 
-    rc = MsixInit(pPciDev->Int.s.CTX_SUFF(pBus)->CTX_SUFF(pPciHlp), pPciDev, pMsiReg);
+    rc = MsixR3Init(pPciDev->Int.s.CTX_SUFF(pBus)->CTX_SUFF(pPciHlp), pPciDev, pMsiReg);
     if (RT_FAILURE(rc))
         return rc;
@@ -2544 +2544 @@
         if (   pciDevIsMsiCapable(pPciDev)
             && uAddress - (uint32_t)pPciDev->Int.s.u8MsiCapOffset < (uint32_t)pPciDev->Int.s.u8MsiCapSize)
-            MsiPciConfigWrite(pPciDev->Int.s.CTX_SUFF(pBus)->CTX_SUFF(pDevIns),
-                              pPciDev->Int.s.CTX_SUFF(pBus)->CTX_SUFF(pPciHlp),
-                              pPciDev, uAddress, u32Value, cb);
+            MsiR3PciConfigWrite(pPciDev->Int.s.CTX_SUFF(pBus)->CTX_SUFF(pDevIns),
+                                pPciDev->Int.s.CTX_SUFF(pBus)->CTX_SUFF(pPciHlp),
+                                pPciDev, uAddress, u32Value, cb);
         else if (   pciDevIsMsixCapable(pPciDev)
                  && uAddress - (uint32_t)pPciDev->Int.s.u8MsixCapOffset < (uint32_t)pPciDev->Int.s.u8MsixCapSize)
-            MsixPciConfigWrite(pPciDev->Int.s.CTX_SUFF(pBus)->CTX_SUFF(pDevIns),
-                               pPciDev->Int.s.CTX_SUFF(pBus)->CTX_SUFF(pPciHlp),
-                               pPciDev, uAddress, u32Value, cb);
+            MsixR3PciConfigWrite(pPciDev->Int.s.CTX_SUFF(pBus)->CTX_SUFF(pDevIns),
+                                 pPciDev->Int.s.CTX_SUFF(pBus)->CTX_SUFF(pPciHlp),
+                                 pPciDev, uAddress, u32Value, cb);
         else
         {