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

Timestamp:

Oct 30, 2019 2:14:10 PM (5 years ago)

Author:

vboxsync

Message:

Devices: Use PDMDEVINS_2_DATA and PDMDEVINS_2_DATA. bugref:9218

File:

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

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

@@ -1076 +1076 @@
 static DECLCALLBACK(void) acpiR3PmTimer(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser)
 {
-    ACPIState *pThis = PDMINS_2_DATA(pDevIns, ACPIState *);
+    ACPIState *pThis = PDMDEVINS_2_DATA(pDevIns, ACPIState *);
     Assert(TMTimerIsLockOwner(pTimer));
     RT_NOREF(pvUser);
@@ -1730 +1730 @@
         return VERR_IOM_IOPORT_UNUSED;
 
-    ACPIState *pThis = PDMINS_2_DATA(pDevIns, ACPIState *);
+    ACPIState *pThis = PDMDEVINS_2_DATA(pDevIns, ACPIState *);
 
     /*
@@ -1783 +1783 @@
 {
     RT_NOREF(pszArgs);
-    ACPIState *pThis = PDMINS_2_DATA(pDevIns, ACPIState *);
+    ACPIState *pThis = PDMDEVINS_2_DATA(pDevIns, ACPIState *);
     pHlp->pfnPrintf(pHlp,
                     "timer: old=%08RX32, current=%08RX32\n", pThis->uPmTimeA, pThis->uPmTimeB);
@@ -2496 +2496 @@
 static DECLCALLBACK(int) acpiR3SaveState(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
 {
-    ACPIState *pThis = PDMINS_2_DATA(pDevIns, ACPIState *);
+    ACPIState *pThis = PDMDEVINS_2_DATA(pDevIns, ACPIState *);
     return SSMR3PutStruct(pSSM, pThis, &g_AcpiSavedStateFields8[0]);
 }
@@ -2505 +2505 @@
 static DECLCALLBACK(int) acpiR3LoadState(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass)
 {
-    ACPIState *pThis = PDMINS_2_DATA(pDevIns, ACPIState *);
+    ACPIState *pThis = PDMDEVINS_2_DATA(pDevIns, ACPIState *);
     Assert(uPass == SSM_PASS_FINAL); NOREF(uPass);
 
@@ -3369 +3369 @@
                                                        uint32_t uAddress, unsigned cb, uint32_t u32Value)
 {
-    ACPIState *pThis = PDMINS_2_DATA(pDevIns, ACPIState *);
+    ACPIState *pThis = PDMDEVINS_2_DATA(pDevIns, ACPIState *);
 
     Log2(("acpi: PCI config write: 0x%x -> 0x%x (%d)\n", u32Value, uAddress, cb));
@@ -3430 +3430 @@
 static DECLCALLBACK(int) acpiR3Attach(PPDMDEVINS pDevIns, unsigned iLUN, uint32_t fFlags)
 {
-    ACPIState *pThis = PDMINS_2_DATA(pDevIns, ACPIState *);
+    ACPIState *pThis = PDMDEVINS_2_DATA(pDevIns, ACPIState *);
     LogFlow(("acpiAttach: pDevIns=%p iLUN=%u fFlags=%#x\n", pDevIns, iLUN, fFlags));
 
@@ -3475 +3475 @@
 static DECLCALLBACK(void) acpiR3Detach(PPDMDEVINS pDevIns, unsigned iLUN, uint32_t fFlags)
 {
-    ACPIState *pThis = PDMINS_2_DATA(pDevIns, ACPIState *);
+    ACPIState *pThis = PDMDEVINS_2_DATA(pDevIns, ACPIState *);
 
     LogFlow(("acpiDetach: pDevIns=%p iLUN=%u fFlags=%#x\n", pDevIns, iLUN, fFlags));
@@ -3507 +3507 @@
 static DECLCALLBACK(void) acpiR3Resume(PPDMDEVINS pDevIns)
 {
-    ACPIState *pThis = PDMINS_2_DATA(pDevIns, ACPIState *);
+    ACPIState *pThis = PDMDEVINS_2_DATA(pDevIns, ACPIState *);
     if (pThis->fSetWakeupOnResume)
     {
@@ -3522 +3522 @@
 {
     RT_NOREF1(enmCtx);
-    ACPIState *pThis = PDMINS_2_DATA(pDevIns, ACPIState *);
+    ACPIState *pThis = PDMDEVINS_2_DATA(pDevIns, ACPIState *);
     acpiR3PlantTables(pThis);
 }
@@ -3531 +3531 @@
 static DECLCALLBACK(void) acpiR3Reset(PPDMDEVINS pDevIns)
 {
-    ACPIState *pThis = PDMINS_2_DATA(pDevIns, ACPIState *);
+    ACPIState *pThis = PDMDEVINS_2_DATA(pDevIns, ACPIState *);
 
     /* Play safe: make sure that the IRQ isn't stuck after a reset. */
@@ -3569 +3569 @@
 static DECLCALLBACK(void) acpiR3Relocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta)
 {
-    ACPIState *pThis = PDMINS_2_DATA(pDevIns, ACPIState *);
+    ACPIState *pThis = PDMDEVINS_2_DATA(pDevIns, ACPIState *);
     pThis->pDevInsRC = PDMDEVINS_2_RCPTR(pDevIns);
     pThis->pPmTimerRC = TMTimerRCPtr(pThis->pPmTimerR3);
@@ -3581 +3581 @@
 {
     PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
-    ACPIState *pThis = PDMINS_2_DATA(pDevIns, ACPIState *);
+    ACPIState *pThis = PDMDEVINS_2_DATA(pDevIns, ACPIState *);
     for (uint8_t i = 0; i < pThis->cCustTbls; i++)
     {
@@ -3599 +3599 @@
 {
     PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
-    ACPIState *pThis = PDMINS_2_DATA(pDevIns, ACPIState *);
+    ACPIState *pThis = PDMDEVINS_2_DATA(pDevIns, ACPIState *);
 
     /*