Changeset 17075 in vbox for trunk/src/VBox/Main/ConsoleImpl2.cpp

Timestamp:

Feb 24, 2009 3:13:31 PM (16 years ago)

Author:

vboxsync

Message:

ICH6 controller in UI and configs (don't think amount of work required to add
just new IDE controller type is adequate)

File:

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

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -276 +276 @@
      */
     IDEControllerType_T controllerType;
-    BOOL fPIIX4, fICH6;
     hrc = biosSettings->COMGETTER(IDEControllerType)(&controllerType);               H();
-    switch (controllerType)
-    {
-        case IDEControllerType_PIIX3:
-            fPIIX4 = FALSE;
-            break;
-        case IDEControllerType_PIIX4:
-            fPIIX4 = TRUE;
-            break;
-        default:
-            AssertMsgFailed(("Invalid IDE controller type '%d'", controllerType));
-            return VMSetError(pVM, VERR_INVALID_PARAMETER, RT_SRC_POS,
-                              N_("Invalid IDE controller type '%d'"), controllerType);
-    }
-#ifdef VBOX_WITH_SMC
-    /** @todo: gross hack, rewrite appropriately */
-    fPIIX4 = FALSE;
-    fICH6 = TRUE;
-#else
-    fICH6 = FALSE;
-#endif
 
     /*
@@ -801 +780 @@
     rc = CFGMR3InsertInteger(pIdeInst, "PCIFunctionNo",        1);                  RC_CHECK();
     rc = CFGMR3InsertNode(pIdeInst,    "Config", &pCfg);                            RC_CHECK();
-    rc = CFGMR3InsertInteger(pCfg,  "PIIX4", fPIIX4);               /* boolean */   RC_CHECK();
-    rc = CFGMR3InsertInteger(pCfg,  "ICH6",  fICH6);                /* boolean */   RC_CHECK();
+    rc = CFGMR3InsertInteger(pCfg,  "Type", (uint32_t)controllerType);              RC_CHECK();
 
     /* Attach the status driver */