diff options
author | Kevin Lim <ktlim@umich.edu> | 2005-01-18 15:48:38 -0500 |
---|---|---|
committer | Kevin Lim <ktlim@umich.edu> | 2005-01-18 15:48:38 -0500 |
commit | c389c2e327cc3ee1c988855b05505660c6670172 (patch) | |
tree | 7861dcb3ed07f03850ee922db9c0c33b038265e4 /dev/io_device.cc | |
parent | 42f3b4ffb3fedcb70e9ff068ed7160dc6020b8c4 (diff) | |
parent | 25f54857c9356b7f8608be8d45fec17d6c26bce5 (diff) | |
download | gem5-c389c2e327cc3ee1c988855b05505660c6670172.tar.xz |
Merge zizzer.eecs.umich.edu:/bk/m5/
into zamp.eecs.umich.edu:/z/ktlim2/m5
--HG--
extra : convert_revision : c8b7f46e9d0dbff2a12a7375d361098fba352647
Diffstat (limited to 'dev/io_device.cc')
-rw-r--r-- | dev/io_device.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dev/io_device.cc b/dev/io_device.cc index 7703ad5e3..ffded5858 100644 --- a/dev/io_device.cc +++ b/dev/io_device.cc @@ -31,8 +31,8 @@ #include "mem/bus/dma_interface.hh" #include "sim/builder.hh" -PioDevice::PioDevice(const std::string &name) - : FunctionalMemory(name), pioInterface(NULL), pioLatency(0) +PioDevice::PioDevice(const std::string &name, Platform *p) + : FunctionalMemory(name), platform(p), pioInterface(NULL), pioLatency(0) {} PioDevice::~PioDevice() @@ -43,8 +43,8 @@ PioDevice::~PioDevice() DEFINE_SIM_OBJECT_CLASS_NAME("PioDevice", PioDevice) -DmaDevice::DmaDevice(const std::string &name) - : PioDevice(name), dmaInterface(NULL) +DmaDevice::DmaDevice(const std::string &name, Platform *p) + : PioDevice(name, p), dmaInterface(NULL) {} DmaDevice::~DmaDevice() |