correct relative positionning of source/group

[blast.git] / AbstractInterface.h

diff --git a/AbstractInterface.h b/AbstractInterface.h
index 78414c36236a33a040736e75b5193c2d8c87cc47..39157a65bbb58869fa63ca6aac23964a6c1af4de 100644 (file)
--- a/AbstractInterface.h
+++ b/AbstractInterface.h
@@ -23,18 +23,16 @@ class AbstractInterface {
 
 public :
 
 
 public :
 

-  enum IfaceWidthType { Expression = 1, Boolean, Natural};
-  enum IfacePurpose { Data = 1, Clock = 2, Reset = 3, Wishbone = 4 };
-  enum IfaceDirection { Input = 1, Output = 2, InOut = 3 };
-  enum IfaceLevel { Basic = 1, Top = 2 };  
+  enum IfaceWidthType { Expression = 1, Boolean, Natural, Inherited}; //! Inherited is only for Group interface 
+  enum IfacePurpose { Data = 1, Control, Clock, Reset, Wishbone };
+  enum IfaceDirection { Input = 1, Output = 2, InOut = 3 };  

   enum IfaceVHDLContext { Entity = 1, Component = 2, Architecture = 3 }; // NB : 3 is when creating an instance of the block that owns this iface
   enum IfaceVHDLFlags { NoComma = 1 };
 
   enum IfaceVHDLContext { Entity = 1, Component = 2, Architecture = 3 }; // NB : 3 is when creating an instance of the block that owns this iface
   enum IfaceVHDLFlags { NoComma = 1 };
 

-  static int getIntDirection(QString str);
-  static int getIntLevel(QString str);
+  static int getIntDirection(QString str);  

 
   AbstractInterface(AbstractBlock* _owner);
 
   AbstractInterface(AbstractBlock* _owner);

-  AbstractInterface(AbstractBlock* _owner, const QString& _name, const QString& _type, const QString& _width, int _direction, int _purpose, int _level);
+  AbstractInterface(AbstractBlock* _owner, const QString& _name, const QString& _type, const QString& _width, int _direction, int _purpose);

   AbstractInterface(AbstractInterface* other);
   virtual ~AbstractInterface();
 
   AbstractInterface(AbstractInterface* other);
   virtual ~AbstractInterface();
 


@@ -46,10 +44,9 @@ public :
   inline int getPurpose() { return purpose;}
   QString getPurposeString();
   inline int getDirection() { return direction;}
   inline int getPurpose() { return purpose;}
   QString getPurposeString();
   inline int getDirection() { return direction;}

-  QString getDirectionString();
-  inline int getLevel() { return level;}
-  QString getLevelString();
+  QString getDirectionString();  

   inline AbstractBlock *getOwner() { return owner;}
   inline AbstractBlock *getOwner() { return owner;}

+  inline AbstractInterface* getAssociatedIface() { return associatedIface; }

 
   double getDoubleWidth() throw(QException);
 
 
   double getDoubleWidth() throw(QException);
 


@@ -68,7 +65,7 @@ public :
   inline void setType(const QString& _type) { type = typeFromString(_type);}
   void setPurpose(int _purpose);
   void setDirection(int _direction);
   inline void setType(const QString& _type) { type = typeFromString(_type);}
   void setPurpose(int _purpose);
   void setDirection(int _direction);

-  void setLevel(int _level);
+  bool setAssociatedIface(AbstractInterface* iface);

 
   // testers
   virtual bool isReferenceInterface();
 
   // testers
   virtual bool isReferenceInterface();


@@ -98,9 +95,17 @@ protected:
   QString width;
   int purpose;
   int direction;
   QString width;
   int purpose;
   int direction;

-  int level;

 
   AbstractBlock* owner;
 
   AbstractBlock* owner;

+  /*!
+   * \brief associatedIface the control (resp. data) interface that is bounded to this data (resp. control) interface
+   * If a reference block is designed to be fully integrated in Blast, nearly every data interface is bounded
+   * to a control interface that signals if the value presented on the interface is valid or not. associatedIface
+   * references this control interface if this is a data interface, and a data interface is this is a control interface.
+   * Note that the association is done by the call of setAssociatedIface() that must be done only for a control interface.
+   * (NB: a test is done in the method to prevent the other case).
+   */
+  AbstractInterface* associatedIface;

 };
 
 
 };