mem: Consistently use ISO prefixes

[gem5.git] / src / mem / external_master.hh

diff --git a/src/mem/external_master.hh b/src/mem/external_master.hh
index 1988c9bdaa5bfa43e1a6b50679aa8f5b9e29eee0..0ca19363e9c6e4f0206be9f4b42d988953e2951f 100644 (file)
--- a/src/mem/external_master.hh
+++ b/src/mem/external_master.hh
@@ -39,7 +39,7 @@
  * @file
  *
  * ExternalMaster is a memory object representing a binding from
- * a gem5 slave to a master port in a system external to gem5.
+ * a gem5 responder to a request port in a system external to gem5.
  *
  * During initialisation, a `handler' for the port type specified in the
  * port's port_type parameter is found from the registered port handlers
@@ -48,9 +48,9 @@
  * port which is to be bound to.  A port handler will usually construct a
  * bridge object in the external system to accomodate the port-to-port
  * mapping but this bridge is not exposed to gem5 other than be the
- * presentation of the MasterPort which can be bound.
+ * presentation of the RequestPort which can be bound.
  *
- * The external port must provide a gem5 MasterPort interface.
+ * The external port must provide a gem5 RequestPort interface.
  */
 
 #ifndef __MEM_EXTERNAL_MASTER_HH__
@@ -64,7 +64,7 @@ class ExternalMaster : public SimObject
 {
   public:
     /** Derive from this class to create an external port interface */
-    class ExternalPort : public MasterPort
+    class ExternalPort : public RequestPort
     {
       protected:
         ExternalMaster &owner;
@@ -72,7 +72,7 @@ class ExternalMaster : public SimObject
       public:
         ExternalPort(const std::string &name_,
             ExternalMaster &owner_) :
-            MasterPort(name_, &owner_), owner(owner_)
+            RequestPort(name_, &owner_), owner(owner_)
         { }
 
         ~ExternalPort() { }
@@ -83,7 +83,7 @@ class ExternalMaster : public SimObject
 
     /* Handlers are specific to *types* of port not specific port
      * instantiations.  A handler will typically build a bridge to the
-     * external port from gem5 and provide gem5 with a MasterPort that can be
+     * external port from gem5 and provide gem5 with a RequestPort that can be
      * bound to for each call to Handler::getExternalPort.*/
     class Handler
     {
@@ -115,7 +115,7 @@ class ExternalMaster : public SimObject
     static std::map<std::string, Handler *> portHandlers;
 
   public:
-    ExternalMaster(ExternalMasterParams *params);
+    ExternalMaster(const ExternalMasterParams &params);
 
     /** Port interface.  Responds only to port "port" */
     Port &getPort(const std::string &if_name,
@@ -128,7 +128,7 @@ class ExternalMaster : public SimObject
 
     void init() override;
 
-    const MasterID masterId;
+    const RequestorID id;
 };