Changeset 32342 in vbox

Timestamp:

Sep 9, 2010 12:08:48 PM (14 years ago)

Author:

vboxsync

Message:

PCI: typos, first functional version

Location:

trunk/src/VBox/Devices

Files:

• Builtins.cpp (modified) (2 diffs)
• Builtins.h (modified) (2 diffs)
• Bus/DevPciIch9.cpp (modified) (8 diffs)
• Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/Devices/Builtins.cpp

@@ -60 +60 @@
     if (RT_FAILURE(rc))
         return rc;
+    rc = pCallbacks->pfnRegister(pCallbacks, &g_DevicePciIch9);
+    if (RT_FAILURE(rc))
+        return rc;
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DevicePcArch);
     if (RT_FAILURE(rc))
@@ -165 +168 @@
 #endif
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DevicePCIBridge);
+    if (RT_FAILURE(rc))
+        return rc;
+    rc = pCallbacks->pfnRegister(pCallbacks, &g_DevicePciIch9Bridge);
     if (RT_FAILURE(rc))
         return rc;

trunk/src/VBox/Devices/Builtins.h

@@ -36 +36 @@
 
 extern const PDMDEVREG g_DevicePCI;
+extern const PDMDEVREG g_DevicePciIch9;
 extern const PDMDEVREG g_DevicePcArch;
 extern const PDMDEVREG g_DevicePcBios;
@@ -77 +78 @@
 #endif
 extern const PDMDEVREG g_DevicePCIBridge;
+extern const PDMDEVREG g_DevicePciIch9Bridge;
 #ifdef VBOX_WITH_LSILOGIC
 extern const PDMDEVREG g_DeviceLsiLogicSCSI;

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

@@ -800 +800 @@
     int rc = ich9pciDataRead(pGlobals, addr & 3, len, &u32Val);
     AssertRC(rc);
+    switch (len)
+    {
+        case 1:
+            u32Val &= 0xff;
+            break;
+        case 2:
+            u32Val &= 0xffff;
+            break;
+    }
     return u32Val;
 }
@@ -912 +921 @@
 {
     uint32_t *paddr;
-    int i, pin, pic_irq;
     uint16_t uDevClass, uVendor, uDevice;
 
@@ -923 +931 @@
         return;
 
-    switch (uDevice)
+    switch (uDevClass)
     {
         case 0x0101:
@@ -1005 +1013 @@
                     u32Size = (~u32Size) + 1;
 
-                Log(("%s: Size of region %u for device %d on bus %d is %u\n", __FUNCTION__, i, uDevFn, uBus, u32Size));
+                Log(("%s: Size of region %u for device %d on bus %d is %u\n", __FUNCTION__, iRegion, uDevFn, uBus, u32Size));
 
                 if (u32Size)
@@ -1011 +1019 @@
                     paddr = fIsPio ? &pGlobals->uPciBiosIo : &pGlobals->uPciBiosMmio;
                     *paddr = (*paddr + u32Size - 1) & ~(u32Size - 1);
-                    Log(("%s: Start address of %s region %u is %#x\n", __FUNCTION__, (fIsPio ? "I/O" : "MMIO"), i, *paddr));
-                    ich9pciSetRegionAddress(pGlobals, uBus, uDevFn, i, *paddr);
+                    Log(("%s: Start address of %s region %u is %#x\n", __FUNCTION__, (fIsPio ? "I/O" : "MMIO"), iRegion, *paddr));
+                    ich9pciSetRegionAddress(pGlobals, uBus, uDevFn, iRegion, *paddr);
                     *paddr += u32Size;
                     Log(("%s: New address is %#x\n", __FUNCTION__, *paddr));
@@ -1505 +1513 @@
 
     pBus->aPciDev.pDevIns               = pDevIns;
-    pBus->aPciDev.Int.s.fRequestedDevFn = true;
     /* We register Host<->PCI controller on the bus */
-    ich9pciRegisterInternal(pBus, 0, &pBus->aPciDev, "i82801");
-
-    /** @todo: ther chipset devices shall be registered too */
-    /** @todo: bridges? */
+    ich9pciRegisterInternal(pBus, -1, &pBus->aPciDev, "i82801");
+
+    /** @todo: other chipset devices shall be registered too */
+    /** @todo: what to with bridges? */
 
     return VINF_SUCCESS;
@@ -1574 +1581 @@
 static DECLCALLBACK(void) ich9pcibridgeReset(PPDMDEVINS pDevIns)
 {
+    PPCIBUS pBus = PDMINS_2_DATA(pDevIns, PPCIBUS);
+
+    /* Reset config space to default values. */
+    pBus->aPciDev.config[VBOX_PCI_PRIMARY_BUS] = 0;
+    pBus->aPciDev.config[VBOX_PCI_SECONDARY_BUS] = 0;
+    pBus->aPciDev.config[VBOX_PCI_SUBORDINATE_BUS] = 0;
 }
 
@@ -1582 +1595 @@
 static DECLCALLBACK(void) ich9pcibridgeRelocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta)
 {
+    PPCIBUS pBus = PDMINS_2_DATA(pDevIns, PPCIBUS);
+    pBus->pDevInsRC = PDMDEVINS_2_RCPTR(pDevIns);
+
+    /* Relocate RC pointers for the attached pci devices. */
+    for (uint32_t i = 0; i < RT_ELEMENTS(pBus->apDevices); i++)
+    {
+        if (pBus->apDevices[i])
+            pBus->apDevices[i]->Int.s.pBusRC += offDelta;
+    }
+
 }
 

trunk/src/VBox/Devices/Makefile.kmk

@@ -298 +298 @@
         Input/UsbMouse.cpp \
         Bus/DevPCI.cpp \
-        $(if $(VBOX_WITH_NEWPCI),Bus/DevPciIch9.cpp,) \
+        Bus/DevPciIch9.cpp \
         Graphics/DevVGA.cpp \
         Storage/DevATA.cpp \
@@ -551 +551 @@
  VBoxDDGC_SOURCES        = \
         Bus/DevPCI.cpp \
-        $(if $(VBOX_WITH_NEWPCI),Bus/DevPciIch9.cpp,) \
+        Bus/DevPciIch9.cpp \
         Graphics/DevVGA.cpp \
         Input/DevPS2.cpp \
@@ -663 +663 @@
 VBoxDDR0_SOURCES        = \
         Bus/DevPCI.cpp \
-        $(if $(VBOX_WITH_NEWPCI),Bus/DevPciIch9.cpp,) \
+        Bus/DevPciIch9.cpp \
         Graphics/DevVGA.cpp \
         Input/DevPS2.cpp \