[Csp-commits] APPLICATIONS/CSPSim/Include Bus.h,1.1,1.2 System.h,1.2,1.3

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/CSPSim/Include
In directory sc8-pr-cvs1:/tmp/cvs-serv3748/Include

Modified Files:
	Bus.h System.h 
Log Message:


Index: Bus.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/Bus.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Bus.h	7 Sep 2003 16:38:32 -0000	1.1
--- Bus.h	7 Sep 2003 22:25:49 -0000	1.2
***************
*** 65,74 ****
  	      MASK_BLOCKED = 0x00000002,
  	      MASK_SHARED  = 0x00000004,
! 	      DERIVED_MASK = 0xffff0000,
  	};
  
  	typedef enum {
  		ACCESS_LOCAL,
! 		ACCESS_SHARED,
  	} AccessType;
  
--- 65,74 ----
  	      MASK_BLOCKED = 0x00000002,
  	      MASK_SHARED  = 0x00000004,
! 	      DERIVED_MASK = 0xffff0000
  	};
  
  	typedef enum {
  		ACCESS_LOCAL,
! 		ACCESS_SHARED
  	} AccessType;
  
***************
*** 95,99 ****
  	 */
  	void setEnabled(bool enabled) {
! 		m_Mask = (m_Mask & ~MASK_ENABLED) | (enabled ? MASK_ENABLED : 0);
  	}
  
--- 95,99 ----
  	 */
  	void setEnabled(bool enabled) {
! 		m_Mask = (m_Mask & ~MASK_ENABLED) | (enabled ? MASK_ENABLED : 0U);
  	}
  
***************
*** 126,130 ****
  		m_Name(name), m_Mask(0) 
  	{
! 		m_Mask |= (access == ACCESS_SHARED) ? MASK_SHARED : 0;
  	}
  };
--- 126,130 ----
  		m_Name(name), m_Mask(0) 
  	{
! 		m_Mask |= (access == ACCESS_SHARED) ? MASK_SHARED : 0U;
  	}
  };
***************
*** 186,190 ****
  	      MASK_PUSH    = 0x00020000,
  	      MASK_PULL    = 0x00040000,
! 	      MASK_DIRTY   = 0x00080000,
  	};
  
--- 186,190 ----
  	      MASK_PUSH    = 0x00020000,
  	      MASK_PULL    = 0x00040000,
! 	      MASK_DIRTY   = 0x00080000
  	};
  
***************
*** 194,198 ****
  		NO_SIGNAL,
  		PUSH_SIGNAL,
! 		PULL_SIGNAL,
  	} SignalType;
  
--- 194,198 ----
  		NO_SIGNAL,
  		PUSH_SIGNAL,
! 		PULL_SIGNAL
  	} SignalType;
  
***************
*** 349,353 ****
  	 *  @param shared Create a shared (or non-shared) channel.
  	 */
! 	DataChannel(std::string const &name, T const &value, AccessType access=ACCESS_LOCAL, SignalType signal=NO_SIGNAL): m_Value(value), DataChannelBase(name, access, signal) {}
  
  	static DataChannel<T> *newLocal(std::string const &name, T const &value) {
--- 349,353 ----
  	 *  @param shared Create a shared (or non-shared) channel.
  	 */
! 	DataChannel(std::string const &name, T const &value, AccessType access=ACCESS_LOCAL, SignalType signal=NO_SIGNAL): DataChannelBase(name, access, signal), m_Value(value) {}
  
  	static DataChannel<T> *newLocal(std::string const &name, T const &value) {
***************
*** 583,588 ****
  	 */
  	Bus(std::string const &name): 
- 		m_Name(name), 
  		m_Bound(false), 
  		m_Status(1.0), 
  		m_Enabled(true) 
--- 583,588 ----
  	 */
  	Bus(std::string const &name): 
  		m_Bound(false), 
+ 		m_Name(name), 
  		m_Status(1.0), 
  		m_Enabled(true) 

Index: System.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Include/System.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** System.h	7 Sep 2003 16:45:55 -0000	1.2
--- System.h	7 Sep 2003 22:25:49 -0000	1.3
***************
*** 120,124 ****
  	// for internal use by the system instance, which will be
  	// destroyed when the model goes out of scope.
! 	Model* System::getModel() const { return m_Model; }
  
  public:
--- 120,124 ----
  	// for internal use by the system instance, which will be
  	// destroyed when the model goes out of scope.
! 	Model* getModel() const { return m_Model; }
  
  public:
***************
*** 178,182 ****
  	Bus::Ref m_Bus;
  
! 	virtual void setModel(Model *model) {}
  
  	class FindSystemByNameVisitor: public simdata::FindVisitor<System,SystemVisitor> {
--- 178,182 ----
  	Bus::Ref m_Bus;
  
! 	virtual void setModel(Model *) {}
  
  	class FindSystemByNameVisitor: public simdata::FindVisitor<System,SystemVisitor> {