Merge with head.

--HG--
extra : convert_revision : 6ce77b5bd4f43ddecd51ea8c66759e4b70d4ad82

1 files changed, 8 insertions, 3 deletions

diff --git a/src/dev/etherint.hh b/src/dev/etherint.hh
index 430f45d66..98b820dbf 100644
--- a/src/dev/etherint.hh
+++ b/src/dev/etherint.hh
@@ -39,23 +39,28 @@
 #include <string>
 
 #include "dev/etherpkt.hh"
-#include "sim/sim_object.hh"
 
 /*
  * Class representing the actual interface between two ethernet
  * components.  These components are intended to attach to another
  * ethernet interface on one side and whatever device on the other.
  */
-class EtherInt : public SimObject
+class EtherInt
 {
   protected:
+    mutable std::string portName;
     EtherInt *peer;
 
   public:
-    EtherInt(const std::string &name) : SimObject(name), peer(NULL) {}
+    EtherInt(const std::string &name)
+        : portName(name), peer(NULL) {}
     virtual ~EtherInt() {}
 
+    /** Return port name (for DPRINTF). */
+    const std::string &name() const { return portName; }
+
     void setPeer(EtherInt *p);
+    EtherInt* getPeer() { return peer; }
 
     void recvDone() { peer->sendDone(); }
     virtual void sendDone() = 0;