Merge branch 'next' of http://gnuradio.org/git/gnuradio into next

Conflicts:
	gnuradio-core/src/lib/filter/gr_dc_blocker_cc.h
	gnuradio-core/src/lib/filter/gr_dc_blocker_ff.h
	gnuradio-core/src/lib/general/gr_ofdm_demapper_vcb.h
	gr-digital/include/digital_ofdm_cyclic_prefixer.h
	gr-digital/include/digital_ofdm_frame_acquisition.h
	gr-digital/include/digital_ofdm_frame_sink.h
	gr-digital/include/digital_ofdm_insert_preamble.h
	gr-digital/include/digital_ofdm_mapper_bcv.h
	gr-digital/include/digital_ofdm_sampler.h

1 files changed, 49 insertions, 0 deletions

diff --git a/gr-digital/swig/digital_ofdm_frame_acquisition.i b/gr-digital/swig/digital_ofdm_frame_acquisition.i
new file mode 100644
index 000000000..b61297bde
--- /dev/null
+++ b/gr-digital/swig/digital_ofdm_frame_acquisition.i
@@ -0,0 +1,49 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2007,2011 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,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <vector>
+
+GR_SWIG_BLOCK_MAGIC(digital,ofdm_frame_acquisition);
+
+digital_ofdm_frame_acquisition_sptr 
+digital_make_ofdm_frame_acquisition (unsigned int occupied_carriers, 
+				     unsigned int fft_length,
+				     unsigned int cplen,
+				     const std::vector<gr_complex> &known_symbol, 
+				     unsigned int max_fft_shift_len=4);
+
+class digital_ofdm_frame_acquisition : public gr_sync_decimator
+{
+ protected:
+  digital_ofdm_frame_acquisition (unsigned int occupied_carriers,
+				  unsigned int fft_length,
+				  unsigned int cplen,
+				  const std::vector<gr_complex> &known_symbol, 
+				  unsigned int max_fft_shift_len);
+
+ public:
+  float snr() { return d_snr_est; }
+  int general_work(int noutput_items,
+		   gr_vector_int &ninput_items,
+		   gr_vector_const_void_star &input_items,
+		   gr_vector_void_star &output_items);
+};