Merge branch 'convert_fc64'

11 files changed, 98 insertions, 357 deletions

diff --git a/host/lib/convert/convert_common.hpp b/host/lib/convert/convert_common.hpp
index 1a653a56f..c6ba1fcf9 100644
--- a/host/lib/convert/convert_common.hpp
+++ b/host/lib/convert/convert_common.hpp
@@ -41,8 +41,10 @@
 /***********************************************************************
  * Typedefs
  **********************************************************************/
+typedef std::complex<double>         fc64_t;
 typedef std::complex<float>          fc32_t;
 typedef std::complex<boost::int16_t> sc16_t;
+typedef std::complex<boost::int8_t>  sc8_t;
 typedef boost::uint32_t              item32_t;
 
 /***********************************************************************
@@ -87,4 +89,27 @@ static UHD_INLINE fc32_t item32_to_fc32(item32_t item){
     );
 }
 
+/***********************************************************************
+ * Convert complex double buffer to items32 (no swap)
+ **********************************************************************/
+static const double shorts_per_double = double(32767);
+
+static UHD_INLINE item32_t fc64_to_item32(fc64_t num){
+    boost::uint16_t real = boost::int16_t(num.real()*shorts_per_double);
+    boost::uint16_t imag = boost::int16_t(num.imag()*shorts_per_double);
+    return (item32_t(real) << 16) | (item32_t(imag) << 0);
+}
+
+/***********************************************************************
+ * Convert items32 buffer to complex double
+ **********************************************************************/
+static const double doubles_per_short = double(1.0/shorts_per_double);
+
+static UHD_INLINE fc64_t item32_to_fc64(item32_t item){
+    return fc64_t(
+        float(boost::int16_t(item >> 16)*doubles_per_short),
+        float(boost::int16_t(item >> 0)*doubles_per_short)
+    );
+}
+
 #endif /* INCLUDED_LIBUHD_CONVERT_COMMON_HPP */
diff --git a/host/lib/convert/gen_convert_general.py b/host/lib/convert/gen_convert_general.py
index 47c4cd7d0..f03448047 100644
--- a/host/lib/convert/gen_convert_general.py
+++ b/host/lib/convert/gen_convert_general.py
@@ -85,7 +85,7 @@ if __name__ == '__main__':
     output = parse_tmpl(TMPL_HEADER, file=file)
     for width in 1, 2, 3, 4:
         for swap, swap_fcn in (('nswap', ''), ('bswap', 'uhd::byteswap')):
-            for cpu_type in 'fc32', 'sc16':
+            for cpu_type in 'fc64', 'fc32', 'sc16':
                 output += parse_tmpl(
                     TMPL_CONV_TO_FROM_ITEM32_1 if width == 1 else TMPL_CONV_TO_FROM_ITEM32_X,
                     width=width, swap=swap, swap_fcn=swap_fcn, cpu_type=cpu_type
diff --git a/host/lib/convert/gen_convert_pred.py b/host/lib/convert/gen_convert_pred.py
index 1d573bf1a..fea7db4cc 100644
--- a/host/lib/convert/gen_convert_pred.py
+++ b/host/lib/convert/gen_convert_pred.py
@@ -69,8 +69,10 @@ pred_type make_pred(const std::string &markup, dir_type &dir){
             dir = DIR_OTW_TO_CPU;
         }
 
-        if      (cpu_type == "fc32") pred |= $ph.fc32_p;
+        if      (cpu_type == "fc64") pred |= $ph.fc64_p;
+        else if (cpu_type == "fc32") pred |= $ph.fc32_p;
         else if (cpu_type == "sc16") pred |= $ph.sc16_p;
+        else if (cpu_type == "sc8")  pred |= $ph.sc8_p;
         else throw pred_error("unhandled io type " + cpu_type);
 
         if (otw_type == "item32") pred |= $ph.item32_p;
@@ -127,6 +129,8 @@ UHD_INLINE pred_type make_pred(
     switch(io_type.tid){
     case io_type_t::COMPLEX_FLOAT32: pred |= $ph.fc32_p; break;
     case io_type_t::COMPLEX_INT16:   pred |= $ph.sc16_p; break;
+    //case io_type_t::COMPLEX_INT8:    pred |= $ph.sc8_p; break;
+    case io_type_t::COMPLEX_FLOAT64: pred |= $ph.fc64_p; break;
     default: throw pred_error("unhandled io type id");
     }
 
@@ -150,12 +154,14 @@ class ph:
     bswap_p  = 0b00001
     nswap_p  = 0b00000
     item32_p = 0b00000
+    sc8_p    = 0b00000
     sc16_p   = 0b00010
-    fc32_p   = 0b00000
+    fc32_p   = 0b00100
+    fc64_p   = 0b00110
     chan1_p  = 0b00000
-    chan2_p  = 0b00100
-    chan3_p  = 0b01000
-    chan4_p  = 0b01100
+    chan2_p  = 0b01000
+    chan3_p  = 0b10000
+    chan4_p  = 0b11000
 
 if __name__ == '__main__':
     import sys, os
diff --git a/host/lib/types/types.cpp b/host/lib/types/types.cpp
index 34d5947eb..c1be2ff6d 100644
--- a/host/lib/types/types.cpp
+++ b/host/lib/types/types.cpp
@@ -68,6 +68,7 @@ otw_type_t::otw_type_t(void):
  **********************************************************************/
 static size_t tid_to_size(io_type_t::tid_t tid){
     switch(tid){
+    case io_type_t::COMPLEX_FLOAT64: return sizeof(std::complex<double>);
     case io_type_t::COMPLEX_FLOAT32: return sizeof(std::complex<float>);
     case io_type_t::COMPLEX_INT16:   return sizeof(std::complex<boost::int16_t>);
     case io_type_t::COMPLEX_INT8:    return sizeof(std::complex<boost::int8_t>);
diff --git a/host/lib/usrp/CMakeLists.txt b/host/lib/usrp/CMakeLists.txt
index bd25aec2b..97a54a798 100644
--- a/host/lib/usrp/CMakeLists.txt
+++ b/host/lib/usrp/CMakeLists.txt
@@ -29,7 +29,6 @@ LIBUHD_APPEND_SOURCES(
     ${CMAKE_CURRENT_SOURCE_DIR}/mboard_eeprom.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/misc_utils.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/multi_usrp.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/single_usrp.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/subdev_spec.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/tune_helper.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wrapper_utils.hpp
diff --git a/host/lib/usrp/multi_usrp.cpp b/host/lib/usrp/multi_usrp.cpp
index 48eec28c1..817d7b085 100644
--- a/host/lib/usrp/multi_usrp.cpp
+++ b/host/lib/usrp/multi_usrp.cpp
@@ -53,11 +53,26 @@ public:
     /*******************************************************************
      * Mboard methods
      ******************************************************************/
+    void set_master_clock_rate(double rate, size_t mboard){
+        if (mboard != ALL_MBOARDS){
+            _mboard(mboard)[MBOARD_PROP_CLOCK_RATE] = rate;
+            return;
+        }
+        for (size_t m = 0; m < get_num_mboards(); m++){
+            set_master_clock_rate(rate, m);
+        }
+    }
+
+    double get_master_clock_rate(size_t mboard){
+        return _mboard(mboard)[MBOARD_PROP_CLOCK_RATE].as<double>();
+    }
+
     std::string get_pp_string(void){
         std::string buff = str(boost::format(
-            "Multi USRP:\n"
+            "%s USRP:\n"
             "  Device: %s\n"
         )
+            % ((get_num_mboards() > 1)? "Multi" : "Single")
             % (*_dev)[DEVICE_PROP_NAME].as<std::string>()
         );
         for (size_t m = 0; m < get_num_mboards(); m++){
@@ -121,6 +136,16 @@ public:
         return _mboard(0)[MBOARD_PROP_TIME_PPS].as<time_spec_t>();
     }
 
+    void set_time_now(const time_spec_t &time_spec, size_t mboard){
+        if (mboard != ALL_MBOARDS){
+            _mboard(mboard)[MBOARD_PROP_TIME_NOW] = time_spec;
+            return;
+        }
+        for (size_t m = 0; m < get_num_mboards(); m++){
+            set_time_now(time_spec, m);
+        }
+    }
+
     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_PPS] = time_spec;
diff --git a/host/lib/usrp/single_usrp.cpp b/host/lib/usrp/single_usrp.cpp
deleted file mode 100644
index c37449c5f..000000000
--- a/host/lib/usrp/single_usrp.cpp
+++ /dev/null
@@ -1,339 +0,0 @@
-//
-// Copyright 2010-2011 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/single_usrp.hpp>
-#include <uhd/usrp/tune_helper.hpp>
-#include <uhd/utils/assert.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/foreach.hpp>
-#include <boost/format.hpp>
-#include <stdexcept>
-#include <iostream>
-
-using namespace uhd;
-using namespace uhd::usrp;
-
-const std::string single_usrp::ALL_GAINS = "";
-
-/***********************************************************************
- * Simple USRP Implementation
- **********************************************************************/
-class single_usrp_impl : public single_usrp{
-public:
-    single_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(
-            "Single USRP:\n"
-            "  Device: %s\n"
-            "  Mboard: %s\n"
-        )
-            % (*_dev)[DEVICE_PROP_NAME].as<std::string>()
-            % _mboard()[MBOARD_PROP_NAME].as<std::string>()
-        );
-
-        //----------- rx side of life ----------------------------------
-        buff += str(boost::format(
-            "  RX DSP: %s\n"
-        )
-            % _rx_dsp()[DSP_PROP_NAME].as<std::string>()
-        );
-        for (size_t chan = 0; chan < this->get_rx_subdev_spec().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 ----------------------------------
-        buff += str(boost::format(
-            "  TX DSP: %s\n"
-        )
-            % _tx_dsp()[DSP_PROP_NAME].as<std::string>()
-        );
-        for (size_t chan = 0; chan < this->get_tx_subdev_spec().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(void){
-        return _mboard()[MBOARD_PROP_NAME].as<std::string>();
-    }
-
-    time_spec_t get_time_now(void){
-        return _mboard()[MBOARD_PROP_TIME_NOW].as<time_spec_t>();
-    }
-
-    time_spec_t get_time_last_pps(void){
-        return _mboard()[MBOARD_PROP_TIME_PPS].as<time_spec_t>();
-    }
-
-    void set_time_now(const time_spec_t &time_spec){
-        _mboard()[MBOARD_PROP_TIME_NOW] = time_spec;
-    }
-
-    void set_time_next_pps(const time_spec_t &time_spec){
-        _mboard()[MBOARD_PROP_TIME_PPS] = time_spec;
-    }
-
-    void issue_stream_cmd(const stream_cmd_t &stream_cmd){
-        _mboard()[MBOARD_PROP_STREAM_CMD] = stream_cmd;
-    }
-
-    void set_clock_config(const clock_config_t &clock_config){
-        _mboard()[MBOARD_PROP_CLOCK_CONFIG] = clock_config;
-    }
-
-    /*******************************************************************
-     * RX methods
-     ******************************************************************/
-    void set_rx_subdev_spec(const subdev_spec_t &spec){
-        _mboard()[MBOARD_PROP_RX_SUBDEV_SPEC] = spec;
-    }
-
-    subdev_spec_t get_rx_subdev_spec(void){
-        return _mboard()[MBOARD_PROP_RX_SUBDEV_SPEC].as<subdev_spec_t>();
-    }
-
-    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){
-        _rx_dsp()[DSP_PROP_HOST_RATE] = rate;
-        do_samp_rate_warning_message(rate, get_rx_rate(), "RX");
-    }
-
-    double get_rx_rate(void){
-        return _rx_dsp()[DSP_PROP_HOST_RATE].as<double>();
-    }
-
-    tune_result_t set_rx_freq(const tune_request_t &tune_request, size_t chan){
-        tune_result_t r = tune_rx_subdev_and_dsp(_rx_subdev(chan), _rx_dsp(), chan, tune_request);
-        do_tune_freq_warning_message(tune_request.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);
-    }
-
-    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());
-    }
-
-    void set_rx_gain(double gain, const std::string &name, size_t chan){
-        return _rx_gain_group(chan)->set_value(gain, name);
-    }
-
-    double 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>();
-    }
-
-    double read_rssi(size_t chan){
-        return _rx_subdev(chan)[SUBDEV_PROP_RSSI].as<double>();
-    }
-
-    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){
-        _mboard()[MBOARD_PROP_TX_SUBDEV_SPEC] = spec;
-    }
-
-    subdev_spec_t get_tx_subdev_spec(void){
-        return _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>();
-    }
-
-    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){
-        return _tx_dsp()[DSP_PROP_HOST_RATE].as<double>();
-    }
-
-    tune_result_t set_tx_freq(const tune_request_t &tune_request, size_t chan){
-        tune_result_t r = tune_tx_subdev_and_dsp(_tx_subdev(chan), _tx_dsp(), chan, tune_request);
-        do_tune_freq_warning_message(tune_request.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);
-    }
-
-    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());
-    }
-
-    void set_tx_gain(double gain, const std::string &name, size_t chan){
-        return _tx_gain_group(chan)->set_value(gain, name);
-    }
-
-    double 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;
-    wax::obj _mboard(void){
-        return (*_dev)[DEVICE_PROP_MBOARD];
-    }
-    wax::obj _rx_dsp(void){
-        return _mboard()[MBOARD_PROP_RX_DSP];
-    }
-    wax::obj _tx_dsp(void){
-        return _mboard()[MBOARD_PROP_TX_DSP];
-    }
-    wax::obj _rx_dboard(size_t chan){
-        std::string db_name = this->get_rx_subdev_spec().at(chan).db_name;
-        return _mboard()[named_prop_t(MBOARD_PROP_RX_DBOARD, db_name)];
-    }
-    wax::obj _tx_dboard(size_t chan){
-        std::string db_name = this->get_tx_subdev_spec().at(chan).db_name;
-        return _mboard()[named_prop_t(MBOARD_PROP_TX_DBOARD, db_name)];
-    }
-    wax::obj _rx_subdev(size_t chan){
-        std::string sd_name = this->get_rx_subdev_spec().at(chan).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 = this->get_tx_subdev_spec().at(chan).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 = this->get_rx_subdev_spec().at(chan).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 = this->get_tx_subdev_spec().at(chan).sd_name;
-        return _tx_dboard(chan)[named_prop_t(DBOARD_PROP_GAIN_GROUP, sd_name)].as<gain_group::sptr>();
-    }
-};
-
-/***********************************************************************
- * The Make Function
- **********************************************************************/
-single_usrp::sptr single_usrp::make(const device_addr_t &dev_addr){
-    return sptr(new single_usrp_impl(dev_addr));
-}
diff --git a/host/lib/usrp/usrp1/clock_ctrl.cpp b/host/lib/usrp/usrp1/clock_ctrl.cpp
index 68c5f5320..156f2b0c4 100644
--- a/host/lib/usrp/usrp1/clock_ctrl.cpp
+++ b/host/lib/usrp/usrp1/clock_ctrl.cpp
@@ -29,32 +29,33 @@ using namespace uhd;
 /***********************************************************************
  * Constants
  **********************************************************************/
-static const double master_clock_rate = 64e6;
+static const double default_master_clock_rate = 64e6;
 
 /***********************************************************************
  * Clock Control Implementation
  **********************************************************************/
 class usrp1_clock_ctrl_impl : public usrp1_clock_ctrl {
 public:
-    usrp1_clock_ctrl_impl(usrp1_iface::sptr iface)
-    {
-        _iface = iface;
+    usrp1_clock_ctrl_impl(usrp1_iface::sptr iface): _iface(iface){
+        this->set_master_clock_freq(default_master_clock_rate);
     }
 
-    double get_master_clock_freq(void)
-    {
-        return master_clock_rate; 
+    void set_master_clock_freq(double freq){
+        _freq = freq;
+    }
+
+    double get_master_clock_freq(void){
+        return _freq;
     }
 
 private:
     usrp1_iface::sptr _iface;
-
+    double _freq;
 };
 
 /***********************************************************************
  * Clock Control Make
  **********************************************************************/
-usrp1_clock_ctrl::sptr usrp1_clock_ctrl::make(usrp1_iface::sptr iface)
-{
+usrp1_clock_ctrl::sptr usrp1_clock_ctrl::make(usrp1_iface::sptr iface){
     return sptr(new usrp1_clock_ctrl_impl(iface));
 }
diff --git a/host/lib/usrp/usrp1/clock_ctrl.hpp b/host/lib/usrp/usrp1/clock_ctrl.hpp
index 366869dab..645472f02 100644
--- a/host/lib/usrp/usrp1/clock_ctrl.hpp
+++ b/host/lib/usrp/usrp1/clock_ctrl.hpp
@@ -40,6 +40,13 @@ public:
     static sptr make(usrp1_iface::sptr iface);
 
     /*!
+     * Set the rate of the fpga clock line.
+     * Note: does not really set, its all software.
+     * \param freq the new clock rate in Hz
+     */
+    virtual void set_master_clock_freq(double freq) = 0;
+
+    /*!
      * Get the rate of the fpga clock line.
      * \return the fpga clock rate in Hz
      */
diff --git a/host/lib/usrp/usrp1/mboard_impl.cpp b/host/lib/usrp/usrp1/mboard_impl.cpp
index 23c8f03c4..6d5bf466d 100644
--- a/host/lib/usrp/usrp1/mboard_impl.cpp
+++ b/host/lib/usrp/usrp1/mboard_impl.cpp
@@ -317,6 +317,10 @@ void usrp1_impl::mboard_get(const wax::obj &key_, wax::obj &val)
         val = _soft_time_ctrl->get_time();
         return;
 
+    case MBOARD_PROP_CLOCK_RATE:
+        val = _clock_ctrl->get_master_clock_freq();
+        return;
+
     default: UHD_THROW_PROP_GET_ERROR();
     }
 }
@@ -379,6 +383,10 @@ void usrp1_impl::mboard_set(const wax::obj &key, const wax::obj &val)
         _soft_time_ctrl->set_time(val.as<time_spec_t>());
         return;
 
+    case MBOARD_PROP_CLOCK_RATE:
+        _clock_ctrl->set_master_clock_freq(val.as<double>());
+        return;
+
     default: UHD_THROW_PROP_SET_ERROR();
     }
 }
diff --git a/host/lib/usrp/usrp2/mboard_impl.cpp b/host/lib/usrp/usrp2/mboard_impl.cpp
index 3e7e8b01f..784f662d9 100644
--- a/host/lib/usrp/usrp2/mboard_impl.cpp
+++ b/host/lib/usrp/usrp2/mboard_impl.cpp
@@ -355,6 +355,10 @@ void usrp2_mboard_impl::get(const wax::obj &key_, wax::obj &val){
         val = _iface->mb_eeprom;
         return;
 
+    case MBOARD_PROP_CLOCK_RATE:
+        val = this->get_master_clock_freq();
+        return;
+
     default: UHD_THROW_PROP_GET_ERROR();
     }
 }
@@ -412,6 +416,10 @@ void usrp2_mboard_impl::set(const wax::obj &key, const wax::obj &val){
         _iface->mb_eeprom = mboard_eeprom_t(*_iface, mboard_eeprom_t::MAP_N100);
         return;
 
+    case MBOARD_PROP_CLOCK_RATE:
+        UHD_ASSERT_THROW(val.as<double>() == this->get_master_clock_freq());
+        return;
+
     default: UHD_THROW_PROP_SET_ERROR();
     }
 }