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/ns_gige.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/ns_gige.cc')
-rw-r--r-- | src/dev/ns_gige.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/dev/ns_gige.cc b/src/dev/ns_gige.cc index 9269f7935..67f8e0345 100644 --- a/src/dev/ns_gige.cc +++ b/src/dev/ns_gige.cc @@ -146,7 +146,7 @@ NSGigE::writeConfig(PacketPtr pkt) { int offset = pkt->getAddr() & PCI_CONFIG_SIZE; if (offset < PCI_DEVICE_SPECIFIC) - PciDev::writeConfig(pkt); + PciDevice::writeConfig(pkt); else panic("Device specific PCI config space not implemented!\n"); @@ -2126,8 +2126,8 @@ NSGigE::drainResume() void NSGigE::serialize(ostream &os) { - // Serialize the PciDev base class - PciDev::serialize(os); + // Serialize the PciDevice base class + PciDevice::serialize(os); /* * Finalize any DMA events now. @@ -2298,8 +2298,8 @@ NSGigE::serialize(ostream &os) void NSGigE::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_SCALAR(regs.command); UNSERIALIZE_SCALAR(regs.config); |