diff options
| author | Andrew Schultz <alschult@umich.edu> | 2004-05-03 11:48:17 -0400 |
|---|---|---|
| committer | Andrew Schultz <alschult@umich.edu> | 2004-05-03 11:48:17 -0400 |
| commit | 8538ffdb3682d71c90c33b92b436a2d9cbdc42c3 (patch) | |
| tree | 9d0e79de7630c3f5765d422cf8752f663533dddb /dev/pciconfigall.cc | |
| parent | 53b54c2b65773374f617a73bb967554b706d7bbd (diff) | |
| parent | 6807c319b02af31626ab2ed716da6341924eb857 (diff) | |
| download | gem5-8538ffdb3682d71c90c33b92b436a2d9cbdc42c3.tar.xz | |
Merge zizzer:/bk/linux
into zower.eecs.umich.edu:/.automount/zizzer/z/alschult/DiskModel/linux
--HG--
extra : convert_revision : 8eca0fba9d96bffea7a24bce9b14f0284bd58c83
Diffstat (limited to 'dev/pciconfigall.cc')
| -rw-r--r-- | dev/pciconfigall.cc | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/dev/pciconfigall.cc b/dev/pciconfigall.cc index 4467ce1e5..226fd2749 100644 --- a/dev/pciconfigall.cc +++ b/dev/pciconfigall.cc @@ -39,23 +39,18 @@ #include "dev/scsi_ctrl.hh" #include "dev/pciconfigall.hh" #include "dev/pcidev.hh" -#include "dev/tsunamireg.h" -#include "dev/tsunami.hh" #include "mem/functional_mem/memory_control.hh" #include "sim/builder.hh" #include "sim/system.hh" using namespace std; -PciConfigAll::PciConfigAll(const string &name, Tsunami *t, Addr a, +PciConfigAll::PciConfigAll(const string &name, Addr a, MemoryController *mmu) - : FunctionalMemory(name), addr(a), tsunami(t) + : FunctionalMemory(name), addr(a) { mmu->add_child(this, Range<Addr>(addr, addr + size)); - // Put back pointer in tsunami - tsunami->pciconfig = this; - // Make all the pointers to devices null for(int x=0; x < MAX_PCI_DEV; x++) for(int y=0; y < MAX_PCI_FUNC; y++) @@ -103,7 +98,7 @@ PciConfigAll::read(MemReqPtr &req, uint8_t *data) } } - DPRINTFN("Tsunami PCI Configspace ERROR: read daddr=%#x size=%d\n", + DPRINTFN("PCI Configspace ERROR: read daddr=%#x size=%d\n", daddr, req->size); return No_Fault; @@ -166,7 +161,6 @@ PciConfigAll::unserialize(Checkpoint *cp, const std::string §ion) BEGIN_DECLARE_SIM_OBJECT_PARAMS(PciConfigAll) - SimObjectParam<Tsunami *> tsunami; SimObjectParam<MemoryController *> mmu; Param<Addr> addr; Param<Addr> mask; @@ -175,7 +169,6 @@ END_DECLARE_SIM_OBJECT_PARAMS(PciConfigAll) BEGIN_INIT_SIM_OBJECT_PARAMS(PciConfigAll) - INIT_PARAM(tsunami, "Tsunami"), INIT_PARAM(mmu, "Memory Controller"), INIT_PARAM(addr, "Device Address"), INIT_PARAM(mask, "Address Mask") @@ -184,7 +177,7 @@ END_INIT_SIM_OBJECT_PARAMS(PciConfigAll) CREATE_SIM_OBJECT(PciConfigAll) { - return new PciConfigAll(getInstanceName(), tsunami, addr, mmu); + return new PciConfigAll(getInstanceName(), addr, mmu); } REGISTER_SIM_OBJECT("PciConfigAll", PciConfigAll) |