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/ide_ctrl.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/ide_ctrl.cc')
-rw-r--r-- | src/dev/ide_ctrl.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/dev/ide_ctrl.cc b/src/dev/ide_ctrl.cc index f33d603af..df02bf5f5 100644 --- a/src/dev/ide_ctrl.cc +++ b/src/dev/ide_ctrl.cc @@ -80,7 +80,7 @@ IdeController::Channel::~Channel() } IdeController::IdeController(Params *p) - : PciDev(p), primary(name() + ".primary", BARSize[0], BARSize[1]), + : PciDevice(p), primary(name() + ".primary", BARSize[0], BARSize[1]), secondary(name() + ".secondary", BARSize[2], BARSize[3]), bmiAddr(0), bmiSize(BARSize[4]), primaryTiming(htole(timeRegWithDecodeEn)), @@ -132,7 +132,7 @@ void IdeController::intrPost() { primary.bmiRegs.status.intStatus = 1; - PciDev::intrPost(); + PciDevice::intrPost(); } void @@ -157,7 +157,7 @@ IdeController::readConfig(PacketPtr pkt) { int offset = pkt->getAddr() & PCI_CONFIG_SIZE; if (offset < PCI_DEVICE_SPECIFIC) { - return PciDev::readConfig(pkt); + return PciDevice::readConfig(pkt); } pkt->allocate(); @@ -232,7 +232,7 @@ IdeController::writeConfig(PacketPtr pkt) { int offset = pkt->getAddr() & PCI_CONFIG_SIZE; if (offset < PCI_DEVICE_SPECIFIC) { - PciDev::writeConfig(pkt); + PciDevice::writeConfig(pkt); } else { switch (pkt->getSize()) { case sizeof(uint8_t): @@ -523,8 +523,8 @@ IdeController::write(PacketPtr pkt) void IdeController::serialize(std::ostream &os) { - // Serialize the PciDev base class - PciDev::serialize(os); + // Serialize the PciDevice base class + PciDevice::serialize(os); // Serialize channels primary.serialize("primary", os); @@ -565,8 +565,8 @@ IdeController::Channel::serialize(const std::string &base, std::ostream &os) void IdeController::unserialize(Checkpoint *cp, const std::string §ion) { - // Unserialize the PciDev base class - PciDev::unserialize(cp, section); + // Unserialize the PciDevice base class + PciDevice::unserialize(cp, section); // Unserialize channels primary.unserialize("primary", cp, section); |