diff options
Diffstat (limited to 'gr-digital/lib')
-rw-r--r-- | gr-digital/lib/cpmmod_bc_impl.h | 13 | ||||
-rw-r--r-- | gr-digital/lib/modulate_vector.cc | 2 | ||||
-rw-r--r-- | gr-digital/lib/ofdm_sync_sc_cfb_impl.cc | 3 |
3 files changed, 8 insertions, 10 deletions
diff --git a/gr-digital/lib/cpmmod_bc_impl.h b/gr-digital/lib/cpmmod_bc_impl.h index 3402e6e2bb..f6385d0d30 100644 --- a/gr-digital/lib/cpmmod_bc_impl.h +++ b/gr-digital/lib/cpmmod_bc_impl.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2010,2012 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -26,7 +26,7 @@ #include <gnuradio/digital/cpmmod_bc.h> #include <gnuradio/blocks/char_to_float.h> #include <gnuradio/analog/frequency_modulator_fc.h> -#include <gnuradio/filter/interp_fir_filter_fff.h> +#include <gnuradio/filter/interp_fir_filter.h> namespace gr { namespace digital { @@ -45,7 +45,7 @@ namespace gr { gr::blocks::char_to_float::sptr d_char_to_float; gr::filter::interp_fir_filter_fff::sptr d_pulse_shaper; analog::frequency_modulator_fc::sptr d_fm; - + public: cpmmod_bc_impl(const std::string &name, analog::cpm::cpm_type type, float h, @@ -65,4 +65,3 @@ namespace gr { } /* namespace gr */ #endif /* INCLUDED_DIGITAL_CPMMOD_BC_IMPL_H */ - diff --git a/gr-digital/lib/modulate_vector.cc b/gr-digital/lib/modulate_vector.cc index 4ef6e804ae..81964aa8e5 100644 --- a/gr-digital/lib/modulate_vector.cc +++ b/gr-digital/lib/modulate_vector.cc @@ -42,7 +42,7 @@ #include <gnuradio/blocks/vector_source.h> #include <gnuradio/blocks/vector_sink.h> -#include <gnuradio/filter/fir_filter_ccf.h> +#include <gnuradio/filter/fir_filter_blk.h> #include <gnuradio/top_block.h> #include <gnuradio/digital/modulate_vector.h> diff --git a/gr-digital/lib/ofdm_sync_sc_cfb_impl.cc b/gr-digital/lib/ofdm_sync_sc_cfb_impl.cc index 4c5bad14e1..b928d94e99 100644 --- a/gr-digital/lib/ofdm_sync_sc_cfb_impl.cc +++ b/gr-digital/lib/ofdm_sync_sc_cfb_impl.cc @@ -35,8 +35,7 @@ #include <gnuradio/blocks/divide.h> #include <gnuradio/blocks/multiply.h> #include <gnuradio/blocks/sample_and_hold.h> -#include <gnuradio/filter/fir_filter_ccf.h> -#include <gnuradio/filter/fir_filter_fff.h> +#include <gnuradio/filter/fir_filter_blk.h> namespace gr { namespace digital { |