From 4f480479afac529eadc65f4e0bc6fe13e42553b3 Mon Sep 17 00:00:00 2001
From: jblum
Date: Tue, 24 Mar 2009 19:45:55 +0000
Subject: Merged r10666:10669 from jblum/vlen. Trunk passes distcheck.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10678 221aa14e-8319-0410-a670-987f0aec2ac5
---
 grc/data/platforms/python/block_tree.xml           |  4 +-
 grc/data/platforms/python/blocks/Makefile.am       |  4 +-
 grc/data/platforms/python/blocks/gr_add_vxx.xml    | 63 ----------------------
 grc/data/platforms/python/blocks/gr_add_xx.xml     | 63 ++++++++++++++++++++++
 .../platforms/python/blocks/gr_multiply_vxx.xml    | 63 ----------------------
 .../platforms/python/blocks/gr_multiply_xx.xml     | 63 ++++++++++++++++++++++
 6 files changed, 130 insertions(+), 130 deletions(-)
 delete mode 100644 grc/data/platforms/python/blocks/gr_add_vxx.xml
 create mode 100644 grc/data/platforms/python/blocks/gr_add_xx.xml
 delete mode 100644 grc/data/platforms/python/blocks/gr_multiply_vxx.xml
 create mode 100644 grc/data/platforms/python/blocks/gr_multiply_xx.xml

(limited to 'grc/data/platforms/python')

diff --git a/grc/data/platforms/python/block_tree.xml b/grc/data/platforms/python/block_tree.xml
index 7e13aaff6..4e6ff01c4 100644
--- a/grc/data/platforms/python/block_tree.xml
+++ b/grc/data/platforms/python/block_tree.xml
@@ -42,9 +42,9 @@
 	</cat>
 	<cat>
 		<name>Operators</name>
-		<block>gr_add_vxx</block>
+		<block>gr_add_xx</block>
 		<block>gr_sub_xx</block>
-		<block>gr_multiply_vxx</block>
+		<block>gr_multiply_xx</block>
 		<block>gr_divide_xx</block>
 		<block>gr_nlog10_ff</block>
 
diff --git a/grc/data/platforms/python/blocks/Makefile.am b/grc/data/platforms/python/blocks/Makefile.am
index 506648d45..a97266fba 100644
--- a/grc/data/platforms/python/blocks/Makefile.am
+++ b/grc/data/platforms/python/blocks/Makefile.am
@@ -59,7 +59,7 @@ dist_ourdata_DATA = \
 	blks2_wfm_tx.xml \
 	const_source_x.xml \
 	gr_add_const_vxx.xml \
-	gr_add_vxx.xml \
+	gr_add_xx.xml \
 	gr_agc2_xx.xml \
 	gr_agc_xx.xml \
 	gr_and_xx.xml \
@@ -124,7 +124,7 @@ dist_ourdata_DATA = \
 	gr_mpsk_receiver_cc.xml \
 	gr_mpsk_sync_cc.xml \
 	gr_multiply_const_vxx.xml \
-	gr_multiply_vxx.xml \
+	gr_multiply_xx.xml \
 	gr_mute_xx.xml \
 	gr_nlog10_ff.xml \
 	gr_noise_source_x.xml \
diff --git a/grc/data/platforms/python/blocks/gr_add_vxx.xml b/grc/data/platforms/python/blocks/gr_add_vxx.xml
deleted file mode 100644
index 479cdaae4..000000000
--- a/grc/data/platforms/python/blocks/gr_add_vxx.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##Add Block:
-##	all types, 1 output, 2 to inf inputs
-###################################################
- -->
-<block>
-	<name>Add</name>
-	<key>gr_add_vxx</key>
-	<import>from gnuradio import gr</import>
-	<make>gr.add_v$(type.fcn)($vlen)</make>
-	<param>
-		<name>IO Type</name>
-		<key>type</key>
-		<type>enum</type>
-		<option>
-			<name>Complex</name>
-			<key>complex</key>
-			<opt>fcn:cc</opt>
-		</option>
-		<option>
-			<name>Float</name>
-			<key>float</key>
-			<opt>fcn:ff</opt>
-		</option>
-		<option>
-			<name>Int</name>
-			<key>int</key>
-			<opt>fcn:ii</opt>
-		</option>
-		<option>
-			<name>Short</name>
-			<key>short</key>
-			<opt>fcn:ss</opt>
-		</option>
-	</param>
-	<param>
-		<name>Num Inputs</name>
-		<key>num_inputs</key>
-		<value>2</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Vec Length</name>
-		<key>vlen</key>
-		<value>1</value>
-		<type>int</type>
-	</param>
-	<check>$num_inputs &gt; 1</check>
-	<check>$vlen &gt; 0</check>
-	<sink>
-		<name>in</name>
-		<type>$type</type>
-		<vlen>$vlen</vlen>
-		<nports>$num_inputs</nports>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>$type</type>
-		<vlen>$vlen</vlen>
-	</source>
-</block>
diff --git a/grc/data/platforms/python/blocks/gr_add_xx.xml b/grc/data/platforms/python/blocks/gr_add_xx.xml
new file mode 100644
index 000000000..97ed9283c
--- /dev/null
+++ b/grc/data/platforms/python/blocks/gr_add_xx.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##Add Block:
+##	all types, 1 output, 2 to inf inputs
+###################################################
+ -->
+<block>
+	<name>Add</name>
+	<key>gr_add_xx</key>
+	<import>from gnuradio import gr</import>
+	<make>gr.add_v$(type.fcn)($vlen)</make>
+	<param>
+		<name>IO Type</name>
+		<key>type</key>
+		<type>enum</type>
+		<option>
+			<name>Complex</name>
+			<key>complex</key>
+			<opt>fcn:cc</opt>
+		</option>
+		<option>
+			<name>Float</name>
+			<key>float</key>
+			<opt>fcn:ff</opt>
+		</option>
+		<option>
+			<name>Int</name>
+			<key>int</key>
+			<opt>fcn:ii</opt>
+		</option>
+		<option>
+			<name>Short</name>
+			<key>short</key>
+			<opt>fcn:ss</opt>
+		</option>
+	</param>
+	<param>
+		<name>Num Inputs</name>
+		<key>num_inputs</key>
+		<value>2</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Vec Length</name>
+		<key>vlen</key>
+		<value>1</value>
+		<type>int</type>
+	</param>
+	<check>$num_inputs &gt; 1</check>
+	<check>$vlen &gt; 0</check>
+	<sink>
+		<name>in</name>
+		<type>$type</type>
+		<vlen>$vlen</vlen>
+		<nports>$num_inputs</nports>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>$type</type>
+		<vlen>$vlen</vlen>
+	</source>
+</block>
diff --git a/grc/data/platforms/python/blocks/gr_multiply_vxx.xml b/grc/data/platforms/python/blocks/gr_multiply_vxx.xml
deleted file mode 100644
index ea0d555b6..000000000
--- a/grc/data/platforms/python/blocks/gr_multiply_vxx.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##Multiply Block:
-##	all types, 1 output, 2 to inf inputs
-###################################################
- -->
-<block>
-	<name>Multiply</name>
-	<key>gr_multiply_vxx</key>
-	<import>from gnuradio import gr</import>
-	<make>gr.multiply_v$(type.fcn)($vlen)</make>
-	<param>
-		<name>IO Type</name>
-		<key>type</key>
-		<type>enum</type>
-		<option>
-			<name>Complex</name>
-			<key>complex</key>
-			<opt>fcn:cc</opt>
-		</option>
-		<option>
-			<name>Float</name>
-			<key>float</key>
-			<opt>fcn:ff</opt>
-		</option>
-		<option>
-			<name>Int</name>
-			<key>int</key>
-			<opt>fcn:ii</opt>
-		</option>
-		<option>
-			<name>Short</name>
-			<key>short</key>
-			<opt>fcn:ss</opt>
-		</option>
-	</param>
-	<param>
-		<name>Num Inputs</name>
-		<key>num_inputs</key>
-		<value>2</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Vec Length</name>
-		<key>vlen</key>
-		<value>1</value>
-		<type>int</type>
-	</param>
-	<check>$num_inputs &gt; 1</check>
-	<check>$vlen &gt; 0</check>
-	<sink>
-		<name>in</name>
-		<type>$type</type>
-		<vlen>$vlen</vlen>
-		<nports>$num_inputs</nports>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>$type</type>
-		<vlen>$vlen</vlen>
-	</source>
-</block>
diff --git a/grc/data/platforms/python/blocks/gr_multiply_xx.xml b/grc/data/platforms/python/blocks/gr_multiply_xx.xml
new file mode 100644
index 000000000..60f65c274
--- /dev/null
+++ b/grc/data/platforms/python/blocks/gr_multiply_xx.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##Multiply Block:
+##	all types, 1 output, 2 to inf inputs
+###################################################
+ -->
+<block>
+	<name>Multiply</name>
+	<key>gr_multiply_xx</key>
+	<import>from gnuradio import gr</import>
+	<make>gr.multiply_v$(type.fcn)($vlen)</make>
+	<param>
+		<name>IO Type</name>
+		<key>type</key>
+		<type>enum</type>
+		<option>
+			<name>Complex</name>
+			<key>complex</key>
+			<opt>fcn:cc</opt>
+		</option>
+		<option>
+			<name>Float</name>
+			<key>float</key>
+			<opt>fcn:ff</opt>
+		</option>
+		<option>
+			<name>Int</name>
+			<key>int</key>
+			<opt>fcn:ii</opt>
+		</option>
+		<option>
+			<name>Short</name>
+			<key>short</key>
+			<opt>fcn:ss</opt>
+		</option>
+	</param>
+	<param>
+		<name>Num Inputs</name>
+		<key>num_inputs</key>
+		<value>2</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Vec Length</name>
+		<key>vlen</key>
+		<value>1</value>
+		<type>int</type>
+	</param>
+	<check>$num_inputs &gt; 1</check>
+	<check>$vlen &gt; 0</check>
+	<sink>
+		<name>in</name>
+		<type>$type</type>
+		<vlen>$vlen</vlen>
+		<nports>$num_inputs</nports>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>$type</type>
+		<vlen>$vlen</vlen>
+	</source>
+</block>
-- 
cgit