summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Reinhardt <steve.reinhardt@amd.com>2011-10-20 13:11:56 -0700
committerSteve Reinhardt <steve.reinhardt@amd.com>2011-10-20 13:11:56 -0700
commit38aef4c4c7e58e9166616554465bea70afab824f (patch)
tree67452346f5ed51a5fcd6b6a7f5a43c006464649d
parent7b500f56ca539d1a31f9590a810e86146dd2582f (diff)
downloadgem5-38aef4c4c7e58e9166616554465bea70afab824f.tar.xz
dev: clean up PioDevice and DmaDevive getPort() methods.
Make DmaDevice::getPort() call PioDevice::getPort() instead of just copying and pasting the code. Also move definitions from .hh to .cc file.
-rw-r--r--src/dev/io_device.cc28
-rw-r--r--src/dev/io_device.hh32
2 files changed, 31 insertions, 29 deletions
diff --git a/src/dev/io_device.cc b/src/dev/io_device.cc
index bfdf3d486..5e2395bf9 100644
--- a/src/dev/io_device.cc
+++ b/src/dev/io_device.cc
@@ -75,6 +75,18 @@ PioDevice::init()
pioPort->sendStatusChange(Port::RangeChange);
}
+Port *
+PioDevice::getPort(const std::string &if_name, int idx)
+{
+ if (if_name == "pio") {
+ if (pioPort != NULL)
+ fatal("%s: pio port already connected to %s",
+ name(), pioPort->getPeer()->name());
+ pioPort = new PioPort(this, sys);
+ return pioPort;
+ }
+ return NULL;
+}
unsigned int
PioDevice::drain(Event *de)
@@ -349,3 +361,19 @@ DmaDevice::~DmaDevice()
if (dmaPort)
delete dmaPort;
}
+
+
+Port *
+DmaDevice::getPort(const std::string &if_name, int idx)
+{
+ if (if_name == "dma") {
+ if (dmaPort != NULL)
+ fatal("%s: dma port already connected to %s",
+ name(), dmaPort->getPeer()->name());
+ dmaPort = new DmaPort(this, sys, params()->min_backoff_delay,
+ params()->max_backoff_delay);
+ return dmaPort;
+ }
+ return PioDevice::getPort(if_name, idx);
+}
+
diff --git a/src/dev/io_device.hh b/src/dev/io_device.hh
index bc6f1d4f7..812c276d6 100644
--- a/src/dev/io_device.hh
+++ b/src/dev/io_device.hh
@@ -215,17 +215,8 @@ class PioDevice : public MemObject
virtual unsigned int drain(Event *de);
- virtual Port *getPort(const std::string &if_name, int idx = -1)
- {
- if (if_name == "pio") {
- if (pioPort != NULL)
- fatal("%s: pio port already connected to %s",
- name(), pioPort->getPeer()->name());
- pioPort = new PioPort(this, sys);
- return pioPort;
- } else
- return NULL;
- }
+ virtual Port *getPort(const std::string &if_name, int idx = -1);
+
friend class PioPort;
};
@@ -291,24 +282,7 @@ class DmaDevice : public PioDevice
unsigned cacheBlockSize() const { return dmaPort->cacheBlockSize(); }
- virtual Port *getPort(const std::string &if_name, int idx = -1)
- {
- if (if_name == "pio") {
- if (pioPort != NULL)
- fatal("%s: pio port already connected to %s",
- name(), pioPort->getPeer()->name());
- pioPort = new PioPort(this, sys);
- return pioPort;
- } else if (if_name == "dma") {
- if (dmaPort != NULL)
- fatal("%s: dma port already connected to %s",
- name(), dmaPort->getPeer()->name());
- dmaPort = new DmaPort(this, sys, params()->min_backoff_delay,
- params()->max_backoff_delay);
- return dmaPort;
- } else
- return NULL;
- }
+ virtual Port *getPort(const std::string &if_name, int idx = -1);
friend class DmaPort;
};