From 359c4e16b2d2748a97ce33073c64502a7f190aa6 Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Mon, 25 Oct 2010 13:41:40 -0700
Subject: uhd: created tune request struct and implemented more fine grained
 tuning calls

---
 host/lib/types.cpp | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'host/lib/types.cpp')

diff --git a/host/lib/types.cpp b/host/lib/types.cpp
index 6aa82b012..a8062b6ae 100644
--- a/host/lib/types.cpp
+++ b/host/lib/types.cpp
@@ -17,6 +17,7 @@
 
 #include <uhd/utils/assert.hpp>
 #include <uhd/types/ranges.hpp>
+#include <uhd/types/tune_request.hpp>
 #include <uhd/types/tune_result.hpp>
 #include <uhd/types/clock_config.hpp>
 #include <uhd/types/stream_cmd.hpp>
@@ -57,6 +58,25 @@ freq_range_t::freq_range_t(double min, double max):
     /* NOP */
 }
 
+/***********************************************************************
+ * tune request
+ **********************************************************************/
+tune_request_t::tune_request_t(double target_freq):
+    target_freq(target_freq),
+    inter_freq_policy(POLICY_AUTO),
+    dsp_freq_policy(POLICY_AUTO)
+{
+    /* NOP */
+}
+
+tune_request_t::tune_request_t(double target_freq, double lo_off):
+    target_freq(target_freq + lo_off),
+    inter_freq_policy(POLICY_MANUAL),
+    dsp_freq_policy(POLICY_AUTO)
+{
+    /* NOP */
+}
+
 /***********************************************************************
  * tune result
  **********************************************************************/
-- 
cgit v1.2.3


From 2d21958e1b7ecc9ff083f2e60b0b5d06ccb3c638 Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Mon, 25 Oct 2010 17:04:51 -0700
Subject: uhd: tune helper + request, forgot to use and set target freq

---
 host/lib/types.cpp            | 3 ++-
 host/lib/usrp/tune_helper.cpp | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'host/lib/types.cpp')

diff --git a/host/lib/types.cpp b/host/lib/types.cpp
index a8062b6ae..4188568aa 100644
--- a/host/lib/types.cpp
+++ b/host/lib/types.cpp
@@ -70,8 +70,9 @@ 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 + lo_off),
+    target_freq(target_freq),
     inter_freq_policy(POLICY_MANUAL),
+    inter_freq(target_freq + lo_off),
     dsp_freq_policy(POLICY_AUTO)
 {
     /* NOP */
diff --git a/host/lib/usrp/tune_helper.cpp b/host/lib/usrp/tune_helper.cpp
index 8c57cc428..a6b615926 100644
--- a/host/lib/usrp/tune_helper.cpp
+++ b/host/lib/usrp/tune_helper.cpp
@@ -70,7 +70,7 @@ static tune_result_t tune_xx_subdev_and_dsp(
     //------------------------------------------------------------------
     //-- calculate the dsp freq, only used with automatic policy
     //------------------------------------------------------------------
-    double delta_freq = std::fmod(target_inter_freq - actual_inter_freq, dsp_sample_rate);
+    double delta_freq = std::fmod(tune_request.target_freq - actual_inter_freq, dsp_sample_rate);
     bool outside_of_nyquist = std::abs(delta_freq) > dsp_sample_rate/2.0;
     double target_dsp_freq = (outside_of_nyquist)?
         boost::math::sign(delta_freq)*dsp_sample_rate - delta_freq : -delta_freq;
-- 
cgit v1.2.3