Changeset 64387 in vbox for trunk/src/VBox/Devices/Bus/MsiCommon.cpp

Timestamp:

Oct 24, 2016 2:06:02 PM (8 years ago)

Author:

vboxsync

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

111495

Message:

PDM,Devices: Some PCI device type cleanup.

File:

• trunk/src/VBox/Devices/Bus/MsiCommon.cpp (modified) (9 diffs)

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

@@ -27 +27 @@
 #include "PciInline.h"
 
-DECLINLINE(uint16_t) msiGetMessageControl(PPCIDEVICE pDev)
+DECLINLINE(uint16_t) msiGetMessageControl(PPDMPCIDEV pDev)
 {
     uint32_t idxMessageControl = pDev->Int.s.u8MsiCapOffset + VBOX_MSI_CAP_MESSAGE_CONTROL;
@@ -38 +38 @@
 }
 
-DECLINLINE(bool) msiIs64Bit(PPCIDEVICE pDev)
+DECLINLINE(bool) msiIs64Bit(PPDMPCIDEV pDev)
 {
     return pciDevIsMsi64Capable(pDev);
 }
 
-DECLINLINE(uint32_t*) msiGetMaskBits(PPCIDEVICE pDev)
+DECLINLINE(uint32_t*) msiGetMaskBits(PPDMPCIDEV pDev)
 {
     uint8_t iOff = msiIs64Bit(pDev) ? VBOX_MSI_CAP_MASK_BITS_64 : VBOX_MSI_CAP_MASK_BITS_32;
@@ -53 +53 @@
 }
 
-DECLINLINE(uint32_t*) msiGetPendingBits(PPCIDEVICE pDev)
+DECLINLINE(uint32_t*) msiGetPendingBits(PPDMPCIDEV pDev)
 {
     uint8_t iOff = msiIs64Bit(pDev) ? VBOX_MSI_CAP_PENDING_BITS_64 : VBOX_MSI_CAP_PENDING_BITS_32;
@@ -63 +63 @@
 }
 
-DECLINLINE(bool) msiIsEnabled(PPCIDEVICE pDev)
+DECLINLINE(bool) msiIsEnabled(PPDMPCIDEV pDev)
 {
     return (msiGetMessageControl(pDev) & VBOX_PCI_MSI_FLAGS_ENABLE) != 0;
 }
 
-DECLINLINE(uint8_t) msiGetMme(PPCIDEVICE pDev)
+DECLINLINE(uint8_t) msiGetMme(PPDMPCIDEV pDev)
 {
     return (msiGetMessageControl(pDev) & VBOX_PCI_MSI_FLAGS_QSIZE) >> 4;
 }
 
-DECLINLINE(RTGCPHYS) msiGetMsiAddress(PPCIDEVICE pDev)
+DECLINLINE(RTGCPHYS) msiGetMsiAddress(PPDMPCIDEV pDev)
 {
     if (msiIs64Bit(pDev))
@@ -87 +87 @@
 }
 
-DECLINLINE(uint32_t) msiGetMsiData(PPCIDEVICE pDev, int32_t iVector)
+DECLINLINE(uint32_t) msiGetMsiData(PPDMPCIDEV pDev, int32_t iVector)
 {
     int16_t  iOff = msiIs64Bit(pDev) ? VBOX_MSI_CAP_MESSAGE_DATA_64 : VBOX_MSI_CAP_MESSAGE_DATA_32;
@@ -117 +117 @@
 }
 
-void     MsiPciConfigWrite(PPDMDEVINS pDevIns, PCPDMPCIHLP pPciHlp, PPCIDEVICE pDev,
+void     MsiPciConfigWrite(PPDMDEVINS pDevIns, PCPDMPCIHLP pPciHlp, PPDMPCIDEV pDev,
                            uint32_t u32Address, uint32_t val, unsigned len)
 {
@@ -202 +202 @@
 }
 
-uint32_t MsiPciConfigRead (PPDMDEVINS pDevIns, PPCIDEVICE pDev, uint32_t u32Address, unsigned len)
+uint32_t MsiPciConfigRead (PPDMDEVINS pDevIns, PPDMPCIDEV pDev, uint32_t u32Address, unsigned len)
 {
     RT_NOREF1(pDevIns);
@@ -231 +231 @@
 }
 
-int MsiInit(PPCIDEVICE pDev, PPDMMSIREG pMsiReg)
+int MsiInit(PPDMPCIDEV pDev, PPDMMSIREG pMsiReg)
 {
     if (pMsiReg->cMsiVectors == 0)
@@ -284 +284 @@
 
 
-bool     MsiIsEnabled(PPCIDEVICE pDev)
+bool     MsiIsEnabled(PPDMPCIDEV pDev)
 {
     return pciDevIsMsiCapable(pDev) && msiIsEnabled(pDev);
 }
 
-void MsiNotify(PPDMDEVINS pDevIns, PCPDMPCIHLP pPciHlp, PPCIDEVICE pDev, int iVector, int iLevel, uint32_t uTagSrc)
+void MsiNotify(PPDMDEVINS pDevIns, PCPDMPCIHLP pPciHlp, PPDMPCIDEV pDev, int iVector, int iLevel, uint32_t uTagSrc)
 {
     AssertMsg(msiIsEnabled(pDev), ("Must be enabled to use that"));