diff options
| author | trondeau | 2007-06-04 16:08:44 +0000 |
|---|---|---|
| committer | trondeau | 2007-06-04 16:08:44 +0000 |
| commit | c7dbfcc7d78275f76d8c2a8ef21e3100721874be (patch) | |
| tree | c57b7b49ba153b6858a86de8714c2737f55bbc26 /gnuradio-core/src/lib/general/general.i | |
| parent | d476abb6debdf8ef5c0adf97af50a9b704605e2a (diff) | |
| download | gnuradio-c7dbfcc7d78275f76d8c2a8ef21e3100721874be.tar.gz gnuradio-c7dbfcc7d78275f76d8c2a8ef21e3100721874be.tar.bz2 gnuradio-c7dbfcc7d78275f76d8c2a8ef21e3100721874be.zip | |
merge ordm/receiver branch -r5574:5659. Reworks OFDM receiver with refactored OFDM blocks. A few bug fixes for other blocks have also been slipped in.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@5661 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gnuradio-core/src/lib/general/general.i')
| -rw-r--r-- | gnuradio-core/src/lib/general/general.i | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 64144a05a..1fdb4239a 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -84,7 +84,7 @@ #include <gr_packet_sink.h> #include <gr_lms_dfe_cc.h> #include <gr_lms_dfe_ff.h> -#include <gr_dpll_ff.h> +#include <gr_dpll_bb.h> #include <gr_pll_freqdet_cf.h> #include <gr_pll_refout_cc.h> #include <gr_pll_carriertracking_cc.h> @@ -97,6 +97,7 @@ #include <gr_ofdm_cyclic_prefixer.h> #include <gr_ofdm_bpsk_demapper.h> #include <gr_ofdm_bpsk_mapper.h> +#include <gr_ofdm_frame_sink.h> #include <gr_ofdm_sampler.h> #include <gr_costas_loop_cc.h> #include <gr_pa_2x2_phase_combiner.h> @@ -186,7 +187,7 @@ %include "gr_packet_sink.i" %include "gr_lms_dfe_cc.i" %include "gr_lms_dfe_ff.i" -%include "gr_dpll_ff.i" +%include "gr_dpll_bb.i" %include "gr_pll_freqdet_cf.i" %include "gr_pll_refout_cc.i" %include "gr_pll_carriertracking_cc.i" @@ -199,6 +200,7 @@ %include "gr_ofdm_cyclic_prefixer.i" %include "gr_ofdm_bpsk_demapper.i" %include "gr_ofdm_bpsk_mapper.i" +%include "gr_ofdm_frame_sink.i" %include "gr_ofdm_sampler.i" %include "gr_costas_loop_cc.i" %include "gr_pa_2x2_phase_combiner.i" |