From e8b6eb49bcaa768c40c10e354bb66cae0a65a2a1 Mon Sep 17 00:00:00 2001
From: Ali Saidi <saidi@eecs.umich.edu>
Date: Mon, 10 Apr 2006 14:14:06 -0400
Subject: updates for newmem

SConscript:
    compile some more devices

--HG--
extra : convert_revision : 82a8164ab38814a56a0c143658bc06338cf6b8f5
---
 dev/alpha_console.cc | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

(limited to 'dev/alpha_console.cc')

diff --git a/dev/alpha_console.cc b/dev/alpha_console.cc
index 88219fcbc..f68f132c8 100644
--- a/dev/alpha_console.cc
+++ b/dev/alpha_console.cc
@@ -87,15 +87,6 @@ AlphaConsole::startup()
     alphaAccess->intrClockFrequency = params()->platform->intrFrequency();
 }
 
-void
-AlphaConsole::addressRanges(AddrRangeList &range_list)
-{
-    assert(pioSize != 0);
-    range_list.clear();
-    range_list.push_back(RangeSize(pioAddr, sizeof(struct AlphaAccess)));
-}
-
-
 Tick
 AlphaConsole::read(Packet &pkt)
 {
@@ -325,7 +316,7 @@ BEGIN_DECLARE_SIM_OBJECT_PARAMS(AlphaConsole)
 
     SimObjectParam<SimConsole *> sim_console;
     SimObjectParam<SimpleDisk *> disk;
-    Param<Addr> addr;
+    Param<Addr> pio_addr;
     SimObjectParam<AlphaSystem *> system;
     SimObjectParam<BaseCPU *> cpu;
     SimObjectParam<Platform *> platform;
@@ -337,7 +328,7 @@ BEGIN_INIT_SIM_OBJECT_PARAMS(AlphaConsole)
 
     INIT_PARAM(sim_console, "The Simulator Console"),
     INIT_PARAM(disk, "Simple Disk"),
-    INIT_PARAM(addr, "Device Address"),
+    INIT_PARAM(pio_addr, "Device Address"),
     INIT_PARAM(system, "system object"),
     INIT_PARAM(cpu, "Processor"),
     INIT_PARAM(platform, "platform"),
@@ -350,7 +341,7 @@ CREATE_SIM_OBJECT(AlphaConsole)
     AlphaConsole::Params *p = new AlphaConsole::Params;
     p->name = getInstanceName();
     p->platform = platform;
-    p->pio_addr = addr;
+    p->pio_addr = pio_addr;
     p->pio_delay = pio_latency;
     p->cons = sim_console;
     p->disk = disk;
-- 
cgit v1.2.3