Changeset 564 in vbox for trunk/src/VBox/Devices

Timestamp:

Feb 2, 2007 5:06:00 PM (18 years ago)

Author:

vboxsync

Message:

Added disabled code path for sending multiple packets.

File:

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

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

@@ -67 +67 @@
 #include <iprt/string.h>
 #include <iprt/time.h>
+#ifdef IN_RING3
+#include <iprt/mem.h>
+#endif
 
 #include "Builtins.h"
@@ -1778 +1781 @@
 {
     PCNetState *pData = PDMINS2DATA(pDevIns, PCNetState *);
-    unsigned    i;
     int         rc;
 
@@ -1788 +1790 @@
 
     pData->fTransmitting = true;
-    for (i = 0; i < pData->iFrame; i++)
+
+#ifdef PCNET_SEND_MULTIPLE_PACKETS
+    if (pData->iFrame)
+    {
+        if (pData->iFrame > 1)
+        {
+            PPDMINETWORKPACKET paPacket = (PPDMINETWORKPACKET)RTMemTmpAlloc(sizeof(PDMINETWORKPACKET)*pData->iFrame);
+            unsigned           i;
+
+            Assert(paPacket);
+            if (paPacket)
+            {
+                for (i = 0; i < pData->iFrame; i++)
+                {
+                    paPacket[i].pvBuf = pData->aFrames[i].pvR3 != NIL_RTR3PTR
+                                      ? pData->aFrames[i].pvR3
+                                      : &pData->abFrameBuf[pData->aFrames[i].off];
+                    paPacket[i].cb    = pData->aFrames[i].cb;
+
+                    if (pData->aFrames[i].cb > 70) /* unqualified guess */
+                        pData->Led.Asserted.s.fWriting = pData->Led.Actual.s.fWriting = 1;
+                }
+
+                if (pcnetIsLinkUp(pData))
+                    pData->pDrv->pfnSendEx(pData->pDrv, pData->iFrame, paPacket);
+
+                RTMemTmpFree(paPacket);
+            }
+        }
+        else
+        {
+            RTR3PTR pv = pData->aFrames[0].pvR3 != NIL_RTR3PTR
+                       ? pData->aFrames[0].pvR3
+                       : &pData->abFrameBuf[pData->aFrames[0].off];
+            if (pData->aFrames[0].cb > 70) /* unqualified guess */
+                pData->Led.Asserted.s.fWriting = pData->Led.Actual.s.fWriting = 1;
+            if (pcnetIsLinkUp(pData))
+            {
+                pData->pDrv->pfnSend(pData->pDrv, pv, pData->aFrames[0].cb);
+                LOG_PACKET("xmit", pv, pData->aFrames[0].cb);
+            }
+        }
+
+#ifdef PCNET_DELAY_INT
+        /* Update TXSTRT and TINT. */
+        pData->aCSR[4] |=  0x0004;       /* set TXSTRT */
+        pData->aCSR[0] |= 0x0200;    /* set TINT */
+        pcnetUpdateIrq(pData);
+#endif
+    }
+
+#else /* PCNET_SEND_MULTIPLE_PACKETS */
+
+    for (unsigned i = 0; i < pData->iFrame; i++)
     {
         RTR3PTR pv = pData->aFrames[i].pvR3 != NIL_RTR3PTR
@@ -1803 +1858 @@
 
 #ifdef PCNET_DELAY_INT
-    /* Update TXSTRT and TINT. */
-    pData->aCSR[4] |=  0x0004;       /* set TXSTRT */
-    pData->aCSR[0] |= 0x0200;    /* set TINT */
-    pcnetUpdateIrq(pData);
-#endif
+    if (pData->iFrame)
+    {
+        /* Update TXSTRT and TINT. */
+        pData->aCSR[4] |=  0x0004;       /* set TXSTRT */
+        pData->aCSR[0] |= 0x0200;    /* set TINT */
+        pcnetUpdateIrq(pData);
+    }
+#endif
+
+#endif /* PCNET_SEND_MULTIPLE_PACKETS */
 
     pData->fTransmitting = false;