Merge saidi@zizzer:/z/m5/Bitkeeper/m5/

[gem5.git] / dev / pciconfigall.cc

diff --git a/dev/pciconfigall.cc b/dev/pciconfigall.cc
index 63943c7be17f55fd2a16ee2f3e0d869bb8658d14..226fd2749ec57b04087ba0fbe17eef0e2b4bcd11 100644 (file)
--- 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++)
@@ -63,9 +58,9 @@ PCIConfigAll::PCIConfigAll(const string &name, Tsunami *t, Addr a,
 }
 
 Fault
-PCIConfigAll::read(MemReqPtr &req, uint8_t *data)
+PciConfigAll::read(MemReqPtr &req, uint8_t *data)
 {
-    DPRINTF(PCIConfigAll, "read  va=%#x size=%d\n",
+    DPRINTF(PciConfigAll, "read  va=%#x size=%d\n",
             req->vaddr, req->size);
 
     Addr daddr = (req->paddr - (addr & PA_IMPL_MASK));
@@ -103,14 +98,14 @@ 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;
 }
 
 Fault
-PCIConfigAll::write(MemReqPtr &req, const uint8_t *data)
+PciConfigAll::write(MemReqPtr &req, const uint8_t *data)
 {
     Addr daddr = (req->paddr - (addr & PA_IMPL_MASK));
 
@@ -142,7 +137,7 @@ PCIConfigAll::write(MemReqPtr &req, const uint8_t *data)
             }
     }
 
-    DPRINTF(PCIConfigAll, "write - va=%#x size=%d data=%#x\n",
+    DPRINTF(PciConfigAll, "write - va=%#x size=%d data=%#x\n",
             req->vaddr, req->size, word_value);
 
     devices[device][func]->WriteConfig(reg, req->size, word_value);
@@ -151,42 +146,40 @@ PCIConfigAll::write(MemReqPtr &req, const uint8_t *data)
 }
 
 void
-PCIConfigAll::serialize(std::ostream &os)
+PciConfigAll::serialize(std::ostream &os)
 {
     // code should be written
 }
 
 void
-PCIConfigAll::unserialize(Checkpoint *cp, const std::string &section)
+PciConfigAll::unserialize(Checkpoint *cp, const std::string &section)
 {
     //code should be written
 }
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 
-BEGIN_DECLARE_SIM_OBJECT_PARAMS(PCIConfigAll)
+BEGIN_DECLARE_SIM_OBJECT_PARAMS(PciConfigAll)
 
-    SimObjectParam<Tsunami *> tsunami;
     SimObjectParam<MemoryController *> mmu;
     Param<Addr> addr;
     Param<Addr> mask;
 
-END_DECLARE_SIM_OBJECT_PARAMS(PCIConfigAll)
+END_DECLARE_SIM_OBJECT_PARAMS(PciConfigAll)
 
-BEGIN_INIT_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")
 
-END_INIT_SIM_OBJECT_PARAMS(PCIConfigAll)
+END_INIT_SIM_OBJECT_PARAMS(PciConfigAll)
 
-CREATE_SIM_OBJECT(PCIConfigAll)
+CREATE_SIM_OBJECT(PciConfigAll)
 {
-    return new PCIConfigAll(getInstanceName(), tsunami, addr, mmu);
+    return new PciConfigAll(getInstanceName(), addr, mmu);
 }
 
-REGISTER_SIM_OBJECT("PCIConfigAll", PCIConfigAll)
+REGISTER_SIM_OBJECT("PciConfigAll", PciConfigAll)
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS