Changeset 64393 in vbox for trunk/src/VBox/Devices/PC/DevACPI.cpp

Timestamp:

Oct 24, 2016 2:42:05 PM (8 years ago)

Author:

vboxsync

Message:

PDMPCIDEV: s/config/abConfig/ everywhere, removing the legacy alias.

File:

• trunk/src/VBox/Devices/PC/DevACPI.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/PC/DevACPI.cpp

@@ -793 +793 @@
 {
     return    (pThis->u8SMBusHstCnt & SMBHSTCNT_INTEREN)
-           && (pThis->dev.config[SMBHSTCFG] & SMBHSTCFG_SMB_HST_EN)
-           && (pThis->dev.config[SMBHSTCFG] & SMBHSTCFG_INTRSEL) == SMBHSTCFG_INTRSEL_IRQ9 << SMBHSTCFG_INTRSEL_SHIFT
+           && (pThis->dev.abConfig[SMBHSTCFG] & SMBHSTCFG_SMB_HST_EN)
+           && (pThis->dev.abConfig[SMBHSTCFG] & SMBHSTCFG_INTRSEL) == SMBHSTCFG_INTRSEL_IRQ9 << SMBHSTCFG_INTRSEL_SHIFT
            && (pThis->u8SMBusHstSts & SMBHSTSTS_INT_MASK);
 }
@@ -1927 +1927 @@
 static void acpiR3PmPCIBIOSFake(ACPIState *pThis)
 {
-    pThis->dev.config[PMBA  ] = pThis->uPmIoPortBase | 1; /* PMBA, PM base address, bit 0 marks it as IO range */
-    pThis->dev.config[PMBA+1] = pThis->uPmIoPortBase >> 8;
-    pThis->dev.config[PMBA+2] = 0x00;
-    pThis->dev.config[PMBA+3] = 0x00;
+    pThis->dev.abConfig[PMBA  ] = pThis->uPmIoPortBase | 1; /* PMBA, PM base address, bit 0 marks it as IO range */
+    pThis->dev.abConfig[PMBA+1] = pThis->uPmIoPortBase >> 8;
+    pThis->dev.abConfig[PMBA+2] = 0x00;
+    pThis->dev.abConfig[PMBA+3] = 0x00;
 }
 
@@ -2228 +2228 @@
 static void acpiR3SMBusPCIBIOSFake(ACPIState *pThis)
 {
-    pThis->dev.config[SMBBA  ] = pThis->uSMBusIoPortBase | 1; /* SMBBA, SMBus base address, bit 0 marks it as IO range */
-    pThis->dev.config[SMBBA+1] = pThis->uSMBusIoPortBase >> 8;
-    pThis->dev.config[SMBBA+2] = 0x00;
-    pThis->dev.config[SMBBA+3] = 0x00;
-    pThis->dev.config[SMBHSTCFG] = SMBHSTCFG_INTRSEL_IRQ9 << SMBHSTCFG_INTRSEL_SHIFT | SMBHSTCFG_SMB_HST_EN; /* SMBHSTCFG */
-    pThis->dev.config[SMBSLVC] = 0x00; /* SMBSLVC */
-    pThis->dev.config[SMBSHDW1] = 0x00; /* SMBSHDW1 */
-    pThis->dev.config[SMBSHDW2] = 0x00; /* SMBSHDW2 */
-    pThis->dev.config[SMBREV] = 0x00; /* SMBREV */
+    pThis->dev.abConfig[SMBBA  ] = pThis->uSMBusIoPortBase | 1; /* SMBBA, SMBus base address, bit 0 marks it as IO range */
+    pThis->dev.abConfig[SMBBA+1] = pThis->uSMBusIoPortBase >> 8;
+    pThis->dev.abConfig[SMBBA+2] = 0x00;
+    pThis->dev.abConfig[SMBBA+3] = 0x00;
+    pThis->dev.abConfig[SMBHSTCFG] = SMBHSTCFG_INTRSEL_IRQ9 << SMBHSTCFG_INTRSEL_SHIFT | SMBHSTCFG_SMB_HST_EN; /* SMBHSTCFG */
+    pThis->dev.abConfig[SMBSLVC] = 0x00; /* SMBSLVC */
+    pThis->dev.abConfig[SMBSHDW1] = 0x00; /* SMBSHDW1 */
+    pThis->dev.abConfig[SMBSHDW2] = 0x00; /* SMBSHDW2 */
+    pThis->dev.abConfig[SMBREV] = 0x00; /* SMBREV */
 }
 
@@ -3301 +3301 @@
         RTIOPORT NewIoPortBase = 0;
         /* Check Power Management IO Space Enable (PMIOSE) bit */
-        if (pPciDev->config[PMREGMISC] & 0x01)
+        if (pPciDev->abConfig[PMREGMISC] & 0x01)
         {
             NewIoPortBase = (RTIOPORT)PCIDevGetDWord(pPciDev, PMBA);
@@ -3315 +3315 @@
         RTIOPORT NewIoPortBase = 0;
         /* Check SMBus Controller Host Interface Enable (SMB_HST_EN) bit */
-        if (pPciDev->config[SMBHSTCFG] & SMBHSTCFG_SMB_HST_EN)
+        if (pPciDev->abConfig[SMBHSTCFG] & SMBHSTCFG_SMB_HST_EN)
         {
             NewIoPortBase = (RTIOPORT)PCIDevGetDWord(pPciDev, SMBBA);