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

Timestamp:

Nov 2, 2010 2:02:19 PM (14 years ago)

Author:

vboxsync

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

67316

Message:

PCI: more slot management bits

File:

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

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -966 +966 @@
             InsertConfigNode(pDevices, "lpc", &pDev);
             InsertConfigNode(pDev,     "0", &pInst);
+#if 0
+            PciAddr = PciBusAddress(0, 31, 0);
+            hrc = BusMgr->assignPciDevice("lpc", pInst);                               H();
+#endif
             InsertConfigInteger(pInst, "Trusted",   1); /* boolean */
         }
@@ -2307 +2311 @@
             if (fOsXGuest && fAudioEnabled)
             {
-                /** @todo: don't hardcode */
-                uint32_t u32AudioPciAddr = (5 << 16) | 0;
-                InsertConfigInteger(pCfg, "AudioPciAddress",    u32AudioPciAddr);
+                PciBusAddress Address;
+                if (BusMgr->findPciAddress("hda", 0, Address))
+                {
+                    uint32_t u32AudioPciAddr = (Address.iDevice << 16) | Address.iFn;
+                    InsertConfigInteger(pCfg, "AudioPciAddress",    u32AudioPciAddr);
+                }
             }
             InsertConfigInteger(pCfg,  "IocPciAddress", u32IocPciAddress);