From 8edabae54b3b7c64180d734d4525a94e2a2d1ac8 Mon Sep 17 00:00:00 2001
From: Tom Rondeau
Date: Wed, 18 May 2011 11:05:10 +0100
Subject: digital: set number of samps per symbol for the equalizer. Also,
 explicitly set the initial taps of the adaptive filter to 0+j0

---
 gr-digital/lib/digital_cma_equalizer_cc.cc | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'gr-digital/lib/digital_cma_equalizer_cc.cc')

diff --git a/gr-digital/lib/digital_cma_equalizer_cc.cc b/gr-digital/lib/digital_cma_equalizer_cc.cc
index 89f56c16f..113b50ab8 100644
--- a/gr-digital/lib/digital_cma_equalizer_cc.cc
+++ b/gr-digital/lib/digital_cma_equalizer_cc.cc
@@ -25,15 +25,16 @@
 #endif
 
 #include <digital_cma_equalizer_cc.h>
+#include <cstdio>
 
 digital_cma_equalizer_cc_sptr
-digital_make_cma_equalizer_cc(int num_taps, float modulus, float mu)
+digital_make_cma_equalizer_cc(int num_taps, float modulus, float mu, int sps)
 {
-  return gnuradio::get_initial_sptr(new digital_cma_equalizer_cc(num_taps, modulus, mu));
+  return gnuradio::get_initial_sptr(new digital_cma_equalizer_cc(num_taps, modulus, mu, sps));
 }
 
-digital_cma_equalizer_cc::digital_cma_equalizer_cc(int num_taps, float modulus, float mu)
-  : gr_adaptive_fir_ccc("cma_equalizer_cc", 1, std::vector<gr_complex>(num_taps))
+digital_cma_equalizer_cc::digital_cma_equalizer_cc(int num_taps, float modulus, float mu, int sps)
+  : gr_adaptive_fir_ccc("cma_equalizer_cc", sps, std::vector<gr_complex>(num_taps, gr_complex(0,0)))
 {
   set_modulus(modulus);
   set_gain(mu);
-- 
cgit 


From 23ee6269df6f139ef6b85e7f404d452c10bb63a8 Mon Sep 17 00:00:00 2001
From: Tom Rondeau
Date: Mon, 6 Jun 2011 11:35:28 -0400
Subject: digital: formatting CMA code; adding get_ functions and renaming
 things for consistency.

---
 gr-digital/lib/digital_cma_equalizer_cc.cc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'gr-digital/lib/digital_cma_equalizer_cc.cc')

diff --git a/gr-digital/lib/digital_cma_equalizer_cc.cc b/gr-digital/lib/digital_cma_equalizer_cc.cc
index 113b50ab8..c6c46c2d8 100644
--- a/gr-digital/lib/digital_cma_equalizer_cc.cc
+++ b/gr-digital/lib/digital_cma_equalizer_cc.cc
@@ -30,15 +30,17 @@
 digital_cma_equalizer_cc_sptr
 digital_make_cma_equalizer_cc(int num_taps, float modulus, float mu, int sps)
 {
-  return gnuradio::get_initial_sptr(new digital_cma_equalizer_cc(num_taps, modulus, mu, sps));
+  return gnuradio::get_initial_sptr(new digital_cma_equalizer_cc(num_taps, modulus,
+								 mu, sps));
 }
 
-digital_cma_equalizer_cc::digital_cma_equalizer_cc(int num_taps, float modulus, float mu, int sps)
-  : gr_adaptive_fir_ccc("cma_equalizer_cc", sps, std::vector<gr_complex>(num_taps, gr_complex(0,0)))
+digital_cma_equalizer_cc::digital_cma_equalizer_cc(int num_taps, float modulus,
+						   float mu, int sps)
+  : gr_adaptive_fir_ccc("cma_equalizer_cc", sps,
+			std::vector<gr_complex>(num_taps, gr_complex(0,0)))
 {
   set_modulus(modulus);
   set_gain(mu);
   if (num_taps > 0)
     d_taps[0] = 1.0;
 }
-
-- 
cgit