Changeset 5637 in vbox

Timestamp:

Nov 7, 2007 3:36:22 PM (17 years ago)

Author:

vboxsync

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

25967

Message:

fa -> af. comment.

File:

• trunk/src/VBox/Main/ConsoleImpl2.cpp (modified) (9 diffs)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -67 +67 @@
 {
     LogFlowFuncEnter();
-    /** Note: hardcoded assumption about number of slots; see rom bios */
-    bool faPciDeviceNo[15] = {false};
+    /* Note: hardcoded assumption about number of slots; see rom bios */
+    bool afPciDeviceNo[15] = {false};
 
 #if defined(RT_OS_WINDOWS)
@@ -347 +347 @@
         rc = CFGMR3InsertInteger(pCfg,  "IOAPIC", fIOAPIC);                         RC_CHECK();
         rc = CFGMR3InsertInteger(pInst, "PCIDeviceNo",          7);                 RC_CHECK();
-        Assert(!faPciDeviceNo[7]);
-        faPciDeviceNo[7] = true;
+        Assert(!afPciDeviceNo[7]);
+        afPciDeviceNo[7] = true;
         rc = CFGMR3InsertInteger(pInst, "PCIFunctionNo",        0);                 RC_CHECK();
 
@@ -525 +525 @@
     rc = CFGMR3InsertInteger(pInst, "Trusted",              1);     /* boolean */   RC_CHECK();
     rc = CFGMR3InsertInteger(pInst, "PCIDeviceNo",          2);                     RC_CHECK();
-    Assert(!faPciDeviceNo[2]);
-    faPciDeviceNo[2] = true;
+    Assert(!afPciDeviceNo[2]);
+    afPciDeviceNo[2] = true;
     rc = CFGMR3InsertInteger(pInst, "PCIFunctionNo",        0);                     RC_CHECK();
     rc = CFGMR3InsertNode(pInst,    "Config", &pCfg);                               RC_CHECK();
@@ -576 +576 @@
     rc = CFGMR3InsertInteger(pInst, "Trusted",              1);     /* boolean */   RC_CHECK();
     rc = CFGMR3InsertInteger(pInst, "PCIDeviceNo",          1);                     RC_CHECK();
-    Assert(!faPciDeviceNo[1]);
-    faPciDeviceNo[1] = true;
+    Assert(!afPciDeviceNo[1]);
+    afPciDeviceNo[1] = true;
     rc = CFGMR3InsertInteger(pInst, "PCIFunctionNo",        1);                     RC_CHECK();
     rc = CFGMR3InsertNode(pInst,    "Config", &pCfg);                               RC_CHECK();
@@ -846 +846 @@
         rc = CFGMR3InsertNode(pDev, szInstance, &pInst);                            RC_CHECK();
         rc = CFGMR3InsertInteger(pInst, "Trusted",              1); /* boolean */   RC_CHECK();
-        /* the first network card gets the PCI ID 3, the followings starting from 8 */
-        rc = CFGMR3InsertInteger(pInst, "PCIDeviceNo", !ulInstance ? 3 : ulInstance - 1 + 8); RC_CHECK();
-        Assert(!faPciDeviceNo[!ulInstance ? 3 : ulInstance - 1 + 8]);
-        faPciDeviceNo[!ulInstance ? 3 : ulInstance - 1 + 8] = true;
+        /* the first network card gets the PCI ID 3, the next 3 gets 8..10. */
+        const unsigned iPciDeviceNo = !ulInstance ? 3 : ulInstance - 1 + 8;
+        rc = CFGMR3InsertInteger(pInst, "PCIDeviceNo", iPciDeviceNo);               RC_CHECK();
+        Assert(!afPciDeviceNo[iPciDeviceNo]);
+        afPciDeviceNo[iPciDeviceNo] = true;
         rc = CFGMR3InsertInteger(pInst, "PCIFunctionNo",        0);                 RC_CHECK();
         rc = CFGMR3InsertNode(pInst, "Config", &pCfg);                              RC_CHECK();
@@ -1213 +1214 @@
     rc = CFGMR3InsertInteger(pInst, "Trusted",              1);     /* boolean */   RC_CHECK();
     rc = CFGMR3InsertInteger(pInst, "PCIDeviceNo",          4);                     RC_CHECK();
-    Assert(!faPciDeviceNo[4]);
-    faPciDeviceNo[4] = true;
+    Assert(!afPciDeviceNo[4]);
+    afPciDeviceNo[4] = true;
     rc = CFGMR3InsertInteger(pInst, "PCIFunctionNo",        0);                     RC_CHECK();
 
@@ -1264 +1265 @@
         rc = CFGMR3InsertInteger(pInst, "Trusted",              1);     /* boolean */   RC_CHECK();
         rc = CFGMR3InsertInteger(pInst, "PCIDeviceNo",          5);                     RC_CHECK();
-        Assert(!faPciDeviceNo[5]);
-        faPciDeviceNo[5] = true;
+        Assert(!afPciDeviceNo[5]);
+        afPciDeviceNo[5] = true;
         rc = CFGMR3InsertInteger(pInst, "PCIFunctionNo",        0);                     RC_CHECK();
         rc = CFGMR3InsertNode(pInst,    "Config", &pCfg);
@@ -1336 +1337 @@
             rc = CFGMR3InsertInteger(pInst, "Trusted",              1); /* boolean */   RC_CHECK();
             rc = CFGMR3InsertInteger(pInst, "PCIDeviceNo",          6);                 RC_CHECK();
-            Assert(!faPciDeviceNo[6]);
-            faPciDeviceNo[6] = true;
+            Assert(!afPciDeviceNo[6]);
+            afPciDeviceNo[6] = true;
             rc = CFGMR3InsertInteger(pInst, "PCIFunctionNo",        0);                 RC_CHECK();
 
@@ -1363 +1364 @@
                 rc = CFGMR3InsertInteger(pInst, "Trusted",              1); /* boolean */   RC_CHECK();
                 rc = CFGMR3InsertInteger(pInst, "PCIDeviceNo",          11);                RC_CHECK();
-                Assert(!faPciDeviceNo[11]);
-                faPciDeviceNo[11] = true;
+                Assert(!afPciDeviceNo[11]);
+                afPciDeviceNo[11] = true;
                 rc = CFGMR3InsertInteger(pInst, "PCIFunctionNo",        0);                 RC_CHECK();