Changeset 81591 in vbox for trunk/src/VBox/Devices/Audio/DevSB16.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/Audio/DevSB16.cpp (modified) (10 diffs)

trunk/src/VBox/Devices/Audio/DevSB16.cpp

@@ -1677 +1677 @@
     RT_NOREF(pDevIns);
     PSB16STATE pThis = (PSB16STATE)pvUser;
-    Assert(pThis == PDMINS_2_DATA(pDevIns, PSB16STATE));
+    Assert(pThis == PDMDEVINS_2_DATA(pDevIns, PSB16STATE));
     AssertPtr(pThis);
 
@@ -1750 +1750 @@
 {
     RT_NOREF(uPass);
-    PSB16STATE pThis = PDMINS_2_DATA(pDevIns, PSB16STATE);
+    PSB16STATE pThis = PDMDEVINS_2_DATA(pDevIns, PSB16STATE);
 
     SSMR3PutS32(pSSM, pThis->irqCfg);
@@ -1821 +1821 @@
 static DECLCALLBACK(int) sb16SaveExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
 {
-    PSB16STATE pThis = PDMINS_2_DATA(pDevIns, PSB16STATE);
+    PSB16STATE pThis = PDMDEVINS_2_DATA(pDevIns, PSB16STATE);
 
     sb16LiveExec(pDevIns, pSSM, 0);
@@ -1904 +1904 @@
 static DECLCALLBACK(int) sb16LoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass)
 {
-    PSB16STATE pThis = PDMINS_2_DATA(pDevIns, PSB16STATE);
+    PSB16STATE pThis = PDMDEVINS_2_DATA(pDevIns, PSB16STATE);
 
     AssertMsgReturn(    uVersion == SB16_SAVE_STATE_VERSION
@@ -2218 +2218 @@
 static DECLCALLBACK(int) sb16Attach(PPDMDEVINS pDevIns, unsigned uLUN, uint32_t fFlags)
 {
-    PSB16STATE pThis = PDMINS_2_DATA(pDevIns, PSB16STATE);
+    PSB16STATE pThis = PDMDEVINS_2_DATA(pDevIns, PSB16STATE);
 
     LogFunc(("uLUN=%u, fFlags=0x%x\n", uLUN, fFlags));
@@ -2235 +2235 @@
 static DECLCALLBACK(void) sb16Detach(PPDMDEVINS pDevIns, unsigned uLUN, uint32_t fFlags)
 {
-    PSB16STATE pThis = PDMINS_2_DATA(pDevIns, PSB16STATE);
+    PSB16STATE pThis = PDMDEVINS_2_DATA(pDevIns, PSB16STATE);
 
     LogFunc(("uLUN=%u, fFlags=0x%x\n", uLUN, fFlags));
@@ -2334 +2334 @@
 static DECLCALLBACK(void) sb16DevReset(PPDMDEVINS pDevIns)
 {
-    PSB16STATE pThis = PDMINS_2_DATA(pDevIns, PSB16STATE);
+    PSB16STATE pThis = PDMDEVINS_2_DATA(pDevIns, PSB16STATE);
 
     /* Bring back the device to initial state, and especially make
@@ -2369 +2369 @@
 static DECLCALLBACK(void) sb16PowerOff(PPDMDEVINS pDevIns)
 {
-    PSB16STATE pThis = PDMINS_2_DATA(pDevIns, PSB16STATE);
+    PSB16STATE pThis = PDMDEVINS_2_DATA(pDevIns, PSB16STATE);
 
     LogRel2(("SB16: Powering off ...\n"));
@@ -2384 +2384 @@
 {
     PDMDEV_CHECK_VERSIONS_RETURN_QUIET(pDevIns); /* this shall come first */
-    PSB16STATE pThis = PDMINS_2_DATA(pDevIns, PSB16STATE);
+    PSB16STATE pThis = PDMDEVINS_2_DATA(pDevIns, PSB16STATE);
 
     LogFlowFuncEnter();
@@ -2404 +2404 @@
     RT_NOREF(iInstance);
     PDMDEV_CHECK_VERSIONS_RETURN(pDevIns); /* this shall come first */
-    PSB16STATE pThis = PDMINS_2_DATA(pDevIns, PSB16STATE);
+    PSB16STATE pThis = PDMDEVINS_2_DATA(pDevIns, PSB16STATE);
 
     /*