Changeset 7320 in vbox

Timestamp:

Mar 6, 2008 1:46:50 PM (17 years ago)

Author:

vboxsync

Message:

pcnet: fix for r28728

File:

• trunk/src/VBox/Devices/Network/DevPCNet.cpp (modified) (16 diffs)

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

@@ -601 +601 @@
  * @param addr          physical address of the descriptor
  * @param fRetIfNotOwn  return immediately after reading the own flag if we don't own the descriptor
- */
-DECLINLINE(void) pcnetTmdLoad(PCNetState *pData, TMD *tmd, RTGCPHYS32 addr, bool fRetIfNotOwn)
+ * @return              true if we own the descriptor, false otherwise
+ */
+DECLINLINE(bool) pcnetTmdLoad(PCNetState *pData, TMD *tmd, RTGCPHYS32 addr, bool fRetIfNotOwn)
 {
     PPDMDEVINS pDevIns = PCNETSTATE_2_DEVINS(pData);
@@ -613 +614 @@
         PDMDevHlpPhysRead(pDevIns, addr+3, &ownbyte, 1);
         if (!(ownbyte & 0x80) && fRetIfNotOwn)
-            return;
+            return false;
         PDMDevHlpPhysRead(pDevIns, addr, (void*)&xda[0], sizeof(xda));
         ((uint32_t *)tmd)[0] = (uint32_t)xda[0] | ((uint32_t)(xda[1] & 0x00ff) << 16);
@@ -624 +625 @@
         PDMDevHlpPhysRead(pDevIns, addr+7, &ownbyte, 1);
         if (!(ownbyte & 0x80) && fRetIfNotOwn)
-            return;
+            return false;
         PDMDevHlpPhysRead(pDevIns, addr, (void*)tmd, 16);
     }
@@ -632 +633 @@
         PDMDevHlpPhysRead(pDevIns, addr+7, &ownbyte, 1);
         if (!(ownbyte & 0x80) && fRetIfNotOwn)
-            return;
+            return false;
         PDMDevHlpPhysRead(pDevIns, addr, (void*)&xda[0], sizeof(xda));
         ((uint32_t *)tmd)[0] = xda[2];
@@ -646 +647 @@
     if (!(ownbyte & 0x80))
         tmd->tmd1.own = 0;
+
+    return !!tmd->tmd1.own;
 }
 
@@ -697 +700 @@
  * @param addr          physical address of the descriptor
  * @param fRetIfNotOwn  return immediately after reading the own flag if we don't own the descriptor
- */
-DECLINLINE(void) pcnetRmdLoad(PCNetState *pData, RMD *rmd, RTGCPHYS32 addr, bool fRetIfNotOwn)
+ * @return              true if we own the descriptor, false otherwise
+ */
+DECLINLINE(int) pcnetRmdLoad(PCNetState *pData, RMD *rmd, RTGCPHYS32 addr, bool fRetIfNotOwn)
 {
     PPDMDEVINS pDevIns = PCNETSTATE_2_DEVINS(pData);
@@ -708 +712 @@
         PDMDevHlpPhysRead(pDevIns, addr+3, &ownbyte, 1);
         if ((!ownbyte & 0x80) && fRetIfNotOwn)
-            return;
+            return false;
         PDMDevHlpPhysRead(pDevIns, addr, (void*)&rda[0], sizeof(rda));
         ((uint32_t *)rmd)[0] = (uint32_t)rda[0] | ((rda[1] & 0x00ff) << 16);
@@ -719 +723 @@
         PDMDevHlpPhysRead(pDevIns, addr+7, &ownbyte, 1);
         if ((!ownbyte & 0x80) && fRetIfNotOwn)
-            return;
+            return false;
         PDMDevHlpPhysRead(pDevIns, addr, (void*)rmd, 16);
     }
@@ -727 +731 @@
         PDMDevHlpPhysRead(pDevIns, addr+7, &ownbyte, 1);
         if ((!ownbyte & 0x80) && fRetIfNotOwn)
-            return;
+            return false;
         PDMDevHlpPhysRead(pDevIns, addr, (void*)&rda[0], sizeof(rda));
         ((uint32_t *)rmd)[0] = rda[2];
@@ -741 +745 @@
     if (!(ownbyte & 0x80))
         rmd->rmd1.own = 0;
+
+    return !!rmd->rmd1.own;
 }
 
@@ -1520 +1526 @@
         {
             addr = pcnetRdraAddr(pData, i);
-            pcnetRmdLoad(pData, &rmd, PHYSADDR(pData, addr), true);
             CSR_CRDA(pData) = CSR_CRBA(pData) = 0;
             CSR_CRBC(pData) = CSR_CRST(pData) = 0;
-            if (!rmd.rmd1.own)
+            if (!pcnetRmdLoad(pData, &rmd, PHYSADDR(pData, addr), true))
             {
                 STAM_PROFILE_ADV_STOP(&pData->CTXSUFF(StatRdtePoll), a);
@@ -1559 +1564 @@
             i = CSR_RCVRL(pData);
         addr = pcnetRdraAddr(pData, i);
-        pcnetRmdLoad(pData, &rmd, PHYSADDR(pData, addr), true);
         CSR_NRDA(pData) = CSR_NRBA(pData) = 0;
         CSR_NRBC(pData) = 0;
-        if (!rmd.rmd1.own)
+        if (!pcnetRmdLoad(pData, &rmd, PHYSADDR(pData, addr), true))
         {
             STAM_PROFILE_ADV_STOP(&pData->CTXSUFF(StatRdtePoll), a);
@@ -1606 +1610 @@
         RTGCPHYS32 cxda = pcnetTdraAddr(pData, CSR_XMTRC(pData));
 
-        pcnetTmdLoad(pData, tmd, PHYSADDR(pData, cxda), true);
-
-        if (!tmd->tmd1.own)
+        if (!pcnetTmdLoad(pData, tmd, PHYSADDR(pData, cxda), true))
         {
             STAM_PROFILE_ADV_STOP(&pData->CTXSUFF(StatTdtePoll), a);
@@ -1766 +1768 @@
                     i = CSR_RCVRL(pData);
                 next_crda = pcnetRdraAddr(pData, i);
-                pcnetRmdLoad(pData, &next_rmd, PHYSADDR(pData, next_crda), true);
 
                 /* Check next descriptor's own bit. If we don't own it, we have
                  * to quit and write error status into the last descriptor we own.
                  */
-                if (!next_rmd.rmd1.own)
+                if (!pcnetRmdLoad(pData, &next_rmd, PHYSADDR(pData, next_crda), true))
                     break;
 
@@ -2130 +2131 @@
         /*
          * The typical case - a complete packet.
-         * This can be performed with zero copy in Ring-3.
          */
         if (tmd.tmd1.stp && tmd.tmd1.enp)
@@ -4707 +4707 @@
     PDMDevHlpSTAMRegisterF(pDevIns, &pData->StatXmitSkipCurrent,    STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_OCCURENCES,    "",                                    "/Devices/PCNet%d/Xmit/Skipped", iInstance, i + 1);
 
-    PDMDevHlpSTAMRegisterF(pDevIns, &pData->StatInterrupt,          STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_TICKS_PER_CALL, "Profiling PCNet interrupt checks",   "/Devices/PCNet%d/Interrupt", iInstance);
+    PDMDevHlpSTAMRegisterF(pDevIns, &pData->StatInterrupt,          STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_TICKS_PER_CALL, "Profiling PCNet interrupt checks",   "/Devices/PCNet%d/UpdateIRQ", iInstance);
     PDMDevHlpSTAMRegisterF(pDevIns, &pData->StatPollTimer,          STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_TICKS_PER_CALL, "Profiling PCNet poll timer",         "/Devices/PCNet%d/PollTimer", iInstance);
     PDMDevHlpSTAMRegisterF(pDevIns, &pData->StatMIIReads,           STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_OCCURENCES,     "Number of MII reads",                "/Devices/PCNet%d/MIIReads", iInstance);