From db59e22feef9597b258d365ad4e0e5859257172b Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Tue, 4 May 2010 15:46:23 -0700
Subject: added hb filter calculation on usrp2 dsp impl

---
 host/lib/usrp/usrp2/dsp_impl.cpp | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'host/lib/usrp/usrp2')

diff --git a/host/lib/usrp/usrp2/dsp_impl.cpp b/host/lib/usrp/usrp2/dsp_impl.cpp
index 84314a656..e6e905fdc 100644
--- a/host/lib/usrp/usrp2/dsp_impl.cpp
+++ b/host/lib/usrp/usrp2/dsp_impl.cpp
@@ -52,6 +52,19 @@ static boost::uint32_t calculate_freq_word_and_update_actual_freq(double &freq,
     return freq_word;
 }
 
+static boost::uint32_t calculate_cic_word(size_t rate){
+    int hb0 = 0, hb1 = 0;
+    if (rate & 0x1){
+        hb0 = 1;
+        rate /= 2;
+    }
+    if (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);
 }
@@ -84,7 +97,7 @@ void usrp2_impl::init_ddc_config(void){
 
 void usrp2_impl::update_ddc_config(void){
     //set the decimation
-    _iface->poke32(FR_DSP_RX_DECIM_RATE, _ddc_decim);
+    _iface->poke32(FR_DSP_RX_DECIM_RATE, calculate_cic_word(_ddc_decim));
 
     //set the scaling
     static const boost::int16_t default_rx_scale_iq = 1024;
@@ -163,15 +176,14 @@ void usrp2_impl::init_duc_config(void){
 
 void usrp2_impl::update_duc_config(void){
     // Calculate CIC interpolation (i.e., without halfband interpolators)
-    size_t tmp_interp = _duc_interp;
-    while(tmp_interp > 128) tmp_interp /= 2;
+    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(FR_DSP_TX_INTERP_RATE, _ddc_decim);
+    _iface->poke32(FR_DSP_TX_INTERP_RATE, calculate_cic_word(_duc_interp));
 
     //set the scaling
     _iface->poke32(FR_DSP_TX_SCALE_IQ, calculate_iq_scale_word(scale, scale));
-- 
cgit v1.2.3


From 23e0f3d215a320a30731a70590d50003bd718378 Mon Sep 17 00:00:00 2001
From: Jason Abele <jason@ettus.com>
Date: Tue, 4 May 2010 17:34:54 -0700
Subject: Inverted logic in halfband selection

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

(limited to 'host/lib/usrp/usrp2')

diff --git a/host/lib/usrp/usrp2/dsp_impl.cpp b/host/lib/usrp/usrp2/dsp_impl.cpp
index e6e905fdc..fc4c5479e 100644
--- a/host/lib/usrp/usrp2/dsp_impl.cpp
+++ b/host/lib/usrp/usrp2/dsp_impl.cpp
@@ -52,13 +52,17 @@ static boost::uint32_t calculate_freq_word_and_update_actual_freq(double &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 (rate & 0x1){
+    if (not (rate & 0x1)){
         hb0 = 1;
         rate /= 2;
     }
-    if (rate & 0x1){
+    if (not (rate & 0x1)){
         hb1 = 1;
         rate /= 2;
     }
-- 
cgit v1.2.3