Changeset 44569 in vbox

Timestamp:

Feb 6, 2013 2:00:43 PM (12 years ago)

Author:

vboxsync

Message:

DevE1000: fGCEnabled -> fRCEnabled.

Location:

trunk/src/VBox/Devices

Files:

• Network/DevE1000.cpp (modified) (6 diffs)
• testcase/tstDeviceStructSizeRC.cpp (modified) (1 diff)

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

@@ -1081 +1081 @@
     bool        fR0Enabled;
     /** EMT: */
-    bool        fGCEnabled;
+    bool        fRCEnabled;
     /** EMT: Compute Ethernet CRC for RX packets. */
     bool        fEthernetCRC;
@@ -5964 +5964 @@
                 rc = PDMDevHlpIOPortRegisterR0(pPciDev->pDevIns, pThis->addrIOPort, cb, NIL_RTR0PTR /*pvUser*/,
                                              "e1kIOPortOut", "e1kIOPortIn", NULL, NULL, "E1000");
-            if (pThis->fGCEnabled && RT_SUCCESS(rc))
+            if (pThis->fRCEnabled && RT_SUCCESS(rc))
                 rc = PDMDevHlpIOPortRegisterRC(pPciDev->pDevIns, pThis->addrIOPort, cb, NIL_RTRCPTR /*pvUser*/,
                                                "e1kIOPortOut", "e1kIOPortIn", NULL, NULL, "E1000");
@@ -5984 +5984 @@
                 rc = PDMDevHlpMMIORegisterR0(pPciDev->pDevIns, GCPhysAddress, cb, NIL_RTR0PTR /*pvUser*/,
                                              "e1kMMIOWrite", "e1kMMIORead");
-            if (pThis->fGCEnabled && RT_SUCCESS(rc))
+            if (pThis->fRCEnabled && RT_SUCCESS(rc))
                 rc = PDMDevHlpMMIORegisterRC(pPciDev->pDevIns, GCPhysAddress, cb, NIL_RTRCPTR /*pvUser*/,
                                              "e1kMMIOWrite", "e1kMMIORead");
@@ -6892 +6892 @@
                     pDevIns->iInstance, pThis->addrIOPort, pThis->addrMMReg,
                     &pThis->macConfigured, g_Chips[pThis->eChip].pcszName,
-                    pThis->fGCEnabled ? " GC" : "", pThis->fR0Enabled ? " R0" : "");
+                    pThis->fRCEnabled ? " GC" : "", pThis->fR0Enabled ? " R0" : "");
 
     e1kCsEnter(pThis, VERR_INTERNAL_ERROR); /* Not sure why but PCNet does it */
@@ -7378 +7378 @@
 
     pThis->fR0Enabled   = true;
-    pThis->fGCEnabled   = true;
+    pThis->fRCEnabled   = true;
     pThis->fEthernetCRC = true;
     pThis->fGSOEnabled  = true;
@@ -7397 +7397 @@
                                 N_("Configuration error: Failed to get the value of 'AdapterType'"));
     Assert(pThis->eChip <= E1K_CHIP_82545EM);
-    rc = CFGMR3QueryBoolDef(pCfg, "GCEnabled", &pThis->fGCEnabled, true);
+    rc = CFGMR3QueryBoolDef(pCfg, "RCEnabled", &pThis->fRCEnabled, true);
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,

trunk/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp

@@ -1305 +1305 @@
     GEN_CHECK_OFF(E1KSTATE, fCableConnected);
     GEN_CHECK_OFF(E1KSTATE, fR0Enabled);
-    GEN_CHECK_OFF(E1KSTATE, fGCEnabled);
+    GEN_CHECK_OFF(E1KSTATE, fRCEnabled);
     GEN_CHECK_OFF(E1KSTATE, auRegs[E1K_NUM_OF_32BIT_REGS]);
     GEN_CHECK_OFF(E1KSTATE, led);