Changeset 81424 in vbox for trunk

Timestamp:

Oct 21, 2019 6:10:31 PM (5 years ago)

Author:

vboxsync

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

134141

Message:

DevE1000: VINF_IOM_R3_MMIO_WRITE status code inside #ifndef IN_RING3 as that status code has nothing to do in ring-3. Added 'R3' to the prefix of a bunch of ring-3 functions to make the code simpler to read. bugref:9218

File:

• trunk/src/VBox/Devices/Network/DevE1000.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Network/DevE1000.cpp

@@ -7933 +7933 @@
 # ifndef E1K_NO_TAD
         /* Create Transmit Absolute Delay Timer */
-        rc = PDMDevHlpTimerCreate(pDevIns, TMCLOCK_VIRTUAL, e1kR3TxIntDelayTimer, pThis, TMTIMER_FLAGS_NO_CRIT_SECT,
+        rc = PDMDevHlpTimerCreate(pDevIns, TMCLOCK_VIRTUAL, e1kR3TxAbsDelayTimer, pThis, TMTIMER_FLAGS_NO_CRIT_SECT,
                                   "E1000 Transmit Absolute Delay Timer", &pThis->hTADTimer);
         AssertRCReturn(rc, rc);
@@ -7947 +7947 @@
 
     /* Create Receive Absolute Delay Timer */
-    rc = PDMDevHlpTimerCreate(pDevIns, TMCLOCK_VIRTUAL, e1kR3RxIntDelayTimer, pThis, TMTIMER_FLAGS_NO_CRIT_SECT,
+    rc = PDMDevHlpTimerCreate(pDevIns, TMCLOCK_VIRTUAL, e1kR3RxAbsDelayTimer, pThis, TMTIMER_FLAGS_NO_CRIT_SECT,
                               "E1000 Receive Absolute Delay Timer", &pThis->hRADTimer);
     AssertRCReturn(rc, rc);