summaryrefslogtreecommitdiff
path: root/src/dev/x86/PC.py
diff options
context:
space:
mode:
authorNathan Binkert <nate@binkert.org>2008-06-17 20:29:06 -0700
committerNathan Binkert <nate@binkert.org>2008-06-17 20:29:06 -0700
commit00df9016fead5f7427576acf6d3faee29779f0a1 (patch)
treebad5b6b78710fd0e82dcff5b27d2088ec6d706dc /src/dev/x86/PC.py
parentfa8f91fdc0609fb9cb8bcde22b440b40e52f1cc8 (diff)
downloadgem5-00df9016fead5f7427576acf6d3faee29779f0a1.tar.xz
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
Diffstat (limited to 'src/dev/x86/PC.py')
-rw-r--r--src/dev/x86/PC.py15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/dev/x86/PC.py b/src/dev/x86/PC.py
index 4ba9e7a8a..5165308ed 100644
--- a/src/dev/x86/PC.py
+++ b/src/dev/x86/PC.py
@@ -28,12 +28,13 @@
from m5.params import *
from m5.proxy import *
-from Uart import Uart8250
+
from Device import IsaFake
-from SouthBridge import SouthBridge
-from Platform import Platform
from Pci import PciConfigAll
-from SimConsole import SimConsole
+from Platform import Platform
+from SouthBridge import SouthBridge
+from Terminal import Terminal
+from Uart import Uart8250
def x86IOAddress(port):
IO_address_space_base = 0x8000000000000000
@@ -54,11 +55,11 @@ class PC(Platform):
# but the linux kernel fiddles with them anway.
behind_pci = IsaFake(pio_addr=x86IOAddress(0xcf8), pio_size=8)
- # Serial port and console
- console = SimConsole()
+ # Serial port and terminal
+ terminal = Terminal()
com_1 = Uart8250()
com_1.pio_addr = x86IOAddress(0x3f8)
- com_1.sim_console = console
+ com_1.terminal = terminal
def attachIO(self, bus):
self.south_bridge.pio = bus.port