From 3bcfe4df6fdde086eb1b59f7a0173358170174a1 Mon Sep 17 00:00:00 2001 From: stephane Domas Date: Wed, 2 May 2018 22:20:39 +0200 Subject: [PATCH] changed ref/impls xsd and xml --- FunctionalBlock.cpp | 23 +++++----- ReferenceBlock.cpp | 43 +++++------------- ReferenceBlock.h | 20 ++++---- SpecialBlock.cpp | 14 +----- SpecialBlock.h | 5 +- blast.creator.user | 6 +-- block-1I1O.xml | 7 +-- block-2I2O.xml | 7 +-- block-2INO.xml | 5 -- implementation.xsd | 34 +++++++------- lib/implementations/apf27-wb-master_impl.xml | 26 +++++------ lib/implementations/average-Nx3_impl.xml | 9 ++-- lib/implementations/boxfilter_3x3_impl.xml | 8 ++-- lib/implementations/checker_impl.xml | 8 ++-- .../clkdomain_convert_1024x8_impl.xml | 9 ++-- lib/implementations/clkrstgen_impl.xml | 9 ++-- lib/implementations/csvreader_impl.xml | 9 ++-- lib/implementations/decimator-N_impl.xml | 10 ++-- lib/implementations/demux_impl.xml | 8 +--- lib/implementations/deserializer_3x1_impl.xml | 9 ++-- lib/implementations/generator-cst_impl.xml | 9 ++-- lib/implementations/generator-img_impl.xml | 9 ++-- lib/implementations/impls.bmf | Bin 6865 -> 0 bytes lib/implementations/logical_AND_3_impl.xml | 8 ++-- lib/implementations/multadd_impl.xml | 10 ++-- lib/implementations/read_csv_impl.xml | 8 ++-- lib/implementations/rgb3sx8_to_gs_impl.xml | 8 ++-- .../rgb3sx8_to_ycbcr_3DSP_impl.xml | 8 ++-- lib/implementations/scatter_impl.xml | 10 ++-- lib/implementations/threshold_extctl_impl.xml | 8 ++-- lib/references/apf27-wb-master.xml | 5 -- lib/references/average-Nx3.xml | 7 +-- lib/references/boxfilter_3x3.xml | 3 +- lib/references/checker.xml | 3 +- lib/references/clkdomain_convert_1024x8.xml | 6 +-- lib/references/clkrstgen.xml | 9 +--- lib/references/csvreader.xml | 7 +-- lib/references/decimator-N.xml | 7 +-- lib/references/demux.xml | 7 +-- lib/references/deserializer_3x1.xml | 3 +- lib/references/generator-cst.xml | 7 +-- lib/references/generator-img.xml | 7 +-- lib/references/logical_AND_3.xml | 3 +- lib/references/multadd.xml | 5 -- lib/references/read_csv.xml | 3 +- lib/references/references.bmf | Bin 25194 -> 20084 bytes lib/references/rgb216bits.xml | 38 ---------------- lib/references/rgb32-to-gs.xml | 42 ----------------- lib/references/rgb3sx8_to_gs.xml | 4 +- lib/references/rgb3sx8_to_ycbcr_3DSP.xml | 5 +- lib/references/scatter.xml | 7 +-- lib/references/threshold_extctl.xml | 4 +- reference.xsd | 20 +------- source-2O.xml | 5 -- 54 files changed, 161 insertions(+), 393 deletions(-) delete mode 100644 lib/implementations/impls.bmf delete mode 100644 lib/references/rgb216bits.xml delete mode 100644 lib/references/rgb32-to-gs.xml diff --git a/FunctionalBlock.cpp b/FunctionalBlock.cpp index ab9611d..ccaa7b2 100644 --- a/FunctionalBlock.cpp +++ b/FunctionalBlock.cpp @@ -1424,23 +1424,22 @@ void FunctionalBlock::generateComments(QTextStream& out, QDomElement &elt, QStri QString mail = eltAuthor.attribute("mail",""); out << "-- Author(s) : "<getDescription() << endl; out << "--" << endl; - QDomElement eltNote = eltDesc.nextSiblingElement("description"); + QDomElement eltNote = eltLog.nextSiblingElement("notes"); QDomElement note = eltNote.firstChildElement(); QString noteTxt = note.text(); - out << "-- Note :\n"<>(QDataStream &in, ReferenceBlock &b) { in >> b.name; in >> b.xmlFile; - in >> b.descriptionBrief; - in >> b.descriptionDetail; + in >> b.description; in >> b.categories; in >> b.hashMd5; b.params.clear(); diff --git a/ReferenceBlock.h b/ReferenceBlock.h index 83f38c5..2aca879 100644 --- a/ReferenceBlock.h +++ b/ReferenceBlock.h @@ -26,25 +26,26 @@ public: ReferenceBlock(const QString _xmlFile); + // getters int getType(); inline QString getXmlFile() { return xmlFile; } - inline QString getBriefDescription() { return descriptionBrief; } - inline QString getDetailedDescription() { return descriptionDetail; } + inline QString getDescription() { return description; } inline QList getCategories() { return categories; } inline QList getImplementations() { return implementations; } - inline QString getHashMd5() { return hashMd5; } - + inline QString getHashMd5() { return hashMd5; } inline AbstractBlock* getParent() { return NULL; } + QList 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 addCategory(int id); void load(QDomElement &elt) throw(Exception); void setHashMd5(); - QList getExternalResources(); void generateVHDL(const QString& path) throw(Exception); // main entry to generate the VHDL code void parametersValidation(QList* checkedBlocks, QList* blocksToConfigure); @@ -52,8 +53,7 @@ public: private: QString xmlFile; // the xml file from which attributes are initialized. QString hashMd5; - QString descriptionBrief; - QString descriptionDetail; + QString description; QList categories; QList implementations; // set when implementations are read diff --git a/SpecialBlock.cpp b/SpecialBlock.cpp index 8edff6f..2d225e2 100644 --- a/SpecialBlock.cpp +++ b/SpecialBlock.cpp @@ -12,10 +12,7 @@ void SpecialBlock::checkInputPatternCompatibility() throw(Exception) { switch(type) { case ClockConvert : checkInputPatternCompatibilityClockConvert(); - break; - case ClkRstGen: - checkInputPatternCompatibilityClkRstGen(); - break; + break; } } catch(Exception e) { @@ -28,10 +25,7 @@ void SpecialBlock::computeOutputPattern(int nbExec) throw(Exception) { switch(type) { case ClockConvert : computeOutputPatternClockConvert(nbExec); - break; - case ClkRstGen: - computeOutputPatternClkRstGen(nbExec); - break; + break; } } catch(Exception e) { @@ -45,7 +39,3 @@ void SpecialBlock::computeOutputPatternClockConvert(int nbExec) throw(Exception) } -void SpecialBlock::checkInputPatternCompatibilityClkRstGen() throw(Exception) { -} -void SpecialBlock::computeOutputPatternClkRstGen(int nbExec) throw(Exception) { -} diff --git a/SpecialBlock.h b/SpecialBlock.h index 06c6459..574803d 100644 --- a/SpecialBlock.h +++ b/SpecialBlock.h @@ -16,7 +16,7 @@ using namespace Qt; class SpecialBlock : public FunctionalBlock { public: - enum SpecialType { ClockConvert = 0, ClkRstGen = 1 }; + enum SpecialType { ClockConvert = 1 }; SpecialBlock(SpecialType _type, GroupBlock* _parent, ReferenceBlock* _reference, bool createIfaces = true) throw(Exception); ~SpecialBlock(); @@ -37,8 +37,7 @@ private: void checkInputPatternCompatibilityClockConvert() throw(Exception); void computeOutputPatternClockConvert(int nbExec = -1) throw(Exception); - void checkInputPatternCompatibilityClkRstGen() throw(Exception); - void computeOutputPatternClkRstGen(int nbExec = -1) throw(Exception); + }; diff --git a/blast.creator.user b/blast.creator.user index abc9d49..ee6eead 100644 --- a/blast.creator.user +++ b/blast.creator.user @@ -1,10 +1,10 @@ - + EnvironmentId - {3701e197-5b6c-48ea-9e98-a6cf6de18672} + {c8006d66-d34f-42be-ad10-d0207752286d} ProjectExplorer.Project.ActiveTarget @@ -61,7 +61,7 @@ Desktop Desktop - {ed04208c-8774-456b-99b9-4a02094ca7a4} + {2c9bf876-3476-44eb-8065-1f0844704dda} 0 0 0 diff --git a/block-1I1O.xml b/block-1I1O.xml index 1e05fa5..3d36ceb 100644 --- a/block-1I1O.xml +++ b/block-1I1O.xml @@ -6,12 +6,7 @@ - - A testing block with 1 input, 1 output - - - A testing block with 1 input, 1 output - + A testing block with 1 input, 1 output diff --git a/block-2I2O.xml b/block-2I2O.xml index c8bfdc5..a712c2f 100644 --- a/block-2I2O.xml +++ b/block-2I2O.xml @@ -6,12 +6,7 @@ - - A testing block with 2 inputs, 2 outputs - - - A testing block with 2 inputs, 2 outputs - + A testing block with 2 inputs, 2 outputs diff --git a/block-2INO.xml b/block-2INO.xml index af3e0df..c1aaa04 100644 --- a/block-2INO.xml +++ b/block-2INO.xml @@ -6,12 +6,7 @@ - A testing block with 2 inputs, N outputs - - - A testing block with 2 inputs, N outputs - diff --git a/implementation.xsd b/implementation.xsd index a42059f..d69fe73 100644 --- a/implementation.xsd +++ b/implementation.xsd @@ -32,10 +32,8 @@ - - - - + + @@ -63,22 +61,26 @@ - - - - + + + + + + + - - - - + + + + + + + + + - - - - diff --git a/lib/implementations/apf27-wb-master_impl.xml b/lib/implementations/apf27-wb-master_impl.xml index 2b2548b..3775e07 100644 --- a/lib/implementations/apf27-wb-master_impl.xml +++ b/lib/implementations/apf27-wb-master_impl.xml @@ -2,21 +2,19 @@ - - - - This component is an interface between i.MX signals - and the interconnector component. - + + + changed to comply with new structure + + - On i.MX<->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<->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. diff --git a/lib/implementations/average-Nx3_impl.xml b/lib/implementations/average-Nx3_impl.xml index a19842c..2181965 100644 --- a/lib/implementations/average-Nx3_impl.xml +++ b/lib/implementations/average-Nx3_impl.xml @@ -2,13 +2,10 @@ - - - - This component is a average filter on 3 succesives inputs, over N samples - + + - No notes + This component is a average filter on 3 succesives inputs, over N samples diff --git a/lib/implementations/boxfilter_3x3_impl.xml b/lib/implementations/boxfilter_3x3_impl.xml index 40f260f..3eb2b90 100644 --- a/lib/implementations/boxfilter_3x3_impl.xml +++ b/lib/implementations/boxfilter_3x3_impl.xml @@ -2,10 +2,10 @@ - - - frdfgdr - gregre + + + + diff --git a/lib/implementations/checker_impl.xml b/lib/implementations/checker_impl.xml index a9d780d..fb0dab5 100644 --- a/lib/implementations/checker_impl.xml +++ b/lib/implementations/checker_impl.xml @@ -2,10 +2,10 @@ - - - frdfgdr - gre + + + + diff --git a/lib/implementations/clkdomain_convert_1024x8_impl.xml b/lib/implementations/clkdomain_convert_1024x8_impl.xml index cdab60b..f5c5ead 100644 --- a/lib/implementations/clkdomain_convert_1024x8_impl.xml +++ b/lib/implementations/clkdomain_convert_1024x8_impl.xml @@ -2,11 +2,10 @@ - - - This IP allows to pass 8 bits values from a clock domain to another. It uses a FIFO of 1024 entries. - - This IP allows to pass 8 bits values from a clock domain to another. It uses a FIFO of 1024 entries. + + + + diff --git a/lib/implementations/clkrstgen_impl.xml b/lib/implementations/clkrstgen_impl.xml index 7e9d15a..192b142 100644 --- a/lib/implementations/clkrstgen_impl.xml +++ b/lib/implementations/clkrstgen_impl.xml @@ -2,11 +2,10 @@ - - - implementation of cljrstgen that does the connection between - external and internal clock and reset - none + + + + diff --git a/lib/implementations/csvreader_impl.xml b/lib/implementations/csvreader_impl.xml index 2ea85fe..6c39f20 100644 --- a/lib/implementations/csvreader_impl.xml +++ b/lib/implementations/csvreader_impl.xml @@ -2,14 +2,11 @@ - - - - This component read data in a CSV file - + + - No notes + diff --git a/lib/implementations/decimator-N_impl.xml b/lib/implementations/decimator-N_impl.xml index f68c396..65e8cbc 100644 --- a/lib/implementations/decimator-N_impl.xml +++ b/lib/implementations/decimator-N_impl.xml @@ -2,14 +2,10 @@ - - - - This component is a decimator of N-1 values out of N - + + - No notes - + diff --git a/lib/implementations/demux_impl.xml b/lib/implementations/demux_impl.xml index a61d4e3..6d1355f 100644 --- a/lib/implementations/demux_impl.xml +++ b/lib/implementations/demux_impl.xml @@ -2,13 +2,9 @@ - - - - This component is a synchronous demultiplixer with variable number of outputs - + + - No notes diff --git a/lib/implementations/deserializer_3x1_impl.xml b/lib/implementations/deserializer_3x1_impl.xml index 9b48470..71431a1 100644 --- a/lib/implementations/deserializer_3x1_impl.xml +++ b/lib/implementations/deserializer_3x1_impl.xml @@ -2,10 +2,11 @@ - - - gre - gre + + + + + diff --git a/lib/implementations/generator-cst_impl.xml b/lib/implementations/generator-cst_impl.xml index 9768641..69094c0 100644 --- a/lib/implementations/generator-cst_impl.xml +++ b/lib/implementations/generator-cst_impl.xml @@ -2,14 +2,11 @@ - - - - This component is a generator of a sequence of V fixed values, followed by Z idle cycles. - + + - No notes + diff --git a/lib/implementations/generator-img_impl.xml b/lib/implementations/generator-img_impl.xml index d5f66f3..b4952a1 100644 --- a/lib/implementations/generator-img_impl.xml +++ b/lib/implementations/generator-img_impl.xml @@ -2,14 +2,11 @@ - - - - This component is a generator of a RGB image, read in a CSV file - + + - No notes + diff --git a/lib/implementations/impls.bmf b/lib/implementations/impls.bmf deleted file mode 100644 index 0a2f0e6ee6405e605e6351d4cb6e2f6ba6b1127d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6865 zcmd5=zmFS56n<+^gn|@BaI#JoN^ujc^sct0{) zXXtT=Yl1#AqxTT4pGr^eN>`qsM;CIcd4v(uqW{}+ik2y6`6k-e^>LCA7D>!+=_mOT zkKbc*|Glw~0mKppjPc)<4`9@tppiEq6OyeMN3*WWHn8kN%@Cc4uNu8kJQKwf15!$) zE&KAU)@K#yHTQbGCb!Ku*0%?pJ-J`g+r?=2ajoQLtxZ}#VbmWQScpFS?-YJFfk&N~ zB}uUmvBlT|ZZY}tg3#GIW`U2*dMxm}58Qh44z%AxtAT+*F-Fr9Okju!9LZY%$G$zn zgeGV|LW^C>1>T&Z#{`S$ma>;GrR{mXKD*3qgpg{S%Oi~AbRJ;3bdS2uJp}3MUyb-% zRHM2~eXJNBUD=7uttY#MqlM=m(@CeT&tT8E^KDox$z80&*A2Mo06s86g8e*qQO=Ud z)Hz)nt-g$Fp|6=w3rnVM)GlQN-;q?N1-Xu=FooBbo#RC~2eoZ_nqo3WXF`YjwGrs1 zfX!Ag4I5UfS)Nwu@_uB7D$PA$aXBqz_?Zp13mxl5hv3DRiE1yr0P+{4ziVs(mWCv- z+R@$W{!4cw#J*e^#9#rZ4>n^|2LD;YoJ06ljG@q|s$9h=%pXK%8>;500x2*cLgS(q zXhGLj%4z_wTlGz7v!S>!L_iDM41F~eKfzrStcO4i%-WNl%waQ`Pskf?7*Ol70q{0p zu4O%{ey_-LG3L{OgwK3jKU)_4o<95On7pTju{Y(MBNJI1tiy($LN*cN!+dDZX={DfbT z7jShjjPhzybsJ)qO}_-s;Fr=)k`um|WbYhFGvDNWXm5fiYvR@|iw#}oHdfDiGT$=W znweQR7wRe>Sc*16n5*{?%KZEXTk)ZH#=?;s3I=kh_X>-l{BLNqmUS~+@o9aGpZ^P> zmU~_lP?Zk=`XEYVsedj2)DtMv2W0Y*^h?WEn7!vb$hnjL9{v3x@A zZ*RC9*H91`E&dkdd5pph*Yh4l3+)_MHQ`)S*f&O84onJ7 zON$)c!m$u0ukwymrJRHgUEgXr3C-%-__?@$FU%sNf(GUk!F@arjMkOnIo;#aQYPQ zvY`KOVWnd70oQT-Y$NYjO)-w0DMiqMtc$gBWrXuEKr2fSXiU$@5j1bu+&t zc^P9ik)bopnq*XW!y$m%@LXS}3?i}0cX*1Y-3?Hc<1AYEsuDimuxDq=5k7*}CN^3; zY-XO%@IOatWYHQSkWT=?37$g$?Vx3SuP9_ZQf!;^%aO^|A+~Vdu_Qrte4)Ov@__vZ Dr1))` diff --git a/lib/implementations/logical_AND_3_impl.xml b/lib/implementations/logical_AND_3_impl.xml index 8d6e479..4ca5aa5 100644 --- a/lib/implementations/logical_AND_3_impl.xml +++ b/lib/implementations/logical_AND_3_impl.xml @@ -2,10 +2,10 @@ - - - yt - hyjt + + + + diff --git a/lib/implementations/multadd_impl.xml b/lib/implementations/multadd_impl.xml index 74a022a..23d60d2 100644 --- a/lib/implementations/multadd_impl.xml +++ b/lib/implementations/multadd_impl.xml @@ -2,14 +2,10 @@ - - - - This component is a multadd - + + - No notes - + diff --git a/lib/implementations/read_csv_impl.xml b/lib/implementations/read_csv_impl.xml index 8010600..aa5e00f 100644 --- a/lib/implementations/read_csv_impl.xml +++ b/lib/implementations/read_csv_impl.xml @@ -2,10 +2,10 @@ - - - read a csv file - read a csv file + + + + diff --git a/lib/implementations/rgb3sx8_to_gs_impl.xml b/lib/implementations/rgb3sx8_to_gs_impl.xml index 26e171a..fc4540b 100644 --- a/lib/implementations/rgb3sx8_to_gs_impl.xml +++ b/lib/implementations/rgb3sx8_to_gs_impl.xml @@ -2,10 +2,10 @@ - - - fez - fez + + + + diff --git a/lib/implementations/rgb3sx8_to_ycbcr_3DSP_impl.xml b/lib/implementations/rgb3sx8_to_ycbcr_3DSP_impl.xml index 055ec26..5ce24a6 100644 --- a/lib/implementations/rgb3sx8_to_ycbcr_3DSP_impl.xml +++ b/lib/implementations/rgb3sx8_to_ycbcr_3DSP_impl.xml @@ -2,10 +2,10 @@ - - - fez - fez + + + + diff --git a/lib/implementations/scatter_impl.xml b/lib/implementations/scatter_impl.xml index e214f6a..c5e86ea 100644 --- a/lib/implementations/scatter_impl.xml +++ b/lib/implementations/scatter_impl.xml @@ -2,14 +2,10 @@ - - - - This component scatters an input over X outputs - + + - No notes - + diff --git a/lib/implementations/threshold_extctl_impl.xml b/lib/implementations/threshold_extctl_impl.xml index e417446..37abf77 100644 --- a/lib/implementations/threshold_extctl_impl.xml +++ b/lib/implementations/threshold_extctl_impl.xml @@ -2,10 +2,10 @@ - - - fez - fez + + + + diff --git a/lib/references/apf27-wb-master.xml b/lib/references/apf27-wb-master.xml index 293b847..83a8a04 100644 --- a/lib/references/apf27-wb-master.xml +++ b/lib/references/apf27-wb-master.xml @@ -6,12 +6,7 @@ - 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 - diff --git a/lib/references/average-Nx3.xml b/lib/references/average-Nx3.xml index 24e96a3..eded9d4 100644 --- a/lib/references/average-Nx3.xml +++ b/lib/references/average-Nx3.xml @@ -6,12 +6,7 @@ - - This block does an average on 3 successives units, over a sequence of N inputs - - - This block does an average on 3 successives units, over a sequence of N inputs - + This block does an average on 3 successives units, over a sequence of N inputs diff --git a/lib/references/boxfilter_3x3.xml b/lib/references/boxfilter_3x3.xml index e604bbd..7e42175 100644 --- a/lib/references/boxfilter_3x3.xml +++ b/lib/references/boxfilter_3x3.xml @@ -4,8 +4,7 @@ boxfilter_3x3 - frdfgdr - gregre + average filter with a 3x3 mask on grayscale (8 bits) images diff --git a/lib/references/checker.xml b/lib/references/checker.xml index 6934164..3b3734c 100644 --- a/lib/references/checker.xml +++ b/lib/references/checker.xml @@ -4,8 +4,7 @@ checker - gre - gre + checks if an input is lower/greater a value, or within an interval. diff --git a/lib/references/clkdomain_convert_1024x8.xml b/lib/references/clkdomain_convert_1024x8.xml index 1df9cf1..9247fb2 100644 --- a/lib/references/clkdomain_convert_1024x8.xml +++ b/lib/references/clkdomain_convert_1024x8.xml @@ -1,12 +1,10 @@ - + clkdomain_convert_1024x8 - This IP allows to pass 8 bits values from a clock domain to another. It uses a FIFO of 1024 entries. - - This IP allows to pass 8 bits values from a clock domain to another. It uses a FIFO of 1024 entries. + This IP allows to pass 8 bits values from a clock domain to another. It uses a FIFO of 1024 entries. diff --git a/lib/references/clkrstgen.xml b/lib/references/clkrstgen.xml index 5f06f17..bd1ac7d 100644 --- a/lib/references/clkrstgen.xml +++ b/lib/references/clkrstgen.xml @@ -6,13 +6,8 @@ - - This block generates a reset signal synchronous to an external clock - - - This block generates a reset signal synchronous to clock. The block is automatically - connected to the external clock and asynchronous reset. - + This block generates a reset signal synchronous to an external clock + and relays the external clock. diff --git a/lib/references/csvreader.xml b/lib/references/csvreader.xml index 00f92d7..7da5240 100644 --- a/lib/references/csvreader.xml +++ b/lib/references/csvreader.xml @@ -6,12 +6,7 @@ - - generates data from a csv file - - - generates data from a csv file - + generates data from a csv file diff --git a/lib/references/decimator-N.xml b/lib/references/decimator-N.xml index b008aa2..b07b683 100644 --- a/lib/references/decimator-N.xml +++ b/lib/references/decimator-N.xml @@ -6,12 +6,7 @@ - - This block does a decimation of N-1 inputs overs N - - - This block does a decimation of N-1 inputs overs N - + This block does a decimation of N-1 inputs overs N diff --git a/lib/references/demux.xml b/lib/references/demux.xml index 88d0772..272ee95 100644 --- a/lib/references/demux.xml +++ b/lib/references/demux.xml @@ -6,12 +6,7 @@ - - This block demux an entry presented on FPGA pins over a variable number of outputs - - - This block demux an entry presented on FPGA pins over a variable number of outputs - + This block demux an entry presented on FPGA pins over a variable number of outputs diff --git a/lib/references/deserializer_3x1.xml b/lib/references/deserializer_3x1.xml index 874ecad..45af723 100644 --- a/lib/references/deserializer_3x1.xml +++ b/lib/references/deserializer_3x1.xml @@ -4,8 +4,7 @@ deserializer_3x1 - gre - gre + deserializes 3 parallel inputs into a sequence of 3 outputs diff --git a/lib/references/generator-cst.xml b/lib/references/generator-cst.xml index 8522dd1..76e4d39 100644 --- a/lib/references/generator-cst.xml +++ b/lib/references/generator-cst.xml @@ -6,12 +6,7 @@ - - generates V consecutives constant values, followed by Z idle cycles - - - generates V consecutives constant values, followed by Z idle cycles - + generates V consecutives constant values, followed by Z idle cycles diff --git a/lib/references/generator-img.xml b/lib/references/generator-img.xml index 55a5cee..a3905a0 100644 --- a/lib/references/generator-img.xml +++ b/lib/references/generator-img.xml @@ -6,12 +6,7 @@ - - generates a RGB image, reading if from a csv file - - - generates a RGB image, reading if from a csv file - + generates a RGB image, reading if from a csv file diff --git a/lib/references/logical_AND_3.xml b/lib/references/logical_AND_3.xml index 99b4aea..2edceea 100644 --- a/lib/references/logical_AND_3.xml +++ b/lib/references/logical_AND_3.xml @@ -4,8 +4,7 @@ logical_AND_3 - yt - hyjt + produces data1_in AND data2_in AND data3_in diff --git a/lib/references/multadd.xml b/lib/references/multadd.xml index 5ba1037..af16efe 100644 --- a/lib/references/multadd.xml +++ b/lib/references/multadd.xml @@ -6,15 +6,10 @@ - - This block multiplies 2 input values, adding the result to a third one. - - This block does d=a*b+c. a/b are provided by input port. c is set via the wishbone interconnector d is forwarded to an output port and can be retrieved via the wishbone interconnector - diff --git a/lib/references/read_csv.xml b/lib/references/read_csv.xml index 02aa93c..7cebc17 100644 --- a/lib/references/read_csv.xml +++ b/lib/references/read_csv.xml @@ -4,8 +4,7 @@ read_csv - read a csv file - read a csv file + read a csv file diff --git a/lib/references/references.bmf b/lib/references/references.bmf index 633acf924abd9235d3480563ac01b262e2b28313..3c19438c097d2343fffb1e6485f708444c5a1fe1 100644 GIT binary patch literal 20084 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 literal 25194 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 AjsO4v diff --git a/lib/references/rgb216bits.xml b/lib/references/rgb216bits.xml deleted file mode 100644 index 6898880..0000000 --- a/lib/references/rgb216bits.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - RGB to 16 bits - - - - - This block does a conversion of an RGB pixel into a 16 bits value - - - This block does a conversion of an RGB pixel into a 16 bits value - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/lib/references/rgb32-to-gs.xml b/lib/references/rgb32-to-gs.xml deleted file mode 100644 index dc98d7e..0000000 --- a/lib/references/rgb32-to-gs.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - RGB32 (8 bits/serial) to grayscale - - - - - This block does a conversion of an RGB32 pixel (8 bits/serial) into a grayscale value (8 bits). - - - This block does a conversion of an RGB32 pixel into a grayscale value. - A RGB32 pixel is composed of 4 components: red, green, blue, transparency, each on 8 bits. - They are stored as in little-endian arch. which means that components must enter in the block - in the following order : transparency, blue, green, red. - The block does a simple average over the three values to obtain a grayscale pixel. - It also outputs the transparency component, in case of it should be used after. - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/lib/references/rgb3sx8_to_gs.xml b/lib/references/rgb3sx8_to_gs.xml index 10cea03..5421108 100644 --- a/lib/references/rgb3sx8_to_gs.xml +++ b/lib/references/rgb3sx8_to_gs.xml @@ -4,8 +4,8 @@ rgb3sx8_to_gs - fez - fez + converts a RGB 24 bits pixel into grayscale. R, G and B + are consumed sequentially on rgb_in. diff --git a/lib/references/rgb3sx8_to_ycbcr_3DSP.xml b/lib/references/rgb3sx8_to_ycbcr_3DSP.xml index 17d1870..4d72166 100644 --- a/lib/references/rgb3sx8_to_ycbcr_3DSP.xml +++ b/lib/references/rgb3sx8_to_ycbcr_3DSP.xml @@ -4,8 +4,9 @@ rgb3sx8_to_ycbcr_3DSP - fez - fez + 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. + diff --git a/lib/references/scatter.xml b/lib/references/scatter.xml index ce9e2ef..45a1902 100644 --- a/lib/references/scatter.xml +++ b/lib/references/scatter.xml @@ -6,12 +6,7 @@ - - This block replicates the input over X outputs, the outputs being created at will. - - - This block replicates the input over X outputs, the outputs being created at will. - + This block replicates the input over X outputs, the outputs being created at will. diff --git a/lib/references/threshold_extctl.xml b/lib/references/threshold_extctl.xml index 136226f..d0c2d2d 100644 --- a/lib/references/threshold_extctl.xml +++ b/lib/references/threshold_extctl.xml @@ -4,8 +4,8 @@ threshold_extctl - fez - fez + if keep_in is true, data_in is reported on data_out. + Otherwise, the dfault_value is reported on data_out. diff --git a/reference.xsd b/reference.xsd index bf87cb8..9442528 100644 --- a/reference.xsd +++ b/reference.xsd @@ -99,14 +99,7 @@ - - - - - - - - + @@ -135,16 +128,6 @@ - - - - - - - - - - @@ -236,6 +219,7 @@ + diff --git a/source-2O.xml b/source-2O.xml index 3c94d75..812e815 100644 --- a/source-2O.xml +++ b/source-2O.xml @@ -6,12 +6,7 @@ - - A testing source block, with 2 outputs - - A testing source block, with 2 outputs - -- 2.39.5