Changeset 22369 in vbox

Timestamp:

Aug 20, 2009 12:46:53 PM (15 years ago)

Author:

vboxsync

Message:

PCNet/E1000: change the link UP delay to 5 seconds

Location:

trunk/src/VBox/Devices/Network

Files:

• DevE1000.cpp (modified) (1 diff)
• DevPCNet.cpp (modified) (1 diff)

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

@@ -4303 +4303 @@
         if (fNewUp)
         {
-            E1kLog(("%s Link is up\n", INSTANCE(pState)));
-            STATUS |= STATUS_LU;
-            Phy::setLinkStatus(&pState->phy, true);
+            E1kLog(("%s Link will be up in approximately 5 secs\n", INSTANCE(pState)));
+            STATUS &= ~STATUS_LU;
+            Phy::setLinkStatus(&pState->phy, false);
+            e1kRaiseInterrupt(pState, ICR_LSC);
+            /* Restore the link back in 5 second. */
+            e1kArmTimer(pState, pState->pLUTimer, 5000000);
         }
         else

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

@@ -4631 +4631 @@
         if (fLinkUp)
         {
-            /* connect */
-            pThis->aCSR[0] &= ~(RT_BIT(15) | RT_BIT(13)); /* ERR | CERR - probably not 100% correct either... */
-            pThis->Led.Actual.s.fError = 0;
+            /* connect  with a delay of 5 seconds */
+            pThis->fLinkTempDown = true;
+            pThis->cLinkDownReported = 0;
+            pThis->aCSR[0] |= RT_BIT(15) | RT_BIT(13); /* ERR | CERR (this is probably wrong) */
+            pThis->Led.Asserted.s.fError = pThis->Led.Actual.s.fError = 1;
+            int rc = TMTimerSetMillies(pThis->pTimerRestore, 5000);
+            AssertRC(rc);
         }
         else