From 4448843ca7392e2e5fbd44d6af12e69e6d465e00 Mon Sep 17 00:00:00 2001 From: Ben Hilburn Date: Fri, 27 Jun 2014 17:24:00 -0700 Subject: uhd: fixed RX and TX DSP cores for 3rd generation products --- host/lib/usrp/multi_usrp.cpp | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'host/lib/usrp/multi_usrp.cpp') diff --git a/host/lib/usrp/multi_usrp.cpp b/host/lib/usrp/multi_usrp.cpp index 53530d05f..471d453c2 100644 --- a/host/lib/usrp/multi_usrp.cpp +++ b/host/lib/usrp/multi_usrp.cpp @@ -30,7 +30,6 @@ #include #include #include -#include using namespace uhd; using namespace uhd::usrp; @@ -100,11 +99,6 @@ static meta_range_t make_overall_tune_range( const meta_range_t &dsp_range, const double bw ){ - std::cout << "Entering make_overall_tune_range..." << std::endl; - UHD_VAR(dsp_range.start()); - UHD_VAR(dsp_range.stop()); - UHD_VAR(bw); - meta_range_t range; BOOST_FOREACH(const range_t &sub_range, fe_range){ range.push_back(range_t( @@ -226,19 +220,12 @@ static tune_result_t tune_xx_subdev_and_dsp( rf_fe_subtree->access("freq/value").set(target_rf_freq); const double actual_rf_freq = rf_fe_subtree->access("freq/value").get(); - std::cout << "multi_usrp - done tuning FE..." << std::endl; - UHD_VAR(target_rf_freq); - UHD_VAR(actual_rf_freq); - //------------------------------------------------------------------ //-- set the dsp frequency depending upon the dsp frequency policy //------------------------------------------------------------------ double target_dsp_freq = 0.0; double forced_target_rf_freq = target_rf_freq; - UHD_VAR(tune_range.start()); - UHD_VAR(tune_range.stop()); - freq_range_t dsp_range = dsp_subtree->access("freq/range").get(); switch (tune_request.dsp_freq_policy){ @@ -268,15 +255,10 @@ static tune_result_t tune_xx_subdev_and_dsp( break; //does not set } - UHD_VAR(forced_target_rf_freq); - UHD_VAR(target_dsp_freq); - /* Set the DSP frequency. */ dsp_subtree->access("freq/value").set(target_dsp_freq); const double actual_dsp_freq = dsp_subtree->access("freq/value").get(); - UHD_VAR(actual_dsp_freq); - //------------------------------------------------------------------ //-- load and return the tune result //------------------------------------------------------------------ @@ -297,9 +279,6 @@ static double derive_freq_from_xx_subdev_and_dsp( const double actual_rf_freq = rf_fe_subtree->access("freq/value").get(); const double actual_dsp_freq = dsp_subtree->access("freq/value").get(); - UHD_VAR(actual_rf_freq); - UHD_VAR(actual_dsp_freq); - //invert the sign on the dsp freq for transmit return actual_rf_freq - actual_dsp_freq * xx_sign; } -- cgit v1.2.3