Changeset 81591 in vbox for trunk/src/VBox/ExtPacks

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/ExtPacks/BusMouseSample/BusMouse.cpp (modified) (10 diffs)

trunk/src/VBox/ExtPacks/BusMouseSample/BusMouse.cpp

@@ -245 +245 @@
 {
     RT_NOREF(pvUser);
-    MouState   *pThis = PDMINS_2_DATA(pDevIns, MouState *);
+    MouState   *pThis = PDMDEVINS_2_DATA(pDevIns, MouState *);
     uint8_t     irq_bit;
 
@@ -444 +444 @@
     if (cb == 1)
     {
-        MouState *pThis = PDMINS_2_DATA(pDevIns, MouState *);
+        MouState *pThis = PDMDEVINS_2_DATA(pDevIns, MouState *);
         *pu32 = bms_read_port(pThis, Port & 3);
         Log2(("mouIOPortRead: Port=%#x cb=%d *pu32=%#x\n", Port, cb, *pu32));
@@ -470 +470 @@
     if (cb == 1)
     {
-        MouState *pThis = PDMINS_2_DATA(pDevIns, MouState *);
+        MouState *pThis = PDMDEVINS_2_DATA(pDevIns, MouState *);
         rc = bms_write_port(pThis, Port & 3, u32);
         Log2(("mouIOPortWrite: Port=%#x cb=%d u32=%#x\n", Port, cb, u32));
@@ -490 +490 @@
 static DECLCALLBACK(int) mouSaveExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle)
 {
-    MouState    *pThis = PDMINS_2_DATA(pDevIns, MouState *);
+    MouState    *pThis = PDMDEVINS_2_DATA(pDevIns, MouState *);
 
     /* 8255A state. */
@@ -523 +523 @@
 {
     int         rc;
-    MouState    *pThis = PDMINS_2_DATA(pDevIns, MouState *);
+    MouState    *pThis = PDMDEVINS_2_DATA(pDevIns, MouState *);
 
     Assert(uPass == SSM_PASS_FINAL); NOREF(uPass);
@@ -558 +558 @@
 static DECLCALLBACK(void) mouReset(PPDMDEVINS pDevIns)
 {
-    MouState   *pThis = PDMINS_2_DATA(pDevIns, MouState *);
+    MouState   *pThis = PDMDEVINS_2_DATA(pDevIns, MouState *);
 
     /* Reinitialize the timer. */
@@ -643 +643 @@
 {
     int         rc;
-    MouState   *pThis = PDMINS_2_DATA(pDevIns, MouState *);
+    MouState   *pThis = PDMDEVINS_2_DATA(pDevIns, MouState *);
 
     AssertMsgReturn(fFlags & PDM_TACH_FLAGS_NOT_HOT_PLUG,
@@ -702 +702 @@
      * Reset the interfaces and update the controller state.
      */
-    MouState   *pThis = PDMINS_2_DATA(pDevIns, MouState *);
+    MouState   *pThis = PDMDEVINS_2_DATA(pDevIns, MouState *);
     switch (iLUN)
     {
@@ -727 +727 @@
 {
     RT_NOREF(offDelta);
-    MouState *pThis = PDMINS_2_DATA(pDevIns, MouState *);
+    MouState *pThis = PDMDEVINS_2_DATA(pDevIns, MouState *);
     pThis->pDevInsRC = PDMDEVINS_2_RCPTR(pDevIns);
 }
@@ -739 +739 @@
     RT_NOREF(iInstance);
     PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
-    MouState   *pThis = PDMINS_2_DATA(pDevIns, MouState *);
+    MouState   *pThis = PDMDEVINS_2_DATA(pDevIns, MouState *);
     int         rc;
     bool        fGCEnabled;