diff options
| author | Ben Reynwar <ben@reynwar.net> | 2013-05-19 02:55:33 -0700 |
|---|---|---|
| committer | Ben Reynwar <ben@reynwar.net> | 2013-05-19 02:55:33 -0700 |
| commit | bb01988e75d50d82cbb44c1a49c86c1d08f05665 (patch) | |
| tree | 0528dac14476d37f2cde7374a8fcb3428f879c69 /gr-digital/lib/ofdm_sync_sc_cfb_impl.cc | |
| parent | e4f0319eced22c112f7e6a4cc45bc2036d285332 (diff) | |
| parent | 0fa219774dcf9141ae91204f948c029b05673f3f (diff) | |
Merged in next_docs branch.
Diffstat (limited to 'gr-digital/lib/ofdm_sync_sc_cfb_impl.cc')
| -rw-r--r-- | gr-digital/lib/ofdm_sync_sc_cfb_impl.cc | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/gr-digital/lib/ofdm_sync_sc_cfb_impl.cc b/gr-digital/lib/ofdm_sync_sc_cfb_impl.cc index 822b9021e2..9b3e9687bc 100644 --- a/gr-digital/lib/ofdm_sync_sc_cfb_impl.cc +++ b/gr-digital/lib/ofdm_sync_sc_cfb_impl.cc @@ -24,44 +24,44 @@ #include "config.h" #endif -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include "ofdm_sync_sc_cfb_impl.h" -#include <blocks/plateau_detector_fb.h> -#include <blocks/complex_to_arg.h> -#include <blocks/complex_to_mag_squared.h> -#include <blocks/conjugate_cc.h> -#include <blocks/delay.h> -#include <blocks/divide_ff.h> -#include <blocks/multiply_cc.h> -#include <blocks/multiply_ff.h> -#include <blocks/sample_and_hold_ff.h> -#include <filter/fir_filter_ccf.h> -#include <filter/fir_filter_fff.h> +#include <gnuradio/blocks/plateau_detector_fb.h> +#include <gnuradio/blocks/complex_to_arg.h> +#include <gnuradio/blocks/complex_to_mag_squared.h> +#include <gnuradio/blocks/conjugate_cc.h> +#include <gnuradio/blocks/delay.h> +#include <gnuradio/blocks/divide_ff.h> +#include <gnuradio/blocks/multiply_cc.h> +#include <gnuradio/blocks/multiply_ff.h> +#include <gnuradio/blocks/sample_and_hold_ff.h> +#include <gnuradio/filter/fir_filter_ccf.h> +#include <gnuradio/filter/fir_filter_fff.h> namespace gr { namespace digital { ofdm_sync_sc_cfb::sptr - ofdm_sync_sc_cfb::make(int fft_len, int cp_len) + ofdm_sync_sc_cfb::make(int fft_len, int cp_len, bool use_even_carriers) { - return gnuradio::get_initial_sptr (new ofdm_sync_sc_cfb_impl(fft_len, cp_len)); + return gnuradio::get_initial_sptr (new ofdm_sync_sc_cfb_impl(fft_len, cp_len, use_even_carriers)); } - ofdm_sync_sc_cfb_impl::ofdm_sync_sc_cfb_impl(int fft_len, int cp_len) - : gr_hier_block2 ("ofdm_sync_sc_cfb", - gr_make_io_signature(1, 1, sizeof (gr_complex)), + ofdm_sync_sc_cfb_impl::ofdm_sync_sc_cfb_impl(int fft_len, int cp_len, bool use_even_carriers) + : hier_block2 ("ofdm_sync_sc_cfb", + io_signature::make(1, 1, sizeof (gr_complex)), #ifndef SYNC_ADD_DEBUG_OUTPUT - gr_make_io_signature2(2, 2, sizeof (float), sizeof (unsigned char))) + io_signature::make2(2, 2, sizeof (float), sizeof (unsigned char))) #else - gr_make_io_signature3(3, 3, sizeof (float), sizeof (unsigned char), sizeof (float))) + io_signature::make3(3, 3, sizeof (float), sizeof (unsigned char), sizeof (float))) #endif { std::vector<float> ma_taps(fft_len/2, 1.0); gr::blocks::delay::sptr delay(gr::blocks::delay::make(sizeof(gr_complex), fft_len/2)); gr::blocks::conjugate_cc::sptr delay_conjugate(gr::blocks::conjugate_cc::make()); gr::blocks::multiply_cc::sptr delay_corr(gr::blocks::multiply_cc::make()); - gr::filter::fir_filter_ccf::sptr delay_ma(gr::filter::fir_filter_ccf::make(1, std::vector<float>(fft_len/2, 1.0))); + gr::filter::fir_filter_ccf::sptr delay_ma(gr::filter::fir_filter_ccf::make(1, std::vector<float>(fft_len/2, use_even_carriers ? 1.0 : -1.0))); gr::blocks::complex_to_mag_squared::sptr delay_magsquare(gr::blocks::complex_to_mag_squared::make()); gr::blocks::divide_ff::sptr delay_normalize(gr::blocks::divide_ff::make()); |