1 files changed, 7 insertions, 56 deletions

diff --git a/host/lib/usrp/usrp2/dsp_impl.cpp b/host/lib/usrp/usrp2/dsp_impl.cpp
index 330638cb1..367cde2e1 100644
--- a/host/lib/usrp/usrp2/dsp_impl.cpp
+++ b/host/lib/usrp/usrp2/dsp_impl.cpp
@@ -17,12 +17,10 @@
 
 #include "usrp2_impl.hpp"
 #include "usrp2_regs.hpp"
+#include "../dsp_utils.hpp"
 #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>
 
 using namespace uhd;
 using namespace uhd::usrp;
@@ -30,49 +28,9 @@ using namespace uhd::usrp;
 static const size_t default_decim = 16;
 static const size_t default_interp = 16;
 
-#define rint boost::math::iround
-
-template <class T> T log2(T num){
-    return std::log(num)/std::log(T(2));
-}
-
 /***********************************************************************
  * DDC Helper Methods
  **********************************************************************/
-static boost::uint32_t calculate_freq_word_and_update_actual_freq(double &freq, double clock_freq){
-    UHD_ASSERT_THROW(std::abs(freq) < clock_freq/2.0);
-    static const double scale_factor = std::pow(2.0, 32);
-
-    //calculate the freq register word
-    boost::uint32_t freq_word = rint((freq / clock_freq) * scale_factor);
-
-    //update the actual frequency
-    freq = (double(freq_word) / scale_factor) * clock_freq;
-
-    return freq_word;
-}
-
-// Check if requested decim/interp rate is:
-//      multiple of 4, enable two halfband filters
-//      multiple of 2, enable one halfband filter
-//      handle remainder in CIC
-static boost::uint32_t calculate_cic_word(size_t rate){
-    int hb0 = 0, hb1 = 0;
-    if (not (rate & 0x1)){
-        hb0 = 1;
-        rate /= 2;
-    }
-    if (not (rate & 0x1)){
-        hb1 = 1;
-        rate /= 2;
-    }
-    return (hb1 << 9) | (hb0 << 8) | (rate & 0xff);
-}
-
-static boost::uint32_t calculate_iq_scale_word(boost::int16_t i, boost::int16_t q){
-    return (boost::uint16_t(i) << 16) | (boost::uint16_t(q) << 0);
-}
-
 template <class rate_t> static rate_t
 pick_closest_rate(double exact_rate, const std::vector<rate_t> &rates){
     rate_t closest_match = rates.at(0);
@@ -130,7 +88,7 @@ void usrp2_impl::ddc_set(const wax::obj &key, const wax::obj &val){
     case DSP_PROP_FREQ_SHIFT:{
             double new_freq = val.as<double>();
             _iface->poke32(U2_REG_DSP_RX_FREQ,
-                calculate_freq_word_and_update_actual_freq(new_freq, get_master_clock_freq())
+                dsp_type1::calc_cordic_word_and_update(new_freq, get_master_clock_freq())
             );
             _ddc_freq = new_freq; //shadow
         }
@@ -141,12 +99,12 @@ void usrp2_impl::ddc_set(const wax::obj &key, const wax::obj &val){
             _ddc_decim = pick_closest_rate(extact_rate, _allowed_decim_and_interp_rates);
 
             //set the decimation
-            _iface->poke32(U2_REG_DSP_RX_DECIM_RATE, calculate_cic_word(_ddc_decim));
+            _iface->poke32(U2_REG_DSP_RX_DECIM_RATE, dsp_type1::calc_cic_filter_word(_ddc_decim));
 
             //set the scaling
             static const boost::int16_t default_rx_scale_iq = 1024;
             _iface->poke32(U2_REG_DSP_RX_SCALE_IQ,
-                calculate_iq_scale_word(default_rx_scale_iq, default_rx_scale_iq)
+                dsp_type1::calc_iq_scale_word(default_rx_scale_iq, default_rx_scale_iq)
             );
         }
         return;
@@ -205,7 +163,7 @@ void usrp2_impl::duc_set(const wax::obj &key, const wax::obj &val){
     case DSP_PROP_FREQ_SHIFT:{
             double new_freq = val.as<double>();
             _iface->poke32(U2_REG_DSP_TX_FREQ,
-                calculate_freq_word_and_update_actual_freq(new_freq, get_master_clock_freq())
+                dsp_type1::calc_cordic_word_and_update(new_freq, get_master_clock_freq())
             );
             _duc_freq = new_freq; //shadow
         }
@@ -215,18 +173,11 @@ void usrp2_impl::duc_set(const wax::obj &key, const wax::obj &val){
             double extact_rate = get_master_clock_freq()/val.as<double>();
             _duc_interp = pick_closest_rate(extact_rate, _allowed_decim_and_interp_rates);
 
-            // Calculate CIC interpolation (i.e., without halfband interpolators)
-            size_t tmp_interp = calculate_cic_word(_duc_interp) & 0xff;
-
-            // Calculate closest multiplier constant to reverse gain absent scale multipliers
-            double interp_cubed = std::pow(double(tmp_interp), 3);
-            boost::int16_t scale = rint((4096*std::pow(2, ceil(log2(interp_cubed))))/(1.65*interp_cubed));
-
             //set the interpolation
-            _iface->poke32(U2_REG_DSP_TX_INTERP_RATE, calculate_cic_word(_duc_interp));
+            _iface->poke32(U2_REG_DSP_TX_INTERP_RATE, dsp_type1::calc_cic_filter_word(_duc_interp));
 
             //set the scaling
-            _iface->poke32(U2_REG_DSP_TX_SCALE_IQ, calculate_iq_scale_word(scale, scale));
+            _iface->poke32(U2_REG_DSP_TX_SCALE_IQ, dsp_type1::calc_iq_scale_word(_duc_interp));
         }
         return;