diff options
author | Ron Dreslinski <rdreslin@umich.edu> | 2004-01-27 21:36:46 -0500 |
---|---|---|
committer | Ron Dreslinski <rdreslin@umich.edu> | 2004-01-27 21:36:46 -0500 |
commit | 3ccc0b1f968e3efaeccda65e06f862c899678312 (patch) | |
tree | 56244532839df17d2eebf7c8dc2a2b010565a2e8 /dev/tsunami.cc | |
parent | 6f3c09a12c7120b518e1c41d995094538b120ba0 (diff) | |
download | gem5-3ccc0b1f968e3efaeccda65e06f862c899678312.tar.xz |
Add support for RTC to interrupt, HACK in alpha_console temporary
dev/alpha_console.cc:
Fix reference to tlaserclock, HACK FOR NOW
dev/alpha_console.hh:
fix reference to tlaser_clock, HACK FOR NOW
dev/tsunami.cc:
Add proper tsunami chip pointers
dev/tsunami.hh:
add proper tsunami chip pointers add RTC interrupt capabilities
dev/tsunami_cchip.cc:
Add proper Interrupt for RTC
dev/tsunami_cchip.hh:
Add proper interrupt for RTC
dev/tsunami_io.cc:
dev/tsunami_io.hh:
Make RTC interrupt
dev/tsunami_pchip.cc:
dev/tsunami_pchip.hh:
Add back pointer to tsunami
--HG--
extra : convert_revision : 2b0a8616b0bed8d9962ee5ca643dce56b9922d52
Diffstat (limited to 'dev/tsunami.cc')
-rw-r--r-- | dev/tsunami.cc | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/dev/tsunami.cc b/dev/tsunami.cc index 95c671495..a8cf551d3 100644 --- a/dev/tsunami.cc +++ b/dev/tsunami.cc @@ -44,10 +44,9 @@ using namespace std; Tsunami::Tsunami(const string &name, ScsiController *s, EtherDev *e, - TlaserClock *c, TsunamiCChip *cc, TsunamiPChip *pc, SimConsole *con, - IntrControl *ic, int intr_freq) - : SimObject(name), intctrl(ic), cons(con), scsi(s), ethernet(e), - clock(c), cchip(cc), pchip(pc), interrupt_frequency(intr_freq) + SimConsole *con, IntrControl *ic, int intr_freq) + : SimObject(name), intrctrl(ic), cons(con), scsi(s), ethernet(e), + interrupt_frequency(intr_freq) { for (int i = 0; i < Tsunami::Max_CPUs; i++) intr_sum_type[i] = 0; @@ -69,9 +68,6 @@ BEGIN_DECLARE_SIM_OBJECT_PARAMS(Tsunami) SimObjectParam<ScsiController *> scsi; SimObjectParam<EtherDev *> ethernet; - SimObjectParam<TlaserClock *> clock; - SimObjectParam<TsunamiCChip *> cchip; - SimObjectParam<TsunamiPChip *> pchip; SimObjectParam<SimConsole *> cons; SimObjectParam<IntrControl *> intrctrl; Param<int> interrupt_frequency; @@ -82,9 +78,6 @@ BEGIN_INIT_SIM_OBJECT_PARAMS(Tsunami) INIT_PARAM(scsi, "scsi controller"), INIT_PARAM(ethernet, "ethernet controller"), - INIT_PARAM(clock, "turbolaser clock"), - INIT_PARAM(cchip, "cchip"), - INIT_PARAM(pchip, "pchip"), INIT_PARAM(cons, "system console"), INIT_PARAM(intrctrl, "interrupt controller"), INIT_PARAM_DFLT(interrupt_frequency, "frequency of interrupts", 1200) @@ -94,8 +87,8 @@ END_INIT_SIM_OBJECT_PARAMS(Tsunami) CREATE_SIM_OBJECT(Tsunami) { - return new Tsunami(getInstanceName(), scsi, ethernet, clock, - cchip, pchip, cons, intrctrl, interrupt_frequency); + return new Tsunami(getInstanceName(), scsi, ethernet, + cons, intrctrl, interrupt_frequency); } REGISTER_SIM_OBJECT("Tsunami", Tsunami) |