Changeset 7946 in vbox

Timestamp:

Apr 14, 2008 9:28:05 AM (17 years ago)

Author:

vboxsync

Message:

cosmetics.

File:

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

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -605 +605 @@
         if (enabled)
         {
-            ULONG nrPorts = 0;
-
             rc = CFGMR3InsertNode(pDevices, "ahci", &pDev);                             RC_CHECK();
             rc = CFGMR3InsertNode(pDev,     "0", &pSataInst);                           RC_CHECK();
@@ -616 +614 @@
             rc = CFGMR3InsertNode(pSataInst,    "Config", &pCfg);                       RC_CHECK();
 
-            hrc = sataController->COMGETTER(PortCount)(&nrPorts);                       H();
-            rc = CFGMR3InsertInteger(pCfg, "PortCount", nrPorts);                       RC_CHECK();
+            ULONG cPorts = 0;
+            hrc = sataController->COMGETTER(PortCount)(&cPorts);                        H();
+            rc = CFGMR3InsertInteger(pCfg, "PortCount", cPorts);                        RC_CHECK();
 
             /* Needed configuration values for the bios. */
@@ -624 +623 @@
             for (uint32_t i = 0; i < 4; i++)
             {
-                const char *g_apszConfig[] =
-                    { "PrimaryMaster", "PrimarySlave", "SecondaryMaster", "SecondarySlave" };
-                const char *g_apszBiosConfig[] =
-                    { "SataPrimaryMasterLUN", "SataPrimarySlaveLUN", "SataSecondaryMasterLUN", "SataSecondarySlaveLUN" };
-                LONG aPortNumber;
-
-                hrc = sataController->GetIDEEmulationPort(i, &aPortNumber);             H();
-                rc = CFGMR3InsertInteger(pCfg, g_apszConfig[i], aPortNumber);           RC_CHECK();
-                rc = CFGMR3InsertInteger(pBiosCfg, g_apszBiosConfig[i], aPortNumber);   RC_CHECK();
+                static const char *s_apszConfig[4] =
+                { "PrimaryMaster", "PrimarySlave", "SecondaryMaster", "SecondarySlave" };
+                static const char *s_apszBiosConfig[4] =
+                { "SataPrimaryMasterLUN", "SataPrimarySlaveLUN", "SataSecondaryMasterLUN", "SataSecondarySlaveLUN" };
+
+                LONG lPortNumber = -1;
+                hrc = sataController->GetIDEEmulationPort(i, &lPortNumber);             H();
+                rc = CFGMR3InsertInteger(pCfg, s_apszConfig[i], lPortNumber);           RC_CHECK();
+                rc = CFGMR3InsertInteger(pBiosCfg, s_apszBiosConfig[i], lPortNumber);   RC_CHECK();
             }
 
@@ -639 +638 @@
             rc = CFGMR3InsertString(pLunL0, "Driver",               "MainStatus");            RC_CHECK();
             rc = CFGMR3InsertNode(pLunL0,   "Config", &pCfg);                                 RC_CHECK();
+            AssertRelease(cPorts <= RT_ELEMENTS(pConsole->mapSATALeds));
             rc = CFGMR3InsertInteger(pCfg,  "papLeds", (uintptr_t)&pConsole->mapSATALeds[0]); RC_CHECK();
             rc = CFGMR3InsertInteger(pCfg,  "First",    0);                                   RC_CHECK();
-            rc = CFGMR3InsertInteger(pCfg,  "Last",     nrPorts-1);                           RC_CHECK();
-
+            rc = CFGMR3InsertInteger(pCfg,  "Last",     cPorts - 1);                          RC_CHECK();
         }
     }