diff options
| author | Gabe Black <gabeblack@google.com> | 2019-03-07 03:02:35 -0800 |
|---|---|---|
| committer | Gabe Black <gabeblack@google.com> | 2019-03-19 10:22:50 +0000 |
| commit | d3d24835bcc03ecf312ac6ba7df114656770730f (patch) | |
| tree | 43bb564a7bc3e22ffd7b1b906f6f96742ecb619a /src/mem/external_slave.cc | |
| parent | 378d9ccbeb4053aeeab002159b26625854af54f7 (diff) | |
| download | gem5-d3d24835bcc03ecf312ac6ba7df114656770730f.tar.xz | |
arch, cpu, dev, gpu, mem, sim, python: start using getPort.
Replace the getMasterPort, getSlavePort, and getEthPort functions
with getPort, and remove extraneous mechanisms that are no longer
necessary.
Change-Id: Iab7e3c02d2f3a0cf33e7e824e18c28646b5bc318
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/17040
Reviewed-by: Daniel Carvalho <odanrc@yahoo.com.br>
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Diffstat (limited to 'src/mem/external_slave.cc')
| -rw-r--r-- | src/mem/external_slave.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/mem/external_slave.cc b/src/mem/external_slave.cc index ac93e669c..6266f6649 100644 --- a/src/mem/external_slave.cc +++ b/src/mem/external_slave.cc @@ -49,7 +49,7 @@ * a message. The stub port can be used to configure and test a system * where the external port is used for a peripheral before connecting * the external port */ -class StubSlavePort : public ExternalSlave::Port +class StubSlavePort : public ExternalSlave::ExternalPort { public: void processResponseEvent(); @@ -66,7 +66,7 @@ class StubSlavePort : public ExternalSlave::Port StubSlavePort(const std::string &name_, ExternalSlave &owner_) : - ExternalSlave::Port(name_, owner_), + ExternalSlave::ExternalPort(name_, owner_), responseEvent([this]{ processResponseEvent(); }, name()), responsePacket(NULL), mustRetry(false) { } @@ -83,7 +83,7 @@ class StubSlavePortHandler : public ExternalSlave::Handler { public: - ExternalSlave::Port *getExternalPort( + ExternalSlave::ExternalPort *getExternalPort( const std::string &name_, ExternalSlave &owner, const std::string &port_data) @@ -175,7 +175,7 @@ std::map<std::string, ExternalSlave::Handler *> ExternalSlave::portHandlers; AddrRangeList -ExternalSlave::Port::getAddrRanges() const +ExternalSlave::ExternalPort::getAddrRanges() const { return owner.addrRanges; } @@ -193,9 +193,8 @@ ExternalSlave::ExternalSlave(ExternalSlaveParams *params) : registerHandler("stub", new StubSlavePortHandler); } -BaseSlavePort & -ExternalSlave::getSlavePort(const std::string &if_name, - PortID idx) +Port & +ExternalSlave::getPort(const std::string &if_name, PortID idx) { if (if_name == "port") { DPRINTF(ExternalPort, "Trying to bind external port: %s %s\n", @@ -217,7 +216,7 @@ ExternalSlave::getSlavePort(const std::string &if_name, } return *externalPort; } else { - return MemObject::getSlavePort(if_name, idx); + return MemObject::getPort(if_name, idx); } } |