From d3d24835bcc03ecf312ac6ba7df114656770730f Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Thu, 7 Mar 2019 03:02:35 -0800 Subject: 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 Reviewed-by: Andreas Sandberg Maintainer: Andreas Sandberg --- src/mem/qos/mem_sink.cc | 6 +++--- src/mem/qos/mem_sink.hh | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'src/mem/qos') diff --git a/src/mem/qos/mem_sink.cc b/src/mem/qos/mem_sink.cc index 77cfbaf22..3ff2339d5 100644 --- a/src/mem/qos/mem_sink.cc +++ b/src/mem/qos/mem_sink.cc @@ -106,11 +106,11 @@ MemSinkCtrl::recvFunctional(PacketPtr pkt) pkt->popLabel(); } -BaseSlavePort & -MemSinkCtrl::getSlavePort(const std::string &interface, PortID idx) +Port & +MemSinkCtrl::getPort(const std::string &interface, PortID idx) { if (interface != "port") { - return MemObject::getSlavePort(interface, idx); + return MemObject::getPort(interface, idx); } else { return port; } diff --git a/src/mem/qos/mem_sink.hh b/src/mem/qos/mem_sink.hh index 84258e0ac..9a51269dc 100644 --- a/src/mem/qos/mem_sink.hh +++ b/src/mem/qos/mem_sink.hh @@ -133,12 +133,11 @@ class MemSinkCtrl : public MemCtrl /** * Getter method to access this memory's slave port * - * @param interface interface name + * @param if_name interface name * @param idx port ID number * @return reference to this memory's slave port */ - BaseSlavePort& getSlavePort(const std::string&, - PortID = InvalidPortID) override; + Port &getPort(const std::string &if_name, PortID=InvalidPortID) override; /** * Initializes this object -- cgit v1.2.3