From 66f5124e2b7db64279f894a0694da3c75b9c157c Mon Sep 17 00:00:00 2001
From: Andreas Hansson <andreas.hansson@arm.com>
Date: Mon, 23 Jul 2012 09:32:19 -0400
Subject: [PATCH] Bridge: Use EventWrapper instead of Event subclass for
 sendEvent

This class simply cleans up the code by making use of the EventWrapper
convenience class to schedule the sendEvent in the bridge ports.
---
 src/mem/bridge.hh | 32 ++------------------------------
 1 file changed, 2 insertions(+), 30 deletions(-)

diff --git a/src/mem/bridge.hh b/src/mem/bridge.hh
index eefb4d121..cc428e44d 100644
--- a/src/mem/bridge.hh
+++ b/src/mem/bridge.hh
@@ -213,22 +213,8 @@ class Bridge : public MemObject
          */
         void trySend();
 
-        /**
-         * Private class for scheduling sending of responses from the
-         * response queue.
-         */
-        class SendEvent : public Event
-        {
-            BridgeSlavePort& port;
-
-          public:
-            SendEvent(BridgeSlavePort& p) : port(p) {}
-            virtual void process() { port.trySend(); }
-            virtual const char *description() const { return "bridge send"; }
-        };
-
         /** Send event for the response queue. */
-        SendEvent sendEvent;
+        EventWrapper<BridgeSlavePort, &BridgeSlavePort::trySend> sendEvent;
 
       public:
 
@@ -322,22 +308,8 @@ class Bridge : public MemObject
          */
         void trySend();
 
-        /**
-         * Private class for scheduling sending of requests from the
-         * request queue.
-         */
-        class SendEvent : public Event
-        {
-            BridgeMasterPort& port;
-
-          public:
-            SendEvent(BridgeMasterPort& p) : port(p) {}
-            virtual void process() { port.trySend(); }
-            virtual const char *description() const { return "bridge send"; }
-        };
-
         /** Send event for the request queue. */
-        SendEvent sendEvent;
+        EventWrapper<BridgeMasterPort, &BridgeMasterPort::trySend> sendEvent;
 
       public: