summaryrefslogtreecommitdiffstats
path: root/host/lib/usrp
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2011-05-01 09:38:30 -0700
committerJosh Blum <josh@joshknows.com>2011-05-01 09:38:30 -0700
commit4b18ab84921a88f0448632355e8165ecaff4ed6f (patch)
treeeeddfe4f7806b4cf92d8d1195ec44d81f521dcb2 /host/lib/usrp
parent46b20f25556620433c89b16984dc1633221ae28b (diff)
downloaduhd-4b18ab84921a88f0448632355e8165ecaff4ed6f.tar.gz
uhd-4b18ab84921a88f0448632355e8165ecaff4ed6f.tar.bz2
uhd-4b18ab84921a88f0448632355e8165ecaff4ed6f.zip
uhd: fixed typo in tune request/result inter_freq -> rf_freq
For some reason, the code said intermediate frequency, however, it was used and treated as RF frequency. It was always intended to be the RF frequency, but was misnamed due to a cognitive distortion.
Diffstat (limited to 'host/lib/usrp')
-rw-r--r--host/lib/usrp/tune_helper.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/host/lib/usrp/tune_helper.cpp b/host/lib/usrp/tune_helper.cpp
index 9637301ad..264e6c04b 100644
--- a/host/lib/usrp/tune_helper.cpp
+++ b/host/lib/usrp/tune_helper.cpp
@@ -49,28 +49,28 @@ static tune_result_t tune_xx_subdev_and_dsp(
}
//------------------------------------------------------------------
- //-- set the intermediate frequency depending upon the IF policy
+ //-- set the RF frequency depending upon the policy
//------------------------------------------------------------------
- double target_inter_freq = 0.0;
- switch (tune_request.inter_freq_policy){
+ double target_rf_freq = 0.0;
+ switch (tune_request.rf_freq_policy){
case tune_request_t::POLICY_AUTO:
- target_inter_freq = tune_request.target_freq + lo_offset;
- subdev_freq_proxy = target_inter_freq;
+ target_rf_freq = tune_request.target_freq + lo_offset;
+ subdev_freq_proxy = target_rf_freq;
break;
case tune_request_t::POLICY_MANUAL:
- target_inter_freq = tune_request.inter_freq;
- subdev_freq_proxy = target_inter_freq;
+ target_rf_freq = tune_request.rf_freq;
+ subdev_freq_proxy = target_rf_freq;
break;
case tune_request_t::POLICY_NONE: break; //does not set
}
- double actual_inter_freq = subdev_freq_proxy.as<double>();
+ double actual_rf_freq = subdev_freq_proxy.as<double>();
//------------------------------------------------------------------
//-- calculate the dsp freq, only used with automatic policy
//------------------------------------------------------------------
- double target_dsp_freq = actual_inter_freq - tune_request.target_freq;
+ double target_dsp_freq = actual_rf_freq - tune_request.target_freq;
//invert the sign on the dsp freq given the following conditions
if (unit == dboard_iface::UNIT_TX) target_dsp_freq *= -1.0;
@@ -96,8 +96,8 @@ static tune_result_t tune_xx_subdev_and_dsp(
//-- load and return the tune result
//------------------------------------------------------------------
tune_result_t tune_result;
- tune_result.target_inter_freq = target_inter_freq;
- tune_result.actual_inter_freq = actual_inter_freq;
+ tune_result.target_rf_freq = target_rf_freq;
+ tune_result.actual_rf_freq = actual_rf_freq;
tune_result.target_dsp_freq = target_dsp_freq;
tune_result.actual_dsp_freq = actual_dsp_freq;
return tune_result;
@@ -107,13 +107,13 @@ static double derive_freq_from_xx_subdev_and_dsp(
dboard_iface::unit_t unit, wax::obj subdev, wax::obj dsp
){
//extract actual dsp and IF frequencies
- double actual_inter_freq = subdev[SUBDEV_PROP_FREQ].as<double>();
+ double actual_rf_freq = subdev[SUBDEV_PROP_FREQ].as<double>();
double actual_dsp_freq = dsp[DSP_PROP_FREQ_SHIFT].as<double>();
//invert the sign on the dsp freq given the following conditions
if (unit == dboard_iface::UNIT_TX) actual_dsp_freq *= -1.0;
- return actual_inter_freq - actual_dsp_freq;
+ return actual_rf_freq - actual_dsp_freq;
}
/***********************************************************************