Changeset 32037 in vbox for trunk/src/VBox

Timestamp:

Aug 27, 2010 10:23:14 AM (14 years ago)

Author:

vboxsync

Message:

PCI work: make ICH9 PCI an additional device, not alternative implementation

Location:

trunk/src/VBox/Devices

Files:

• Bus/DevPciIch9.cpp (moved) (moved from trunk/src/VBox/Devices/Bus/DevPCI-new.cpp ) (17 diffs)
• Makefile.kmk (modified) (5 diffs)

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * DevPCI - PCI BUS Device.
+ * DevPCI - ICH9 southbridge PCI bus emulation Device.
  */
 
@@ -65 +65 @@
 } PCIBUS, *PPCIBUS;
 
-/**
- * PIIX3 ISA Bridge state.
- */
-typedef struct
-{
-    /** The PCI device of the bridge. */
-    PCIDEVICE dev;
-} PIIX3, *PPIIX3;
-
 
 /** @def PCI_IRQ_PINS
@@ -104 +95 @@
 #endif
 
-    /** ISA bridge state. */
-    PIIX3               PIIX3State;
     /** PCI bus which is attached to the host-to-PCI bridge. */
     PCIBUS              PciBus;
@@ -128 +117 @@
 #ifdef IN_RING3
 
-static DECLCALLBACK(int) pciConstruct(PPDMDEVINS pDevIns, 
-                                      int        iInstance, 
-                                      PCFGMNODE  pCfg)
+static DECLCALLBACK(int) ich9pciConstruct(PPDMDEVINS pDevIns,
+                                          int        iInstance,
+                                          PCFGMNODE  pCfg)
 {
     int rc;
     Assert(iInstance == 0);
-    
+
     /*
      * Validate and read configuration.
@@ -147 +136 @@
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed to query boolean value \"IOAPIC\""));
-    
+
     /* check if RC code is enabled. */
     bool fGCEnabled;
@@ -166 +155 @@
      * Init data and register the PCI bus.
      */
-    PPCIGLOBALS pGlobals = PDMINS_2_DATA(pDevIns, PPCIGLOBALS);    
+    PPCIGLOBALS pGlobals = PDMINS_2_DATA(pDevIns, PPCIGLOBALS);
     pGlobals->fUseIoApic          = fUseIoApic;
-    
+
     return VINF_SUCCESS;
 }
@@ -175 +164 @@
  * @copydoc FNPDMDEVRELOCATE
  */
-static DECLCALLBACK(void) pciRelocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta)
+static DECLCALLBACK(void) ich9pciRelocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta)
 {
 }
@@ -182 +171 @@
  * @interface_method_impl{PDMDEVREG,pfnConstruct}
  */
-static DECLCALLBACK(int)   pcibridgeConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
+static DECLCALLBACK(int)   ich9pcibridgeConstruct(PPDMDEVINS pDevIns, 
+                                                  int        iInstance, 
+                                                  PCFGMNODE  pCfg)
 {
     int rc;
@@ -213 +204 @@
  * @copydoc FNPDMDEVRESET
  */
-static DECLCALLBACK(void) pcibridgeReset(PPDMDEVINS pDevIns)
+static DECLCALLBACK(void) ich9pcibridgeReset(PPDMDEVINS pDevIns)
 {
 }
@@ -221 +212 @@
  * @copydoc FNPDMDEVRELOCATE
  */
-static DECLCALLBACK(void) pcibridgeRelocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta)
+static DECLCALLBACK(void) ich9pcibridgeRelocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta)
 {
 }
@@ -228 +219 @@
  * The PCI bus device registration structure.
  */
-const PDMDEVREG g_DevicePCI =
+const PDMDEVREG g_DevicePciIch9 =
 {
     /* u32Version */
     PDM_DEVREG_VERSION,
     /* szName */
-    "pci",
+    "ich9pci",
     /* szRCMod */
     "VBoxDDGC.gc",
@@ -239 +230 @@
     "VBoxDDR0.r0",
     /* pszDescription */
-    "i440FX PCI bridge and PIIX3 ISA bridge.",
+    "ICH9 PCI bridge",
     /* fFlags */
     PDM_DEVREG_FLAGS_DEFAULT_BITS | PDM_DEVREG_FLAGS_RC | PDM_DEVREG_FLAGS_R0,
@@ -249 +240 @@
     sizeof(PCIGLOBALS),
     /* pfnConstruct */
-    pciConstruct,
+    ich9pciConstruct,
     /* pfnDestruct */
     NULL,
     /* pfnRelocate */
-    pciRelocate,
+    ich9pciRelocate,
     /* pfnIOCtl */
     NULL,
@@ -284 +275 @@
  * for the PCI-to-PCI bridge.
  */
-const PDMDEVREG g_DevicePCIBridge =
+const PDMDEVREG g_DevicePciIch9Bridge =
 {
     /* u32Version */
     PDM_DEVREG_VERSION,
     /* szName */
-    "pcibridge",
+    "ich9pcibridge",
     /* szRCMod */
     "VBoxDDGC.gc",
@@ -295 +286 @@
     "VBoxDDR0.r0",
     /* pszDescription */
-    "82801 Mobile PCI to PCI bridge",
+    "ICH9 PCI to PCI bridge",
     /* fFlags */
     PDM_DEVREG_FLAGS_DEFAULT_BITS | PDM_DEVREG_FLAGS_RC | PDM_DEVREG_FLAGS_R0,
@@ -305 +296 @@
     sizeof(PCIBUS),
     /* pfnConstruct */
-    pcibridgeConstruct,
+    ich9pcibridgeConstruct,
     /* pfnDestruct */
     NULL,
     /* pfnRelocate */
-    pcibridgeRelocate,
+    ich9pcibridgeRelocate,
     /* pfnIOCtl */
     NULL,
@@ -315 +306 @@
     NULL,
     /* pfnReset */
-    pcibridgeReset,
+    ich9pcibridgeReset,
     /* pfnSuspend */
     NULL,

trunk/src/VBox/Devices/Makefile.kmk

@@ -187 +187 @@
 endif
 
-ifdef VBOX_WITH_NEWPCI
- DevPCI.cpp           := Bus/DevPCI-new.cpp
-else
- DevPCI.cpp           := Bus/DevPCI.cpp
-endif
-
-
 VBoxDD_LIBS             = \
         $(PATH_LIB)/DevicesR3$(VBOX_SUFF_LIB) \
@@ -304 +297 @@
         Input/UsbKbd.cpp \
         Input/UsbMouse.cpp \
-        $(DevPCI.cpp) \
+        Bus/DevPCI.cpp \
+        $(if $(VBOX_WITH_NEWPCI),Bus/DevPciIch9.cpp,) \
         Graphics/DevVGA.cpp \
         Storage/DevATA.cpp \
@@ -537 +531 @@
 
 # For finding PCIInternal.h from VBox/pci.h.
-$(DevPCI.cpp)_INCS      = Bus
+Bus/DevPCI.cpp_INCS      = Bus
+Bus/DevPciIch9.cpp_INCS  = Bus
 
 # For finding and generating vbetables.h (see Graphics/BIOS/Makefile.kmk).
@@ -556 +551 @@
         $(PATH_SUB_CURRENT)
  VBoxDDGC_SOURCES        = \
-        $(DevPCI.cpp) \
+        Bus/DevPCI.cpp \
+        $(if $(VBOX_WITH_NEWPCI),Bus/DevPciIch9.cpp,) \
         Graphics/DevVGA.cpp \
         Input/DevPS2.cpp \
@@ -667 +663 @@
         $(PATH_SUB_CURRENT)
 VBoxDDR0_SOURCES        = \
-        $(DevPCI.cpp) \
+        Bus/DevPCI.cpp \
+        $(if $(VBOX_WITH_NEWPCI),Bus/DevPciIch9.cpp,) \
         Graphics/DevVGA.cpp \
         Input/DevPS2.cpp \