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

Timestamp:

Apr 22, 2009 2:32:45 PM (16 years ago)

Author:

vboxsync

Message:

PCNet: removed dead code (will not work with the current memory model anyway)

File:

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

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

@@ -1906 +1906 @@
             size_t count = RT_MIN(4096 - (size_t)rmd.rmd1.bcnt, size);
             RTGCPHYS32 rbadr = PHYSADDR(pThis, rmd.rmd0.rbadr);
-#if 0
-            if (pThis->fPrivIfEnabled)
-            {
-                uint8_t *pb = (uint8_t*)pThis->CTX_SUFF(pSharedMMIO)
-                            + rbadr - pThis->GCRDRA + pThis->CTX_SUFF(pSharedMMIO)->V.V1.offRxDescriptors;
-                memcpy(pb, src, count);
-            }
-            else
-#endif
-            {
-                /* We have to leave the critical section here or we risk deadlocking
-                 * with EMT when the write is to an unallocated page or has an access
-                 * handler associated with it.
-                 *
-                 * This shouldn't be a problem because:
-                 *  - any modification to the RX descriptor by the driver is
-                 *    forbidden as long as it is owned by the device
-                 *  - we don't cache any register state beyond this point
-                 */
-                PDMCritSectLeave(&pThis->CritSect);
-                PDMDevHlpPhysWrite(pDevIns, rbadr, src, count);
-                int rc = PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
-                AssertReleaseRC(rc);
-            }
+
+            /* We have to leave the critical section here or we risk deadlocking
+             * with EMT when the write is to an unallocated page or has an access
+             * handler associated with it.
+             *
+             * This shouldn't be a problem because:
+             *  - any modification to the RX descriptor by the driver is
+             *    forbidden as long as it is owned by the device
+             *  - we don't cache any register state beyond this point
+             */
+            PDMCritSectLeave(&pThis->CritSect);
+            PDMDevHlpPhysWrite(pDevIns, rbadr, src, count);
+            int rc = PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
+            AssertReleaseRC(rc);
 
             src  += count;
@@ -1960 +1950 @@
                 count = RT_MIN(4096 - (size_t)rmd.rmd1.bcnt, size);
                 RTGCPHYS32 rbadr = PHYSADDR(pThis, rmd.rmd0.rbadr);
-#if 0
-                if (pThis->fPrivIfEnabled)
-                {
-                    uint8_t *pb = (uint8_t*)pThis->CTX_SUFF(pSharedMMIO)
-                                + rbadr - pThis->GCRDRA + pThis->CTX_SUFF(pSharedMMIO)->V.V1.offRxDescriptors;
-                    memcpy(pb, src, count);
-                }
-                else
-#endif
-                {
-                    /* We have to leave the critical section here or we risk deadlocking
-                     * with EMT when the write is to an unallocated page or has an access
-                     * handler associated with it. See above for additional comments. */
-                    PDMCritSectLeave(&pThis->CritSect);
-                    PDMDevHlpPhysWrite(pDevIns, rbadr, src, count);
-                    int rc = PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
-                    AssertReleaseRC(rc);
-                }
+
+                /* We have to leave the critical section here or we risk deadlocking
+                 * with EMT when the write is to an unallocated page or has an access
+                 * handler associated with it. See above for additional comments. */
+                PDMCritSectLeave(&pThis->CritSect);
+                PDMDevHlpPhysWrite(pDevIns, rbadr, src, count);
+                int rc = PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
+                AssertReleaseRC(rc);
+
                 src  += count;
                 size -= count;