From 502ad1e6757116867e0e0529c0c080320a2b440b Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Thu, 11 Jul 2013 21:56:50 -0500 Subject: 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 --- src/dev/x86/SConscript | 2 +- src/dev/x86/i82094aa.cc | 6 +++--- src/dev/x86/i82094aa.hh | 2 +- src/dev/x86/i8259.cc | 2 +- src/dev/x86/i8259.hh | 2 +- src/dev/x86/intdev.cc | 4 ++-- src/dev/x86/intdev.hh | 18 +++++++++--------- 7 files changed, 18 insertions(+), 18 deletions(-) (limited to 'src/dev/x86') diff --git a/src/dev/x86/SConscript b/src/dev/x86/SConscript index 038e4824b..331f0a229 100644 --- a/src/dev/x86/SConscript +++ b/src/dev/x86/SConscript @@ -67,4 +67,4 @@ if env['TARGET_ISA'] == 'x86': SimObject('X86IntPin.py') Source('intdev.cc') - DebugFlag('IntDev') + DebugFlag('IntDevice') diff --git a/src/dev/x86/i82094aa.cc b/src/dev/x86/i82094aa.cc index 1d3defa12..f547d7c1b 100644 --- a/src/dev/x86/i82094aa.cc +++ b/src/dev/x86/i82094aa.cc @@ -39,7 +39,7 @@ #include "sim/system.hh" X86ISA::I82094AA::I82094AA(Params *p) - : BasicPioDevice(p), IntDev(this, p->int_latency), + : BasicPioDevice(p), IntDevice(this, p->int_latency), extIntPic(p->external_int_pic), lowestPriorityOffset(0) { // This assumes there's only one I/O APIC in the system and since the apic @@ -65,10 +65,10 @@ X86ISA::I82094AA::init() { // The io apic must register its address ranges on both its pio port // via the piodevice init() function and its int port that it inherited - // from IntDev. Note IntDev is not a SimObject itself. + // from IntDevice. Note IntDevice is not a SimObject itself. BasicPioDevice::init(); - IntDev::init(); + IntDevice::init(); } BaseMasterPort & diff --git a/src/dev/x86/i82094aa.hh b/src/dev/x86/i82094aa.hh index a8d79fde1..4fe927ae4 100644 --- a/src/dev/x86/i82094aa.hh +++ b/src/dev/x86/i82094aa.hh @@ -44,7 +44,7 @@ namespace X86ISA class I8259; class Interrupts; -class I82094AA : public BasicPioDevice, public IntDev +class I82094AA : public BasicPioDevice, public IntDevice { public: BitUnion64(RedirTableEntry) diff --git a/src/dev/x86/i8259.cc b/src/dev/x86/i8259.cc index 4e8c10181..fa54ad5d7 100644 --- a/src/dev/x86/i8259.cc +++ b/src/dev/x86/i8259.cc @@ -35,7 +35,7 @@ #include "mem/packet.hh" #include "mem/packet_access.hh" -X86ISA::I8259::I8259(Params * p) : BasicPioDevice(p), IntDev(this), +X86ISA::I8259::I8259(Params * p) : BasicPioDevice(p), IntDevice(this), latency(p->pio_latency), output(p->output), mode(p->mode), slave(p->slave), IRR(0), ISR(0), IMR(0), diff --git a/src/dev/x86/i8259.hh b/src/dev/x86/i8259.hh index eee5ec171..2d6080cc3 100644 --- a/src/dev/x86/i8259.hh +++ b/src/dev/x86/i8259.hh @@ -39,7 +39,7 @@ namespace X86ISA { -class I8259 : public BasicPioDevice, public IntDev +class I8259 : public BasicPioDevice, public IntDevice { protected: static const int NumLines = 8; diff --git a/src/dev/x86/intdev.cc b/src/dev/x86/intdev.cc index 3f8e49ce1..883073302 100644 --- a/src/dev/x86/intdev.cc +++ b/src/dev/x86/intdev.cc @@ -43,7 +43,7 @@ #include "dev/x86/intdev.hh" void -X86ISA::IntDev::IntMasterPort::sendMessage(ApicList apics, +X86ISA::IntDevice::IntMasterPort::sendMessage(ApicList apics, TriggerIntMessage message, bool timing) { @@ -66,7 +66,7 @@ X86ISA::IntDev::IntMasterPort::sendMessage(ApicList apics, } void -X86ISA::IntDev::init() +X86ISA::IntDevice::init() { if (!intMasterPort.isConnected()) { panic("Int port not connected to anything!"); diff --git a/src/dev/x86/intdev.hh b/src/dev/x86/intdev.hh index 99c361bae..078ea2b6f 100644 --- a/src/dev/x86/intdev.hh +++ b/src/dev/x86/intdev.hh @@ -60,16 +60,16 @@ namespace X86ISA { typedef std::list ApicList; -class IntDev +class IntDevice { protected: class IntSlavePort : public MessageSlavePort { - IntDev * device; + IntDevice * device; public: IntSlavePort(const std::string& _name, MemObject* _parent, - IntDev* dev) : + IntDevice* dev) : MessageSlavePort(_name, _parent), device(dev) { } @@ -89,11 +89,11 @@ class IntDev class IntMasterPort : public MessageMasterPort { - IntDev* device; + IntDevice* device; Tick latency; public: IntMasterPort(const std::string& _name, MemObject* _parent, - IntDev* dev, Tick _latency) : + IntDevice* dev, Tick _latency) : MessageMasterPort(_name, _parent), device(dev), latency(_latency) { } @@ -112,12 +112,12 @@ class IntDev IntMasterPort intMasterPort; public: - IntDev(MemObject * parent, Tick latency = 0) : + IntDevice(MemObject * parent, Tick latency = 0) : intMasterPort(parent->name() + ".int_master", parent, this, latency) { } - virtual ~IntDev() + virtual ~IntDevice() {} virtual void init(); @@ -163,7 +163,7 @@ class IntDev class IntSinkPin : public SimObject { public: - IntDev * device; + IntDevice * device; int number; typedef X86IntSinkPinParams Params; @@ -175,7 +175,7 @@ class IntSinkPin : public SimObject } IntSinkPin(Params *p) : SimObject(p), - device(dynamic_cast(p->device)), number(p->number) + device(dynamic_cast(p->device)), number(p->number) { assert(device); } -- cgit v1.2.3