Changeset 81591 in vbox for trunk/src/VBox/Devices/Parallel

Timestamp:

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

Author:

vboxsync

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

134346

Message:

Devices: Use PDMDEVINS_2_DATA and PDMDEVINS_2_DATA. bugref:9218

File:

• trunk/src/VBox/Devices/Parallel/DevParallel.cpp (modified) (9 diffs)

trunk/src/VBox/Devices/Parallel/DevParallel.cpp

@@ -321 +321 @@
 PDMBOTHCBDECL(int) parallelIOPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t u32, unsigned cb)
 {
-    PARALLELPORT *pThis = PDMINS_2_DATA(pDevIns, PPARALLELPORT);
+    PARALLELPORT *pThis = PDMDEVINS_2_DATA(pDevIns, PPARALLELPORT);
     int           rc = VINF_SUCCESS;
     RT_NOREF_PV(pvUser);
@@ -428 +428 @@
 PDMBOTHCBDECL(int) parallelIOPortRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t *pu32, unsigned cb)
 {
-    PARALLELPORT *pThis = PDMINS_2_DATA(pDevIns, PARALLELPORT *);
+    PARALLELPORT *pThis = PDMDEVINS_2_DATA(pDevIns, PARALLELPORT *);
     int           rc = VINF_SUCCESS;
     RT_NOREF_PV(pvUser);
@@ -531 +531 @@
 PDMBOTHCBDECL(int) parallelIOPortWriteECP(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb)
 {
-    PARALLELPORT *pThis = PDMINS_2_DATA(pDevIns, PARALLELPORT *);
+    PARALLELPORT *pThis = PDMDEVINS_2_DATA(pDevIns, PARALLELPORT *);
     int            rc = VINF_SUCCESS;
 
@@ -550 +550 @@
 PDMBOTHCBDECL(int) parallelIOPortReadECP(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)
 {
-    PARALLELPORT *pThis = PDMINS_2_DATA(pDevIns, PARALLELPORT *);
+    PARALLELPORT *pThis = PDMDEVINS_2_DATA(pDevIns, PARALLELPORT *);
     int           rc = VINF_SUCCESS;
 
@@ -573 +573 @@
 {
     RT_NOREF(uPass);
-    PARALLELPORT *pThis = PDMINS_2_DATA(pDevIns, PARALLELPORT *);
+    PARALLELPORT *pThis = PDMDEVINS_2_DATA(pDevIns, PARALLELPORT *);
 
     SSMR3PutS32(pSSM, pThis->iIrq);
@@ -587 +587 @@
 static DECLCALLBACK(int) parallelR3SaveExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
 {
-    PARALLELPORT *pThis = PDMINS_2_DATA(pDevIns, PARALLELPORT *);
+    PARALLELPORT *pThis = PDMDEVINS_2_DATA(pDevIns, PARALLELPORT *);
 
     SSMR3PutU8(pSSM, pThis->regData);
@@ -603 +603 @@
 static DECLCALLBACK(int) parallelR3LoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass)
 {
-    PARALLELPORT *pThis = PDMINS_2_DATA(pDevIns, PARALLELPORT *);
+    PARALLELPORT *pThis = PDMDEVINS_2_DATA(pDevIns, PARALLELPORT *);
 
     AssertMsgReturn(uVersion == PARALLEL_SAVED_STATE_VERSION, ("%d\n", uVersion), VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION);
@@ -656 +656 @@
 static DECLCALLBACK(void) parallelR3Relocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta)
 {
-    PARALLELPORT *pThis = PDMINS_2_DATA(pDevIns, PARALLELPORT *);
+    PARALLELPORT *pThis = PDMDEVINS_2_DATA(pDevIns, PARALLELPORT *);
     pThis->pDevInsRC += offDelta;
 }
@@ -668 +668 @@
     PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
     int            rc;
-    PARALLELPORT *pThis = PDMINS_2_DATA(pDevIns, PARALLELPORT*);
+    PARALLELPORT *pThis = PDMDEVINS_2_DATA(pDevIns, PARALLELPORT*);
 
     Assert(iInstance < 4);