Changeset 64697 in vbox

Timestamp:

Nov 17, 2016 5:44:28 PM (8 years ago)

Author:

vboxsync

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

111976

Message:

DevPciIch9: Default to PDM bus numbering.

Location:

trunk/src/VBox/Devices/Bus

Files:

• DevPciIch9.cpp (modified) (3 diffs)
• DevPciInternal.h (modified) (1 diff)

trunk/src/VBox/Devices/Bus/DevPciIch9.cpp

@@ -1517 +1517 @@
         case 0x0604:
             /* PCI-to-PCI bridge. */
-            AssertMsg(pPciRoot->uPciBiosBus < 255, ("Too many bridges on the bus\n"));
             ich9pciBiosInitBridge(pPciRoot, uBus, uDevFn);
             break;
@@ -1714 +1713 @@
                   ("Device is not a PCI bridge but on the list of PCI bridges\n"));
         PDEVPCIBUS pChildBus = PDMINS_2_DATA(pBridge->Int.s.CTX_SUFF(pDevIns), PDEVPCIBUS);
-        pPciRoot->uPciBiosBus++;
-        ich9pciBiosInitBridgeTopology(pPciRoot, pChildBus, uBusSecondary, pPciRoot->uPciBiosBus);
+        ich9pciBiosInitBridgeTopology(pPciRoot, pChildBus, uBusSecondary, pChildBus->iBus);
     }
     PCIDevSetByte(pBridgeDev, VBOX_PCI_SUBORDINATE_BUS, pPciRoot->uPciBiosBus);
@@ -1758 +1756 @@
      */
     PDEVPCIBUS pBus = &pPciRoot->PciBus;
-    ich9pciBiosInitBridgeTopology(pPciRoot, pBus, 0, 0);
+    AssertLogRel(pBus->iBus == 0);
+    ich9pciBiosInitBridgeTopology(pPciRoot, pBus, 0, pBus->iBus);
 
     /*

trunk/src/VBox/Devices/Bus/DevPciInternal.h

@@ -146 +146 @@
 
 #if 1 /* Will be moved into the BIOS "soon". */
-    /** Current bus number (?). */
+    /** Current bus number - obsolete (still used by DevPCI, but merge will fix that). */
     uint8_t             uPciBiosBus;
     uint8_t             abAlignment2[7];