Changeset 71770 in vbox

Timestamp:

Apr 9, 2018 2:22:03 PM (7 years ago)

Author:

vboxsync

Message:

Msi: Some R3 prefixes and some clenaup. [build fix]

File:

• trunk/src/VBox/Devices/Bus/MsixCommon.cpp (modified) (4 diffs)

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

@@ -56 +56 @@
 }
 
+#ifdef IN_RING3
 DECLINLINE(uint16_t)  msixTableSize(PPDMPCIDEV pDev)
 {
     return (msixGetMessageControl(pDev) & 0x3ff) + 1;
 }
-
-DECLINLINE(uint8_t*)  msixGetPageOffset(PPDMPCIDEV pDev, uint32_t off)
-{
-    return (uint8_t*)pDev->Int.s.CTX_SUFF(pMsixPage) + off;
-}
-
-DECLINLINE(MsixTableRecord*) msixGetVectorRecord(PPDMPCIDEV pDev, uint32_t iVector)
-{
-    return (MsixTableRecord*)msixGetPageOffset(pDev, iVector * VBOX_MSIX_ENTRY_SIZE);
+#endif
+
+DECLINLINE(uint8_t *) msixGetPageOffset(PPDMPCIDEV pDev, uint32_t off)
+{
+    return (uint8_t *)pDev->Int.s.CTX_SUFF(pMsixPage) + off;
+}
+
+DECLINLINE(MsixTableRecord *) msixGetVectorRecord(PPDMPCIDEV pDev, uint32_t iVector)
+{
+    return (MsixTableRecord *)msixGetPageOffset(pDev, iVector * VBOX_MSIX_ENTRY_SIZE);
 }
 
 DECLINLINE(RTGCPHYS)  msixGetMsiAddress(PPDMPCIDEV pDev, uint32_t iVector)
 {
-    MsixTableRecord* pRec = msixGetVectorRecord(pDev, iVector);
+    MsixTableRecord *pRec = msixGetVectorRecord(pDev, iVector);
     return RT_MAKE_U64(pRec->u32MsgAddressLo & ~UINT32_C(0x3), pRec->u32MsgAddressHi);
 }
@@ -87 +89 @@
 }
 
-DECLINLINE(uint8_t*)  msixPendingByte(PPDMPCIDEV pDev, uint32_t iVector)
+DECLINLINE(uint8_t *) msixPendingByte(PPDMPCIDEV pDev, uint32_t iVector)
 {
     return msixGetPageOffset(pDev, pDev->Int.s.offMsixPba + iVector / 8);
@@ -136 +138 @@
 }
 
-PDMBOTHCBDECL(int) msixR3MMIOWrite(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, void const *pv, unsigned cb)
+PDMBOTHCBDECL(int,) msixR3MMIOWrite(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, void const *pv, unsigned cb)
 {
     LogFlowFunc(("\n"));
@@ -244 +246 @@
     return VINF_SUCCESS;
 }
-#endif
+
+#endif /* IN_RING3 */
 
 bool MsixIsEnabled(PPDMPCIDEV pDev)