Changeset 81432 in vbox for trunk

Timestamp:

Oct 21, 2019 8:13:22 PM (5 years ago)

Author:

vboxsync

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

134150

Message:

DevE1000: Converted to new model (wrt critsects, I/O, and pointers at least). bugref:9218

File:

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

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

@@ -8114 +8114 @@
     PE1KSTATECC pThisCC = PDMINS_2_DATA_CC(pDevIns, PE1KSTATECC);
 
+    /* Initialize context specific state data: */
     pThisCC->CTX_SUFF(pDevIns)      = pDevIns;
     /** @todo @bugref{9218} ring-0 driver stuff */
@@ -8119 +8120 @@
     pThisCC->CTX_SUFF(pTxSg)        = NULL;
 
-    int rc = PDMDevHlpMmioSetUpContext(pDevIns, pThis->hMmioRegion, e1kMMIOWrite, e1kMMIORead, NULL /*pvUser*/);
+    /* Configure critical sections the same way: */
+    int rc = PDMDevHlpSetDeviceCritSect(pDevIns, PDMDevHlpCritSectGetNop(pDevIns));
+    AssertRCReturn(rc, rc);
+
+    /* Set up MMIO and I/O port callbacks for this context: */
+    rc = PDMDevHlpMmioSetUpContext(pDevIns, pThis->hMmioRegion, e1kMMIOWrite, e1kMMIORead, NULL /*pvUser*/);
     AssertRCReturn(rc, rc);
 
@@ -8138 +8144 @@
     /* .uReserved0 = */             0,
     /* .szName = */                 "e1000",
-    /* .fFlags = */                 PDM_DEVREG_FLAGS_DEFAULT_BITS | PDM_DEVREG_FLAGS_RC | PDM_DEVREG_FLAGS_R0,
+    /* .fFlags = */                 PDM_DEVREG_FLAGS_DEFAULT_BITS | PDM_DEVREG_FLAGS_RC | PDM_DEVREG_FLAGS_R0 | PDM_DEVREG_FLAGS_NEW_STYLE,
     /* .fClass = */                 PDM_DEVREG_CLASS_NETWORK,
     /* .cMaxInstances = */          ~0U,