儲存庫 vbox 的更動 18573

時間撮記:

2009-3-31 下午01:46:00 (16 年 以前)

作者:

vboxsync

訊息:

PCNet: another workaround for #3775

檔案:

• trunk/src/VBox/Devices/Network/DevPCNet.cpp (修改) (1 筆差異)

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

@@ -1552 +1552 @@
         /* At this time it is not guaranteed that the buffers are already initialized. */
         if (pcnetRmdLoad(pThis, &rmd, PHYSADDR(pThis, addr), false))
-            cbRxBuffers += 4096-rmd.rmd1.bcnt;
-        /* Hack: Make sure that all receive buffers are touched when the
-         * device is initialized. */
-        static char aBuf[4096];
-        RTGCPHYS32 rbadr = PHYSADDR(pThis, rmd.rmd0.rbadr);
-        /* don't change the content */
-        PDMDevHlpPhysRead(pDevIns, rbadr, aBuf, RT_MIN(sizeof(aBuf), 4096U-rmd.rmd1.bcnt));
-        PDMDevHlpPhysWrite(pDevIns, rbadr, aBuf, RT_MIN(sizeof(aBuf), 4096U-rmd.rmd1.bcnt));
+        {
+            /* Hack: Make sure that all RX buffers are touched when the
+             * device is initialized. */
+            static char aBuf[4096];
+            RTGCPHYS32 rbadr = PHYSADDR(pThis, rmd.rmd0.rbadr);
+            uint32_t cbBuf = 4096U-rmd.rmd1.bcnt;
+            /* don't change the content */
+            PDMDevHlpPhysRead(pDevIns, rbadr, aBuf, RT_MIN(sizeof(aBuf), cbBuf));
+            PDMDevHlpPhysWrite(pDevIns, rbadr, aBuf, RT_MIN(sizeof(aBuf), cbBuf));
+            cbRxBuffers += cbBuf;
+        }
+        PDMDevHlpPhysWrite(pDevIns, addr, (void*)&rmd, sizeof(rmd));
+    }
+
+    for (int i = CSR_XMTRL(pThis); i >= 1; i--)
+    {
+        TMD        tmd;
+        RTGCPHYS32 addr = pcnetRdraAddr(pThis, i);
+        if (pcnetTmdLoad(pThis, &tmd, PHYSADDR(pThis, addr), false))
+        {
+            /* Hack: Make sure that all TX buffers are touched when the
+             * device is initialized. */
+            static char aBuf[4096];
+            uint32_t cbBuf = 4096U-tmd.tmd1.bcnt;
+            RTGCPHYS32 tbadr = PHYSADDR(pThis, tmd.tmd0.tbadr);
+            /* don't change the content */
+            PDMDevHlpPhysRead(pDevIns, tbadr, aBuf, RT_MIN(sizeof(aBuf), cbBuf));
+            PDMDevHlpPhysWrite(pDevIns, tbadr, aBuf, RT_MIN(sizeof(aBuf), cbBuf));
+        }
+        PDMDevHlpPhysWrite(pDevIns, addr, (void*)&tmd, sizeof(tmd));
     }