diff options
| -rw-r--r-- | dev/tsunami.cc | 6 | ||||
| -rw-r--r-- | dev/tsunami.hh | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/dev/tsunami.cc b/dev/tsunami.cc index a8cf551d3..c6823ffa4 100644 --- a/dev/tsunami.cc +++ b/dev/tsunami.cc @@ -33,7 +33,7 @@ #include "cpu/intr_control.hh" #include "dev/console.hh" #include "dev/etherdev.hh" -#include "dev/scsi_ctrl.hh" +#include "dev/adaptec_ctrl.hh" #include "dev/tlaser_clock.hh" #include "dev/tsunami_cchip.hh" #include "dev/tsunami_pchip.hh" @@ -43,7 +43,7 @@ using namespace std; -Tsunami::Tsunami(const string &name, ScsiController *s, EtherDev *e, +Tsunami::Tsunami(const string &name, AdaptecController *s, EtherDev *e, SimConsole *con, IntrControl *ic, int intr_freq) : SimObject(name), intrctrl(ic), cons(con), scsi(s), ethernet(e), interrupt_frequency(intr_freq) @@ -66,7 +66,7 @@ Tsunami::unserialize(Checkpoint *cp, const std::string §ion) BEGIN_DECLARE_SIM_OBJECT_PARAMS(Tsunami) - SimObjectParam<ScsiController *> scsi; + SimObjectParam<AdaptecController *> scsi; SimObjectParam<EtherDev *> ethernet; SimObjectParam<SimConsole *> cons; SimObjectParam<IntrControl *> intrctrl; diff --git a/dev/tsunami.hh b/dev/tsunami.hh index e6623899d..f45bb2059 100644 --- a/dev/tsunami.hh +++ b/dev/tsunami.hh @@ -40,7 +40,7 @@ class IntrControl; class ConsoleListener; class SimConsole; -class ScsiController; +class AdaptecController; class TlaserClock; class EtherDev; class TsunamiCChip; @@ -67,7 +67,7 @@ class Tsunami : public SimObject SimConsole *cons; /** Pointer to the SCSI controller device */ - ScsiController *scsi; + AdaptecController *scsi; /** Pointer to the ethernet controller device */ EtherDev *ethernet; @@ -99,7 +99,7 @@ class Tsunami : public SimObject * Constructor for the Tsunami Class. * @param */ - Tsunami(const std::string &name, ScsiController *scsi, + Tsunami(const std::string &name, AdaptecController *scsi, EtherDev *ethernet, SimConsole *, IntrControl *intctrl, int intrFreq); |