diff options
Diffstat (limited to 'src/dev/alpha')
-rw-r--r-- | src/dev/alpha/tsunami.cc | 7 | ||||
-rw-r--r-- | src/dev/alpha/tsunami.hh | 10 |
2 files changed, 6 insertions, 11 deletions
diff --git a/src/dev/alpha/tsunami.cc b/src/dev/alpha/tsunami.cc index bac2a8682..5bc0de5da 100644 --- a/src/dev/alpha/tsunami.cc +++ b/src/dev/alpha/tsunami.cc @@ -42,15 +42,14 @@ #include "dev/alpha/tsunami_pchip.hh" #include "dev/alpha/tsunami_io.hh" #include "dev/alpha/tsunami.hh" -#include "params/Tsunami.hh" #include "sim/system.hh" using namespace std; //Should this be AlphaISA? using namespace TheISA; -Tsunami::Tsunami(const string &name, System *s, IntrControl *ic) - : Platform(name, ic), system(s) +Tsunami::Tsunami(const Params *p) + : Platform(p), system(p->system) { // set the back pointer from the system to myself system->platform = this; @@ -117,5 +116,5 @@ Tsunami::unserialize(Checkpoint *cp, const std::string §ion) Tsunami * TsunamiParams::create() { - return new Tsunami(name, system, intrctrl); + return new Tsunami(this); } diff --git a/src/dev/alpha/tsunami.hh b/src/dev/alpha/tsunami.hh index 6fbfac851..44c5d41a4 100644 --- a/src/dev/alpha/tsunami.hh +++ b/src/dev/alpha/tsunami.hh @@ -38,6 +38,7 @@ #define __DEV_TSUNAMI_HH__ #include "dev/platform.hh" +#include "params/Tsunami.hh" class IdeController; class TsunamiCChip; @@ -80,13 +81,8 @@ class Tsunami : public Platform int ipi_pending[Tsunami::Max_CPUs]; public: - /** - * Constructor for the Tsunami Class. - * @param name name of the object - * @param s system the object belongs to - * @param intctrl pointer to the interrupt controller - */ - Tsunami(const std::string &name, System *s, IntrControl *intctrl); + typedef TsunamiParams Params; + Tsunami(const Params *p); /** * Return the interrupting frequency to AlphaAccess |