Renamed OpClass enum members: they all end in 'Op' now.

[gem5.git] / dev / alpha_console.hh

diff --git a/dev/alpha_console.hh b/dev/alpha_console.hh
index 54a2af6d51a373eee519cbc7931b437a534a48b1..b617b64e77e93710c6fdd912b9e0ca9c7430d86f 100644 (file)
--- a/dev/alpha_console.hh
+++ b/dev/alpha_console.hh
@@ -35,7 +35,7 @@
 
 #include "base/range.hh"
 #include "dev/alpha_access.h"
-#include "mem/functional_mem/functional_memory.hh"
+#include "dev/io_device.hh"
 #include "sim/host.hh"
 
 class BaseCPU;
@@ -69,7 +69,7 @@ class SimpleDisk;
  * primarily used doing boot before the kernel has loaded its device
  * drivers.
  */
-class AlphaConsole : public FunctionalMemory
+class AlphaConsole : public PioDevice
 {
   protected:
     union {
@@ -90,7 +90,8 @@ class AlphaConsole : public FunctionalMemory
     /** Standard Constructor */
     AlphaConsole(const std::string &name, SimConsole *cons, SimpleDisk *d,
                  System *system, BaseCPU *cpu, TlaserClock *clock,
-                 int num_cpus, MemoryController *mmu, Addr addr);
+                 int num_cpus, MemoryController *mmu, Addr addr,
+                 HierParams *hier, Bus *bus);
 
     /**
      * memory mapped reads and writes
@@ -103,6 +104,9 @@ class AlphaConsole : public FunctionalMemory
      */
     virtual void serialize(std::ostream &os);
     virtual void unserialize(Checkpoint *cp, const std::string &section);
+
+  public:
+    Tick cacheAccess(MemReqPtr &req);
 };
 
 #endif // __ALPHA_CONSOLE_HH__