vbox的更動 81591 路徑 trunk/src/VBox/Devices/Serial/DevOxPcie958.cpp

時間撮記:

2019-10-30 下午02:14:10 (5 年 以前)

作者:

vboxsync

訊息:

Devices: Use PDMDEVINS_2_DATA and PDMDEVINS_2_DATA. bugref:9218

檔案:

• trunk/src/VBox/Devices/Serial/DevOxPcie958.cpp (修改) (10 筆差異)

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;