summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJosh Blum2012-10-21 07:29:40 -0700
committerJosh Blum2012-10-21 07:29:40 -0700
commit25ec793e687821bd2ac5862fcf934c4c9c0f47b6 (patch)
treeb008e209ad36f71b2b5bf5c1bbf29800172e8d41 /lib
parentcdc35131dba81dfc17ef8c3b14bbe5d766c5f537 (diff)
downloadsandhi-25ec793e687821bd2ac5862fcf934c4c9c0f47b6.tar.gz
sandhi-25ec793e687821bd2ac5862fcf934c4c9c0f47b6.tar.bz2
sandhi-25ec793e687821bd2ac5862fcf934c4c9c0f47b6.zip
moved commit and deprecated lock/unlock into hier block
it can now be called from within a hier block once the design has been committed
Diffstat (limited to 'lib')
-rw-r--r--lib/gr_top_block.cpp10
-rw-r--r--lib/hier_block.cpp5
2 files changed, 5 insertions, 10 deletions
diff --git a/lib/gr_top_block.cpp b/lib/gr_top_block.cpp
index 6c023b1..c51f9b3 100644
--- a/lib/gr_top_block.cpp
+++ b/lib/gr_top_block.cpp
@@ -34,16 +34,6 @@ gr_top_block_sptr gr_make_top_block(const std::string &name)
return gr_top_block_sptr(new gr_top_block(name));
}
-void gr_top_block::lock(void)
-{
- //NOP
-}
-
-void gr_top_block::unlock(void)
-{
- this->commit();
-}
-
void gr_top_block::start(void)
{
gnuradio::TopBlock::start();
diff --git a/lib/hier_block.cpp b/lib/hier_block.cpp
index ef29cc2..422ed77 100644
--- a/lib/hier_block.cpp
+++ b/lib/hier_block.cpp
@@ -76,3 +76,8 @@ void HierBlock::disconnect_all(void)
{
(*this)->topology->clear_all();
}
+
+void HierBlock::commit(void)
+{
+ (*this)->topology->commit();
+}