diff options
| author | jcorgan | 2007-04-26 22:51:48 +0000 |
|---|---|---|
| committer | jcorgan | 2007-04-26 22:51:48 +0000 |
| commit | 43819f0f33498239970b4479684f12aa080859e6 (patch) | |
| tree | cb48bd98bde120d4b9c9d098414f7a25cf9b41fd /gnuradio-core/src/lib/general/general.i | |
| parent | c6baf9d41d452965fe6af642b61b2bb823dcf9ea (diff) | |
| download | gnuradio-43819f0f33498239970b4479684f12aa080859e6.tar.gz gnuradio-43819f0f33498239970b4479684f12aa080859e6.tar.bz2 gnuradio-43819f0f33498239970b4479684f12aa080859e6.zip | |
Merged r4518:5130 from developer branch n4hy/ofdm into trunk, passes distcheck.
Adds incomplete OFDM implementation, further work to be completed in the
features/ofdm branch.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@5131 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 | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 2c915b602..c49a01222 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004,2005,2006 Free Software Foundation, Inc. + * Copyright 2004,2005,2006,2007 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -57,6 +57,7 @@ #include <gr_firdes.h> #include <gr_interleave.h> #include <gr_deinterleave.h> +#include <gr_delay.h> #include <gr_simple_squelch_cc.h> #include <gr_agc_ff.h> #include <gr_agc_cc.h> @@ -68,6 +69,7 @@ #include <gr_fake_channel_coder_pp.h> #include <gr_throttle.h> #include <gr_mpsk_receiver_cc.h> +#include <gr_stream_mux.h> #include <gr_stream_to_streams.h> #include <gr_streams_to_stream.h> #include <gr_streams_to_vector.h> @@ -82,6 +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_pll_freqdet_cf.h> #include <gr_pll_refout_cc.h> #include <gr_pll_carriertracking_cc.h> @@ -89,6 +92,11 @@ #include <gr_probe_avg_mag_sqrd_c.h> #include <gr_probe_avg_mag_sqrd_f.h> #include <gr_probe_signal_f.h> +#include <gr_ofdm_correlator.h> +#include <gr_ofdm_cyclic_prefixer.h> +#include <gr_ofdm_bpsk_demapper.h> +#include <gr_ofdm_bpsk_mapper.h> +#include <gr_ofdm_sampler.h> #include <gr_costas_loop_cc.h> #include <gr_pa_2x2_phase_combiner.h> #include <gr_kludge_copy.h> @@ -150,6 +158,7 @@ %include "gr_firdes.i" %include "gr_interleave.i" %include "gr_deinterleave.i" +%include "gr_delay.i" %include "gr_simple_squelch_cc.i" %include "gr_agc_ff.i" %include "gr_agc_cc.i" @@ -161,6 +170,7 @@ %include "gr_fake_channel_coder_pp.i" %include "gr_throttle.i" %include "gr_mpsk_receiver_cc.i" +%include "gr_stream_mux.i" %include "gr_stream_to_streams.i" %include "gr_streams_to_stream.i" %include "gr_streams_to_vector.i" @@ -175,6 +185,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_pll_freqdet_cf.i" %include "gr_pll_refout_cc.i" %include "gr_pll_carriertracking_cc.i" @@ -182,6 +193,11 @@ %include "gr_probe_avg_mag_sqrd_c.i" %include "gr_probe_avg_mag_sqrd_f.i" %include "gr_probe_signal_f.i" +%include "gr_ofdm_correlator.i" +%include "gr_ofdm_cyclic_prefixer.i" +%include "gr_ofdm_bpsk_demapper.i" +%include "gr_ofdm_bpsk_mapper.i" +%include "gr_ofdm_sampler.i" %include "gr_costas_loop_cc.i" %include "gr_pa_2x2_phase_combiner.i" %include "gr_kludge_copy.i" |