Merge branch 'usrp_e100_devel' of ettus.sourcerepo.com:ettus/uhdpriv into usrp_e100_devel

Conflicts:
	host/lib/usrp/usrp_e100/clock_ctrl.cpp

13 files changed, 213 insertions, 415 deletions

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/gps_ctrl.cpp b/host/lib/usrp/gps_ctrl.cpp
index 3c7c00134..b1062fa39 100644
--- a/host/lib/usrp/gps_ctrl.cpp
+++ b/host/lib/usrp/gps_ctrl.cpp
@@ -58,7 +58,7 @@ public:
       if(trim_right_copy(reply) == "Command Error") {
         gps_type = GPS_TYPE_JACKSON_LABS;
         break;
-      }
+      } 
       else if(reply.substr(0, 3) == "$GP") i_heard_some_nmea = true; //but keep looking for that "Command Error" response
       else if(reply.length() != 0) i_heard_something_weird = true; //probably wrong baud rate
       boost::this_thread::sleep(boost::posix_time::milliseconds(200));
@@ -104,6 +104,7 @@ public:
           found_gprmc = true;
           break;
         }
+        boost::this_thread::sleep(boost::posix_time::milliseconds(200));
       }
       if(!found_gprmc) {
         if(gps_type == GPS_TYPE_JACKSON_LABS) std::cout << "Firefly GPS not locked or warming up." << std::endl;
@@ -127,16 +128,7 @@ public:
 
 //TODO: this isn't generalizeable to non-USRP2 USRPs.
   std::string safe_gps_read() {
-    std::string reply;
-    try {
-        reply = _recv();
-    } catch (std::runtime_error err) {
-      if(err.what() != std::string("usrp2 no control response")) throw; //sorry can't cope with that
-      else { //we don't actually have a GPS installed
-        reply = std::string();
-      }
-    }
-    return reply;
+    return _recv();
   }
 
   ptime get_time(void) {
@@ -196,7 +188,7 @@ private:
     GPS_TYPE_NONE
   } gps_type;
 
-  static const int GPS_TIMEOUT_TRIES = 5;
+  static const int GPS_TIMEOUT_TRIES = 10;
   static const int GPS_TIMEOUT_DELAY_MS = 200;
   static const int FIREFLY_STUPID_DELAY_MS = 200;
 
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/subdev_spec.cpp b/host/lib/usrp/subdev_spec.cpp
index 51c88bda3..d5d950f1f 100644
--- a/host/lib/usrp/subdev_spec.cpp
+++ b/host/lib/usrp/subdev_spec.cpp
@@ -46,7 +46,7 @@ bool usrp::operator==(const subdev_spec_pair_t &lhs, const subdev_spec_pair_t &r
 
 subdev_spec_t::subdev_spec_t(const std::string &markup){
     BOOST_FOREACH(const std::string &pair, pair_tokenizer(markup)){
-        if (pair == "") continue;
+        if (pair.empty()) continue;
         std::vector<std::string> db_sd; boost::split(db_sd, pair, boost::is_any_of(":"));
         switch(db_sd.size()){
         case 1: this->push_back(subdev_spec_pair_t("", db_sd.front())); break;
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/usrp1/soft_time_ctrl.cpp b/host/lib/usrp/usrp1/soft_time_ctrl.cpp
index 856faf89d..c91ecc7ed 100644
--- a/host/lib/usrp/usrp1/soft_time_ctrl.cpp
+++ b/host/lib/usrp/usrp1/soft_time_ctrl.cpp
@@ -69,6 +69,9 @@ public:
         _thread_group.create_thread(boost::bind(&soft_time_ctrl_impl::recv_cmd_dispatcher, this));
         _update_mutex.lock(); //lock blocks until spawned
         _update_mutex.unlock(); //unlock mutex before done
+
+        //initialize the time to something
+        this->set_time(time_spec_t(0.0));
     }
 
     ~soft_time_ctrl_impl(void){
diff --git a/host/lib/usrp/usrp2/mboard_impl.cpp b/host/lib/usrp/usrp2/mboard_impl.cpp
index 95f7013e7..784f662d9 100644
--- a/host/lib/usrp/usrp2/mboard_impl.cpp
+++ b/host/lib/usrp/usrp2/mboard_impl.cpp
@@ -66,9 +66,9 @@ usrp2_mboard_impl::usrp2_mboard_impl(
     //contruct the interfaces to mboard perifs
     _clock_ctrl = usrp2_clock_ctrl::make(_iface);
     _codec_ctrl = usrp2_codec_ctrl::make(_iface);
-    //_gps_ctrl = gps_ctrl::make(
-    //    _iface->get_gps_write_fn(),
-    //    _iface->get_gps_read_fn());
+//    _gps_ctrl = gps_ctrl::make(
+//        _iface->get_gps_write_fn(),
+//        _iface->get_gps_read_fn());
 
     //if(_gps_ctrl->gps_detected()) std::cout << "GPS time: " << _gps_ctrl->get_time() << std::endl;
 
@@ -243,6 +243,9 @@ void usrp2_mboard_impl::update_clock_config(void){
 }
 
 void usrp2_mboard_impl::set_time_spec(const time_spec_t &time_spec, bool now){
+    //dont set the time for slave devices, they always take from mimo cable
+    if (not _mimo_clocking_mode_is_master) return;
+
     //set the ticks
     _iface->poke32(_iface->regs.time64_ticks, time_spec.get_tick_count(get_master_clock_freq()));
 
@@ -352,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();
     }
 }
@@ -409,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();
     }
 }
diff --git a/host/lib/usrp/usrp2/usrp2_impl.cpp b/host/lib/usrp/usrp2/usrp2_impl.cpp
index 059ddf65f..9ce0f7359 100644
--- a/host/lib/usrp/usrp2/usrp2_impl.cpp
+++ b/host/lib/usrp/usrp2/usrp2_impl.cpp
@@ -202,8 +202,11 @@ static device::sptr usrp2_make(const device_addr_t &device_addr){
     //setup the dsp transport hints (default to a large recv buff)
     device_addr_t dsp_xport_hints = device_addr;
     if (not dsp_xport_hints.has_key("recv_buff_size")){
-        //set to half-a-second of buffering at max rate
-        dsp_xport_hints["recv_buff_size"] = "50e6";
+        //only enable on platforms that are happy with the large buffer resize
+        #if defined(UHD_PLATFORM_LINUX) || defined(UHD_PLATFORM_WIN32)
+            //set to half-a-second of buffering at max rate
+            dsp_xport_hints["recv_buff_size"] = "50e6";
+        #endif /*defined(UHD_PLATFORM_LINUX) || defined(UHD_PLATFORM_WIN32)*/
     }
 
     //create a ctrl and data transport for each address
diff --git a/host/lib/usrp/usrp_e100/clock_ctrl.cpp b/host/lib/usrp/usrp_e100/clock_ctrl.cpp
index a8d88fa42..05a27c38b 100644
--- a/host/lib/usrp/usrp_e100/clock_ctrl.cpp
+++ b/host/lib/usrp/usrp_e100/clock_ctrl.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2010 Ettus Research LLC
+// 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
@@ -18,17 +18,29 @@
 #include "clock_ctrl.hpp"
 #include "ad9522_regs.hpp"
 #include <uhd/utils/assert.hpp>
-#include <uhd/utils/static.hpp>
 #include <boost/cstdint.hpp>
 #include "usrp_e100_regs.hpp" //spi slave constants
 #include <boost/assign/list_of.hpp>
 #include <boost/foreach.hpp>
 #include <boost/format.hpp>
+#include <boost/operators.hpp>
+#include <boost/math/common_factor_rt.hpp> //gcd
+#include <algorithm>
 #include <utility>
 #include <iostream>
 
 using namespace uhd;
 
+/***********************************************************************
+ * Constants
+ **********************************************************************/
+static const bool ENABLE_THE_TEST_OUT = false;
+static const double REFERENCE_INPUT_RATE = 10e6;
+static const double DEFAULT_OUTPUT_RATE = 64e6;
+
+/***********************************************************************
+ * Helpers
+ **********************************************************************/
 template <typename div_type, typename bypass_type> static void set_clock_divider(
     size_t divider, div_type &low, div_type &high, bypass_type &bypass
 ){
@@ -41,13 +53,13 @@ template <typename div_type, typename bypass_type> static void set_clock_divider
  * Clock rate calculation stuff:
  *   Using the internal VCO between 1400 and 1800 MHz
  **********************************************************************/
-struct clock_settings_type{
-    size_t ref_clock_doubler, r_counter, a_counter, b_counter, prescaler, vco_divider, clk_divider;
+struct clock_settings_type : boost::totally_ordered<clock_settings_type>{
+    size_t ref_clock_doubler, r_counter, a_counter, b_counter, prescaler, vco_divider, chan_divider;
     size_t get_n_counter(void) const{return prescaler * b_counter + a_counter;}
-    double get_ref_rate(void) const{return 10e6 * ref_clock_doubler;}
+    double get_ref_rate(void) const{return REFERENCE_INPUT_RATE * ref_clock_doubler;}
     double get_vco_rate(void) const{return get_ref_rate()/r_counter * get_n_counter();}
-    double get_clk_rate(void) const{return get_vco_rate()/vco_divider;}
-    double get_out_rate(void) const{return get_clk_rate()/clk_divider;}
+    double get_chan_rate(void) const{return get_vco_rate()/vco_divider;}
+    double get_out_rate(void) const{return get_chan_rate()/chan_divider;}
     std::string to_pp_string(void) const{
         return str(boost::format(
             "  r_counter: %d\n"
@@ -55,9 +67,9 @@ struct clock_settings_type{
             "  b_counter: %d\n"
             "  prescaler: %d\n"
             "  vco_divider: %d\n"
-            "  clk_divider: %d\n"
+            "  chan_divider: %d\n"
             "  vco_rate: %fMHz\n"
-            "  clk_rate: %fMHz\n"
+            "  chan_rate: %fMHz\n"
             "  out_rate: %fMHz\n"
             )
             % r_counter
@@ -65,31 +77,43 @@ struct clock_settings_type{
             % b_counter
             % prescaler
             % vco_divider
-            % clk_divider
+            % chan_divider
             % (get_vco_rate()/1e6)
-            % (get_clk_rate()/1e6)
+            % (get_chan_rate()/1e6)
             % (get_out_rate()/1e6)
         );
     }
 };
 
-UHD_SINGLETON_FCN(std::vector<clock_settings_type>, get_clock_settings);
+bool operator<(const clock_settings_type &lhs, const clock_settings_type &rhs){
+    if (lhs.get_out_rate() != rhs.get_out_rate()) //sort small to large out rates
+        return lhs.get_out_rate() < rhs.get_out_rate();
+
+    if (lhs.r_counter != rhs.r_counter) //sort small to large r dividers
+        return lhs.r_counter < rhs.r_counter;
+
+    if (lhs.get_vco_rate() != rhs.get_vco_rate()) //sort large to small vco rates
+        return lhs.get_vco_rate() > rhs.get_vco_rate();
+
+    return false; //whatever case
+}
+
+static std::vector<clock_settings_type> _get_clock_settings(void){
+    std::vector<clock_settings_type> clock_settings;
 
-UHD_STATIC_BLOCK(libuhd_usrp_e100_reg_clock_rates){
     clock_settings_type cs;
     cs.ref_clock_doubler = 2; //always doubling
     cs.prescaler = 8; //set to 8 when input is under 2400 MHz
 
-    for (cs.r_counter = 1; cs.r_counter <= 1; cs.r_counter++){
+    for (cs.r_counter = 1; cs.r_counter <= 3; cs.r_counter++){
     for (cs.b_counter = 3; cs.b_counter <= 10; cs.b_counter++){
     for (cs.a_counter = 0; cs.a_counter <= 10; cs.a_counter++){
     for (cs.vco_divider = 2; cs.vco_divider <= 6; cs.vco_divider++){
-    for (cs.clk_divider = 1; cs.clk_divider <= 32; cs.clk_divider++){
+    for (cs.chan_divider = 1; cs.chan_divider <= 32; cs.chan_divider++){
         if (cs.get_vco_rate() > 1800e6) continue;
         if (cs.get_vco_rate() < 1400e6) continue;
         if (cs.get_out_rate() < 32e6) continue; //lowest we allow for GPMC interface
-        //std::cout << (cs.get_out_rate()/1e6) << std::endl;
-        get_clock_settings().push_back(cs);
+        clock_settings.push_back(cs);
     }}}}}
 }
 
@@ -105,30 +129,44 @@ class usrp_e100_clock_ctrl_impl : public usrp_e100_clock_ctrl{
 public:
     usrp_e100_clock_ctrl_impl(usrp_e100_iface::sptr iface){
         _iface = iface;
+        _chan_rate = 0.0;
+        _out_rate = 0.0;
 
         //init the clock gen registers
         //Note: out0 should already be clocking the FPGA or this isnt going to work
         _ad9522_regs.sdo_active = ad9522_regs_t::SDO_ACTIVE_SDO_SDIO;
         _ad9522_regs.enable_clock_doubler = 1; //enable ref clock doubler
         _ad9522_regs.enb_stat_eeprom_at_stat_pin = 0; //use status pin
-        _ad9522_regs.status_pin_control = 0x1; //n divider
+        _ad9522_regs.status_pin_control = 0x2; //r divider
         _ad9522_regs.ld_pin_control = 0x00; //dld
         _ad9522_regs.refmon_pin_control = 0x12; //show ref2
+        _ad9522_regs.lock_detect_counter = ad9522_regs_t::LOCK_DETECT_COUNTER_255CYC;
 
         this->use_internal_ref();
 
-        this->set_fpga_clock_rate(64e6); //initialize to something
+        this->set_fpga_clock_rate(DEFAULT_OUTPUT_RATE); //initialize to something
 
+        this->enable_test_clock(ENABLE_THE_TEST_OUT);
         this->enable_rx_dboard_clock(false);
         this->enable_tx_dboard_clock(false);
     }
 
     ~usrp_e100_clock_ctrl_impl(void){
+        this->enable_test_clock(ENABLE_THE_TEST_OUT);
         this->enable_rx_dboard_clock(false);
         this->enable_tx_dboard_clock(false);
     }
 
+    /***********************************************************************
+     * Clock rate control:
+     *  - set clock rate w/ internal VCO
+     *  - set clock rate w/ external VCXO
+     **********************************************************************/
     void set_clock_settings_with_internal_vco(const clock_settings_type &cs){
+        //set the rates to private variables so the implementation knows!
+        _chan_rate = cs.get_chan_rate();
+        _out_rate = cs.get_out_rate();
+
         _ad9522_regs.enable_clock_doubler = (cs.ref_clock_doubler == 2)? 1 : 0;
 
         _ad9522_regs.set_r_counter(cs.r_counter);
@@ -141,6 +179,7 @@ public:
         _ad9522_regs.cp_current = ad9522_regs_t::CP_CURRENT_1_2MA;
 
         _ad9522_regs.vco_calibration_now = 1; //calibrate it!
+        _ad9522_regs.bypass_vco_divider = 0;
         switch(cs.vco_divider){
         case 1: _ad9522_regs.vco_divider = ad9522_regs_t::VCO_DIVIDER_DIV1; break;
         case 2: _ad9522_regs.vco_divider = ad9522_regs_t::VCO_DIVIDER_DIV2; break;
@@ -153,7 +192,7 @@ public:
 
         //setup fpga master clock
         _ad9522_regs.out0_format = ad9522_regs_t::OUT0_FORMAT_LVDS;
-        set_clock_divider(cs.clk_divider,
+        set_clock_divider(cs.chan_divider,
             _ad9522_regs.divider0_low_cycles,
             _ad9522_regs.divider0_high_cycles,
             _ad9522_regs.divider0_bypass
@@ -161,44 +200,60 @@ public:
 
         //setup codec clock
         _ad9522_regs.out3_format = ad9522_regs_t::OUT3_FORMAT_LVDS;
-        set_clock_divider(cs.clk_divider,
+        set_clock_divider(cs.chan_divider,
             _ad9522_regs.divider1_low_cycles,
             _ad9522_regs.divider1_high_cycles,
             _ad9522_regs.divider1_bypass
         );
 
-        //setup test clock (same divider as codec clock)
-        _ad9522_regs.out4_format = ad9522_regs_t::OUT4_FORMAT_CMOS;
-        _ad9522_regs.out4_cmos_configuration = (enable_test_clock)?
-            ad9522_regs_t::OUT4_CMOS_CONFIGURATION_A_ON :
-            ad9522_regs_t::OUT4_CMOS_CONFIGURATION_OFF;
+        this->send_all_regs();
+    }
 
-        //setup a list of register ranges to write
-        typedef std::pair<boost::uint16_t, boost::uint16_t> range_t;
-        static const std::vector<range_t> ranges = boost::assign::list_of
-            (range_t(0x000, 0x000)) (range_t(0x010, 0x01F))
-            (range_t(0x0F0, 0x0FD)) (range_t(0x190, 0x19B))
-            (range_t(0x1E0, 0x1E1)) (range_t(0x230, 0x230))
-        ;
+    void set_clock_settings_with_external_vcxo(double rate){
+        //set the rates to private variables so the implementation knows!
+        _chan_rate = rate;
+        _out_rate = rate;
 
-        //write initial register values and latch/update
-        BOOST_FOREACH(const range_t &range, ranges){
-            for(boost::uint16_t addr = range.first; addr <= range.second; addr++){
-                this->send_reg(addr);
-            }
-        }
-        this->latch_regs();
+        _ad9522_regs.enable_clock_doubler = 1; //doubler always on
+        const double ref_rate = REFERENCE_INPUT_RATE*2;
+
+        //bypass prescaler such that N = B
+        long gcd = boost::math::gcd(long(ref_rate), long(rate));
+        _ad9522_regs.set_r_counter(int(ref_rate/gcd));
+        _ad9522_regs.a_counter = 0;
+        _ad9522_regs.set_b_counter(int(rate/gcd));
+        _ad9522_regs.prescaler_p = ad9522_regs_t::PRESCALER_P_DIV1;
+
+        //setup external vcxo
+        _ad9522_regs.pll_power_down = ad9522_regs_t::PLL_POWER_DOWN_NORMAL;
+        _ad9522_regs.cp_current = ad9522_regs_t::CP_CURRENT_1_2MA;
+        _ad9522_regs.bypass_vco_divider = 1;
+        _ad9522_regs.select_vco_or_clock = ad9522_regs_t::SELECT_VCO_OR_CLOCK_EXTERNAL;
+
+        //setup fpga master clock
+        _ad9522_regs.out0_format = ad9522_regs_t::OUT0_FORMAT_LVDS;
+        _ad9522_regs.divider0_bypass = 1;
+
+        //setup codec clock
+        _ad9522_regs.out3_format = ad9522_regs_t::OUT3_FORMAT_LVDS;
+        _ad9522_regs.divider1_bypass = 1;
+
+        this->send_all_regs();
     }
 
     void set_fpga_clock_rate(double rate){
+        if (_out_rate == rate) return;
+
         if (rate == 61.44e6){
-            //TODO special settings for external VCXO
+            set_clock_settings_with_external_vcxo(rate);
         }
         else{
             BOOST_FOREACH(const clock_settings_type &cs, get_clock_settings()){
+                //std::cout << cs.to_pp_string() << std::endl;
                 if (rate != cs.get_out_rate()) continue;
                 std::cout << "USRP-E100 clock control:" << std::endl << cs.to_pp_string() << std::endl;
                 set_clock_settings_with_internal_vco(cs);
+                return; //done here, exits loop
             }
             throw std::runtime_error(str(boost::format(
                 "USRP-E100 clock control: could not find settings for clock rate %fMHz"
@@ -207,7 +262,20 @@ public:
     }
 
     double get_fpga_clock_rate(void){
-        return master_clock_rate/fpga_clock_divider;
+        return this->_out_rate;
+    }
+
+    /***********************************************************************
+     * Special test clock output
+     **********************************************************************/
+    void enable_test_clock(bool enb){
+        //setup test clock (same divider as codec clock)
+        _ad9522_regs.out4_format = ad9522_regs_t::OUT4_FORMAT_CMOS;
+        _ad9522_regs.out4_cmos_configuration = (enb)?
+            ad9522_regs_t::OUT4_CMOS_CONFIGURATION_A_ON :
+            ad9522_regs_t::OUT4_CMOS_CONFIGURATION_OFF;
+        this->send_reg(0x0F0);
+        this->latch_regs();
     }
 
     /***********************************************************************
@@ -225,13 +293,13 @@ public:
     std::vector<double> get_rx_dboard_clock_rates(void){
         std::vector<double> rates;
         for(size_t div = 1; div <= 16+16; div++)
-            rates.push_back(master_clock_rate/div);
+            rates.push_back(this->_chan_rate/div);
         return rates;
     }
 
     void set_rx_dboard_clock_rate(double rate){
         assert_has(get_rx_dboard_clock_rates(), rate, "rx dboard clock rate");
-        size_t divider = size_t(master_clock_rate/rate);
+        size_t divider = size_t(this->_chan_rate/rate);
         //set the divider registers
         set_clock_divider(divider,
             _ad9522_regs.divider3_low_cycles,
@@ -261,7 +329,7 @@ public:
 
     void set_tx_dboard_clock_rate(double rate){
         assert_has(get_tx_dboard_clock_rates(), rate, "tx dboard clock rate");
-        size_t divider = size_t(master_clock_rate/rate);
+        size_t divider = size_t(this->_chan_rate/rate);
         //set the divider registers
         set_clock_divider(divider,
             _ad9522_regs.divider2_low_cycles,
@@ -302,6 +370,8 @@ public:
 private:
     usrp_e100_iface::sptr _iface;
     ad9522_regs_t _ad9522_regs;
+    double _out_rate; //rate at the fpga and codec
+    double _chan_rate; //rate before final dividers
 
     void latch_regs(void){
         _ad9522_regs.io_update = 1;
@@ -317,6 +387,24 @@ private:
             reg, 24, false /*no rb*/
         );
     }
+
+    void send_all_regs(void){
+        //setup a list of register ranges to write
+        typedef std::pair<boost::uint16_t, boost::uint16_t> range_t;
+        static const std::vector<range_t> ranges = boost::assign::list_of
+            (range_t(0x000, 0x000)) (range_t(0x010, 0x01F))
+            (range_t(0x0F0, 0x0FD)) (range_t(0x190, 0x19B))
+            (range_t(0x1E0, 0x1E1)) (range_t(0x230, 0x230))
+        ;
+
+        //write initial register values and latch/update
+        BOOST_FOREACH(const range_t &range, ranges){
+            for(boost::uint16_t addr = range.first; addr <= range.second; addr++){
+                this->send_reg(addr);
+            }
+        }
+        this->latch_regs();
+    }
 };
 
 /***********************************************************************
diff --git a/host/lib/usrp/usrp_e100/usrp_e100_impl.hpp b/host/lib/usrp/usrp_e100/usrp_e100_impl.hpp
index 864e82099..df8e5dc9f 100644
--- a/host/lib/usrp/usrp_e100/usrp_e100_impl.hpp
+++ b/host/lib/usrp/usrp_e100/usrp_e100_impl.hpp
@@ -30,7 +30,7 @@
 #ifndef INCLUDED_USRP_E100_IMPL_HPP
 #define INCLUDED_USRP_E100_IMPL_HPP
 
-static const boost::uint16_t USRP_E_COMPAT_NUM = 0x03;
+static const boost::uint16_t USRP_E_COMPAT_NUM = 0x02; //make this 3 then the mainline fpga image gets fixed for embedded
 
 //! load an fpga image from a bin file into the usrp-e fpga
 extern void usrp_e100_load_fpga(const std::string &bin_file);