installed mux setting and initing the duc and ddc

3 files changed, 35 insertions, 16 deletions

diff --git a/host/lib/usrp/usrp_e/dboard_impl.cpp b/host/lib/usrp/usrp_e/dboard_impl.cpp
index 22c4ac8b7..a384c71a0 100644
--- a/host/lib/usrp/usrp_e/dboard_impl.cpp
+++ b/host/lib/usrp/usrp_e/dboard_impl.cpp
@@ -15,10 +15,13 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#include <boost/bind.hpp>
 #include "usrp_e_impl.hpp"
+#include "usrp_e_regs.hpp"
+#include "../dsp_utils.hpp"
 #include <uhd/utils/assert.hpp>
 #include <uhd/usrp/dboard_props.hpp>
+#include <uhd/usrp/subdev_props.hpp>
+#include <boost/bind.hpp>
 #include <iostream>
 
 using namespace uhd;
@@ -31,9 +34,6 @@ void usrp_e_impl::dboard_init(void){
     _rx_db_eeprom = dboard_eeprom_t(_iface->read_eeprom(I2C_ADDR_RX_DB, 0, dboard_eeprom_t::num_bytes()));
     _tx_db_eeprom = dboard_eeprom_t(_iface->read_eeprom(I2C_ADDR_TX_DB, 0, dboard_eeprom_t::num_bytes()));
 
-    std::cout << _rx_db_eeprom.id.to_pp_string() << std::endl;
-    std::cout << _tx_db_eeprom.id.to_pp_string() << std::endl;
-
     //create a new dboard interface and manager
     _dboard_iface = make_usrp_e_dboard_iface(
         _iface, _clock_ctrl, _codec_ctrl
@@ -53,11 +53,8 @@ void usrp_e_impl::dboard_init(void){
     );
 
     //init the subdevs in use (use the first subdevice)
-    _rx_subdevs_in_use = prop_names_t(1, _dboard_manager->get_rx_subdev_names().at(0));
-    //TODO update_rx_mux_config();
-
-    _tx_subdevs_in_use = prop_names_t(1, _dboard_manager->get_tx_subdev_names().at(0));
-    //TODO update_tx_mux_config();
+    rx_dboard_set(DBOARD_PROP_USED_SUBDEVS, prop_names_t(1, _dboard_manager->get_rx_subdev_names().at(0)));
+    tx_dboard_set(DBOARD_PROP_USED_SUBDEVS, prop_names_t(1, _dboard_manager->get_tx_subdev_names().at(0)));
 }
 
 /***********************************************************************
@@ -102,9 +99,16 @@ void usrp_e_impl::rx_dboard_get(const wax::obj &key_, wax::obj &val){
  **********************************************************************/
 void usrp_e_impl::rx_dboard_set(const wax::obj &key, const wax::obj &val){
     switch(key.as<dboard_prop_t>()){
-    case DBOARD_PROP_USED_SUBDEVS:
-        _rx_subdevs_in_use = val.as<prop_names_t>();
-        //TODO update_rx_mux_config(); //if the val is bad, this will throw
+        case DBOARD_PROP_USED_SUBDEVS:{
+            _rx_subdevs_in_use = val.as<prop_names_t>();
+            UHD_ASSERT_THROW(_rx_subdevs_in_use.size() == 1);
+            wax::obj rx_subdev = _dboard_manager->get_rx_subdev(_rx_subdevs_in_use.at(0));
+            std::cout << "Using: " << rx_subdev[SUBDEV_PROP_NAME].as<std::string>() << std::endl;
+            _iface->poke32(UE_REG_DSP_RX_MUX, dsp_type1::calc_rx_mux_word(
+                rx_subdev[SUBDEV_PROP_QUADRATURE].as<bool>(),
+                rx_subdev[SUBDEV_PROP_IQ_SWAPPED].as<bool>()
+            ));
+        }
         return;
 
     case DBOARD_PROP_DBOARD_ID:
@@ -158,9 +162,15 @@ void usrp_e_impl::tx_dboard_get(const wax::obj &key_, wax::obj &val){
  **********************************************************************/
 void usrp_e_impl::tx_dboard_set(const wax::obj &key, const wax::obj &val){
         switch(key.as<dboard_prop_t>()){
-    case DBOARD_PROP_USED_SUBDEVS:
-        _tx_subdevs_in_use = val.as<prop_names_t>();
-        //TODO update_tx_mux_config(); //if the val is bad, this will throw
+    case DBOARD_PROP_USED_SUBDEVS:{
+            _tx_subdevs_in_use = val.as<prop_names_t>();
+            UHD_ASSERT_THROW(_tx_subdevs_in_use.size() == 1);
+            wax::obj tx_subdev = _dboard_manager->get_tx_subdev(_tx_subdevs_in_use.at(0));
+            std::cout << "Using: " << tx_subdev[SUBDEV_PROP_NAME].as<std::string>() << std::endl;
+            _iface->poke32(UE_REG_DSP_TX_MUX, dsp_type1::calc_tx_mux_word(
+                tx_subdev[SUBDEV_PROP_IQ_SWAPPED].as<bool>()
+            ));
+        }
         return;
 
     case DBOARD_PROP_DBOARD_ID:
diff --git a/host/lib/usrp/usrp_e/dsp_impl.cpp b/host/lib/usrp/usrp_e/dsp_impl.cpp
index a87a41ca6..58a58706d 100644
--- a/host/lib/usrp/usrp_e/dsp_impl.cpp
+++ b/host/lib/usrp/usrp_e/dsp_impl.cpp
@@ -34,6 +34,10 @@ void usrp_e_impl::rx_ddc_init(void){
         boost::bind(&usrp_e_impl::rx_ddc_get, this, _1, _2),
         boost::bind(&usrp_e_impl::rx_ddc_set, this, _1, _2)
     );
+
+    //initial config and update
+    rx_ddc_set(DSP_PROP_FREQ_SHIFT, double(0));
+    rx_ddc_set(DSP_PROP_HOST_RATE, double(64e6/10));
 }
 
 /***********************************************************************
@@ -105,6 +109,10 @@ void usrp_e_impl::tx_duc_init(void){
         boost::bind(&usrp_e_impl::tx_duc_get, this, _1, _2),
         boost::bind(&usrp_e_impl::tx_duc_set, this, _1, _2)
     );
+
+    //initial config and update
+    tx_duc_set(DSP_PROP_FREQ_SHIFT, double(0));
+    tx_duc_set(DSP_PROP_HOST_RATE, double(64e6/10));
 }
 
 /***********************************************************************
diff --git a/host/lib/usrp/usrp_e/usrp_e_regs.hpp b/host/lib/usrp/usrp_e/usrp_e_regs.hpp
index 67c174208..41cbfa1e2 100644
--- a/host/lib/usrp/usrp_e/usrp_e_regs.hpp
+++ b/host/lib/usrp/usrp_e/usrp_e_regs.hpp
@@ -174,7 +174,8 @@
 #define UE_REG_TIME64_SECS  UE_REG_SR_ADDR(28)  // value to set absolute secs to on next PPS
 #define UE_REG_TIME64_TICKS UE_REG_SR_ADDR(29)  // value to set absolute ticks to on next PPS
 #define UE_REG_TIME64_FLAGS UE_REG_SR_ADDR(30)  // flags - see chart above
-#define UE_REG_TIME64_IMM   UE_REG_SR_ADDR(31) // set immediate (0=latch on next pps, 1=latch immediate, default=0)
+#define UE_REG_TIME64_IMM   UE_REG_SR_ADDR(31)  // set immediate (0=latch on next pps, 1=latch immediate, default=0)
+#define UE_REG_TIME64_TPS   UE_REG_SR_ADDR(31)  // clock ticks per second (counter rollover)
 
 //pps flags (see above)
 #define UE_FLAG_TIME64_PPS_NEGEDGE (0 << 0)