summaryrefslogtreecommitdiff
path: root/dev/console.hh
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@eecs.umich.edu>2003-10-28 12:56:17 -0800
committerSteve Reinhardt <stever@eecs.umich.edu>2003-10-28 12:56:17 -0800
commite12e64a0718f6805c1203e1d11a39abaf0d9483b (patch)
tree3908a0650ad9a4022fb906c553c3648d31c1fcb4 /dev/console.hh
parent18205206972932a236d0bf4f427918b57f9857f0 (diff)
parentb90f810575679442d78c0e9cd0c98a057ba4871b (diff)
downloadgem5-e12e64a0718f6805c1203e1d11a39abaf0d9483b.tar.xz
Merge zizzer:bk/m5 into isabel.reinhardt.house:/z/stever/ser/m5
--HG-- extra : convert_revision : 50aa3791d27a17c4ea2fb4aee1a67011bd2abec1
Diffstat (limited to 'dev/console.hh')
-rw-r--r--dev/console.hh5
1 files changed, 2 insertions, 3 deletions
diff --git a/dev/console.hh b/dev/console.hh
index b88cab3ef..5d9ea5302 100644
--- a/dev/console.hh
+++ b/dev/console.hh
@@ -128,9 +128,8 @@ class SimConsole : public SimObject
void initInt(IntrControl *i);
void setInt(int bits);
- virtual void serialize();
- virtual void unserialize(IniFile &db, const std::string &category,
- ConfigNode *node);
+ virtual void serialize(std::ostream &os);
+ virtual void unserialize(IniFile &db, const std::string &section);
};
class ConsoleListener : public SimObject