Merge branch 'master' of http://gnuradio.org/git/gnuradio into cpuid

Conflicts:
	volk/Makefile.common
	volk/lib/qa_utils.cc

5 files changed, 57 insertions, 303 deletions

diff --git a/gr-uhd/grc/.gitignore b/gr-uhd/grc/.gitignore
index d8ab9bd0c..797c54ae7 100644
--- a/gr-uhd/grc/.gitignore
+++ b/gr-uhd/grc/.gitignore
@@ -1,4 +1,3 @@
-/uhd_multi*.xml
-/uhd_single*.xml
+/uhd_usrp*.xml
 /Makefile
 /Makefile.in
diff --git a/gr-uhd/grc/Makefile.am b/gr-uhd/grc/Makefile.am
index 30061a7ec..7e73a5b39 100644
--- a/gr-uhd/grc/Makefile.am
+++ b/gr-uhd/grc/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2010 Free Software Foundation, Inc.
+# Copyright 2010-2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -23,17 +23,11 @@ include $(top_srcdir)/Makefile.common
 
 grcblocksdir = $(grc_blocksdir)
 
-generated_uhd_multi_usrp_blocks = \
-	uhd_multi_usrp_source.xml \
-	uhd_multi_usrp_sink.xml
+generated_uhd_usrp_blocks = \
+	uhd_usrp_source.xml \
+	uhd_usrp_sink.xml
 
-generated_uhd_single_usrp_blocks = \
-	uhd_single_usrp_source.xml \
-	uhd_single_usrp_sink.xml
-
-BUILT_SOURCES += \
-	$(generated_uhd_multi_usrp_blocks) \
-	$(generated_uhd_single_usrp_blocks)
+BUILT_SOURCES += $(generated_uhd_usrp_blocks)
 
 dist_grcblocks_DATA = \
 	uhd_block_tree.xml \
@@ -42,14 +36,8 @@ dist_grcblocks_DATA = \
 ########################################################################
 # Rules for generating the source and sink xml wrappers
 ########################################################################
-EXTRA_DIST += \
-	$(srcdir)/gen_uhd_multi_usrp_blocks_xml.py \
-	$(srcdir)/gen_uhd_single_usrp_blocks_xml.py
-
-$(generated_uhd_multi_usrp_blocks): $(srcdir)/gen_uhd_multi_usrp_blocks_xml.py
-	@echo "generating $@..."
-	$(PYTHON) $< $@
+EXTRA_DIST += $(srcdir)/gen_uhd_usrp_blocks.py
 
-$(generated_uhd_single_usrp_blocks): $(srcdir)/gen_uhd_single_usrp_blocks_xml.py
+$(generated_uhd_usrp_blocks): $(srcdir)/gen_uhd_usrp_blocks.py
 	@echo "generating $@..."
 	$(PYTHON) $< $@
diff --git a/gr-uhd/grc/gen_uhd_single_usrp_blocks_xml.py b/gr-uhd/grc/gen_uhd_single_usrp_blocks_xml.py
deleted file mode 100755
index 4de21c989..000000000
--- a/gr-uhd/grc/gen_uhd_single_usrp_blocks_xml.py
+++ /dev/null
@@ -1,265 +0,0 @@
-#!/usr/bin/env python
-"""
-Copyright 2010-2011 Free Software Foundation, Inc.
-
-This file is part of GNU Radio
-
-GNU Radio Companion is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-GNU Radio Companion is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-"""
-
-MAIN_TMPL = """\
-<?xml version="1.0"?>
-<block>
-	<name>UHD: Single USRP $sourk.title()</name>
-	<key>uhd_single_usrp_$(sourk)</key>
-	<import>from gnuradio import uhd</import>
-	<make>uhd.single_usrp_$(sourk)(
-	device_addr=\$dev_addr,
-	io_type=uhd.io_type.\$type.type,
-	num_channels=\$nchan,
-)
-\#if \$ref_clk()
-self.\$(id).set_clock_config(uhd.clock_config.external());
-\#end if
-\#if \$sd_spec()
-self.\$(id).set_subdev_spec(\$sd_spec)
-\#end if
-self.\$(id).set_samp_rate(\$samp_rate)
-#for $n in range($max_nchan)
-\#if \$nchan() > $n
-self.\$(id).set_center_freq(\$center_freq$(n), $n)
-self.\$(id).set_gain(\$gain$(n), $n)
-	\#if \$ant$(n)()
-self.\$(id).set_antenna(\$ant$(n), $n)
-	\#end if
-	\#if \$bw$(n)()
-self.\$(id).set_bandwidth(\$bw$(n), $n)
-	\#end if
-\#end if
-#end for
-</make>
-	<callback>set_samp_rate(\$samp_rate)</callback>
-	#for $n in range($max_nchan)
-	<callback>set_center_freq(\$center_freq$(n), $n)</callback>
-	<callback>set_gain(\$gain$(n), $n)</callback>
-	<callback>set_antenna(\$ant$(n), $n)</callback>
-	<callback>set_bandwidth(\$bw$(n), $n)</callback>
-	#end for
-	<param>
-		<name>Input Type</name>
-		<key>type</key>
-		<type>enum</type>
-		<option>
-			<name>Complex</name>
-			<key>complex</key>
-			<opt>type:COMPLEX_FLOAT32</opt>
-			<opt>vlen:1</opt>
-		</option>
-		<option>
-			<name>Short</name>
-			<key>short</key>
-			<opt>type:COMPLEX_INT16</opt>
-			<opt>vlen:2</opt>
-		</option>
-	</param>
-	<param>
-		<name>Num Channels</name>
-		<key>nchan</key>
-		<value>1</value>
-		<type>int</type>
-		<hide>part</hide>
-		<option>
-			<name>Single Channel</name>
-			<key>1</key>
-		</option>
-		<option>
-			<name>Dual Channel</name>
-			<key>2</key>
-		</option>
-		<option>
-			<name>Quad Channel</name>
-			<key>4</key>
-		</option>
-	</param>
-	<param>
-		<name>Device Addr</name>
-		<key>dev_addr</key>
-		<value>addr=192.168.10.2</value>
-		<type>string</type>
-		<hide>
-			\#if \$dev_addr()
-				none
-			\#else
-				part
-			\#end if
-		</hide>
-	</param>
-	<param>
-		<name>Ref Clock</name>
-		<key>ref_clk</key>
-		<value></value>
-		<type>enum</type>
-		<hide>\#if \$ref_clk() then 'none' else 'part'#</hide>
-		<option>
-			<name>External</name>
-			<key>ext</key>
-		</option>
-		<option>
-			<name>Internal</name>
-			<key></key>
-		</option>
-	</param>
-	<param>
-		<name>Subdev Spec</name>
-		<key>sd_spec</key>
-		<value></value>
-		<type>string</type>
-		<hide>
-			\#if \$sd_spec()
-				none
-			\#else
-				part
-			\#end if
-		</hide>
-	</param>
-	<param>
-		<name>Samp Rate (Sps)</name>
-		<key>samp_rate</key>
-		<value>samp_rate</value>
-		<type>real</type>
-	</param>
-	$params
-	<check>$max_nchan >= \$nchan</check>
-	<check>\$nchan > 0</check>
-	<check>(len((\$sd_spec).split()) or 1) == \$nchan</check>
-	<$sourk>
-		<name>$direction</name>
-		<type>\$type</type>
-		<vlen>\$type.vlen</vlen>
-		<nports>\$nchan</nports>
-	</$sourk>
-	<doc>
-The UHD Single USRP $sourk.title() Block:
-
-Device Address:
-The device address is a delimited string used to locate UHD devices on your system. \\
-If left blank, the first UHD device found will be used. \\
-Use the device address to specify a specific device.
-USRP2 Example: addr=192.168.10.2
-USRP1 Example: serial=12345678
-
-Subdevice specification:
-Select the subdevice or subdevices for each channel using a markup string. \\
-The markup string consists of a list of dboard_slot:subdev_name pairs (one pair per channel). \\
-If left blank, the UHD will try to select the first subdevice on your system. \\
-See the application notes for further details.
-Single channel example: A:AB
-Dual channel example: A:AB B:0
-
-Sample rate:
-The sample rate is the number of samples per second input by this block. \\
-The UHD device driver will try its best to match the requested sample rate. \\
-If the requested rate is not possible, the UHD block will print an error at runtime.
-
-Center frequency:
-The center frequency is the overall frequency of the RF chain. \\
-For greater control of how the UHD tunes elements in the RF chain, \\
-pass a tune_request object rather than a simple target frequency.
-Tuning with an LO offset example: uhd.tune_request(freq, lo_off)
-
-Antenna:
-For subdevices with only one antenna, this may be left blank. \\
-Otherwise, the user should specify one of the possible antenna choices. \\
-See the daughterboard application notes for the possible antenna choices.
-
-Bandwidth:
-To use the default bandwidth filter setting, this should be zero. \\
-Only certain subdevices have configurable bandwidth filters. \\
-See the daughterboard application notes for possible configurations.
-	</doc>
-</block>
-"""
-
-PARAMS_TMPL = """
-	<param>
-		<name>Ch$(n): Center Freq (Hz)</name>
-		<key>center_freq$(n)</key>
-		<value>0</value>
-		<type>real</type>
-		<hide>\#if \$nchan() > $n then 'none' else 'all'#</hide>
-	</param>
-	<param>
-		<name>Ch$(n): Gain (dB)</name>
-		<key>gain$(n)</key>
-		<value>0</value>
-		<type>real</type>
-		<hide>\#if \$nchan() > $n then 'none' else 'all'#</hide>
-	</param>
-	<param>
-		<name>Ch$(n): Antenna</name>
-		<key>ant$(n)</key>
-		<value></value>
-		<type>string</type>
-		<hide>
-			\#if not \$nchan() > $n
-				all
-			\#elif \$ant$(n)()
-				none
-			\#else
-				part
-			\#end if
-		</hide>
-	</param>
-	<param>
-		<name>Ch$(n): Bandwidth (Hz)</name>
-		<key>bw$(n)</key>
-		<value>0</value>
-		<type>real</type>
-		<hide>
-			\#if not \$nchan() > $n
-				all
-			\#elif \$bw$(n)()
-				none
-			\#else
-				part
-			\#end if
-		</hide>
-	</param>
-"""
-
-def parse_tmpl(_tmpl, **kwargs):
-	from Cheetah import Template
-	return str(Template.Template(_tmpl, kwargs))
-
-max_num_channels = 4
-
-if __name__ == '__main__':
-	import sys
-	for file in sys.argv[1:]:
-		if 'source' in file:
-			sourk = 'source'
-			direction = 'out'
-		elif 'sink' in file:
-			sourk = 'sink'
-			direction = 'in'
-		else: raise Exception, 'is %s a source or sink?'%file
-
-		params = ''.join([parse_tmpl(PARAMS_TMPL, n=n) for n in range(max_num_channels)])
-		open(file, 'w').write(parse_tmpl(MAIN_TMPL,
-			max_nchan=max_num_channels,
-			params=params,
-			sourk=sourk,
-			direction=direction,
-		))
diff --git a/gr-uhd/grc/gen_uhd_multi_usrp_blocks_xml.py b/gr-uhd/grc/gen_uhd_usrp_blocks.py
index fc44501de..8596e14a6 100755..100644
--- a/gr-uhd/grc/gen_uhd_multi_usrp_blocks_xml.py
+++ b/gr-uhd/grc/gen_uhd_usrp_blocks.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """
 Copyright 2010-2011 Free Software Foundation, Inc.
 
@@ -22,18 +21,23 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 MAIN_TMPL = """\
 <?xml version="1.0"?>
 <block>
-	<name>UHD: Multi USRP $sourk.title()</name>
-	<key>uhd_multi_usrp_$(sourk)</key>
+	<name>UHD: USRP $sourk.title()</name>
+	<key>uhd_usrp_$(sourk)</key>
 	<import>from gnuradio import uhd</import>
-	<make>uhd.multi_usrp_$(sourk)(
+	<make>uhd.usrp_$(sourk)(
 	device_addr=\$dev_addr,
 	io_type=uhd.io_type.\$type.type,
 	num_channels=\$nchan,
 )
+\#if \$ref_clk()
+self.\$(id).set_clock_config(uhd.clock_config.external(), uhd.ALL_MBOARDS)
+\#end if
 \#if \$sync()
-self.\$(id).set_clock_config(uhd.clock_config.external(), uhd.ALL_MBOARDS);
 self.\$(id).set_time_unknown_pps(uhd.time_spec())
 \#end if
+\#if \$clock_rate()
+self.\$(id).set_clock_rate(\$clock_rate, uhd.ALL_MBOARDS)
+\#end if
 #for $m in range($max_mboards)
 \#if \$num_mboards() > $m and \$sd_spec$(m)()
 self.\$(id).set_subdev_spec(\$sd_spec$(m), $m)
@@ -61,7 +65,7 @@ self.\$(id).set_bandwidth(\$bw$(n), $n)
 	<callback>set_bandwidth(\$bw$(n), $n)</callback>
 	#end for
 	<param>
-		<name>Input Type</name>
+		<name>$(direction.title())put Type</name>
 		<key>type</key>
 		<type>enum</type>
 		<option>
@@ -80,7 +84,7 @@ self.\$(id).set_bandwidth(\$bw$(n), $n)
 	<param>
 		<name>Device Addr</name>
 		<key>dev_addr</key>
-		<value>addr0=192.168.10.2, addr1=192.168.10.3</value>
+		<value></value>
 		<type>string</type>
 		<hide>
 			\#if \$dev_addr()
@@ -91,9 +95,24 @@ self.\$(id).set_bandwidth(\$bw$(n), $n)
 		</hide>
 	</param>
 	<param>
+		<name>Ref Clock</name>
+		<key>ref_clk</key>
+		<value></value>
+		<type>enum</type>
+		<hide>\#if \$ref_clk() then 'none' else 'part'#</hide>
+		<option>
+			<name>External</name>
+			<key>ext</key>
+		</option>
+		<option>
+			<name>Internal</name>
+			<key></key>
+		</option>
+	</param>
+	<param>
 		<name>Sync</name>
 		<key>sync</key>
-		<value>sync</value>
+		<value></value>
 		<type>enum</type>
 		<hide>\#if \$sync() then 'none' else 'part'#</hide>
 		<option>
@@ -106,10 +125,22 @@ self.\$(id).set_bandwidth(\$bw$(n), $n)
 		</option>
 	</param>
 	<param>
+		<name>Clock Rate (Hz)</name>
+		<key>clock_rate</key>
+		<value>0.0</value>
+		<type>real</type>
+		<hide>\#if \$clock_rate() then 'none' else 'part'#</hide>
+		<option>
+			<name>Default</name>
+			<key>0.0</key>
+		</option>
+	</param>
+	<param>
 		<name>Num Mboards</name>
 		<key>num_mboards</key>
-		<value>2</value>
+		<value>1</value>
 		<type>int</type>
+		<hide>part</hide>
 		#for $m in range(1, $max_mboards+1)
 		<option>
 			<name>$(m)</name>
@@ -137,7 +168,7 @@ self.\$(id).set_bandwidth(\$bw$(n), $n)
 	<param>
 		<name>Num Channels</name>
 		<key>nchan</key>
-		<value>2</value>
+		<value>1</value>
 		<type>int</type>
 		#for $n in range(1, $max_nchan+1)
 		<option>
@@ -165,15 +196,18 @@ self.\$(id).set_bandwidth(\$bw$(n), $n)
 		<nports>\$nchan</nports>
 	</$sourk>
 	<doc>
-The UHD Multi USRP $sourk.title() Block:
+The UHD USRP $sourk.title() Block:
 
 Device Address:
 The device address is a delimited string used to locate UHD devices on your system. \\
-Use the device address to specify a list of devices.
+If left blank, the first UHD device found will be used. \\
+Use the device address to specify a specific device or list of devices.
+USRP1 Example: serial=12345678
+USRP2 Example: addr=192.168.10.2
 USRP2 Example: addr0=192.168.10.2, addr1=192.168.10.3
 
 Num Motherboards:
-Selects the number of USRP motherboards in this multi-USRP configuration.
+Selects the number of USRP motherboards in this device configuration.
 
 Subdevice specification:
 Each motherboard should have its own subdevice specification \\
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>