Changeset 33203 in vbox

Timestamp:

Oct 18, 2010 2:55:53 PM (14 years ago)

Author:

vboxsync

Message:

PCI: tight packing of builting devices into functions, chipset slot assignment has higher priority than device now

File:

• trunk/src/VBox/Devices/Bus/DevPciIch9.cpp (modified) (5 diffs)

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

@@ -1880 +1880 @@
         "piix3ide", 31, 1 /* IDE controller */
     },
-#if 0
+    /* Disable, if we may wish to have multiple AHCI controllers */
+#if 1
     {
         "ahci",     31, 2 /* SATA controller */
@@ -1889 +1890 @@
     },
     {
+        "usb-ohci", 31, 4 /* OHCI USB controller */
+    },
+    {
+        "usb-ehci", 31, 5 /* EHCI USB controller */
+    },
+    {
         "thermal",  31, 6 /* Thermal controller */
     },
 };
 
-static int assignPosition(PPCIBUS pBus, PPCIDEVICE pPciDev, const char *pszName)
+static int assignPosition(PPCIBUS pBus, PPCIDEVICE pPciDev, const char *pszName, int iDevFn)
 {
     /* Hardcoded slots/functions, per chipset spec */
@@ -1904 +1911 @@
         }
     }
+
+    if (iDevFn >=0 && iDevFn < (int)RT_ELEMENTS(pBus->apDevices))
+        return iDevFn;
 
     /* Otherwise when assigning a slot, we need to make sure all its functions are available */
@@ -1945 +1955 @@
      * Find device position
      */
-    if (iDev < 0 || !strcmp(pszName, "piix3ide"))
-    {
-        iDev = assignPosition(pBus, pPciDev, pszName);
-        if (iDev < 0)
-        {
-             AssertMsgFailed(("Couldn't find free spot!\n"));
-             return VERR_PDM_TOO_PCI_MANY_DEVICES;
-        }
+    iDev = assignPosition(pBus, pPciDev, pszName, iDev);
+    if (iDev < 0)
+    {
+        AssertMsgFailed(("Couldn't find free spot!\n"));
+        return VERR_PDM_TOO_PCI_MANY_DEVICES;
     }
 
@@ -1971 +1978 @@
     {
         /* if we got here, we shall (and usually can) relocate the device */
-        int iRelDev = assignPosition(pBus, pBus->apDevices[iDev], pBus->apDevices[iDev]->name);
+        int iRelDev = assignPosition(pBus, pBus->apDevices[iDev], pBus->apDevices[iDev]->name, -1);
         if (iRelDev < 0 || iRelDev == iDev)
         {