diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2006-07-06 14:41:09 -0400 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-07-06 14:41:09 -0400 |
| commit | 4b741100714c6f20749f344ddd4b16459f28df72 (patch) | |
| tree | 613d4bf11ced3c8df4b5bb2e9a68a3df04b11333 /src/dev/sinic.cc | |
| parent | e60f998e2993df35460c8835016b3043a13da80a (diff) | |
| parent | 93839380e7dc4799d234843d10329c03d38487fa (diff) | |
| download | gem5-4b741100714c6f20749f344ddd4b16459f28df72.tar.xz | |
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem
--HG--
extra : convert_revision : 4669e87d29fa3e0ca9009f6b9dce72113220d7bc
Diffstat (limited to 'src/dev/sinic.cc')
| -rw-r--r-- | src/dev/sinic.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/dev/sinic.cc b/src/dev/sinic.cc index a0223733b..dddda1f1c 100644 --- a/src/dev/sinic.cc +++ b/src/dev/sinic.cc @@ -37,7 +37,6 @@ #include "cpu/intr_control.hh" #include "dev/etherlink.hh" #include "dev/sinic.hh" -#include "dev/pciconfigall.hh" #include "mem/packet.hh" #include "sim/builder.hh" #include "sim/debug.hh" @@ -1623,7 +1622,6 @@ BEGIN_DECLARE_SIM_OBJECT_PARAMS(Device) SimObjectParam<System *> system; SimObjectParam<Platform *> platform; - SimObjectParam<PciConfigAll *> configspace; SimObjectParam<PciConfigData *> configdata; Param<uint32_t> pci_bus; Param<uint32_t> pci_dev; @@ -1666,7 +1664,6 @@ BEGIN_INIT_SIM_OBJECT_PARAMS(Device) INIT_PARAM(system, "System pointer"), INIT_PARAM(platform, "Platform pointer"), - INIT_PARAM(configspace, "PCI Configspace"), INIT_PARAM(configdata, "PCI Config data"), INIT_PARAM(pci_bus, "PCI bus ID"), INIT_PARAM(pci_dev, "PCI device number"), @@ -1711,7 +1708,6 @@ CREATE_SIM_OBJECT(Device) params->name = getInstanceName(); params->platform = platform; params->system = system; - params->configSpace = configspace; params->configData = configdata; params->busNum = pci_bus; params->deviceNum = pci_dev; |