trace: reimplement the DTRACE function so it doesn't use a vector

[gem5.git] / src / dev / alpha / tsunami_io.cc

diff --git a/src/dev/alpha/tsunami_io.cc b/src/dev/alpha/tsunami_io.cc
index 1a76c2c32619caf39ce9255c31941b679a0cc890..0c1937a3288ef611bade5ddf1e650df91748db31 100644 (file)
--- a/src/dev/alpha/tsunami_io.cc
+++ b/src/dev/alpha/tsunami_io.cc
@@ -43,11 +43,12 @@
 #include "base/time.hh"
 #include "base/trace.hh"
 #include "config/the_isa.hh"
-#include "dev/rtcreg.h"
-#include "dev/alpha/tsunami_cchip.hh"
+#include "debug/Tsunami.hh"
 #include "dev/alpha/tsunami.hh"
+#include "dev/alpha/tsunami_cchip.hh"
 #include "dev/alpha/tsunami_io.hh"
 #include "dev/alpha/tsunamireg.h"
+#include "dev/rtcreg.h"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 #include "mem/port.hh"
@@ -249,17 +250,6 @@ TsunamiIO::clearPIC(uint8_t bitvector)
     }
 }
 
-unsigned int 
-TsunamiIO::drain(Event *de)
-{
-    unsigned int count = 0;
-    count += pitimer.drain(de);
-    count += rtc.drain(de);
-    assert(count == 0);
-    changeState(SimObject::Drained);
-    return count;
-}
-
 void
 TsunamiIO::serialize(ostream &os)
 {