Changed new linux stuff to work with new FunctionalMemory interface and

some sundry problems with new interface

dev/alpha_console.cc:
dev/alpha_console.hh:
dev/baddev.cc:
dev/baddev.hh:
dev/pciconfigall.cc:
dev/pciconfigall.hh:
dev/pcidev.cc:
dev/pcidev.hh:
dev/tsunami_cchip.cc:
dev/tsunami_cchip.hh:
dev/tsunami_io.cc:
dev/tsunami_io.hh:
dev/tsunami_pchip.cc:
dev/tsunami_pchip.hh:
dev/tsunami_uart.cc:
dev/tsunami_uart.hh:
    Fixed to use new FunctionalMemory interface

--HG--
extra : convert_revision : bee98e6285d92f28fafacf919ab06eaf333a9b56

1 files changed, 5 insertions, 6 deletions

diff --git a/dev/baddev.cc b/dev/baddev.cc
index d91069bae..8a5d68533 100644
--- a/dev/baddev.cc
+++ b/dev/baddev.cc
@@ -20,10 +20,11 @@
 
 using namespace std;
 
-BadDevice::BadDevice(const string &name,
-                       Addr addr, Addr mask, MemoryController *mmu, const string &devicename)
-    : MmapDevice(name, addr, mask, mmu), devname(devicename)
+BadDevice::BadDevice(const string &name, Addr a, MemoryController *mmu,
+                     const string &devicename)
+    : FunctionalMemory(name), addr(a), devname(devicename)
 {
+    mmu->add_child(this, Range<Addr>(addr, addr + size));
 }
 
 Fault
@@ -46,7 +47,6 @@ BEGIN_DECLARE_SIM_OBJECT_PARAMS(BadDevice)
 
     SimObjectParam<MemoryController *> mmu;
     Param<Addr> addr;
-    Param<Addr> mask;
     Param<string> devicename;
 
 END_DECLARE_SIM_OBJECT_PARAMS(BadDevice)
@@ -55,14 +55,13 @@ BEGIN_INIT_SIM_OBJECT_PARAMS(BadDevice)
 
     INIT_PARAM(mmu, "Memory Controller"),
     INIT_PARAM(addr, "Device Address"),
-    INIT_PARAM(mask, "Address Mask"),
     INIT_PARAM(devicename, "Name of device to error on")
 
 END_INIT_SIM_OBJECT_PARAMS(BadDevice)
 
 CREATE_SIM_OBJECT(BadDevice)
 {
-    return new BadDevice(getInstanceName(), addr, mask, mmu, devicename);
+    return new BadDevice(getInstanceName(), addr, mmu, devicename);
 }
 
 REGISTER_SIM_OBJECT("BadDevice", BadDevice)