Changeset 33687 in vbox for trunk/src/VBox/Devices/Bus

Timestamp:

Nov 2, 2010 1:05:01 PM (14 years ago)

Author:

vboxsync

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

67311

Message:

PCI: part 1 of PCI slots assignment logic in Main

File:

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

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

@@ -253 +253 @@
     {
         PPCIGLOBALS pThis = PDMINS_2_DATA(pDevIns, PPCIGLOBALS);
+
         PCI_LOCK(pDevIns, VINF_IOM_HC_IOPORT_WRITE);
         pThis->uConfigReg = u32 & ~3; /* Bits 0-1 are reserved and we silently clear them */
         PCI_UNLOCK(pDevIns);
     }
+
     return VINF_SUCCESS;
 }
@@ -311 +313 @@
                 pBridgeDevice->Int.s.pfnBridgeConfigWrite(pBridgeDevice->pDevIns, pAddr->iBus, pAddr->iDeviceFunc, pAddr->iRegister, val, cb);
             }
+            else
+            {
+                // do nothing, bridge not found
+            }
 #else
             rc = rcReschedule;
@@ -360 +366 @@
 static void ich9pciNoMem(void* ptr, int cb)
 {
-    memset(ptr, 0xff, cb);
+    for (int i = 0; i < cb; i++)
+        ((uint8_t*)ptr)[i] = 0xff;
 }
 
@@ -448 +455 @@
 }
 
-static int ich9pciDataRead(PPCIGLOBALS pGlobals, uint32_t addr, int len, uint32_t *pu32)
+static int ich9pciDataRead(PPCIGLOBALS pGlobals, uint32_t addr, int cb, uint32_t *pu32)
 {
     PciAddress aPciAddr;
 
-    LogFlow(("ich9pciDataRead: config=%x len=%d\n",  pGlobals->uConfigReg, len));
+    LogFlow(("ich9pciDataRead: config=%x cb=%d\n",  pGlobals->uConfigReg, cb));
+
+    *pu32 = 0xffffffff;
 
     if (!(pGlobals->uConfigReg & (1 << 31)))
@@ -463 +472 @@
     ich9pciStateToPciAddr(pGlobals, addr, &aPciAddr);
 
-    return ich9pciDataReadAddr(pGlobals, &aPciAddr, len, pu32, VINF_IOM_HC_IOPORT_READ);
+    return ich9pciDataReadAddr(pGlobals, &aPciAddr, cb, pu32, VINF_IOM_HC_IOPORT_READ);
 }
 
@@ -1038 +1047 @@
         }
         else
-            ich9pciNoMem(&u32Value, cb);
+            ich9pciNoMem(&u32Value, 4);
     }
     else
@@ -1050 +1059 @@
         }
         else
-            ich9pciNoMem(&u32Value, cb);
+            ich9pciNoMem(&u32Value, 4);
     }
 
@@ -1979 +1988 @@
     },
     /* Disable, if we may wish to have multiple AHCI controllers */
-#if 1
     {
         "ahci",     31, 2 /* SATA controller */
     },
-#endif
     {
         "smbus",    31, 3 /* System Management Bus */
@@ -2021 +2028 @@
 
     int iStartPos = 0;
-
-    /* We add bridges starting slot 22 */
-    if (!strcmp(pszName, "ich9pcibridge"))
-    {
-        iStartPos = 22 * 8;
-    }
 
     /* Otherwise when assigning a slot, we need to make sure all its functions are available */