Merge branch 'master' into flow_ctrl

33 files changed, 2166 insertions, 718 deletions

diff --git a/host/docs/coding.rst b/host/docs/coding.rst
index d6a19d250..7533445ea 100644
--- a/host/docs/coding.rst
+++ b/host/docs/coding.rst
@@ -41,13 +41,13 @@ The single usrp provides ways to:
 See the documentation in *usrp/single_usrp.hpp* for reference.
 
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-High-Level: The mimo usrp
+High-Level: The multi usrp
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-The mimo usrp API provides a wrapper around a device that represents several motherboards.
+The multi usrp API provides a wrapper around a device that represents several motherboards.
 This API provides convenience calls just like the single usrp,
 however the calls either work across all channels in the configuration,
 or take a channel argument to specify which channel to configure.
-The mimo usrp provides ways to:
+The multi usrp provides ways to:
 
 * Set and get the sample rate across all channels.
 * Issue a stream command across all channels.
@@ -57,7 +57,7 @@ The mimo usrp provides ways to:
 * Tune individual DSPs and daughterboards.
 * Get the underlying device (as discussed above).
 
-See the documentation in *usrp/mimo_usrp.hpp* for reference.
+See the documentation in *usrp/multi_usrp.hpp* for reference.
 
 ------------------------------------------------------------------------
 Integrating custom hardware
diff --git a/host/docs/usrp2.rst b/host/docs/usrp2.rst
index 8fa666a49..181e34223 100644
--- a/host/docs/usrp2.rst
+++ b/host/docs/usrp2.rst
@@ -157,7 +157,7 @@ The value for the addr key is a white-space separated list
 of IPv4 addresses or resolvable hostnames.
 The first address in the list will represent channel 0,
 the second channel 1, and so on...
-Use this addressing scheme with the *mimo_usrp* interface.
+Use this addressing scheme with the *multi_usrp* interface.
 
 The device address string representation for 2 USRP2s with IPv4 addresses 192.168.10.2 and 192.168.20.2
 ::
diff --git a/host/include/uhd/config.hpp b/host/include/uhd/config.hpp
index dacd3a96b..2918c2340 100644
--- a/host/include/uhd/config.hpp
+++ b/host/include/uhd/config.hpp
@@ -31,11 +31,12 @@
 # pragma warning(disable: 4251) // class 'A<T>' needs to have dll-interface to be used by clients of class 'B'
 //# pragma warning(disable: 4127) // conditional expression is constant
 //# pragma warning(disable: 4290) // C++ exception specification ignored except to ...
-# pragma warning(disable: 4180) // qualifier applied to function type has no meaning; ignored
+//# pragma warning(disable: 4180) // qualifier applied to function type has no meaning; ignored
 # pragma warning(disable: 4275) // non dll-interface class ... used as base for dll-interface class ...
 //# pragma warning(disable: 4267) // 'var' : conversion from 'size_t' to 'type', possible loss of data
 //# pragma warning(disable: 4511) // 'class' : copy constructor could not be generated
-# pragma warning(disable: 4250) // 'class' : inherits 'method' via dominance
+//# pragma warning(disable: 4250) // 'class' : inherits 'method' via dominance
+# pragma warning(disable: 4200) // nonstandard extension used : zero-sized array in struct/union
 #endif
 
 // define logical operators
diff --git a/host/include/uhd/types/time_spec.hpp b/host/include/uhd/types/time_spec.hpp
index 59b85f4b7..57d002d48 100644
--- a/host/include/uhd/types/time_spec.hpp
+++ b/host/include/uhd/types/time_spec.hpp
@@ -59,7 +59,7 @@ namespace uhd{
          * \param tick_count the fractional seconds tick count
          * \param tick_rate the number of ticks per second
          */
-        time_spec_t(time_t full_secs, size_t tick_count, double tick_rate);
+        time_spec_t(time_t full_secs, long tick_count, double tick_rate);
 
         /*!
          * Convert the fractional seconds to clock ticks.
@@ -67,7 +67,7 @@ namespace uhd{
          * \param tick_rate the number of ticks per second
          * \return the fractional seconds tick count
          */
-        size_t get_tick_count(double tick_rate) const;
+        long get_tick_count(double tick_rate) const;
 
         /*!
          * Get the time as a real-valued seconds count.
diff --git a/host/include/uhd/usrp/CMakeLists.txt b/host/include/uhd/usrp/CMakeLists.txt
index f973e401a..abddf3951 100644
--- a/host/include/uhd/usrp/CMakeLists.txt
+++ b/host/include/uhd/usrp/CMakeLists.txt
@@ -42,6 +42,7 @@ INSTALL(FILES
     simple_usrp.hpp
     single_usrp.hpp
     mimo_usrp.hpp
+    multi_usrp.hpp
 
     DESTINATION ${INCLUDE_DIR}/uhd/usrp
 )
diff --git a/host/include/uhd/usrp/dboard_id.hpp b/host/include/uhd/usrp/dboard_id.hpp
index 4c45e4334..1fda8182e 100644
--- a/host/include/uhd/usrp/dboard_id.hpp
+++ b/host/include/uhd/usrp/dboard_id.hpp
@@ -67,6 +67,12 @@ namespace uhd{ namespace usrp{
         std::string to_string(void) const;
 
         /*!
+         * Get the dboard id represented as a canonical name.
+         * \return the canonical string representation
+         */
+        std::string to_cname(void) const;
+
+        /*!
          * Get the pretty print representation of this dboard id.
          * \return a string with the dboard name and id number
          */
diff --git a/host/include/uhd/usrp/mimo_usrp.hpp b/host/include/uhd/usrp/mimo_usrp.hpp
index bdd84a148..78833e24e 100644
--- a/host/include/uhd/usrp/mimo_usrp.hpp
+++ b/host/include/uhd/usrp/mimo_usrp.hpp
@@ -32,12 +32,12 @@
 namespace uhd{ namespace usrp{
 
 /*!
- * The MIMO USRP device class:
+ * The MIMO USRP device class (DEPRECATED):
  * A mimo usrp facilitates ease-of-use for multi-usrp scenarios.
  * The wrapper provides convenience functions to control the group
  * of underlying devices as if they consisted of a single device.
  */
-class UHD_API mimo_usrp : boost::noncopyable{
+class UHD_API UHD_DEPRECATED mimo_usrp : boost::noncopyable{
 public:
     typedef boost::shared_ptr<mimo_usrp> sptr;
 
@@ -179,4 +179,347 @@ public:
 
 }}
 
+#include <uhd/utils/warning.hpp>
+#include <uhd/usrp/tune_helper.hpp>
+#include <uhd/utils/assert.hpp>
+#include <uhd/utils/gain_group.hpp>
+#include <uhd/utils/algorithm.hpp>
+#include <uhd/utils/warning.hpp>
+#include <uhd/usrp/subdev_props.hpp>
+#include <uhd/usrp/mboard_props.hpp>
+#include <uhd/usrp/device_props.hpp>
+#include <uhd/usrp/dboard_props.hpp>
+#include <uhd/usrp/dsp_props.hpp>
+#include <boost/foreach.hpp>
+#include <boost/format.hpp>
+#include <boost/thread.hpp>
+#include <stdexcept>
+#include <iostream>
+
+namespace uhd{ namespace usrp{ namespace /*anon*/{
+
+static inline freq_range_t add_dsp_shift(const freq_range_t &range, wax::obj dsp){
+    double codec_rate = dsp[DSP_PROP_CODEC_RATE].as<double>();
+    return freq_range_t(range.min - codec_rate/2.0, range.max + codec_rate/2.0);
+}
+
+/***********************************************************************
+ * MIMO USRP Implementation
+ **********************************************************************/
+class mimo_usrp_impl : public mimo_usrp{
+public:
+    mimo_usrp_impl(const device_addr_t &addr){
+        _dev = device::make(addr);
+
+        //set the clock config across all mboards (TODO set through api)
+        clock_config_t clock_config;
+        clock_config.ref_source = clock_config_t::REF_SMA;
+        clock_config.pps_source = clock_config_t::PPS_SMA;
+        for (size_t chan = 0; chan < get_num_channels(); chan++){
+            _mboard(chan)[MBOARD_PROP_CLOCK_CONFIG] = clock_config;
+        }
+    }
+
+    ~mimo_usrp_impl(void){
+        /* NOP */
+    }
+
+    device::sptr get_device(void){
+        return _dev;
+    }
+
+    std::string get_pp_string(void){
+        std::string buff = str(boost::format(
+            "MIMO USRP:\n"
+            "  Device: %s\n"
+        )
+            % (*_dev)[DEVICE_PROP_NAME].as<std::string>()
+        );
+        for (size_t chan = 0; chan < get_num_channels(); chan++){
+            buff += str(boost::format(
+                "  Channel: %u\n"
+                "    Mboard: %s\n"
+                "    RX DSP: %s\n"
+                "    RX Dboard: %s\n"
+                "    RX Subdev: %s\n"
+                "    TX DSP: %s\n"
+                "    TX Dboard: %s\n"
+                "    TX Subdev: %s\n"
+            ) % chan
+                % _mboard(chan)[MBOARD_PROP_NAME].as<std::string>()
+                % _rx_dsp(chan)[DSP_PROP_NAME].as<std::string>()
+                % _rx_dboard(chan)[DBOARD_PROP_NAME].as<std::string>()
+                % _rx_subdev(chan)[SUBDEV_PROP_NAME].as<std::string>()
+                % _tx_dsp(chan)[DSP_PROP_NAME].as<std::string>()
+                % _tx_dboard(chan)[DBOARD_PROP_NAME].as<std::string>()
+                % _tx_subdev(chan)[SUBDEV_PROP_NAME].as<std::string>()
+            );
+        }
+        return buff;
+    }
+
+    size_t get_num_channels(void){
+        return (*_dev)[DEVICE_PROP_MBOARD_NAMES].as<prop_names_t>().size();
+    }
+
+    /*******************************************************************
+     * Misc
+     ******************************************************************/
+    time_spec_t get_time_now(void){
+        //the time on the first mboard better be the same on all
+        return _mboard(0)[MBOARD_PROP_TIME_NOW].as<time_spec_t>();
+    }
+
+    void set_time_next_pps(const time_spec_t &time_spec){
+        for (size_t chan = 0; chan < get_num_channels(); chan++){
+            _mboard(chan)[MBOARD_PROP_TIME_NEXT_PPS] = time_spec;
+        }
+    }
+
+    void set_time_unknown_pps(const time_spec_t &time_spec){
+        std::cout << "Set time with unknown pps edge:" << std::endl;
+        std::cout << "    1) set times next pps (race condition)" << std::endl;
+        set_time_next_pps(time_spec);
+        boost::this_thread::sleep(boost::posix_time::seconds(1));
+
+        std::cout << "    2) catch seconds rollover at pps edge" << std::endl;
+        time_t last_secs = 0, curr_secs = 0;
+        while(curr_secs == last_secs){
+            last_secs = curr_secs;
+            curr_secs = get_time_now().get_full_secs();
+        }
+
+        std::cout << "    3) set times next pps (synchronously)" << std::endl;
+        set_time_next_pps(time_spec);
+        boost::this_thread::sleep(boost::posix_time::seconds(1));
+
+        //verify that the time registers are read to be within a few RTT
+        for (size_t chan = 1; chan < get_num_channels(); chan++){
+            time_spec_t time_0 = _mboard(0)[MBOARD_PROP_TIME_NOW].as<time_spec_t>();
+            time_spec_t time_i = _mboard(chan)[MBOARD_PROP_TIME_NOW].as<time_spec_t>();
+            if (time_i < time_0 or (time_i - time_0) > time_spec_t(0.01)){ //10 ms: greater than RTT but not too big
+                uhd::print_warning(str(boost::format(
+                    "Detected time deviation between board %d and board 0.\n"
+                    "Board 0 time is %f seconds.\n"
+                    "Board %d time is %f seconds.\n"
+                ) % chan % time_0.get_real_secs() % chan % time_i.get_real_secs()));
+            }
+        }
+    }
+
+    void issue_stream_cmd(const stream_cmd_t &stream_cmd){
+        for (size_t chan = 0; chan < get_num_channels(); chan++){
+            _mboard(chan)[MBOARD_PROP_STREAM_CMD] = stream_cmd;
+        }
+    }
+
+    /*******************************************************************
+     * RX methods
+     ******************************************************************/
+    void set_rx_subdev_spec(size_t chan, const subdev_spec_t &spec){
+        UHD_ASSERT_THROW(spec.size() <= 1);
+        _mboard(chan)[MBOARD_PROP_RX_SUBDEV_SPEC] = spec;
+    }
+
+    subdev_spec_t get_rx_subdev_spec(size_t chan){
+        return _mboard(chan)[MBOARD_PROP_RX_SUBDEV_SPEC].as<subdev_spec_t>();
+    }
+
+    void set_rx_rate_all(double rate){
+        std::vector<double> _actual_rates;
+        for (size_t chan = 0; chan < get_num_channels(); chan++){
+            _rx_dsp(chan)[DSP_PROP_HOST_RATE] = rate;
+            _actual_rates.push_back(_rx_dsp(chan)[DSP_PROP_HOST_RATE].as<double>());
+        }
+        _rx_rate = _actual_rates.front();
+        if (std::count(_actual_rates, _rx_rate) != _actual_rates.size()) throw std::runtime_error(
+            "MIMO configuratio error: rx rate inconsistent across mboards"
+        );
+    }
+
+    double get_rx_rate_all(void){
+        return _rx_rate;
+    }
+
+    tune_result_t set_rx_freq(size_t chan, double target_freq){
+        return tune_rx_subdev_and_dsp(_rx_subdev(chan), _rx_dsp(chan), 0, target_freq);
+    }
+
+    tune_result_t set_rx_freq(size_t chan, double target_freq, double lo_off){
+        return tune_rx_subdev_and_dsp(_rx_subdev(chan), _rx_dsp(chan), 0, target_freq, lo_off);
+    }
+
+    double get_rx_freq(size_t chan){
+        return derive_freq_from_rx_subdev_and_dsp(_rx_subdev(chan), _rx_dsp(chan), 0);
+    }
+
+    freq_range_t get_rx_freq_range(size_t chan){
+        return add_dsp_shift(_rx_subdev(chan)[SUBDEV_PROP_FREQ_RANGE].as<freq_range_t>(), _rx_dsp(chan));
+    }
+
+    void set_rx_gain(size_t chan, float gain){
+        return _rx_gain_group(chan)->set_value(gain);
+    }
+
+    float get_rx_gain(size_t chan){
+        return _rx_gain_group(chan)->get_value();
+    }
+
+    gain_range_t get_rx_gain_range(size_t chan){
+        return _rx_gain_group(chan)->get_range();
+    }
+
+    void set_rx_antenna(size_t chan, const std::string &ant){
+        _rx_subdev(chan)[SUBDEV_PROP_ANTENNA] = ant;
+    }
+
+    std::string get_rx_antenna(size_t chan){
+        return _rx_subdev(chan)[SUBDEV_PROP_ANTENNA].as<std::string>();
+    }
+
+    std::vector<std::string> get_rx_antennas(size_t chan){
+        return _rx_subdev(chan)[SUBDEV_PROP_ANTENNA_NAMES].as<prop_names_t>();
+    }
+
+    bool get_rx_lo_locked(size_t chan){
+        return _rx_subdev(chan)[SUBDEV_PROP_LO_LOCKED].as<bool>();
+    }
+
+    float read_rssi(size_t chan){
+        return _rx_subdev(chan)[SUBDEV_PROP_RSSI].as<float>();
+    }
+    
+    void set_rx_bandwidth(size_t chan, float bandwidth){
+        _rx_subdev(chan)[SUBDEV_PROP_BANDWIDTH] = bandwidth;
+    }
+
+    /*******************************************************************
+     * TX methods
+     ******************************************************************/
+    void set_tx_subdev_spec(size_t chan, const subdev_spec_t &spec){
+        UHD_ASSERT_THROW(spec.size() <= 1);
+        _mboard(chan)[MBOARD_PROP_TX_SUBDEV_SPEC] = spec;
+    }
+
+    subdev_spec_t get_tx_subdev_spec(size_t chan){
+        return _mboard(chan)[MBOARD_PROP_TX_SUBDEV_SPEC].as<subdev_spec_t>();
+    }
+
+    void set_tx_rate_all(double rate){
+        std::vector<double> _actual_rates;
+        for (size_t chan = 0; chan < get_num_channels(); chan++){
+            _tx_dsp(chan)[DSP_PROP_HOST_RATE] = rate;
+            _actual_rates.push_back(_tx_dsp(chan)[DSP_PROP_HOST_RATE].as<double>());
+        }
+        _tx_rate = _actual_rates.front();
+        if (std::count(_actual_rates, _tx_rate) != _actual_rates.size()) throw std::runtime_error(
+            "MIMO configuratio error: tx rate inconsistent across mboards"
+        );
+    }
+
+    double get_tx_rate_all(void){
+        return _tx_rate;
+    }
+
+    tune_result_t set_tx_freq(size_t chan, double target_freq){
+        return tune_tx_subdev_and_dsp(_tx_subdev(chan), _tx_dsp(chan), 0, target_freq);
+    }
+
+    tune_result_t set_tx_freq(size_t chan, double target_freq, double lo_off){
+        return tune_tx_subdev_and_dsp(_tx_subdev(chan), _tx_dsp(chan), 0, target_freq, lo_off);
+    }
+
+    double get_tx_freq(size_t chan){
+        return derive_freq_from_tx_subdev_and_dsp(_tx_subdev(chan), _tx_dsp(chan), 0);
+    }
+
+    freq_range_t get_tx_freq_range(size_t chan){
+        return add_dsp_shift(_tx_subdev(chan)[SUBDEV_PROP_FREQ_RANGE].as<freq_range_t>(), _tx_dsp(chan));
+    }
+
+    void set_tx_gain(size_t chan, float gain){
+        return _tx_gain_group(chan)->set_value(gain);
+    }
+
+    float get_tx_gain(size_t chan){
+        return _tx_gain_group(chan)->get_value();
+    }
+
+    gain_range_t get_tx_gain_range(size_t chan){
+        return _tx_gain_group(chan)->get_range();
+    }
+
+    void set_tx_antenna(size_t chan, const std::string &ant){
+        _tx_subdev(chan)[SUBDEV_PROP_ANTENNA] = ant;
+    }
+
+    std::string get_tx_antenna(size_t chan){
+        return _tx_subdev(chan)[SUBDEV_PROP_ANTENNA].as<std::string>();
+    }
+
+    std::vector<std::string> get_tx_antennas(size_t chan){
+        return _tx_subdev(chan)[SUBDEV_PROP_ANTENNA_NAMES].as<prop_names_t>();
+    }
+
+    bool get_tx_lo_locked(size_t chan){
+        return _tx_subdev(chan)[SUBDEV_PROP_LO_LOCKED].as<bool>();
+    }
+
+private:
+    device::sptr _dev;
+    wax::obj _mboard(size_t chan){
+        prop_names_t names = (*_dev)[DEVICE_PROP_MBOARD_NAMES].as<prop_names_t>();
+        return (*_dev)[named_prop_t(DEVICE_PROP_MBOARD, names.at(chan))];
+    }
+    wax::obj _rx_dsp(size_t chan){
+        return _mboard(chan)[MBOARD_PROP_RX_DSP];
+    }
+    wax::obj _tx_dsp(size_t chan){
+        return _mboard(chan)[MBOARD_PROP_TX_DSP];
+    }
+    wax::obj _rx_dboard(size_t chan){
+        std::string db_name = _mboard(chan)[MBOARD_PROP_RX_SUBDEV_SPEC].as<subdev_spec_t>().front().db_name;
+        return _mboard(chan)[named_prop_t(MBOARD_PROP_RX_DBOARD, db_name)];
+    }
+    wax::obj _tx_dboard(size_t chan){
+        std::string db_name = _mboard(chan)[MBOARD_PROP_TX_SUBDEV_SPEC].as<subdev_spec_t>().front().db_name;
+        return _mboard(chan)[named_prop_t(MBOARD_PROP_TX_DBOARD, db_name)];
+    }
+    wax::obj _rx_subdev(size_t chan){
+        std::string sd_name = _mboard(chan)[MBOARD_PROP_RX_SUBDEV_SPEC].as<subdev_spec_t>().front().sd_name;
+        return _rx_dboard(chan)[named_prop_t(DBOARD_PROP_SUBDEV, sd_name)];
+    }
+    wax::obj _tx_subdev(size_t chan){
+        std::string sd_name = _mboard(chan)[MBOARD_PROP_TX_SUBDEV_SPEC].as<subdev_spec_t>().front().sd_name;
+        return _tx_dboard(chan)[named_prop_t(DBOARD_PROP_SUBDEV, sd_name)];
+    }
+    gain_group::sptr _rx_gain_group(size_t chan){
+        std::string sd_name = _mboard(chan)[MBOARD_PROP_RX_SUBDEV_SPEC].as<subdev_spec_t>().front().sd_name;
+        return _rx_dboard(chan)[named_prop_t(DBOARD_PROP_GAIN_GROUP, sd_name)].as<gain_group::sptr>();
+    }
+    gain_group::sptr _tx_gain_group(size_t chan){
+        std::string sd_name = _mboard(chan)[MBOARD_PROP_TX_SUBDEV_SPEC].as<subdev_spec_t>().front().sd_name;
+        return _tx_dboard(chan)[named_prop_t(DBOARD_PROP_GAIN_GROUP, sd_name)].as<gain_group::sptr>();
+    }
+
+    //shadows
+    double _rx_rate, _tx_rate;
+};
+}}}
+
+namespace uhd{ namespace usrp{
+/***********************************************************************
+ * The Make Function
+ **********************************************************************/
+inline mimo_usrp::sptr mimo_usrp::make(const device_addr_t &dev_addr){
+    uhd::print_warning(
+        "The mimo USRP interface has been deprecated.\n"
+        "Please switch to the multi USRP interface.\n"
+        "#include <uhd/usrp/multi_usrp.hpp>\n"
+        "multi_usrp::sptr sdev = multi_usrp::make(args);\n"
+    );
+    return sptr(new mimo_usrp_impl(dev_addr));
+}
+}}
+
 #endif /* INCLUDED_UHD_USRP_MIMO_USRP_HPP */
diff --git a/host/include/uhd/usrp/misc_utils.hpp b/host/include/uhd/usrp/misc_utils.hpp
index 2af9f5b40..37860a1a5 100644
--- a/host/include/uhd/usrp/misc_utils.hpp
+++ b/host/include/uhd/usrp/misc_utils.hpp
@@ -20,6 +20,7 @@
 
 #include <uhd/config.hpp>
 #include <uhd/wax.hpp>
+#include <uhd/usrp/dboard_id.hpp>
 #include <uhd/usrp/subdev_spec.hpp>
 #include <uhd/utils/gain_group.hpp>
 
@@ -35,11 +36,13 @@ namespace uhd{ namespace usrp{
 
     /*!
      * Create a gain group that represents the subdevice and its codec.
+     * \param dboard_id the dboard id for this subdevice
      * \param subdev the object with subdevice properties
      * \param codec the object with codec properties
      * \param gain_group_policy the policy to use
      */
     UHD_API gain_group::sptr make_gain_group(
+        const dboard_id_t &dboard_id,
         wax::obj subdev, wax::obj codec,
         gain_group_policy_t gain_group_policy
     );
diff --git a/host/include/uhd/usrp/multi_usrp.hpp b/host/include/uhd/usrp/multi_usrp.hpp
new file mode 100644
index 000000000..2f71f80b1
--- /dev/null
+++ b/host/include/uhd/usrp/multi_usrp.hpp
@@ -0,0 +1,535 @@
+//
+// Copyright 2010 Ettus Research LLC
+//
+// This program 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 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#ifndef INCLUDED_UHD_USRP_MULTI_USRP_HPP
+#define INCLUDED_UHD_USRP_MULTI_USRP_HPP
+
+#include <uhd/config.hpp>
+#include <uhd/device.hpp>
+#include <uhd/types/ranges.hpp>
+#include <uhd/types/stream_cmd.hpp>
+#include <uhd/types/clock_config.hpp>
+#include <uhd/types/tune_result.hpp>
+#include <uhd/usrp/subdev_spec.hpp>
+#include <uhd/usrp/dboard_iface.hpp>
+#include <boost/shared_ptr.hpp>
+#include <boost/utility.hpp>
+#include <vector>
+
+namespace uhd{ namespace usrp{
+
+/*!
+ * The multi-USRP device class:
+ * A multi-USRP facilitates ease-of-use for multiple USRP scenarios.
+ * The wrapper provides convenience functions to control the group
+ * of underlying devices as if they consisted of a single device.
+ *
+ * A few notes about a multi-USRP configuration:
+ *  - All boards share a common RX sample rate
+ *  - All boards share a common TX sample rate
+ *  - All boards share a common RX subdevice specification size
+ *  - All boards share a common TX subdevice specification size
+ *  - All boards must have synchronized times (see the set_time_*() calls)
+ *
+ * Example to setup channel mapping:
+ * <pre>
+ *
+ * //create a multi_usrp with two boards in the configuration
+ * device_addr_t dev_addr;
+ * dev_addr["addr"] = "192.168.10.2 192.168.10.3";
+ * multi_usrp::sptr dev = multi_usrp::make(dev_addr);
+ *
+ * //set the board on 10.2 to use the A RX subdevice (RX channel 0)
+ * dev->set_rx_subdev_spec(":A", 0);
+ *
+ * //set the board on 10.3 to use the B RX subdevice (RX channel 1)
+ * dev->set_rx_subdev_spec(":B", 1);
+ *
+ * //set both boards to use the AB TX subdevice (TX channels 0 and 1)
+ * dev->set_tx_subdev_spec(":AB", multi_usrp::ALL_MBOARDS);
+ *
+ * //now that all the channels are mapped, continue with configuration...
+ *
+ * </pre>
+ */
+class UHD_API multi_usrp : boost::noncopyable{
+public:
+    typedef boost::shared_ptr<multi_usrp> sptr;
+
+    //! A wildcard motherboard index
+    static const size_t ALL_MBOARDS = size_t(~0);
+
+    //! A wildcard gain element name
+    static const std::string ALL_GAINS;
+
+    /*!
+     * Make a new multi usrp from the device address.
+     * \param dev_addr the device address
+     * \return a new single usrp object
+     */
+    static sptr make(const device_addr_t &dev_addr);
+
+    /*!
+     * Get the underlying device object.
+     * This is needed to get access to the streaming API and properties.
+     * \return the device object within this single usrp
+     */
+    virtual device::sptr get_device(void) = 0;
+
+    /*******************************************************************
+     * Mboard methods
+     ******************************************************************/
+    /*!
+     * Get a printable summary for this USRP configuration.
+     * \return a printable string
+     */
+    virtual std::string get_pp_string(void) = 0;
+
+    /*!
+     * Get canonical name for this USRP motherboard.
+     * \param mboard which motherboard to query
+     * \return a string representing the name
+     */
+    virtual std::string get_mboard_name(size_t mboard) = 0;
+
+    /*!
+     * Gets the current time in the usrp time registers.
+     * \return a timespec representing current usrp time
+     */
+    virtual time_spec_t get_time_now(void) = 0;
+
+    /*!
+     * Set the time registers on the usrp at the next pps tick.
+     * The values will not be latched in until the pulse occurs.
+     * It is recommended that the user sleep(1) after calling to ensure
+     * that the time registers will be in a known state prior to use.
+     *
+     * Note: Because this call sets the time on the "next" pps,
+     * the seconds in the time spec should be current seconds + 1.
+     *
+     * \param time_spec the time to latch into the usrp device
+     */
+    virtual void set_time_next_pps(const time_spec_t &time_spec) = 0;
+
+    /*!
+     * Synchronize the times across all motherboards in this configuration.
+     * Use this method to sync the times when the edge of the PPS is unknown.
+     *
+     * Ex: Host machine is not attached to serial port of GPSDO
+     * and can therefore not query the GPSDO for the PPS edge.
+     *
+     * This is a 3-step process, and will take at most 3 seconds to complete.
+     * Upon completion, the times will be synchronized to the time provided.
+     *
+     * - Step1: set the time at the next pps (potential race condition)
+     * - Step2: wait for the seconds to rollover to catch the pps edge
+     * - Step3: set the time at the next pps (synchronous for all boards)
+     *
+     * \param time_spec the time to latch into the usrp device
+     */
+    virtual void set_time_unknown_pps(const time_spec_t &time_spec) = 0;
+
+    /*!
+     * Issue a stream command to the usrp device.
+     * This tells the usrp to send samples into the host.
+     * See the documentation for stream_cmd_t for more info.
+     * \param stream_cmd the stream command to issue
+     */
+    virtual void issue_stream_cmd(const stream_cmd_t &stream_cmd) = 0;
+
+    /*!
+     * Set the clock configuration for the usrp device.
+     * This tells the usrp how to get a 10Mhz reference and PPS clock.
+     * See the documentation for clock_config_t for more info.
+     * \param clock_config the clock configuration to set
+     * \param mboard which motherboard to set the config
+     */
+    virtual void set_clock_config(const clock_config_t &clock_config, size_t mboard) = 0;
+
+    /*!
+     * Get the number of USRP motherboards in this configuration.
+     */
+    virtual size_t get_num_mboards(void) = 0;
+
+    /*******************************************************************
+     * RX methods
+     ******************************************************************/
+    /*!
+     * Set the RX subdevice specification:
+     * The subdev spec maps a physical part of a daughter-board to a channel number.
+     * Set the subdev spec before calling into any methods with a channel number.
+     * The subdev spec must be the same size across all motherboards.
+     * \param spec the new subdevice specification
+     * \param mboard the motherboard index 0 to M-1
+     */
+    virtual void set_rx_subdev_spec(const uhd::usrp::subdev_spec_t &spec, size_t mboard) = 0;
+
+    /*!
+     * Get the RX subdevice specification.
+     * \param mboard the motherboard index 0 to M-1
+     * \return the subdevice specification in use
+     */
+    virtual uhd::usrp::subdev_spec_t get_rx_subdev_spec(size_t mboard) = 0;
+
+    /*!
+     * Get the number of RX channels in this configuration.
+     * This is the number of USRPs times the number of RX channels per board,
+     * where the number of RX channels per board is homogeneous among all USRPs.
+     */
+    virtual size_t get_rx_num_channels(void) = 0;
+
+    /*!
+     * Get the name of the RX subdevice.
+     * \param chan the channel index 0 to N-1
+     * \return the subdevice name
+     */
+    virtual std::string get_rx_subdev_name(size_t chan) = 0;
+
+    /*!
+     * Set the RX sample rate across all channels.
+     * \param rate the rate in Sps
+     */
+    virtual void set_rx_rate(double rate) = 0;
+
+    /*!
+     * Gets the RX sample rate for all channels.
+     * \return the rate in Sps
+     */
+    virtual double get_rx_rate(void) = 0;
+
+    /*!
+     * Set the RX center frequency.
+     * \param freq the frequency in Hz
+     * \param chan the channel index 0 to N-1
+     * \return a tune result object
+     */
+    virtual tune_result_t set_rx_freq(double freq, size_t chan) = 0;
+
+    /*!
+     * Set the RX center frequency.
+     * \param freq the frequency in Hz
+     * \param lo_off an LO offset in Hz
+     * \param chan the channel index 0 to N-1
+     * \return a tune result object
+     */
+    virtual tune_result_t set_rx_freq(double freq, double lo_off, size_t chan) = 0;
+
+    /*!
+     * Get the RX center frequency.
+     * \param chan the channel index 0 to N-1
+     * \return the frequency in Hz
+     */
+    virtual double get_rx_freq(size_t chan) = 0;
+
+    /*!
+     * Get the RX center frequency range.
+     * \param chan the channel index 0 to N-1
+     * \return a frequency range object
+     */
+    virtual freq_range_t get_rx_freq_range(size_t chan) = 0;
+
+    /*!
+     * Set the RX gain value for the specified gain element.
+     * For an empty name, distribute across all gain elements.
+     * \param gain the gain in dB
+     * \param name the name of the gain element
+     * \param chan the channel index 0 to N-1
+     */
+    virtual void set_rx_gain(float gain, const std::string &name, size_t chan) = 0;
+
+    //! A convenience wrapper for setting overall RX gain
+    void set_rx_gain(float gain, size_t chan){
+        return this->set_rx_gain(gain, ALL_GAINS, chan);
+    }
+
+    /*!
+     * Get the RX gain value for the specified gain element.
+     * For an empty name, sum across all gain elements.
+     * \param name the name of the gain element
+     * \param chan the channel index 0 to N-1
+     * \return the gain in dB
+     */
+    virtual float get_rx_gain(const std::string &name, size_t chan) = 0;
+
+    //! A convenience wrapper for getting overall RX gain
+    float get_rx_gain(size_t chan){
+        return this->get_rx_gain(ALL_GAINS, chan);
+    }
+
+    /*!
+     * Get the RX gain range for the specified gain element.
+     * For an empty name, calculate the overall gain range.
+     * \param name the name of the gain element
+     * \param chan the channel index 0 to N-1
+     * \return a gain range object
+     */
+    virtual gain_range_t get_rx_gain_range(const std::string &name, size_t chan) = 0;
+
+    //! A convenience wrapper for getting overall RX gain range
+    gain_range_t get_rx_gain_range(size_t chan){
+        return this->get_rx_gain_range(ALL_GAINS, chan);
+    }
+
+    /*!
+     * Get the names of the gain elements in the RX chain.
+     * Gain elements are ordered from antenna to FPGA.
+     * \param chan the channel index 0 to N-1
+     * \return a vector of gain element names
+     */
+    virtual std::vector<std::string> get_rx_gain_names(size_t chan) = 0;
+
+    /*!
+     * Select the RX antenna on the subdevice.
+     * \param ant the antenna name
+     * \param chan the channel index 0 to N-1
+     */
+    virtual void set_rx_antenna(const std::string &ant, size_t chan) = 0;
+
+    /*!
+     * Get the selected RX antenna on the subdevice.
+     * \param chan the channel index 0 to N-1
+     * \return the antenna name
+     */
+    virtual std::string get_rx_antenna(size_t chan) = 0;
+
+    /*!
+     * Get a list of possible RX antennas on the subdevice.
+     * \param chan the channel index 0 to N-1
+     * \return a vector of antenna names
+     */
+    virtual std::vector<std::string> get_rx_antennas(size_t chan) = 0;
+
+    /*!
+     * Get the locked status of the LO on the subdevice.
+     * \param chan the channel index 0 to N-1
+     * \return true for locked
+     */
+    virtual bool get_rx_lo_locked(size_t chan) = 0;
+
+    /*!
+     * Set the RX bandwidth on the subdevice.
+     * \param bandwidth the bandwidth in Hz
+     * \param chan the channel index 0 to N-1
+     */
+    virtual void set_rx_bandwidth(double bandwidth, size_t chan) = 0;
+
+    /*!
+     * Get the RX bandwidth on the subdevice.
+     * \param chan the channel index 0 to N-1
+     * \return the bandwidth in Hz
+     */
+    virtual double get_rx_bandwidth(size_t chan) = 0;
+
+    /*!
+     * Read the RSSI value on the RX subdevice.
+     * \param chan the channel index 0 to N-1
+     * \return the rssi in dB
+     * \throw exception if RSSI readback not supported
+     */
+    virtual float read_rssi(size_t chan) = 0;
+
+    /*!
+     * Get the dboard interface object for the RX subdevice.
+     * The dboard interface gives access to GPIOs, SPI, I2C, low-speed ADC and DAC.
+     * Use at your own risk!
+     * \param chan the channel index 0 to N-1
+     * \return the dboard interface sptr
+     */
+    virtual dboard_iface::sptr get_rx_dboard_iface(size_t chan) = 0;
+
+    /*******************************************************************
+     * TX methods
+     ******************************************************************/
+    /*!
+     * Set the TX subdevice specification:
+     * The subdev spec maps a physical part of a daughter-board to a channel number.
+     * Set the subdev spec before calling into any methods with a channel number.
+     * The subdev spec must be the same size across all motherboards.
+     * \param spec the new subdevice specification
+     * \param mboard the motherboard index 0 to M-1
+     */
+    virtual void set_tx_subdev_spec(const uhd::usrp::subdev_spec_t &spec, size_t mboard) = 0;
+
+    /*!
+     * Get the TX subdevice specification.
+     * \param mboard the motherboard index 0 to M-1
+     * \return the subdevice specification in use
+     */
+    virtual uhd::usrp::subdev_spec_t get_tx_subdev_spec(size_t mboard) = 0;
+
+    /*!
+     * Get the number of TX channels in this configuration.
+     * This is the number of USRPs times the number of TX channels per board,
+     * where the number of TX channels per board is homogeneous among all USRPs.
+     */
+    virtual size_t get_tx_num_channels(void) = 0;
+
+    /*!
+     * Get the name of the TX subdevice.
+     * \param chan the channel index 0 to N-1
+     * \return the subdevice name
+     */
+    virtual std::string get_tx_subdev_name(size_t chan) = 0;
+
+    /*!
+     * Set the TX sample rate across all channels.
+     * \param rate the rate in Sps
+     */
+    virtual void set_tx_rate(double rate) = 0;
+
+    /*!
+     * Gets the TX sample rate for all channels.
+     * \return the rate in Sps
+     */
+    virtual double get_tx_rate(void) = 0;
+
+    /*!
+     * Set the TX center frequency.
+     * \param freq the frequency in Hz
+     * \param chan the channel index 0 to N-1
+     * \return a tune result object
+     */
+    virtual tune_result_t set_tx_freq(double freq, size_t chan) = 0;
+
+    /*!
+     * Set the TX center frequency.
+     * \param freq the frequency in Hz
+     * \param lo_off an LO offset in Hz
+     * \param chan the channel index 0 to N-1
+     * \return a tune result object
+     */
+    virtual tune_result_t set_tx_freq(double freq, double lo_off, size_t chan) = 0;
+
+    /*!
+     * Get the TX center frequency.
+     * \param chan the channel index 0 to N-1
+     * \return the frequency in Hz
+     */
+    virtual double get_tx_freq(size_t chan) = 0;
+
+    /*!
+     * Get the TX center frequency range.
+     * \param chan the channel index 0 to N-1
+     * \return a frequency range object
+     */
+    virtual freq_range_t get_tx_freq_range(size_t chan) = 0;
+
+    /*!
+     * Set the TX gain value for the specified gain element.
+     * For an empty name, distribute across all gain elements.
+     * \param gain the gain in dB
+     * \param name the name of the gain element
+     * \param chan the channel index 0 to N-1
+     */
+    virtual void set_tx_gain(float gain, const std::string &name, size_t chan) = 0;
+
+    //! A convenience wrapper for setting overall TX gain
+    void set_tx_gain(float gain, size_t chan){
+        return this->set_tx_gain(gain, ALL_GAINS, chan);
+    }
+
+    /*!
+     * Get the TX gain value for the specified gain element.
+     * For an empty name, sum across all gain elements.
+     * \param name the name of the gain element
+     * \param chan the channel index 0 to N-1
+     * \return the gain in dB
+     */
+    virtual float get_tx_gain(const std::string &name, size_t chan) = 0;
+
+    //! A convenience wrapper for getting overall TX gain
+    float get_tx_gain(size_t chan){
+        return this->get_tx_gain(ALL_GAINS, chan);
+    }
+
+    /*!
+     * Get the TX gain range for the specified gain element.
+     * For an empty name, calculate the overall gain range.
+     * \param name the name of the gain element
+     * \param chan the channel index 0 to N-1
+     * \return a gain range object
+     */
+    virtual gain_range_t get_tx_gain_range(const std::string &name, size_t chan) = 0;
+
+    //! A convenience wrapper for getting overall TX gain range
+    gain_range_t get_tx_gain_range(size_t chan){
+        return this->get_tx_gain_range(ALL_GAINS, chan);
+    }
+
+    /*!
+     * Get the names of the gain elements in the TX chain.
+     * Gain elements are ordered from antenna to FPGA.
+     * \param chan the channel index 0 to N-1
+     * \return a vector of gain element names
+     */
+    virtual std::vector<std::string> get_tx_gain_names(size_t chan) = 0;
+
+    /*!
+     * Select the TX antenna on the subdevice.
+     * \param ant the antenna name
+     * \param chan the channel index 0 to N-1
+     */
+    virtual void set_tx_antenna(const std::string &ant, size_t chan) = 0;
+
+    /*!
+     * Get the selected TX antenna on the subdevice.
+     * \param chan the channel index 0 to N-1
+     * \return the antenna name
+     */
+    virtual std::string get_tx_antenna(size_t chan) = 0;
+
+    /*!
+     * Get a list of possible TX antennas on the subdevice.
+     * \param chan the channel index 0 to N-1
+     * \return a vector of antenna names
+     */
+    virtual std::vector<std::string> get_tx_antennas(size_t chan) = 0;
+
+    /*!
+     * Get the locked status of the LO on the subdevice.
+     * \param chan the channel index 0 to N-1
+     * \return true for locked
+     */
+    virtual bool get_tx_lo_locked(size_t chan) = 0;
+
+    /*!
+     * Set the TX bandwidth on the subdevice.
+     * \param bandwidth the bandwidth in Hz
+     * \param chan the channel index 0 to N-1
+     */
+    virtual void set_tx_bandwidth(double bandwidth, size_t chan) = 0;
+
+    /*!
+     * Get the TX bandwidth on the subdevice.
+     * \param chan the channel index 0 to N-1
+     * \return the bandwidth in Hz
+     */
+    virtual double get_tx_bandwidth(size_t chan) = 0;
+
+    /*!
+     * Get the dboard interface object for the TX subdevice.
+     * The dboard interface gives access to GPIOs, SPI, I2C, low-speed ADC and DAC.
+     * Use at your own risk!
+     * \param chan the channel index 0 to N-1
+     * \return the dboard interface sptr
+     */
+    virtual dboard_iface::sptr get_tx_dboard_iface(size_t chan) = 0;
+};
+
+}}
+
+#endif /* INCLUDED_UHD_USRP_MULTI_USRP_HPP */
diff --git a/host/include/uhd/usrp/simple_usrp.hpp b/host/include/uhd/usrp/simple_usrp.hpp
index 6f3597ed7..22f4d64ba 100644
--- a/host/include/uhd/usrp/simple_usrp.hpp
+++ b/host/include/uhd/usrp/simple_usrp.hpp
@@ -171,4 +171,218 @@ public:
 
 }}
 
+#include <uhd/usrp/single_usrp.hpp>
+#include <uhd/utils/warning.hpp>
+
+namespace uhd{ namespace usrp{ namespace /*anon*/{
+
+/***********************************************************************
+ * Simple USRP Implementation
+ **********************************************************************/
+class simple_usrp_impl : public simple_usrp{
+public:
+    simple_usrp_impl(const device_addr_t &addr){
+        _sdev = single_usrp::make(addr);
+    }
+
+    ~simple_usrp_impl(void){
+        /* NOP */
+    }
+
+    device::sptr get_device(void){
+        return _sdev->get_device();
+    }
+
+    std::string get_pp_string(void){
+        return _sdev->get_pp_string();
+    }
+
+    /*******************************************************************
+     * Misc
+     ******************************************************************/
+    time_spec_t get_time_now(void){
+        return _sdev->get_time_now();
+    }
+
+    void set_time_now(const time_spec_t &time_spec){
+        return _sdev->set_time_now(time_spec);
+    }
+
+    void set_time_next_pps(const time_spec_t &time_spec){
+        return _sdev->set_time_next_pps(time_spec);
+    }
+
+    void issue_stream_cmd(const stream_cmd_t &stream_cmd){
+        return _sdev->issue_stream_cmd(stream_cmd);
+    }
+
+    void set_clock_config(const clock_config_t &clock_config){
+        return _sdev->set_clock_config(clock_config);
+    }
+
+    /*******************************************************************
+     * RX methods
+     ******************************************************************/
+    void set_rx_subdev_spec(const subdev_spec_t &spec){
+        return _sdev->set_rx_subdev_spec(spec);
+    }
+
+    subdev_spec_t get_rx_subdev_spec(void){
+        return _sdev->get_rx_subdev_spec();
+    }
+
+    void set_rx_rate(double rate){
+        return _sdev->set_rx_rate(rate);
+    }
+
+    double get_rx_rate(void){
+        return _sdev->get_rx_rate();
+    }
+
+    tune_result_t set_rx_freq(double target_freq){
+        return _sdev->set_rx_freq(target_freq);
+    }
+
+    tune_result_t set_rx_freq(double target_freq, double lo_off){
+        return _sdev->set_rx_freq(target_freq, lo_off);
+    }
+
+    double get_rx_freq(void){
+        return _sdev->get_rx_freq();
+    }
+
+    freq_range_t get_rx_freq_range(void){
+        return _sdev->get_rx_freq_range();
+    }
+
+    void set_rx_gain(float gain){
+        return _sdev->set_rx_gain(gain);
+    }
+
+    float get_rx_gain(void){
+        return _sdev->get_rx_gain();
+    }
+
+    gain_range_t get_rx_gain_range(void){
+        return _sdev->get_rx_gain_range();
+    }
+
+    void set_rx_antenna(const std::string &ant){
+        return _sdev->set_rx_antenna(ant);
+    }
+
+    std::string get_rx_antenna(void){
+        return _sdev->get_rx_antenna();
+    }
+
+    std::vector<std::string> get_rx_antennas(void){
+        return _sdev->get_rx_antennas();
+    }
+
+    bool get_rx_lo_locked(void){
+        return _sdev->get_rx_lo_locked();
+    }
+
+    float read_rssi(void){
+        return _sdev->read_rssi();
+    }
+
+    dboard_iface::sptr get_rx_dboard_iface(void){
+        return _sdev->get_rx_dboard_iface();
+    }
+    
+    void set_rx_bandwidth(float bandwidth) {
+        return _sdev->set_rx_bandwidth(bandwidth);
+    }
+
+    /*******************************************************************
+     * TX methods
+     ******************************************************************/
+    void set_tx_subdev_spec(const subdev_spec_t &spec){
+        return _sdev->set_tx_subdev_spec(spec);
+    }
+
+    subdev_spec_t get_tx_subdev_spec(void){
+        return _sdev->get_tx_subdev_spec();
+    }
+
+    void set_tx_rate(double rate){
+        return _sdev->set_tx_rate(rate);
+    }
+
+    double get_tx_rate(void){
+        return _sdev->get_tx_rate();
+    }
+
+    tune_result_t set_tx_freq(double target_freq){
+        return _sdev->set_tx_freq(target_freq);
+    }
+
+    tune_result_t set_tx_freq(double target_freq, double lo_off){
+        return _sdev->set_tx_freq(target_freq, lo_off);
+    }
+
+    double get_tx_freq(void){
+        return _sdev->get_tx_freq();
+    }
+
+    freq_range_t get_tx_freq_range(void){
+        return _sdev->get_tx_freq_range();
+    }
+
+    void set_tx_gain(float gain){
+        return _sdev->set_tx_gain(gain);
+    }
+
+    float get_tx_gain(void){
+        return _sdev->get_tx_gain();
+    }
+
+    gain_range_t get_tx_gain_range(void){
+        return _sdev->get_tx_gain_range();
+    }
+
+    void set_tx_antenna(const std::string &ant){
+        return _sdev->set_tx_antenna(ant);
+    }
+
+    std::string get_tx_antenna(void){
+        return _sdev->get_tx_antenna();
+    }
+
+    std::vector<std::string> get_tx_antennas(void){
+        return _sdev->get_tx_antennas();
+    }
+
+    bool get_tx_lo_locked(void){
+        return _sdev->get_tx_lo_locked();
+    }
+
+    dboard_iface::sptr get_tx_dboard_iface(void){
+        return _sdev->get_tx_dboard_iface();
+    }
+
+private:
+    single_usrp::sptr _sdev;
+};
+
+}}}
+
+namespace uhd{ namespace usrp{
+
+/***********************************************************************
+ * The Make Function
+ **********************************************************************/
+inline simple_usrp::sptr simple_usrp::make(const device_addr_t &dev_addr){
+    uhd::print_warning(
+        "The simple USRP interface has been deprecated.\n"
+        "Please switch to the single USRP interface.\n"
+        "#include <uhd/usrp/single_usrp.hpp>\n"
+        "single_usrp::sptr sdev = single_usrp::make(args);\n"
+    );
+    return sptr(new simple_usrp_impl(dev_addr));
+}
+
+}}
+
 #endif /* INCLUDED_UHD_USRP_SIMPLE_USRP_HPP */
diff --git a/host/include/uhd/usrp/single_usrp.hpp b/host/include/uhd/usrp/single_usrp.hpp
index fa6498d13..a068fbed8 100644
--- a/host/include/uhd/usrp/single_usrp.hpp
+++ b/host/include/uhd/usrp/single_usrp.hpp
@@ -33,8 +33,8 @@
 namespace uhd{ namespace usrp{
 
 /*!
- * The single USRP device class:
- * A single usrp facilitates ease-of-use for most use-case scenarios.
+ * The single-USRP device class:
+ * A single-USRP facilitates ease-of-use for most use-case scenarios.
  * The wrapper provides convenience functions to tune the devices
  * as well as to set the dboard gains, antennas, and other properties.
  * This wrapper supports multi-channel configurations per motherboard.
@@ -43,6 +43,9 @@ class UHD_API single_usrp : boost::noncopyable{
 public:
     typedef boost::shared_ptr<single_usrp> sptr;
 
+    //! A wildcard gain element name
+    static const std::string ALL_GAINS;
+
     /*!
      * Make a new single usrp from the device address.
      * \param dev_addr the device address
@@ -61,7 +64,7 @@ public:
      * Mboard methods
      ******************************************************************/
     /*!
-     * Get a printable name for this usrp.
+     * Get a printable summary for this USRP configuration.
      * \return a printable string
      */
     virtual std::string get_pp_string(void) = 0;
@@ -120,40 +123,174 @@ public:
      * Set the RX subdevice specification:
      * The subdev spec maps a physical part of a daughter-board to a channel number.
      * Set the subdev spec before calling into any methods with a channel number.
+     * \param spec the new subdevice specification
      */
     virtual void set_rx_subdev_spec(const uhd::usrp::subdev_spec_t &spec) = 0;
+
+    /*!
+     * Get the RX subdevice specification.
+     * \return the subdevice specification in use
+     */
     virtual uhd::usrp::subdev_spec_t get_rx_subdev_spec(void) = 0;
 
+    /*!
+     * Get the name of the RX subdevice.
+     * \param chan the channel index 0 to N-1
+     * \return the subdevice name
+     */
     virtual std::string get_rx_subdev_name(size_t chan = 0) = 0;
 
+    /*!
+     * Set the RX sample rate across all channels.
+     * \param rate the rate in Sps
+     */
     virtual void set_rx_rate(double rate) = 0;
+
+    /*!
+     * Gets the RX sample rate for all channels.
+     * \return the rate in Sps
+     */
     virtual double get_rx_rate(void) = 0;
 
+    /*!
+     * Set the RX center frequency.
+     * \param freq the frequency in Hz
+     * \param chan the channel index 0 to N-1
+     * \return a tune result object
+     */
     virtual tune_result_t set_rx_freq(double freq, size_t chan = 0) = 0;
+
+    /*!
+     * Set the RX center frequency.
+     * \param freq the frequency in Hz
+     * \param lo_off an LO offset in Hz
+     * \param chan the channel index 0 to N-1
+     * \return a tune result object
+     */
     virtual tune_result_t set_rx_freq(double freq, double lo_off, size_t chan = 0) = 0;
+
+    /*!
+     * Get the RX center frequency.
+     * \param chan the channel index 0 to N-1
+     * \return the frequency in Hz
+     */
     virtual double get_rx_freq(size_t chan = 0) = 0;
+
+    /*!
+     * Get the RX center frequency range.
+     * \param chan the channel index 0 to N-1
+     * \return a frequency range object
+     */
     virtual freq_range_t get_rx_freq_range(size_t chan = 0) = 0;
 
-    virtual void set_rx_gain(float gain, size_t chan = 0) = 0;
-    virtual float get_rx_gain(size_t chan = 0) = 0;
-    virtual gain_range_t get_rx_gain_range(size_t chan = 0) = 0;
+    /*!
+     * Set the RX gain value for the specified gain element.
+     * For an empty name, distribute across all gain elements.
+     * \param gain the gain in dB
+     * \param name the name of the gain element
+     * \param chan the channel index 0 to N-1
+     */
+    virtual void set_rx_gain(float gain, const std::string &name, size_t chan = 0) = 0;
+
+    //! A convenience wrapper for setting overall RX gain
+    void set_rx_gain(float gain, size_t chan = 0){
+        return this->set_rx_gain(gain, ALL_GAINS, chan);
+    }
+
+    /*!
+     * Get the RX gain value for the specified gain element.
+     * For an empty name, sum across all gain elements.
+     * \param name the name of the gain element
+     * \param chan the channel index 0 to N-1
+     * \return the gain in dB
+     */
+    virtual float get_rx_gain(const std::string &name, size_t chan = 0) = 0;
+
+    //! A convenience wrapper for getting overall RX gain
+    float get_rx_gain(size_t chan = 0){
+        return this->get_rx_gain(ALL_GAINS, chan);
+    }
+
+    /*!
+     * Get the RX gain range for the specified gain element.
+     * For an empty name, calculate the overall gain range.
+     * \param name the name of the gain element
+     * \param chan the channel index 0 to N-1
+     * \return a gain range object
+     */
+    virtual gain_range_t get_rx_gain_range(const std::string &name, size_t chan = 0) = 0;
+
+    //! A convenience wrapper for getting overall RX gain range
+    gain_range_t get_rx_gain_range(size_t chan = 0){
+        return this->get_rx_gain_range(ALL_GAINS, chan);
+    }
+
+    /*!
+     * Get the names of the gain elements in the RX chain.
+     * Gain elements are ordered from antenna to FPGA.
+     * \param chan the channel index 0 to N-1
+     * \return a vector of gain element names
+     */
+    virtual std::vector<std::string> get_rx_gain_names(size_t chan = 0) = 0;
 
+    /*!
+     * Select the RX antenna on the subdevice.
+     * \param ant the antenna name
+     * \param chan the channel index 0 to N-1
+     */
     virtual void set_rx_antenna(const std::string &ant, size_t chan = 0) = 0;
+
+    /*!
+     * Get the selected RX antenna on the subdevice.
+     * \param chan the channel index 0 to N-1
+     * \return the antenna name
+     */
     virtual std::string get_rx_antenna(size_t chan = 0) = 0;
+
+    /*!
+     * Get a list of possible RX antennas on the subdevice.
+     * \param chan the channel index 0 to N-1
+     * \return a vector of antenna names
+     */
     virtual std::vector<std::string> get_rx_antennas(size_t chan = 0) = 0;
 
+    /*!
+     * Get the locked status of the LO on the subdevice.
+     * \param chan the channel index 0 to N-1
+     * \return true for locked
+     */
     virtual bool get_rx_lo_locked(size_t chan = 0) = 0;
 
     /*!
-     * Read the RSSI value from a usrp device.
-     * Or throw if the dboard does not support an RSSI readback.
+     * Set the RX bandwidth on the subdevice.
+     * \param bandwidth the bandwidth in Hz
+     * \param chan the channel index 0 to N-1
+     */
+    virtual void set_rx_bandwidth(double bandwidth, size_t chan = 0) = 0;
+
+    /*!
+     * Get the RX bandwidth on the subdevice.
+     * \param chan the channel index 0 to N-1
+     * \return the bandwidth in Hz
+     */
+    virtual double get_rx_bandwidth(size_t chan = 0) = 0;
+
+    /*!
+     * Read the RSSI value on the RX subdevice.
+     * \param chan the channel index 0 to N-1
      * \return the rssi in dB
+     * \throw exception if RSSI readback not supported
      */
     virtual float read_rssi(size_t chan = 0) = 0;
 
+    /*!
+     * Get the dboard interface object for the RX subdevice.
+     * The dboard interface gives access to GPIOs, SPI, I2C, low-speed ADC and DAC.
+     * Use at your own risk!
+     * \param chan the channel index 0 to N-1
+     * \return the dboard interface sptr
+     */
     virtual dboard_iface::sptr get_rx_dboard_iface(size_t chan = 0) = 0;
-    
-    virtual void set_rx_bandwidth(float bandwidth, size_t chan = 0) = 0;
 
     /*******************************************************************
      * TX methods
@@ -162,30 +299,165 @@ public:
      * Set the TX subdevice specification:
      * The subdev spec maps a physical part of a daughter-board to a channel number.
      * Set the subdev spec before calling into any methods with a channel number.
+     * \param spec the new subdevice specification
      */
     virtual void set_tx_subdev_spec(const uhd::usrp::subdev_spec_t &spec) = 0;
+
+    /*!
+     * Get the TX subdevice specification.
+     * \return the subdevice specification in use
+     */
     virtual uhd::usrp::subdev_spec_t get_tx_subdev_spec(void) = 0;
 
+    /*!
+     * Get the name of the TX subdevice.
+     * \param chan the channel index 0 to N-1
+     * \return the subdevice name
+     */
     virtual std::string get_tx_subdev_name(size_t chan = 0) = 0;
 
+    /*!
+     * Set the TX sample rate across all channels.
+     * \param rate the rate in Sps
+     */
     virtual void set_tx_rate(double rate) = 0;
+
+    /*!
+     * Gets the TX sample rate for all channels.
+     * \return the rate in Sps
+     */
     virtual double get_tx_rate(void) = 0;
 
+    /*!
+     * Set the TX center frequency.
+     * \param freq the frequency in Hz
+     * \param chan the channel index 0 to N-1
+     * \return a tune result object
+     */
     virtual tune_result_t set_tx_freq(double freq, size_t chan = 0) = 0;
+
+    /*!
+     * Set the TX center frequency.
+     * \param freq the frequency in Hz
+     * \param lo_off an LO offset in Hz
+     * \param chan the channel index 0 to N-1
+     * \return a tune result object
+     */
     virtual tune_result_t set_tx_freq(double freq, double lo_off, size_t chan = 0) = 0;
+
+    /*!
+     * Get the TX center frequency.
+     * \param chan the channel index 0 to N-1
+     * \return the frequency in Hz
+     */
     virtual double get_tx_freq(size_t chan = 0) = 0;
+
+    /*!
+     * Get the TX center frequency range.
+     * \param chan the channel index 0 to N-1
+     * \return a frequency range object
+     */
     virtual freq_range_t get_tx_freq_range(size_t chan = 0) = 0;
 
-    virtual void set_tx_gain(float gain, size_t chan = 0) = 0;
-    virtual float get_tx_gain(size_t chan = 0) = 0;
-    virtual gain_range_t get_tx_gain_range(size_t chan = 0) = 0;
+    /*!
+     * Set the TX gain value for the specified gain element.
+     * For an empty name, distribute across all gain elements.
+     * \param gain the gain in dB
+     * \param name the name of the gain element
+     * \param chan the channel index 0 to N-1
+     */
+    virtual void set_tx_gain(float gain, const std::string &name, size_t chan = 0) = 0;
+
+    //! A convenience wrapper for setting overall TX gain
+    void set_tx_gain(float gain, size_t chan = 0){
+        return this->set_tx_gain(gain, ALL_GAINS, chan);
+    }
+
+    /*!
+     * Get the TX gain value for the specified gain element.
+     * For an empty name, sum across all gain elements.
+     * \param name the name of the gain element
+     * \param chan the channel index 0 to N-1
+     * \return the gain in dB
+     */
+    virtual float get_tx_gain(const std::string &name, size_t chan = 0) = 0;
 
+    //! A convenience wrapper for getting overall TX gain
+    float get_tx_gain(size_t chan = 0){
+        return this->get_tx_gain(ALL_GAINS, chan);
+    }
+
+    /*!
+     * Get the TX gain range for the specified gain element.
+     * For an empty name, calculate the overall gain range.
+     * \param name the name of the gain element
+     * \param chan the channel index 0 to N-1
+     * \return a gain range object
+     */
+    virtual gain_range_t get_tx_gain_range(const std::string &name, size_t chan = 0) = 0;
+
+    //! A convenience wrapper for getting overall TX gain range
+    gain_range_t get_tx_gain_range(size_t chan = 0){
+        return this->get_tx_gain_range(ALL_GAINS, chan);
+    }
+
+    /*!
+     * Get the names of the gain elements in the TX chain.
+     * Gain elements are ordered from antenna to FPGA.
+     * \param chan the channel index 0 to N-1
+     * \return a vector of gain element names
+     */
+    virtual std::vector<std::string> get_tx_gain_names(size_t chan = 0) = 0;
+
+    /*!
+     * Select the TX antenna on the subdevice.
+     * \param ant the antenna name
+     * \param chan the channel index 0 to N-1
+     */
     virtual void set_tx_antenna(const std::string &ant, size_t chan = 0) = 0;
+
+    /*!
+     * Get the selected TX antenna on the subdevice.
+     * \param chan the channel index 0 to N-1
+     * \return the antenna name
+     */
     virtual std::string get_tx_antenna(size_t chan = 0) = 0;
+
+    /*!
+     * Get a list of possible TX antennas on the subdevice.
+     * \param chan the channel index 0 to N-1
+     * \return a vector of antenna names
+     */
     virtual std::vector<std::string> get_tx_antennas(size_t chan = 0) = 0;
 
+    /*!
+     * Get the locked status of the LO on the subdevice.
+     * \param chan the channel index 0 to N-1
+     * \return true for locked
+     */
     virtual bool get_tx_lo_locked(size_t chan = 0) = 0;
 
+    /*!
+     * Set the TX bandwidth on the subdevice.
+     * \param bandwidth the bandwidth in Hz
+     * \param chan the channel index 0 to N-1
+     */
+    virtual void set_tx_bandwidth(double bandwidth, size_t chan = 0) = 0;
+
+    /*!
+     * Get the TX bandwidth on the subdevice.
+     * \param chan the channel index 0 to N-1
+     * \return the bandwidth in Hz
+     */
+    virtual double get_tx_bandwidth(size_t chan = 0) = 0;
+
+    /*!
+     * Get the dboard interface object for the TX subdevice.
+     * The dboard interface gives access to GPIOs, SPI, I2C, low-speed ADC and DAC.
+     * Use at your own risk!
+     * \param chan the channel index 0 to N-1
+     * \return the dboard interface sptr
+     */
     virtual dboard_iface::sptr get_tx_dboard_iface(size_t chan = 0) = 0;
 };
 
diff --git a/host/include/uhd/utils/gain_group.hpp b/host/include/uhd/utils/gain_group.hpp
index 3955dfa9a..c863248ce 100644
--- a/host/include/uhd/utils/gain_group.hpp
+++ b/host/include/uhd/utils/gain_group.hpp
@@ -23,6 +23,8 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/function.hpp>
 #include <boost/utility.hpp>
+#include <vector>
+#include <string>
 
 namespace uhd{
 
@@ -40,36 +42,57 @@ public:
     typedef boost::shared_ptr<gain_group> sptr;
 
     /*!
-     * Get the overall gain range for this group.
+     * Get the gain range for the gain element specified by name.
+     * For an empty name, get the overall gain range for this group.
      * Overall step is defined as the minimum step size.
+     * \param name name of the gain element (optional)
      * \return a gain range with overall min, max, step
      */
-    virtual gain_range_t get_range(void) = 0;
+    virtual gain_range_t get_range(const std::string &name = "") = 0;
 
     /*!
-     * Get the overall gain value for this group.
-     * \return a summation of all the gain values
+     * Get the gain value for the gain element specified by name.
+     * For an empty name, get the overall gain value for this group.
+     * \param name name of the gain element (optional)
+     * \return a gain value of the element or all elements
      */
-    virtual float get_value(void) = 0;
+    virtual float get_value(const std::string &name = "") = 0;
 
     /*!
-     * Set the overall gain value for this group.
+     * Set the gain value for the gain element specified by name.
+     * For an empty name, set the overall gain value for this group.
      * The power will be distributed across individual gain elements.
      * The semantics of how to do this are determined by the priority.
-     * \param gain the gain to set across the group
+     * \param gain the gain to set for the lement or across the group
+     * \param name name of the gain element (optional)
      */
-    virtual void set_value(float gain) = 0;
+    virtual void set_value(float gain, const std::string &name = "") = 0;
 
     /*!
-     * Register a set of gain functions into this group.
+     * Get a list of names of registered gain elements.
+     * The names are in the order that they were registered.
+     * \return a vector of gain name strings
+     */
+    virtual const std::vector<std::string> get_names(void) = 0;
+
+    /*!
+     * Register a set of gain functions into this group:
+     *
+     * The name should be a unique and non-empty name.
+     * Othwerwise, the implementation will rename it.
+     *
      * Priority determines how power will be distributed
      * with higher priorities getting the power first,
      * and lower priorities getting the remainder power.
+     *
+     * \param name the name of the gain element
      * \param gain_fcns the set of gain functions
      * \param priority the priority of the gain element
      */
     virtual void register_fcns(
-        const gain_fcns_t &gain_fcns, size_t priority = 0
+        const std::string &name,
+        const gain_fcns_t &gain_fcns,
+        size_t priority = 0
     ) = 0;
 
     /*!
diff --git a/host/lib/types.cpp b/host/lib/types.cpp
index f957cd83f..6aa82b012 100644
--- a/host/lib/types.cpp
+++ b/host/lib/types.cpp
@@ -124,14 +124,14 @@ time_spec_t::time_spec_t(time_t full_secs, double frac_secs):
     /* NOP */
 }
 
-time_spec_t::time_spec_t(time_t full_secs, size_t tick_count, double tick_rate):
+time_spec_t::time_spec_t(time_t full_secs, long tick_count, double tick_rate):
     _full_secs(full_secs),
     _frac_secs(double(tick_count)/tick_rate)
 {
     /* NOP */
 }
 
-size_t time_spec_t::get_tick_count(double tick_rate) const{
+long time_spec_t::get_tick_count(double tick_rate) const{
     return boost::math::iround(this->get_frac_secs()*tick_rate);
 }
 
@@ -140,7 +140,9 @@ double time_spec_t::get_real_secs(void) const{
 }
 
 time_t time_spec_t::get_full_secs(void) const{
-    return this->_full_secs + time_t(std::floor(this->_frac_secs));
+    double intpart;
+    std::modf(this->_frac_secs, &intpart);
+    return this->_full_secs + time_t(intpart);
 }
 
 double time_spec_t::get_frac_secs(void) const{
@@ -160,13 +162,18 @@ time_spec_t &time_spec_t::operator-=(const time_spec_t &rhs){
 }
 
 bool uhd::operator==(const time_spec_t &lhs, const time_spec_t &rhs){
-    return lhs.get_full_secs() == rhs.get_full_secs() and lhs.get_frac_secs() == rhs.get_frac_secs();
+    return
+        lhs.get_full_secs() == rhs.get_full_secs() and
+        lhs.get_frac_secs() == rhs.get_frac_secs()
+    ;
 }
 
 bool uhd::operator<(const time_spec_t &lhs, const time_spec_t &rhs){
-    if (lhs.get_full_secs() < rhs.get_full_secs()) return true;
-    if (lhs.get_full_secs() > rhs.get_full_secs()) return false;
-    return lhs.get_frac_secs() < rhs.get_frac_secs();
+    return (
+        (lhs.get_full_secs() < rhs.get_full_secs()) or (
+        (lhs.get_full_secs() == rhs.get_full_secs()) and
+        (lhs.get_frac_secs() < rhs.get_frac_secs())
+    ));
 }
 
 /***********************************************************************
diff --git a/host/lib/usrp/CMakeLists.txt b/host/lib/usrp/CMakeLists.txt
index 69a190bfa..eeb181e0b 100644
--- a/host/lib/usrp/CMakeLists.txt
+++ b/host/lib/usrp/CMakeLists.txt
@@ -23,12 +23,12 @@ LIBUHD_APPEND_SOURCES(
     ${CMAKE_SOURCE_DIR}/lib/usrp/dboard_id.cpp
     ${CMAKE_SOURCE_DIR}/lib/usrp/dboard_manager.cpp
     ${CMAKE_SOURCE_DIR}/lib/usrp/dsp_utils.cpp
-    ${CMAKE_SOURCE_DIR}/lib/usrp/mimo_usrp.cpp
     ${CMAKE_SOURCE_DIR}/lib/usrp/misc_utils.cpp
-    ${CMAKE_SOURCE_DIR}/lib/usrp/simple_usrp.cpp
+    ${CMAKE_SOURCE_DIR}/lib/usrp/multi_usrp.cpp
     ${CMAKE_SOURCE_DIR}/lib/usrp/single_usrp.cpp
     ${CMAKE_SOURCE_DIR}/lib/usrp/subdev_spec.cpp
     ${CMAKE_SOURCE_DIR}/lib/usrp/tune_helper.cpp
+    ${CMAKE_SOURCE_DIR}/lib/usrp/wrapper_utils.hpp
 )
 
 INCLUDE(${CMAKE_SOURCE_DIR}/lib/usrp/dboard/CMakeLists.txt)
diff --git a/host/lib/usrp/dboard/db_dbsrx.cpp b/host/lib/usrp/dboard/db_dbsrx.cpp
index 99137dda3..0b8b4db83 100644
--- a/host/lib/usrp/dboard/db_dbsrx.cpp
+++ b/host/lib/usrp/dboard/db_dbsrx.cpp
@@ -69,7 +69,7 @@ public:
 
 private:
     double _lo_freq;
-    float _bandwidth;
+    double _bandwidth;
     uhd::dict<std::string, float> _gains;
     max2118_write_regs_t _max2118_write_regs;
     max2118_read_regs_t _max2118_read_regs;
@@ -79,7 +79,7 @@ private:
 
     void set_lo_freq(double target_freq);
     void set_gain(float gain, const std::string &name);
-    void set_bandwidth(float bandwidth);
+    void set_bandwidth(double bandwidth);
 
     void send_reg(boost::uint8_t start_reg, boost::uint8_t stop_reg){
         start_reg = boost::uint8_t(std::clip(int(start_reg), 0x0, 0x5));
@@ -162,15 +162,10 @@ static dboard_base::sptr make_dbsrx(dboard_base::ctor_args_t args){
     return dboard_base::sptr(new dbsrx(args));
 }
 
-//dbid for USRP2 version
 UHD_STATIC_BLOCK(reg_dbsrx_dboard){
-    //register the factory function for the rx dbid
+    //register the factory function for the rx dbid (others version)
     dboard_manager::register_dboard(0x000D, &make_dbsrx, "DBSRX");
-}
-
-//dbid for USRP1 version
-UHD_STATIC_BLOCK(reg_dbsrx_on_usrp1_dboard){
-    //register the factory function for the rx dbid
+    //register the factory function for the rx dbid (USRP1 version)
     dboard_manager::register_dboard(0x0002, &make_dbsrx, "DBSRX");
 }
 
@@ -482,9 +477,9 @@ void dbsrx::set_gain(float gain, const std::string &name){
 /***********************************************************************
  * Bandwidth Handling
  **********************************************************************/
-void dbsrx::set_bandwidth(float bandwidth){
+void dbsrx::set_bandwidth(double bandwidth){
     //clip the input
-    bandwidth = std::clip<float>(bandwidth, 4e6, 33e6);
+    bandwidth = std::clip<double>(bandwidth, 4e6, 33e6);
 
     double ref_clock = this->get_iface()->get_clock_rate(dboard_iface::UNIT_RX);
     
@@ -494,7 +489,7 @@ void dbsrx::set_bandwidth(float bandwidth){
     _max2118_write_regs.f_dac = std::clip<int>(int((((bandwidth*_max2118_write_regs.m_divider)/ref_clock) - 4)/0.145),0,127);
 
     //determine actual bandwidth
-    _bandwidth = float((ref_clock/(_max2118_write_regs.m_divider))*(4+0.145*_max2118_write_regs.f_dac));
+    _bandwidth = double((ref_clock/(_max2118_write_regs.m_divider))*(4+0.145*_max2118_write_regs.f_dac));
 
     if (dbsrx_debug) std::cerr << boost::format(
         "DBSRX Filter Bandwidth: %f MHz, m: %d, f_dac: %d\n"
@@ -565,12 +560,6 @@ void dbsrx::rx_get(const wax::obj &key_, wax::obj &val){
         val = this->get_locked();
         return;
 
-/*
-    case SUBDEV_PROP_RSSI:
-        val = this->get_rssi();
-        return;
-*/
-
     case SUBDEV_PROP_BANDWIDTH:
         val = _bandwidth;
         return;
@@ -597,7 +586,7 @@ void dbsrx::rx_set(const wax::obj &key_, const wax::obj &val){
         return; //always enabled
 
     case SUBDEV_PROP_BANDWIDTH:
-        this->set_bandwidth(val.as<float>());
+        this->set_bandwidth(val.as<double>());
         return;
 
     default: UHD_THROW_PROP_SET_ERROR();
diff --git a/host/lib/usrp/dboard/db_rfx.cpp b/host/lib/usrp/dboard/db_rfx.cpp
index cfc34381e..3c24d90db 100644
--- a/host/lib/usrp/dboard/db_rfx.cpp
+++ b/host/lib/usrp/dboard/db_rfx.cpp
@@ -152,12 +152,12 @@ static dboard_base::sptr make_rfx_flex2400(dboard_base::ctor_args_t args){
 }
 
 UHD_STATIC_BLOCK(reg_rfx_dboards){
-    dboard_manager::register_dboard(0x0024, 0x0028, &make_rfx_flex400,  "Flex 400 MIMO B");
-    dboard_manager::register_dboard(0x0025, 0x0029, &make_rfx_flex900,  "Flex 900 MIMO B");
-    dboard_manager::register_dboard(0x0034, 0x0035, &make_rfx_flex1800, "Flex 1800 MIMO B");
-    dboard_manager::register_dboard(0x0026, 0x002a, &make_rfx_flex1200, "Flex 1200 MIMO B");
-    dboard_manager::register_dboard(0x002c, 0x002d, &make_rfx_flex2200, "Flex 2200 MIMO B");
-    dboard_manager::register_dboard(0x0027, 0x002b, &make_rfx_flex2400, "Flex 2400 MIMO B");
+    dboard_manager::register_dboard(0x0024, 0x0028, &make_rfx_flex400,  "RFX400");
+    dboard_manager::register_dboard(0x0025, 0x0029, &make_rfx_flex900,  "RFX900");
+    dboard_manager::register_dboard(0x0034, 0x0035, &make_rfx_flex1800, "RFX1800");
+    dboard_manager::register_dboard(0x0026, 0x002a, &make_rfx_flex1200, "RFX1200");
+    dboard_manager::register_dboard(0x002c, 0x002d, &make_rfx_flex2200, "RFX2200");
+    dboard_manager::register_dboard(0x0027, 0x002b, &make_rfx_flex2400, "RFX2400");
 }
 
 /***********************************************************************
diff --git a/host/lib/usrp/dboard/db_tvrx.cpp b/host/lib/usrp/dboard/db_tvrx.cpp
index 10be8d1c3..d39dc3bf8 100644
--- a/host/lib/usrp/dboard/db_tvrx.cpp
+++ b/host/lib/usrp/dboard/db_tvrx.cpp
@@ -179,7 +179,7 @@ static dboard_base::sptr make_tvrx(dboard_base::ctor_args_t args){
 
 UHD_STATIC_BLOCK(reg_tvrx_dboard){
     //register the factory function for the rx dbid
-    dboard_manager::register_dboard(0x0040, &make_tvrx, "tvrx");
+    dboard_manager::register_dboard(0x0040, &make_tvrx, "TVRX");
 }
 
 /***********************************************************************
diff --git a/host/lib/usrp/dboard/db_xcvr2450.cpp b/host/lib/usrp/dboard/db_xcvr2450.cpp
index 314c85a69..fb1367113 100644
--- a/host/lib/usrp/dboard/db_xcvr2450.cpp
+++ b/host/lib/usrp/dboard/db_xcvr2450.cpp
@@ -102,7 +102,7 @@ public:
 
 private:
     double _lo_freq;
-    float _rx_bandwidth, _tx_bandwidth;
+    double _rx_bandwidth, _tx_bandwidth;
     uhd::dict<std::string, float> _tx_gains, _rx_gains;
     std::string _tx_ant, _rx_ant;
     int _ad9515div;
@@ -113,8 +113,8 @@ private:
     void set_rx_ant(const std::string &ant);
     void set_tx_gain(float gain, const std::string &name);
     void set_rx_gain(float gain, const std::string &name);
-    void set_rx_bandwidth(float bandwidth);
-    void set_tx_bandwidth(float bandwidth);
+    void set_rx_bandwidth(double bandwidth);
+    void set_tx_bandwidth(double bandwidth);
 
     void update_atr(void);
     void spi_reset(void);
@@ -455,7 +455,7 @@ void xcvr2450::set_rx_gain(float gain, const std::string &name){
 /***********************************************************************
  * Bandwidth Handling
  **********************************************************************/
-static max2829_regs_t::tx_lpf_coarse_adj_t bandwidth_to_tx_lpf_coarse_reg(float &bandwidth){
+static max2829_regs_t::tx_lpf_coarse_adj_t bandwidth_to_tx_lpf_coarse_reg(double &bandwidth){
     int reg = std::clip(boost::math::iround((bandwidth-6.0e6)/6.0e6), 1, 3);
 
     switch(reg){
@@ -472,7 +472,7 @@ static max2829_regs_t::tx_lpf_coarse_adj_t bandwidth_to_tx_lpf_coarse_reg(float
     UHD_THROW_INVALID_CODE_PATH();
 }
 
-static max2829_regs_t::rx_lpf_fine_adj_t bandwidth_to_rx_lpf_fine_reg(float &bandwidth, float requested_bandwidth){
+static max2829_regs_t::rx_lpf_fine_adj_t bandwidth_to_rx_lpf_fine_reg(double &bandwidth, double requested_bandwidth){
     int reg = std::clip(boost::math::iround((requested_bandwidth/bandwidth)/0.05), 18, 22);
 
     switch(reg){
@@ -495,7 +495,7 @@ static max2829_regs_t::rx_lpf_fine_adj_t bandwidth_to_rx_lpf_fine_reg(float &ban
     UHD_THROW_INVALID_CODE_PATH();
 }
 
-static max2829_regs_t::rx_lpf_coarse_adj_t bandwidth_to_rx_lpf_coarse_reg(float &bandwidth){
+static max2829_regs_t::rx_lpf_coarse_adj_t bandwidth_to_rx_lpf_coarse_reg(double &bandwidth){
     int reg = std::clip(boost::math::iround((bandwidth-7.0e6)/1.0e6), 0, 11);
 
     switch(reg){
@@ -523,8 +523,8 @@ static max2829_regs_t::rx_lpf_coarse_adj_t bandwidth_to_rx_lpf_coarse_reg(float
     UHD_THROW_INVALID_CODE_PATH();
 }
 
-void xcvr2450::set_rx_bandwidth(float bandwidth){
-    float requested_bandwidth = bandwidth;
+void xcvr2450::set_rx_bandwidth(double bandwidth){
+    double requested_bandwidth = bandwidth;
 
     //compute coarse low pass cutoff frequency setting
     _max2829_regs.rx_lpf_coarse_adj = bandwidth_to_rx_lpf_coarse_reg(bandwidth);
@@ -543,7 +543,7 @@ void xcvr2450::set_rx_bandwidth(float bandwidth){
     ) % _rx_bandwidth % (int(_max2829_regs.rx_lpf_coarse_adj)) % (int(_max2829_regs.rx_lpf_fine_adj)) << std::endl;
 }
 
-void xcvr2450::set_tx_bandwidth(float bandwidth){
+void xcvr2450::set_tx_bandwidth(double bandwidth){
     //compute coarse low pass cutoff frequency setting
     _max2829_regs.tx_lpf_coarse_adj = bandwidth_to_tx_lpf_coarse_reg(bandwidth);
 
@@ -652,7 +652,7 @@ void xcvr2450::rx_set(const wax::obj &key_, const wax::obj &val){
         return;
 
     case SUBDEV_PROP_BANDWIDTH:
-        this->set_rx_bandwidth(val.as<float>());
+        this->set_rx_bandwidth(val.as<double>());
         return;
 
     case SUBDEV_PROP_ENABLED:
@@ -747,7 +747,7 @@ void xcvr2450::tx_set(const wax::obj &key_, const wax::obj &val){
         return;
 
     case SUBDEV_PROP_BANDWIDTH:
-        this->set_tx_bandwidth(val.as<float>());
+        this->set_tx_bandwidth(val.as<double>());
         return;
 
     case SUBDEV_PROP_ANTENNA:
diff --git a/host/lib/usrp/dboard_manager.cpp b/host/lib/usrp/dboard_manager.cpp
index 78daa1b4d..d73a698ae 100644
--- a/host/lib/usrp/dboard_manager.cpp
+++ b/host/lib/usrp/dboard_manager.cpp
@@ -69,20 +69,21 @@ void dboard_manager::register_dboard(
     const prop_names_t &subdev_names
 ){
     //regular registration for ids
-    register_dboard(rx_dboard_id, dboard_ctor, name + " RX", subdev_names);
-    register_dboard(tx_dboard_id, dboard_ctor, name + " TX", subdev_names);
+    register_dboard(rx_dboard_id, dboard_ctor, name, subdev_names);
+    register_dboard(tx_dboard_id, dboard_ctor, name, subdev_names);
 
     //register xcvr mapping for ids
     get_xcvr_id_to_id_map()[rx_dboard_id] = tx_dboard_id;
     get_xcvr_id_to_id_map()[tx_dboard_id] = rx_dboard_id;
 }
 
+std::string dboard_id_t::to_cname(void) const{
+    if (not get_id_to_args_map().has_key(*this)) return "Unknown";
+    return get_id_to_args_map()[*this].get<1>();
+}
+
 std::string dboard_id_t::to_pp_string(void) const{
-    std::string name = "unknown";
-    if (get_id_to_args_map().has_key(*this)){
-        name = get_id_to_args_map()[*this].get<1>();
-    }
-    return str(boost::format("%s (%s)") % name % this->to_string());
+    return str(boost::format("%s (%s)") % this->to_cname() % this->to_string());
 }
 
 /***********************************************************************
diff --git a/host/lib/usrp/mimo_usrp.cpp b/host/lib/usrp/mimo_usrp.cpp
deleted file mode 100644
index 08618c288..000000000
--- a/host/lib/usrp/mimo_usrp.cpp
+++ /dev/null
@@ -1,351 +0,0 @@
-//
-// Copyright 2010 Ettus Research LLC
-//
-// This program 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 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-#include <uhd/usrp/mimo_usrp.hpp>
-#include <uhd/usrp/tune_helper.hpp>
-#include <uhd/utils/assert.hpp>
-#include <uhd/utils/gain_group.hpp>
-#include <uhd/utils/algorithm.hpp>
-#include <uhd/utils/warning.hpp>
-#include <uhd/usrp/subdev_props.hpp>
-#include <uhd/usrp/mboard_props.hpp>
-#include <uhd/usrp/device_props.hpp>
-#include <uhd/usrp/dboard_props.hpp>
-#include <uhd/usrp/dsp_props.hpp>
-#include <boost/foreach.hpp>
-#include <boost/format.hpp>
-#include <boost/thread.hpp>
-#include <stdexcept>
-#include <iostream>
-
-using namespace uhd;
-using namespace uhd::usrp;
-
-static inline freq_range_t add_dsp_shift(const freq_range_t &range, wax::obj dsp){
-    double codec_rate = dsp[DSP_PROP_CODEC_RATE].as<double>();
-    return freq_range_t(range.min - codec_rate/2.0, range.max + codec_rate/2.0);
-}
-
-/***********************************************************************
- * MIMO USRP Implementation
- **********************************************************************/
-class mimo_usrp_impl : public mimo_usrp{
-public:
-    mimo_usrp_impl(const device_addr_t &addr){
-        _dev = device::make(addr);
-
-        //set the clock config across all mboards (TODO set through api)
-        clock_config_t clock_config;
-        clock_config.ref_source = clock_config_t::REF_SMA;
-        clock_config.pps_source = clock_config_t::PPS_SMA;
-        for (size_t chan = 0; chan < get_num_channels(); chan++){
-            _mboard(chan)[MBOARD_PROP_CLOCK_CONFIG] = clock_config;
-        }
-    }
-
-    ~mimo_usrp_impl(void){
-        /* NOP */
-    }
-
-    device::sptr get_device(void){
-        return _dev;
-    }
-
-    std::string get_pp_string(void){
-        std::string buff = str(boost::format(
-            "MIMO USRP:\n"
-            "  Device: %s\n"
-        )
-            % (*_dev)[DEVICE_PROP_NAME].as<std::string>()
-        );
-        for (size_t chan = 0; chan < get_num_channels(); chan++){
-            buff += str(boost::format(
-                "  Channel: %u\n"
-                "    Mboard: %s\n"
-                "    RX DSP: %s\n"
-                "    RX Dboard: %s\n"
-                "    RX Subdev: %s\n"
-                "    TX DSP: %s\n"
-                "    TX Dboard: %s\n"
-                "    TX Subdev: %s\n"
-            ) % chan
-                % _mboard(chan)[MBOARD_PROP_NAME].as<std::string>()
-                % _rx_dsp(chan)[DSP_PROP_NAME].as<std::string>()
-                % _rx_dboard(chan)[DBOARD_PROP_NAME].as<std::string>()
-                % _rx_subdev(chan)[SUBDEV_PROP_NAME].as<std::string>()
-                % _tx_dsp(chan)[DSP_PROP_NAME].as<std::string>()
-                % _tx_dboard(chan)[DBOARD_PROP_NAME].as<std::string>()
-                % _tx_subdev(chan)[SUBDEV_PROP_NAME].as<std::string>()
-            );
-        }
-        return buff;
-    }
-
-    size_t get_num_channels(void){
-        return (*_dev)[DEVICE_PROP_MBOARD_NAMES].as<prop_names_t>().size();
-    }
-
-    /*******************************************************************
-     * Misc
-     ******************************************************************/
-    time_spec_t get_time_now(void){
-        //the time on the first mboard better be the same on all
-        return _mboard(0)[MBOARD_PROP_TIME_NOW].as<time_spec_t>();
-    }
-
-    void set_time_next_pps(const time_spec_t &time_spec){
-        for (size_t chan = 0; chan < get_num_channels(); chan++){
-            _mboard(chan)[MBOARD_PROP_TIME_NEXT_PPS] = time_spec;
-        }
-    }
-
-    void set_time_unknown_pps(const time_spec_t &time_spec){
-        std::cout << "Set time with unknown pps edge:" << std::endl;
-        std::cout << "    1) set times next pps (race condition)" << std::endl;
-        set_time_next_pps(time_spec);
-        boost::this_thread::sleep(boost::posix_time::seconds(1));
-
-        std::cout << "    2) catch seconds rollover at pps edge" << std::endl;
-        time_t last_secs = 0, curr_secs = 0;
-        while(curr_secs == last_secs){
-            last_secs = curr_secs;
-            curr_secs = get_time_now().get_full_secs();
-        }
-
-        std::cout << "    3) set times next pps (synchronously)" << std::endl;
-        set_time_next_pps(time_spec);
-        boost::this_thread::sleep(boost::posix_time::seconds(1));
-
-        //verify that the time registers are read to be within a few RTT
-        for (size_t chan = 1; chan < get_num_channels(); chan++){
-            time_spec_t time_0 = _mboard(0)[MBOARD_PROP_TIME_NOW].as<time_spec_t>();
-            time_spec_t time_i = _mboard(chan)[MBOARD_PROP_TIME_NOW].as<time_spec_t>();
-            if (time_i < time_0 or (time_i - time_0) > time_spec_t(0.01)){ //10 ms: greater than RTT but not too big
-                uhd::print_warning(str(boost::format(
-                    "Detected time deviation between board %d and board 0.\n"
-                    "Board 0 time is %f seconds.\n"
-                    "Board %d time is %f seconds.\n"
-                ) % chan % time_0.get_real_secs() % chan % time_i.get_real_secs()));
-            }
-        }
-    }
-
-    void issue_stream_cmd(const stream_cmd_t &stream_cmd){
-        for (size_t chan = 0; chan < get_num_channels(); chan++){
-            _mboard(chan)[MBOARD_PROP_STREAM_CMD] = stream_cmd;
-        }
-    }
-
-    /*******************************************************************
-     * RX methods
-     ******************************************************************/
-    void set_rx_subdev_spec(size_t chan, const subdev_spec_t &spec){
-        UHD_ASSERT_THROW(spec.size() <= 1);
-        _mboard(chan)[MBOARD_PROP_RX_SUBDEV_SPEC] = spec;
-    }
-
-    subdev_spec_t get_rx_subdev_spec(size_t chan){
-        return _mboard(chan)[MBOARD_PROP_RX_SUBDEV_SPEC].as<subdev_spec_t>();
-    }
-
-    void set_rx_rate_all(double rate){
-        std::vector<double> _actual_rates;
-        for (size_t chan = 0; chan < get_num_channels(); chan++){
-            _rx_dsp(chan)[DSP_PROP_HOST_RATE] = rate;
-            _actual_rates.push_back(_rx_dsp(chan)[DSP_PROP_HOST_RATE].as<double>());
-        }
-        _rx_rate = _actual_rates.front();
-        if (std::count(_actual_rates, _rx_rate) != _actual_rates.size()) throw std::runtime_error(
-            "MIMO configuratio error: rx rate inconsistent across mboards"
-        );
-    }
-
-    double get_rx_rate_all(void){
-        return _rx_rate;
-    }
-
-    tune_result_t set_rx_freq(size_t chan, double target_freq){
-        return tune_rx_subdev_and_dsp(_rx_subdev(chan), _rx_dsp(chan), 0, target_freq);
-    }
-
-    tune_result_t set_rx_freq(size_t chan, double target_freq, double lo_off){
-        return tune_rx_subdev_and_dsp(_rx_subdev(chan), _rx_dsp(chan), 0, target_freq, lo_off);
-    }
-
-    double get_rx_freq(size_t chan){
-        return derive_freq_from_rx_subdev_and_dsp(_rx_subdev(chan), _rx_dsp(chan), 0);
-    }
-
-    freq_range_t get_rx_freq_range(size_t chan){
-        return add_dsp_shift(_rx_subdev(chan)[SUBDEV_PROP_FREQ_RANGE].as<freq_range_t>(), _rx_dsp(chan));
-    }
-
-    void set_rx_gain(size_t chan, float gain){
-        return _rx_gain_group(chan)->set_value(gain);
-    }
-
-    float get_rx_gain(size_t chan){
-        return _rx_gain_group(chan)->get_value();
-    }
-
-    gain_range_t get_rx_gain_range(size_t chan){
-        return _rx_gain_group(chan)->get_range();
-    }
-
-    void set_rx_antenna(size_t chan, const std::string &ant){
-        _rx_subdev(chan)[SUBDEV_PROP_ANTENNA] = ant;
-    }
-
-    std::string get_rx_antenna(size_t chan){
-        return _rx_subdev(chan)[SUBDEV_PROP_ANTENNA].as<std::string>();
-    }
-
-    std::vector<std::string> get_rx_antennas(size_t chan){
-        return _rx_subdev(chan)[SUBDEV_PROP_ANTENNA_NAMES].as<prop_names_t>();
-    }
-
-    bool get_rx_lo_locked(size_t chan){
-        return _rx_subdev(chan)[SUBDEV_PROP_LO_LOCKED].as<bool>();
-    }
-
-    float read_rssi(size_t chan){
-        return _rx_subdev(chan)[SUBDEV_PROP_RSSI].as<float>();
-    }
-    
-    void set_rx_bandwidth(size_t chan, float bandwidth){
-        _rx_subdev(chan)[SUBDEV_PROP_BANDWIDTH] = bandwidth;
-    }
-
-    /*******************************************************************
-     * TX methods
-     ******************************************************************/
-    void set_tx_subdev_spec(size_t chan, const subdev_spec_t &spec){
-        UHD_ASSERT_THROW(spec.size() <= 1);
-        _mboard(chan)[MBOARD_PROP_TX_SUBDEV_SPEC] = spec;
-    }
-
-    subdev_spec_t get_tx_subdev_spec(size_t chan){
-        return _mboard(chan)[MBOARD_PROP_TX_SUBDEV_SPEC].as<subdev_spec_t>();
-    }
-
-    void set_tx_rate_all(double rate){
-        std::vector<double> _actual_rates;
-        for (size_t chan = 0; chan < get_num_channels(); chan++){
-            _tx_dsp(chan)[DSP_PROP_HOST_RATE] = rate;
-            _actual_rates.push_back(_tx_dsp(chan)[DSP_PROP_HOST_RATE].as<double>());
-        }
-        _tx_rate = _actual_rates.front();
-        if (std::count(_actual_rates, _tx_rate) != _actual_rates.size()) throw std::runtime_error(
-            "MIMO configuratio error: tx rate inconsistent across mboards"
-        );
-    }
-
-    double get_tx_rate_all(void){
-        return _tx_rate;
-    }
-
-    tune_result_t set_tx_freq(size_t chan, double target_freq){
-        return tune_tx_subdev_and_dsp(_tx_subdev(chan), _tx_dsp(chan), 0, target_freq);
-    }
-
-    tune_result_t set_tx_freq(size_t chan, double target_freq, double lo_off){
-        return tune_tx_subdev_and_dsp(_tx_subdev(chan), _tx_dsp(chan), 0, target_freq, lo_off);
-    }
-
-    double get_tx_freq(size_t chan){
-        return derive_freq_from_tx_subdev_and_dsp(_tx_subdev(chan), _tx_dsp(chan), 0);
-    }
-
-    freq_range_t get_tx_freq_range(size_t chan){
-        return add_dsp_shift(_tx_subdev(chan)[SUBDEV_PROP_FREQ_RANGE].as<freq_range_t>(), _tx_dsp(chan));
-    }
-
-    void set_tx_gain(size_t chan, float gain){
-        return _tx_gain_group(chan)->set_value(gain);
-    }
-
-    float get_tx_gain(size_t chan){
-        return _tx_gain_group(chan)->get_value();
-    }
-
-    gain_range_t get_tx_gain_range(size_t chan){
-        return _tx_gain_group(chan)->get_range();
-    }
-
-    void set_tx_antenna(size_t chan, const std::string &ant){
-        _tx_subdev(chan)[SUBDEV_PROP_ANTENNA] = ant;
-    }
-
-    std::string get_tx_antenna(size_t chan){
-        return _tx_subdev(chan)[SUBDEV_PROP_ANTENNA].as<std::string>();
-    }
-
-    std::vector<std::string> get_tx_antennas(size_t chan){
-        return _tx_subdev(chan)[SUBDEV_PROP_ANTENNA_NAMES].as<prop_names_t>();
-    }
-
-    bool get_tx_lo_locked(size_t chan){
-        return _tx_subdev(chan)[SUBDEV_PROP_LO_LOCKED].as<bool>();
-    }
-
-private:
-    device::sptr _dev;
-    wax::obj _mboard(size_t chan){
-        prop_names_t names = (*_dev)[DEVICE_PROP_MBOARD_NAMES].as<prop_names_t>();
-        return (*_dev)[named_prop_t(DEVICE_PROP_MBOARD, names.at(chan))];
-    }
-    wax::obj _rx_dsp(size_t chan){
-        return _mboard(chan)[MBOARD_PROP_RX_DSP];
-    }
-    wax::obj _tx_dsp(size_t chan){
-        return _mboard(chan)[MBOARD_PROP_TX_DSP];
-    }
-    wax::obj _rx_dboard(size_t chan){
-        std::string db_name = _mboard(chan)[MBOARD_PROP_RX_SUBDEV_SPEC].as<subdev_spec_t>().front().db_name;
-        return _mboard(chan)[named_prop_t(MBOARD_PROP_RX_DBOARD, db_name)];
-    }
-    wax::obj _tx_dboard(size_t chan){
-        std::string db_name = _mboard(chan)[MBOARD_PROP_TX_SUBDEV_SPEC].as<subdev_spec_t>().front().db_name;
-        return _mboard(chan)[named_prop_t(MBOARD_PROP_TX_DBOARD, db_name)];
-    }
-    wax::obj _rx_subdev(size_t chan){
-        std::string sd_name = _mboard(chan)[MBOARD_PROP_RX_SUBDEV_SPEC].as<subdev_spec_t>().front().sd_name;
-        return _rx_dboard(chan)[named_prop_t(DBOARD_PROP_SUBDEV, sd_name)];
-    }
-    wax::obj _tx_subdev(size_t chan){
-        std::string sd_name = _mboard(chan)[MBOARD_PROP_TX_SUBDEV_SPEC].as<subdev_spec_t>().front().sd_name;
-        return _tx_dboard(chan)[named_prop_t(DBOARD_PROP_SUBDEV, sd_name)];
-    }
-    gain_group::sptr _rx_gain_group(size_t chan){
-        std::string sd_name = _mboard(chan)[MBOARD_PROP_RX_SUBDEV_SPEC].as<subdev_spec_t>().front().sd_name;
-        return _rx_dboard(chan)[named_prop_t(DBOARD_PROP_GAIN_GROUP, sd_name)].as<gain_group::sptr>();
-    }
-    gain_group::sptr _tx_gain_group(size_t chan){
-        std::string sd_name = _mboard(chan)[MBOARD_PROP_TX_SUBDEV_SPEC].as<subdev_spec_t>().front().sd_name;
-        return _tx_dboard(chan)[named_prop_t(DBOARD_PROP_GAIN_GROUP, sd_name)].as<gain_group::sptr>();
-    }
-
-    //shadows
-    double _rx_rate, _tx_rate;
-};
-
-/***********************************************************************
- * The Make Function
- **********************************************************************/
-mimo_usrp::sptr mimo_usrp::make(const device_addr_t &dev_addr){
-    return sptr(new mimo_usrp_impl(dev_addr));
-}
diff --git a/host/lib/usrp/misc_utils.cpp b/host/lib/usrp/misc_utils.cpp
index 05308baba..7e49baa52 100644
--- a/host/lib/usrp/misc_utils.cpp
+++ b/host/lib/usrp/misc_utils.cpp
@@ -80,6 +80,7 @@ static void set_subdev_gain(wax::obj subdev, const std::string &name, float gain
  * gain group factory function for usrp
  **********************************************************************/
 gain_group::sptr usrp::make_gain_group(
+    const dboard_id_t &dboard_id,
     wax::obj subdev, wax::obj codec,
     gain_group_policy_t gain_group_policy
 ){
@@ -87,6 +88,8 @@ gain_group::sptr usrp::make_gain_group(
     const size_t codec_gain_priority = (gain_group_policy == GAIN_GROUP_POLICY_RX)?
         (subdev_gain_priority - 1): //RX policy, codec gains fill last (lower priority)
         (subdev_gain_priority + 1); //TX policy, codec gains fill first (higher priority)
+    const std::string subdev_prefix = dboard_id.to_cname() + "-";
+    const std::string codec_prefix = (gain_group_policy == GAIN_GROUP_POLICY_RX)? "ADC-" : "DAC-";
 
     gain_group::sptr gg = gain_group::make();
     gain_fcns_t fcns;
@@ -95,7 +98,7 @@ gain_group::sptr usrp::make_gain_group(
         fcns.get_range = boost::bind(&get_subdev_gain_range, subdev, name);
         fcns.get_value = boost::bind(&get_subdev_gain, subdev, name);
         fcns.set_value = boost::bind(&set_subdev_gain, subdev, name, _1);
-        gg->register_fcns(fcns, subdev_gain_priority);
+        gg->register_fcns(subdev_prefix+name, fcns, subdev_gain_priority);
     }
     //add all the codec gains last (antenna to dsp order)
     BOOST_FOREACH(const std::string &name, codec[CODEC_PROP_GAIN_NAMES].as<prop_names_t>()){
@@ -119,7 +122,7 @@ gain_group::sptr usrp::make_gain_group(
             fcns.set_value = boost::bind(&set_codec_gain_q, codec, name, _1);
             break;
         }
-        gg->register_fcns(fcns, codec_gain_priority);
+        gg->register_fcns(codec_prefix+name, fcns, codec_gain_priority);
     }
     return gg;
 }
diff --git a/host/lib/usrp/multi_usrp.cpp b/host/lib/usrp/multi_usrp.cpp
new file mode 100644
index 000000000..443b91594
--- /dev/null
+++ b/host/lib/usrp/multi_usrp.cpp
@@ -0,0 +1,445 @@
+//
+// Copyright 2010 Ettus Research LLC
+//
+// This program 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 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#include "wrapper_utils.hpp"
+#include <uhd/usrp/multi_usrp.hpp>
+#include <uhd/usrp/tune_helper.hpp>
+#include <uhd/utils/assert.hpp>
+#include <uhd/utils/warning.hpp>
+#include <uhd/utils/gain_group.hpp>
+#include <uhd/usrp/subdev_props.hpp>
+#include <uhd/usrp/mboard_props.hpp>
+#include <uhd/usrp/device_props.hpp>
+#include <uhd/usrp/dboard_props.hpp>
+#include <uhd/usrp/dsp_props.hpp>
+#include <boost/thread.hpp>
+#include <boost/foreach.hpp>
+#include <boost/format.hpp>
+#include <stdexcept>
+#include <iostream>
+
+using namespace uhd;
+using namespace uhd::usrp;
+
+const std::string multi_usrp::ALL_GAINS = "";
+
+/***********************************************************************
+ * Simple USRP Implementation
+ **********************************************************************/
+class multi_usrp_impl : public multi_usrp{
+public:
+    multi_usrp_impl(const device_addr_t &addr){
+        _dev = device::make(addr);
+    }
+
+    device::sptr get_device(void){
+        return _dev;
+    }
+
+    /*******************************************************************
+     * Mboard methods
+     ******************************************************************/
+    std::string get_pp_string(void){
+        std::string buff = str(boost::format(
+            "Multi USRP:\n"
+            "  Device: %s\n"
+        )
+            % (*_dev)[DEVICE_PROP_NAME].as<std::string>()
+        );
+        for (size_t m = 0; m < get_num_mboards(); m++){
+            buff += str(boost::format(
+                "  Mboard %d: %s\n"
+            ) % m
+                % _mboard(m)[MBOARD_PROP_NAME].as<std::string>()
+            );
+        }
+
+        //----------- rx side of life ----------------------------------
+        for (size_t m = 0, chan = 0; m < get_num_mboards(); m++){
+            buff += str(boost::format(
+                "  RX DSP %d: %s\n"
+            ) % m
+                % _rx_dsp(m)[DSP_PROP_NAME].as<std::string>()
+            );
+            for (; chan < (m + 1)*get_rx_subdev_spec(m).size(); chan++){
+                buff += str(boost::format(
+                    "  RX Channel: %u\n"
+                    "    RX Dboard: %s\n"
+                    "    RX Subdev: %s\n"
+                ) % chan
+                    % _rx_dboard(chan)[DBOARD_PROP_NAME].as<std::string>()
+                    % _rx_subdev(chan)[SUBDEV_PROP_NAME].as<std::string>()
+                );
+            }
+        }
+
+        //----------- tx side of life ----------------------------------
+        for (size_t m = 0, chan = 0; m < get_num_mboards(); m++){
+            buff += str(boost::format(
+                "  TX DSP %d: %s\n"
+            ) % m
+                % _tx_dsp(m)[DSP_PROP_NAME].as<std::string>()
+            );
+            for (; chan < (m + 1)*get_tx_subdev_spec(m).size(); chan++){
+                buff += str(boost::format(
+                    "  TX Channel: %u\n"
+                    "    TX Dboard: %s\n"
+                    "    TX Subdev: %s\n"
+                ) % chan
+                    % _tx_dboard(chan)[DBOARD_PROP_NAME].as<std::string>()
+                    % _tx_subdev(chan)[SUBDEV_PROP_NAME].as<std::string>()
+                );
+            }
+        }
+
+        return buff;
+    }
+
+    std::string get_mboard_name(size_t mboard){
+        return _mboard(mboard)[MBOARD_PROP_NAME].as<std::string>();
+    }
+
+    time_spec_t get_time_now(void){
+        return _mboard(0)[MBOARD_PROP_TIME_NOW].as<time_spec_t>();
+    }
+
+    void set_time_next_pps(const time_spec_t &time_spec){
+        for (size_t m = 0; m < get_num_mboards(); m++){
+            _mboard(m)[MBOARD_PROP_TIME_NEXT_PPS] = time_spec;
+        }
+    }
+
+    void set_time_unknown_pps(const time_spec_t &time_spec){
+        std::cout << "Set time with unknown pps edge:" << std::endl;
+        std::cout << "    1) set times next pps (race condition)" << std::endl;
+        set_time_next_pps(time_spec);
+        boost::this_thread::sleep(boost::posix_time::seconds(1));
+
+        std::cout << "    2) catch seconds rollover at pps edge" << std::endl;
+        time_t last_secs = 0, curr_secs = 0;
+        while(curr_secs == last_secs){
+            last_secs = curr_secs;
+            curr_secs = get_time_now().get_full_secs();
+        }
+
+        std::cout << "    3) set times next pps (synchronously)" << std::endl;
+        set_time_next_pps(time_spec);
+        boost::this_thread::sleep(boost::posix_time::seconds(1));
+
+        //verify that the time registers are read to be within a few RTT
+        for (size_t m = 1; m < get_num_mboards(); m++){
+            time_spec_t time_0 = _mboard(0)[MBOARD_PROP_TIME_NOW].as<time_spec_t>();
+            time_spec_t time_i = _mboard(m)[MBOARD_PROP_TIME_NOW].as<time_spec_t>();
+            if (time_i < time_0 or (time_i - time_0) > time_spec_t(0.01)){ //10 ms: greater than RTT but not too big
+                uhd::print_warning(str(boost::format(
+                    "Detected time deviation between board %d and board 0.\n"
+                    "Board 0 time is %f seconds.\n"
+                    "Board %d time is %f seconds.\n"
+                ) % m % time_0.get_real_secs() % m % time_i.get_real_secs()));
+            }
+        }
+    }
+
+    void issue_stream_cmd(const stream_cmd_t &stream_cmd){
+        for (size_t m = 0; m < get_num_mboards(); m++){
+            _mboard(m)[MBOARD_PROP_STREAM_CMD] = stream_cmd;
+        }
+    }
+
+    void set_clock_config(const clock_config_t &clock_config, size_t mboard){
+        if (mboard != ALL_MBOARDS){
+            _mboard(mboard)[MBOARD_PROP_CLOCK_CONFIG] = clock_config;
+            return;
+        }
+        for (size_t m = 0; m < get_num_mboards(); m++){
+            set_clock_config(clock_config, m);
+        }
+    }
+
+    size_t get_num_mboards(void){
+        return (*_dev)[DEVICE_PROP_MBOARD_NAMES].as<prop_names_t>().size();
+    }
+
+    /*******************************************************************
+     * RX methods
+     ******************************************************************/
+    void set_rx_subdev_spec(const subdev_spec_t &spec, size_t mboard){
+        if (mboard != ALL_MBOARDS){
+            _mboard(mboard)[MBOARD_PROP_RX_SUBDEV_SPEC] = spec;
+            return;
+        }
+        for (size_t m = 0; m < get_num_mboards(); m++){
+            set_rx_subdev_spec(spec, m);
+        }
+    }
+
+    subdev_spec_t get_rx_subdev_spec(size_t mboard){
+        return _mboard(mboard)[MBOARD_PROP_RX_SUBDEV_SPEC].as<subdev_spec_t>();
+    }
+
+    size_t get_rx_num_channels(void){
+        return rx_cpm()*get_num_mboards(); //total num channels
+    }
+
+    std::string get_rx_subdev_name(size_t chan){
+        return _rx_subdev(chan)[SUBDEV_PROP_NAME].as<std::string>();
+    }
+
+    void set_rx_rate(double rate){
+        for (size_t m = 0; m < get_num_mboards(); m++){
+            _rx_dsp(m)[DSP_PROP_HOST_RATE] = rate;
+        }
+        do_samp_rate_warning_message(rate, get_rx_rate(), "RX");
+    }
+
+    double get_rx_rate(void){
+        return _rx_dsp(0)[DSP_PROP_HOST_RATE].as<double>();
+    }
+
+    tune_result_t set_rx_freq(double target_freq, size_t chan){
+        tune_result_t r = tune_rx_subdev_and_dsp(_rx_subdev(chan), _rx_dsp(chan/rx_cpm()), chan%rx_cpm(), target_freq);
+        do_tune_freq_warning_message(target_freq, get_rx_freq(chan), "RX");
+        return r;
+    }
+
+    tune_result_t set_rx_freq(double target_freq, double lo_off, size_t chan){
+        tune_result_t r = tune_rx_subdev_and_dsp(_rx_subdev(chan), _rx_dsp(chan/rx_cpm()), chan%rx_cpm(), target_freq, lo_off);
+        do_tune_freq_warning_message(target_freq, get_rx_freq(chan), "RX");
+        return r;
+    }
+
+    double get_rx_freq(size_t chan){
+        return derive_freq_from_rx_subdev_and_dsp(_rx_subdev(chan), _rx_dsp(chan/rx_cpm()), chan%rx_cpm());
+    }
+
+    freq_range_t get_rx_freq_range(size_t chan){
+        return add_dsp_shift(_rx_subdev(chan)[SUBDEV_PROP_FREQ_RANGE].as<freq_range_t>(), _rx_dsp(chan/rx_cpm()));
+    }
+
+    void set_rx_gain(float gain, const std::string &name, size_t chan){
+        return _rx_gain_group(chan)->set_value(gain, name);
+    }
+
+    float get_rx_gain(const std::string &name, size_t chan){
+        return _rx_gain_group(chan)->get_value(name);
+    }
+
+    gain_range_t get_rx_gain_range(const std::string &name, size_t chan){
+        return _rx_gain_group(chan)->get_range(name);
+    }
+
+    std::vector<std::string> get_rx_gain_names(size_t chan){
+        return _rx_gain_group(chan)->get_names();
+    }
+
+    void set_rx_antenna(const std::string &ant, size_t chan){
+        _rx_subdev(chan)[SUBDEV_PROP_ANTENNA] = ant;
+    }
+
+    std::string get_rx_antenna(size_t chan){
+        return _rx_subdev(chan)[SUBDEV_PROP_ANTENNA].as<std::string>();
+    }
+
+    std::vector<std::string> get_rx_antennas(size_t chan){
+        return _rx_subdev(chan)[SUBDEV_PROP_ANTENNA_NAMES].as<prop_names_t>();
+    }
+
+    bool get_rx_lo_locked(size_t chan){
+        return _rx_subdev(chan)[SUBDEV_PROP_LO_LOCKED].as<bool>();
+    }
+
+    void set_rx_bandwidth(double bandwidth, size_t chan){
+        _rx_subdev(chan)[SUBDEV_PROP_BANDWIDTH] = bandwidth;
+    }
+
+    double get_rx_bandwidth(size_t chan){
+        return _rx_subdev(chan)[SUBDEV_PROP_BANDWIDTH].as<double>();
+    }
+
+    float read_rssi(size_t chan){
+        return _rx_subdev(chan)[SUBDEV_PROP_RSSI].as<float>();
+    }
+
+    dboard_iface::sptr get_rx_dboard_iface(size_t chan){
+        return _rx_dboard(chan)[DBOARD_PROP_DBOARD_IFACE].as<dboard_iface::sptr>();
+    }
+
+    /*******************************************************************
+     * TX methods
+     ******************************************************************/
+    void set_tx_subdev_spec(const subdev_spec_t &spec, size_t mboard){
+        if (mboard != ALL_MBOARDS){
+            _mboard(mboard)[MBOARD_PROP_TX_SUBDEV_SPEC] = spec;
+            return;
+        }
+        for (size_t m = 0; m < get_num_mboards(); m++){
+            set_tx_subdev_spec(spec, m);
+        }
+    }
+
+    subdev_spec_t get_tx_subdev_spec(size_t mboard){
+        return _mboard(mboard)[MBOARD_PROP_TX_SUBDEV_SPEC].as<subdev_spec_t>();
+    }
+
+    std::string get_tx_subdev_name(size_t chan){
+        return _tx_subdev(chan)[SUBDEV_PROP_NAME].as<std::string>();
+    }
+
+    size_t get_tx_num_channels(void){
+        return tx_cpm()*get_num_mboards(); //total num channels
+    }
+
+    void set_tx_rate(double rate){
+        for (size_t m = 0; m < get_num_mboards(); m++){
+            _tx_dsp(m)[DSP_PROP_HOST_RATE] = rate;
+        }
+        do_samp_rate_warning_message(rate, get_tx_rate(), "TX");
+    }
+
+    double get_tx_rate(void){
+        return _tx_dsp(0)[DSP_PROP_HOST_RATE].as<double>();
+    }
+
+    tune_result_t set_tx_freq(double target_freq, size_t chan){
+        tune_result_t r = tune_tx_subdev_and_dsp(_tx_subdev(chan), _tx_dsp(chan/tx_cpm()), chan%tx_cpm(), target_freq);
+        do_tune_freq_warning_message(target_freq, get_tx_freq(chan), "TX");
+        return r;
+    }
+
+    tune_result_t set_tx_freq(double target_freq, double lo_off, size_t chan){
+        tune_result_t r = tune_tx_subdev_and_dsp(_tx_subdev(chan), _tx_dsp(chan/tx_cpm()), chan%tx_cpm(), target_freq, lo_off);
+        do_tune_freq_warning_message(target_freq, get_tx_freq(chan), "TX");
+        return r;
+    }
+
+    double get_tx_freq(size_t chan){
+        return derive_freq_from_tx_subdev_and_dsp(_tx_subdev(chan), _tx_dsp(chan/tx_cpm()), chan%tx_cpm());
+    }
+
+    freq_range_t get_tx_freq_range(size_t chan){
+        return add_dsp_shift(_tx_subdev(chan)[SUBDEV_PROP_FREQ_RANGE].as<freq_range_t>(), _tx_dsp(chan/tx_cpm()));
+    }
+
+    void set_tx_gain(float gain, const std::string &name, size_t chan){
+        return _tx_gain_group(chan)->set_value(gain, name);
+    }
+
+    float get_tx_gain(const std::string &name, size_t chan){
+        return _tx_gain_group(chan)->get_value(name);
+    }
+
+    gain_range_t get_tx_gain_range(const std::string &name, size_t chan){
+        return _tx_gain_group(chan)->get_range(name);
+    }
+
+    std::vector<std::string> get_tx_gain_names(size_t chan){
+        return _tx_gain_group(chan)->get_names();
+    }
+
+    void set_tx_antenna(const std::string &ant, size_t chan){
+        _tx_subdev(chan)[SUBDEV_PROP_ANTENNA] = ant;
+    }
+
+    std::string get_tx_antenna(size_t chan){
+        return _tx_subdev(chan)[SUBDEV_PROP_ANTENNA].as<std::string>();
+    }
+
+    std::vector<std::string> get_tx_antennas(size_t chan){
+        return _tx_subdev(chan)[SUBDEV_PROP_ANTENNA_NAMES].as<prop_names_t>();
+    }
+
+    bool get_tx_lo_locked(size_t chan){
+        return _tx_subdev(chan)[SUBDEV_PROP_LO_LOCKED].as<bool>();
+    }
+
+    void set_tx_bandwidth(double bandwidth, size_t chan){
+        _tx_subdev(chan)[SUBDEV_PROP_BANDWIDTH] = bandwidth;
+    }
+
+    double get_tx_bandwidth(size_t chan){
+        return _tx_subdev(chan)[SUBDEV_PROP_BANDWIDTH].as<double>();
+    }
+
+    dboard_iface::sptr get_tx_dboard_iface(size_t chan){
+        return _tx_dboard(chan)[DBOARD_PROP_DBOARD_IFACE].as<dboard_iface::sptr>();
+    }
+
+private:
+    device::sptr _dev;
+
+    size_t rx_cpm(void){ //channels per mboard
+        size_t nchan = get_rx_subdev_spec(0).size();
+        for (size_t m = 1; m < get_num_mboards(); m++){
+            if (nchan != get_rx_subdev_spec(m).size()){
+                throw std::runtime_error("rx subdev spec size inconsistent across all mboards");
+            }
+        }
+        return nchan;
+    }
+
+    size_t tx_cpm(void){ //channels per mboard
+        size_t nchan = get_tx_subdev_spec(0).size();
+        for (size_t m = 1; m < get_num_mboards(); m++){
+            if (nchan != get_tx_subdev_spec(m).size()){
+                throw std::runtime_error("tx subdev spec size inconsistent across all mboards");
+            }
+        }
+        return nchan;
+    }
+
+    wax::obj _mboard(size_t mboard){
+        std::string mb_name = (*_dev)[DEVICE_PROP_MBOARD_NAMES].as<prop_names_t>().at(mboard);
+        return (*_dev)[named_prop_t(DEVICE_PROP_MBOARD, mb_name)];
+    }
+    wax::obj _rx_dsp(size_t mboard){
+        return _mboard(mboard)[MBOARD_PROP_RX_DSP];
+    }
+    wax::obj _tx_dsp(size_t mboard){
+        return _mboard(mboard)[MBOARD_PROP_TX_DSP];
+    }
+    wax::obj _rx_dboard(size_t chan){
+        std::string db_name = get_rx_subdev_spec(chan/rx_cpm()).at(chan%rx_cpm()).db_name;
+        return _mboard(chan/rx_cpm())[named_prop_t(MBOARD_PROP_RX_DBOARD, db_name)];
+    }
+    wax::obj _tx_dboard(size_t chan){
+        std::string db_name = get_tx_subdev_spec(chan/tx_cpm()).at(chan%tx_cpm()).db_name;
+        return _mboard(chan/tx_cpm())[named_prop_t(MBOARD_PROP_TX_DBOARD, db_name)];
+    }
+    wax::obj _rx_subdev(size_t chan){
+        std::string sd_name = get_rx_subdev_spec(chan/rx_cpm()).at(chan%rx_cpm()).sd_name;
+        return _rx_dboard(chan)[named_prop_t(DBOARD_PROP_SUBDEV, sd_name)];
+    }
+    wax::obj _tx_subdev(size_t chan){
+        std::string sd_name = get_tx_subdev_spec(chan/tx_cpm()).at(chan%tx_cpm()).sd_name;
+        return _tx_dboard(chan)[named_prop_t(DBOARD_PROP_SUBDEV, sd_name)];
+    }
+    gain_group::sptr _rx_gain_group(size_t chan){
+        std::string sd_name = get_rx_subdev_spec(chan/rx_cpm()).at(chan%rx_cpm()).sd_name;
+        return _rx_dboard(chan)[named_prop_t(DBOARD_PROP_GAIN_GROUP, sd_name)].as<gain_group::sptr>();
+    }
+    gain_group::sptr _tx_gain_group(size_t chan){
+        std::string sd_name = get_tx_subdev_spec(chan/tx_cpm()).at(chan%tx_cpm()).sd_name;
+        return _tx_dboard(chan)[named_prop_t(DBOARD_PROP_GAIN_GROUP, sd_name)].as<gain_group::sptr>();
+    }
+};
+
+/***********************************************************************
+ * The Make Function
+ **********************************************************************/
+multi_usrp::sptr multi_usrp::make(const device_addr_t &dev_addr){
+    return sptr(new multi_usrp_impl(dev_addr));
+}
diff --git a/host/lib/usrp/simple_usrp.cpp b/host/lib/usrp/simple_usrp.cpp
deleted file mode 100644
index b4f34287b..000000000
--- a/host/lib/usrp/simple_usrp.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-//
-// Copyright 2010 Ettus Research LLC
-//
-// This program 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 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-#include <uhd/usrp/single_usrp.hpp>
-#include <uhd/usrp/simple_usrp.hpp>
-#include <uhd/utils/warning.hpp>
-
-using namespace uhd;
-using namespace uhd::usrp;
-
-/***********************************************************************
- * Simple USRP Implementation
- **********************************************************************/
-class simple_usrp_impl : public simple_usrp{
-public:
-    simple_usrp_impl(const device_addr_t &addr){
-        _sdev = single_usrp::make(addr);
-    }
-
-    ~simple_usrp_impl(void){
-        /* NOP */
-    }
-
-    device::sptr get_device(void){
-        return _sdev->get_device();
-    }
-
-    std::string get_pp_string(void){
-        return _sdev->get_pp_string();
-    }
-
-    /*******************************************************************
-     * Misc
-     ******************************************************************/
-    time_spec_t get_time_now(void){
-        return _sdev->get_time_now();
-    }
-
-    void set_time_now(const time_spec_t &time_spec){
-        return _sdev->set_time_now(time_spec);
-    }
-
-    void set_time_next_pps(const time_spec_t &time_spec){
-        return _sdev->set_time_next_pps(time_spec);
-    }
-
-    void issue_stream_cmd(const stream_cmd_t &stream_cmd){
-        return _sdev->issue_stream_cmd(stream_cmd);
-    }
-
-    void set_clock_config(const clock_config_t &clock_config){
-        return _sdev->set_clock_config(clock_config);
-    }
-
-    /*******************************************************************
-     * RX methods
-     ******************************************************************/
-    void set_rx_subdev_spec(const subdev_spec_t &spec){
-        return _sdev->set_rx_subdev_spec(spec);
-    }
-
-    subdev_spec_t get_rx_subdev_spec(void){
-        return _sdev->get_rx_subdev_spec();
-    }
-
-    void set_rx_rate(double rate){
-        return _sdev->set_rx_rate(rate);
-    }
-
-    double get_rx_rate(void){
-        return _sdev->get_rx_rate();
-    }
-
-    tune_result_t set_rx_freq(double target_freq){
-        return _sdev->set_rx_freq(target_freq);
-    }
-
-    tune_result_t set_rx_freq(double target_freq, double lo_off){
-        return _sdev->set_rx_freq(target_freq, lo_off);
-    }
-
-    double get_rx_freq(void){
-        return _sdev->get_rx_freq();
-    }
-
-    freq_range_t get_rx_freq_range(void){
-        return _sdev->get_rx_freq_range();
-    }
-
-    void set_rx_gain(float gain){
-        return _sdev->set_rx_gain(gain);
-    }
-
-    float get_rx_gain(void){
-        return _sdev->get_rx_gain();
-    }
-
-    gain_range_t get_rx_gain_range(void){
-        return _sdev->get_rx_gain_range();
-    }
-
-    void set_rx_antenna(const std::string &ant){
-        return _sdev->set_rx_antenna(ant);
-    }
-
-    std::string get_rx_antenna(void){
-        return _sdev->get_rx_antenna();
-    }
-
-    std::vector<std::string> get_rx_antennas(void){
-        return _sdev->get_rx_antennas();
-    }
-
-    bool get_rx_lo_locked(void){
-        return _sdev->get_rx_lo_locked();
-    }
-
-    float read_rssi(void){
-        return _sdev->read_rssi();
-    }
-
-    dboard_iface::sptr get_rx_dboard_iface(void){
-        return _sdev->get_rx_dboard_iface();
-    }
-    
-    void set_rx_bandwidth(float bandwidth) {
-        return _sdev->set_rx_bandwidth(bandwidth);
-    }
-
-    /*******************************************************************
-     * TX methods
-     ******************************************************************/
-    void set_tx_subdev_spec(const subdev_spec_t &spec){
-        return _sdev->set_tx_subdev_spec(spec);
-    }
-
-    subdev_spec_t get_tx_subdev_spec(void){
-        return _sdev->get_tx_subdev_spec();
-    }
-
-    void set_tx_rate(double rate){
-        return _sdev->set_tx_rate(rate);
-    }
-
-    double get_tx_rate(void){
-        return _sdev->get_tx_rate();
-    }
-
-    tune_result_t set_tx_freq(double target_freq){
-        return _sdev->set_tx_freq(target_freq);
-    }
-
-    tune_result_t set_tx_freq(double target_freq, double lo_off){
-        return _sdev->set_tx_freq(target_freq, lo_off);
-    }
-
-    double get_tx_freq(void){
-        return _sdev->get_tx_freq();
-    }
-
-    freq_range_t get_tx_freq_range(void){
-        return _sdev->get_tx_freq_range();
-    }
-
-    void set_tx_gain(float gain){
-        return _sdev->set_tx_gain(gain);
-    }
-
-    float get_tx_gain(void){
-        return _sdev->get_tx_gain();
-    }
-
-    gain_range_t get_tx_gain_range(void){
-        return _sdev->get_tx_gain_range();
-    }
-
-    void set_tx_antenna(const std::string &ant){
-        return _sdev->set_tx_antenna(ant);
-    }
-
-    std::string get_tx_antenna(void){
-        return _sdev->get_tx_antenna();
-    }
-
-    std::vector<std::string> get_tx_antennas(void){
-        return _sdev->get_tx_antennas();
-    }
-
-    bool get_tx_lo_locked(void){
-        return _sdev->get_tx_lo_locked();
-    }
-
-    dboard_iface::sptr get_tx_dboard_iface(void){
-        return _sdev->get_tx_dboard_iface();
-    }
-
-private:
-    single_usrp::sptr _sdev;
-};
-
-/***********************************************************************
- * The Make Function
- **********************************************************************/
-simple_usrp::sptr simple_usrp::make(const device_addr_t &dev_addr){
-    uhd::print_warning(
-        "The simple USRP interface has been deprecated.\n"
-        "Please switch to the single USRP interface.\n"
-        "#include <uhd/usrp/single_usrp.hpp>\n"
-        "single_usrp::sptr sdev = single_usrp::make(args);\n"
-    );
-    return sptr(new simple_usrp_impl(dev_addr));
-}
diff --git a/host/lib/usrp/single_usrp.cpp b/host/lib/usrp/single_usrp.cpp
index 7d053535e..5e57849b8 100644
--- a/host/lib/usrp/single_usrp.cpp
+++ b/host/lib/usrp/single_usrp.cpp
@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
+#include "wrapper_utils.hpp"
 #include <uhd/usrp/single_usrp.hpp>
 #include <uhd/usrp/tune_helper.hpp>
 #include <uhd/utils/assert.hpp>
@@ -32,10 +33,7 @@
 using namespace uhd;
 using namespace uhd::usrp;
 
-static inline freq_range_t add_dsp_shift(const freq_range_t &range, wax::obj dsp){
-    double codec_rate = dsp[DSP_PROP_CODEC_RATE].as<double>();
-    return freq_range_t(range.min - codec_rate/2.0, range.max + codec_rate/2.0);
-}
+const std::string single_usrp::ALL_GAINS = "";
 
 /***********************************************************************
  * Simple USRP Implementation
@@ -46,10 +44,6 @@ public:
         _dev = device::make(addr);
     }
 
-    ~single_usrp_impl(void){
-        /* NOP */
-    }
-
     device::sptr get_device(void){
         return _dev;
     }
@@ -145,6 +139,7 @@ public:
 
     void set_rx_rate(double rate){
         _rx_dsp()[DSP_PROP_HOST_RATE] = rate;
+        do_samp_rate_warning_message(rate, get_rx_rate(), "RX");
     }
 
     double get_rx_rate(void){
@@ -152,11 +147,15 @@ public:
     }
 
     tune_result_t set_rx_freq(double target_freq, size_t chan){
-        return tune_rx_subdev_and_dsp(_rx_subdev(chan), _rx_dsp(), chan, target_freq);
+        tune_result_t r = tune_rx_subdev_and_dsp(_rx_subdev(chan), _rx_dsp(), chan, target_freq);
+        do_tune_freq_warning_message(target_freq, get_rx_freq(chan), "RX");
+        return r;
     }
 
     tune_result_t set_rx_freq(double target_freq, double lo_off, size_t chan){
-        return tune_rx_subdev_and_dsp(_rx_subdev(chan), _rx_dsp(), chan, target_freq, lo_off);
+        tune_result_t r = tune_rx_subdev_and_dsp(_rx_subdev(chan), _rx_dsp(), chan, target_freq, lo_off);
+        do_tune_freq_warning_message(target_freq, get_rx_freq(chan), "RX");
+        return r;
     }
 
     double get_rx_freq(size_t chan){
@@ -167,16 +166,20 @@ public:
         return add_dsp_shift(_rx_subdev(chan)[SUBDEV_PROP_FREQ_RANGE].as<freq_range_t>(), _rx_dsp());
     }
 
-    void set_rx_gain(float gain, size_t chan){
-        return _rx_gain_group(chan)->set_value(gain);
+    void set_rx_gain(float gain, const std::string &name, size_t chan){
+        return _rx_gain_group(chan)->set_value(gain, name);
+    }
+
+    float get_rx_gain(const std::string &name, size_t chan){
+        return _rx_gain_group(chan)->get_value(name);
     }
 
-    float get_rx_gain(size_t chan){
-        return _rx_gain_group(chan)->get_value();
+    gain_range_t get_rx_gain_range(const std::string &name, size_t chan){
+        return _rx_gain_group(chan)->get_range(name);
     }
 
-    gain_range_t get_rx_gain_range(size_t chan){
-        return _rx_gain_group(chan)->get_range();
+    std::vector<std::string> get_rx_gain_names(size_t chan){
+        return _rx_gain_group(chan)->get_names();
     }
 
     void set_rx_antenna(const std::string &ant, size_t chan){
@@ -195,6 +198,14 @@ public:
         return _rx_subdev(chan)[SUBDEV_PROP_LO_LOCKED].as<bool>();
     }
 
+    void set_rx_bandwidth(double bandwidth, size_t chan){
+        _rx_subdev(chan)[SUBDEV_PROP_BANDWIDTH] = bandwidth;
+    }
+
+    double get_rx_bandwidth(size_t chan){
+        return _rx_subdev(chan)[SUBDEV_PROP_BANDWIDTH].as<double>();
+    }
+
     float read_rssi(size_t chan){
         return _rx_subdev(chan)[SUBDEV_PROP_RSSI].as<float>();
     }
@@ -202,10 +213,6 @@ public:
     dboard_iface::sptr get_rx_dboard_iface(size_t chan){
         return _rx_dboard(chan)[DBOARD_PROP_DBOARD_IFACE].as<dboard_iface::sptr>();
     }
-    
-    void set_rx_bandwidth(float bandwidth, size_t chan) {
-        _rx_subdev(chan)[SUBDEV_PROP_BANDWIDTH] = bandwidth;
-    }
 
     /*******************************************************************
      * TX methods
@@ -224,6 +231,7 @@ public:
 
     void set_tx_rate(double rate){
         _tx_dsp()[DSP_PROP_HOST_RATE] = rate;
+        do_samp_rate_warning_message(rate, get_tx_rate(), "TX");
     }
 
     double get_tx_rate(void){
@@ -231,11 +239,15 @@ public:
     }
 
     tune_result_t set_tx_freq(double target_freq, size_t chan){
-        return tune_tx_subdev_and_dsp(_tx_subdev(chan), _tx_dsp(), chan, target_freq);
+        tune_result_t r = tune_tx_subdev_and_dsp(_tx_subdev(chan), _tx_dsp(), chan, target_freq);
+        do_tune_freq_warning_message(target_freq, get_tx_freq(chan), "TX");
+        return r;
     }
 
     tune_result_t set_tx_freq(double target_freq, double lo_off, size_t chan){
-        return tune_tx_subdev_and_dsp(_tx_subdev(chan), _tx_dsp(), chan, target_freq, lo_off);
+        tune_result_t r = tune_tx_subdev_and_dsp(_tx_subdev(chan), _tx_dsp(), chan, target_freq, lo_off);
+        do_tune_freq_warning_message(target_freq, get_tx_freq(chan), "TX");
+        return r;
     }
 
     double get_tx_freq(size_t chan){
@@ -246,16 +258,20 @@ public:
         return add_dsp_shift(_tx_subdev(chan)[SUBDEV_PROP_FREQ_RANGE].as<freq_range_t>(), _tx_dsp());
     }
 
-    void set_tx_gain(float gain, size_t chan){
-        return _tx_gain_group(chan)->set_value(gain);
+    void set_tx_gain(float gain, const std::string &name, size_t chan){
+        return _tx_gain_group(chan)->set_value(gain, name);
+    }
+
+    float get_tx_gain(const std::string &name, size_t chan){
+        return _tx_gain_group(chan)->get_value(name);
     }
 
-    float get_tx_gain(size_t chan){
-        return _tx_gain_group(chan)->get_value();
+    gain_range_t get_tx_gain_range(const std::string &name, size_t chan){
+        return _tx_gain_group(chan)->get_range(name);
     }
 
-    gain_range_t get_tx_gain_range(size_t chan){
-        return _tx_gain_group(chan)->get_range();
+    std::vector<std::string> get_tx_gain_names(size_t chan){
+        return _tx_gain_group(chan)->get_names();
     }
 
     void set_tx_antenna(const std::string &ant, size_t chan){
@@ -274,6 +290,14 @@ public:
         return _tx_subdev(chan)[SUBDEV_PROP_LO_LOCKED].as<bool>();
     }
 
+    void set_tx_bandwidth(double bandwidth, size_t chan){
+        _tx_subdev(chan)[SUBDEV_PROP_BANDWIDTH] = bandwidth;
+    }
+
+    double get_tx_bandwidth(size_t chan){
+        return _tx_subdev(chan)[SUBDEV_PROP_BANDWIDTH].as<double>();
+    }
+
     dboard_iface::sptr get_tx_dboard_iface(size_t chan){
         return _tx_dboard(chan)[DBOARD_PROP_DBOARD_IFACE].as<dboard_iface::sptr>();
     }
diff --git a/host/lib/usrp/usrp1/codec_impl.cpp b/host/lib/usrp/usrp1/codec_impl.cpp
index 1756c1ed4..db53be53e 100644
--- a/host/lib/usrp/usrp1/codec_impl.cpp
+++ b/host/lib/usrp/usrp1/codec_impl.cpp
@@ -45,7 +45,7 @@ void usrp1_impl::codec_init(void)
 /***********************************************************************
  * RX Codec Properties
  **********************************************************************/
-static const std::string ad9862_pga_gain_name = "ad9862 pga";
+static const std::string adc_pga_gain_name = "PGA";
 
 void usrp1_impl::rx_codec_get(const wax::obj &key_, wax::obj &val, dboard_slot_t dboard_slot)
 {
@@ -62,21 +62,21 @@ void usrp1_impl::rx_codec_get(const wax::obj &key_, wax::obj &val, dboard_slot_t
         return;
 
     case CODEC_PROP_GAIN_NAMES:
-        val = prop_names_t(1, ad9862_pga_gain_name);
+        val = prop_names_t(1, adc_pga_gain_name);
         return;
 
     case CODEC_PROP_GAIN_RANGE:
-        UHD_ASSERT_THROW(key.name == ad9862_pga_gain_name);
+        UHD_ASSERT_THROW(key.name == adc_pga_gain_name);
         val = usrp1_codec_ctrl::rx_pga_gain_range;
         return;
 
     case CODEC_PROP_GAIN_I:
-        UHD_ASSERT_THROW(key.name == ad9862_pga_gain_name);
+        UHD_ASSERT_THROW(key.name == adc_pga_gain_name);
         val = _codec_ctrls[dboard_slot]->get_rx_pga_gain('A');
         return;
 
     case CODEC_PROP_GAIN_Q:
-        UHD_ASSERT_THROW(key.name == ad9862_pga_gain_name);
+        UHD_ASSERT_THROW(key.name == adc_pga_gain_name);
         val = _codec_ctrls[dboard_slot]->get_rx_pga_gain('B');
         return;
 
@@ -91,12 +91,12 @@ void usrp1_impl::rx_codec_set(const wax::obj &key_, const wax::obj &val, dboard_
     //handle the set request conditioned on the key
     switch(key.as<codec_prop_t>()) {
     case CODEC_PROP_GAIN_I:
-        UHD_ASSERT_THROW(key.name == ad9862_pga_gain_name);
+        UHD_ASSERT_THROW(key.name == adc_pga_gain_name);
         _codec_ctrls[dboard_slot]->set_rx_pga_gain(val.as<float>(), 'A');
         return;
 
     case CODEC_PROP_GAIN_Q:
-        UHD_ASSERT_THROW(key.name == ad9862_pga_gain_name);
+        UHD_ASSERT_THROW(key.name == adc_pga_gain_name);
         _codec_ctrls[dboard_slot]->set_rx_pga_gain(val.as<float>(), 'B');
         return;
 
@@ -107,6 +107,8 @@ void usrp1_impl::rx_codec_set(const wax::obj &key_, const wax::obj &val, dboard_
 /***********************************************************************
  * TX Codec Properties
  **********************************************************************/
+static const std::string dac_pga_gain_name = "PGA";
+
 void usrp1_impl::tx_codec_get(const wax::obj &key_, wax::obj &val, dboard_slot_t dboard_slot)
 {
     named_prop_t key = named_prop_t::extract(key_);
@@ -122,17 +124,17 @@ void usrp1_impl::tx_codec_get(const wax::obj &key_, wax::obj &val, dboard_slot_t
         return;
 
     case CODEC_PROP_GAIN_NAMES:
-        val = prop_names_t(1, ad9862_pga_gain_name);
+        val = prop_names_t(1, dac_pga_gain_name);
         return;
 
     case CODEC_PROP_GAIN_RANGE:
-        UHD_ASSERT_THROW(key.name == ad9862_pga_gain_name);
+        UHD_ASSERT_THROW(key.name == dac_pga_gain_name);
         val = usrp1_codec_ctrl::tx_pga_gain_range;
         return;
 
     case CODEC_PROP_GAIN_I: //only one gain for I and Q
     case CODEC_PROP_GAIN_Q:
-        UHD_ASSERT_THROW(key.name == ad9862_pga_gain_name);
+        UHD_ASSERT_THROW(key.name == dac_pga_gain_name);
         val = _codec_ctrls[dboard_slot]->get_tx_pga_gain();
         return;
 
@@ -148,7 +150,7 @@ void usrp1_impl::tx_codec_set(const wax::obj &key_, const wax::obj &val, dboard_
     switch(key.as<codec_prop_t>()){
     case CODEC_PROP_GAIN_I: //only one gain for I and Q
     case CODEC_PROP_GAIN_Q:
-        UHD_ASSERT_THROW(key.name == ad9862_pga_gain_name);
+        UHD_ASSERT_THROW(key.name == dac_pga_gain_name);
         _codec_ctrls[dboard_slot]->set_tx_pga_gain(val.as<float>());
         return;
 
diff --git a/host/lib/usrp/usrp1/dboard_impl.cpp b/host/lib/usrp/usrp1/dboard_impl.cpp
index 3a8480e1b..2a2762a82 100644
--- a/host/lib/usrp/usrp1/dboard_impl.cpp
+++ b/host/lib/usrp/usrp1/dboard_impl.cpp
@@ -124,6 +124,7 @@ void usrp1_impl::rx_dboard_get(const wax::obj &key_, wax::obj &val, dboard_slot_
 
     case DBOARD_PROP_GAIN_GROUP:
         val = make_gain_group(
+            _rx_db_eeproms[dboard_slot].id,
             _dboard_managers[dboard_slot]->get_rx_subdev(key.name),
             _rx_codec_proxies[dboard_slot]->get_link(),
             GAIN_GROUP_POLICY_RX
@@ -188,6 +189,7 @@ void usrp1_impl::tx_dboard_get(const wax::obj &key_, wax::obj &val, dboard_slot_
 
     case DBOARD_PROP_GAIN_GROUP:
         val = make_gain_group(
+            _tx_db_eeproms[dboard_slot].id,
             _dboard_managers[dboard_slot]->get_tx_subdev(key.name),
             _tx_codec_proxies[dboard_slot]->get_link(),
             GAIN_GROUP_POLICY_TX
diff --git a/host/lib/usrp/usrp2/dboard_impl.cpp b/host/lib/usrp/usrp2/dboard_impl.cpp
index a462b93c2..540c9fefb 100644
--- a/host/lib/usrp/usrp2/dboard_impl.cpp
+++ b/host/lib/usrp/usrp2/dboard_impl.cpp
@@ -89,6 +89,7 @@ void usrp2_mboard_impl::rx_dboard_get(const wax::obj &key_, wax::obj &val){
 
     case DBOARD_PROP_GAIN_GROUP:
         val = make_gain_group(
+            _rx_db_eeprom.id,
             _dboard_manager->get_rx_subdev(key.name),
             _rx_codec_proxy->get_link(),
             GAIN_GROUP_POLICY_RX
@@ -145,6 +146,7 @@ void usrp2_mboard_impl::tx_dboard_get(const wax::obj &key_, wax::obj &val){
 
     case DBOARD_PROP_GAIN_GROUP:
         val = make_gain_group(
+            _tx_db_eeprom.id,
             _dboard_manager->get_tx_subdev(key.name),
             _tx_codec_proxy->get_link(),
             GAIN_GROUP_POLICY_TX
diff --git a/host/lib/usrp/wrapper_utils.hpp b/host/lib/usrp/wrapper_utils.hpp
new file mode 100644
index 000000000..aee230fc0
--- /dev/null
+++ b/host/lib/usrp/wrapper_utils.hpp
@@ -0,0 +1,66 @@
+//
+// Copyright 2010 Ettus Research LLC
+//
+// This program 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 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#ifndef INCLUDED_LIBUHD_USRP_WRAPPER_UTILS_HPP
+#define INCLUDED_LIBUHD_USRP_WRAPPER_UTILS_HPP
+
+#include <uhd/wax.hpp>
+#include <uhd/types/ranges.hpp>
+#include <uhd/usrp/dsp_props.hpp>
+#include <uhd/utils/warning.hpp>
+#include <boost/format.hpp>
+#include <cmath>
+
+static inline uhd::freq_range_t add_dsp_shift(
+    const uhd::freq_range_t &range,
+    wax::obj dsp
+){
+    double codec_rate = dsp[uhd::usrp::DSP_PROP_CODEC_RATE].as<double>();
+    return uhd::freq_range_t(range.min - codec_rate/2.0, range.max + codec_rate/2.0);
+}
+
+static inline void do_samp_rate_warning_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)));
+    }
+}
+
+static inline void do_tune_freq_warning_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)));
+    }
+}
+
+#endif /* INCLUDED_LIBUHD_USRP_WRAPPER_UTILS_HPP */
diff --git a/host/lib/utils/gain_group.cpp b/host/lib/utils/gain_group.cpp
index 078fe56b2..54146726a 100644
--- a/host/lib/utils/gain_group.cpp
+++ b/host/lib/utils/gain_group.cpp
@@ -63,7 +63,9 @@ public:
         /*NOP*/
     }
 
-    gain_range_t get_range(void){
+    gain_range_t get_range(const std::string &name){
+        if (not name.empty()) return _name_to_fcns[name].get_range();
+
         float overall_min = 0, overall_max = 0, overall_step = 0;
         BOOST_FOREACH(const gain_fcns_t &fcns, get_all_fcns()){
             const gain_range_t range = fcns.get_range();
@@ -76,7 +78,9 @@ public:
         return gain_range_t(overall_min, overall_max, overall_step);
     }
 
-    float get_value(void){
+    float get_value(const std::string &name){
+        if (not name.empty()) return _name_to_fcns[name].get_value();
+
         float overall_gain = 0;
         BOOST_FOREACH(const gain_fcns_t &fcns, get_all_fcns()){
             overall_gain += fcns.get_value();
@@ -84,7 +88,9 @@ public:
         return overall_gain;
     }
 
-    void set_value(float gain){
+    void set_value(float gain, const std::string &name){
+        if (not name.empty()) return _name_to_fcns[name].set_value(gain);
+
         std::vector<gain_fcns_t> all_fcns = get_all_fcns();
         if (all_fcns.size() == 0) return; //nothing to set!
 
@@ -140,10 +146,21 @@ public:
         }
     }
 
+    const std::vector<std::string> get_names(void){
+        return _name_to_fcns.keys();
+    }
+
     void register_fcns(
-        const gain_fcns_t &gain_fcns, size_t priority
+        const std::string &name,
+        const gain_fcns_t &gain_fcns,
+        size_t priority
     ){
+        if (name.empty() or _name_to_fcns.has_key(name)){
+            //ensure the name name is unique and non-empty
+            return register_fcns(name + "_", gain_fcns, priority);
+        }
         _registry[priority].push_back(gain_fcns);
+        _name_to_fcns[name] = gain_fcns;
     }
 
 private:
@@ -158,6 +175,7 @@ private:
     }
 
     uhd::dict<size_t, std::vector<gain_fcns_t> > _registry;
+    uhd::dict<std::string, gain_fcns_t> _name_to_fcns;
 };
 
 /***********************************************************************
diff --git a/host/test/CMakeLists.txt b/host/test/CMakeLists.txt
index c620fd641..d67399e5b 100644
--- a/host/test/CMakeLists.txt
+++ b/host/test/CMakeLists.txt
@@ -18,8 +18,7 @@
 ########################################################################
 # unit test suite
 ########################################################################
-ADD_EXECUTABLE(main_test
-    main_test.cpp
+SET(test_sources
     addr_test.cpp
     buffer_test.cpp
     byteswap_test.cpp
@@ -28,13 +27,24 @@ ADD_EXECUTABLE(main_test
     error_test.cpp
     gain_group_test.cpp
     subdev_spec_test.cpp
+    time_spec_test.cpp
     tune_helper_test.cpp
     vrt_test.cpp
     warning_test.cpp
     wax_test.cpp
 )
-TARGET_LINK_LIBRARIES(main_test uhd)
-ADD_TEST(test main_test)
+
+#turn each test cpp file into an executable with an int main() function
+ADD_DEFINITIONS(-DBOOST_TEST_DYN_LINK -DBOOST_TEST_MAIN)
+
+#for each source: build an executable, register it as a test, and install
+FOREACH(test_source ${test_sources})
+    GET_FILENAME_COMPONENT(test_name ${test_source} NAME_WE)
+    ADD_EXECUTABLE(${test_name} ${test_source})
+    TARGET_LINK_LIBRARIES(${test_name} uhd)
+    ADD_TEST(${test_name} ${test_name})
+    INSTALL(TARGETS ${test_name} RUNTIME DESTINATION ${PKG_DATA_DIR}/tests)
+ENDFOREACH(test_source)
 
 ########################################################################
 # demo of a loadable module
diff --git a/host/test/gain_group_test.cpp b/host/test/gain_group_test.cpp
index 761372e5a..555ccaed3 100644
--- a/host/test/gain_group_test.cpp
+++ b/host/test/gain_group_test.cpp
@@ -81,12 +81,12 @@ static gain_group::sptr get_gain_group(size_t pri1 = 0, size_t pri2 = 0){
     gain_fcns.get_range = boost::bind(&gain_element1::get_range, &g1);
     gain_fcns.get_value = boost::bind(&gain_element1::get_value, &g1);
     gain_fcns.set_value = boost::bind(&gain_element1::set_value, &g1, _1);
-    gg->register_fcns(gain_fcns, pri1);
+    gg->register_fcns("g1", gain_fcns, pri1);
 
     gain_fcns.get_range = boost::bind(&gain_element2::get_range, &g2);
     gain_fcns.get_value = boost::bind(&gain_element2::get_value, &g2);
     gain_fcns.set_value = boost::bind(&gain_element2::set_value, &g2, _1);
-    gg->register_fcns(gain_fcns, pri2);
+    gg->register_fcns("g2", gain_fcns, pri2);
 
     return gg;
 }
diff --git a/host/test/main_test.cpp b/host/test/main_test.cpp
deleted file mode 100644
index 0b47303b7..000000000
--- a/host/test/main_test.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_MAIN
-#include <boost/test/unit_test.hpp>
diff --git a/host/test/time_spec_test.cpp b/host/test/time_spec_test.cpp
new file mode 100644
index 000000000..5ad782160
--- /dev/null
+++ b/host/test/time_spec_test.cpp
@@ -0,0 +1,61 @@
+//
+// Copyright 2010 Ettus Research LLC
+//
+// This program 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 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#include <boost/test/unit_test.hpp>
+#include <uhd/types/time_spec.hpp>
+#include <boost/foreach.hpp>
+#include <iostream>
+
+BOOST_AUTO_TEST_CASE(test_time_spec_compare){
+    std::cout << "Testing time specification compare..." << std::endl;
+
+    BOOST_CHECK(uhd::time_spec_t(2.0) == uhd::time_spec_t(2.0));
+    BOOST_CHECK(uhd::time_spec_t(2.0) > uhd::time_spec_t(1.0));
+    BOOST_CHECK(uhd::time_spec_t(1.0) < uhd::time_spec_t(2.0));
+
+    BOOST_CHECK(uhd::time_spec_t(1.1) == uhd::time_spec_t(1.1));
+    BOOST_CHECK(uhd::time_spec_t(1.1) > uhd::time_spec_t(1.0));
+    BOOST_CHECK(uhd::time_spec_t(1.0) < uhd::time_spec_t(1.1));
+
+    BOOST_CHECK(uhd::time_spec_t(0.1) == uhd::time_spec_t(0.1));
+    BOOST_CHECK(uhd::time_spec_t(0.2) > uhd::time_spec_t(0.1));
+    BOOST_CHECK(uhd::time_spec_t(0.1) < uhd::time_spec_t(0.2));
+}
+
+#define CHECK_TS_EQUAL(lhs, rhs) \
+    BOOST_CHECK_CLOSE((lhs).get_real_secs(), (rhs).get_real_secs(), 0.001)
+
+BOOST_AUTO_TEST_CASE(test_time_spec_arithmetic){
+    std::cout << "Testing time specification arithmetic..." << std::endl;
+
+    CHECK_TS_EQUAL(uhd::time_spec_t(2.3) + uhd::time_spec_t(1.0), uhd::time_spec_t(3.3));
+    CHECK_TS_EQUAL(uhd::time_spec_t(2.3) - uhd::time_spec_t(1.0), uhd::time_spec_t(1.3));
+    CHECK_TS_EQUAL(uhd::time_spec_t(1.0) + uhd::time_spec_t(2.3), uhd::time_spec_t(3.3));
+    CHECK_TS_EQUAL(uhd::time_spec_t(1.0) - uhd::time_spec_t(2.3), uhd::time_spec_t(-1.3));
+}
+
+BOOST_AUTO_TEST_CASE(test_time_spec_parts){
+    std::cout << "Testing time specification parts..." << std::endl;
+
+    BOOST_CHECK_EQUAL(uhd::time_spec_t(1.1).get_full_secs(), 1);
+    BOOST_CHECK_CLOSE(uhd::time_spec_t(1.1).get_frac_secs(), 0.1, 0.001);
+    BOOST_CHECK_EQUAL(uhd::time_spec_t(1.1).get_tick_count(100), 10);
+
+    BOOST_CHECK_EQUAL(uhd::time_spec_t(-1.1).get_full_secs(), -1);
+    BOOST_CHECK_CLOSE(uhd::time_spec_t(-1.1).get_frac_secs(), -0.1, 0.001);
+    BOOST_CHECK_EQUAL(uhd::time_spec_t(-1.1).get_tick_count(100), -10);
+}