From 1e5db4248e2488e0f1b44ac1405d78e16c2408d8 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Mon, 18 Oct 2010 16:13:10 -0700
Subject: uhd: work on multi usrp blocks, use block tree to categorize blocks,
 deprecate mimo blocks

---
 gr-uhd/grc/uhd_block_tree.xml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 gr-uhd/grc/uhd_block_tree.xml

(limited to 'gr-uhd/grc/uhd_block_tree.xml')

diff --git a/gr-uhd/grc/uhd_block_tree.xml b/gr-uhd/grc/uhd_block_tree.xml
new file mode 100644
index 000000000..e8c4f069d
--- /dev/null
+++ b/gr-uhd/grc/uhd_block_tree.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##Block Tree for uhd blocks.
+###################################################
+ -->
+<cat>
+	<name></name> <!-- Blank for Root Name -->
+	<cat>
+		<name>UHD</name>
+		<block>uhd_single_usrp_source</block>
+		<block>uhd_single_usrp_sink</block>
+		<block>uhd_multi_usrp_source</block>
+		<block>uhd_multi_usrp_sink</block>
+	</cat>
+	<cat>
+		<name>UHD (DEPRECATED)</name>
+		<block>uhd_simple_source</block>
+		<block>uhd_simple_sink</block>
+		<block>uhd_mimo_source</block>
+		<block>uhd_mimo_sink</block>
+	</cat>
+</cat>
-- 
cgit 


From b245c628f4f5e252740e0248a33c0266640cb0bb Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Sun, 21 Nov 2010 18:03:01 -0800
Subject: uhd: remove deprecated grc wrappers

---
 gr-uhd/grc/uhd_block_tree.xml | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'gr-uhd/grc/uhd_block_tree.xml')

diff --git a/gr-uhd/grc/uhd_block_tree.xml b/gr-uhd/grc/uhd_block_tree.xml
index e8c4f069d..f5d42b567 100644
--- a/gr-uhd/grc/uhd_block_tree.xml
+++ b/gr-uhd/grc/uhd_block_tree.xml
@@ -13,11 +13,4 @@
 		<block>uhd_multi_usrp_source</block>
 		<block>uhd_multi_usrp_sink</block>
 	</cat>
-	<cat>
-		<name>UHD (DEPRECATED)</name>
-		<block>uhd_simple_source</block>
-		<block>uhd_simple_sink</block>
-		<block>uhd_mimo_source</block>
-		<block>uhd_mimo_sink</block>
-	</cat>
 </cat>
-- 
cgit 


From 7787d1fc1aecc7b59e476c31865b4f32348cb729 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Thu, 10 Feb 2011 00:56:55 -0800
Subject: uhd: replaced multi/single usrp stuff with just one usrp wrapper

---
 gr-uhd/grc/uhd_block_tree.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'gr-uhd/grc/uhd_block_tree.xml')

diff --git a/gr-uhd/grc/uhd_block_tree.xml b/gr-uhd/grc/uhd_block_tree.xml
index f5d42b567..8a9f62f7c 100644
--- a/gr-uhd/grc/uhd_block_tree.xml
+++ b/gr-uhd/grc/uhd_block_tree.xml
@@ -8,9 +8,7 @@
 	<name></name> <!-- Blank for Root Name -->
 	<cat>
 		<name>UHD</name>
-		<block>uhd_single_usrp_source</block>
-		<block>uhd_single_usrp_sink</block>
-		<block>uhd_multi_usrp_source</block>
-		<block>uhd_multi_usrp_sink</block>
+		<block>uhd_usrp_source</block>
+		<block>uhd_usrp_sink</block>
 	</cat>
 </cat>
-- 
cgit