summaryrefslogtreecommitdiff
path: root/src/dev/mips
diff options
context:
space:
mode:
authorCagdas Dirik <cdirik@micron.com>2015-01-03 17:51:48 -0600
committerCagdas Dirik <cdirik@micron.com>2015-01-03 17:51:48 -0600
commit02c376ac44584484268bd714a45fa0f0265a896a (patch)
tree8bcd4be1ea858883cf68cc40e1142aaca1b8e6e3 /src/dev/mips
parent1ee70e9d84b769b736348e1f7709bc8ede344ec2 (diff)
downloadgem5-02c376ac44584484268bd714a45fa0f0265a896a.tar.xz
dev: prevent RTC events firing before startup
This change includes edits to MC146818 timer to prevent RTC events firing before startup to comply with SimObject initialization call sequence. Committed by: Nilay Vaish <nilay@cs.wisc.edu>
Diffstat (limited to 'src/dev/mips')
-rwxr-xr-xsrc/dev/mips/malta_io.cc6
-rwxr-xr-xsrc/dev/mips/malta_io.hh5
2 files changed, 11 insertions, 0 deletions
diff --git a/src/dev/mips/malta_io.cc b/src/dev/mips/malta_io.cc
index d769b1112..6797a054c 100755
--- a/src/dev/mips/malta_io.cc
+++ b/src/dev/mips/malta_io.cc
@@ -142,6 +142,12 @@ MaltaIO::unserialize(Checkpoint *cp, const string &section)
rtc.unserialize("rtc", cp, section);
}
+void
+MaltaIO::startup()
+{
+ rtc.startup();
+}
+
MaltaIO *
MaltaIOParams::create()
{
diff --git a/src/dev/mips/malta_io.hh b/src/dev/mips/malta_io.hh
index f74d42da4..dd035aea2 100755
--- a/src/dev/mips/malta_io.hh
+++ b/src/dev/mips/malta_io.hh
@@ -143,6 +143,11 @@ class MaltaIO : public BasicPioDevice
*/
virtual void unserialize(Checkpoint *cp, const std::string &section);
+ /**
+ * Start running.
+ */
+ virtual void startup();
+
};
#endif // __DEV_MALTA_IO_HH__