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/pcidev.hh | |
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/pcidev.hh')
-rw-r--r-- | src/dev/pcidev.hh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/dev/pcidev.hh b/src/dev/pcidev.hh index df468d4c6..d4820c0ee 100644 --- a/src/dev/pcidev.hh +++ b/src/dev/pcidev.hh @@ -56,12 +56,12 @@ /** * PCI device, base implementation is only config space. */ -class PciDev : public DmaDevice +class PciDevice : public DmaDevice { class PciConfigPort : public SimpleTimingPort { protected: - PciDev *device; + PciDevice *device; virtual Tick recvAtomic(PacketPtr pkt); @@ -76,7 +76,7 @@ class PciDev : public DmaDevice Addr configAddr; public: - PciConfigPort(PciDev *dev, int busid, int devid, int funcid, + PciConfigPort(PciDevice *dev, int busid, int devid, int funcid, Platform *p); }; @@ -198,7 +198,7 @@ class PciDev : public DmaDevice * config file object PCIConfigData and registers the device with * a PciConfigAll object. */ - PciDev(const Params *params); + PciDevice(const Params *params); virtual void init(); |