Changeset 7762 in vbox for trunk/src/VBox

Timestamp:

Apr 7, 2008 7:12:34 AM (17 years ago)

Author:

vboxsync

Message:

small optimization

File:

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

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

@@ -1717 +1717 @@
 
 /**
- * Check if there is at least one free receive buffer available.
- */
-static int pcnetCanReceiveNoSync(PCNetState *pData)
-{
-    if (RT_UNLIKELY(CSR_DRX(pData) || CSR_STOP(pData) || CSR_SPND(pData)))
-        return 0;
-
-    if (HOST_IS_OWNER(CSR_CRST(pData)) && pData->GCRDRA)
-        pcnetRdtePoll(pData);
-
-    if (HOST_IS_OWNER(CSR_CRST(pData)))
-    {
-        /** @todo Notify the guest _now_. Will potentially increase the interrupt load */
-        pData->aCSR[0] |= 0x1000; /* Set MISS flag */
-        return 0;
-    }
-
-    /* byte count stored in two's complement 12 bits wide */
-    Log(("#%d pcnetCanReceiveNoSync %d bytes\n", PCNET_INST_NR,
-         4096 - CSR_CRBC(pData)));
-    return 4096 - CSR_CRBC(pData);
-}
-
-/**
  * Write data into guest receive buffers.
  */
@@ -2567 +2543 @@
 
 
-static int pcnetCSRWriteU16(PCNetState *pData, uint32_t u32RAP, uint32_t new_value)
-{
-    uint16_t val = new_value;
+static int pcnetCSRWriteU16(PCNetState *pData, uint32_t u32RAP, uint32_t val)
+{
     int      rc  = VINF_SUCCESS;
 #ifdef PCNET_DEBUG_CSR
@@ -4251 +4226 @@
 static DECLCALLBACK(size_t) pcnetCanReceive(PPDMINETWORKPORT pInterface)
 {
-    size_t cb;
+    size_t cb = 0;
     int    rc;
     PCNetState *pData = INETWORKPORT_2_DATA(pInterface);
@@ -4258 +4233 @@
     AssertReleaseRC(rc);
 
-    cb = pcnetCanReceiveNoSync(pData);
+    if (RT_LIKELY(!CSR_DRX(pData) && !CSR_STOP(pData) && !CSR_SPND(pData)))
+    {
+        if (HOST_IS_OWNER(CSR_CRST(pData)) && pData->GCRDRA)
+            pcnetRdtePoll(pData);
+
+        if (HOST_IS_OWNER(CSR_CRST(pData)))
+        {
+            /** @todo Notify the guest _now_. Will potentially increase the interrupt load */
+            pData->aCSR[0] |= 0x1000; /* Set MISS flag */
+        }
+        else
+        {
+            /* byte count stored in two's complement 12 bits wide */
+            Log(("#%d pcnetCanReceiveNoSync %d bytes\n", PCNET_INST_NR, 4096 - CSR_CRBC(pData)));
+            cb = 4096 - CSR_CRBC(pData);
+        }
+    }
 
     PDMCritSectLeave(&pData->CritSect);