changed ref/impls xsd and xml

diff --git a/FunctionalBlock.cpp b/FunctionalBlock.cpp
index ab9611d9f9aa3e9fc2276068418cf93b44cf76ee..ccaa7b2c8ead70bc09165e0ac451ce2ee039ecf1 100644 (file)
--- a/FunctionalBlock.cpp
+++ b/FunctionalBlock.cpp
@@ -1424,23 +1424,22 @@ void FunctionalBlock::generateComments(QTextStream& out, QDomElement &elt, QStri
   QString mail = eltAuthor.attribute("mail","");\r
   out << "--  Author(s)   : "<<firstName+" "<<lastName<<" ("<<mail<<")" << endl;\r
   out << "--" << endl;\r
   QString mail = eltAuthor.attribute("mail","");\r
   out << "--  Author(s)   : "<<firstName+" "<<lastName<<" ("<<mail<<")" << endl;\r
   out << "--" << endl;\r

-  QDomElement eltDate = eltAuthor.nextSiblingElement("date");\r
-  QString crea = eltDate.attribute("creation","");\r
+  QDomElement eltLog = eltAuthor.nextSiblingElement("log");\r
+  QString crea = eltLog.attribute("creation","");\r

   out << "--  Creation Date   : "<<crea<< endl;\r
   out << "--" << endl;\r
   out << "--  Creation Date   : "<<crea<< endl;\r
   out << "--" << endl;\r

-  QDomElement eltRelated = eltDate.nextSiblingElement("related_files");\r
-  QString relateds = eltRelated.attribute("list","");\r
-  out << "--  Related files   :\n"<<relateds<<endl;\r
-  out << "--" << endl;\r
-  QDomElement eltDesc = eltRelated.nextSiblingElement("description");\r
-  QDomElement desc = eltDesc.firstChildElement();\r
-  QString descTxt = desc.text();\r
-  out << "--  Decription      :\n"<<descTxt<<endl;\r
+  QDomNodeList listModifs = eltLog.elementsByTagName("modification");\r
+  for(int j=0;j<listModifs.length();j++) {\r
+    QDomNode nodeModif = listModifs.at(j);\r
+    QDomElement eltModif = nodeModif.toElement();\r
+  }\r
+  out << "-- Description   : " << endl;\r
+  out << reference->getDescription() << endl;\r

   out << "--" << endl;\r
   out << "--" << endl;\r

-  QDomElement eltNote = eltDesc.nextSiblingElement("description");\r
+  QDomElement eltNote = eltLog.nextSiblingElement("notes");\r

   QDomElement note = eltNote.firstChildElement();\r
   QString noteTxt = note.text();\r
   QDomElement note = eltNote.firstChildElement();\r
   QString noteTxt = note.text();\r

-  out << "--  Note          :\n"<<noteTxt<<endl;\r
+  out << "--  Notes          :\n"<<noteTxt<<endl;\r

   out << "--" << endl;\r
   for(int i = 0; i < 50; i++) {\r
     out << "--";\r
   out << "--" << endl;\r
   for(int i = 0; i < 50; i++) {\r
     out << "--";\r

diff --git a/ReferenceBlock.cpp b/ReferenceBlock.cpp
index c2d9bffdfefbb4dccd3b40385f86ede7762ee97b..b6dee80ce813a88016e75e0cc823a856239a263c 100644 (file)
--- a/ReferenceBlock.cpp
+++ b/ReferenceBlock.cpp
@@ -16,14 +16,9 @@ void ReferenceBlock::addCategory(int id) {
  categories.append(id);
 }
 
  categories.append(id);
 }
 

-void ReferenceBlock::setBriefDescription(const QString& str) {
+void ReferenceBlock::setDescription(const QString& str) {

   if(str != NULL)
   if(str != NULL)

-    descriptionBrief = str;
-}
-
-void ReferenceBlock::setDetailedDescription(const QString& str) {
-  if(str != NULL)
-    descriptionDetail = str;
+    description = str;

 }
 
 void ReferenceBlock::addImplementation(BlockImplementation *impl) {
 }
 
 void ReferenceBlock::addImplementation(BlockImplementation *impl) {


@@ -120,28 +115,16 @@ void ReferenceBlock::loadInformations(QDomElement &elt) throw(Exception) {
   // getting description
   cout << "Block info : get description" << endl;  
   QDomElement eltDesc = eltCat.nextSiblingElement("description");
   // getting description
   cout << "Block info : get description" << endl;  
   QDomElement eltDesc = eltCat.nextSiblingElement("description");

-  // getting brief  
-  QDomElement eltBrief = eltDesc.firstChildElement("brief");
-  QDomNode nodeBriefTxt = eltBrief.firstChild();
-  if (nodeBriefTxt.isNull()) {
-    descriptionBrief = "no brief description";
-  }
-  else {
-    QDomText txtBrief = nodeBriefTxt.toText();
-    descriptionBrief = txtBrief.data().trimmed();
-    cout << "block brief desc : " << qPrintable(descriptionBrief) << endl;
-  }
-  // getting detailed  
-  QDomElement eltDetail = eltBrief.nextSiblingElement("detailed");
-  QDomNode nodeDetailTxt = eltDetail.firstChild();
-  if (nodeDetailTxt.isNull()) {
-    descriptionDetail = "no detailed description";
+  // getting text
+  QDomNode nodeTxt = eltDesc.firstChild();
+  if (nodeTxt.isNull()) {
+    description = "no description";

   }
   else {
   }
   else {

-    QDomText txtDetail = nodeDetailTxt.toText();
-    descriptionDetail = txtDetail.data().trimmed();
-    cout << "block detail desc : " << qPrintable(descriptionDetail) << endl;
-  }
+    QDomText txtBrief = nodeTxt.toText();
+    description = txtBrief.data().trimmed();
+    cout << "block desc : " << qPrintable(description) << endl;
+  }  

 }
 
 void ReferenceBlock::loadParameters(QDomElement &elt) throw(Exception) {
 }
 
 void ReferenceBlock::loadParameters(QDomElement &elt) throw(Exception) {


@@ -436,8 +419,7 @@ QDataStream& operator<<(QDataStream &out, const ReferenceBlock &b) {
 
   toWrite << b.name;
   toWrite << b.xmlFile;
 
   toWrite << b.name;
   toWrite << b.xmlFile;

-  toWrite << b.descriptionBrief;
-  toWrite << b.descriptionDetail;
+  toWrite << b.description;

   toWrite << b.categories;
   toWrite << b.hashMd5;
   toWrite << b.params.size();
   toWrite << b.categories;
   toWrite << b.hashMd5;
   toWrite << b.params.size();


@@ -565,8 +547,7 @@ QDataStream& operator>>(QDataStream &in, ReferenceBlock &b) {
 
   in >> b.name;
   in >> b.xmlFile;
 
   in >> b.name;
   in >> b.xmlFile;

-  in >> b.descriptionBrief;
-  in >> b.descriptionDetail;
+  in >> b.description;

   in >> b.categories;
   in >> b.hashMd5;
   b.params.clear();
   in >> b.categories;
   in >> b.hashMd5;
   b.params.clear();

diff --git a/ReferenceBlock.h b/ReferenceBlock.h
index 83f38c55d0902f114146662d18ed6a3efb801937..2aca8797119874d09f96fc3c239889131a7f5ce4 100644 (file)
--- a/ReferenceBlock.h
+++ b/ReferenceBlock.h
@@ -26,25 +26,26 @@ public:
 
   ReferenceBlock(const QString _xmlFile);
 
 
   ReferenceBlock(const QString _xmlFile);
 

+  // getters

   int getType();
   inline QString getXmlFile() { return xmlFile; }
   int getType();
   inline QString getXmlFile() { return xmlFile; }

-  inline QString getBriefDescription() { return descriptionBrief; }
-  inline QString getDetailedDescription() { return descriptionDetail; }
+  inline QString getDescription() { return description; }

   inline QList<int> getCategories() { return categories; }
   inline QList<BlockImplementation *> getImplementations() { return implementations; }
   inline QList<int> getCategories() { return categories; }
   inline QList<BlockImplementation *> getImplementations() { return implementations; }

-  inline QString getHashMd5() { return hashMd5; }
-
+  inline QString getHashMd5() { return hashMd5; }  

   inline AbstractBlock* getParent() { return NULL; }
   inline AbstractBlock* getParent() { return NULL; }

+  QList<QString> getExternalResources();

 
 

-  void addCategory(int id);
-  void setBriefDescription(const QString& str);
-  void setDetailedDescription(const QString& str);
+  // setters
+  void setDescription(const QString& str);
+
+  // others

   void addImplementation(BlockImplementation* impl);
   void addImplementation(BlockImplementation* impl);

+  void addCategory(int id);

 
   void load(QDomElement &elt) throw(Exception);
   void setHashMd5();
 
 
   void load(QDomElement &elt) throw(Exception);
   void setHashMd5();
 

-  QList<QString> getExternalResources();

   void generateVHDL(const QString& path) throw(Exception); // main entry to generate the VHDL code
 
   void parametersValidation(QList<AbstractBlock*>* checkedBlocks, QList<AbstractBlock*>* blocksToConfigure);
   void generateVHDL(const QString& path) throw(Exception); // main entry to generate the VHDL code
 
   void parametersValidation(QList<AbstractBlock*>* checkedBlocks, QList<AbstractBlock*>* blocksToConfigure);


@@ -52,8 +53,7 @@ public:
 private:
   QString xmlFile; // the xml file from which attributes are initialized.
   QString hashMd5;
 private:
   QString xmlFile; // the xml file from which attributes are initialized.
   QString hashMd5;

-  QString descriptionBrief;
-  QString descriptionDetail;
+  QString description;

   QList<int> categories;
   QList<BlockImplementation *> implementations; // set when implementations are read
 
   QList<int> categories;
   QList<BlockImplementation *> implementations; // set when implementations are read
 

diff --git a/SpecialBlock.cpp b/SpecialBlock.cpp
index 8edff6f9adc6a448add3220bafaacc15f16faafd..2d225e2ea3e389f89645f0abedec850026a04f05 100644 (file)
--- a/SpecialBlock.cpp
+++ b/SpecialBlock.cpp
@@ -12,10 +12,7 @@ void SpecialBlock::checkInputPatternCompatibility() throw(Exception) {
     switch(type) {\r
     case ClockConvert :\r
       checkInputPatternCompatibilityClockConvert();\r
     switch(type) {\r
     case ClockConvert :\r
       checkInputPatternCompatibilityClockConvert();\r

-      break;\r
-    case ClkRstGen:\r
-      checkInputPatternCompatibilityClkRstGen();\r
-      break;\r
+      break;    \r

     }\r
   }\r
   catch(Exception e) {\r
     }\r
   }\r
   catch(Exception e) {\r


@@ -28,10 +25,7 @@ void SpecialBlock::computeOutputPattern(int nbExec) throw(Exception) {
     switch(type) {\r
     case ClockConvert :\r
       computeOutputPatternClockConvert(nbExec);\r
     switch(type) {\r
     case ClockConvert :\r
       computeOutputPatternClockConvert(nbExec);\r

-      break;\r
-    case ClkRstGen:\r
-      computeOutputPatternClkRstGen(nbExec);\r
-      break;\r
+      break;    \r

     }\r
   }\r
   catch(Exception e) {\r
     }\r
   }\r
   catch(Exception e) {\r


@@ -45,7 +39,3 @@ void SpecialBlock::computeOutputPatternClockConvert(int nbExec) throw(Exception)
 }\r
 \r
 \r
 }\r
 \r
 \r

-void SpecialBlock::checkInputPatternCompatibilityClkRstGen() throw(Exception) {\r
-}\r
-void SpecialBlock::computeOutputPatternClkRstGen(int nbExec) throw(Exception) {\r
-}\r

diff --git a/SpecialBlock.h b/SpecialBlock.h
index 06c645966ac51697d8960e9d21ab32a11a9a13a3..574803d883de02b23cb511aeb1c8fdc82ed2fb39 100644 (file)
--- a/SpecialBlock.h
+++ b/SpecialBlock.h
@@ -16,7 +16,7 @@ using namespace Qt;
 class SpecialBlock : public FunctionalBlock {\r
 public:\r
 \r
 class SpecialBlock : public FunctionalBlock {\r
 public:\r
 \r

-  enum SpecialType { ClockConvert = 0, ClkRstGen = 1 };\r
+  enum SpecialType { ClockConvert = 1 };\r

   \r
   SpecialBlock(SpecialType _type, GroupBlock* _parent, ReferenceBlock* _reference, bool createIfaces = true) throw(Exception);\r
   ~SpecialBlock();\r
   \r
   SpecialBlock(SpecialType _type, GroupBlock* _parent, ReferenceBlock* _reference, bool createIfaces = true) throw(Exception);\r
   ~SpecialBlock();\r


@@ -37,8 +37,7 @@ private:
   \r
   void checkInputPatternCompatibilityClockConvert() throw(Exception);\r
   void computeOutputPatternClockConvert(int nbExec = -1) throw(Exception);\r
   \r
   void checkInputPatternCompatibilityClockConvert() throw(Exception);\r
   void computeOutputPatternClockConvert(int nbExec = -1) throw(Exception);\r

-  void checkInputPatternCompatibilityClkRstGen() throw(Exception);\r
-  void computeOutputPatternClkRstGen(int nbExec = -1) throw(Exception);\r
+\r

 \r
 };\r
 \r
 \r
 };\r
 \r

diff --git a/blast.creator.user b/blast.creator.user
index abc9d49e6fb387c7a007997cdedfb5d17a86a8f8..ee6eead3e209db99219cd6a61b0ab6cc40985ce0 100644 (file)
--- a/blast.creator.user
+++ b/blast.creator.user
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>

-<!-- Written by QtCreator 4.2.0, 2018-05-02T16:34:14. -->
+<!-- Written by QtCreator 4.2.0, 2018-05-02T22:20:14. -->

 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

-  <value type="QByteArray">{3701e197-5b6c-48ea-9e98-a6cf6de18672}</value>
+  <value type="QByteArray">{c8006d66-d34f-42be-ad10-d0207752286d}</value>

  </data>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
  </data>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>


@@ -61,7 +61,7 @@
   <valuemap type="QVariantMap">
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value>
   <valuemap type="QVariantMap">
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value>

-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{ed04208c-8774-456b-99b9-4a02094ca7a4}</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{2c9bf876-3476-44eb-8065-1f0844704dda}</value>

    <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>

diff --git a/block-1I1O.xml b/block-1I1O.xml
index 1e05fa5625d6740b3b8332ecc6c858e491124964..3d36ceb1c1ceb78e5e2063c85210085d4f187b2f 100644 (file)
--- a/block-1I1O.xml
+++ b/block-1I1O.xml
@@ -6,12 +6,7 @@
     </name>
     <category ids="8" />  
     <description>
     </name>
     <category ids="8" />  
     <description>

-      <brief>
-       A testing block with 1 input, 1 output
-      </brief>
-      <detailed>
-       A testing block with 1 input, 1 output
-      </detailed>     
+      A testing block with 1 input, 1 output

     </description>    
   </informations>
 
     </description>    
   </informations>
 

diff --git a/block-2I2O.xml b/block-2I2O.xml
index c8bfdc579bf1dc7ca9879d243256ab2aff9328e6..a712c2f8a2c00551dad7ba2f0dc0ee27a8ea5007 100644 (file)
--- a/block-2I2O.xml
+++ b/block-2I2O.xml
@@ -6,12 +6,7 @@
     </name>
     <category ids="8" />  
     <description>
     </name>
     <category ids="8" />  
     <description>

-      <brief>
-       A testing block with 2 inputs, 2 outputs
-      </brief>
-      <detailed>
-       A testing block with 2 inputs, 2 outputs
-      </detailed>     
+      A testing block with 2 inputs, 2 outputs

     </description>    
   </informations>
 
     </description>    
   </informations>
 

diff --git a/block-2INO.xml b/block-2INO.xml
index af3e0dfa16bd51c1441d7bdaad8076ec3579de62..c1aaa04926dd3afb1cdddcb74587b3f2ab31ed08 100644 (file)
--- a/block-2INO.xml
+++ b/block-2INO.xml
@@ -6,12 +6,7 @@
     </name>
     <category ids="8" />  
     <description>
     </name>
     <category ids="8" />  
     <description>

-      <brief>

        A testing block with 2 inputs, N outputs
        A testing block with 2 inputs, N outputs

-      </brief>
-      <detailed>
-       A testing block with 2 inputs,  N outputs
-      </detailed>     

     </description>    
   </informations>
 
     </description>    
   </informations>
 

diff --git a/implementation.xsd b/implementation.xsd
index a42059f55daee4fcce736c8d06c27848b61acbeb..d69fe735c9d6c2aaab2015f05155c6bbac7247c7 100644 (file)
--- a/implementation.xsd
+++ b/implementation.xsd
@@ -32,10 +32,8 @@
     <xs:group name="commentsElmtGroup">
        <xs:sequence>
          <xs:element ref="author"/>
     <xs:group name="commentsElmtGroup">
        <xs:sequence>
          <xs:element ref="author"/>

-         <xs:element ref="date"/>        
-         <xs:element ref="related_files"/>
-         <xs:element ref="description"/>
-         <xs:element ref="notes"/>       
+         <xs:element ref="log"/>         
+         <xs:element name="notes" type="xs:string"/>

        </xs:sequence>
     </xs:group>
 
        </xs:sequence>
     </xs:group>
 


@@ -63,22 +61,26 @@
        </xs:complexType>
     </xs:element>
 
        </xs:complexType>
     </xs:element>
 

-    <xs:element name="date">
-       <xs:complexType>
-         <xs:attribute ref="creation" />
-       </xs:complexType>
+    <xs:element name="log">
+      <xs:complexType>
+       <xs:sequence>
+         <xs:element ref="modification" minOccurs="0" maxOccurs="unbounded" />
+       </xs:sequence>
+       <xs:attribute ref="creation" />
+      </xs:complexType>

     </xs:element>
 
     </xs:element>
 

-    <xs:element name="related_files">
-       <xs:complexType>
-         <xs:attribute ref="list" />
-       </xs:complexType>
+    <xs:element name="modification">
+      <xs:complexType>
+       <xs:simpleContent>
+         <xs:extension base="xs:string">
+         <xs:attribute name="id" type="xs:nonNegativeInteger" />
+         <xs:attribute name="date" type="xs:date" />
+         </xs:extension>
+       </xs:simpleContent>
+      </xs:complexType>

     </xs:element>
     
     </xs:element>
     

-    <xs:element name="description" type="xs:string" />
-
-    <xs:element name="notes" type="xs:string" />
-

     <xs:element name="libraries">
       <xs:complexType>
        <xs:sequence>
     <xs:element name="libraries">
       <xs:complexType>
        <xs:sequence>

diff --git a/lib/implementations/apf27-wb-master_impl.xml b/lib/implementations/apf27-wb-master_impl.xml
index 2b2548ba8b4ddaec55b3a30ad2adc4a54e281e5e..3775e0730ff0bacc7f642d279dba2ab54b039f5f 100644 (file)
--- a/lib/implementations/apf27-wb-master_impl.xml
+++ b/lib/implementations/apf27-wb-master_impl.xml
@@ -2,21 +2,19 @@
 <block_impl ref_name="apf27-wb-master.xml" ref_md5="">
   <comments>
     <author firstname="stephane" lastname="Domas" mail="sdomas@univ-fcomte.fr" />
 <block_impl ref_name="apf27-wb-master.xml" ref_md5="">
   <comments>
     <author firstname="stephane" lastname="Domas" mail="sdomas@univ-fcomte.fr" />

-    <date creation="2015-04-27" />
-    <related_files list="interconn.vhd,clkrstgen.vhd"/>
-    <description>
-      This component is an interface between i.MX signals
-      and the interconnector component.
-    </description>
+    <log creation="2018-05-02">
+      <modification id="1" date="2018-05-02">
+       changed to comply with new structure
+      </modification>
+    </log>

     <notes>
     <notes>

-   On i.MX&lt;->FPGA connection : the WEIM part of i.MX has a 16 bits bus address
-   but only [1:12] bits are connected to FPGA pins. From the i.MX point of view
-   it means that reading in memory mapped address 0x0002 or 0x0003 gives the same
-   result since the LSB bit of the address is not transmited.
-   
-   These 12 bits are forwarded to the interconnector which is responsible to
-   determine for what IP the data and addr signals must be routed.
-
+       On i.MX&lt;->FPGA connection : the WEIM part of i.MX has a 16 bits bus address
+       but only [1:12] bits are connected to FPGA pins. From the i.MX point of view
+       it means that reading in memory mapped address 0x0002 or 0x0003 gives the same
+       result since the LSB bit of the address is not transmited.
+       
+       These 12 bits are forwarded to the interconnector which is responsible to
+       determine for what IP the data and addr signals must be routed.

     </notes>
   </comments>
 
     </notes>
   </comments>
 

diff --git a/lib/implementations/average-Nx3_impl.xml b/lib/implementations/average-Nx3_impl.xml
index a19842c413a39d9e986c6bfc4931ee56df87b6eb..2181965b199d21b6b4d88a1459e71cd9052871b1 100644 (file)
--- a/lib/implementations/average-Nx3_impl.xml
+++ b/lib/implementations/average-Nx3_impl.xml
@@ -2,13 +2,10 @@
 <block_impl ref_name="average-Nx3.xml" ref_md5="">
   <comments>
     <author firstname="stephane" lastname="Domas" mail="sdomas@univ-fcomte.fr" />
 <block_impl ref_name="average-Nx3.xml" ref_md5="">
   <comments>
     <author firstname="stephane" lastname="Domas" mail="sdomas@univ-fcomte.fr" />

-    <date creation="2015-04-27" />
-    <related_files list=""/>
-    <description>
-      This component is a average filter on 3 succesives inputs, over N samples
-    </description>
+    <log creation="2018-05-02">
+    </log>

     <notes>
     <notes>

-      No notes
+       This component is a average filter on 3 succesives inputs, over N samples

     </notes>
   </comments>
 
     </notes>
   </comments>
 

diff --git a/lib/implementations/boxfilter_3x3_impl.xml b/lib/implementations/boxfilter_3x3_impl.xml
index 40f260f6bb43719cfa37245475e9fafaa1112528..3eb2b903a0824e758cd7578f685b1d76b3d2ec6c 100644 (file)
--- a/lib/implementations/boxfilter_3x3_impl.xml
+++ b/lib/implementations/boxfilter_3x3_impl.xml
@@ -2,10 +2,10 @@
 <block_impl ref_name="boxfilter_3x3.xml" ref_md5="">
   <comments>
     <author lastname="" mail="" firstname=""/>
 <block_impl ref_name="boxfilter_3x3.xml" ref_md5="">
   <comments>
     <author lastname="" mail="" firstname=""/>

-    <date creation="2018-01-10"/>
-    <related_files list=""/>
-    <description>frdfgdr</description>
-    <notes>gregre</notes>
+    <log creation="2018-01-10">
+    </log>
+    <notes>
+    </notes>

   </comments>
   <libraries>
     <library name="ieee">
   </comments>
   <libraries>
     <library name="ieee">

diff --git a/lib/implementations/checker_impl.xml b/lib/implementations/checker_impl.xml
index a9d780df628d087b790eac69f2f7641d47808e9b..fb0dab5aaf746b82a1d1e49906f06054ea8199b8 100644 (file)
--- a/lib/implementations/checker_impl.xml
+++ b/lib/implementations/checker_impl.xml
@@ -2,10 +2,10 @@
 <block_impl ref_name="checker.xml" ref_md5="">
   <comments>
     <author lastname="" mail="" firstname=""/>
 <block_impl ref_name="checker.xml" ref_md5="">
   <comments>
     <author lastname="" mail="" firstname=""/>

-    <date creation="2018-01-10"/>
-    <related_files list=""/>
-    <description>frdfgdr</description>    
-    <notes>gre</notes>
+    <log creation="2018-05-02">
+    </log>
+    <notes>
+    </notes>

   </comments>
   <libraries>
     <library name="ieee">
   </comments>
   <libraries>
     <library name="ieee">

diff --git a/lib/implementations/clkdomain_convert_1024x8_impl.xml b/lib/implementations/clkdomain_convert_1024x8_impl.xml
index cdab60b298d5619ee5ce3b7cb6497daadaf3dad1..f5c5ead27aed7c68060bac6f64d722095e434a15 100644 (file)
--- a/lib/implementations/clkdomain_convert_1024x8_impl.xml
+++ b/lib/implementations/clkdomain_convert_1024x8_impl.xml
@@ -2,11 +2,10 @@
 <block_impl ref_name="clkdomain_convert_1024x8.xml" ref_md5="">
   <comments>
     <author mail="sdomas@univ-fcomte.fr" lastname="domas" firstname="stephane"/>
 <block_impl ref_name="clkdomain_convert_1024x8.xml" ref_md5="">
   <comments>
     <author mail="sdomas@univ-fcomte.fr" lastname="domas" firstname="stephane"/>

-    <date creation="2018-04-13"/>
-    <related_files list=""/>
-    <description>This IP allows to pass 8 bits values from a clock domain to another. It uses a FIFO of 1024 entries.
-</description>
-    <notes>This IP allows to pass 8 bits values from a clock domain to another. It uses a FIFO of 1024 entries.</notes>
+    <log creation="2018-05-02">
+    </log>
+    <notes>
+    </notes>

   </comments>
   <libraries>
     <library name="ieee">
   </comments>
   <libraries>
     <library name="ieee">

diff --git a/lib/implementations/clkrstgen_impl.xml b/lib/implementations/clkrstgen_impl.xml
index 7e9d15a8e4b9a93c8ae5583951862d2fa3280b08..192b142894d3aaa1e132b4b1e4fb3593b3ba2ab0 100644 (file)
--- a/lib/implementations/clkrstgen_impl.xml
+++ b/lib/implementations/clkrstgen_impl.xml
@@ -2,11 +2,10 @@
 <block_impl ref_name="clkrstgen.xml" ref_md5="">
   <comments>
     <author lastname="Domas" mail="sdomas@univ-fcomte.fr" firstname="Stephane"/>
 <block_impl ref_name="clkrstgen.xml" ref_md5="">
   <comments>
     <author lastname="Domas" mail="sdomas@univ-fcomte.fr" firstname="Stephane"/>

-    <date creation="2018-01-10"/>
-    <related_files list=""/>
-    <description>implementation of cljrstgen that does the connection between
-    external and internal clock and reset</description>    
-    <notes>none</notes>
+    <log creation="2018-05-02">
+    </log>
+    <notes>
+    </notes>

   </comments>
   <libraries>
     <library name="ieee">
   </comments>
   <libraries>
     <library name="ieee">

diff --git a/lib/implementations/csvreader_impl.xml b/lib/implementations/csvreader_impl.xml
index 2ea85fe1194c77ec8dfcd33b5e28008b6ca12755..6c39f20236aaae2e507529e5d4a0be3664056eeb 100644 (file)
--- a/lib/implementations/csvreader_impl.xml
+++ b/lib/implementations/csvreader_impl.xml
@@ -2,14 +2,11 @@
 <block_impl ref_name="csvreader.xml" ref_md5="">
   <comments>
     <author firstname="stephane" lastname="Domas" mail="sdomas@univ-fcomte.fr" />
 <block_impl ref_name="csvreader.xml" ref_md5="">
   <comments>
     <author firstname="stephane" lastname="Domas" mail="sdomas@univ-fcomte.fr" />

-    <date creation="2015-05-10" />
-    <related_files list=""/>
-    <description>
-      This component read data in a CSV file
-    </description>
+    <log creation="2018-05-02">
+    </log>

     <notes>
     <notes>

-      No notes

     </notes>
     </notes>

+

   </comments>
 
   <libraries>
   </comments>
 
   <libraries>

diff --git a/lib/implementations/decimator-N_impl.xml b/lib/implementations/decimator-N_impl.xml
index f68c3961cb2383e9ff0804d0d4d2bbbc69f3afd3..65e8cbc90b1baa89edcb0b04c1efef9426f139ca 100644 (file)
--- a/lib/implementations/decimator-N_impl.xml
+++ b/lib/implementations/decimator-N_impl.xml
@@ -2,14 +2,10 @@
 <block_impl ref_name="decimator-N.xml" ref_md5="">
   <comments>
     <author firstname="stephane" lastname="Domas" mail="sdomas@univ-fcomte.fr" />
 <block_impl ref_name="decimator-N.xml" ref_md5="">
   <comments>
     <author firstname="stephane" lastname="Domas" mail="sdomas@univ-fcomte.fr" />

-    <date creation="2015-04-27" />
-    <related_files list=""/>
-    <description>
-      This component is a decimator of N-1 values out of N
-    </description>
+    <log creation="2018-05-02">
+    </log>

     <notes>
     <notes>

-      No notes
-    </notes>
+    </notes>    

   </comments>
 
   <libraries>
   </comments>
 
   <libraries>

diff --git a/lib/implementations/demux_impl.xml b/lib/implementations/demux_impl.xml
index a61d4e3c76f84c6dac988f06b90376d097017878..6d1355f82641b609919eccba0195b69e0a7166bc 100644 (file)
--- a/lib/implementations/demux_impl.xml
+++ b/lib/implementations/demux_impl.xml
@@ -2,13 +2,9 @@
 <block_impl ref_name="demux.xml" ref_md5="">
   <comments>
     <author firstname="stephane" lastname="Domas" mail="sdomas@univ-fcomte.fr" />
 <block_impl ref_name="demux.xml" ref_md5="">
   <comments>
     <author firstname="stephane" lastname="Domas" mail="sdomas@univ-fcomte.fr" />

-    <date creation="2015-04-27" />
-    <related_files list=""/>
-    <description>
-      This component is a synchronous demultiplixer with variable number of outputs
-    </description>
+    <log creation="2018-05-02">
+    </log>

     <notes>
     <notes>

-      No notes

     </notes>
   </comments>
 
     </notes>
   </comments>
 

diff --git a/lib/implementations/deserializer_3x1_impl.xml b/lib/implementations/deserializer_3x1_impl.xml
index 9b484701911f07d82000a74348849c3d67868a00..71431a1e3aba08f6c8df403ee331967bab79e467 100644 (file)
--- a/lib/implementations/deserializer_3x1_impl.xml
+++ b/lib/implementations/deserializer_3x1_impl.xml
@@ -2,10 +2,11 @@
 <block_impl ref_name="deserializer_3x1.xml" ref_md5="">
   <comments>
     <author lastname="" mail="" firstname=""/>
 <block_impl ref_name="deserializer_3x1.xml" ref_md5="">
   <comments>
     <author lastname="" mail="" firstname=""/>

-    <date creation="2018-01-10"/>
-    <related_files list=""/>
-    <description>gre</description>
-    <notes>gre</notes>
+    <log creation="2018-05-02">
+    </log>
+    <notes>
+    </notes>
+

   </comments>
   <libraries>
     <library name="ieee">
   </comments>
   <libraries>
     <library name="ieee">

diff --git a/lib/implementations/generator-cst_impl.xml b/lib/implementations/generator-cst_impl.xml
index 9768641b1d8d62e402e6737da576148b7718b83a..69094c0b0bb0a507f0c29f4a2d701457f6c776c9 100644 (file)
--- a/lib/implementations/generator-cst_impl.xml
+++ b/lib/implementations/generator-cst_impl.xml
@@ -2,14 +2,11 @@
 <block_impl ref_name="generator-cst.xml" ref_md5="">
   <comments>
     <author firstname="stephane" lastname="Domas" mail="sdomas@univ-fcomte.fr" />
 <block_impl ref_name="generator-cst.xml" ref_md5="">
   <comments>
     <author firstname="stephane" lastname="Domas" mail="sdomas@univ-fcomte.fr" />

-    <date creation="2015-05-10" />
-    <related_files list=""/>
-    <description>
-      This component is a generator of a sequence of V fixed values, followed by Z idle cycles.
-    </description>
+    <log creation="2018-05-02">
+    </log>

     <notes>
     <notes>

-      No notes

     </notes>
     </notes>

+    

   </comments>
 
   <libraries>
   </comments>
 
   <libraries>

diff --git a/lib/implementations/generator-img_impl.xml b/lib/implementations/generator-img_impl.xml
index d5f66f3813cba2416fa327a733c9e538a8223102..b4952a1d11031e2e1418841317f2a38da1e37ec9 100644 (file)
--- a/lib/implementations/generator-img_impl.xml
+++ b/lib/implementations/generator-img_impl.xml
@@ -2,14 +2,11 @@
 <block_impl ref_name="generator-img.xml" ref_md5="">
   <comments>
     <author firstname="stephane" lastname="Domas" mail="sdomas@univ-fcomte.fr" />
 <block_impl ref_name="generator-img.xml" ref_md5="">
   <comments>
     <author firstname="stephane" lastname="Domas" mail="sdomas@univ-fcomte.fr" />

-    <date creation="2015-05-10" />
-    <related_files list=""/>
-    <description>
-      This component is a generator of a RGB image, read in a CSV file
-    </description>
+    <log creation="2018-05-02">
+    </log>

     <notes>
     <notes>

-      No notes

     </notes>
     </notes>

+    

   </comments>
 
   <libraries>
   </comments>
 
   <libraries>

diff --git a/lib/implementations/impls.bmf b/lib/implementations/impls.bmf
deleted file mode 100644 (file)
index 0a2f0e6..0000000
Binary files a/lib/implementations/impls.bmf and /dev/null differ

diff --git a/lib/implementations/logical_AND_3_impl.xml b/lib/implementations/logical_AND_3_impl.xml
index 8d6e479f45849b25e50e227e79641780890b2b94..4ca5aa5fd8bef9c00f4067b101c849904425ec2d 100644 (file)
--- a/lib/implementations/logical_AND_3_impl.xml
+++ b/lib/implementations/logical_AND_3_impl.xml
@@ -2,10 +2,10 @@
 <block_impl ref_name="logical_AND_3.xml" ref_md5="">
   <comments>
     <author lastname="" mail="" firstname=""/>
 <block_impl ref_name="logical_AND_3.xml" ref_md5="">
   <comments>
     <author lastname="" mail="" firstname=""/>

-    <date creation="2018-01-10"/>
-    <related_files list=""/>
-    <description>yt</description>
-    <notes>hyjt</notes>
+    <log creation="2018-05-02">
+    </log>
+    <notes>
+    </notes>    

   </comments>
   <libraries>
     <library name="ieee">
   </comments>
   <libraries>
     <library name="ieee">

diff --git a/lib/implementations/multadd_impl.xml b/lib/implementations/multadd_impl.xml
index 74a022a3207db0beb475b904143c447e33bb1045..23d60d212ee47cfd30c43956bd67ed10ab95d201 100644 (file)
--- a/lib/implementations/multadd_impl.xml
+++ b/lib/implementations/multadd_impl.xml
@@ -2,14 +2,10 @@
 <block_impl ref_name="multadd.xml" ref_md5="">\r
   <comments>\r
     <author firstname="stephane" lastname="Domas" mail="sdomas@univ-fcomte.fr" />\r
 <block_impl ref_name="multadd.xml" ref_md5="">\r
   <comments>\r
     <author firstname="stephane" lastname="Domas" mail="sdomas@univ-fcomte.fr" />\r

-    <date creation="2015-04-27" />\r
-    <related_files list=""/>\r
-    <description>\r
-      This component is a multadd\r
-    </description>\r
+    <log creation="2018-05-02">\r
+    </log>\r

     <notes>\r
     <notes>\r

-      No notes\r
-    </notes>\r
+    </notes>    \r

   </comments>\r
 \r
   <libraries>\r
   </comments>\r
 \r
   <libraries>\r

diff --git a/lib/implementations/read_csv_impl.xml b/lib/implementations/read_csv_impl.xml
index 80106000da4418e15ff5867329f9dc37e58ebdb1..aa5e00ff45af7314447a1a469f5ec2aebe788c3b 100644 (file)
--- a/lib/implementations/read_csv_impl.xml
+++ b/lib/implementations/read_csv_impl.xml
@@ -2,10 +2,10 @@
 <block_impl ref_name="read_csv.xml" ref_md5="">
   <comments>
     <author lastname="Domas" mail="sdomas@univ-fcomte.fr" firstname="stephane"/>
 <block_impl ref_name="read_csv.xml" ref_md5="">
   <comments>
     <author lastname="Domas" mail="sdomas@univ-fcomte.fr" firstname="stephane"/>

-    <date creation="2018-04-12"/>
-    <related_files list="" />
-    <description>read a csv file</description>
-    <notes>read a csv file</notes>
+    <log creation="2018-05-02">
+    </log>
+    <notes>
+    </notes>    

   </comments>
   <libraries>
     <library name="ieee">
   </comments>
   <libraries>
     <library name="ieee">

diff --git a/lib/implementations/rgb3sx8_to_gs_impl.xml b/lib/implementations/rgb3sx8_to_gs_impl.xml
index 26e171aa1617aa923ccc4611e6d14ad8200a924f..fc4540b721628cfda9d29939fed15c91a7abfff1 100644 (file)
--- a/lib/implementations/rgb3sx8_to_gs_impl.xml
+++ b/lib/implementations/rgb3sx8_to_gs_impl.xml
@@ -2,10 +2,10 @@
 <block_impl ref_name="rgb3sx8_to_gs.xml" ref_md5="">
   <comments>
     <author lastname="" mail="" firstname=""/>
 <block_impl ref_name="rgb3sx8_to_gs.xml" ref_md5="">
   <comments>
     <author lastname="" mail="" firstname=""/>

-    <date creation="2018-01-10"/>
-    <related_files list=""/>
-    <description>fez</description>
-    <notes>fez</notes>
+    <log creation="2018-05-02">
+    </log>
+    <notes>
+    </notes>    

   </comments>
   <libraries>
     <library name="ieee">
   </comments>
   <libraries>
     <library name="ieee">

diff --git a/lib/implementations/rgb3sx8_to_ycbcr_3DSP_impl.xml b/lib/implementations/rgb3sx8_to_ycbcr_3DSP_impl.xml
index 055ec26f337e042fd294bb38ef4a4386201d2692..5ce24a63fb650097ff97ef0c77e4945082b248b7 100644 (file)
--- a/lib/implementations/rgb3sx8_to_ycbcr_3DSP_impl.xml
+++ b/lib/implementations/rgb3sx8_to_ycbcr_3DSP_impl.xml
@@ -2,10 +2,10 @@
 <block_impl ref_name="rgb3sx8_to_ycbcr_3DSP.xml" ref_md5="">
   <comments>
     <author lastname="" mail="" firstname=""/>
 <block_impl ref_name="rgb3sx8_to_ycbcr_3DSP.xml" ref_md5="">
   <comments>
     <author lastname="" mail="" firstname=""/>

-    <date creation="2018-01-10"/>
-    <related_files list=""/>
-    <description>fez</description>
-    <notes>fez</notes>
+    <log creation="2018-05-02">
+    </log>
+    <notes>
+    </notes>    

   </comments>
   <libraries>
     <library name="ieee">
   </comments>
   <libraries>
     <library name="ieee">

diff --git a/lib/implementations/scatter_impl.xml b/lib/implementations/scatter_impl.xml
index e214f6ab598947331dacc3ebb2a993aebcc2d86f..c5e86ea6dde86d6f7af021535a8fab2a9a4cd173 100644 (file)
--- a/lib/implementations/scatter_impl.xml
+++ b/lib/implementations/scatter_impl.xml
@@ -2,14 +2,10 @@
 <block_impl ref_name="scatter.xml" ref_md5="">
   <comments>
     <author firstname="stephane" lastname="Domas" mail="sdomas@univ-fcomte.fr" />
 <block_impl ref_name="scatter.xml" ref_md5="">
   <comments>
     <author firstname="stephane" lastname="Domas" mail="sdomas@univ-fcomte.fr" />

-    <date creation="2015-04-27" />
-    <related_files list=""/>
-    <description>
-      This component scatters an input over X outputs
-    </description>
+    <log creation="2018-05-02">
+    </log>

     <notes>
     <notes>

-      No notes
-    </notes>
+    </notes>    

   </comments>
 
   <libraries>
   </comments>
 
   <libraries>

diff --git a/lib/implementations/threshold_extctl_impl.xml b/lib/implementations/threshold_extctl_impl.xml
index e41744601b2aadcf5ea564ac53da0ccb601c796f..37abf779cdd6b698f5d1c10b5f0d40e54cf47a08 100644 (file)
--- a/lib/implementations/threshold_extctl_impl.xml
+++ b/lib/implementations/threshold_extctl_impl.xml
@@ -2,10 +2,10 @@
 <block_impl ref_name="threshold_extctl.xml" ref_md5="">
   <comments>
     <author lastname="" mail="" firstname=""/>
 <block_impl ref_name="threshold_extctl.xml" ref_md5="">
   <comments>
     <author lastname="" mail="" firstname=""/>

-    <date creation="2018-01-10"/>
-    <related_files list=""/>
-    <description>fez</description>
-    <notes>fez</notes>
+    <log creation="2018-05-02">
+    </log>
+    <notes>
+    </notes>    

   </comments>
   <libraries>
     <library name="ieee">
   </comments>
   <libraries>
     <library name="ieee">

diff --git a/lib/references/apf27-wb-master.xml b/lib/references/apf27-wb-master.xml
index 293b847f3eba200c83c37b04a52090d13093eae0..83a8a046de6eeaf91fa0dbfb2c81163a8a2a5039 100644 (file)
--- a/lib/references/apf27-wb-master.xml
+++ b/lib/references/apf27-wb-master.xml
@@ -6,12 +6,7 @@
     </name>
     <category ids="8" />  
     <description>
     </name>
     <category ids="8" />  
     <description>

-      <brief>

        This block is the wishbone master of the design, connected to the i.MX of APF27
        This block is the wishbone master of the design, connected to the i.MX of APF27

-      </brief>
-      <detailed>
-       This block is the wishbone master of the design, connected to the i.MX of APF27
-      </detailed>     

     </description>    
   </informations>
 
     </description>    
   </informations>
 

diff --git a/lib/references/average-Nx3.xml b/lib/references/average-Nx3.xml
index 24e96a3c9dac2c27afbbec81bb51478cec0ec872..eded9d422a8696223be0033ac818b0c1cdb5e04d 100644 (file)
--- a/lib/references/average-Nx3.xml
+++ b/lib/references/average-Nx3.xml
@@ -6,12 +6,7 @@
     </name>\r
     <category ids="4" />  \r
     <description>\r
     </name>\r
     <category ids="4" />  \r
     <description>\r

-      <brief>\r
-       This block does an average on 3 successives units, over a sequence of N inputs\r
-      </brief>\r
-      <detailed>\r
-       This block does an average on 3 successives units, over a sequence of N inputs\r
-      </detailed>     \r
+      This block does an average on 3 successives units, over a sequence of N inputs\r

     </description>    \r
   </informations>\r
 \r
     </description>    \r
   </informations>\r
 \r

diff --git a/lib/references/boxfilter_3x3.xml b/lib/references/boxfilter_3x3.xml
index e604bbdbe69206076e7e230b1ae9a3aa110f8bb6..7e42175f1884a2f2a13cf1c04cbfea460e110f85 100644 (file)
--- a/lib/references/boxfilter_3x3.xml
+++ b/lib/references/boxfilter_3x3.xml
@@ -4,8 +4,7 @@
     <name>boxfilter_3x3</name>
     <category ids=""/>
     <description>
     <name>boxfilter_3x3</name>
     <category ids=""/>
     <description>

-      <brief>frdfgdr</brief>
-      <detailed>gregre</detailed>
+      average filter with a 3x3 mask on grayscale (8 bits) images

     </description>
   </informations>
   <parameters>
     </description>
   </informations>
   <parameters>

diff --git a/lib/references/checker.xml b/lib/references/checker.xml
index 69341642772c1c383045c396129c1be3ab6b1c08..3b3734cdf87b1aff3ff2ec895dcd01518caf2f21 100644 (file)
--- a/lib/references/checker.xml
+++ b/lib/references/checker.xml
@@ -4,8 +4,7 @@
     <name>checker</name>
     <category ids=""/>
     <description>
     <name>checker</name>
     <category ids=""/>
     <description>

-      <brief>gre</brief>
-      <detailed>gre</detailed>
+      checks if an input is lower/greater a value, or within an interval.

     </description>
   </informations>
   <parameters>
     </description>
   </informations>
   <parameters>

diff --git a/lib/references/clkdomain_convert_1024x8.xml b/lib/references/clkdomain_convert_1024x8.xml
index 1df9cf1e4c4604a05631bda95c65b8bf96dffddf..9247fb2c1368d13c06f55354d3f0e819f91de9a7 100644 (file)
--- a/lib/references/clkdomain_convert_1024x8.xml
+++ b/lib/references/clkdomain_convert_1024x8.xml
@@ -1,12 +1,10 @@
 <!DOCTYPE clkdomain_convert_1024x8>
 <!DOCTYPE clkdomain_convert_1024x8>

-<block version="0.1">
+<block version="0.1" special="1">

   <informations>
     <name>clkdomain_convert_1024x8</name>
     <category ids="10"/>
     <description>
   <informations>
     <name>clkdomain_convert_1024x8</name>
     <category ids="10"/>
     <description>

-      <brief>This IP allows to pass 8 bits values from a clock domain to another. It uses a FIFO of 1024 entries.
-</brief>
-      <detailed>This IP allows to pass 8 bits values from a clock domain to another. It uses a FIFO of 1024 entries.</detailed>
+      This IP allows to pass 8 bits values from a clock domain to another. It uses a FIFO of 1024 entries.

     </description>
   </informations>
   <parameters>
     </description>
   </informations>
   <parameters>

diff --git a/lib/references/clkrstgen.xml b/lib/references/clkrstgen.xml
index 5f06f17b1e5a9eaacfe5683c7cd54279a08ef648..bd1ac7df747eed20419537eabe78e436e51a5db1 100644 (file)
--- a/lib/references/clkrstgen.xml
+++ b/lib/references/clkrstgen.xml
@@ -6,13 +6,8 @@
     </name>
     <category ids="100" />  
     <description>
     </name>
     <category ids="100" />  
     <description>

-      <brief>
-       This block generates a reset signal synchronous to an external clock
-      </brief>
-      <detailed>
-       This block generates a reset signal synchronous to clock. The block is automatically
-       connected to the external clock and asynchronous reset.
-      </detailed>     
+      This block generates a reset signal synchronous to an external clock
+      and relays the external clock.

     </description>    
   </informations>
 
     </description>    
   </informations>
 

diff --git a/lib/references/csvreader.xml b/lib/references/csvreader.xml
index 00f92d757dc1923e486e9b06192ca07c71372df2..7da5240c34616b7909883f8485b855e435f7befc 100644 (file)
--- a/lib/references/csvreader.xml
+++ b/lib/references/csvreader.xml
@@ -6,12 +6,7 @@
     </name>
     <category ids="6" />  
     <description>
     </name>
     <category ids="6" />  
     <description>

-      <brief>
-       generates data from a csv file
-      </brief>
-      <detailed>
-       generates data from a csv file
-      </detailed>     
+      generates data from a csv file

     </description>    
   </informations>
 
     </description>    
   </informations>
 

diff --git a/lib/references/decimator-N.xml b/lib/references/decimator-N.xml
index b008aa2215e975929e16b71c0162fe0afe33b85b..b07b6834be9f22410d2b8bf83ad58a7b78d925c5 100644 (file)
--- a/lib/references/decimator-N.xml
+++ b/lib/references/decimator-N.xml
@@ -6,12 +6,7 @@
     </name>\r
     <category ids="4" />  \r
     <description>\r
     </name>\r
     <category ids="4" />  \r
     <description>\r

-      <brief>\r
-       This block does a decimation of N-1 inputs overs N\r
-      </brief>\r
-      <detailed>\r
-       This block does a decimation of N-1 inputs overs N\r
-      </detailed>     \r
+      This block does a decimation of N-1 inputs overs N\r

     </description>    \r
   </informations>\r
 \r
     </description>    \r
   </informations>\r
 \r

diff --git a/lib/references/demux.xml b/lib/references/demux.xml
index 88d07725788aeffb65b677d57165d7d6ee85be82..272ee9500714c4173e083922caebcabbc76d8417 100644 (file)
--- a/lib/references/demux.xml
+++ b/lib/references/demux.xml
@@ -6,12 +6,7 @@
     </name>\r
     <category ids="1,5" />  \r
     <description>\r
     </name>\r
     <category ids="1,5" />  \r
     <description>\r

-      <brief>\r
-       This block demux an entry presented on FPGA pins over a variable number of outputs\r
-      </brief>\r
-      <detailed>\r
-       This block demux an entry presented on FPGA pins over a variable number of outputs\r
-      </detailed>     \r
+      This block demux an entry presented on FPGA pins over a variable number of outputs\r

     </description>    \r
   </informations>\r
 \r
     </description>    \r
   </informations>\r
 \r

diff --git a/lib/references/deserializer_3x1.xml b/lib/references/deserializer_3x1.xml
index 874ecad9cfe6667aca65e0e8e450d0a723ac7fcf..45af723fb9c45be57771ce6fb9c92ff09fd3abe1 100644 (file)
--- a/lib/references/deserializer_3x1.xml
+++ b/lib/references/deserializer_3x1.xml
@@ -4,8 +4,7 @@
     <name>deserializer_3x1</name>
     <category ids=""/>
     <description>
     <name>deserializer_3x1</name>
     <category ids=""/>
     <description>

-      <brief>gre</brief>
-      <detailed>gre</detailed>
+      deserializes 3 parallel inputs into a sequence of 3 outputs

     </description>
   </informations>
   <parameters>
     </description>
   </informations>
   <parameters>

diff --git a/lib/references/generator-cst.xml b/lib/references/generator-cst.xml
index 8522dd165e3582b148e589174d341d8a891c8c60..76e4d392edb73487737f2883d73af018922fe92a 100644 (file)
--- a/lib/references/generator-cst.xml
+++ b/lib/references/generator-cst.xml
@@ -6,12 +6,7 @@
     </name>
     <category ids="6" />  
     <description>
     </name>
     <category ids="6" />  
     <description>

-      <brief>
-       generates V consecutives constant values, followed by Z idle cycles
-      </brief>
-      <detailed>
-       generates V consecutives constant values, followed by Z idle cycles
-      </detailed>     
+      generates V consecutives constant values, followed by Z idle cycles    

     </description>    
   </informations>
 
     </description>    
   </informations>
 

diff --git a/lib/references/generator-img.xml b/lib/references/generator-img.xml
index 55a5cee6dceb821bc3c46c096dbb50b073edd4e4..a3905a0688b16b88fd864c29d2d711e2df42d875 100644 (file)
--- a/lib/references/generator-img.xml
+++ b/lib/references/generator-img.xml
@@ -6,12 +6,7 @@
     </name>
     <category ids="6" />  
     <description>
     </name>
     <category ids="6" />  
     <description>

-      <brief>
-       generates a RGB image, reading if from a csv file
-      </brief>
-      <detailed>
-       generates a RGB image, reading if from a csv file
-      </detailed>     
+      generates a RGB image, reading if from a csv file

     </description>    
   </informations>
 
     </description>    
   </informations>
 

diff --git a/lib/references/logical_AND_3.xml b/lib/references/logical_AND_3.xml
index 99b4aeafa660e171fd6bbc3cdbe0523b571e10db..2edceea6e669a0dcbdf8df5ae50ed6a1a7926e45 100644 (file)
--- a/lib/references/logical_AND_3.xml
+++ b/lib/references/logical_AND_3.xml
@@ -4,8 +4,7 @@
     <name>logical_AND_3</name>
     <category ids=""/>
     <description>
     <name>logical_AND_3</name>
     <category ids=""/>
     <description>

-      <brief>yt</brief>
-      <detailed>hyjt</detailed>
+      produces data1_in AND data2_in AND data3_in

     </description>
   </informations>
   <parameters/>
     </description>
   </informations>
   <parameters/>

diff --git a/lib/references/multadd.xml b/lib/references/multadd.xml
index 5ba103753dc5ae0b3f1b40b4ec5073c6edd1184b..af16efe940ac7ef23615af91b99ecc181817c928 100644 (file)
--- a/lib/references/multadd.xml
+++ b/lib/references/multadd.xml
@@ -6,15 +6,10 @@
     </name>\r
     <category ids="3" />  \r
     <description>\r
     </name>\r
     <category ids="3" />  \r
     <description>\r

-      <brief>\r
-       This block multiplies 2 input values, adding the result to a third one.\r
-      </brief>\r
-      <detailed>\r

        This block does d=a*b+c.\r
        a/b are provided by input port.\r
        c is set via the wishbone interconnector\r
        d is forwarded to an output port and can be retrieved via the wishbone interconnector\r
        This block does d=a*b+c.\r
        a/b are provided by input port.\r
        c is set via the wishbone interconnector\r
        d is forwarded to an output port and can be retrieved via the wishbone interconnector\r

-      </detailed>     \r

     </description>    \r
   </informations>\r
 \r
     </description>    \r
   </informations>\r
 \r

diff --git a/lib/references/read_csv.xml b/lib/references/read_csv.xml
index 02aa93c067692ac78bc5eeff1c85c100144bbf87..7cebc17ccde29aa7b601058ed0e8688d96ba5860 100644 (file)
--- a/lib/references/read_csv.xml
+++ b/lib/references/read_csv.xml
@@ -4,8 +4,7 @@
     <name>read_csv</name>
     <category ids="6"/>
     <description>
     <name>read_csv</name>
     <category ids="6"/>
     <description>

-      <brief>read a csv file</brief>
-      <detailed>read a csv file</detailed>
+      read a csv file

     </description>
   </informations>
   <parameters>
     </description>
   </informations>
   <parameters>

diff --git a/lib/references/references.bmf b/lib/references/references.bmf
index 633acf924abd9235d3480563ac01b262e2b28313..3c19438c097d2343fffb1e6485f708444c5a1fe1 100644 (file)
Binary files a/lib/references/references.bmf and b/lib/references/references.bmf differ

diff --git a/lib/references/rgb216bits.xml b/lib/references/rgb216bits.xml
deleted file mode 100644 (file)
index 6898880..0000000
--- a/lib/references/rgb216bits.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>\r
-<block>\r
-  <informations>\r
-    <name>\r
-      RGB to 16 bits\r
-    </name>\r
-    <category ids="4" />  \r
-    <description>\r
-      <brief>\r
-       This block does a conversion of an RGB pixel into a 16 bits value\r
-      </brief>\r
-      <detailed>\r
-       This block does a conversion of an RGB pixel into a 16 bits value       \r
-      </detailed>     \r
-    </description>    \r
-  </informations>\r
-\r
-  <parameters>\r
-  </parameters>\r
-\r
-  <interfaces>\r
-    <inputs>\r
-      <input name="clk" type="boolean" width="1" purpose="clock" />\r
-      <input name="rst" type="boolean" width="1" purpose="reset" />\r
-      <input name="r_i" type="natural" width="8" />\r
-      <input name="g_i" type="natural" width="8" />\r
-      <input name="b_i" type="natural" width="8" />      \r
-      <control iface="r_i" />\r
-      <control iface="g_i" />\r
-      <control iface="b_i" />      \r
-    </inputs>\r
-    <outputs>\r
-      <output name="pix_o" type="natural" width="16" multiplicity="1"/>\r
-      <control iface="pix_o" />\r
-    </outputs>    \r
-  </interfaces>\r
-\r
-</block>\r

diff --git a/lib/references/rgb32-to-gs.xml b/lib/references/rgb32-to-gs.xml
deleted file mode 100644 (file)
index dc98d7e..0000000
--- a/lib/references/rgb32-to-gs.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>\r
-<block>\r
-  <informations>\r
-    <name>\r
-      RGB32 (8 bits/serial) to grayscale\r
-    </name>\r
-    <category ids="4" />  \r
-    <description>\r
-      <brief>\r
-       This block does a conversion of an RGB32 pixel (8 bits/serial) into a grayscale value (8 bits).\r
-      </brief>\r
-      <detailed>\r
-       This block does a conversion of an RGB32 pixel into a grayscale value.\r
-       A RGB32 pixel is composed of 4 components: red, green, blue, transparency, each on 8 bits.\r
-       They are stored as in little-endian arch. which means that components must enter in the block\r
-       in the following order : transparency, blue, green, red.\r
-       The block does a simple average over the three values to obtain a grayscale pixel.\r
-       It also outputs the transparency component, in case of it should be used after.\r
-      </detailed>     \r
-    </description>    \r
-  </informations>\r
-\r
-  <parameters>\r
-  </parameters>\r
-\r
-  <interfaces>\r
-    <inputs>\r
-      <input name="clk" type="boolean" width="1" purpose="clock" />\r
-      <input name="rst" type="boolean" width="1" purpose="reset" />\r
-      \r
-      <input name="compo_i" type="natural" width="8" />\r
-      <control iface="compo_i" />\r
-    </inputs>\r
-    <outputs>\r
-      <output name="pix_o" type="natural" width="8" multiplicity="1"/>\r
-      <output name="transparency_o" type="natural" width="8" multiplicity="1"/>      \r
-      <control iface="pix_o" />\r
-      <control iface="transparency_o" />\r
-    </outputs>    \r
-  </interfaces>\r
-\r
-</block>\r

diff --git a/lib/references/rgb3sx8_to_gs.xml b/lib/references/rgb3sx8_to_gs.xml
index 10cea03c4826934ada29e559b13918c95e881928..54211082a5bff7340deb036eedf8eb4b0572ab83 100644 (file)
--- a/lib/references/rgb3sx8_to_gs.xml
+++ b/lib/references/rgb3sx8_to_gs.xml
@@ -4,8 +4,8 @@
     <name>rgb3sx8_to_gs</name>
     <category ids=""/>
     <description>
     <name>rgb3sx8_to_gs</name>
     <category ids=""/>
     <description>

-      <brief>fez</brief>
-      <detailed>fez</detailed>
+      converts a RGB 24 bits pixel into grayscale. R, G and B
+      are consumed sequentially on rgb_in.

     </description>
   </informations>
   <parameters>
     </description>
   </informations>
   <parameters>

diff --git a/lib/references/rgb3sx8_to_ycbcr_3DSP.xml b/lib/references/rgb3sx8_to_ycbcr_3DSP.xml
index 17d1870510da65fddd3568f09b489cbb73497b19..4d721662f02d047fec64ef43cad3f96692e00925 100644 (file)
--- a/lib/references/rgb3sx8_to_ycbcr_3DSP.xml
+++ b/lib/references/rgb3sx8_to_ycbcr_3DSP.xml
@@ -4,8 +4,9 @@
     <name>rgb3sx8_to_ycbcr_3DSP</name>
     <category ids=""/>
     <description>
     <name>rgb3sx8_to_ycbcr_3DSP</name>
     <category ids=""/>
     <description>

-      <brief>fez</brief>
-      <detailed>fez</detailed>
+      convert an RGB pixel 24 bits, into a Y/Cb/Cr. R, G and B components
+      are consumed sequentially, and Y, Cb, Cr are produced sequentially.
+      

     </description>
   </informations>
   <parameters/>
     </description>
   </informations>
   <parameters/>

diff --git a/lib/references/scatter.xml b/lib/references/scatter.xml
index ce9e2ef776479a29b7d95f8891f62e2ec1da0917..45a1902b6da8052a60e77e4bd51cea11be029de7 100644 (file)
--- a/lib/references/scatter.xml
+++ b/lib/references/scatter.xml
@@ -6,12 +6,7 @@
     </name>\r
     <category ids="1,5" />  \r
     <description>\r
     </name>\r
     <category ids="1,5" />  \r
     <description>\r

-      <brief>\r
-       This block replicates the input over X outputs, the outputs being created at will.\r
-      </brief>\r
-      <detailed>\r
-       This block replicates the input over X outputs, the outputs being created at will.\r
-      </detailed>     \r
+      This block replicates the input over X outputs, the outputs being created at will.\r

     </description>    \r
   </informations>\r
 \r
     </description>    \r
   </informations>\r
 \r

diff --git a/lib/references/threshold_extctl.xml b/lib/references/threshold_extctl.xml
index 136226f7a39f5c50ffbd74707ccb41af3b7ce9e5..d0c2d2d38b46ff1d46c49b2c2111c3bbc2835573 100644 (file)
--- a/lib/references/threshold_extctl.xml
+++ b/lib/references/threshold_extctl.xml
@@ -4,8 +4,8 @@
     <name>threshold_extctl</name>
     <category ids=""/>
     <description>
     <name>threshold_extctl</name>
     <category ids=""/>
     <description>

-      <brief>fez</brief>
-      <detailed>fez</detailed>
+      if keep_in is true, data_in is reported on data_out.
+      Otherwise, the dfault_value is reported on data_out.

     </description>
   </informations>
   <parameters>
     </description>
   </informations>
   <parameters>

diff --git a/reference.xsd b/reference.xsd
index bf87cb8f6f78f2ae20def03619274482e78baae2..9442528904882607cb97adba5c167f8fbffbaf64 100644 (file)
--- a/reference.xsd
+++ b/reference.xsd
@@ -99,14 +99,7 @@
        <xs:sequence>
            <xs:element ref="name"/>
            <xs:element ref="category"/>
        <xs:sequence>
            <xs:element ref="name"/>
            <xs:element ref="category"/>

-           <xs:element ref="description"/>
-       </xs:sequence>
-    </xs:group>
-
-    <xs:group name="descriptionElmtGroup">
-       <xs:sequence>
-           <xs:element ref="brief"/>
-           <xs:element ref="detailed"/>
+           <xs:element name="description" type="xs:string"/>

        </xs:sequence>
     </xs:group>
 
        </xs:sequence>
     </xs:group>
 


@@ -135,16 +128,6 @@
        </xs:complexType>
     </xs:element>
 
        </xs:complexType>
     </xs:element>
 

-    <xs:element name="description">
-       <xs:complexType>
-           <xs:group ref="descriptionElmtGroup"/>
-       </xs:complexType>
-    </xs:element>
-
-    <xs:element name="brief" type="xs:string" />
-
-    <xs:element name="detailed" type="xs:string" />
-

     <xs:element name="parameters">
        <xs:complexType>
            <xs:sequence>
     <xs:element name="parameters">
        <xs:complexType>
            <xs:sequence>


@@ -236,6 +219,7 @@
       <xs:complexType>
        <xs:group ref="blockElmtGroup"/>
        <xs:attribute name="version" type="xs:string" use="optional" />
       <xs:complexType>
        <xs:group ref="blockElmtGroup"/>
        <xs:attribute name="version" type="xs:string" use="optional" />

+       <xs:attribute name="special" type="xs:nonNegativeInteger" use="optional" />

       </xs:complexType>
     </xs:element>
 
       </xs:complexType>
     </xs:element>
 

diff --git a/source-2O.xml b/source-2O.xml
index 3c94d759d09d109e51011e38192c9cc71353b0f6..812e81542117d87dfffe43611793ce56c343ea9f 100644 (file)
--- a/source-2O.xml
+++ b/source-2O.xml
@@ -6,12 +6,7 @@
     </name>
     <category ids="6" />  
     <description>
     </name>
     <category ids="6" />  
     <description>

-      <brief>
-       A testing source block, with 2 outputs
-      </brief>
-      <detailed>

        A testing source block, with 2 outputs  
        A testing source block, with 2 outputs  

-      </detailed>     

     </description>    
   </informations>
 
     </description>    
   </informations>