Changeset 64451 in vbox for trunk

Timestamp:

Oct 28, 2016 10:14:32 AM (8 years ago)

Author:

vboxsync

Message:

DevPci: Share the pfnSetConfigCallbacksR3 implementation.

Location:

trunk/src/VBox/Devices/Bus

Files:

• DevPCI.cpp (modified) (3 diffs)
• DevPciIch9.cpp (modified) (4 diffs)
• DevPciInternal.h (modified) (1 diff)

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

@@ -1511 +1511 @@
 
 /**
- * @interface_method_impl{PDMPCIBUSREG,pfnSetConfigCallbacksR3}
- */
-static DECLCALLBACK(void)
-pciR3CommonSetConfigCallbacks(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev, PFNPCICONFIGREAD pfnRead, PPFNPCICONFIGREAD ppfnReadOld,
-                              PFNPCICONFIGWRITE pfnWrite, PPFNPCICONFIGWRITE ppfnWriteOld)
-{
-    NOREF(pDevIns);
-
-    if (ppfnReadOld)
-        *ppfnReadOld = pPciDev->Int.s.pfnConfigRead;
-    pPciDev->Int.s.pfnConfigRead  = pfnRead;
-
-    if (ppfnWriteOld)
-        *ppfnWriteOld = pPciDev->Int.s.pfnConfigWrite;
-    pPciDev->Int.s.pfnConfigWrite = pfnWrite;
-}
-
-
-/**
  * @interface_method_impl{PDMPCIBUSREG,pfnFakePCIBIOSR3}
  */
@@ -1695 +1676 @@
     PciBusReg.pfnRegisterMsiR3        = NULL;
     PciBusReg.pfnIORegionRegisterR3   = devpciR3CommonIORegionRegister;
-    PciBusReg.pfnSetConfigCallbacksR3 = pciR3CommonSetConfigCallbacks;
+    PciBusReg.pfnSetConfigCallbacksR3 = devpciR3CommonSetConfigCallbacks;
     PciBusReg.pfnSetIrqR3             = pciSetIrq;
     PciBusReg.pfnFakePCIBIOSR3        = pciR3FakePCIBIOS;
@@ -2032 +2013 @@
     PciBusReg.pfnRegisterMsiR3        = NULL;
     PciBusReg.pfnIORegionRegisterR3   = devpciR3CommonIORegionRegister;
-    PciBusReg.pfnSetConfigCallbacksR3 = pciR3CommonSetConfigCallbacks;
+    PciBusReg.pfnSetConfigCallbacksR3 = devpciR3CommonSetConfigCallbacks;
     PciBusReg.pfnSetIrqR3             = pcibridgeSetIrq;
     PciBusReg.pfnFakePCIBIOSR3        = NULL; /* Only needed for the first bus. */

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

@@ -946 +946 @@
 }
 
-static DECLCALLBACK(void) ich9pciSetConfigCallbacks(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev, PFNPCICONFIGREAD pfnRead, PPFNPCICONFIGREAD ppfnReadOld,
+
+/**
+ * @interface_method_impl{PDMPCIBUSREG,pfnSetConfigCallbacksR3}
+ */
+DECLCALLBACK(void) devpciR3CommonSetConfigCallbacks(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev,
+                                                    PFNPCICONFIGREAD pfnRead, PPFNPCICONFIGREAD ppfnReadOld,
                                                     PFNPCICONFIGWRITE pfnWrite, PPFNPCICONFIGWRITE ppfnWriteOld)
 {
@@ -959 +964 @@
     pPciDev->Int.s.pfnConfigWrite = pfnWrite;
 }
+
 
 static int ich9pciR3CommonSaveExec(PDEVPCIBUS pBus, PSSMHANDLE pSSM)
@@ -2400 +2406 @@
     PciBusReg.pfnRegisterMsiR3        = ich9pciRegisterMsi;
     PciBusReg.pfnIORegionRegisterR3   = devpciR3CommonIORegionRegister;
-    PciBusReg.pfnSetConfigCallbacksR3 = ich9pciSetConfigCallbacks;
+    PciBusReg.pfnSetConfigCallbacksR3 = devpciR3CommonSetConfigCallbacks;
     PciBusReg.pfnSetIrqR3             = ich9pciSetIrq;
     PciBusReg.pfnFakePCIBIOSR3        = ich9pciFakePCIBIOS;
@@ -2672 +2678 @@
     PciBusReg.pfnRegisterMsiR3        = ich9pciRegisterMsi;
     PciBusReg.pfnIORegionRegisterR3   = devpciR3CommonIORegionRegister;
-    PciBusReg.pfnSetConfigCallbacksR3 = ich9pciSetConfigCallbacks;
+    PciBusReg.pfnSetConfigCallbacksR3 = devpciR3CommonSetConfigCallbacks;
     PciBusReg.pfnSetIrqR3             = ich9pcibridgeSetIrq;
     PciBusReg.pfnFakePCIBIOSR3        = NULL; /* Only needed for the first bus. */

trunk/src/VBox/Devices/Bus/DevPciInternal.h

@@ -187 +187 @@
 DECLCALLBACK(int)  devpciR3CommonIORegionRegister(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev, int iRegion, RTGCPHYS cbRegion,
                                                   PCIADDRESSSPACE enmType, PFNPCIIOREGIONMAP pfnCallback);
+DECLCALLBACK(void) devpciR3CommonSetConfigCallbacks(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev,
+                                                    PFNPCICONFIGREAD pfnRead, PPFNPCICONFIGREAD ppfnReadOld,
+                                                    PFNPCICONFIGWRITE pfnWrite, PPFNPCICONFIGWRITE ppfnWriteOld);
 
 #endif