summaryrefslogtreecommitdiff
path: root/dev/alpha_console.hh
diff options
context:
space:
mode:
authorMiguel Serrano <mserrano@umich.edu>2005-07-01 15:12:09 -0400
committerMiguel Serrano <mserrano@umich.edu>2005-07-01 15:12:09 -0400
commit4f2480a18bdf98792e2ebf3471ce7cd3109ef824 (patch)
treeb2d8d27e41eae3d659dbe6e6665436d02bcea429 /dev/alpha_console.hh
parent16a2357e8637fed706a94ab0da6226df8a2e7f07 (diff)
parentefd0c5d4b04f630f1b591af509458224b6d98655 (diff)
downloadgem5-4f2480a18bdf98792e2ebf3471ce7cd3109ef824.tar.xz
Merge m5read@m5.eecs.umich.edu:/bk/m5
into zamp.eecs.umich.edu:/.automount/fox/y/mserrano/m5_new/m5 --HG-- extra : convert_revision : bb3e977e79599c459fb32f309ce5b486f1639afa
Diffstat (limited to 'dev/alpha_console.hh')
-rw-r--r--dev/alpha_console.hh12
1 files changed, 9 insertions, 3 deletions
diff --git a/dev/alpha_console.hh b/dev/alpha_console.hh
index 63e0d3ae4..6236c5713 100644
--- a/dev/alpha_console.hh
+++ b/dev/alpha_console.hh
@@ -72,8 +72,14 @@ class SimpleDisk;
class AlphaConsole : public PioDevice
{
protected:
+ struct Access : public AlphaAccess
+ {
+ void serialize(std::ostream &os);
+ void unserialize(Checkpoint *cp, const std::string &section);
+ };
+
union {
- AlphaAccess *alphaAccess;
+ Access *alphaAccess;
uint8_t *consoleData;
};
@@ -96,10 +102,10 @@ class AlphaConsole : public PioDevice
/** Standard Constructor */
AlphaConsole(const std::string &name, SimConsole *cons, SimpleDisk *d,
System *s, BaseCPU *c, Platform *platform,
- int num_cpus, MemoryController *mmu, Addr addr,
+ MemoryController *mmu, Addr addr,
HierParams *hier, Bus *bus);
- virtual void init();
+ virtual void startup();
/**
* memory mapped reads and writes