10 files changed, 106 insertions, 1198 deletions
diff --git a/gr-uhd/lib/Makefile.am b/gr-uhd/lib/Makefile.am
index 7ddb45cb3a..d93b243e23 100644
--- a/gr-uhd/lib/Makefile.am
+++ b/gr-uhd/lib/Makefile.am
@@ -24,15 +24,14 @@ include $(top_srcdir)/Makefile.common
 AM_CPPFLAGS = \
 	$(STD_DEFINES_AND_INCLUDES) \
 	$(WITH_INCLUDES) \
-	$(UHD_CPPFLAGS)
+	$(UHD_CPPFLAGS) \
+	-Dgnuradio_uhd_EXPORTS
 
 lib_LTLIBRARIES = libgnuradio-uhd.la
 
 libgnuradio_uhd_la_SOURCES = \
-	uhd_multi_usrp_source.cc \
-	uhd_multi_usrp_sink.cc \
-	uhd_single_usrp_source.cc \
-	uhd_single_usrp_sink.cc
+	gr_uhd_usrp_source.cc \
+	gr_uhd_usrp_sink.cc
 
 libgnuradio_uhd_la_LIBADD = \
 	$(GNURADIO_CORE_LA) \
@@ -40,11 +39,4 @@ libgnuradio_uhd_la_LIBADD = \
 
 libgnuradio_uhd_la_LDFLAGS = $(LTVERSIONFLAGS)
 
-grinclude_HEADERS = \
-	gr_uhd_api.h \
-	uhd_multi_usrp_source.h \
-	uhd_multi_usrp_sink.h \
-	uhd_single_usrp_source.h \
-	uhd_single_usrp_sink.h
-
 noinst_HEADERS =
diff --git a/gr-uhd/lib/gr_uhd_api.h b/gr-uhd/lib/gr_uhd_api.h
deleted file mode 100644
index a9b99fd87e..0000000000
--- a/gr-uhd/lib/gr_uhd_api.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2011 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_GR_UHD_API_H
-#define INCLUDED_GR_UHD_API_H
-
-#include <uhd/config.hpp>
-
-#ifdef gnuradio_uhd_EXPORTS
-#  define GR_UHD_API UHD_EXPORT
-#else
-#  define GR_UHD_API UHD_EXPORT
-#endif
-
-#endif /* INCLUDED_GR_UHD_API_H */
diff --git a/gr-uhd/lib/uhd_multi_usrp_sink.cc b/gr-uhd/lib/gr_uhd_usrp_sink.cc
index 32039e44ad..4598e54c27 100644
--- a/gr-uhd/lib/uhd_multi_usrp_sink.cc
+++ b/gr-uhd/lib/gr_uhd_usrp_sink.cc
@@ -19,29 +19,29 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <uhd_multi_usrp_sink.h>
+#include <gr_uhd_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)){
+uhd_usrp_sink::uhd_usrp_sink(gr_io_signature_sptr sig)
+:gr_sync_block("gr uhd 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{
+class uhd_usrp_sink_impl : public uhd_usrp_sink{
 public:
-    uhd_multi_usrp_sink_impl(
+    uhd_usrp_sink_impl(
         const uhd::device_addr_t &device_addr,
         const uhd::io_type_t &io_type,
         size_t num_channels
     ):
-        uhd_multi_usrp_sink(gr_make_io_signature(
+        uhd_usrp_sink(gr_make_io_signature(
             num_channels, num_channels, io_type.size
         )),
         _type(io_type),
@@ -69,6 +69,10 @@ public:
         return _dev->set_tx_freq(tune_request, chan);
     }
 
+    double get_center_freq(size_t chan){
+        return _dev->get_tx_freq(chan);
+    }
+
     uhd::freq_range_t get_freq_range(size_t chan){
         return _dev->get_tx_freq_range(chan);
     }
@@ -101,12 +105,44 @@ public:
         return _dev->set_tx_bandwidth(bandwidth, chan);
     }
 
+    uhd::sensor_value_t get_dboard_sensor(const std::string &name, size_t chan){
+        return _dev->get_tx_sensor(name, chan);
+    }
+
+    std::vector<std::string> get_dboard_sensor_names(size_t chan){
+        return _dev->get_tx_sensor_names(chan);
+    }
+
+    uhd::sensor_value_t get_mboard_sensor(const std::string &name, size_t mboard){
+        return _dev->get_mboard_sensor(name, mboard);
+    }
+
+    std::vector<std::string> get_mboard_sensor_names(size_t mboard){
+        return _dev->get_mboard_sensor_names(mboard);
+    }
+
     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();
+    double get_clock_rate(size_t mboard){
+        return _dev->get_master_clock_rate(mboard);
+    }
+
+    void set_clock_rate(double rate, size_t mboard){
+        return _dev->set_master_clock_rate(rate, mboard);
+    }
+
+    uhd::time_spec_t get_time_now(size_t mboard = 0){
+        return _dev->get_time_now(mboard);
+    }
+
+    uhd::time_spec_t get_time_last_pps(size_t mboard){
+        return _dev->get_time_last_pps(mboard);
+    }
+
+    void set_time_now(const uhd::time_spec_t &time_spec, size_t mboard){
+        return _dev->set_time_now(time_spec, mboard);
     }
 
     void set_time_next_pps(const uhd::time_spec_t &time_spec){
@@ -117,6 +153,10 @@ public:
         return _dev->set_time_unknown_pps(time_spec);
     }
 
+    uhd::usrp::dboard_iface::sptr get_dboard_iface(size_t chan){
+        return _dev->get_tx_dboard_iface(chan);
+    }
+
     uhd::usrp::multi_usrp::sptr get_device(void){
         return _dev;
     }
@@ -184,12 +224,12 @@ protected:
 /***********************************************************************
  * Make UHD Multi USRP Sink
  **********************************************************************/
-boost::shared_ptr<uhd_multi_usrp_sink> uhd_make_multi_usrp_sink(
+boost::shared_ptr<uhd_usrp_sink> uhd_make_usrp_sink(
     const uhd::device_addr_t &device_addr,
     const uhd::io_type_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)
+    return boost::shared_ptr<uhd_usrp_sink>(
+        new uhd_usrp_sink_impl(device_addr, io_type, num_channels)
     );
 }
diff --git a/gr-uhd/lib/uhd_multi_usrp_source.cc b/gr-uhd/lib/gr_uhd_usrp_source.cc
index 181cf1eb46..09cced567d 100644
--- a/gr-uhd/lib/uhd_multi_usrp_source.cc
+++ b/gr-uhd/lib/gr_uhd_usrp_source.cc
@@ -19,7 +19,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <uhd_multi_usrp_source.h>
+#include <gr_uhd_usrp_source.h>
 #include <gr_io_signature.h>
 #include <stdexcept>
 #include <iostream>
@@ -28,22 +28,22 @@
 /***********************************************************************
  * 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){
+uhd_usrp_source::uhd_usrp_source(gr_io_signature_sptr sig)
+:gr_sync_block("gr uhd 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{
+class uhd_usrp_source_impl : public uhd_usrp_source{
 public:
-    uhd_multi_usrp_source_impl(
+    uhd_usrp_source_impl(
         const uhd::device_addr_t &device_addr,
         const uhd::io_type_t &io_type,
         size_t num_channels
     ):
-        uhd_multi_usrp_source(gr_make_io_signature(
+        uhd_usrp_source(gr_make_io_signature(
             num_channels, num_channels, io_type.size
         )),
         _type(io_type)
@@ -69,6 +69,10 @@ public:
         return _dev->set_rx_freq(tune_request, chan);
     }
 
+    double get_center_freq(size_t chan){
+        return _dev->get_rx_freq(chan);
+    }
+
     uhd::freq_range_t get_freq_range(size_t chan){
         return _dev->get_rx_freq_range(chan);
     }
@@ -101,12 +105,44 @@ public:
         return _dev->set_rx_bandwidth(bandwidth, chan);
     }
 
+    uhd::sensor_value_t get_dboard_sensor(const std::string &name, size_t chan){
+        return _dev->get_rx_sensor(name, chan);
+    }
+
+    std::vector<std::string> get_dboard_sensor_names(size_t chan){
+        return _dev->get_rx_sensor_names(chan);
+    }
+
+    uhd::sensor_value_t get_mboard_sensor(const std::string &name, size_t mboard){
+        return _dev->get_mboard_sensor(name, mboard);
+    }
+
+    std::vector<std::string> get_mboard_sensor_names(size_t mboard){
+        return _dev->get_mboard_sensor_names(mboard);
+    }
+
     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();
+    double get_clock_rate(size_t mboard){
+        return _dev->get_master_clock_rate(mboard);
+    }
+
+    void set_clock_rate(double rate, size_t mboard){
+        return _dev->set_master_clock_rate(rate, mboard);
+    }
+
+    uhd::time_spec_t get_time_now(size_t mboard = 0){
+        return _dev->get_time_now(mboard);
+    }
+
+    uhd::time_spec_t get_time_last_pps(size_t mboard){
+        return _dev->get_time_last_pps(mboard);
+    }
+
+    void set_time_now(const uhd::time_spec_t &time_spec, size_t mboard){
+        return _dev->set_time_now(time_spec, mboard);
     }
 
     void set_time_next_pps(const uhd::time_spec_t &time_spec){
@@ -117,6 +153,10 @@ public:
         return _dev->set_time_unknown_pps(time_spec);
     }
 
+    uhd::usrp::dboard_iface::sptr get_dboard_iface(size_t chan){
+        return _dev->get_rx_dboard_iface(chan);
+    }
+
     uhd::usrp::multi_usrp::sptr get_device(void){
         return _dev;
     }
@@ -176,12 +216,12 @@ private:
 /***********************************************************************
  * Make UHD Multi USRP Source
  **********************************************************************/
-boost::shared_ptr<uhd_multi_usrp_source> uhd_make_multi_usrp_source(
+boost::shared_ptr<uhd_usrp_source> uhd_make_usrp_source(
     const uhd::device_addr_t &device_addr,
     const uhd::io_type_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)
+    return boost::shared_ptr<uhd_usrp_source>(
+        new uhd_usrp_source_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
deleted file mode 100644
index 4866f2cbb5..0000000000
--- a/gr-uhd/lib/uhd_multi_usrp_sink.h
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Copyright 2010-2011 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_uhd_api.h>
-#include <gr_sync_block.h>
-#include <uhd/usrp/multi_usrp.hpp>
-
-class uhd_multi_usrp_sink;
-
-GR_UHD_API boost::shared_ptr<uhd_multi_usrp_sink> uhd_make_multi_usrp_sink(
-    const uhd::device_addr_t &device_addr,
-    const uhd::io_type_t &io_type,
-    size_t num_channels
-);
-
-class GR_UHD_API 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(double 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 double 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.h b/gr-uhd/lib/uhd_multi_usrp_source.h
deleted file mode 100644
index 9cbec52aad..0000000000
--- a/gr-uhd/lib/uhd_multi_usrp_source.h
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Copyright 2010-2011 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_uhd_api.h>
-#include <gr_sync_block.h>
-#include <uhd/usrp/multi_usrp.hpp>
-
-class uhd_multi_usrp_source;
-
-GR_UHD_API boost::shared_ptr<uhd_multi_usrp_source> uhd_make_multi_usrp_source(
-    const uhd::device_addr_t &device_addr,
-    const uhd::io_type_t &io_type,
-    size_t num_channels
-);
-
-class GR_UHD_API 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(double 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 double 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_single_usrp_sink.cc b/gr-uhd/lib/uhd_single_usrp_sink.cc
deleted file mode 100644
index d9aaac893b..0000000000
--- a/gr-uhd/lib/uhd_single_usrp_sink.cc
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Copyright 2010-2011 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_single_usrp_sink.h>
-#include <gr_io_signature.h>
-#include <stdexcept>
-
-/***********************************************************************
- * 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)){
-    /* NOP */
-}
-
-/***********************************************************************
- * UHD Single USRP Sink Impl
- **********************************************************************/
-class uhd_single_usrp_sink_impl : public uhd_single_usrp_sink{
-public:
-    uhd_single_usrp_sink_impl(
-        const uhd::device_addr_t &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, io_type.size
-        )),
-        _type(io_type),
-        _nchan(num_channels)
-    {
-        _dev = uhd::usrp::single_usrp::make(device_addr);
-    }
-
-    void set_subdev_spec(const std::string &spec){
-        return _dev->set_tx_subdev_spec(spec);
-    }
-
-    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(double gain, size_t chan){
-        return _dev->set_tx_gain(gain, chan);
-    }
-
-    double 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){
-        return _dev->set_clock_config(clock_config);
-    }
-
-    uhd::time_spec_t get_time_now(void){
-        return _dev->get_time_now();
-    }
-
-    void set_time_now(const uhd::time_spec_t &time_spec){
-        return _dev->set_time_now(time_spec);
-    }
-
-    void set_time_next_pps(const uhd::time_spec_t &time_spec){
-        return _dev->set_time_next_pps(time_spec);
-    }
-
-    uhd::usrp::single_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; //send a mid-burst packet
-
-        return _dev->get_device()->send(
-            input_items, noutput_items, metadata,
-            _type, uhd::device::SEND_MODE_FULL_BUFF
-        );
-    }
-
-    //Send an empty start-of-burst packet to begin streaming.
-    //This is not necessary since all packets are marked SOB.
-    bool start(void){
-        uhd::tx_metadata_t metadata;
-        metadata.start_of_burst = true;
-
-        _dev->get_device()->send(
-            gr_vector_const_void_star(_nchan), 0, metadata,
-            _type, uhd::device::SEND_MODE_ONE_PACKET
-        );
-        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
-        );
-        return true;
-    }
-
-protected:
-    uhd::usrp::single_usrp::sptr _dev;
-    const uhd::io_type_t _type;
-    size_t _nchan;
-};
-
-/***********************************************************************
- * Make UHD Single USRP Sink
- **********************************************************************/
-boost::shared_ptr<uhd_single_usrp_sink> uhd_make_single_usrp_sink(
-    const uhd::device_addr_t &device_addr,
-    const uhd::io_type_t &io_type,
-    size_t num_channels
-){
-    return boost::shared_ptr<uhd_single_usrp_sink>(
-        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
deleted file mode 100644
index 4929d0f135..0000000000
--- a/gr-uhd/lib/uhd_single_usrp_sink.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Copyright 2010-2011 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_SINGLE_USRP_SINK_H
-#define INCLUDED_UHD_SINGLE_USRP_SINK_H
-
-#include <gr_uhd_api.h>
-#include <gr_sync_block.h>
-#include <uhd/usrp/single_usrp.hpp>
-
-class uhd_single_usrp_sink;
-
-GR_UHD_API boost::shared_ptr<uhd_single_usrp_sink> uhd_make_single_usrp_sink(
-    const uhd::device_addr_t &device_addr,
-    const uhd::io_type_t &io_type,
-    size_t num_channels = 1
-);
-
-class GR_UHD_API uhd_single_usrp_sink : public gr_sync_block{
-public:
-
-    /*!
-     * Set the IO signature for this block.
-     * \param sig the input signature
-     */
-    uhd_single_usrp_sink(gr_io_signature_sptr sig);
-
-    /*!
-     * Set the subdevice specification.
-     * \param spec the subdev spec markup string
-     */
-    virtual void set_subdev_spec(const std::string &spec) = 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) = 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(double 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 double 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;
-
-    /*!
-     * 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
-     */
-    virtual void set_clock_config(const uhd::clock_config_t &clock_config) = 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 asap.
-     * \param time_spec the new time
-     */
-    virtual void set_time_now(const uhd::time_spec_t &time_spec) = 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;
-
-    /*!
-     * Get access to the underlying uhd device object.
-     * \return the single usrp device object
-     */
-    virtual uhd::usrp::single_usrp::sptr get_device(void) = 0;
-};
-
-#endif /* INCLUDED_UHD_SINGLE_USRP_SINK_H */
diff --git a/gr-uhd/lib/uhd_single_usrp_source.cc b/gr-uhd/lib/uhd_single_usrp_source.cc
deleted file mode 100644
index 5a26d44b14..0000000000
--- a/gr-uhd/lib/uhd_single_usrp_source.cc
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- * Copyright 2010-2011 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_single_usrp_source.h>
-#include <gr_io_signature.h>
-#include <stdexcept>
-#include <iostream>
-#include <boost/format.hpp>
-
-/***********************************************************************
- * 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){
-    /* NOP */
-}
-
-/***********************************************************************
- * UHD Single USRP Source Impl
- **********************************************************************/
-class uhd_single_usrp_source_impl : public uhd_single_usrp_source{
-public:
-    uhd_single_usrp_source_impl(
-        const uhd::device_addr_t &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, io_type.size
-        )),
-        _type(io_type)
-    {
-        _dev = uhd::usrp::single_usrp::make(device_addr);
-    }
-
-    void set_subdev_spec(const std::string &spec){
-        return _dev->set_rx_subdev_spec(spec);
-    }
-
-    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(double gain, size_t chan){
-        return _dev->set_rx_gain(gain, chan);
-    }
-
-    double 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){
-        return _dev->set_clock_config(clock_config);
-    }
-
-    uhd::time_spec_t get_time_now(void){
-        return _dev->get_time_now();
-    }
-
-    void set_time_now(const uhd::time_spec_t &time_spec){
-        return _dev->set_time_now(time_spec);
-    }
-
-    void set_time_next_pps(const uhd::time_spec_t &time_spec){
-        return _dev->set_time_next_pps(time_spec);
-    }
-
-    uhd::usrp::single_usrp::sptr get_device(void){
-        return _dev;
-    }
-
-/***********************************************************************
- * Work
- **********************************************************************/
-    virtual 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
-        );
-
-        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){
-        _dev->issue_stream_cmd(uhd::stream_cmd_t::STREAM_MODE_START_CONTINUOUS);
-        return true;
-    }
-
-    bool stop(void){
-        _dev->issue_stream_cmd(uhd::stream_cmd_t::STREAM_MODE_STOP_CONTINUOUS);
-        return true;
-    }
-
-protected:
-    uhd::usrp::single_usrp::sptr _dev;
-    const uhd::io_type_t _type;
-};
-
-/***********************************************************************
- * UHD Single USRP Source Impl with Tags
- **********************************************************************/
-class uhd_single_usrp_source_impl_with_tags : public uhd_single_usrp_source_impl{
-public:
-    uhd_single_usrp_source_impl_with_tags(
-        const uhd::device_addr_t &device_addr,
-        const uhd::io_type_t &io_type,
-        size_t num_channels
-    ):
-        uhd_single_usrp_source_impl(device_addr, io_type, num_channels)
-    {
-        d_tag_srcid = pmt::mp("uhd_single_usrp_source");
-    }
-
-    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
-        );
-
-        switch(metadata.error_code){
-        case uhd::rx_metadata_t::ERROR_CODE_NONE:
-        //FIXME in RECV_MODE_FULL_BUFF we are probably get remainders,
-        //there is no guarantee of has_time_spec, its random
-	  if(metadata.has_time_spec) {
-	    d_tstamp_pair = pmt::mp(pmt::mp(metadata.time_spec.get_full_secs()),
-				    pmt::mp(metadata.time_spec.get_frac_secs()));
-	    add_item_tag(0, nitems_written(0),
-			 //gr_tags::key_time,
-			 pmt::pmt_string_to_symbol("time"),
-			 d_tstamp_pair,
-			 d_tag_srcid);
-	  }
-	  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;
-        }
-    }
-
-private:
-    size_t d_num_packet_samps;
-    pmt::pmt_t d_tstamp_pair;
-    pmt::pmt_t d_tag_srcid;
-};
-
-
-/***********************************************************************
- * Make UHD Single USRP Source
- **********************************************************************/
-#include <gr_prefs.h>
-boost::shared_ptr<uhd_single_usrp_source> uhd_make_single_usrp_source(
-    const uhd::device_addr_t &device_addr,
-    const uhd::io_type_t &io_type,
-    size_t num_channels
-){
-    //use the tags constructor if tags is set to on
-    bool tags_enabled = (gr_prefs().get_string("gr-uhd", "tags", "off") == "on");
-    if (tags_enabled) return boost::shared_ptr<uhd_single_usrp_source>(
-        new uhd_single_usrp_source_impl_with_tags(device_addr, io_type, num_channels)
-    );
-
-    return boost::shared_ptr<uhd_single_usrp_source>(
-        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
deleted file mode 100644
index 262f6696ca..0000000000
--- a/gr-uhd/lib/uhd_single_usrp_source.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Copyright 2010-2011 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_SINGLE_USRP_SOURCE_H
-#define INCLUDED_UHD_SINGLE_USRP_SOURCE_H
-
-#include <gr_uhd_api.h>
-#include <gr_sync_block.h>
-#include <uhd/usrp/single_usrp.hpp>
-
-class uhd_single_usrp_source;
-
-GR_UHD_API boost::shared_ptr<uhd_single_usrp_source> uhd_make_single_usrp_source(
-    const uhd::device_addr_t &device_addr,
-    const uhd::io_type_t &io_type,
-    size_t num_channels = 1
-);
-
-class GR_UHD_API uhd_single_usrp_source : public gr_sync_block{
-public:
-
-    /*!
-     * Set the IO signature for this block.
-     * \param sig the output signature
-     */
-    uhd_single_usrp_source(gr_io_signature_sptr sig);
-
-    /*!
-     * Set the subdevice specification.
-     * \param spec the subdev spec markup string
-     */
-    virtual void set_subdev_spec(const std::string &spec) = 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) = 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(double 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 double 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;
-
-    /*!
-     * 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
-     */
-    virtual void set_clock_config(const uhd::clock_config_t &clock_config) = 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 asap.
-     * \param time_spec the new time
-     */
-    virtual void set_time_now(const uhd::time_spec_t &time_spec) = 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;
-
-    /*!
-     * Get access to the underlying uhd device object.
-     * \return the single usrp device object
-     */
-    virtual uhd::usrp::single_usrp::sptr get_device(void) = 0;
-};
-
-#endif /* INCLUDED_UHD_SINGLE_USRP_SOURCE_H */