1 files changed, 36 insertions, 104 deletions

diff --git a/host/lib/usrp/dboard/db_wbx_version4.cpp b/host/lib/usrp/dboard/db_wbx_version4.cpp
index b5104c9f1..981e4f4d2 100644
--- a/host/lib/usrp/dboard/db_wbx_version4.cpp
+++ b/host/lib/usrp/dboard/db_wbx_version4.cpp
@@ -37,7 +37,7 @@ using namespace boost::assign;
 /***********************************************************************
  * WBX Version 3 Constants
  **********************************************************************/
-static const uhd::dict<std::string, gain_range_t> wbx_v4_gain_ranges = map_list_of
+static const uhd::dict<std::string, gain_range_t> wbx_v4_tx_gain_ranges = map_list_of
     ("PGA0", gain_range_t(0, 31, 1.0))
 ;
 
@@ -49,10 +49,10 @@ static const freq_range_t wbx_v4_freq_range(50.0e6, 2.2e9);
  **********************************************************************/
 static int tx_pga0_gain_to_iobits(double &gain){
     //clip the input
-    gain = wbx_v4_gain_ranges["PGA0"].clip(gain);
+    gain = wbx_v4_tx_gain_ranges["PGA0"].clip(gain);
 
     //convert to attenuation
-    double attn = wbx_v4_gain_ranges["PGA0"].stop() - gain;
+    double attn = wbx_v4_tx_gain_ranges["PGA0"].stop() - gain;
 
     //calculate the attenuation
     int attn_code = boost::math::iround(attn);
@@ -69,7 +69,7 @@ static int tx_pga0_gain_to_iobits(double &gain){
     ) % attn % attn_code % (iobits & TX_ATTN_MASK) % TX_ATTN_MASK << std::endl;
 
     //the actual gain setting
-    gain = wbx_v4_gain_ranges["PGA0"].stop() - double(attn_code);
+    gain = wbx_v4_tx_gain_ranges["PGA0"].stop() - double(attn_code);
 
     return iobits;
 }
@@ -82,9 +82,33 @@ wbx_base::wbx_version4::wbx_version4(wbx_base *_self_wbx_base) {
     //register our handle on the primary wbx_base instance
     self_base = _self_wbx_base;
 
-    //enable the clocks that we need
-    self_base->get_iface()->set_clock_enabled(dboard_iface::UNIT_TX, true);
-    self_base->get_iface()->set_clock_enabled(dboard_iface::UNIT_RX, true);
+    ////////////////////////////////////////////////////////////////////
+    // Register RX properties
+    ////////////////////////////////////////////////////////////////////
+    this->get_rx_subtree()->create<std::string>("name").set("WBX RX v4");
+    this->get_rx_subtree()->create<double>("freq/value")
+         .coerce(boost::bind(&wbx_base::wbx_version4::set_lo_freq, this, dboard_iface::UNIT_RX, _1))
+         .set((wbx_v4_freq_range.start() + wbx_v4_freq_range.stop())/2.0);
+    this->get_rx_subtree()->create<meta_range_t>("freq/range").set(wbx_v4_freq_range);
+
+    ////////////////////////////////////////////////////////////////////
+    // Register TX properties
+    ////////////////////////////////////////////////////////////////////
+    this->get_tx_subtree()->create<std::string>("name").set("WBX TX v4");
+    BOOST_FOREACH(const std::string &name, wbx_v4_tx_gain_ranges.keys()){
+        self_base->get_tx_subtree()->create<double>("gains/"+name+"/value")
+            .coerce(boost::bind(&wbx_base::wbx_version4::set_tx_gain, this, _1, name))
+            .set(wbx_v4_tx_gain_ranges[name].start());
+        self_base->get_tx_subtree()->create<meta_range_t>("gains/"+name+"/range")
+            .set(wbx_v4_tx_gain_ranges[name]);
+    }
+    this->get_rx_subtree()->create<double>("freq/value")
+         .coerce(boost::bind(&wbx_base::wbx_version4::set_lo_freq, this, dboard_iface::UNIT_TX, _1))
+         .set((wbx_v4_freq_range.start() + wbx_v4_freq_range.stop())/2.0);
+    this->get_tx_subtree()->create<meta_range_t>("freq/range").set(wbx_v4_freq_range);
+    this->get_tx_subtree()->create<bool>("enabled")
+        .subscribe(boost::bind(&wbx_base::wbx_version4::set_tx_enabled, this, _1))
+        .set(true); //start enabled
 
     //set attenuator control bits
     int v4_iobits = TX_ATTN_MASK;
@@ -106,18 +130,6 @@ wbx_base::wbx_version4::wbx_version4(wbx_base *_self_wbx_base) {
     self_base->get_iface()->set_atr_reg(dboard_iface::UNIT_RX, dboard_iface::ATR_REG_TX_ONLY,     RX_MIXER_ENB, RX_MIXER_DIS | RX_MIXER_ENB);
     self_base->get_iface()->set_atr_reg(dboard_iface::UNIT_RX, dboard_iface::ATR_REG_RX_ONLY,     RX_MIXER_ENB, RX_MIXER_DIS | RX_MIXER_ENB);
     self_base->get_iface()->set_atr_reg(dboard_iface::UNIT_RX, dboard_iface::ATR_REG_FULL_DUPLEX, RX_MIXER_ENB, RX_MIXER_DIS | RX_MIXER_ENB);
-
-    //set some default values
-    BOOST_FOREACH(const std::string &name, wbx_v4_gain_ranges.keys()){
-        set_tx_gain(wbx_v4_gain_ranges[name].start(), name);
-    }
-
-    BOOST_FOREACH(const std::string &name, wbx_rx_gain_ranges.keys()){
-        self_base->set_rx_gain(wbx_rx_gain_ranges[name].start(), name);
-    }
-
-    self_base->set_rx_enabled(false);
-    set_tx_enabled(false);
 }
 
 wbx_base::wbx_version4::~wbx_version4(void){
@@ -137,8 +149,8 @@ void wbx_base::wbx_version4::set_tx_enabled(bool enb) {
 /***********************************************************************
  * Gain Handling
  **********************************************************************/
-void wbx_base::wbx_version4::set_tx_gain(double gain, const std::string &name) {
-    assert_has(wbx_v4_gain_ranges.keys(), name, "wbx tx gain name");
+double wbx_base::wbx_version4::set_tx_gain(double gain, const std::string &name) {
+    assert_has(wbx_v4_tx_gain_ranges.keys(), name, "wbx tx gain name");
     if(name == "PGA0"){
         boost::uint16_t io_bits = tx_pga0_gain_to_iobits(gain);
         self_base->_tx_gains[name] = gain;
@@ -147,16 +159,13 @@ void wbx_base::wbx_version4::set_tx_gain(double gain, const std::string &name) {
         self_base->get_iface()->set_gpio_out(dboard_iface::UNIT_TX, io_bits, TX_ATTN_MASK);
     }
     else UHD_THROW_INVALID_CODE_PATH();
+    return self_base->_tx_gains[name];
 }
 
 
 /***********************************************************************
  * Tuning
  **********************************************************************/
-freq_range_t wbx_base::wbx_version4::get_freq_range(void) {
-    return wbx_v4_freq_range;
-}
-
 double wbx_base::wbx_version4::set_lo_freq(dboard_iface::unit_t unit, double target_freq) {
     UHD_LOGV(often) << boost::format(
         "WBX tune: target frequency %f Mhz"
@@ -257,8 +266,8 @@ double wbx_base::wbx_version4::set_lo_freq(dboard_iface::unit_t unit, double tar
     UHD_LOGV(often)
         << boost::format("WBX Intermediates: ref=%0.2f, outdiv=%f, fbdiv=%f") % (ref_freq*(1+int(D))/(R*(1+int(T)))) % double(RFdiv*2) % double(N + double(FRAC)/double(MOD)) << std::endl
 
-        << boost::format("WBX tune: R=%d, BS=%d, N=%d, FRAC=%d, MOD=%d, T=%d, D=%d, RFdiv=%d, LD=%d"
-            ) % R % BS % N % FRAC % MOD % T % D % RFdiv % self_base->get_locked(unit)<< std::endl
+        << boost::format("WBX tune: R=%d, BS=%d, N=%d, FRAC=%d, MOD=%d, T=%d, D=%d, RFdiv=%d, LD=%s"
+            ) % R % BS % N % FRAC % MOD % T % D % RFdiv % self_base->get_locked(unit).to_pp_string() << std::endl
         << boost::format("WBX Frequencies (MHz): REQ=%0.2f, ACT=%0.2f, VCO=%0.2f, PFD=%0.2f, BAND=%0.2f"
             ) % (target_freq/1e6) % (actual_freq/1e6) % (vco_freq/1e6) % (pfd_freq/1e6) % (pfd_freq/BS/1e6) << std::endl;
 
@@ -325,80 +334,3 @@ double wbx_base::wbx_version4::set_lo_freq(dboard_iface::unit_t unit, double tar
     ) % (actual_freq/1e6) << std::endl;
     return actual_freq;
 }
-
-
-/***********************************************************************
- * TX Get and Set
- **********************************************************************/
-void wbx_base::wbx_version4::tx_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<subdev_prop_t>()){
-    case SUBDEV_PROP_NAME:
-        val = self_base->get_tx_id().to_pp_string();
-        return;
-
-    case SUBDEV_PROP_OTHERS:
-        val = prop_names_t(); //empty
-        return;
-
-    case SUBDEV_PROP_GAIN:
-        assert_has(self_base->_tx_gains.keys(), key.name, "wbx tx gain name");
-        val = self_base->_tx_gains[key.name];
-        return;
-
-    case SUBDEV_PROP_GAIN_RANGE:
-        assert_has(wbx_v4_gain_ranges.keys(), key.name, "wbx tx gain name");
-        val = wbx_v4_gain_ranges[key.name];
-        return;
-
-    case SUBDEV_PROP_GAIN_NAMES:
-        val = prop_names_t(wbx_v4_gain_ranges.keys());
-        return;
-
-    case SUBDEV_PROP_FREQ:
-        val = 0.0;
-        return;
-
-    case SUBDEV_PROP_FREQ_RANGE:
-        val = freq_range_t(0.0, 0.0, 0.0);
-        return;
-
-    case SUBDEV_PROP_ANTENNA:
-        val = std::string("");
-        return;
-
-    case SUBDEV_PROP_ANTENNA_NAMES:
-        val = prop_names_t(1, "");
-        return;
-
-    case SUBDEV_PROP_CONNECTION:
-        val = SUBDEV_CONN_COMPLEX_IQ;
-        return;
-
-    case SUBDEV_PROP_ENABLED:
-        val = self_base->_tx_enabled;
-        return;
-
-    case SUBDEV_PROP_USE_LO_OFFSET:
-        val = false;
-        return;
-
-    case SUBDEV_PROP_SENSOR:
-        UHD_ASSERT_THROW(key.name == "lo_locked");
-        val = sensor_value_t("LO", self_base->get_locked(dboard_iface::UNIT_TX), "locked", "unlocked");
-        return;
-
-    case SUBDEV_PROP_SENSOR_NAMES:
-        val = prop_names_t(1, "lo_locked");
-        return;
-
-    case SUBDEV_PROP_BANDWIDTH:
-        val = 2*20.0e6; //20MHz low-pass, we want complex double-sided
-        return;
-
-    default: UHD_THROW_PROP_GET_ERROR();
-    }
-}
-