one step closer to booting

dev/alpha_access.h:
    removed my attempted hack to get console compling in linux
dev/tsunami.cc:
dev/tsunami.hh:
    added pchip pointer to tsunami
dev/tsunami_cchip.cc:
    made printing better
dev/tsunami_cchip.hh:
    commented out back pointer for now, since the parser has issues with it
dev/tsunamireg.h:
    added pchip registers

--HG--
extra : convert_revision : b4fceb7d08e757d9aaf37df8eb1bcd5ae29ce0da

1 files changed, 6 insertions, 3 deletions

diff --git a/dev/tsunami.cc b/dev/tsunami.cc
index 4024db884..95c671495 100644
--- a/dev/tsunami.cc
+++ b/dev/tsunami.cc
@@ -36,6 +36,7 @@
 #include "dev/scsi_ctrl.hh"
 #include "dev/tlaser_clock.hh"
 #include "dev/tsunami_cchip.hh"
+#include "dev/tsunami_pchip.hh"
 #include "dev/tsunami.hh"
 #include "sim/builder.hh"
 #include "sim/system.hh"
@@ -43,10 +44,10 @@
 using namespace std;
 
 Tsunami::Tsunami(const string &name, ScsiController *s, EtherDev *e,
-                       TlaserClock *c, TsunamiCChip *cc, SimConsole *con,
+                       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), interrupt_frequency(intr_freq)
+      clock(c), cchip(cc), pchip(pc), interrupt_frequency(intr_freq)
 {
     for (int i = 0; i < Tsunami::Max_CPUs; i++)
         intr_sum_type[i] = 0;
@@ -70,6 +71,7 @@ BEGIN_DECLARE_SIM_OBJECT_PARAMS(Tsunami)
     SimObjectParam<EtherDev *> ethernet;
     SimObjectParam<TlaserClock *> clock;
     SimObjectParam<TsunamiCChip *> cchip;
+    SimObjectParam<TsunamiPChip *> pchip;
     SimObjectParam<SimConsole *> cons;
     SimObjectParam<IntrControl *> intrctrl;
     Param<int> interrupt_frequency;
@@ -82,6 +84,7 @@ BEGIN_INIT_SIM_OBJECT_PARAMS(Tsunami)
     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)
@@ -92,7 +95,7 @@ END_INIT_SIM_OBJECT_PARAMS(Tsunami)
 CREATE_SIM_OBJECT(Tsunami)
 {
     return new Tsunami(getInstanceName(), scsi, ethernet, clock,
-                           cchip, cons, intrctrl, interrupt_frequency);
+                           cchip, pchip, cons, intrctrl, interrupt_frequency);
 }
 
 REGISTER_SIM_OBJECT("Tsunami", Tsunami)