Rename SimConsole to Terminal since it makes more sense

--HG--
rename : src/dev/SimConsole.py => src/dev/Terminal.py
rename : src/dev/simconsole.cc => src/dev/terminal.cc
rename : src/dev/simconsole.hh => src/dev/terminal.hh

4 files changed, 9 insertions, 9 deletions

diff --git a/src/dev/mips/MipsConsole.py b/src/dev/mips/MipsConsole.py
index 36575677a..8b724991a 100644
--- a/src/dev/mips/MipsConsole.py
+++ b/src/dev/mips/MipsConsole.py
@@ -34,5 +34,5 @@ class MipsConsole(BasicPioDevice):
     type = 'MipsConsole'
     cpu = Param.BaseCPU(Parent.cpu[0], "Processor")
     disk = Param.SimpleDisk("Simple Disk")
-    sim_console = Param.SimConsole(Parent.any, "The Simulator Console")
+    terminal = Param.Terminal(Parent.any, "The console terminal")
     system = Param.MipsSystem(Parent.any, "system object")
diff --git a/src/dev/mips/console.cc b/src/dev/mips/console.cc
index 185e1acbc..d1663999a 100755
--- a/src/dev/mips/console.cc
+++ b/src/dev/mips/console.cc
@@ -45,8 +45,8 @@
 #include "cpu/thread_context.hh"
 #include "dev/mips/console.hh"
 #include "dev/platform.hh"
-#include "dev/simconsole.hh"
 #include "dev/simple_disk.hh"
+#include "dev/terminal.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
 #include "mem/physical.hh"
@@ -58,7 +58,7 @@ using namespace std;
 using namespace MipsISA;
 
 MipsConsole::MipsConsole(const Params *p)
-  : BasicPioDevice(p), disk(p->disk), console(p->sim_console),
+  : BasicPioDevice(p), disk(p->disk), terminal(p->terminal),
     system(p->system), cpu(p->cpu)
 {
 
@@ -125,7 +125,7 @@ MipsConsole::read(PacketPtr pkt)
                     pkt->set(mipsAccess->intrClockFrequency);
                     break;
                 case offsetof(MipsAccess, inputChar):
-                    pkt->set(console->console_in());
+                    pkt->set(terminal->console_in());
                     break;
                 case offsetof(MipsAccess, cpuClock):
                     pkt->set(mipsAccess->cpuClock);
@@ -215,7 +215,7 @@ MipsConsole::write(PacketPtr pkt)
         break;
 
       case offsetof(MipsAccess, outputChar):
-        console->out((char)(val & 0xff));
+        terminal->out((char)(val & 0xff));
         break;
 
       default:
diff --git a/src/dev/mips/console.hh b/src/dev/mips/console.hh
index 34792090d..a78343f35 100755
--- a/src/dev/mips/console.hh
+++ b/src/dev/mips/console.hh
@@ -43,7 +43,7 @@
 #include "sim/sim_object.hh"
 
 class BaseCPU;
-class SimConsole;
+class Terminal;
 class MipsSystem;
 class SimpleDisk;
 
@@ -89,8 +89,8 @@ class MipsConsole : public BasicPioDevice
     /** the disk must be accessed from the console */
     SimpleDisk *disk;
 
-    /** the system console (the terminal) is accessable from the console */
-    SimConsole *console;
+    /** the system terminal is accessable from the console */
+    Terminal *terminal;
 
     /** a pointer to the system we are running in */
     MipsSystem *system;
diff --git a/src/dev/mips/malta.cc b/src/dev/mips/malta.cc
index 0b1fa15ba..21e79d999 100755
--- a/src/dev/mips/malta.cc
+++ b/src/dev/mips/malta.cc
@@ -38,11 +38,11 @@
 #include <vector>
 
 #include "cpu/intr_control.hh"
-#include "dev/simconsole.hh"
 #include "dev/mips/malta_cchip.hh"
 #include "dev/mips/malta_pchip.hh"
 #include "dev/mips/malta_io.hh"
 #include "dev/mips/malta.hh"
+#include "dev/terminal.hh"
 #include "params/Malta.hh"
 #include "sim/system.hh"