diff --git a/src/mem/qos/QoSMemSinkInterface.py b/src/mem/qos/QoSMemSinkInterface.py index 37ddf788da..9b3b89e892 100644 --- a/src/mem/qos/QoSMemSinkInterface.py +++ b/src/mem/qos/QoSMemSinkInterface.py @@ -38,6 +38,7 @@ from m5.objects.AbstractMemory import AbstractMemory class QoSMemSinkInterface(AbstractMemory): type = 'QoSMemSinkInterface' cxx_header = "mem/qos/mem_sink.hh" + cxx_class = 'qos::MemSinkInterface' def controller(self): """ diff --git a/src/mem/qos/mem_sink.cc b/src/mem/qos/mem_sink.cc index 98a5e3f250..f9be06c2b3 100644 --- a/src/mem/qos/mem_sink.cc +++ b/src/mem/qos/mem_sink.cc @@ -386,9 +386,9 @@ MemSinkCtrl::MemoryPort::recvTimingReq(PacketPtr pkt) return mem.recvTimingReq(pkt); } -} // namespace qos - -QoSMemSinkInterface::QoSMemSinkInterface(const QoSMemSinkInterfaceParams &_p) +MemSinkInterface::MemSinkInterface(const QoSMemSinkInterfaceParams &_p) : AbstractMemory(_p) { } + +} // namespace qos diff --git a/src/mem/qos/mem_sink.hh b/src/mem/qos/mem_sink.hh index 3c229ec450..247db22eb6 100644 --- a/src/mem/qos/mem_sink.hh +++ b/src/mem/qos/mem_sink.hh @@ -52,12 +52,13 @@ #include "sim/eventq.hh" struct QoSMemSinkInterfaceParams; -class QoSMemSinkInterface; GEM5_DEPRECATED_NAMESPACE(QoS, qos); namespace qos { +class MemSinkInterface; + /** * QoS Memory Sink * @@ -177,7 +178,7 @@ class MemSinkCtrl : public MemCtrl /** * Create pointer to interface of actual media */ - QoSMemSinkInterface* const interface; + MemSinkInterface* const interface; /** Read request pending */ bool retryRdReq; @@ -262,19 +263,18 @@ class MemSinkCtrl : public MemCtrl MemSinkCtrlStats stats; }; -} // namespace qos - -class QoSMemSinkInterface : public AbstractMemory +class MemSinkInterface : public AbstractMemory { public: /** Setting a pointer to the interface */ - void setMemCtrl(qos::MemSinkCtrl* _ctrl) { ctrl = _ctrl; }; + void setMemCtrl(MemSinkCtrl* _ctrl) { ctrl = _ctrl; }; /** Pointer to the controller */ - qos::MemSinkCtrl* ctrl; + MemSinkCtrl* ctrl; - QoSMemSinkInterface(const QoSMemSinkInterfaceParams &_p); + MemSinkInterface(const QoSMemSinkInterfaceParams &_p); }; +} // namespace qos #endif /* __MEM_QOS_MEM_SINK_HH__ */