Merge branch 'next' into tagging

19 files changed, 873 insertions, 164 deletions

diff --git a/gr-uhd/lib/Makefile.am b/gr-uhd/lib/Makefile.am
index 1260201a5..b4b1abfc6 100644
--- a/gr-uhd/lib/Makefile.am
+++ b/gr-uhd/lib/Makefile.am
@@ -29,13 +29,17 @@ AM_CPPFLAGS = \
 lib_LTLIBRARIES = libgnuradio-uhd.la
 
 libgnuradio_uhd_la_SOURCES = \
-	utils.cc \
+	uhd_multi_usrp_source.cc \
+	uhd_multi_usrp_sink.cc \
+	uhd_single_usrp_source.cc \
+	uhd_single_usrp_sink.cc
+
+# add the deprecated sources
+libgnuradio_uhd_la_SOURCES += \
 	uhd_mimo_source.cc \
 	uhd_mimo_sink.cc \
 	uhd_simple_source.cc \
-	uhd_simple_sink.cc \
-	uhd_single_usrp_source.cc \
-	uhd_single_usrp_sink.cc
+	uhd_simple_sink.cc
 
 libgnuradio_uhd_la_LIBADD = \
 	$(GNURADIO_CORE_LA) \
@@ -44,12 +48,9 @@ libgnuradio_uhd_la_LIBADD = \
 libgnuradio_uhd_la_LDFLAGS = $(LTVERSIONFLAGS)
 
 grinclude_HEADERS = \
-	uhd_mimo_source.h \
-	uhd_mimo_sink.h \
-	uhd_simple_source.h \
-	uhd_simple_sink.h \
+	uhd_multi_usrp_source.h \
+	uhd_multi_usrp_sink.h \
 	uhd_single_usrp_source.h \
 	uhd_single_usrp_sink.h
 
-noinst_HEADERS = \
-	utils.h
+noinst_HEADERS =
diff --git a/gr-uhd/lib/uhd_mimo_sink.cc b/gr-uhd/lib/uhd_mimo_sink.cc
index 0a2ce1b0a..03d310b1e 100644
--- a/gr-uhd/lib/uhd_mimo_sink.cc
+++ b/gr-uhd/lib/uhd_mimo_sink.cc
@@ -23,7 +23,7 @@
 #include <uhd_mimo_sink.h>
 #include <gr_io_signature.h>
 #include <stdexcept>
-#include "utils.h"
+//#include "utils.h"
 
 /***********************************************************************
  * UHD Sink
@@ -59,7 +59,7 @@ public:
 
     void set_samp_rate_all(double rate){
         _dev->set_tx_rate_all(rate);
-        do_samp_rate_error_message(rate, get_samp_rate_all(), "TX");
+        //do_samp_rate_error_message(rate, get_samp_rate_all(), "TX");
     }
 
     double get_samp_rate_all(void){
@@ -68,7 +68,7 @@ public:
 
     uhd::tune_result_t set_center_freq(size_t chan, double freq){
         uhd::tune_result_t tr = _dev->set_tx_freq(chan, freq);
-        do_tune_freq_error_message(freq, _dev->get_tx_freq(chan), "TX");
+        //do_tune_freq_error_message(freq, _dev->get_tx_freq(chan), "TX");
         return tr;
     }
 
diff --git a/gr-uhd/lib/uhd_mimo_sink.h b/gr-uhd/lib/uhd_mimo_sink.h
index 46679d973..28a530b60 100644
--- a/gr-uhd/lib/uhd_mimo_sink.h
+++ b/gr-uhd/lib/uhd_mimo_sink.h
@@ -34,7 +34,10 @@ boost::shared_ptr<uhd_mimo_sink> uhd_make_mimo_sink(
     const uhd::io_type_t::tid_t &type
 );
 
-class uhd_mimo_sink : public gr_sync_block{
+/***********************************************************************
+ * DEPRECATED
+ **********************************************************************/
+class UHD_DEPRECATED uhd_mimo_sink : public gr_sync_block{
 public:
 
     /*!
diff --git a/gr-uhd/lib/uhd_mimo_source.cc b/gr-uhd/lib/uhd_mimo_source.cc
index 62157142d..abd70ba36 100644
--- a/gr-uhd/lib/uhd_mimo_source.cc
+++ b/gr-uhd/lib/uhd_mimo_source.cc
@@ -23,7 +23,7 @@
 #include <uhd_mimo_source.h>
 #include <gr_io_signature.h>
 #include <stdexcept>
-#include "utils.h"
+//#include "utils.h"
 
 /***********************************************************************
  * UHD Source
@@ -59,7 +59,7 @@ public:
 
     void set_samp_rate_all(double rate){
         _dev->set_rx_rate_all(rate);
-        do_samp_rate_error_message(rate, get_samp_rate_all(), "RX");
+        //do_samp_rate_error_message(rate, get_samp_rate_all(), "RX");
     }
 
     double get_samp_rate_all(void){
@@ -68,7 +68,7 @@ public:
 
     uhd::tune_result_t set_center_freq(size_t chan, double freq){
         uhd::tune_result_t tr = _dev->set_rx_freq(chan, freq);
-        do_tune_freq_error_message(freq, _dev->get_rx_freq(chan), "RX");
+        //do_tune_freq_error_message(freq, _dev->get_rx_freq(chan), "RX");
         return tr;
     }
 
diff --git a/gr-uhd/lib/uhd_mimo_source.h b/gr-uhd/lib/uhd_mimo_source.h
index fbd7f2c42..dc2927598 100644
--- a/gr-uhd/lib/uhd_mimo_source.h
+++ b/gr-uhd/lib/uhd_mimo_source.h
@@ -34,7 +34,10 @@ boost::shared_ptr<uhd_mimo_source> uhd_make_mimo_source(
     const uhd::io_type_t::tid_t &type
 );
 
-class uhd_mimo_source : public gr_sync_block{
+/***********************************************************************
+ * DEPRECATED
+ **********************************************************************/
+class UHD_DEPRECATED uhd_mimo_source : public gr_sync_block{
 public:
 
     /*!
diff --git a/gr-uhd/lib/uhd_multi_usrp_sink.cc b/gr-uhd/lib/uhd_multi_usrp_sink.cc
new file mode 100644
index 000000000..ee16e2928
--- /dev/null
+++ b/gr-uhd/lib/uhd_multi_usrp_sink.cc
@@ -0,0 +1,188 @@
+/*
+ * Copyright 2010 Free Software Foundation, Inc.
+ * 
+ * This file is part of GNU Radio
+ * 
+ * GNU Radio 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 3, or (at your option)
+ * any later version.
+ * 
+ * GNU Radio 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 GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <uhd_multi_usrp_sink.h>
+#include <gr_io_signature.h>
+#include <stdexcept>
+
+/***********************************************************************
+ * UHD Multi USRP Sink
+ **********************************************************************/
+uhd_multi_usrp_sink::uhd_multi_usrp_sink(gr_io_signature_sptr sig)
+:gr_sync_block("uhd multi usrp sink", sig, gr_make_io_signature(0, 0, 0)){
+    /* NOP */
+}
+
+/***********************************************************************
+ * UHD Multi USRP Sink Impl
+ **********************************************************************/
+class uhd_multi_usrp_sink_impl : public uhd_multi_usrp_sink{
+public:
+    uhd_multi_usrp_sink_impl(
+        const std::string &device_addr,
+        const uhd::io_type_t &io_type,
+        size_t num_channels
+    ):
+        uhd_multi_usrp_sink(gr_make_io_signature(
+            num_channels, num_channels, io_type.size
+        )),
+        _type(io_type),
+        _nchan(num_channels)
+    {
+        _dev = uhd::usrp::multi_usrp::make(device_addr);
+    }
+
+    void set_subdev_spec(const std::string &spec, size_t mboard){
+        return _dev->set_tx_subdev_spec(spec, mboard);
+    }
+
+    void set_samp_rate(double rate){
+        _dev->set_tx_rate(rate);
+    }
+
+    double get_samp_rate(void){
+        return _dev->get_tx_rate();
+    }
+
+    uhd::tune_result_t set_center_freq(
+        const uhd::tune_request_t tune_request, size_t chan
+    ){
+        return _dev->set_tx_freq(tune_request, chan);
+    }
+
+    uhd::freq_range_t get_freq_range(size_t chan){
+        return _dev->get_tx_freq_range(chan);
+    }
+
+    void set_gain(float gain, size_t chan){
+        return _dev->set_tx_gain(gain, chan);
+    }
+
+    float get_gain(size_t chan){
+        return _dev->get_tx_gain(chan);
+    }
+
+    uhd::gain_range_t get_gain_range(size_t chan){
+        return _dev->get_tx_gain_range(chan);
+    }
+
+    void set_antenna(const std::string &ant, size_t chan){
+        return _dev->set_tx_antenna(ant, chan);
+    }
+
+    std::string get_antenna(size_t chan){
+        return _dev->get_tx_antenna(chan);
+    }
+
+    std::vector<std::string> get_antennas(size_t chan){
+        return _dev->get_tx_antennas(chan);
+    }
+
+    void set_bandwidth(double bandwidth, size_t chan){
+        return _dev->set_tx_bandwidth(bandwidth, chan);
+    }
+
+    void set_clock_config(const uhd::clock_config_t &clock_config, size_t mboard){
+        return _dev->set_clock_config(clock_config, mboard);
+    }
+
+    uhd::time_spec_t get_time_now(void){
+        return _dev->get_time_now();
+    }
+
+    void set_time_next_pps(const uhd::time_spec_t &time_spec){
+        return _dev->set_time_next_pps(time_spec);
+    }
+
+    void set_time_unknown_pps(const uhd::time_spec_t &time_spec){
+        return _dev->set_time_unknown_pps(time_spec);
+    }
+
+    uhd::usrp::multi_usrp::sptr get_device(void){
+        return _dev;
+    }
+
+/***********************************************************************
+ * Work
+ **********************************************************************/
+    int work(
+        int noutput_items,
+        gr_vector_const_void_star &input_items,
+        gr_vector_void_star &output_items
+    ){
+        uhd::tx_metadata_t metadata;
+        metadata.start_of_burst = true;
+
+        return _dev->get_device()->send(
+            input_items, noutput_items, metadata,
+            _type, uhd::device::SEND_MODE_FULL_BUFF, 1.0
+        );
+    }
+
+    //Send an empty start-of-burst packet to begin streaming.
+    //Set at a time in the near future so data will be sync'd.
+    bool start(void){
+        uhd::tx_metadata_t metadata;
+        metadata.start_of_burst = true;
+        metadata.has_time_spec = true;
+        //TODO: Time in the near future, must be less than source time in future
+        //because ethernet pause frames with throttle stream commands.
+        //It will be fixed with the invention of host-based flow control.
+        metadata.time_spec = get_time_now() + uhd::time_spec_t(0.05);
+
+        _dev->get_device()->send(
+            gr_vector_const_void_star(_nchan), 0, metadata,
+            _type, uhd::device::SEND_MODE_ONE_PACKET, 1.0
+        );
+        return true;
+    }
+
+    //Send an empty end-of-burst packet to end streaming.
+    //Ending the burst avoids an underflow error on stop.
+    bool stop(void){
+        uhd::tx_metadata_t metadata;
+        metadata.end_of_burst = true;
+
+        _dev->get_device()->send(
+            gr_vector_const_void_star(_nchan), 0, metadata,
+            _type, uhd::device::SEND_MODE_ONE_PACKET, 1.0
+        );
+        return true;
+    }
+
+protected:
+    uhd::usrp::multi_usrp::sptr _dev;
+    const uhd::io_type_t _type;
+    size_t _nchan;
+};
+
+/***********************************************************************
+ * Make UHD Multi USRP Sink
+ **********************************************************************/
+boost::shared_ptr<uhd_multi_usrp_sink> uhd_make_multi_usrp_sink(
+    const std::string &device_addr,
+    const uhd::io_type_t::tid_t &io_type,
+    size_t num_channels
+){
+    return boost::shared_ptr<uhd_multi_usrp_sink>(
+        new uhd_multi_usrp_sink_impl(device_addr, io_type, num_channels)
+    );
+}
diff --git a/gr-uhd/lib/uhd_multi_usrp_sink.h b/gr-uhd/lib/uhd_multi_usrp_sink.h
new file mode 100644
index 000000000..370e59d0e
--- /dev/null
+++ b/gr-uhd/lib/uhd_multi_usrp_sink.h
@@ -0,0 +1,175 @@
+/*
+ * Copyright 2010 Free Software Foundation, Inc.
+ * 
+ * This file is part of GNU Radio
+ * 
+ * GNU Radio 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 3, or (at your option)
+ * any later version.
+ * 
+ * GNU Radio 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 GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_UHD_MULTI_USRP_SINK_H
+#define INCLUDED_UHD_MULTI_USRP_SINK_H
+
+#include <gr_sync_block.h>
+#include <uhd/usrp/multi_usrp.hpp>
+
+class uhd_multi_usrp_sink;
+
+boost::shared_ptr<uhd_multi_usrp_sink> uhd_make_multi_usrp_sink(
+    const std::string &device_addr,
+    const uhd::io_type_t::tid_t &io_type,
+    size_t num_channels
+);
+
+class uhd_multi_usrp_sink : public gr_sync_block{
+public:
+
+    /*!
+     * Set the IO signature for this block.
+     * \param sig the input signature
+     */
+    uhd_multi_usrp_sink(gr_io_signature_sptr sig);
+
+    /*!
+     * Set the subdevice specification.
+     * \param spec the subdev spec markup string
+     * \param mboard the motherboard index 0 to M-1
+     */
+    virtual void set_subdev_spec(const std::string &spec, size_t mboard) = 0;
+
+    /*!
+     * Set the sample rate for the usrp device.
+     * \param rate a new rate in Sps
+     */
+    virtual void set_samp_rate(double rate) = 0;
+
+    /*!
+     * Get the sample rate for the usrp device.
+     * This is the actual sample rate and may differ from the rate set.
+     * \return the actual rate in Sps
+     */
+    virtual double get_samp_rate(void) = 0;
+
+    /*!
+     * Tune the usrp device to the desired center frequency.
+     * \param tune_request the tune request instructions
+     * \param chan the channel index 0 to N-1
+     * \return a tune result with the actual frequencies
+     */
+    virtual uhd::tune_result_t set_center_freq(
+        const uhd::tune_request_t tune_request, size_t chan
+    ) = 0;
+
+    /*!
+     * Tune the usrp device to the desired center frequency.
+     * This is a wrapper around set center freq so that in this case,
+     * the user can pass a single frequency in the call through swig.
+     * \param freq the desired frequency in Hz
+     * \param chan the channel index 0 to N-1
+     * \return a tune result with the actual frequencies
+     */
+    uhd::tune_result_t set_center_freq(double freq, size_t chan){
+        return set_center_freq(uhd::tune_request_t(freq), chan);
+    }
+
+    /*!
+     * Get the tunable frequency range.
+     * \param chan the channel index 0 to N-1
+     * \return the frequency range in Hz
+     */
+    virtual uhd::freq_range_t get_freq_range(size_t chan) = 0;
+
+    /*!
+     * Set the gain for the dboard.
+     * \param gain the gain in dB
+     * \param chan the channel index 0 to N-1
+     */
+    virtual void set_gain(float gain, size_t chan) = 0;
+
+    /*!
+     * Get the actual dboard gain setting.
+     * \param chan the channel index 0 to N-1
+     * \return the actual gain in dB
+     */
+    virtual float get_gain(size_t chan) = 0;
+
+    /*!
+     * Get the settable gain range.
+     * \param chan the channel index 0 to N-1
+     * \return the gain range in dB
+     */
+    virtual uhd::gain_range_t get_gain_range(size_t chan) = 0;
+
+    /*!
+     * Set the antenna to use.
+     * \param ant the antenna string
+     * \param chan the channel index 0 to N-1
+     */
+    virtual void set_antenna(const std::string &ant, size_t chan) = 0;
+
+    /*!
+     * Get the antenna in use.
+     * \param chan the channel index 0 to N-1
+     * \return the antenna string
+     */
+    virtual std::string get_antenna(size_t chan) = 0;
+
+    /*!
+     * Get a list of possible antennas.
+     * \param chan the channel index 0 to N-1
+     * \return a vector of antenna strings
+     */
+    virtual std::vector<std::string> get_antennas(size_t chan) = 0;
+
+    /*!
+     * Set the subdevice bandpass filter.
+     * \param chan the channel index 0 to N-1
+     * \param bandwidth the filter bandwidth in Hz
+     */
+    virtual void set_bandwidth(double bandwidth, size_t chan) = 0;
+
+    /*!
+     * Set the clock configuration.
+     * \param clock_config the new configuration
+     * \param mboard the motherboard index 0 to M-1
+     */
+    virtual void set_clock_config(const uhd::clock_config_t &clock_config, size_t mboard) = 0;
+
+    /*!
+     * Get the current time registers.
+     * \return the current usrp time
+     */
+    virtual uhd::time_spec_t get_time_now(void) = 0;
+
+    /*!
+     * Set the time registers at the next pps.
+     * \param time_spec the new time
+     */
+    virtual void set_time_next_pps(const uhd::time_spec_t &time_spec) = 0;
+
+    /*!
+     * Sync the time registers with an unknown pps edge.
+     * \param time_spec the new time
+     */
+    virtual void set_time_unknown_pps(const uhd::time_spec_t &time_spec) = 0;
+
+    /*!
+     * Get access to the underlying uhd device object.
+     * \return the multi usrp device object
+     */
+    virtual uhd::usrp::multi_usrp::sptr get_device(void) = 0;
+};
+
+#endif /* INCLUDED_UHD_MULTI_USRP_SINK_H */
diff --git a/gr-uhd/lib/uhd_multi_usrp_source.cc b/gr-uhd/lib/uhd_multi_usrp_source.cc
new file mode 100644
index 000000000..029a763e3
--- /dev/null
+++ b/gr-uhd/lib/uhd_multi_usrp_source.cc
@@ -0,0 +1,187 @@
+/*
+ * Copyright 2010 Free Software Foundation, Inc.
+ * 
+ * This file is part of GNU Radio
+ * 
+ * GNU Radio 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 3, or (at your option)
+ * any later version.
+ * 
+ * GNU Radio 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 GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <uhd_multi_usrp_source.h>
+#include <gr_io_signature.h>
+#include <stdexcept>
+#include <iostream>
+#include <boost/format.hpp>
+
+/***********************************************************************
+ * UHD Multi USRP Source
+ **********************************************************************/
+uhd_multi_usrp_source::uhd_multi_usrp_source(gr_io_signature_sptr sig)
+:gr_sync_block("uhd multi_usrp source", gr_make_io_signature(0, 0, 0), sig){
+    /* NOP */
+}
+
+/***********************************************************************
+ * UHD Multi USRP Source Impl
+ **********************************************************************/
+class uhd_multi_usrp_source_impl : public uhd_multi_usrp_source{
+public:
+    uhd_multi_usrp_source_impl(
+        const std::string &device_addr,
+        const uhd::io_type_t &io_type,
+        size_t num_channels
+    ):
+        uhd_multi_usrp_source(gr_make_io_signature(
+            num_channels, num_channels, io_type.size
+        )),
+        _type(io_type)
+    {
+        _dev = uhd::usrp::multi_usrp::make(device_addr);
+    }
+
+    void set_subdev_spec(const std::string &spec, size_t mboard){
+        return _dev->set_rx_subdev_spec(spec, mboard);
+    }
+
+    void set_samp_rate(double rate){
+        _dev->set_rx_rate(rate);
+    }
+
+    double get_samp_rate(void){
+        return _dev->get_rx_rate();
+    }
+
+    uhd::tune_result_t set_center_freq(
+        const uhd::tune_request_t tune_request, size_t chan
+    ){
+        return _dev->set_rx_freq(tune_request, chan);
+    }
+
+    uhd::freq_range_t get_freq_range(size_t chan){
+        return _dev->get_rx_freq_range(chan);
+    }
+
+    void set_gain(float gain, size_t chan){
+        return _dev->set_rx_gain(gain, chan);
+    }
+
+    float get_gain(size_t chan){
+        return _dev->get_rx_gain(chan);
+    }
+
+    uhd::gain_range_t get_gain_range(size_t chan){
+        return _dev->get_rx_gain_range(chan);
+    }
+
+    void set_antenna(const std::string &ant, size_t chan){
+        return _dev->set_rx_antenna(ant, chan);
+    }
+
+    std::string get_antenna(size_t chan){
+        return _dev->get_rx_antenna(chan);
+    }
+
+    std::vector<std::string> get_antennas(size_t chan){
+        return _dev->get_rx_antennas(chan);
+    }
+
+    void set_bandwidth(double bandwidth, size_t chan){
+        return _dev->set_rx_bandwidth(bandwidth, chan);
+    }
+
+    void set_clock_config(const uhd::clock_config_t &clock_config, size_t mboard){
+        return _dev->set_clock_config(clock_config, mboard);
+    }
+
+    uhd::time_spec_t get_time_now(void){
+        return _dev->get_time_now();
+    }
+
+    void set_time_next_pps(const uhd::time_spec_t &time_spec){
+        return _dev->set_time_next_pps(time_spec);
+    }
+
+    void set_time_unknown_pps(const uhd::time_spec_t &time_spec){
+        return _dev->set_time_unknown_pps(time_spec);
+    }
+
+    uhd::usrp::multi_usrp::sptr get_device(void){
+        return _dev;
+    }
+
+/***********************************************************************
+ * Work
+ **********************************************************************/
+    int work(
+        int noutput_items,
+        gr_vector_const_void_star &input_items,
+        gr_vector_void_star &output_items
+    ){
+        uhd::rx_metadata_t metadata; //not passed out of this block
+
+        size_t num_samps = _dev->get_device()->recv(
+            output_items, noutput_items, metadata,
+            _type, uhd::device::RECV_MODE_FULL_BUFF, 1.0
+        );
+
+        switch(metadata.error_code){
+        case uhd::rx_metadata_t::ERROR_CODE_NONE:
+            return num_samps;
+
+        case uhd::rx_metadata_t::ERROR_CODE_OVERFLOW:
+            //ignore overflows and try work again
+            return work(noutput_items, input_items, output_items);
+
+        default:
+            std::cout << boost::format(
+                "UHD source block got error code 0x%x"
+            ) % metadata.error_code << std::endl;
+            return num_samps;
+        }
+    }
+
+    bool start(void){
+        //setup a stream command that starts streaming slightly in the future
+        static const double reasonable_delay = 0.1; //order of magnitude over RTT
+        uhd::stream_cmd_t stream_cmd(uhd::stream_cmd_t::STREAM_MODE_START_CONTINUOUS);
+        stream_cmd.stream_now = false;
+        stream_cmd.time_spec = get_time_now() + uhd::time_spec_t(reasonable_delay);
+        _dev->issue_stream_cmd(stream_cmd);
+        return true;
+    }
+
+    bool stop(void){
+        _dev->issue_stream_cmd(uhd::stream_cmd_t::STREAM_MODE_STOP_CONTINUOUS);
+        return true;
+    }
+
+private:
+    uhd::usrp::multi_usrp::sptr _dev;
+    const uhd::io_type_t _type;
+};
+
+
+/***********************************************************************
+ * Make UHD Multi USRP Source
+ **********************************************************************/
+boost::shared_ptr<uhd_multi_usrp_source> uhd_make_multi_usrp_source(
+    const std::string &device_addr,
+    const uhd::io_type_t::tid_t &io_type,
+    size_t num_channels
+){
+    return boost::shared_ptr<uhd_multi_usrp_source>(
+        new uhd_multi_usrp_source_impl(device_addr, io_type, num_channels)
+    );
+}
diff --git a/gr-uhd/lib/uhd_multi_usrp_source.h b/gr-uhd/lib/uhd_multi_usrp_source.h
new file mode 100644
index 000000000..b3cbdae1f
--- /dev/null
+++ b/gr-uhd/lib/uhd_multi_usrp_source.h
@@ -0,0 +1,175 @@
+/*
+ * Copyright 2010 Free Software Foundation, Inc.
+ * 
+ * This file is part of GNU Radio
+ * 
+ * GNU Radio 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 3, or (at your option)
+ * any later version.
+ * 
+ * GNU Radio 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 GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_UHD_MULTI_USRP_SOURCE_H
+#define INCLUDED_UHD_MULTI_USRP_SOURCE_H
+
+#include <gr_sync_block.h>
+#include <uhd/usrp/multi_usrp.hpp>
+
+class uhd_multi_usrp_source;
+
+boost::shared_ptr<uhd_multi_usrp_source> uhd_make_multi_usrp_source(
+    const std::string &device_addr,
+    const uhd::io_type_t::tid_t &io_type,
+    size_t num_channels
+);
+
+class uhd_multi_usrp_source : public gr_sync_block{
+public:
+
+    /*!
+     * Set the IO signature for this block.
+     * \param sig the output signature
+     */
+    uhd_multi_usrp_source(gr_io_signature_sptr sig);
+
+    /*!
+     * Set the subdevice specification.
+     * \param spec the subdev spec markup string
+     * \param mboard the motherboard index 0 to M-1
+     */
+    virtual void set_subdev_spec(const std::string &spec, size_t mboard) = 0;
+
+    /*!
+     * Set the sample rate for the usrp device.
+     * \param rate a new rate in Sps
+     */
+    virtual void set_samp_rate(double rate) = 0;
+
+    /*!
+     * Get the sample rate for the usrp device.
+     * This is the actual sample rate and may differ from the rate set.
+     * \return the actual rate in Sps
+     */
+    virtual double get_samp_rate(void) = 0;
+
+    /*!
+     * Tune the usrp device to the desired center frequency.
+     * \param tune_request the tune request instructions
+     * \param chan the channel index 0 to N-1
+     * \return a tune result with the actual frequencies
+     */
+    virtual uhd::tune_result_t set_center_freq(
+        const uhd::tune_request_t tune_request, size_t chan
+    ) = 0;
+
+    /*!
+     * Tune the usrp device to the desired center frequency.
+     * This is a wrapper around set center freq so that in this case,
+     * the user can pass a single frequency in the call through swig.
+     * \param freq the desired frequency in Hz
+     * \param chan the channel index 0 to N-1
+     * \return a tune result with the actual frequencies
+     */
+    uhd::tune_result_t set_center_freq(double freq, size_t chan){
+        return set_center_freq(uhd::tune_request_t(freq), chan);
+    }
+
+    /*!
+     * Get the tunable frequency range.
+     * \param chan the channel index 0 to N-1
+     * \return the frequency range in Hz
+     */
+    virtual uhd::freq_range_t get_freq_range(size_t chan) = 0;
+
+    /*!
+     * Set the gain for the dboard.
+     * \param gain the gain in dB
+     * \param chan the channel index 0 to N-1
+     */
+    virtual void set_gain(float gain, size_t chan) = 0;
+
+    /*!
+     * Get the actual dboard gain setting.
+     * \param chan the channel index 0 to N-1
+     * \return the actual gain in dB
+     */
+    virtual float get_gain(size_t chan) = 0;
+
+    /*!
+     * Get the settable gain range.
+     * \param chan the channel index 0 to N-1
+     * \return the gain range in dB
+     */
+    virtual uhd::gain_range_t get_gain_range(size_t chan) = 0;
+
+    /*!
+     * Set the antenna to use.
+     * \param ant the antenna string
+     * \param chan the channel index 0 to N-1
+     */
+    virtual void set_antenna(const std::string &ant, size_t chan) = 0;
+
+    /*!
+     * Get the antenna in use.
+     * \param chan the channel index 0 to N-1
+     * \return the antenna string
+     */
+    virtual std::string get_antenna(size_t chan) = 0;
+
+    /*!
+     * Get a list of possible antennas.
+     * \param chan the channel index 0 to N-1
+     * \return a vector of antenna strings
+     */
+    virtual std::vector<std::string> get_antennas(size_t chan) = 0;
+
+    /*!
+     * Set the subdevice bandpass filter.
+     * \param bandwidth the filter bandwidth in Hz
+     * \param chan the channel index 0 to N-1
+     */
+    virtual void set_bandwidth(double bandwidth, size_t chan) = 0;
+
+    /*!
+     * Set the clock configuration.
+     * \param clock_config the new configuration
+     * \param mboard the motherboard index 0 to M-1
+     */
+    virtual void set_clock_config(const uhd::clock_config_t &clock_config, size_t mboard) = 0;
+
+    /*!
+     * Get the current time registers.
+     * \return the current usrp time
+     */
+    virtual uhd::time_spec_t get_time_now(void) = 0;
+
+    /*!
+     * Set the time registers at the next pps.
+     * \param time_spec the new time
+     */
+    virtual void set_time_next_pps(const uhd::time_spec_t &time_spec) = 0;
+
+    /*!
+     * Sync the time registers with an unknown pps edge.
+     * \param time_spec the new time
+     */
+    virtual void set_time_unknown_pps(const uhd::time_spec_t &time_spec) = 0;
+
+    /*!
+     * Get access to the underlying uhd device object.
+     * \return the multi usrp device object
+     */
+    virtual uhd::usrp::multi_usrp::sptr get_device(void) = 0;
+};
+
+#endif /* INCLUDED_UHD_MULTI_USRP_SOURCE_H */
diff --git a/gr-uhd/lib/uhd_simple_sink.cc b/gr-uhd/lib/uhd_simple_sink.cc
index 7b31218db..d7b04465d 100644
--- a/gr-uhd/lib/uhd_simple_sink.cc
+++ b/gr-uhd/lib/uhd_simple_sink.cc
@@ -23,7 +23,7 @@
 #include <uhd_simple_sink.h>
 #include <gr_io_signature.h>
 #include <stdexcept>
-#include "utils.h"
+//#include "utils.h"
 
 /***********************************************************************
  * UHD Sink
@@ -56,7 +56,7 @@ public:
 
     void set_samp_rate(double rate){
         _dev->set_tx_rate(rate);
-        do_samp_rate_error_message(rate, get_samp_rate(), "TX");
+        //do_samp_rate_error_message(rate, get_samp_rate(), "TX");
     }
 
     double get_samp_rate(void){
@@ -65,7 +65,7 @@ public:
 
     uhd::tune_result_t set_center_freq(double freq){
         uhd::tune_result_t tr = _dev->set_tx_freq(freq);
-        do_tune_freq_error_message(freq, _dev->get_tx_freq(), "TX");
+        //do_tune_freq_error_message(freq, _dev->get_tx_freq(), "TX");
         return tr;
     }
 
diff --git a/gr-uhd/lib/uhd_simple_sink.h b/gr-uhd/lib/uhd_simple_sink.h
index 0abf30681..b239e3f21 100644
--- a/gr-uhd/lib/uhd_simple_sink.h
+++ b/gr-uhd/lib/uhd_simple_sink.h
@@ -33,7 +33,10 @@ boost::shared_ptr<uhd_simple_sink> uhd_make_simple_sink(
     const uhd::io_type_t::tid_t &type
 );
 
-class uhd_simple_sink : public gr_sync_block{
+/***********************************************************************
+ * DEPRECATED
+ **********************************************************************/
+class UHD_DEPRECATED uhd_simple_sink : public gr_sync_block{
 public:
 
     /*!
diff --git a/gr-uhd/lib/uhd_simple_source.cc b/gr-uhd/lib/uhd_simple_source.cc
index c1e11e85d..d74c8414d 100644
--- a/gr-uhd/lib/uhd_simple_source.cc
+++ b/gr-uhd/lib/uhd_simple_source.cc
@@ -25,7 +25,7 @@
 #include <stdexcept>
 #include <iostream>
 #include <boost/format.hpp>
-#include "utils.h"
+//#include "utils.h"
 
 /***********************************************************************
  * UHD Source
@@ -59,7 +59,7 @@ public:
 
     void set_samp_rate(double rate){
         _dev->set_rx_rate(rate);
-        do_samp_rate_error_message(rate, get_samp_rate(), "RX");
+        //do_samp_rate_error_message(rate, get_samp_rate(), "RX");
     }
 
     double get_samp_rate(void){
@@ -68,7 +68,7 @@ public:
 
     uhd::tune_result_t set_center_freq(double freq){
         uhd::tune_result_t tr = _dev->set_rx_freq(freq);
-        do_tune_freq_error_message(freq, _dev->get_rx_freq(), "RX");
+        //do_tune_freq_error_message(freq, _dev->get_rx_freq(), "RX");
         return tr;
     }
 
diff --git a/gr-uhd/lib/uhd_simple_source.h b/gr-uhd/lib/uhd_simple_source.h
index b95c0cfd9..c524a024a 100644
--- a/gr-uhd/lib/uhd_simple_source.h
+++ b/gr-uhd/lib/uhd_simple_source.h
@@ -33,7 +33,10 @@ boost::shared_ptr<uhd_simple_source> uhd_make_simple_source(
     const uhd::io_type_t::tid_t &type
 );
 
-class uhd_simple_source : public gr_sync_block{
+/***********************************************************************
+ * DEPRECATED
+ **********************************************************************/
+class UHD_DEPRECATED uhd_simple_source : public gr_sync_block{
 public:
 
     /*!
diff --git a/gr-uhd/lib/uhd_single_usrp_sink.cc b/gr-uhd/lib/uhd_single_usrp_sink.cc
index 96f86c8db..622f506b5 100644
--- a/gr-uhd/lib/uhd_single_usrp_sink.cc
+++ b/gr-uhd/lib/uhd_single_usrp_sink.cc
@@ -22,10 +22,9 @@
 #include <uhd_single_usrp_sink.h>
 #include <gr_io_signature.h>
 #include <stdexcept>
-#include "utils.h"
 
 /***********************************************************************
- * UHD Single USPR Sink
+ * UHD Single USRP Sink
  **********************************************************************/
 uhd_single_usrp_sink::uhd_single_usrp_sink(gr_io_signature_sptr sig)
 :gr_sync_block("uhd single usrp sink", sig, gr_make_io_signature(0, 0, 0)){
@@ -33,21 +32,22 @@ uhd_single_usrp_sink::uhd_single_usrp_sink(gr_io_signature_sptr sig)
 }
 
 /***********************************************************************
- * UHD Single USPR Sink Impl
+ * UHD Single USRP Sink Impl
  **********************************************************************/
 class uhd_single_usrp_sink_impl : public uhd_single_usrp_sink{
 public:
     uhd_single_usrp_sink_impl(
-        const std::string &args,
-        const uhd::io_type_t &type,
+        const std::string &device_addr,
+        const uhd::io_type_t &io_type,
         size_t num_channels
-    ) : uhd_single_usrp_sink(gr_make_io_signature(num_channels, num_channels, type.size)), _type(type), _nchan(num_channels)
+    ):
+        uhd_single_usrp_sink(gr_make_io_signature(
+            num_channels, num_channels, io_type.size
+        )),
+        _type(io_type),
+        _nchan(num_channels)
     {
-        _dev = uhd::usrp::single_usrp::make(args);
-    }
-
-    ~uhd_single_usrp_sink_impl(void){
-        //NOP
+        _dev = uhd::usrp::single_usrp::make(device_addr);
     }
 
     void set_subdev_spec(const std::string &spec){
@@ -56,17 +56,16 @@ public:
 
     void set_samp_rate(double rate){
         _dev->set_tx_rate(rate);
-        do_samp_rate_error_message(rate, get_samp_rate(), "TX");
     }
 
     double get_samp_rate(void){
         return _dev->get_tx_rate();
     }
 
-    uhd::tune_result_t set_center_freq(double freq, size_t chan){
-        uhd::tune_result_t tr = _dev->set_tx_freq(freq, chan);
-        do_tune_freq_error_message(freq, _dev->get_tx_freq(chan), "TX");
-        return tr;
+    uhd::tune_result_t set_center_freq(
+        const uhd::tune_request_t tune_request, size_t chan
+    ){
+        return _dev->set_tx_freq(tune_request, chan);
     }
 
     uhd::freq_range_t get_freq_range(size_t chan){
@@ -97,6 +96,10 @@ public:
         return _dev->get_tx_antennas(chan);
     }
 
+    void set_bandwidth(double bandwidth, size_t chan){
+        return _dev->set_tx_bandwidth(bandwidth, chan);
+    }
+
     void set_clock_config(const uhd::clock_config_t &clock_config){
         return _dev->set_clock_config(clock_config);
     }
@@ -167,14 +170,14 @@ protected:
 };
 
 /***********************************************************************
- * Make UHD Single USPR Sink
+ * Make UHD Single USRP Sink
  **********************************************************************/
 boost::shared_ptr<uhd_single_usrp_sink> uhd_make_single_usrp_sink(
-    const std::string &args,
-    const uhd::io_type_t::tid_t &type,
+    const std::string &device_addr,
+    const uhd::io_type_t::tid_t &io_type,
     size_t num_channels
 ){
     return boost::shared_ptr<uhd_single_usrp_sink>(
-        new uhd_single_usrp_sink_impl(args, type, num_channels)
+        new uhd_single_usrp_sink_impl(device_addr, io_type, num_channels)
     );
 }
diff --git a/gr-uhd/lib/uhd_single_usrp_sink.h b/gr-uhd/lib/uhd_single_usrp_sink.h
index bec788193..a4c4e6452 100644
--- a/gr-uhd/lib/uhd_single_usrp_sink.h
+++ b/gr-uhd/lib/uhd_single_usrp_sink.h
@@ -28,8 +28,8 @@
 class uhd_single_usrp_sink;
 
 boost::shared_ptr<uhd_single_usrp_sink> uhd_make_single_usrp_sink(
-    const std::string &args,
-    const uhd::io_type_t::tid_t &type,
+    const std::string &device_addr,
+    const uhd::io_type_t::tid_t &io_type,
     size_t num_channels = 1
 );
 
@@ -63,13 +63,29 @@ public:
 
     /*!
      * Tune the usrp device to the desired center frequency.
+     * \param tune_request the tune request instructions
+     * \param chan the channel index 0 to N-1
+     * \return a tune result with the actual frequencies
+     */
+    virtual uhd::tune_result_t set_center_freq(
+        const uhd::tune_request_t tune_request, size_t chan
+    ) = 0;
+
+    /*!
+     * Tune the usrp device to the desired center frequency.
+     * This is a wrapper around set center freq so that in this case,
+     * the user can pass a single frequency in the call through swig.
      * \param freq the desired frequency in Hz
+     * \param chan the channel index 0 to N-1
      * \return a tune result with the actual frequencies
      */
-    virtual uhd::tune_result_t set_center_freq(double freq, size_t chan = 0) = 0;
+    uhd::tune_result_t set_center_freq(double freq, size_t chan){
+        return set_center_freq(uhd::tune_request_t(freq), chan);
+    }
 
     /*!
      * Get the tunable frequency range.
+     * \param chan the channel index 0 to N-1
      * \return the frequency range in Hz
      */
     virtual uhd::freq_range_t get_freq_range(size_t chan = 0) = 0;
@@ -77,17 +93,20 @@ public:
     /*!
      * Set the gain for the dboard.
      * \param gain the gain in dB
+     * \param chan the channel index 0 to N-1
      */
     virtual void set_gain(float gain, size_t chan = 0) = 0;
 
     /*!
      * Get the actual dboard gain setting.
+     * \param chan the channel index 0 to N-1
      * \return the actual gain in dB
      */
     virtual float get_gain(size_t chan = 0) = 0;
 
     /*!
      * Get the settable gain range.
+     * \param chan the channel index 0 to N-1
      * \return the gain range in dB
      */
     virtual uhd::gain_range_t get_gain_range(size_t chan = 0) = 0;
@@ -95,22 +114,32 @@ public:
     /*!
      * Set the antenna to use.
      * \param ant the antenna string
+     * \param chan the channel index 0 to N-1
      */
     virtual void set_antenna(const std::string &ant, size_t chan = 0) = 0;
 
     /*!
      * Get the antenna in use.
+     * \param chan the channel index 0 to N-1
      * \return the antenna string
      */
     virtual std::string get_antenna(size_t chan = 0) = 0;
 
     /*!
      * Get a list of possible antennas.
+     * \param chan the channel index 0 to N-1
      * \return a vector of antenna strings
      */
     virtual std::vector<std::string> get_antennas(size_t chan = 0) = 0;
 
     /*!
+     * Set the subdevice bandpass filter.
+     * \param bandwidth the filter bandwidth in Hz
+     * \param chan the channel index 0 to N-1
+     */
+    virtual void set_bandwidth(double bandwidth, size_t chan = 0) = 0;
+
+    /*!
      * Set the clock configuration.
      * \param clock_config the new configuration
      */
diff --git a/gr-uhd/lib/uhd_single_usrp_source.cc b/gr-uhd/lib/uhd_single_usrp_source.cc
index b5e39b5a4..907e8be54 100644
--- a/gr-uhd/lib/uhd_single_usrp_source.cc
+++ b/gr-uhd/lib/uhd_single_usrp_source.cc
@@ -24,10 +24,9 @@
 #include <stdexcept>
 #include <iostream>
 #include <boost/format.hpp>
-#include "utils.h"
 
 /***********************************************************************
- * UHD Single USPR Source
+ * UHD Single USRP Source
  **********************************************************************/
 uhd_single_usrp_source::uhd_single_usrp_source(gr_io_signature_sptr sig)
 :gr_sync_block("uhd single_usrp source", gr_make_io_signature(0, 0, 0), sig){
@@ -35,17 +34,21 @@ uhd_single_usrp_source::uhd_single_usrp_source(gr_io_signature_sptr sig)
 }
 
 /***********************************************************************
- * UHD Single USPR Source Impl
+ * UHD Single USRP Source Impl
  **********************************************************************/
 class uhd_single_usrp_source_impl : public uhd_single_usrp_source{
 public:
     uhd_single_usrp_source_impl(
-        const std::string &args,
-        const uhd::io_type_t &type,
+        const std::string &device_addr,
+        const uhd::io_type_t &io_type,
         size_t num_channels
-    ) : uhd_single_usrp_source(gr_make_io_signature(num_channels, num_channels, type.size)), _type(type)
+    ):
+        uhd_single_usrp_source(gr_make_io_signature(
+            num_channels, num_channels, io_type.size
+        )),
+        _type(io_type)
     {
-        _dev = uhd::usrp::single_usrp::make(args);
+        _dev = uhd::usrp::single_usrp::make(device_addr);
     }
 
     void set_subdev_spec(const std::string &spec){
@@ -54,17 +57,16 @@ public:
 
     void set_samp_rate(double rate){
         _dev->set_rx_rate(rate);
-        do_samp_rate_error_message(rate, get_samp_rate(), "RX");
     }
 
     double get_samp_rate(void){
         return _dev->get_rx_rate();
     }
 
-    uhd::tune_result_t set_center_freq(double freq, size_t chan){
-        uhd::tune_result_t tr = _dev->set_rx_freq(freq, chan);
-        do_tune_freq_error_message(freq, _dev->get_rx_freq(chan), "RX");
-        return tr;
+    uhd::tune_result_t set_center_freq(
+        const uhd::tune_request_t tune_request, size_t chan
+    ){
+        return _dev->set_rx_freq(tune_request, chan);
     }
 
     uhd::freq_range_t get_freq_range(size_t chan){
@@ -95,6 +97,10 @@ public:
         return _dev->get_rx_antennas(chan);
     }
 
+    void set_bandwidth(double bandwidth, size_t chan){
+        return _dev->set_rx_bandwidth(bandwidth, chan);
+    }
+
     void set_clock_config(const uhd::clock_config_t &clock_config){
         return _dev->set_clock_config(clock_config);
     }
@@ -163,14 +169,14 @@ private:
 
 
 /***********************************************************************
- * Make UHD Single USPR Source
+ * Make UHD Single USRP Source
  **********************************************************************/
 boost::shared_ptr<uhd_single_usrp_source> uhd_make_single_usrp_source(
-    const std::string &args,
-    const uhd::io_type_t::tid_t &type,
+    const std::string &device_addr,
+    const uhd::io_type_t::tid_t &io_type,
     size_t num_channels
 ){
     return boost::shared_ptr<uhd_single_usrp_source>(
-        new uhd_single_usrp_source_impl(args, type, num_channels)
+        new uhd_single_usrp_source_impl(device_addr, io_type, num_channels)
     );
 }
diff --git a/gr-uhd/lib/uhd_single_usrp_source.h b/gr-uhd/lib/uhd_single_usrp_source.h
index 196b7c675..495f8c611 100644
--- a/gr-uhd/lib/uhd_single_usrp_source.h
+++ b/gr-uhd/lib/uhd_single_usrp_source.h
@@ -28,8 +28,8 @@
 class uhd_single_usrp_source;
 
 boost::shared_ptr<uhd_single_usrp_source> uhd_make_single_usrp_source(
-    const std::string &args,
-    const uhd::io_type_t::tid_t &type,
+    const std::string &device_addr,
+    const uhd::io_type_t::tid_t &io_type,
     size_t num_channels = 1
 );
 
@@ -63,13 +63,29 @@ public:
 
     /*!
      * Tune the usrp device to the desired center frequency.
+     * \param tune_request the tune request instructions
+     * \param chan the channel index 0 to N-1
+     * \return a tune result with the actual frequencies
+     */
+    virtual uhd::tune_result_t set_center_freq(
+        const uhd::tune_request_t tune_request, size_t chan
+    ) = 0;
+
+    /*!
+     * Tune the usrp device to the desired center frequency.
+     * This is a wrapper around set center freq so that in this case,
+     * the user can pass a single frequency in the call through swig.
      * \param freq the desired frequency in Hz
+     * \param chan the channel index 0 to N-1
      * \return a tune result with the actual frequencies
      */
-    virtual uhd::tune_result_t set_center_freq(double freq, size_t chan = 0) = 0;
+    uhd::tune_result_t set_center_freq(double freq, size_t chan){
+        return set_center_freq(uhd::tune_request_t(freq), chan);
+    }
 
     /*!
      * Get the tunable frequency range.
+     * \param chan the channel index 0 to N-1
      * \return the frequency range in Hz
      */
     virtual uhd::freq_range_t get_freq_range(size_t chan = 0) = 0;
@@ -77,17 +93,20 @@ public:
     /*!
      * Set the gain for the dboard.
      * \param gain the gain in dB
+     * \param chan the channel index 0 to N-1
      */
     virtual void set_gain(float gain, size_t chan = 0) = 0;
 
     /*!
      * Get the actual dboard gain setting.
+     * \param chan the channel index 0 to N-1
      * \return the actual gain in dB
      */
     virtual float get_gain(size_t chan = 0) = 0;
 
     /*!
      * Get the settable gain range.
+     * \param chan the channel index 0 to N-1
      * \return the gain range in dB
      */
     virtual uhd::gain_range_t get_gain_range(size_t chan = 0) = 0;
@@ -95,22 +114,32 @@ public:
     /*!
      * Set the antenna to use.
      * \param ant the antenna string
+     * \param chan the channel index 0 to N-1
      */
     virtual void set_antenna(const std::string &ant, size_t chan = 0) = 0;
 
     /*!
      * Get the antenna in use.
+     * \param chan the channel index 0 to N-1
      * \return the antenna string
      */
     virtual std::string get_antenna(size_t chan = 0) = 0;
 
     /*!
      * Get a list of possible antennas.
+     * \param chan the channel index 0 to N-1
      * \return a vector of antenna strings
      */
     virtual std::vector<std::string> get_antennas(size_t chan = 0) = 0;
 
     /*!
+     * Set the subdevice bandpass filter.
+     * \param bandwidth the filter bandwidth in Hz
+     * \param chan the channel index 0 to N-1
+     */
+    virtual void set_bandwidth(double bandwidth, size_t chan = 0) = 0;
+
+    /*!
      * Set the clock configuration.
      * \param clock_config the new configuration
      */
diff --git a/gr-uhd/lib/utils.cc b/gr-uhd/lib/utils.cc
deleted file mode 100644
index da8352965..000000000
--- a/gr-uhd/lib/utils.cc
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2010 Free Software Foundation, Inc.
- * 
- * This file is part of GNU Radio
- * 
- * GNU Radio 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 3, or (at your option)
- * any later version.
- * 
- * GNU Radio 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 GNU Radio; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "utils.h" //local include
-#include <uhd/utils/warning.hpp>
-#include <boost/format.hpp>
-#include <cmath>
-
-void do_samp_rate_error_message(
-    double target_rate,
-    double actual_rate,
-    const std::string &xx
-){
-    static const double max_allowed_error = 1.0; //Sps
-    if (std::abs(target_rate - actual_rate) > max_allowed_error){
-        uhd::print_warning(str(boost::format(
-            "The hardware does not support the requested %s sample rate:\n"
-            "Target sample rate: %f MSps\n"
-            "Actual sample rate: %f MSps\n"
-        ) % xx % (target_rate/1e6) % (actual_rate/1e6)));
-    }
-}
-
-void do_tune_freq_error_message(
-    double target_freq,
-    double actual_freq,
-    const std::string &xx
-){
-    static const double max_allowed_error = 1.0; //Hz
-    if (std::abs(target_freq - actual_freq) > max_allowed_error){
-        uhd::print_warning(str(boost::format(
-            "The hardware does not support the requested %s frequency:\n"
-            "Target frequency: %f MHz\n"
-            "Actual frequency: %f MHz\n"
-        ) % xx % (target_freq/1e6) % (actual_freq/1e6)));
-    }
-}
diff --git a/gr-uhd/lib/utils.h b/gr-uhd/lib/utils.h
deleted file mode 100644
index 4a05476bd..000000000
--- a/gr-uhd/lib/utils.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2010 Free Software Foundation, Inc.
- * 
- * This file is part of GNU Radio
- * 
- * GNU Radio 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 3, or (at your option)
- * any later version.
- * 
- * GNU Radio 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 GNU Radio; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_NOINST_UTILS_H
-#define INCLUDED_NOINST_UTILS_H
-
-#include <string>
-
-void do_samp_rate_error_message(
-    double target_rate,
-    double actual_rate,
-    const std::string &xx
-);
-
-void do_tune_freq_error_message(
-    double target_freq,
-    double actual_freq,
-    const std::string &xx
-);
-
-#endif /* INCLUDED_NOINST_UTILS_H */