Merge branch 'master' into next

1 files changed, 9 insertions, 9 deletions

diff --git a/host/lib/types/tune.cpp b/host/lib/types/tune.cpp
index 601bc20e8..154f0990f 100644
--- a/host/lib/types/tune.cpp
+++ b/host/lib/types/tune.cpp
@@ -23,7 +23,7 @@ using namespace uhd;
 
 tune_request_t::tune_request_t(double target_freq):
     target_freq(target_freq),
-    inter_freq_policy(POLICY_AUTO),
+    rf_freq_policy(POLICY_AUTO),
     dsp_freq_policy(POLICY_AUTO)
 {
     /* NOP */
@@ -31,8 +31,8 @@ tune_request_t::tune_request_t(double target_freq):
 
 tune_request_t::tune_request_t(double target_freq, double lo_off):
     target_freq(target_freq),
-    inter_freq_policy(POLICY_MANUAL),
-    inter_freq(target_freq + lo_off),
+    rf_freq_policy(POLICY_MANUAL),
+    rf_freq(target_freq + lo_off),
     dsp_freq_policy(POLICY_AUTO)
 {
     /* NOP */
@@ -41,12 +41,12 @@ tune_request_t::tune_request_t(double target_freq, double lo_off):
 std::string tune_result_t::to_pp_string(void) const{
     return str(boost::format(
         "Tune Result:\n"
-        "    Target Intermediate Freq: %f (MHz)\n"
-        "    Actual Intermediate Freq: %f (MHz)\n"
-        "    Target DSP Freq Shift:    %f (MHz)\n"
-        "    Actual DSP Freq Shift:    %f (MHz)\n"
+        "    Target RF  Freq: %f (MHz)\n"
+        "    Actual RF  Freq: %f (MHz)\n"
+        "    Target DSP Freq: %f (MHz)\n"
+        "    Actual DSP Freq: %f (MHz)\n"
     )
-        % (target_inter_freq/1e6) % (actual_inter_freq/1e6)
-        % (target_dsp_freq/1e6)   % (actual_dsp_freq/1e6)
+        % (target_rf_freq/1e6)  % (actual_rf_freq/1e6)
+        % (target_dsp_freq/1e6) % (actual_dsp_freq/1e6)
     );
 }