diff options
| author | Ben Reynwar | 2011-06-13 13:30:19 -0700 |
|---|---|---|
| committer | Ben Reynwar | 2011-06-13 13:30:19 -0700 |
| commit | f73984a6b43af4c4795af4b91657cc7b1ff49dae (patch) | |
| tree | f7ed1390445a1a3e8905dba741163a3876ad40f2 /gr-digital/lib/digital_cma_equalizer_cc.cc | |
| parent | 2c8b1d999e7388c4513149615b5c7ebedb854d35 (diff) | |
| parent | 5ce630cbce6460b739b175257ce0d717095a55f4 (diff) | |
| download | gnuradio-f73984a6b43af4c4795af4b91657cc7b1ff49dae.tar.gz gnuradio-f73984a6b43af4c4795af4b91657cc7b1ff49dae.tar.bz2 gnuradio-f73984a6b43af4c4795af4b91657cc7b1ff49dae.zip | |
Merge branch '8psk' of https://github.com/trondeau/gnuradio into 8psk
Diffstat (limited to 'gr-digital/lib/digital_cma_equalizer_cc.cc')
| -rw-r--r-- | gr-digital/lib/digital_cma_equalizer_cc.cc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/gr-digital/lib/digital_cma_equalizer_cc.cc b/gr-digital/lib/digital_cma_equalizer_cc.cc index 89f56c16f..c6c46c2d8 100644 --- a/gr-digital/lib/digital_cma_equalizer_cc.cc +++ b/gr-digital/lib/digital_cma_equalizer_cc.cc @@ -25,19 +25,22 @@ #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); if (num_taps > 0) d_taps[0] = 1.0; } - |