X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/blast.git/blobdiff_plain/5d4e709cb8d460b2efc083e6e7999f1c3a0eb602..18fecf25efe710631fabecbb9f689c2997fdfe18:/AbstractBlock.cpp?ds=sidebyside

diff --git a/AbstractBlock.cpp b/AbstractBlock.cpp
index 66c8f37..336b677 100644
--- a/AbstractBlock.cpp
+++ b/AbstractBlock.cpp
@@ -3,16 +3,22 @@
 #include <QMessageBox>
 #include "AbstractInterface.h"
 #include "BlockParameter.h"
+#include "Parameters.h"
+#include "GroupBlock.h"
+#include "ConnectedInterface.h"
+
 
 AbstractBlock::AbstractBlock() {
   name = "";
   parent = NULL;
 }
 
+/*
 AbstractBlock::AbstractBlock(const QString& _name) {
-  name = _name;
+  name = Parameters::normalizeName(_name);
   parent = NULL;
 }
+*/
 
 AbstractBlock::~AbstractBlock() {
 
@@ -25,7 +31,7 @@ AbstractBlock::~AbstractBlock() {
 }
 
 void AbstractBlock::setName(const QString& str) {
-  name = str;
+  name = Parameters::normalizeName(str);
 }
 
 void AbstractBlock::setParent(AbstractBlock* _parent) {
@@ -234,3 +240,52 @@ QList<BlockParameter *> AbstractBlock::getWishboneParameters() {
   }
   return lst;
 }
+
+
+
+void AbstractBlock::connectClkReset() throw(Exception) {
+
+  GroupBlock* parentBlock = AB_TO_GRP(parent);
+
+  cout << "connecting clk/rst for child " << qPrintable(name) << " of " << qPrintable(parentBlock->getName()) << endl;
+
+  QList<AbstractInterface* > lstClk = getInterfaces(AbstractInterface::Input,AbstractInterface::Clock);
+  QList<AbstractInterface* > lstRst = getInterfaces(AbstractInterface::Input,AbstractInterface::Reset);
+
+  if ((lstClk.isEmpty()) || (lstRst.isEmpty())) {
+    throw(Exception(IFACE_GROUP_NOCLKRST,this));
+  }
+
+  ConnectedInterface* toClk = AI_TO_CON(lstClk.at(0));
+  ConnectedInterface* toRst = AI_TO_CON(lstRst.at(0));
+
+  ConnectedInterface* fromClk = NULL;
+  ConnectedInterface* fromRst = NULL;
+
+  if (parentBlock->isTop()) {
+    AbstractBlock* clkrstgen = parentBlock->getFunctionalBlockByName("clkrstgen");
+    if (clkrstgen == NULL) {
+      throw(Exception(IFACE_TOP_NOCLKRSTGEN,this));
+    }
+    else {
+      fromClk = AI_TO_CON(clkrstgen->getIfaceFromName("clk"));
+      fromRst = AI_TO_CON(clkrstgen->getIfaceFromName("reset"));
+    }
+  }
+  else {
+    fromClk = AI_TO_CON(parentBlock->getIfaceFromName("clk"));
+    fromRst = AI_TO_CON(parentBlock->getIfaceFromName("reset"));
+  }
+  if ((fromClk == NULL) || (fromRst == NULL)) {
+    throw(Exception(IFACE_GROUP_NOCLKRST,parentBlock));
+  }
+  else {
+    fromClk->connectTo(toClk);
+    fromRst->connectTo(toRst);
+  }
+
+
+}
+
+
+