usrp: removed spectrum inverted property from subdev code and tune helper (it wasnt used)

6 files changed, 3 insertions, 50 deletions

diff --git a/host/lib/usrp/dboard/db_basic_and_lf.cpp b/host/lib/usrp/dboard/db_basic_and_lf.cpp
index 766deac78..b40be9dea 100644
--- a/host/lib/usrp/dboard/db_basic_and_lf.cpp
+++ b/host/lib/usrp/dboard/db_basic_and_lf.cpp
@@ -146,10 +146,6 @@ void basic_rx::rx_get(const wax::obj &key_, wax::obj &val){
         val = false;
         return;
 
-    case SUBDEV_PROP_SPECTRUM_INVERTED:
-        val = false;
-        return;
-
     case SUBDEV_PROP_USE_LO_OFFSET:
         val = false;
         return;
@@ -245,10 +241,6 @@ void basic_tx::tx_get(const wax::obj &key_, wax::obj &val){
         val = false;
         return;
 
-    case SUBDEV_PROP_SPECTRUM_INVERTED:
-        val = false;
-        return;
-
     case SUBDEV_PROP_USE_LO_OFFSET:
         val = false;
         return;
diff --git a/host/lib/usrp/dboard/db_rfx.cpp b/host/lib/usrp/dboard/db_rfx.cpp
index 2d6088983..9e5fcd6c6 100644
--- a/host/lib/usrp/dboard/db_rfx.cpp
+++ b/host/lib/usrp/dboard/db_rfx.cpp
@@ -434,10 +434,6 @@ void rfx_xcvr::rx_get(const wax::obj &key_, wax::obj &val){
         val = true;
         return;
 
-    case SUBDEV_PROP_SPECTRUM_INVERTED:
-        val = false;
-        return;
-
     case SUBDEV_PROP_USE_LO_OFFSET:
         val = false;
         return;
@@ -524,10 +520,6 @@ void rfx_xcvr::tx_get(const wax::obj &key_, wax::obj &val){
         val = false;
         return;
 
-    case SUBDEV_PROP_SPECTRUM_INVERTED:
-        val = false;
-        return;
-
     case SUBDEV_PROP_USE_LO_OFFSET:
         val = true;
         return;
diff --git a/host/lib/usrp/dboard/db_unknown.cpp b/host/lib/usrp/dboard/db_unknown.cpp
index ced27e34d..8b247c289 100644
--- a/host/lib/usrp/dboard/db_unknown.cpp
+++ b/host/lib/usrp/dboard/db_unknown.cpp
@@ -127,10 +127,6 @@ void unknown_rx::rx_get(const wax::obj &key_, wax::obj &val){
         val = false;
         return;
 
-    case SUBDEV_PROP_SPECTRUM_INVERTED:
-        val = false;
-        return;
-
     case SUBDEV_PROP_USE_LO_OFFSET:
         val = false;
         return;
@@ -226,10 +222,6 @@ void unknown_tx::tx_get(const wax::obj &key_, wax::obj &val){
         val = false;
         return;
 
-    case SUBDEV_PROP_SPECTRUM_INVERTED:
-        val = false;
-        return;
-
     case SUBDEV_PROP_USE_LO_OFFSET:
         val = false;
         return;
diff --git a/host/lib/usrp/dboard/db_wbx.cpp b/host/lib/usrp/dboard/db_wbx.cpp
index 28bd6317b..23eb5ca44 100644
--- a/host/lib/usrp/dboard/db_wbx.cpp
+++ b/host/lib/usrp/dboard/db_wbx.cpp
@@ -518,10 +518,6 @@ void wbx_xcvr::rx_get(const wax::obj &key_, wax::obj &val){
         val = false;
         return;
 
-    case SUBDEV_PROP_SPECTRUM_INVERTED:
-        val = false;
-        return;
-
     case SUBDEV_PROP_USE_LO_OFFSET:
         val = false;
         return;
@@ -612,10 +608,6 @@ void wbx_xcvr::tx_get(const wax::obj &key_, wax::obj &val){
         val = false;
         return;
 
-    case SUBDEV_PROP_SPECTRUM_INVERTED:
-        val = false;
-        return;
-
     case SUBDEV_PROP_USE_LO_OFFSET:
         val = false;
         return;
diff --git a/host/lib/usrp/dboard/db_xcvr2450.cpp b/host/lib/usrp/dboard/db_xcvr2450.cpp
index 5032b6f31..fabf3dffd 100644
--- a/host/lib/usrp/dboard/db_xcvr2450.cpp
+++ b/host/lib/usrp/dboard/db_xcvr2450.cpp
@@ -489,10 +489,6 @@ void xcvr2450::rx_get(const wax::obj &key_, wax::obj &val){
         val = false;
         return;
 
-    case SUBDEV_PROP_SPECTRUM_INVERTED:
-        val = false;
-        return;
-
     case SUBDEV_PROP_USE_LO_OFFSET:
         val = false;
         return;
@@ -587,10 +583,6 @@ void xcvr2450::tx_get(const wax::obj &key_, wax::obj &val){
         val = true;
         return;
 
-    case SUBDEV_PROP_SPECTRUM_INVERTED:
-        val = false;
-        return;
-
     case SUBDEV_PROP_USE_LO_OFFSET:
         val = false;
         return;
diff --git a/host/lib/usrp/tune_helper.cpp b/host/lib/usrp/tune_helper.cpp
index 1d584913c..dd2985d88 100644
--- a/host/lib/usrp/tune_helper.cpp
+++ b/host/lib/usrp/tune_helper.cpp
@@ -30,13 +30,12 @@ using namespace uhd::usrp;
  **********************************************************************/
 static bool invert_dxc_freq(
     bool outside_of_nyquist,
-    bool subdev_spectrum_inverted,
     bool subdev_quadrature,
     dboard_iface::unit_t unit
 ){
     bool is_tx = unit == dboard_iface::UNIT_TX;
     if (subdev_quadrature) return is_tx;
-    return outside_of_nyquist xor subdev_spectrum_inverted xor is_tx;
+    return outside_of_nyquist xor is_tx;
 }
 
 static tune_result_t tune_xx_subdev_and_dxc(
@@ -46,7 +45,6 @@ static tune_result_t tune_xx_subdev_and_dxc(
 ){
     wax::obj subdev_freq_proxy = subdev[SUBDEV_PROP_FREQ];
     bool subdev_quadrature = subdev[SUBDEV_PROP_QUADRATURE].as<bool>();
-    bool subdev_spectrum_inverted = subdev[SUBDEV_PROP_SPECTRUM_INVERTED].as<bool>();
     wax::obj dxc_freq_proxy = dxc[DSP_PROP_FREQ_SHIFT];
     double dxc_sample_rate = dxc[DSP_PROP_CODEC_RATE].as<double>();
 
@@ -63,9 +61,7 @@ static tune_result_t tune_xx_subdev_and_dxc(
 
     //invert the sign on the dxc freq given the following conditions
     bool outside_of_nyquist = std::abs(target_freq - actual_inter_freq) > dxc_sample_rate/2.0;
-    if (invert_dxc_freq(
-        outside_of_nyquist, subdev_spectrum_inverted, subdev_quadrature, unit
-    )) target_dxc_freq *= -1.0;
+    if (invert_dxc_freq(outside_of_nyquist, subdev_quadrature, unit)) target_dxc_freq *= -1.0;
 
     dxc_freq_proxy = target_dxc_freq;
     double actual_dxc_freq = dxc_freq_proxy.as<double>();
@@ -85,16 +81,13 @@ static double derive_freq_from_xx_subdev_and_dxc(
 ){
     //extract subdev properties
     bool subdev_quadrature = subdev[SUBDEV_PROP_QUADRATURE].as<bool>();
-    bool subdev_spectrum_inverted = subdev[SUBDEV_PROP_SPECTRUM_INVERTED].as<bool>();
 
     //extract actual dsp and IF frequencies
     double actual_inter_freq = subdev[SUBDEV_PROP_FREQ].as<double>();
     double actual_dxc_freq = dxc[DSP_PROP_FREQ_SHIFT].as<double>();
 
     //invert the sign on the dxc freq given the following conditions
-    if (invert_dxc_freq(
-        false, subdev_spectrum_inverted, subdev_quadrature, unit
-    )) actual_dxc_freq *= -1.0;
+    if (invert_dxc_freq(false, subdev_quadrature, unit)) actual_dxc_freq *= -1.0;
 
     return actual_inter_freq - actual_dxc_freq;
 }