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, 4 insertions, 3 deletions

diff --git a/dev/tsunami.hh b/dev/tsunami.hh
index f4f108d43..0ba3cdf67 100644
--- a/dev/tsunami.hh
+++ b/dev/tsunami.hh
@@ -38,6 +38,7 @@ class ScsiController;
 class TlaserClock;
 class EtherDev;
 class TsunamiCChip;
+class TsunamiPChip;
 
 class Tsunami : public SimObject
 {
@@ -54,6 +55,7 @@ class Tsunami : public SimObject
 
     TlaserClock *clock;
     TsunamiCChip *cchip;
+    TsunamiPChip *pchip;
 
     int intr_sum_type[Tsunami::Max_CPUs];
     int ipi_pending[Tsunami::Max_CPUs];
@@ -62,9 +64,8 @@ class Tsunami : public SimObject
 
   public:
     Tsunami(const std::string &name, ScsiController *scsi,
-               EtherDev *ethernet, TlaserClock *clock, TsunamiCChip *tc,
-               SimConsole *, IntrControl *intctrl,
-               int intrFreq);
+               EtherDev *ethernet, TlaserClock *clock, TsunamiCChip *cc, TsunamiPChip *pc,
+               SimConsole *, IntrControl *intctrl, int intrFreq);
 
     virtual void serialize(std::ostream &os);
     virtual void unserialize(Checkpoint *cp, const std::string &section);