From 51a9c2d42d12caa607ae33feb12a6f16ab8a3fe5 Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Tue, 13 Apr 2010 17:48:48 -0700
Subject: Created a usrp2 interface class with the control, spi, peek/poke
 functionality. Its used in all the implementation level code

---
 host/lib/usrp/usrp2/dsp_impl.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'host/lib/usrp/usrp2/dsp_impl.cpp')

diff --git a/host/lib/usrp/usrp2/dsp_impl.cpp b/host/lib/usrp/usrp2/dsp_impl.cpp
index 92b55d029..664d69948 100644
--- a/host/lib/usrp/usrp2/dsp_impl.cpp
+++ b/host/lib/usrp/usrp2/dsp_impl.cpp
@@ -20,6 +20,7 @@
 #include <uhd/usrp/dsp_props.hpp>
 #include <uhd/utils/assert.hpp>
 #include <boost/format.hpp>
+#include <boost/bind.hpp>
 #include <boost/assign/list_of.hpp>
 #include <boost/math/special_functions/round.hpp>
 
@@ -82,11 +83,11 @@ void usrp2_impl::init_ddc_config(void){
 
 void usrp2_impl::update_ddc_config(void){
     //set the decimation
-    this->poke32(FR_DSP_RX_DECIM_RATE, _ddc_decim);
+    _iface->poke32(FR_DSP_RX_DECIM_RATE, _ddc_decim);
 
     //set the scaling
     static const boost::int16_t default_rx_scale_iq = 1024;
-    this->poke32(FR_DSP_RX_SCALE_IQ,
+    _iface->poke32(FR_DSP_RX_SCALE_IQ,
         calculate_iq_scale_word(default_rx_scale_iq, default_rx_scale_iq)
     );
 }
@@ -126,7 +127,7 @@ void usrp2_impl::ddc_set(const wax::obj &key, const wax::obj &val){
             ASSERT_THROW(new_freq <= get_master_clock_freq()/2.0);
             ASSERT_THROW(new_freq >= -get_master_clock_freq()/2.0);
             _ddc_freq = new_freq; //shadow
-            this->poke32(FR_DSP_RX_FREQ,
+            _iface->poke32(FR_DSP_RX_FREQ,
                 calculate_freq_word_and_update_actual_freq(_ddc_freq, get_master_clock_freq())
             );
         }
@@ -170,10 +171,10 @@ void usrp2_impl::update_duc_config(void){
     boost::int16_t scale = rint((4096*std::pow(2, ceil(log2(interp_cubed))))/(1.65*interp_cubed));
 
     //set the interpolation
-    this->poke32(FR_DSP_TX_INTERP_RATE, _ddc_decim);
+    _iface->poke32(FR_DSP_TX_INTERP_RATE, _ddc_decim);
 
     //set the scaling
-    this->poke32(FR_DSP_TX_SCALE_IQ, calculate_iq_scale_word(scale, scale));
+    _iface->poke32(FR_DSP_TX_SCALE_IQ, calculate_iq_scale_word(scale, scale));
 }
 
 /***********************************************************************
@@ -211,7 +212,7 @@ void usrp2_impl::duc_set(const wax::obj &key, const wax::obj &val){
             ASSERT_THROW(new_freq <= get_master_clock_freq()/2.0);
             ASSERT_THROW(new_freq >= -get_master_clock_freq()/2.0);
             _duc_freq = new_freq; //shadow
-            this->poke32(FR_DSP_TX_FREQ,
+            _iface->poke32(FR_DSP_TX_FREQ,
                 calculate_freq_word_and_update_actual_freq(_duc_freq, get_master_clock_freq())
             );
         }
-- 
cgit v1.2.3