ruby: Converted Garnet to M5 configuration

1 files changed, 6 insertions, 9 deletions

diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh
index 03a17037f..3669799fa 100644
--- a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh
@@ -32,9 +32,10 @@
 #define GARNET_NETWORK_H
 
 #include "mem/ruby/network/garnet/NetworkHeader.hh"
+#include "mem/ruby/network/garnet/BaseGarnetNetwork.hh"
 #include "mem/gems_common/Vector.hh"
-#include "mem/ruby/network/garnet/flexible-pipeline/NetworkConfig.hh"
 #include "mem/ruby/network/Network.hh"
+#include "params/GarnetNetwork.hh"
 
 class NetworkInterface;
 class MessageBuffer;
@@ -43,17 +44,15 @@ class Topology;
 class NetDest;
 class NetworkLink;
 
-class GarnetNetwork : public Network{
+class GarnetNetwork : public BaseGarnetNetwork {
 public:
-        GarnetNetwork(const string & name);
+    typedef GarnetNetworkParams Params;
+    GarnetNetwork(const Params *p);
 
-        ~GarnetNetwork();
+    ~GarnetNetwork();
 
         void init();
 
-        //added by SS
-        NetworkConfig* getNetworkConfig() { return m_network_config_ptr; }
-
         // returns the queue requested for the given component
         MessageBuffer* getToNetQueue(NodeID id, bool ordered, int network_num);
         MessageBuffer* getFromNetQueue(NodeID id, bool ordered, int network_num);
@@ -100,8 +99,6 @@ private:
 
 //      Topology* m_topology_ptr;
         Time m_ruby_start;
-
-        NetworkConfig* m_network_config_ptr;
 };
 
 // Output operator declaration