projects
/
gem5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dev: Use shared_ptr for EthPacketData
[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..6586cd9809fcf920462003d7396392819f9dcb08 100644
(file)
--- a/
src/dev/alpha/tsunami_io.cc
+++ b/
src/dev/alpha/tsunami_io.cc
@@
-43,17
+43,22
@@
#include "base/time.hh"
#include "base/trace.hh"
#include "config/the_isa.hh"
#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.hh"
+#include "dev/alpha/tsunami_cchip.hh"
#include "dev/alpha/tsunami_io.hh"
#include "dev/alpha/tsunamireg.h"
#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"
#include "sim/system.hh"
#include "mem/packet.hh"
#include "mem/packet_access.hh"
#include "mem/port.hh"
#include "sim/system.hh"
-using namespace std;
+// clang complains about std::set being overloaded with Packet::set if
+// we open up the entire namespace std
+using std::string;
+using std::ostream;
+
//Should this be AlphaISA?
using namespace TheISA;
//Should this be AlphaISA?
using namespace TheISA;
@@
-64,11
+69,9
@@
TsunamiIO::RTC::RTC(const string &n, const TsunamiIOParams *p)
}
TsunamiIO::TsunamiIO(const Params *p)
}
TsunamiIO::TsunamiIO(const Params *p)
- : BasicPioDevice(p), tsunami(p->tsunami),
+ : BasicPioDevice(p
, 0x100
), tsunami(p->tsunami),
pitimer(this, p->name + "pitimer"), rtc(p->name + ".rtc", p)
{
pitimer(this, p->name + "pitimer"), rtc(p->name + ".rtc", p)
{
- pioSize = 0x100;
-
// set the back pointer from tsunami to myself
tsunami->io = this;
// set the back pointer from tsunami to myself
tsunami->io = this;
@@
-249,17
+252,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)
{
void
TsunamiIO::serialize(ostream &os)
{