Changeset 81468 in vbox

Timestamp:

Oct 23, 2019 1:24:09 AM (5 years ago)

Author:

vboxsync

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

134193

Message:

DevE1000: Use device helers for critical sections (pDevIns will be needed later). bugref:9218

File:

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

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

@@ -1655 +1655 @@
 #endif /* IN_RING3 */
 
-#define e1kCsEnter(ps, rc) PDMCritSectEnter(&ps->cs, rc)
-#define e1kCsLeave(ps) PDMCritSectLeave(&ps->cs)
-
-#define e1kCsRxEnter(ps, rc) PDMCritSectEnter(&ps->csRx, rc)
-#define e1kCsRxLeave(ps) PDMCritSectLeave(&ps->csRx)
-#define e1kCsRxIsOwner(ps) PDMCritSectIsOwner(&ps->csRx)
+#define e1kCsEnter(ps, rc) PDMDevHlpCritSectEnter(pDevIns, &ps->cs, rc)
+#define e1kCsLeave(ps) PDMDevHlpCritSectLeave(pDevIns, &ps->cs)
+
+#define e1kCsRxEnter(ps, rc) PDMDevHlpCritSectEnter(pDevIns, &ps->csRx, rc)
+#define e1kCsRxLeave(ps) PDMDevHlpCritSectLeave(pDevIns, &ps->csRx)
+#define e1kCsRxIsOwner(ps) PDMDevHlpCritSectIsOwner(pDevIns, &ps->csRx)
 
 #ifndef E1K_WITH_TX_CS
@@ -1666 +1666 @@
 # define e1kCsTxLeave(ps) do { } while (0)
 #else /* E1K_WITH_TX_CS */
-# define e1kCsTxEnter(ps, rc) PDMCritSectEnter(&ps->csTx, rc)
-# define e1kCsTxLeave(ps) PDMCritSectLeave(&ps->csTx)
+# define e1kCsTxEnter(ps, rc) PDMDevHlpCritSectEnter(pDevIns, &ps->csTx, rc)
+# define e1kCsTxLeave(ps) PDMDevHlpCritSectLeave(pDevIns, &ps->csTx)
 #endif /* E1K_WITH_TX_CS */
 
@@ -1789 +1789 @@
  * Dump a packet to debug log.
  *
+ * @param   pDevIns     The device instance.
  * @param   pThis       The device state structure.
  * @param   cpPacket    The packet.
@@ -1795 +1796 @@
  * @thread  E1000_TX
  */
-DECLINLINE(void) e1kPacketDump(PE1KSTATE pThis, const uint8_t *cpPacket, size_t cb, const char *pszText)
+DECLINLINE(void) e1kPacketDump(PPDMDEVINS pDevIns, PE1KSTATE pThis, const uint8_t *cpPacket, size_t cb, const char *pszText)
 {
 #ifdef DEBUG
@@ -4089 +4090 @@
     if (pSg && pSg->pvAllocator != pThis)
     {
-        e1kPacketDump(pThis, (uint8_t const *)pSg->aSegs[0].pvSeg, cbFrame, "--> Outgoing");
+        e1kPacketDump(pDevIns, pThis, (uint8_t const *)pSg->aSegs[0].pvSeg, cbFrame, "--> Outgoing");
 
         pThisCC->CTX_SUFF(pTxSg) = NULL;
@@ -4106 +4107 @@
     {
         Assert(pSg->aSegs[0].pvSeg == pThis->aTxPacketFallback);
-        e1kPacketDump(pThis, (uint8_t const *)pSg->aSegs[0].pvSeg, cbFrame, "--> Loopback");
+        e1kPacketDump(pDevIns, pThis, (uint8_t const *)pSg->aSegs[0].pvSeg, cbFrame, "--> Loopback");
 
         /** @todo do we actually need to check that we're in loopback mode here? */
@@ -6708 +6709 @@
     //    return VERR_PERMISSION_DENIED;
 
-    e1kPacketDump(pThis, (const uint8_t*)pvBuf, cb, "<-- Incoming");
+    e1kPacketDump(pDevIns, pThis, (const uint8_t*)pvBuf, cb, "<-- Incoming");
 
     /* Update stats */
@@ -7445 +7446 @@
     AssertLogRelReturnVoid(iLUN == 0);
 
-    PDMCritSectEnter(&pThis->cs, VERR_SEM_BUSY);
+    PDMDevHlpCritSectEnter(pDevIns, &pThis->cs, VERR_SEM_BUSY);
 
     /** @todo r=pritesh still need to check if i missed
@@ -7461 +7462 @@
 #endif
 
-    PDMCritSectLeave(&pThis->cs);
+    PDMDevHlpCritSectLeave(pDevIns, &pThis->cs);
 }
 
@@ -7485 +7486 @@
     AssertLogRelReturn(iLUN == 0, VERR_PDM_NO_SUCH_LUN);
 
-    PDMCritSectEnter(&pThis->cs, VERR_SEM_BUSY);
+    PDMDevHlpCritSectEnter(pDevIns, &pThis->cs, VERR_SEM_BUSY);
 
     /*
@@ -7529 +7530 @@
         e1kR3LinkDownTemp(pDevIns, pThis, pThisCC);
 
-    PDMCritSectLeave(&pThis->cs);
+    PDMDevHlpCritSectLeave(pDevIns, &pThis->cs);
     return rc;
-
 }
 
@@ -7615 +7615 @@
     e1kDumpState(pThis);
     E1kLog(("%s Destroying instance\n", pThis->szPrf));
-    if (PDMCritSectIsInitialized(&pThis->cs))
+    if (PDMDevHlpCritSectIsInitialized(pDevIns, &pThis->cs))
     {
         if (pThis->hEventMoreRxDescAvail != NIL_SUPSEMEVENT)
@@ -7625 +7625 @@
         }
 #ifdef E1K_WITH_TX_CS
-        PDMR3CritSectDelete(&pThis->csTx);
+        PDMDevHlpCritSectDelete(pDevIns, &pThis->csTx);
 #endif /* E1K_WITH_TX_CS */
-        PDMR3CritSectDelete(&pThis->csRx);
-        PDMR3CritSectDelete(&pThis->cs);
+        PDMDevHlpCritSectDelete(pDevIns, &pThis->csRx);
+        PDMDevHlpCritSectDelete(pDevIns, &pThis->cs);
     }
     return VINF_SUCCESS;