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, 68 insertions, 0 deletions

diff --git a/gr-digital/include/digital_ofdm_sampler.h b/gr-digital/include/digital_ofdm_sampler.h
new file mode 100644
index 000000000..9c54e4e77
--- /dev/null
+++ b/gr-digital/include/digital_ofdm_sampler.h
@@ -0,0 +1,68 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 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.
+ */
+
+#ifndef INCLUDED_DIGITAL_OFDM_SAMPLER_H
+#define INCLUDED_DIGITAL_OFDM_SAMPLER_H
+
+#include <digital_api.h>
+#include <gr_sync_block.h>
+
+class digital_ofdm_sampler;
+typedef boost::shared_ptr<digital_ofdm_sampler> digital_ofdm_sampler_sptr;
+
+DIGITAL_API digital_ofdm_sampler_sptr digital_make_ofdm_sampler (unsigned int fft_length, 
+						     unsigned int symbol_length,
+						     unsigned int timeout=1000);
+
+/*!
+ * \brief does the rest of the OFDM stuff
+ * \ingroup ofdm_blk
+ */
+class DIGITAL_API digital_ofdm_sampler : public gr_block
+{
+  friend DIGITAL_API digital_ofdm_sampler_sptr digital_make_ofdm_sampler (unsigned int fft_length, 
+							      unsigned int symbol_length,
+							      unsigned int timeout);
+
+  digital_ofdm_sampler (unsigned int fft_length, 
+			unsigned int symbol_length,
+			unsigned int timeout);
+
+ private:
+  enum state_t {STATE_NO_SIG, STATE_PREAMBLE, STATE_FRAME};
+
+  state_t d_state;
+  unsigned int d_timeout_max;
+  unsigned int d_timeout;
+  unsigned int d_fft_length;
+  unsigned int d_symbol_length;
+
+ public:
+  void forecast (int noutput_items, gr_vector_int &ninput_items_required);
+
+  int general_work (int noutput_items,
+		    gr_vector_int &ninput_items,
+		    gr_vector_const_void_star &input_items,
+		    gr_vector_void_star &output_items);
+};
+
+#endif