Changeset 41409 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

May 22, 2012 6:12:28 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

78121

Message:

Network: renamed uLinkUpDelay to cMsLinkUpDelay

Location:

trunk/src/VBox/Devices/Network

Files:

• DevE1000.cpp (modified) (6 diffs)
• DevPCNet.cpp (modified) (4 diffs)
• DevVirtioNet.cpp (modified) (3 diffs)

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

@@ -1047 +1047 @@
     bool        Alignment2[3];
     /** Link up delay (in milliseconds). */
-    uint32_t    uLinkUpDelay;
+    uint32_t    cMsLinkUpDelay;
 
     /** All: Device register storage. */
@@ -2174 +2174 @@
 {
     E1kLog(("%s Will bring up the link in %d seconds...\n",
-            INSTANCE(pState), pState->uLinkUpDelay / 1000));
-    e1kArmTimer(pState, pState->CTX_SUFF(pLUTimer), pState->uLinkUpDelay * 1000);
+            INSTANCE(pState), pState->cMsLinkUpDelay / 1000));
+    e1kArmTimer(pState, pState->CTX_SUFF(pLUTimer), pState->cMsLinkUpDelay * 1000);
 }
 
@@ -5913 +5913 @@
         {
             E1kLog(("%s Link will be up in approximately %d secs\n",
-                    INSTANCE(pState), pState->uLinkUpDelay / 1000));
+                    INSTANCE(pState), pState->cMsLinkUpDelay / 1000));
             pState->fCableConnected = true;
             STATUS &= ~STATUS_LU;
@@ -6221 +6221 @@
     if (    (STATUS & STATUS_LU)
         && !PDMDevHlpVMTeleportedAndNotFullyResumedYet(pDevIns)
-        && pState->uLinkUpDelay)
+        && pState->cMsLinkUpDelay)
     {
         E1kLog(("%s Link is down temporarily\n", INSTANCE(pState)));
@@ -6718 +6718 @@
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed to get the value of 'EthernetCRC'"));
-    rc = CFGMR3QueryU32Def(pCfg, "LinkUpDelay", (uint32_t*)&pState->uLinkUpDelay, 5000); /* ms */
+    rc = CFGMR3QueryU32Def(pCfg, "LinkUpDelay", (uint32_t*)&pState->cMsLinkUpDelay, 5000); /* ms */
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed to get the value of 'LinkUpDelay'"));
-    Assert(pState->uLinkUpDelay <= 300000); /* less than 5 minutes */
-    if (pState->uLinkUpDelay > 5000)
+    Assert(pState->cMsLinkUpDelay <= 300000); /* less than 5 minutes */
+    if (pState->cMsLinkUpDelay > 5000)
     {
         LogRel(("%s WARNING! Link up delay is set to %u seconds!\n",
-                INSTANCE(pState), pState->uLinkUpDelay / 1000));
-    }
-    else if (pState->uLinkUpDelay == 0)
+                INSTANCE(pState), pState->cMsLinkUpDelay / 1000));
+    }
+    else if (pState->cMsLinkUpDelay == 0)
     {
         LogRel(("%s WARNING! Link up delay is disabled!\n", INSTANCE(pState)));
@@ -6734 +6734 @@
 
     E1kLog(("%s Chip=%s LinkUpDelay=%ums\n", INSTANCE(pState),
-            g_Chips[pState->eChip].pcszName, pState->uLinkUpDelay));
+            g_Chips[pState->eChip].pcszName, pState->cMsLinkUpDelay));
 
     /* Initialize state structure */

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

@@ -272 +272 @@
     bool                                fAm79C973;
     uint32_t                            u32LinkSpeed;
-    uint32_t                            uLinkUpDelay;
+    uint32_t                            cMsLinkUpDelay;
     uint32_t                            Alignment6;
 
@@ -4335 +4335 @@
         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, pThis->uLinkUpDelay);
+        int rc = TMTimerSetMillies(pThis->pTimerRestore, pThis->cMsLinkUpDelay);
         AssertRC(rc);
     }
@@ -4778 +4778 @@
             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, pThis->uLinkUpDelay);
+            int rc = TMTimerSetMillies(pThis->pTimerRestore, pThis->cMsLinkUpDelay);
             AssertRC(rc);
         }
@@ -5066 +5066 @@
 #endif /* !PCNET_GC_ENABLED */
 
-    rc = CFGMR3QueryU32Def(pCfg, "LinkUpDelay", (uint32_t*)&pThis->uLinkUpDelay, 5000); /* ms */
+    rc = CFGMR3QueryU32Def(pCfg, "LinkUpDelay", (uint32_t*)&pThis->cMsLinkUpDelay, 5000); /* ms */
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed to get the value of 'LinkUpDelay'"));
-    Assert(pThis->uLinkUpDelay <= 300000); /* less than 5 minutes */
-    if (pThis->uLinkUpDelay > 5000 || pThis->uLinkUpDelay < 100)
+    Assert(pThis->cMsLinkUpDelay <= 300000); /* less than 5 minutes */
+    if (pThis->cMsLinkUpDelay > 5000 || pThis->cMsLinkUpDelay < 100)
     {
         LogRel(("PCNet#%d WARNING! Link up delay is set to %u seconds!\n",
-                iInstance, pThis->uLinkUpDelay / 1000));
+                iInstance, pThis->cMsLinkUpDelay / 1000));
     }
     Log(("#%d Link up delay is set to %u seconds\n",
-         iInstance, pThis->uLinkUpDelay / 1000));
+         iInstance, pThis->cMsLinkUpDelay / 1000));
 
 

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

@@ -162 +162 @@
     bool                    fCableConnected;
     /** Link up delay (in milliseconds). */
-    uint32_t                uLinkUpDelay;
+    uint32_t                cMsLinkUpDelay;
 
     uint32_t                alignment;
@@ -1596 +1596 @@
         vpciRaiseInterrupt(&pState->VPCI, VERR_SEM_BUSY, VPCI_ISR_CONFIG);
         /* Restore the link back in 5 seconds. */
-        int rc = TMTimerSetMillies(pState->pLinkUpTimer, pState->uLinkUpDelay);
+        int rc = TMTimerSetMillies(pState->pLinkUpTimer, pState->cMsLinkUpDelay);
         AssertRC(rc);
     }
@@ -1953 +1953 @@
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed to get the value of 'CableConnected'"));
-    rc = CFGMR3QueryU32Def(pCfg, "LinkUpDelay", (uint32_t*)&pState->uLinkUpDelay, 5000); /* ms */
+    rc = CFGMR3QueryU32Def(pCfg, "LinkUpDelay", (uint32_t*)&pState->cMsLinkUpDelay, 5000); /* ms */
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed to get the value of 'LinkUpDelay'"));
-    Assert(pState->uLinkUpDelay <= 300000); /* less than 5 minutes */
-    if (pState->uLinkUpDelay > 5000 || pState->uLinkUpDelay < 100)
+    Assert(pState->cMsLinkUpDelay <= 300000); /* less than 5 minutes */
+    if (pState->cMsLinkUpDelay > 5000 || pState->cMsLinkUpDelay < 100)
     {
         LogRel(("%s WARNING! Link up delay is set to %u seconds!\n",
-                INSTANCE(pState), pState->uLinkUpDelay / 1000));
+                INSTANCE(pState), pState->cMsLinkUpDelay / 1000));
     }
     Log(("%s Link up delay is set to %u seconds\n",
-         INSTANCE(pState), pState->uLinkUpDelay / 1000));
+         INSTANCE(pState), pState->cMsLinkUpDelay / 1000));
 
     /* Initialize PCI config space */