From a1e42e5d60be8fd74d3e93f86546343cb93c3a48 Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Sun, 17 Oct 2010 23:37:52 -0700
Subject: usrp: moved warnings logic into wrappers

---
 host/lib/usrp/multi_usrp.cpp | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 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 d0fc5c0f6..7f7ea77b0 100644
--- a/host/lib/usrp/multi_usrp.cpp
+++ b/host/lib/usrp/multi_usrp.cpp
@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
+#include "wrapper_utils.hpp"
 #include <uhd/usrp/multi_usrp.hpp>
 #include <uhd/usrp/tune_helper.hpp>
 #include <uhd/utils/assert.hpp>
@@ -34,11 +35,6 @@
 using namespace uhd;
 using namespace uhd::usrp;
 
-static inline freq_range_t add_dsp_shift(const freq_range_t &range, wax::obj dsp){
-    double codec_rate = dsp[DSP_PROP_CODEC_RATE].as<double>();
-    return freq_range_t(range.min - codec_rate/2.0, range.max + codec_rate/2.0);
-}
-
 /***********************************************************************
  * Simple USRP Implementation
  **********************************************************************/
@@ -211,6 +207,7 @@ public:
         for (size_t m = 0; m < get_num_mboards(); m++){
             _rx_dsp(m)[DSP_PROP_HOST_RATE] = rate;
         }
+        do_samp_rate_warning_message(rate, get_rx_rate(), "RX");
     }
 
     double get_rx_rate(void){
@@ -219,12 +216,16 @@ public:
 
     tune_result_t set_rx_freq(double target_freq, size_t chan){
         size_t nchan = get_rx_num_channels();
-        return tune_rx_subdev_and_dsp(_rx_subdev(chan), _rx_dsp(nchan/chan), nchan%chan, target_freq);
+        tune_result_t r = tune_rx_subdev_and_dsp(_rx_subdev(chan), _rx_dsp(nchan/chan), nchan%chan, target_freq);
+        do_tune_freq_warning_message(target_freq, get_rx_freq(chan), "RX");
+        return r;
     }
 
     tune_result_t set_rx_freq(double target_freq, double lo_off, size_t chan){
         size_t nchan = get_rx_num_channels();
-        return tune_rx_subdev_and_dsp(_rx_subdev(chan), _rx_dsp(nchan/chan), nchan%chan, target_freq, lo_off);
+        tune_result_t r = tune_rx_subdev_and_dsp(_rx_subdev(chan), _rx_dsp(nchan/chan), nchan%chan, target_freq, lo_off);
+        do_tune_freq_warning_message(target_freq, get_rx_freq(chan), "RX");
+        return r;
     }
 
     double get_rx_freq(size_t chan){
@@ -312,6 +313,7 @@ public:
         for (size_t m = 0; m < get_num_mboards(); m++){
             _tx_dsp(m)[DSP_PROP_HOST_RATE] = rate;
         }
+        do_samp_rate_warning_message(rate, get_tx_rate(), "TX");
     }
 
     double get_tx_rate(void){
@@ -320,12 +322,16 @@ public:
 
     tune_result_t set_tx_freq(double target_freq, size_t chan){
         size_t nchan = get_tx_num_channels();
-        return tune_tx_subdev_and_dsp(_tx_subdev(chan), _tx_dsp(nchan/chan), nchan%chan, target_freq);
+        tune_result_t r = tune_tx_subdev_and_dsp(_tx_subdev(chan), _tx_dsp(nchan/chan), nchan%chan, target_freq);
+        do_tune_freq_warning_message(target_freq, get_tx_freq(chan), "TX");
+        return r;
     }
 
     tune_result_t set_tx_freq(double target_freq, double lo_off, size_t chan){
         size_t nchan = get_tx_num_channels();
-        return tune_tx_subdev_and_dsp(_tx_subdev(chan), _tx_dsp(nchan/chan), nchan%chan, target_freq, lo_off);
+        tune_result_t r = tune_tx_subdev_and_dsp(_tx_subdev(chan), _tx_dsp(nchan/chan), nchan%chan, target_freq, lo_off);
+        do_tune_freq_warning_message(target_freq, get_tx_freq(chan), "TX");
+        return r;
     }
 
     double get_tx_freq(size_t chan){
-- 
cgit v1.2.3