Merge branch 'dev'

1 files changed, 0 insertions, 99 deletions

diff --git a/src/intersim2/.svn/pristine/52/52025d7789c8bb45a38bad2e58ac67cc26f3b4ed.svn-base b/src/intersim2/.svn/pristine/52/52025d7789c8bb45a38bad2e58ac67cc26f3b4ed.svn-base
deleted file mode 100644
index 261c411..0000000
--- a/src/intersim2/.svn/pristine/52/52025d7789c8bb45a38bad2e58ac67cc26f3b4ed.svn-base
+++ /dev/null
@@ -1,99 +0,0 @@
-// $Id$
-
-/*
- Copyright (c) 2007-2012, Trustees of The Leland Stanford Junior University
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this 
- list of conditions and the following disclaimer.
- Redistributions in binary form must reproduce the above copyright notice, this
- list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-// ----------------------------------------------------------------------
-//
-//  File Name: flitchannel.hpp
-//
-//  The FlitChannel models a flit channel with a multi-cycle 
-//   transmission delay. The channel latency can be specified as 
-//   an integer number of simulator cycles.
-// ----------------------------------------------------------------------
-
-#ifndef FLITCHANNEL_HPP
-#define FLITCHANNEL_HPP
-
-// ----------------------------------------------------------------------
-//  $Author: jbalfour $
-//  $Date: 2007/06/27 23:10:17 $
-//  $Id$
-// ----------------------------------------------------------------------
-
-#include "channel.hpp"
-#include "flit.hpp"
-
-using namespace std;
-
-class Router ;
-
-class FlitChannel : public Channel<Flit> {
-public:
-  FlitChannel(Module * parent, string const & name, int classes);
-
-  void SetSource(Router const * const router, int port) ;
-  inline Router const * const GetSource() const {
-    return _routerSource;
-  }
-  inline int const & GetSourcePort() const {
-    return _routerSourcePort;
-  }
-  void SetSink(Router const * const router, int port) ;
-  inline Router const * const GetSink() const {
-    return _routerSink;
-  }
-  inline int const & GetSinkPort() const {
-    return _routerSinkPort;
-  }
-  inline vector<int> const & GetActivity() const {
-    return _active;
-  }
-
-  // Send flit 
-  virtual void Send(Flit * flit);
-
-  virtual void ReadInputs();
-  virtual void WriteOutputs();
-
-private:
-  
-  ////////////////////////////////////////
-  //
-  // Power Models OBSOLETE
-  //
-  ////////////////////////////////////////
-
-  Router const * _routerSource;
-  int _routerSourcePort;
-  Router const * _routerSink;
-  int _routerSinkPort;
-
-  // Statistics for Activity Factors
-  vector<int> _active;
-  int _idle;
-};
-
-#endif