summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2004-01-22 00:36:26 -0500
committerAli Saidi <saidi@eecs.umich.edu>2004-01-22 00:36:26 -0500
commitd9e8ecbf46ead49c2c8174c1362a5cb136b4b5f9 (patch)
tree85daf2b1a81f409eabe51ec28e870ebab09a301e
parentde17a0330443dac568f99d4fabaef9b6a8dcff46 (diff)
downloadgem5-d9e8ecbf46ead49c2c8174c1362a5cb136b4b5f9.tar.xz
renamed tsunami_dma to tsunami_io
dev/tsunami_io.cc: renamed to io instead of dma since it's more than the DMA controller now dev/tsunami_io.hh: renamed from dma to io since it's more than dma just now --HG-- rename : dev/tsunami_dma.cc => dev/tsunami_io.cc rename : dev/tsunami_dma.hh => dev/tsunami_io.hh extra : convert_revision : 4ffb69679eb7cea5725fae3446e088899f1f9315
-rw-r--r--dev/tsunami_io.cc (renamed from dev/tsunami_dma.cc)30
-rw-r--r--dev/tsunami_io.hh (renamed from dev/tsunami_dma.hh)8
2 files changed, 19 insertions, 19 deletions
diff --git a/dev/tsunami_dma.cc b/dev/tsunami_io.cc
index 4b1dca74c..d5f2af960 100644
--- a/dev/tsunami_dma.cc
+++ b/dev/tsunami_io.cc
@@ -14,7 +14,7 @@
#include "dev/etherdev.hh"
#include "dev/scsi_ctrl.hh"
#include "dev/tlaser_clock.hh"
-#include "dev/tsunami_dma.hh"
+#include "dev/tsunami_io.hh"
#include "dev/tsunamireg.h"
#include "dev/tsunami.hh"
#include "mem/functional_mem/memory_control.hh"
@@ -23,7 +23,7 @@
using namespace std;
-TsunamiDMA::TsunamiDMA(const string &name, /*Tsunami *t,*/
+TsunamiIO::TsunamiIO(const string &name, /*Tsunami *t,*/
Addr addr, Addr mask, MemoryController *mmu)
: MmapDevice(name, addr, mask, mmu)/*, tsunami(t) */
{
@@ -31,9 +31,9 @@ TsunamiDMA::TsunamiDMA(const string &name, /*Tsunami *t,*/
}
Fault
-TsunamiDMA::read(MemReqPtr req, uint8_t *data)
+TsunamiIO::read(MemReqPtr req, uint8_t *data)
{
- DPRINTF(Tsunami, "dma read va=%#x size=%d IOPorrt=%#x\n",
+ DPRINTF(Tsunami, "io read va=%#x size=%d IOPorrt=%#x\n",
req->vaddr, req->size, req->vaddr & 0xfff);
// Addr daddr = (req->paddr & addr_mask) >> 6;
@@ -46,9 +46,9 @@ TsunamiDMA::read(MemReqPtr req, uint8_t *data)
}
Fault
-TsunamiDMA::write(MemReqPtr req, const uint8_t *data)
+TsunamiIO::write(MemReqPtr req, const uint8_t *data)
{
- DPRINTF(Tsunami, "dma write - va=%#x size=%d IOPort=%#x\n",
+ DPRINTF(Tsunami, "io write - va=%#x size=%d IOPort=%#x\n",
req->vaddr, req->size, req->vaddr & 0xfff);
Addr daddr = (req->paddr & addr_mask);
@@ -90,38 +90,38 @@ TsunamiDMA::write(MemReqPtr req, const uint8_t *data)
}
void
-TsunamiDMA::serialize(std::ostream &os)
+TsunamiIO::serialize(std::ostream &os)
{
// code should be written
}
void
-TsunamiDMA::unserialize(Checkpoint *cp, const std::string &section)
+TsunamiIO::unserialize(Checkpoint *cp, const std::string &section)
{
//code should be written
}
-BEGIN_DECLARE_SIM_OBJECT_PARAMS(TsunamiDMA)
+BEGIN_DECLARE_SIM_OBJECT_PARAMS(TsunamiIO)
// SimObjectParam<Tsunami *> tsunami;
SimObjectParam<MemoryController *> mmu;
Param<Addr> addr;
Param<Addr> mask;
-END_DECLARE_SIM_OBJECT_PARAMS(TsunamiDMA)
+END_DECLARE_SIM_OBJECT_PARAMS(TsunamiIO)
-BEGIN_INIT_SIM_OBJECT_PARAMS(TsunamiDMA)
+BEGIN_INIT_SIM_OBJECT_PARAMS(TsunamiIO)
// INIT_PARAM(tsunami, "Tsunami"),
INIT_PARAM(mmu, "Memory Controller"),
INIT_PARAM(addr, "Device Address"),
INIT_PARAM(mask, "Address Mask")
-END_INIT_SIM_OBJECT_PARAMS(TsunamiDMA)
+END_INIT_SIM_OBJECT_PARAMS(TsunamiIO)
-CREATE_SIM_OBJECT(TsunamiDMA)
+CREATE_SIM_OBJECT(TsunamiIO)
{
- return new TsunamiDMA(getInstanceName(), /*tsunami,*/ addr, mask, mmu);
+ return new TsunamiIO(getInstanceName(), /*tsunami,*/ addr, mask, mmu);
}
-REGISTER_SIM_OBJECT("TsunamiDMA", TsunamiDMA)
+REGISTER_SIM_OBJECT("TsunamiIO", TsunamiIO)
diff --git a/dev/tsunami_dma.hh b/dev/tsunami_io.hh
index f23abce2d..943df77c2 100644
--- a/dev/tsunami_dma.hh
+++ b/dev/tsunami_io.hh
@@ -37,9 +37,9 @@
#include "dev/tsunami.hh"
/*
- * Tsunami CChip
+ * Tsunami I/O device
*/
-class TsunamiDMA : public MmapDevice
+class TsunamiIO : public MmapDevice
{
public:
@@ -51,7 +51,7 @@ class TsunamiDMA : public MmapDevice
uint8_t mode2;
public:
- TsunamiDMA(const std::string &name, /*Tsunami *t,*/
+ TsunamiIO(const std::string &name, /*Tsunami *t,*/
Addr addr, Addr mask, MemoryController *mmu);
virtual Fault read(MemReqPtr req, uint8_t *data);
@@ -61,4 +61,4 @@ class TsunamiDMA : public MmapDevice
virtual void unserialize(Checkpoint *cp, const std::string &section);
};
-#endif // __TSUNAMI_DMA_HH__
+#endif // __TSUNAMI_IO_HH__