usrp1: removed unused files from impl dir

7 files changed, 0 insertions, 1133 deletions

diff --git a/host/lib/usrp/usrp1/clock_ctrl.cpp b/host/lib/usrp/usrp1/clock_ctrl.cpp
deleted file mode 100644
index 9edc010dd..000000000
--- a/host/lib/usrp/usrp1/clock_ctrl.cpp
+++ /dev/null
@@ -1,68 +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 "clock_ctrl.hpp"
-#include <uhd/utils/msg.hpp>
-#include <boost/lexical_cast.hpp>
-#include <boost/format.hpp>
-
-using namespace uhd;
-
-/***********************************************************************
- * Constants
- **********************************************************************/
-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){
-        this->set_master_clock_freq(default_master_clock_rate);
-        try{
-            if (not _iface->mb_eeprom["mcr"].empty()){
-                UHD_MSG(status) << "Read FPGA clock rate from EEPROM setting." << std::endl;
-                const double master_clock_rate = boost::lexical_cast<double>(_iface->mb_eeprom["mcr"]);
-                UHD_MSG(status) << boost::format("Initializing FPGA clock to %fMHz...") % (master_clock_rate/1e6) << std::endl;
-                this->set_master_clock_freq(master_clock_rate);
-            }
-        }
-        catch(const std::exception &e){
-            UHD_MSG(error) << "Error setting FPGA clock rate from EEPROM: " << e.what() << std::endl;
-        }
-    }
-
-    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){
-    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
deleted file mode 100644
index 339d547e6..000000000
--- a/host/lib/usrp/usrp1/clock_ctrl.hpp
+++ /dev/null
@@ -1,57 +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/>.
-//
-
-#ifndef INCLUDED_USRP1_CLOCK_CTRL_HPP
-#define INCLUDED_USRP1_CLOCK_CTRL_HPP
-
-#include "usrp1_iface.hpp"
-#include <boost/shared_ptr.hpp>
-#include <boost/utility.hpp>
-#include <vector>
-
-/*!
- * The usrp1 clock control:
- * - Setup system clocks.
- * - Disable/enable clock lines.
- */
-class usrp1_clock_ctrl : boost::noncopyable{
-public:
-    typedef boost::shared_ptr<usrp1_clock_ctrl> sptr;
-
-    /*!
-     * Make a new clock control object.
-     * \param iface the usrp1 iface object
-     * \return the clock control object
-     */
-    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
-     */
-    virtual double get_master_clock_freq(void) = 0;
-
-};
-
-#endif /* INCLUDED_USRP1_CLOCK_CTRL_HPP */
diff --git a/host/lib/usrp/usrp1/codec_ctrl.cpp b/host/lib/usrp/usrp1/codec_ctrl.cpp
index 2e9355063..c82569ea3 100644
--- a/host/lib/usrp/usrp1/codec_ctrl.cpp
+++ b/host/lib/usrp/usrp1/codec_ctrl.cpp
@@ -16,8 +16,6 @@
 //
 
 #include "codec_ctrl.hpp"
-#include "usrp_commands.h"
-#include "clock_ctrl.hpp"
 #include "ad9862_regs.hpp"
 #include <uhd/utils/log.hpp>
 #include <uhd/utils/safe_call.hpp>
diff --git a/host/lib/usrp/usrp1/codec_impl.cpp b/host/lib/usrp/usrp1/codec_impl.cpp
deleted file mode 100644
index 7e4032131..000000000
--- a/host/lib/usrp/usrp1/codec_impl.cpp
+++ /dev/null
@@ -1,159 +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 "usrp1_impl.hpp"
-#include <uhd/exception.hpp>
-#include <uhd/usrp/codec_props.hpp>
-#include <boost/bind.hpp>
-#include <boost/foreach.hpp>
-#include <boost/format.hpp>
-
-using namespace uhd;
-using namespace uhd::usrp;
-
-/***********************************************************************
- * Helper Methods
- **********************************************************************/
-void usrp1_impl::codec_init(void)
-{
-    //make proxies
-    BOOST_FOREACH(dboard_slot_t dboard_slot, _dboard_slots){
-        _rx_codec_proxies[dboard_slot] = wax_obj_proxy::make(
-              boost::bind(&usrp1_impl::rx_codec_get, this, _1, _2, dboard_slot),
-              boost::bind(&usrp1_impl::rx_codec_set, this, _1, _2, dboard_slot));
-
-        _tx_codec_proxies[dboard_slot] = wax_obj_proxy::make(
-              boost::bind(&usrp1_impl::tx_codec_get, this, _1, _2, dboard_slot),
-              boost::bind(&usrp1_impl::tx_codec_set, this, _1, _2, dboard_slot));
-    }
-}    
-
-/***********************************************************************
- * RX Codec Properties
- **********************************************************************/
-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)
-{
-    named_prop_t key = named_prop_t::extract(key_);
-
-    //handle the get request conditioned on the key
-    switch(key.as<codec_prop_t>()) {
-    case CODEC_PROP_NAME:
-        val = str(boost::format("usrp1 adc - ad9862 - slot %c") % char(dboard_slot));
-        return;
-
-    case CODEC_PROP_OTHERS:
-        val = prop_names_t();
-        return;
-
-    case CODEC_PROP_GAIN_NAMES:
-        val = prop_names_t(1, adc_pga_gain_name);
-        return;
-
-    case CODEC_PROP_GAIN_RANGE:
-        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 == 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 == adc_pga_gain_name);
-        val = _codec_ctrls[dboard_slot]->get_rx_pga_gain('B');
-        return;
-
-    default: UHD_THROW_PROP_GET_ERROR();
-    }
-}
-
-void usrp1_impl::rx_codec_set(const wax::obj &key_, const wax::obj &val, dboard_slot_t dboard_slot)
-{
-    named_prop_t key = named_prop_t::extract(key_);
-
-    //handle the set request conditioned on the key
-    switch(key.as<codec_prop_t>()) {
-    case CODEC_PROP_GAIN_I:
-        UHD_ASSERT_THROW(key.name == adc_pga_gain_name);
-        _codec_ctrls[dboard_slot]->set_rx_pga_gain(val.as<double>(), 'A');
-        return;
-
-    case CODEC_PROP_GAIN_Q:
-        UHD_ASSERT_THROW(key.name == adc_pga_gain_name);
-        _codec_ctrls[dboard_slot]->set_rx_pga_gain(val.as<double>(), 'B');
-        return;
-
-    default: UHD_THROW_PROP_SET_ERROR();
-    }
-}
-
-/***********************************************************************
- * 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_);
-
-    //handle the get request conditioned on the key
-    switch(key.as<codec_prop_t>()) {
-    case CODEC_PROP_NAME:
-        val = str(boost::format("usrp1 dac - ad9862 - slot %c") % char(dboard_slot));
-        return;
-
-    case CODEC_PROP_OTHERS:
-        val = prop_names_t();
-        return;
-
-    case CODEC_PROP_GAIN_NAMES:
-        val = prop_names_t(1, dac_pga_gain_name);
-        return;
-
-    case CODEC_PROP_GAIN_RANGE:
-        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 == dac_pga_gain_name);
-        val = _codec_ctrls[dboard_slot]->get_tx_pga_gain();
-        return;
-
-    default: UHD_THROW_PROP_GET_ERROR();
-    }
-}
-
-void usrp1_impl::tx_codec_set(const wax::obj &key_, const wax::obj &val, dboard_slot_t dboard_slot)
-{
-    named_prop_t key = named_prop_t::extract(key_);
-
-    //handle the set request conditioned on the key
-    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 == dac_pga_gain_name);
-        _codec_ctrls[dboard_slot]->set_tx_pga_gain(val.as<double>());
-        return;
-
-    default: UHD_THROW_PROP_SET_ERROR();
-    }
-}
diff --git a/host/lib/usrp/usrp1/dboard_impl.cpp b/host/lib/usrp/usrp1/dboard_impl.cpp
deleted file mode 100644
index df0bb6261..000000000
--- a/host/lib/usrp/usrp1/dboard_impl.cpp
+++ /dev/null
@@ -1,218 +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 "usrp1_impl.hpp"
-#include "usrp_i2c_addr.h"
-#include <uhd/usrp/dsp_utils.hpp>
-#include <uhd/usrp/misc_utils.hpp>
-#include <uhd/exception.hpp>
-#include <uhd/usrp/dboard_props.hpp>
-#include <uhd/usrp/subdev_props.hpp>
-#include <boost/bind.hpp>
-#include <boost/foreach.hpp>
-#include <boost/format.hpp>
-#include <iostream>
-
-using namespace uhd;
-using namespace uhd::usrp;
-
-/***********************************************************************
- * Helper Functions
- **********************************************************************/
-static boost::uint8_t get_rx_ee_addr(usrp1_impl::dboard_slot_t dboard_slot){
-    switch(dboard_slot){
-    case usrp1_impl::DBOARD_SLOT_A: return I2C_ADDR_RX_A;
-    case usrp1_impl::DBOARD_SLOT_B: return I2C_ADDR_RX_B;
-    default: UHD_THROW_INVALID_CODE_PATH();
-    }
-}
-
-static boost::uint8_t get_tx_ee_addr(usrp1_impl::dboard_slot_t dboard_slot){
-    switch(dboard_slot){
-    case usrp1_impl::DBOARD_SLOT_A: return I2C_ADDR_TX_A;
-    case usrp1_impl::DBOARD_SLOT_B: return I2C_ADDR_TX_B;
-    default: UHD_THROW_INVALID_CODE_PATH();
-    }
-}
-
-/***********************************************************************
- * Dboard Initialization
- **********************************************************************/
-void usrp1_impl::dboard_init(void)
-{
-    BOOST_FOREACH(dboard_slot_t dboard_slot, _dboard_slots){
-
-        //read the tx and rx dboard eeproms
-        _rx_db_eeproms[dboard_slot].load(*_iface, get_rx_ee_addr(dboard_slot));
-        _tx_db_eeproms[dboard_slot].load(*_iface, get_tx_ee_addr(dboard_slot));
-        _gdb_eeproms[dboard_slot].load(*_iface, get_tx_ee_addr(dboard_slot) ^ 5);
-
-        //create a new dboard interface and manager
-        _dboard_ifaces[dboard_slot] = make_dboard_iface(
-            _iface, _clock_ctrl, _codec_ctrls[dboard_slot],
-            dboard_slot, _rx_db_eeproms[dboard_slot].id
-        );
-
-        _dboard_managers[dboard_slot] = dboard_manager::make(
-            _rx_db_eeproms[dboard_slot].id,
-            ((_gdb_eeproms[dboard_slot].id == dboard_id_t::none())? _tx_db_eeproms[dboard_slot] : _gdb_eeproms[dboard_slot]).id,
-            _dboard_ifaces[dboard_slot]
-        );
-
-        //setup the dboard proxies
-        _rx_dboard_proxies[dboard_slot] = wax_obj_proxy::make(
-             boost::bind(&usrp1_impl::rx_dboard_get, this, _1, _2, dboard_slot),
-             boost::bind(&usrp1_impl::rx_dboard_set, this, _1, _2, dboard_slot));
-
-        _tx_dboard_proxies[dboard_slot] = wax_obj_proxy::make(
-             boost::bind(&usrp1_impl::tx_dboard_get, this, _1, _2, dboard_slot),
-             boost::bind(&usrp1_impl::tx_dboard_set, this, _1, _2, dboard_slot));
-    }
-
-}
-
-/***********************************************************************
- * RX Dboard Get
- **********************************************************************/
-void usrp1_impl::rx_dboard_get(const wax::obj &key_, wax::obj &val, dboard_slot_t dboard_slot)
-{
-    named_prop_t key = named_prop_t::extract(key_);
-
-    //handle the get request conditioned on the key
-    switch(key.as<dboard_prop_t>()){
-    case DBOARD_PROP_NAME:
-        val = str(boost::format("usrp1 dboard (rx unit) - %c") % char(dboard_slot));
-        return;
-
-    case DBOARD_PROP_SUBDEV:
-        val = _dboard_managers[dboard_slot]->get_rx_subdev(key.name);
-        return;
-
-    case DBOARD_PROP_SUBDEV_NAMES:
-        val = _dboard_managers[dboard_slot]->get_rx_subdev_names();
-        return;
-
-    case DBOARD_PROP_DBOARD_EEPROM:
-        val = _rx_db_eeproms[dboard_slot];
-        return;
-
-    case DBOARD_PROP_DBOARD_IFACE:
-        val = _dboard_ifaces[dboard_slot];
-        return;
-
-    case DBOARD_PROP_CODEC:
-        val = _rx_codec_proxies[dboard_slot]->get_link();
-        return;
-
-    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
-        );
-        return;
-
-    default: UHD_THROW_PROP_GET_ERROR();
-    }
-}
-
-/***********************************************************************
- * RX Dboard Set
- **********************************************************************/
-void usrp1_impl::rx_dboard_set(const wax::obj &key, const wax::obj &val, dboard_slot_t dboard_slot)
-{
-    switch(key.as<dboard_prop_t>()) {
-    case DBOARD_PROP_DBOARD_EEPROM:
-        _rx_db_eeproms[dboard_slot] = val.as<dboard_eeprom_t>();
-        _rx_db_eeproms[dboard_slot].store(*_iface, get_rx_ee_addr(dboard_slot));
-        return;
-
-    default:
-        UHD_THROW_PROP_SET_ERROR();
-    }
-}
-
-/***********************************************************************
- * TX Dboard Get
- **********************************************************************/
-void usrp1_impl::tx_dboard_get(const wax::obj &key_, wax::obj &val, dboard_slot_t dboard_slot)
-{
-    named_prop_t key = named_prop_t::extract(key_);
-
-    //handle the get request conditioned on the key
-    switch(key.as<dboard_prop_t>()){
-    case DBOARD_PROP_NAME:
-        val = str(boost::format("usrp1 dboard (tx unit) - %c") % char(dboard_slot));
-        return;
-
-    case DBOARD_PROP_SUBDEV:
-        val = _dboard_managers[dboard_slot]->get_tx_subdev(key.name);
-        return;
-
-    case DBOARD_PROP_SUBDEV_NAMES:
-        val = _dboard_managers[dboard_slot]->get_tx_subdev_names();
-        return;
-
-    case DBOARD_PROP_DBOARD_EEPROM:
-        val = _tx_db_eeproms[dboard_slot];
-        return;
-
-    case DBOARD_PROP_GBOARD_EEPROM:
-        val = _gdb_eeproms[dboard_slot];
-        return;
-
-    case DBOARD_PROP_DBOARD_IFACE:
-        val = _dboard_ifaces[dboard_slot];
-        return;
-
-    case DBOARD_PROP_CODEC:
-        val = _tx_codec_proxies[dboard_slot]->get_link();
-        return;
-
-    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
-        );
-        return;
-
-    default: UHD_THROW_PROP_GET_ERROR();
-    }
-}
-
-/***********************************************************************
- * TX Dboard Set
- **********************************************************************/
-void usrp1_impl::tx_dboard_set(const wax::obj &key, const wax::obj &val, dboard_slot_t dboard_slot)
-{
-    switch(key.as<dboard_prop_t>()) {
-    case DBOARD_PROP_DBOARD_EEPROM:
-        _tx_db_eeproms[dboard_slot] = val.as<dboard_eeprom_t>();
-        _tx_db_eeproms[dboard_slot].store(*_iface, get_tx_ee_addr(dboard_slot));
-        return;
-
-    case DBOARD_PROP_GBOARD_EEPROM:
-        _gdb_eeproms[dboard_slot] = val.as<dboard_eeprom_t>();
-        _gdb_eeproms[dboard_slot].store(*_iface, get_tx_ee_addr(dboard_slot) ^ 5);
-        return;
-
-    default: UHD_THROW_PROP_SET_ERROR();
-    }
-}
diff --git a/host/lib/usrp/usrp1/dsp_impl.cpp b/host/lib/usrp/usrp1/dsp_impl.cpp
deleted file mode 100644
index 0bddc49f0..000000000
--- a/host/lib/usrp/usrp1/dsp_impl.cpp
+++ /dev/null
@@ -1,222 +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 "usrp1_impl.hpp"
-#include "fpga_regs_standard.h"
-#include <uhd/utils/msg.hpp>
-#include <uhd/usrp/dsp_utils.hpp>
-#include <uhd/usrp/dsp_props.hpp>
-#include <boost/bind.hpp>
-#include <boost/format.hpp>
-#include <boost/lexical_cast.hpp>
-#include <boost/assign/list_of.hpp>
-#include <cmath>
-
-using namespace uhd;
-using namespace uhd::usrp;
-
-/***********************************************************************
- * RX DDC Initialization
- **********************************************************************/
-void usrp1_impl::rx_dsp_init(void)
-{
-    for (size_t i = 0; i < this->get_num_ddcs(); i++){
-        _rx_dsp_proxies[str(boost::format("DSP%d")%i)] = wax_obj_proxy::make(
-            boost::bind(&usrp1_impl::rx_dsp_get, this, _1, _2, i),
-            boost::bind(&usrp1_impl::rx_dsp_set, this, _1, _2, i)
-        );
-        rx_dsp_set(DSP_PROP_HOST_RATE, _clock_ctrl->get_master_clock_freq() / 16, i);
-    }
-}
-
-/***********************************************************************
- * RX DDC Get
- **********************************************************************/
-void usrp1_impl::rx_dsp_get(const wax::obj &key_, wax::obj &val, size_t which_dsp){
-    named_prop_t key = named_prop_t::extract(key_);
-
-    switch(key.as<dsp_prop_t>()){
-    case DSP_PROP_NAME:
-        val = str(boost::format("usrp1 ddc%d %s")
-            % which_dsp
-            % (this->has_rx_halfband()? "+ hb" : "")
-        );
-        return;
-
-    case DSP_PROP_OTHERS:
-        val = prop_names_t();
-        return;
-
-    case DSP_PROP_FREQ_SHIFT:
-        val = _rx_dsp_freqs[which_dsp];
-        return;
-
-    case DSP_PROP_CODEC_RATE:
-        val = _clock_ctrl->get_master_clock_freq();
-        return;
-
-    case DSP_PROP_HOST_RATE:
-        val = _clock_ctrl->get_master_clock_freq()/_rx_dsp_decim;
-        return;
-
-    default: UHD_THROW_PROP_GET_ERROR();
-    }
-
-}
-
-/***********************************************************************
- * RX DDC Set
- **********************************************************************/
-void usrp1_impl::rx_dsp_set(const wax::obj &key_, const wax::obj &val, size_t which_dsp){
-    named_prop_t key = named_prop_t::extract(key_);
-
-    switch(key.as<dsp_prop_t>()) {
-    case DSP_PROP_FREQ_SHIFT: {
-            double new_freq = val.as<double>();
-            boost::uint32_t reg_word = dsp_type1::calc_cordic_word_and_update(
-                new_freq, _clock_ctrl->get_master_clock_freq());
-
-            static const boost::uint32_t dsp_index_to_reg_val[4] = {
-                FR_RX_FREQ_0, FR_RX_FREQ_1, FR_RX_FREQ_2, FR_RX_FREQ_3
-            };
-            _iface->poke32(dsp_index_to_reg_val[which_dsp], ~reg_word + 1);
-            _rx_dsp_freqs[which_dsp] = new_freq;
-            return;
-        }
-
-    case DSP_PROP_HOST_RATE:
-        if (which_dsp != 0) return; //only for dsp[0] as this is vectorized
-        {
-            size_t rate = size_t(_clock_ctrl->get_master_clock_freq() / val.as<double>());
-
-            //clip the rate to something in range:
-            rate = std::min<size_t>(std::max<size_t>(rate, 4), 256);
-
-            _rx_dsp_decim = rate;
-            //TODO Poll every 100ms. Make it selectable?
-            _rx_samps_per_poll_interval = size_t(0.1 * _clock_ctrl->get_master_clock_freq() / rate);
-
-            bool s = this->disable_rx();
-            _iface->poke32(FR_DECIM_RATE, _rx_dsp_decim/2 - 1);
-            this->restore_rx(s);
-        }
-        this->update_xport_channel_mapping(); //rate changed -> update
-        return;
-
-    case DSP_PROP_STREAM_CMD:
-        if (which_dsp != 0) return; //only for dsp[0] as this is vectorized
-        _soft_time_ctrl->issue_stream_cmd(val.as<stream_cmd_t>());
-        return;
-
-    default: UHD_THROW_PROP_SET_ERROR();
-    }
-
-}
-
-/***********************************************************************
- * TX DUC Initialization
- **********************************************************************/
-void usrp1_impl::tx_dsp_init(void)
-{
-    for (size_t i = 0; i < this->get_num_ducs(); i++){
-        _tx_dsp_proxies[str(boost::format("DSP%d")%i)] = wax_obj_proxy::make(
-            boost::bind(&usrp1_impl::tx_dsp_get, this, _1, _2, i),
-            boost::bind(&usrp1_impl::tx_dsp_set, this, _1, _2, i)
-        );
-        tx_dsp_set(DSP_PROP_HOST_RATE, _clock_ctrl->get_master_clock_freq() / 16, i);
-    }
-}
-
-/***********************************************************************
- * TX DUC Get
- **********************************************************************/
-void usrp1_impl::tx_dsp_get(const wax::obj &key_, wax::obj &val, size_t which_dsp){
-    named_prop_t key = named_prop_t::extract(key_);
-
-    switch(key.as<dsp_prop_t>()) {
-    case DSP_PROP_NAME:
-        val = str(boost::format("usrp1 duc%d %s")
-            % which_dsp
-            % (this->has_tx_halfband()? "+ hb" : "")
-        );
-        return;
-
-    case DSP_PROP_OTHERS:
-        val = prop_names_t(); //empty
-        return;
-
-    case DSP_PROP_FREQ_SHIFT:
-        val = _tx_dsp_freqs[which_dsp];
-        return;
-
-    case DSP_PROP_CODEC_RATE:
-        val = _clock_ctrl->get_master_clock_freq();
-        return;
-
-    case DSP_PROP_HOST_RATE:
-        val = _clock_ctrl->get_master_clock_freq() / _tx_dsp_interp;
-        return;
-
-    default: UHD_THROW_PROP_GET_ERROR();
-    }
-
-}
-
-/***********************************************************************
- * TX DUC Set
- **********************************************************************/
-void usrp1_impl::tx_dsp_set(const wax::obj &key_, const wax::obj &val, size_t which_dsp){
-    named_prop_t key = named_prop_t::extract(key_);
-
-    switch(key.as<dsp_prop_t>()) {
-
-    case DSP_PROP_FREQ_SHIFT: {
-            double new_freq = val.as<double>();
-
-            //map the freq shift key to a subdev spec to a particular codec chip
-            std::string db_name = _tx_subdev_spec.at(which_dsp).db_name;
-            if (db_name == "A") _codec_ctrls[DBOARD_SLOT_A]->set_duc_freq(new_freq);
-            if (db_name == "B") _codec_ctrls[DBOARD_SLOT_B]->set_duc_freq(new_freq);
-
-            _tx_dsp_freqs[which_dsp] = new_freq;
-            return;
-        }
-
-    case DSP_PROP_HOST_RATE:
-        if (which_dsp != 0) return; //only for dsp[0] as this is vectorized
-        {
-            size_t rate = size_t(_clock_ctrl->get_master_clock_freq() / val.as<double>());
-
-            //clip the rate to something in range:
-            rate = std::min<size_t>(std::max<size_t>(rate, 4), 256);
-
-            _tx_dsp_interp = rate;
-
-            //TODO Poll every 100ms. Make it selectable? 
-            _tx_samps_per_poll_interval = size_t(0.1 * _clock_ctrl->get_master_clock_freq() / rate);
-
-            bool s = this->disable_tx();
-            _iface->poke32(FR_INTERP_RATE, _tx_dsp_interp/2 - 1);
-            this->restore_tx(s);
-        }
-        this->update_xport_channel_mapping(); //rate changed -> update
-        return;
-
-    default: UHD_THROW_PROP_SET_ERROR();
-    }
-
-}
diff --git a/host/lib/usrp/usrp1/mboard_impl.cpp b/host/lib/usrp/usrp1/mboard_impl.cpp
deleted file mode 100644
index a265a5089..000000000
--- a/host/lib/usrp/usrp1/mboard_impl.cpp
+++ /dev/null
@@ -1,407 +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 "usrp1_impl.hpp"
-#include "usrp_commands.h"
-#include "fpga_regs_standard.h"
-#include "fpga_regs_common.h"
-#include "usrp_i2c_addr.h"
-#include <uhd/utils/msg.hpp>
-#include <uhd/utils/log.hpp>
-#include <uhd/usrp/misc_utils.hpp>
-#include <uhd/usrp/mboard_props.hpp>
-#include <uhd/usrp/dboard_props.hpp>
-#include <uhd/usrp/subdev_props.hpp>
-#include <uhd/utils/msg.hpp>
-#include <uhd/utils/assert_has.hpp>
-#include <uhd/utils/images.hpp>
-#include <boost/assign/list_of.hpp>
-#include <boost/foreach.hpp>
-#include <boost/bind.hpp>
-#include <boost/thread/thread.hpp>
-
-using namespace uhd;
-using namespace uhd::usrp;
-
-/***********************************************************************
- * Calculate the RX mux value:
- *    The I and Q mux values are intentionally reversed to flip I and Q
- *    to account for the reversal in the type conversion routines.
- **********************************************************************/
-static int calc_rx_mux_pair(int adc_for_i, int adc_for_q){
-    return (adc_for_i << 2) | (adc_for_q << 0); //shift reversal here
-}
-
-/*!
- *    3                   2                   1                   0
- *  1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
- * +-----------------------+-------+-------+-------+-------+-+-----+
- * |      must be zero     | Q3| I3| Q2| I2| Q1| I1| Q0| I0|Z| NCH |
- * +-----------------------+-------+-------+-------+-------+-+-----+
- */
-static boost::uint32_t calc_rx_mux(
-    const subdev_spec_t &subdev_spec, wax::obj mboard
-){
-    //create look-up-table for mapping dboard name and connection type to ADC flags
-    static const int ADC0 = 0, ADC1 = 1, ADC2 = 2, ADC3 = 3;
-    static const uhd::dict<std::string, uhd::dict<subdev_conn_t, int> > name_to_conn_to_flag = boost::assign::map_list_of
-        ("A", boost::assign::map_list_of
-            (SUBDEV_CONN_COMPLEX_IQ, calc_rx_mux_pair(ADC0, ADC1)) //I and Q
-            (SUBDEV_CONN_COMPLEX_QI, calc_rx_mux_pair(ADC1, ADC0)) //I and Q
-            (SUBDEV_CONN_REAL_I,     calc_rx_mux_pair(ADC0, ADC0)) //I and Q (Q identical but ignored Z=1)
-            (SUBDEV_CONN_REAL_Q,     calc_rx_mux_pair(ADC1, ADC1)) //I and Q (Q identical but ignored Z=1)
-        )
-        ("B", boost::assign::map_list_of
-            (SUBDEV_CONN_COMPLEX_IQ, calc_rx_mux_pair(ADC2, ADC3)) //I and Q
-            (SUBDEV_CONN_COMPLEX_QI, calc_rx_mux_pair(ADC3, ADC2)) //I and Q
-            (SUBDEV_CONN_REAL_I,     calc_rx_mux_pair(ADC2, ADC2)) //I and Q (Q identical but ignored Z=1)
-            (SUBDEV_CONN_REAL_Q,     calc_rx_mux_pair(ADC3, ADC3)) //I and Q (Q identical but ignored Z=1)
-        )
-    ;
-
-    //extract the number of channels
-    size_t nchan = subdev_spec.size();
-
-    //calculate the channel flags
-    int channel_flags = 0;
-    size_t num_reals = 0, num_quads = 0;
-    BOOST_FOREACH(const subdev_spec_pair_t &pair, uhd::reversed(subdev_spec)){
-        wax::obj dboard = mboard[named_prop_t(MBOARD_PROP_RX_DBOARD, pair.db_name)];
-        wax::obj subdev = dboard[named_prop_t(DBOARD_PROP_SUBDEV, pair.sd_name)];
-        subdev_conn_t conn = subdev[SUBDEV_PROP_CONNECTION].as<subdev_conn_t>();
-        switch(conn){
-        case SUBDEV_CONN_COMPLEX_IQ:
-        case SUBDEV_CONN_COMPLEX_QI: num_quads++; break;
-        case SUBDEV_CONN_REAL_I:
-        case SUBDEV_CONN_REAL_Q:     num_reals++; break;
-        }
-        channel_flags = (channel_flags << 4) | name_to_conn_to_flag[pair.db_name][conn];
-    }
-
-    //calculate Z:
-    //    for all real sources: Z = 1
-    //    for all quadrature sources: Z = 0
-    //    for mixed sources: warning + Z = 0
-    int Z = (num_quads > 0)? 0 : 1;
-    if (num_quads != 0 and num_reals != 0) UHD_MSG(warning) << boost::format(
-        "Mixing real and quadrature rx subdevices is not supported.\n"
-        "The Q input to the real source(s) will be non-zero.\n"
-    );
-
-    //calculate the rx mux value
-    return ((channel_flags & 0xffff) << 4) | ((Z & 0x1) << 3) | ((nchan & 0x7) << 0);
-}
-
-/***********************************************************************
- * Calculate the TX mux value:
- *    The I and Q mux values are intentionally reversed to flip I and Q
- *    to account for the reversal in the type conversion routines.
- **********************************************************************/
-static int calc_tx_mux_pair(int chn_for_i, int chn_for_q){
-    return (chn_for_i << 4) | (chn_for_q << 0); //shift reversal here
-}
-
-/*!
- *    3                   2                   1                   0
- *  1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
- * +-----------------------+-------+-------+-------+-------+-+-----+
- * |                       | DAC1Q | DAC1I | DAC0Q | DAC0I |0| NCH |
- * +-----------------------------------------------+-------+-+-----+
- */
-static boost::uint32_t calc_tx_mux(
-    const subdev_spec_t &subdev_spec, wax::obj mboard
-){
-    //create look-up-table for mapping channel number and connection type to flags
-    static const int ENB = 1 << 3, CHAN_I0 = 0, CHAN_Q0 = 1, CHAN_I1 = 2, CHAN_Q1 = 3;
-    static const uhd::dict<size_t, uhd::dict<subdev_conn_t, int> > chan_to_conn_to_flag = boost::assign::map_list_of
-        (0, boost::assign::map_list_of
-            (SUBDEV_CONN_COMPLEX_IQ, calc_tx_mux_pair(CHAN_I0 | ENB, CHAN_Q0 | ENB))
-            (SUBDEV_CONN_COMPLEX_QI, calc_tx_mux_pair(CHAN_Q0 | ENB, CHAN_I0 | ENB))
-            (SUBDEV_CONN_REAL_I,     calc_tx_mux_pair(CHAN_I0 | ENB, 0            ))
-            (SUBDEV_CONN_REAL_Q,     calc_tx_mux_pair(0,             CHAN_I0 | ENB))
-        )
-        (1, boost::assign::map_list_of
-            (SUBDEV_CONN_COMPLEX_IQ, calc_tx_mux_pair(CHAN_I1 | ENB, CHAN_Q1 | ENB))
-            (SUBDEV_CONN_COMPLEX_QI, calc_tx_mux_pair(CHAN_Q1 | ENB, CHAN_I1 | ENB))
-            (SUBDEV_CONN_REAL_I,     calc_tx_mux_pair(CHAN_I1 | ENB, 0            ))
-            (SUBDEV_CONN_REAL_Q,     calc_tx_mux_pair(0,             CHAN_I1 | ENB))
-        )
-    ;
-
-    //extract the number of channels
-    size_t nchan = subdev_spec.size();
-
-    //calculate the channel flags
-    int channel_flags = 0, chan = 0;
-    uhd::dict<std::string, int> slot_to_chan_count = boost::assign::map_list_of("A", 0)("B", 0);
-    BOOST_FOREACH(const subdev_spec_pair_t &pair, subdev_spec){
-        wax::obj dboard = mboard[named_prop_t(MBOARD_PROP_TX_DBOARD, pair.db_name)];
-        wax::obj subdev = dboard[named_prop_t(DBOARD_PROP_SUBDEV, pair.sd_name)];
-        subdev_conn_t conn = subdev[SUBDEV_PROP_CONNECTION].as<subdev_conn_t>();
-
-        //combine the channel flags: shift for slot A vs B
-        if (pair.db_name == "A") channel_flags |= chan_to_conn_to_flag[chan][conn] << 0;
-        if (pair.db_name == "B") channel_flags |= chan_to_conn_to_flag[chan][conn] << 8;
-
-        //sanity check, only 1 channel per slot
-        slot_to_chan_count[pair.db_name]++;
-        if (slot_to_chan_count[pair.db_name] > 1){
-            throw uhd::value_error(str(boost::format(
-                "dboard slot %s assigned to multiple channels in subdev spec %s"
-            ) % pair.db_name % subdev_spec.to_string()));
-        }
-
-        //increment for the next channel
-        chan++;
-    }
-
-    //calculate the tx mux value
-    return ((channel_flags & 0xffff) << 4) | ((nchan & 0x7) << 0);
-}
-
-/*!
- * Capabilities Register
- *
- *    3                   2                   1                   0
- *  1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
- * +-----------------------------------------------+-+-----+-+-----+
- * |               Reserved                        |T|DUCs |R|DDCs |
- * +-----------------------------------------------+-+-----+-+-----+
- */
-size_t usrp1_impl::get_num_ddcs(void){
-    boost::uint32_t regval = _iface->peek32(FR_RB_CAPS);
-    return (regval >> 0) & 0x0007;
-}
-
-size_t usrp1_impl::get_num_ducs(void){
-    boost::uint32_t regval = _iface->peek32(FR_RB_CAPS);
-    return (regval >> 4) & 0x0007;
-}
-
-bool usrp1_impl::has_rx_halfband(void){
-    boost::uint32_t regval = _iface->peek32(FR_RB_CAPS);
-    return (regval >> 3) & 0x0001;
-}
-
-bool usrp1_impl::has_tx_halfband(void){
-    boost::uint32_t regval = _iface->peek32(FR_RB_CAPS);
-    return (regval >> 7) & 0x0001;
-}
-
-/***********************************************************************
- * Mboard Initialization
- **********************************************************************/
-void usrp1_impl::mboard_init(void)
-{
-    _mboard_proxy = wax_obj_proxy::make(
-                     boost::bind(&usrp1_impl::mboard_get, this, _1, _2),
-                     boost::bind(&usrp1_impl::mboard_set, this, _1, _2));
-
-    // Normal mode with no loopback or Rx counting
-    _iface->poke32(FR_MODE, 0x00000000);
-    _iface->poke32(FR_DEBUG_EN, 0x00000000);
-    _iface->poke32(FR_RX_SAMPLE_RATE_DIV, 0x00000001); //divide by 2
-    _iface->poke32(FR_TX_SAMPLE_RATE_DIV, 0x00000001); //divide by 2
-    _iface->poke32(FR_DC_OFFSET_CL_EN, 0x0000000f);
-
-    // Reset offset correction registers
-    _iface->poke32(FR_ADC_OFFSET_0, 0x00000000);
-    _iface->poke32(FR_ADC_OFFSET_1, 0x00000000);
-    _iface->poke32(FR_ADC_OFFSET_2, 0x00000000);
-    _iface->poke32(FR_ADC_OFFSET_3, 0x00000000);
-
-    // Set default for RX format to 16-bit I&Q and no half-band filter bypass
-    _iface->poke32(FR_RX_FORMAT, 0x00000300);
-
-    // Set default for TX format to 16-bit I&Q
-    _iface->poke32(FR_TX_FORMAT, 0x00000000);
-
-    UHD_LOG
-        << "USRP1 Capabilities" << std::endl
-        << "    number of duc's: " << get_num_ddcs() << std::endl
-        << "    number of ddc's: " << get_num_ducs() << std::endl
-        << "    rx halfband:     " << has_rx_halfband() << std::endl
-        << "    tx halfband:     " << has_tx_halfband() << std::endl
-    ;
-}
-
-/***********************************************************************
- * Mboard Get
- **********************************************************************/
-static prop_names_t dboard_names = boost::assign::list_of("A")("B");
-
-void usrp1_impl::mboard_get(const wax::obj &key_, wax::obj &val)
-{
-    named_prop_t key = named_prop_t::extract(key_);
-
-    //handle the get request conditioned on the key
-    switch(key.as<mboard_prop_t>()){
-    case MBOARD_PROP_NAME:
-        val = std::string("usrp1 mboard - " + _iface->mb_eeprom["serial"]);
-        return;
-
-    case MBOARD_PROP_OTHERS:
-        val = prop_names_t();
-        return;
-
-    case MBOARD_PROP_RX_DBOARD:
-        uhd::assert_has(dboard_names, key.name, "dboard name");
-        if (key.name == "A") val = _rx_dboard_proxies[DBOARD_SLOT_A]->get_link();
-        if (key.name == "B") val = _rx_dboard_proxies[DBOARD_SLOT_B]->get_link();
-        return;
-
-    case MBOARD_PROP_RX_DBOARD_NAMES:
-        val = dboard_names;
-        return;
-
-    case MBOARD_PROP_TX_DBOARD:
-        uhd::assert_has(dboard_names, key.name, "dboard name");
-        if (key.name == "A") val = _tx_dboard_proxies[DBOARD_SLOT_A]->get_link();
-        if (key.name == "B") val = _tx_dboard_proxies[DBOARD_SLOT_B]->get_link();
-        return;
-
-    case MBOARD_PROP_TX_DBOARD_NAMES:
-        val = dboard_names;
-        return;
-
-    case MBOARD_PROP_RX_DSP:
-        val = _rx_dsp_proxies.get(key.name)->get_link();
-        return;
-
-    case MBOARD_PROP_RX_DSP_NAMES:
-        val = _rx_dsp_proxies.keys();
-        return;
-
-    case MBOARD_PROP_TX_DSP:
-        val = _tx_dsp_proxies.get(key.name)->get_link();
-        return;
-
-    case MBOARD_PROP_TX_DSP_NAMES:
-        val = _tx_dsp_proxies.keys();
-        return;
-
-    case MBOARD_PROP_CLOCK_CONFIG:
-        val = clock_config_t::internal();
-        return;
-
-    case MBOARD_PROP_RX_SUBDEV_SPEC:
-        val = _rx_subdev_spec;
-        return;
-
-    case MBOARD_PROP_TX_SUBDEV_SPEC:
-        val = _tx_subdev_spec;
-        return;
-
-    case MBOARD_PROP_EEPROM_MAP:
-        val = _iface->mb_eeprom;
-        return;
-
-    case MBOARD_PROP_TIME_NOW:
-        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();
-    }
-}
-
-/***********************************************************************
- * Mboard Set
- **********************************************************************/
-void usrp1_impl::mboard_set(const wax::obj &key, const wax::obj &val)
-{
-    if(key.type() == typeid(std::string)) {
-      if(key.as<std::string>() == "load_eeprom") {
-        std::string usrp1_eeprom_image = val.as<std::string>();
-        UHD_MSG(status) << "USRP1 EEPROM image: " << usrp1_eeprom_image << std::endl;
-        _ctrl_transport->usrp_load_eeprom(val.as<std::string>());
-      }
-      return;
-   	}
-
-    //handle the get request conditioned on the key
-    switch(key.as<mboard_prop_t>()){
-
-    case MBOARD_PROP_RX_SUBDEV_SPEC:{
-        _rx_subdev_spec = val.as<subdev_spec_t>();
-        if (_rx_subdev_spec.size() > this->get_num_ddcs()){
-            throw uhd::value_error(str(boost::format(
-                "USRP1 suports up to %u RX channels.\n"
-                "However, this RX subdev spec requires %u channels\n"
-            ) % this->get_num_ddcs() % _rx_subdev_spec.size()));
-        }
-        verify_rx_subdev_spec(_rx_subdev_spec, _mboard_proxy->get_link());
-        //set the mux and set the number of rx channels
-        bool s = this->disable_rx();
-        _iface->poke32(FR_RX_MUX, calc_rx_mux(_rx_subdev_spec, _mboard_proxy->get_link()));
-        this->restore_rx(s);
-        this->update_xport_channel_mapping();
-    }return;
-
-    case MBOARD_PROP_TX_SUBDEV_SPEC:{
-        _tx_subdev_spec = val.as<subdev_spec_t>();
-        if (_tx_subdev_spec.size() > this->get_num_ducs()){
-            throw uhd::value_error(str(boost::format(
-                "USRP1 suports up to %u TX channels.\n"
-                "However, this TX subdev spec requires %u channels\n"
-            ) % this->get_num_ducs() % _tx_subdev_spec.size()));
-        }
-        verify_tx_subdev_spec(_tx_subdev_spec, _mboard_proxy->get_link());
-        //set the mux and set the number of tx channels
-        bool s = this->disable_tx();
-        _iface->poke32(FR_TX_MUX, calc_tx_mux(_tx_subdev_spec, _mboard_proxy->get_link()));
-        this->restore_tx(s);
-        this->update_xport_channel_mapping();
-    }return;
-
-    case MBOARD_PROP_EEPROM_MAP:
-        // Step1: commit the map, writing only those values set.
-        // Step2: readback the entire eeprom map into the iface.
-        val.as<mboard_eeprom_t>().commit(*_iface, mboard_eeprom_t::MAP_B000);
-        _iface->mb_eeprom = mboard_eeprom_t(*_iface, mboard_eeprom_t::MAP_B000);
-        return;
-
-    case MBOARD_PROP_TIME_NOW:
-        _soft_time_ctrl->set_time(val.as<time_spec_t>());
-        return;
-
-    case MBOARD_PROP_CLOCK_RATE:
-        UHD_MSG(warning)
-            << "I see that you are setting the master clock rate from the API.\n"
-            << "You may find it more convenient to burn this setting into the EEPROM.\n"
-            << "See the application notes for USRP1 for further instructions.\n"
-        ;
-        _clock_ctrl->set_master_clock_freq(val.as<double>());
-        this->update_xport_channel_mapping();
-        return;
-
-    case MBOARD_PROP_CLOCK_CONFIG:{
-        clock_config_t clock_config = val.as<clock_config_t>();
-        if (clock_config.ref_source != clock_config_t::REF_INT){
-            throw uhd::value_error("USRP1 clock config: reference source must be set to internal");
-        }
-        if (clock_config.pps_source != clock_config_t::PPS_INT){
-            throw uhd::value_error("USRP1 clock config: PPS source must be set to internal");
-        }
-    }return;
-
-    default: UHD_THROW_PROP_SET_ERROR();
-    }
-}