Merging OFDM features branch r5661:5759 into trunk. OFDM works over the air with...

[debian/gnuradio] / gnuradio-core / src / lib / general / gr_ofdm_bpsk_mapper.h

diff --git a/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper.h b/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper.h
index 41b2f5bedefa147feaf29f7806c496ca87b50f50..da78ca4753748bdac68e861b0f2a3e47fa7c29c5 100644 (file)
--- a/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper.h
+++ b/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2007 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -27,19 +27,16 @@
 #include <gr_sync_block.h>
 #include <gr_message.h>
 #include <gr_msg_queue.h>
-#include <vector>
 
 class gr_ofdm_bpsk_mapper;
 typedef boost::shared_ptr<gr_ofdm_bpsk_mapper> gr_ofdm_bpsk_mapper_sptr;
 
 gr_ofdm_bpsk_mapper_sptr 
 gr_make_ofdm_bpsk_mapper (unsigned msgq_limit, 
-                         unsigned occupied_carriers, unsigned int fft_length,
-                         const std::vector<gr_complex> &known_symbol1, 
-                         const std::vector<gr_complex> &known_symbol2);
+                         unsigned occupied_carriers, unsigned int fft_length);
 
 /*!
- * \brief take a stream of bytes in and map to a vector of complex
+ * \brief take a message in and map to a vector of complex
  * constellation points suitable for IFFT input to be used in an ofdm
  * modulator.  Simple BPSK version.
  */
@@ -47,28 +44,22 @@ gr_make_ofdm_bpsk_mapper (unsigned msgq_limit,
 class gr_ofdm_bpsk_mapper : public gr_sync_block
 {
   friend gr_ofdm_bpsk_mapper_sptr
-    gr_make_ofdm_bpsk_mapper (unsigned msgq_limit, 
-                             unsigned occupied_carriers, unsigned int fft_length,
-                             const std::vector<gr_complex> &known_symbol1, 
-                             const std::vector<gr_complex> &known_symbol2);
-  
+  gr_make_ofdm_bpsk_mapper (unsigned msgq_limit, 
+                           unsigned occupied_carriers, unsigned int fft_length);
  protected:
   gr_ofdm_bpsk_mapper (unsigned msgq_limit, 
-                      unsigned occupied_carriers, unsigned int fft_length,
-                      const std::vector<gr_complex> &known_symbol1, 
-                      const std::vector<gr_complex> &known_symbol2);
-  
+                      unsigned occupied_carriers, unsigned int fft_length);
+
  private:
   gr_msg_queue_sptr    d_msgq;
   gr_message_sptr      d_msg;
   unsigned             d_msg_offset;
   bool                 d_eof;
   
-  unsigned int d_occupied_carriers;
-  unsigned int d_fft_length;
-  unsigned int d_bit_offset;
-  unsigned int d_header_sent;
-  std::vector<gr_complex> d_known_symbol1, d_known_symbol2;
+  unsigned int                 d_occupied_carriers;
+  unsigned int                 d_fft_length;
+  unsigned int                 d_bit_offset;
+  int                  d_pending_flag;
 
  public:
   ~gr_ofdm_bpsk_mapper(void);