summaryrefslogtreecommitdiff
path: root/dev/alpha_console.hh
diff options
context:
space:
mode:
Diffstat (limited to 'dev/alpha_console.hh')
-rw-r--r--dev/alpha_console.hh11
1 files changed, 7 insertions, 4 deletions
diff --git a/dev/alpha_console.hh b/dev/alpha_console.hh
index 4647be538..29ebec1bb 100644
--- a/dev/alpha_console.hh
+++ b/dev/alpha_console.hh
@@ -33,9 +33,10 @@
#ifndef __ALPHA_CONSOLE_HH__
#define __ALPHA_CONSOLE_HH__
-#include "sim/host.hh"
+#include "base/range.hh"
#include "dev/alpha_access.h"
-#include "mem/functional_mem/mmap_device.hh"
+#include "mem/functional_mem/functional_memory.hh"
+#include "sim/host.hh"
#include "dev/tsunami_io.hh"
class BaseCPU;
@@ -69,7 +70,7 @@ class SimpleDisk;
* primarily used doing boot before the kernel has loaded its device
* drivers.
*/
-class AlphaConsole : public MmapDevice
+class AlphaConsole : public FunctionalMemory
{
protected:
union {
@@ -83,6 +84,9 @@ class AlphaConsole : public MmapDevice
/** the system console (the terminal) is accessable from the console */
SimConsole *console;
+ Addr addr;
+ static const Addr size = 0x80; // equal to sizeof(alpha_access);
+
public:
/** Standard Constructor */
AlphaConsole(const std::string &name, SimConsole *cons,
@@ -91,7 +95,6 @@ class AlphaConsole : public MmapDevice
TsunamiIO *clock, int num_cpus,
Addr addr, Addr mask, MemoryController *mmu);
- public:
/**
* memory mapped reads and writes
*/