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

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

Location:

trunk/src/VBox/Devices/Serial

Files:

• DevOxPcie958.cpp (modified) (10 diffs)
• DevSerial.cpp (modified) (13 diffs)

trunk/src/VBox/Devices/Serial/DevOxPcie958.cpp

@@ -216 +216 @@
 {
     RT_NOREF(pUart);
-    PDEVOX958 pThis = PDMINS_2_DATA(pDevIns, PDEVOX958);
+    PDEVOX958 pThis = PDMDEVINS_2_DATA(pDevIns, PDEVOX958);
 
     if (iLvl)
@@ -238 +238 @@
 PDMBOTHCBDECL(int) ox958MmioRead(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, void *pv, unsigned cb)
 {
-    PDEVOX958 pThis = PDMINS_2_DATA(pDevIns, PDEVOX958);
+    PDEVOX958 pThis = PDMDEVINS_2_DATA(pDevIns, PDEVOX958);
     uint32_t  offReg = (GCPhysAddr - pThis->GCPhysMMIO);
     int       rc = VINF_SUCCESS;
@@ -308 +308 @@
 PDMBOTHCBDECL(int) ox958MmioWrite(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, void const *pv, unsigned cb)
 {
-    PDEVOX958 pThis = PDMINS_2_DATA(pDevIns, PDEVOX958);
+    PDEVOX958 pThis = PDMDEVINS_2_DATA(pDevIns, PDEVOX958);
     uint32_t  offReg = (GCPhysAddr - pThis->GCPhysMMIO);
     int       rc = VINF_SUCCESS;
@@ -367 +367 @@
                                     RTGCPHYS GCPhysAddress, RTGCPHYS cb, PCIADDRESSSPACE enmType)
 {
-    PDEVOX958 pThis = PDMINS_2_DATA(pDevIns, PDEVOX958);
+    PDEVOX958 pThis = PDMDEVINS_2_DATA(pDevIns, PDEVOX958);
     int       rc    = VINF_SUCCESS;
     RT_NOREF(pPciDev, enmType);
@@ -409 +409 @@
 static DECLCALLBACK(void) ox958R3Detach(PPDMDEVINS pDevIns, unsigned iLUN, uint32_t fFlags)
 {
-    PDEVOX958 pThis = PDMINS_2_DATA(pDevIns, PDEVOX958);
+    PDEVOX958 pThis = PDMDEVINS_2_DATA(pDevIns, PDEVOX958);
     AssertReturnVoid(iLUN >= pThis->cUarts);
 
@@ -421 +421 @@
 static DECLCALLBACK(int) ox958R3Attach(PPDMDEVINS pDevIns, unsigned iLUN, uint32_t fFlags)
 {
-    PDEVOX958 pThis = PDMINS_2_DATA(pDevIns, PDEVOX958);
+    PDEVOX958 pThis = PDMDEVINS_2_DATA(pDevIns, PDEVOX958);
 
     RT_NOREF(fFlags);
@@ -435 +435 @@
 static DECLCALLBACK(void) ox958R3Reset(PPDMDEVINS pDevIns)
 {
-    PDEVOX958 pThis = PDMINS_2_DATA(pDevIns, PDEVOX958);
+    PDEVOX958 pThis = PDMDEVINS_2_DATA(pDevIns, PDEVOX958);
 
     pThis->u32RegIrqStsGlob = 0x00;
@@ -449 +449 @@
 static DECLCALLBACK(void) ox958R3Relocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta)
 {
-    PDEVOX958 pThis = PDMINS_2_DATA(pDevIns, PDEVOX958);
+    PDEVOX958 pThis = PDMDEVINS_2_DATA(pDevIns, PDEVOX958);
     RT_NOREF(offDelta);
 
@@ -461 +461 @@
 static DECLCALLBACK(int) ox958R3Destruct(PPDMDEVINS pDevIns)
 {
-    PDEVOX958 pThis = PDMINS_2_DATA(pDevIns, PDEVOX958);
+    PDEVOX958 pThis = PDMDEVINS_2_DATA(pDevIns, PDEVOX958);
     PDMDEV_CHECK_VERSIONS_RETURN_QUIET(pDevIns);
 
@@ -475 +475 @@
 {
     RT_NOREF(iInstance);
-    PDEVOX958   pThis = PDMINS_2_DATA(pDevIns, PDEVOX958);
+    PDEVOX958   pThis = PDMDEVINS_2_DATA(pDevIns, PDEVOX958);
     bool        fRCEnabled = true;
     bool        fR0Enabled = true;

trunk/src/VBox/Devices/Serial/DevSerial.cpp

@@ -76 +76 @@
 {
     RT_NOREF(pUart, iLUN);
-    PDEVSERIAL pThis = PDMINS_2_DATA(pDevIns, PDEVSERIAL);
+    PDEVSERIAL pThis = PDMDEVINS_2_DATA(pDevIns, PDEVSERIAL);
     PDMDevHlpISASetIrqNoWait(pDevIns, pThis->uIrq, iLvl);
 }
@@ -88 +88 @@
 PDMBOTHCBDECL(int) serialIoPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t u32, unsigned cb)
 {
-    PDEVSERIAL pThis = PDMINS_2_DATA(pDevIns, PDEVSERIAL);
+    PDEVSERIAL pThis = PDMDEVINS_2_DATA(pDevIns, PDEVSERIAL);
     RT_NOREF_PV(pvUser);
 
@@ -100 +100 @@
 PDMBOTHCBDECL(int) serialIoPortRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t *pu32, unsigned cb)
 {
-    PDEVSERIAL pThis = PDMINS_2_DATA(pDevIns, PDEVSERIAL);
+    PDEVSERIAL pThis = PDMDEVINS_2_DATA(pDevIns, PDEVSERIAL);
     RT_NOREF_PV(pvUser);
 
@@ -138 +138 @@
 {
     RT_NOREF(uPass);
-    PDEVSERIAL pThis = PDMINS_2_DATA(pDevIns, PDEVSERIAL);
+    PDEVSERIAL pThis = PDMDEVINS_2_DATA(pDevIns, PDEVSERIAL);
     SSMR3PutU8(pSSM, pThis->uIrq);
     SSMR3PutIOPort(pSSM, pThis->PortBase);
@@ -152 +152 @@
 static DECLCALLBACK(int) serialR3SaveExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
 {
-    PDEVSERIAL pThis = PDMINS_2_DATA(pDevIns, PDEVSERIAL);
+    PDEVSERIAL pThis = PDMDEVINS_2_DATA(pDevIns, PDEVSERIAL);
 
     SSMR3PutU8(    pSSM, pThis->uIrq);
@@ -168 +168 @@
 static DECLCALLBACK(int) serialR3LoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass)
 {
-    PDEVSERIAL pThis = PDMINS_2_DATA(pDevIns, PDEVSERIAL);
+    PDEVSERIAL pThis = PDMDEVINS_2_DATA(pDevIns, PDEVSERIAL);
     uint8_t    bIrq;
     RTIOPORT   PortBase;
@@ -236 +236 @@
 static DECLCALLBACK(int) serialR3LoadDone(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
 {
-    PDEVSERIAL  pThis = PDMINS_2_DATA(pDevIns, PDEVSERIAL);
+    PDEVSERIAL  pThis = PDMDEVINS_2_DATA(pDevIns, PDEVSERIAL);
     return uartR3LoadDone(&pThis->UartCore, pSSM);
 }
@@ -248 +248 @@
 static DECLCALLBACK(void) serialR3Relocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta)
 {
-    PDEVSERIAL pThis = PDMINS_2_DATA(pDevIns, PDEVSERIAL);
+    PDEVSERIAL pThis = PDMDEVINS_2_DATA(pDevIns, PDEVSERIAL);
     uartR3Relocate(&pThis->UartCore, offDelta);
 }
@@ -258 +258 @@
 static DECLCALLBACK(void) serialR3Reset(PPDMDEVINS pDevIns)
 {
-    PDEVSERIAL pThis = PDMINS_2_DATA(pDevIns, PDEVSERIAL);
+    PDEVSERIAL pThis = PDMDEVINS_2_DATA(pDevIns, PDEVSERIAL);
     uartR3Reset(&pThis->UartCore);
 }
@@ -269 +269 @@
 {
     RT_NOREF(fFlags);
-    PDEVSERIAL pThis = PDMINS_2_DATA(pDevIns, PDEVSERIAL);
+    PDEVSERIAL pThis = PDMDEVINS_2_DATA(pDevIns, PDEVSERIAL);
     return uartR3Attach(&pThis->UartCore, iLUN);
 }
@@ -280 +280 @@
 {
     RT_NOREF(iLUN, fFlags);
-    PDEVSERIAL pThis = PDMINS_2_DATA(pDevIns, PDEVSERIAL);
+    PDEVSERIAL pThis = PDMDEVINS_2_DATA(pDevIns, PDEVSERIAL);
     uartR3Detach(&pThis->UartCore);
 }
@@ -290 +290 @@
 static DECLCALLBACK(int) serialR3Destruct(PPDMDEVINS pDevIns)
 {
-    PDEVSERIAL pThis = PDMINS_2_DATA(pDevIns, PDEVSERIAL);
+    PDEVSERIAL pThis = PDMDEVINS_2_DATA(pDevIns, PDEVSERIAL);
     PDMDEV_CHECK_VERSIONS_RETURN_QUIET(pDevIns);
 
@@ -303 +303 @@
 static DECLCALLBACK(int) serialR3Construct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
 {
-    PDEVSERIAL pThis = PDMINS_2_DATA(pDevIns, PDEVSERIAL);
+    PDEVSERIAL pThis = PDMDEVINS_2_DATA(pDevIns, PDEVSERIAL);
     int        rc = VINF_SUCCESS;