diff options
author | Steve Reinhardt <stever@gmail.com> | 2013-07-11 21:56:50 -0500 |
---|---|---|
committer | Steve Reinhardt <stever@gmail.com> | 2013-07-11 21:56:50 -0500 |
commit | 502ad1e6757116867e0e0529c0c080320a2b440b (patch) | |
tree | 7f2f79fd913a23a4cfc6bdb9a3147551e6624c00 /src/dev/copy_engine.cc | |
parent | 2737650a69f0c56d325c2d9cfd45eef099fbd581 (diff) | |
download | gem5-502ad1e6757116867e0e0529c0c080320a2b440b.tar.xz |
dev: consistently end device classes in 'Device'
PciDev and IntDev stuck out as the only device classes that
ended in 'Dev' rather than 'Device'. This patch takes care
of that inconsistency.
Note that you may need to delete pre-existing files matching
build/*/python/m5/internal/param_* as scons does not pick up
indirect dependencies on imported python modules when generating
params, and the PciDev -> PciDevice rename takes place in a
file (dev/Device.py) that gets imported quite a bit.
Committed by: Nilay Vaish <nilay@cs.wisc.edu>
Diffstat (limited to 'src/dev/copy_engine.cc')
-rw-r--r-- | src/dev/copy_engine.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/dev/copy_engine.cc b/src/dev/copy_engine.cc index d6162b689..e4cd90c1c 100644 --- a/src/dev/copy_engine.cc +++ b/src/dev/copy_engine.cc @@ -60,7 +60,7 @@ using namespace CopyEngineReg; CopyEngine::CopyEngine(const Params *p) - : PciDev(p) + : PciDevice(p) { // All Reg regs are initialized to 0 by default regs.chanCount = p->ChanCnt; @@ -115,7 +115,7 @@ CopyEngine::getMasterPort(const std::string &if_name, PortID idx) { if (if_name != "dma") { // pass it along to our super class - return PciDev::getMasterPort(if_name, idx); + return PciDevice::getMasterPort(if_name, idx); } else { if (idx >= static_cast<int>(chan.size())) { panic("CopyEngine::getMasterPort: unknown index %d\n", idx); @@ -680,7 +680,7 @@ CopyEngine::drain(DrainManager *dm) void CopyEngine::serialize(std::ostream &os) { - PciDev::serialize(os); + PciDevice::serialize(os); regs.serialize(os); for (int x =0; x < chan.size(); x++) { nameOut(os, csprintf("%s.channel%d", name(), x)); @@ -691,7 +691,7 @@ CopyEngine::serialize(std::ostream &os) void CopyEngine::unserialize(Checkpoint *cp, const std::string §ion) { - PciDev::unserialize(cp, section); + PciDevice::unserialize(cp, section); regs.unserialize(cp, section); for (int x = 0; x < chan.size(); x++) chan[x]->unserialize(cp, csprintf("%s.channel%d", section, x)); |