Merge branch 'master' into usrp_e

Conflicts:
	host/CMakeLists.txt

3 files changed, 71 insertions, 6 deletions

diff --git a/host/lib/usrp/usrp2/clock_ctrl.cpp b/host/lib/usrp/usrp2/clock_ctrl.cpp
index 02227afad..1e1c9b7b8 100644
--- a/host/lib/usrp/usrp2/clock_ctrl.cpp
+++ b/host/lib/usrp/usrp2/clock_ctrl.cpp
@@ -20,6 +20,7 @@
 #include "usrp2_regs.hpp" //spi slave constants
 #include <uhd/utils/assert.hpp>
 #include <boost/cstdint.hpp>
+#include <iostream>
 
 using namespace uhd;
 
@@ -67,12 +68,60 @@ public:
         this->enable_dac_clock(true);
         this->enable_adc_clock(true);
 
+        /* always driving the mimo reference */
+        this->enable_mimo_clock_out(true);
     }
 
     ~usrp2_clock_ctrl_impl(void){
-        /* private clock enables, must be set here */
+        //power down clock outputs
+        this->enable_external_ref(false);
+        this->enable_rx_dboard_clock(false);
+        this->enable_tx_dboard_clock(false);
         this->enable_dac_clock(false);
         this->enable_adc_clock(false);
+        this->enable_mimo_clock_out(false);
+    }
+
+    void enable_mimo_clock_out(bool enb){
+        //FIXME TODO put this revision read in a common place
+        boost::uint8_t rev_hi = _iface->read_eeprom(USRP2_I2C_ADDR_MBOARD, USRP2_EE_MBOARD_REV_MSB, 1).at(0);
+
+        //calculate the low and high dividers
+        size_t divider = size_t(this->get_master_clock_rate()/10e6);
+        size_t high = divider/2;
+        size_t low = divider - high;
+
+        switch(rev_hi){
+        case 3: //clock 2
+            _ad9510_regs.power_down_lvpecl_out2 = enb?
+                ad9510_regs_t::POWER_DOWN_LVPECL_OUT2_NORMAL :
+                ad9510_regs_t::POWER_DOWN_LVPECL_OUT2_SAFE_PD;
+            _ad9510_regs.output_level_lvpecl_out2 = ad9510_regs_t::OUTPUT_LEVEL_LVPECL_OUT2_810MV;
+            //set the registers (divider - 1)
+            _ad9510_regs.divider_low_cycles_out2 = low - 1;
+            _ad9510_regs.divider_high_cycles_out2 = high - 1;
+            _ad9510_regs.bypass_divider_out2 = 0;
+            this->write_reg(0x3e);
+            this->write_reg(0x4c);
+            break;
+
+        case 4: //clock 5
+            _ad9510_regs.power_down_lvds_cmos_out5 = enb? 0 : 1;
+            _ad9510_regs.lvds_cmos_select_out5 = ad9510_regs_t::LVDS_CMOS_SELECT_OUT5_LVDS;
+            _ad9510_regs.output_level_lvds_out5 = ad9510_regs_t::OUTPUT_LEVEL_LVDS_OUT5_1_75MA;
+            //set the registers (divider - 1)
+            _ad9510_regs.divider_low_cycles_out5 = low - 1;
+            _ad9510_regs.divider_high_cycles_out5 = high - 1;
+            _ad9510_regs.bypass_divider_out5 = 0;
+            this->write_reg(0x41);
+            this->write_reg(0x52);
+            break;
+
+        //TODO FIXME do i want to throw, what about uninitialized boards?
+        //default: throw std::runtime_error("unknown rev hi in mboard eeprom");
+        default: std::cerr << "unknown rev hi: " << rev_hi << std::endl;
+        }
+        this->update_regs();
     }
 
     //uses output clock 7 (cmos)
diff --git a/host/lib/usrp/usrp2/dsp_impl.cpp b/host/lib/usrp/usrp2/dsp_impl.cpp
index 6422142ce..0c85e643f 100644
--- a/host/lib/usrp/usrp2/dsp_impl.cpp
+++ b/host/lib/usrp/usrp2/dsp_impl.cpp
@@ -56,7 +56,9 @@ void usrp2_mboard_impl::init_ddc_config(void){
 /***********************************************************************
  * DDC Properties
  **********************************************************************/
-void usrp2_mboard_impl::ddc_get(const wax::obj &key, wax::obj &val){
+void usrp2_mboard_impl::ddc_get(const wax::obj &key_, wax::obj &val){
+    named_prop_t key = named_prop_t::extract(key_);
+
     switch(key.as<dsp_prop_t>()){
     case DSP_PROP_NAME:
         val = std::string("usrp2 ddc0");
@@ -70,6 +72,10 @@ void usrp2_mboard_impl::ddc_get(const wax::obj &key, wax::obj &val){
         val = _ddc_freq;
         return;
 
+    case DSP_PROP_FREQ_SHIFT_NAMES:
+        val = prop_names_t(1, "");
+        return;
+
     case DSP_PROP_CODEC_RATE:
         val = get_master_clock_freq();
         return;
@@ -82,7 +88,9 @@ void usrp2_mboard_impl::ddc_get(const wax::obj &key, wax::obj &val){
     }
 }
 
-void usrp2_mboard_impl::ddc_set(const wax::obj &key, const wax::obj &val){
+void usrp2_mboard_impl::ddc_set(const wax::obj &key_, const wax::obj &val){
+    named_prop_t key = named_prop_t::extract(key_);
+
     switch(key.as<dsp_prop_t>()){
 
     case DSP_PROP_FREQ_SHIFT:{
@@ -131,7 +139,9 @@ void usrp2_mboard_impl::init_duc_config(void){
 /***********************************************************************
  * DUC Properties
  **********************************************************************/
-void usrp2_mboard_impl::duc_get(const wax::obj &key, wax::obj &val){
+void usrp2_mboard_impl::duc_get(const wax::obj &key_, wax::obj &val){
+    named_prop_t key = named_prop_t::extract(key_);
+
     switch(key.as<dsp_prop_t>()){
     case DSP_PROP_NAME:
         val = std::string("usrp2 duc0");
@@ -145,6 +155,10 @@ void usrp2_mboard_impl::duc_get(const wax::obj &key, wax::obj &val){
         val = _duc_freq;
         return;
 
+    case DSP_PROP_FREQ_SHIFT_NAMES:
+        val = prop_names_t(1, "");
+        return;
+
     case DSP_PROP_CODEC_RATE:
         val = get_master_clock_freq();
         return;
@@ -157,7 +171,9 @@ void usrp2_mboard_impl::duc_get(const wax::obj &key, wax::obj &val){
     }
 }
 
-void usrp2_mboard_impl::duc_set(const wax::obj &key, const wax::obj &val){
+void usrp2_mboard_impl::duc_set(const wax::obj &key_, const wax::obj &val){
+    named_prop_t key = named_prop_t::extract(key_);
+
     switch(key.as<dsp_prop_t>()){
 
     case DSP_PROP_FREQ_SHIFT:{
diff --git a/host/lib/usrp/usrp2/io_impl.cpp b/host/lib/usrp/usrp2/io_impl.cpp
index 4e883cf81..91a1b2344 100644
--- a/host/lib/usrp/usrp2/io_impl.cpp
+++ b/host/lib/usrp/usrp2/io_impl.cpp
@@ -189,7 +189,7 @@ bool usrp2_impl::recv_async_msg(
 /***********************************************************************
  * Send Data
  **********************************************************************/
-bool get_send_buffs(
+static bool get_send_buffs(
     const std::vector<udp_zero_copy::sptr> &trans,
     vrt_packet_handler::managed_send_buffs_t &buffs
 ){