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

Timestamp:

Sep 14, 2010 10:26:07 AM (14 years ago)

Author:

vboxsync

Message:

Devices: refactoring, further PCI work

File:

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

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -822 +822 @@
         ChipsetType_T chipsetType;
         hrc = pMachine->COMGETTER(ChipsetType)(&chipsetType);                                H();
+        uint32_t u32IocPciAddress;
 
         switch (chipsetType)
@@ -829 +830 @@
             case ChipsetType_PIIX3:
                 InsertConfigNode(pDevices, "pci", &pDev);
+                u32IocPciAddress = (0x1 << 16) | 0; // ISA controller
                 break;
             case ChipsetType_ICH9:
                 InsertConfigNode(pDevices, "ich9pci", &pDev);
+                u32IocPciAddress = (0x1f << 16) | 0; // LPC controller
                 break;
         }
@@ -870 +873 @@
          */
         BOOL fHpetEnabled;
-#ifdef VBOX_WITH_HPET
         /* Other guests may wish to use HPET too, but MacOS X not functional without it */
         hrc = pMachine->COMGETTER(HpetEnabled)(&fHpetEnabled);                              H();
         /* so always enable HPET in extended profile */
         fHpetEnabled |= fOsXGuest;
-#else
-        fHpetEnabled = false;
-#endif
         if (fHpetEnabled)
         {
@@ -889 +888 @@
          */
         BOOL fSmcEnabled;
-#ifdef VBOX_WITH_SMC
         fSmcEnabled = fOsXGuest;
-#else
-        fSmcEnabled = false;
-#endif
         if (fSmcEnabled)
         {
@@ -915 +910 @@
         BOOL fLpcEnabled;
         /** @todo: implement appropriate getter */
-#ifdef VBOX_WITH_LPC
-        fLpcEnabled = fOsXGuest;
-#else
-        fLpcEnabled = false;
-#endif
+        fLpcEnabled = fOsXGuest || (chipsetType == ChipsetType_ICH9);
         if (fLpcEnabled)
         {
@@ -2287 +2278 @@
                 InsertConfigInteger(pCfg, "AudioPciAddress",    u32AudioPciAddr);
             }
+            InsertConfigInteger(pCfg,  "IocPciAddress", u32IocPciAddress);
             InsertConfigInteger(pCfg,  "ShowCpu", fShowCpu);
             InsertConfigInteger(pCfg,  "CpuHotPlug", fCpuHotPlug);