commit-gnuradio
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-gnuradio] r5696 - gnuradio/branches/features/ofdm/sync/gnuradio-


From: eb
Subject: [Commit-gnuradio] r5696 - gnuradio/branches/features/ofdm/sync/gnuradio-core/src/lib/general
Date: Tue, 5 Jun 2007 17:18:13 -0600 (MDT)

Author: eb
Date: 2007-06-05 17:18:13 -0600 (Tue, 05 Jun 2007)
New Revision: 5696

Added:
   
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper0.cc
   
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper0.h
   
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper0.i
Modified:
   
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/lib/general/Makefile.am
   
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper.cc
   
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper.h
   
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper.i
Log:
Renamed existing gr_ofdm_bpsk_mapper to gr_ofdm_bpsk_mapper0.
Now gr_ofdm_bpsk_mapper does not insert preamble.  That's handled by
gr_ofdm_insert_preamble.  This change cleans up the code, and allows
the preamble to use a different modulation than the payload.


Modified: 
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/lib/general/Makefile.am
===================================================================
--- 
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/lib/general/Makefile.am  
    2007-06-05 22:37:05 UTC (rev 5695)
+++ 
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/lib/general/Makefile.am  
    2007-06-05 23:18:13 UTC (rev 5696)
@@ -102,6 +102,7 @@
         gr_ofdm_mapper_bcv.cc           \
         gr_ofdm_bpsk_demapper.cc        \
         gr_ofdm_bpsk_mapper.cc          \
+        gr_ofdm_bpsk_mapper0.cc         \
        gr_ofdm_frame_sink.cc           \
        gr_ofdm_insert_preamble.cc      \
         gr_ofdm_sampler.cc              \
@@ -242,6 +243,7 @@
         gr_ofdm_demapper_vcb.h          \
         gr_ofdm_mapper_bcv.h            \
         gr_ofdm_bpsk_mapper.h           \
+        gr_ofdm_bpsk_mapper0.h          \
         gr_ofdm_bpsk_demapper.h         \
         gr_ofdm_frame_sink.h           \
        gr_ofdm_insert_preamble.h       \
@@ -385,6 +387,7 @@
         gr_ofdm_mapper_bcv.i            \
         gr_ofdm_bpsk_demapper.i         \
         gr_ofdm_bpsk_mapper.i           \
+        gr_ofdm_bpsk_mapper0.i          \
         gr_ofdm_frame_sink.i           \
        gr_ofdm_insert_preamble.i       \
        gr_ofdm_sampler.i               \

Modified: 
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper.cc
===================================================================
--- 
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper.cc
   2007-06-05 22:37:05 UTC (rev 5695)
+++ 
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper.cc
   2007-06-05 23:18:13 UTC (rev 5696)
@@ -26,21 +26,18 @@
 
 #include <gr_ofdm_bpsk_mapper.h>
 #include <gr_io_signature.h>
-#include <vector>
+#include <stdexcept>
 
 gr_ofdm_bpsk_mapper_sptr
 gr_make_ofdm_bpsk_mapper (unsigned int msgq_limit, 
-                         unsigned int occupied_carriers, unsigned int 
fft_length,
-                         const std::vector< std::vector<gr_complex> > 
&known_symbols)
+                         unsigned int occupied_carriers, unsigned int 
fft_length)
 {
-  return gr_ofdm_bpsk_mapper_sptr (new gr_ofdm_bpsk_mapper (msgq_limit, 
occupied_carriers, fft_length, 
-                                                           known_symbols));
+  return gr_ofdm_bpsk_mapper_sptr (new gr_ofdm_bpsk_mapper (msgq_limit, 
occupied_carriers, fft_length));
 }
 
 // Consumes 1 packet and produces as many OFDM symbols of fft_length to hold 
the full packet
 gr_ofdm_bpsk_mapper::gr_ofdm_bpsk_mapper (unsigned int msgq_limit, 
-                                         unsigned int occupied_carriers, 
unsigned int fft_length,
-                                         const std::vector< 
std::vector<gr_complex> > &known_symbols)
+                                         unsigned int occupied_carriers, 
unsigned int fft_length)
   : gr_sync_block ("ofdm_bpsk_mapper",
                   gr_make_io_signature (0, 0, 0),
                   gr_make_io_signature2 (1, 2, sizeof(gr_complex)*fft_length, 
sizeof(char))),
@@ -48,23 +45,18 @@
     d_occupied_carriers(occupied_carriers),
     d_fft_length(fft_length),
     d_bit_offset(0),
-    d_ks_sent(0),
-    d_start_of_packet(false),
-    d_known_symbols(known_symbols)
+    d_pending_flag(0)
 {
-  assert(d_occupied_carriers <= d_fft_length);
-  
-  // Make sure all known symbols are of the proper length
-  for(size_t i=0; i < d_known_symbols.size(); i++) {
-    assert(d_occupied_carriers == d_known_symbols[i].size());
-  }
+  if (!d_occupied_carriers <= d_fft_length)
+    throw std::invalid_argument("gr_ofdm_bpsk_mapper: occupied carriers must 
be <= fft_length");
 }
 
 gr_ofdm_bpsk_mapper::~gr_ofdm_bpsk_mapper(void)
 {
 }
 
-float randombit()
+static float
+randombit()
 {
   int r = rand()&1;
   return (float)(-1 + 2*r);
@@ -91,39 +83,25 @@
     d_msg = d_msgq->delete_head();        // block, waiting for a message
     d_msg_offset = 0;
     d_bit_offset = 0;
-    d_ks_sent = 0;
+    d_pending_flag = 1;                           // new packet, write start 
of packet flag
     
     if((d_msg->length() == 0) && (d_msg->type() == 1)) {
       d_msg.reset();
-      return -1;
+      return -1;               // We're done; no more messages coming.
     }
   }
 
-  if(output_items.size() == 2) {
-    char *sig = (char *)output_items[1];
-    sig[0] = d_start_of_packet;
-  }
+  char *out_flag = 0;
+  if(output_items.size() == 2)
+    out_flag = (char *) output_items[1];
   
+
   // Build a single symbol:
-  d_start_of_packet = false;
   
+
   // Initialize all bins to 0 to set unused carriers
   memset(out, 0, d_fft_length*sizeof(gr_complex));
   
-  if(d_ks_sent < d_known_symbols.size()) {
-    for(i=0; i < d_occupied_carriers; i++) {
-      out[i+zeros_on_left] = d_known_symbols[d_ks_sent][i];
-    }
-    d_ks_sent++;
-
-    if(d_ks_sent == d_known_symbols.size()) {
-      d_start_of_packet = true;
-    }
- 
-    return 1;
-  }
-  
-  
   i = 0;
   while((d_msg_offset < d_msg->length()) && (i < d_occupied_carriers)) {
     unsigned char bit = (d_msg->msg()[d_msg_offset] >> (d_bit_offset)) & 0x01;
@@ -143,13 +121,15 @@
       i++;
     }
 
-    if (d_msg->type() == 1)               // type == 1 sets EOF
+    if (d_msg->type() == 1)            // type == 1 sets EOF
       d_eof = true;
-    d_msg.reset();   // finished packet, free message
- 
+    d_msg.reset();                     // finished packet, free message
     assert(d_bit_offset == 0);
-    return 1;          // produced one symbol
   }
+
+  if (out_flag)
+    out_flag[0] = d_pending_flag;
+  d_pending_flag = 0;
   
   return 1;  // produced symbol
 }

Modified: 
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper.h
===================================================================
--- 
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper.h
    2007-06-05 22:37:05 UTC (rev 5695)
+++ 
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper.h
    2007-06-05 23:18:13 UTC (rev 5696)
@@ -27,18 +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< std::vector<gr_complex> > 
&known_symbols);
+                         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,12 +45,10 @@
 {
   friend gr_ofdm_bpsk_mapper_sptr
   gr_make_ofdm_bpsk_mapper (unsigned msgq_limit, 
-                           unsigned occupied_carriers, unsigned int fft_length,
-                           const std::vector<std::vector<gr_complex> > 
&known_symbols);  
+                           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<std::vector<gr_complex> > 
&known_symbols);
+                      unsigned occupied_carriers, unsigned int fft_length);
 
  private:
   gr_msg_queue_sptr    d_msgq;
@@ -60,12 +56,10 @@
   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_ks_sent;
-  bool d_start_of_packet;
-  std::vector< std::vector<gr_complex> > d_known_symbols;
+  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);

Modified: 
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper.i
===================================================================
--- 
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper.i
    2007-06-05 22:37:05 UTC (rev 5695)
+++ 
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper.i
    2007-06-05 23:18:13 UTC (rev 5696)
@@ -20,23 +20,20 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <vector>
-
 GR_SWIG_BLOCK_MAGIC(gr,ofdm_bpsk_mapper);
 
 gr_ofdm_bpsk_mapper_sptr 
 gr_make_ofdm_bpsk_mapper (unsigned int msgq_limit,
                          unsigned int bits_per_symbol, 
-                         unsigned int fft_length,
-                         const std::vector< std::vector<gr_complex> > 
&known_symbols);
+                         unsigned int fft_length);
 
+
 class gr_ofdm_bpsk_mapper : public gr_sync_block
 {
  protected:
   gr_ofdm_bpsk_mapper (unsigned int msgq_limit,
                       unsigned int bits_per_symbol,
-                      unsigned int fft_length,
-                      const std::vector< std::vector<gr_complex> > 
&known_symbols);
+                      unsigned int fft_length);
 
  public:
   gr_msg_queue_sptr msgq();

Copied: 
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper0.cc
 (from rev 5694, 
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper.cc)
===================================================================
--- 
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper0.cc
                          (rev 0)
+++ 
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper0.cc
  2007-06-05 23:18:13 UTC (rev 5696)
@@ -0,0 +1,157 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2007 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 2, 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gr_ofdm_bpsk_mapper0.h>
+#include <gr_io_signature.h>
+#include <vector>
+
+gr_ofdm_bpsk_mapper0_sptr
+gr_make_ofdm_bpsk_mapper0 (unsigned int msgq_limit, 
+                         unsigned int occupied_carriers, unsigned int 
fft_length,
+                         const std::vector< std::vector<gr_complex> > 
&known_symbols)
+{
+  return gr_ofdm_bpsk_mapper0_sptr (new gr_ofdm_bpsk_mapper0 (msgq_limit, 
occupied_carriers, fft_length, 
+                                                           known_symbols));
+}
+
+// Consumes 1 packet and produces as many OFDM symbols of fft_length to hold 
the full packet
+gr_ofdm_bpsk_mapper0::gr_ofdm_bpsk_mapper0 (unsigned int msgq_limit, 
+                                         unsigned int occupied_carriers, 
unsigned int fft_length,
+                                         const std::vector< 
std::vector<gr_complex> > &known_symbols)
+  : gr_sync_block ("ofdm_bpsk_mapper0",
+                  gr_make_io_signature (0, 0, 0),
+                  gr_make_io_signature2 (1, 2, sizeof(gr_complex)*fft_length, 
sizeof(char))),
+    d_msgq(gr_make_msg_queue(msgq_limit)), d_msg_offset(0), d_eof(false),
+    d_occupied_carriers(occupied_carriers),
+    d_fft_length(fft_length),
+    d_bit_offset(0),
+    d_ks_sent(0),
+    d_start_of_packet(false),
+    d_known_symbols(known_symbols)
+{
+  assert(d_occupied_carriers <= d_fft_length);
+  
+  // Make sure all known symbols are of the proper length
+  for(size_t i=0; i < d_known_symbols.size(); i++) {
+    assert(d_occupied_carriers == d_known_symbols[i].size());
+  }
+}
+
+gr_ofdm_bpsk_mapper0::~gr_ofdm_bpsk_mapper0(void)
+{
+}
+
+static float
+randombit()
+{
+  int r = rand()&1;
+  return (float)(-1 + 2*r);
+}
+
+int
+gr_ofdm_bpsk_mapper0::work(int noutput_items,
+                         gr_vector_const_void_star &input_items,
+                         gr_vector_void_star &output_items)
+{
+  gr_complex *out = (gr_complex *)output_items[0];
+  
+  unsigned int i=0;
+  unsigned int unoccupied_carriers = d_fft_length - d_occupied_carriers;
+  unsigned int zeros_on_left = (unsigned)ceil(unoccupied_carriers/2.0);
+
+  //printf("OFDM BPSK Mapper0:  ninput_items: %d   noutput_items: %d\n", 
ninput_items[0], noutput_items);
+
+  if(d_eof) {
+    return -1;
+  }
+  
+  if(!d_msg) {
+    d_msg = d_msgq->delete_head();        // block, waiting for a message
+    d_msg_offset = 0;
+    d_bit_offset = 0;
+    d_ks_sent = 0;
+    
+    if((d_msg->length() == 0) && (d_msg->type() == 1)) {
+      d_msg.reset();
+      return -1;
+    }
+  }
+
+  if(output_items.size() == 2) {
+    char *sig = (char *)output_items[1];
+    sig[0] = d_start_of_packet;
+  }
+  
+  // Build a single symbol:
+  d_start_of_packet = false;
+  
+  // Initialize all bins to 0 to set unused carriers
+  memset(out, 0, d_fft_length*sizeof(gr_complex));
+  
+  if(d_ks_sent < d_known_symbols.size()) {
+    for(i=0; i < d_occupied_carriers; i++) {
+      out[i+zeros_on_left] = d_known_symbols[d_ks_sent][i];
+    }
+    d_ks_sent++;
+
+    if(d_ks_sent == d_known_symbols.size()) {
+      d_start_of_packet = true;
+    }
+ 
+    return 1;
+  }
+  
+  
+  i = 0;
+  while((d_msg_offset < d_msg->length()) && (i < d_occupied_carriers)) {
+    unsigned char bit = (d_msg->msg()[d_msg_offset] >> (d_bit_offset)) & 0x01;
+    out[i + zeros_on_left] = gr_complex(-1+2*(bit));
+    i++;
+    d_bit_offset++;
+    if(d_bit_offset == 8) {
+      d_bit_offset = 0;
+      d_msg_offset++;
+    }
+  }
+
+  // Ran out of data to put in symbol
+  if (d_msg_offset == d_msg->length()) {
+    while(i < d_occupied_carriers) {   // finish filling out the symbol
+      out[i + zeros_on_left] = gr_complex(randombit(),0);
+      i++;
+    }
+
+    if (d_msg->type() == 1)               // type == 1 sets EOF
+      d_eof = true;
+    d_msg.reset();   // finished packet, free message
+ 
+    assert(d_bit_offset == 0);
+    return 1;          // produced one symbol
+  }
+  
+  return 1;  // produced symbol
+}
+

Copied: 
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper0.h
 (from rev 5694, 
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper.h)
===================================================================
--- 
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper0.h
                           (rev 0)
+++ 
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper0.h
   2007-06-05 23:18:13 UTC (rev 5696)
@@ -0,0 +1,82 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2007 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 2, 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_GR_OFDM_BPSK_MAPPER0_H
+#define INCLUDED_GR_OFDM_BPSK_MAPPER0_H
+
+
+#include <gr_sync_block.h>
+#include <gr_message.h>
+#include <gr_msg_queue.h>
+#include <vector>
+
+class gr_ofdm_bpsk_mapper0;
+typedef boost::shared_ptr<gr_ofdm_bpsk_mapper0> gr_ofdm_bpsk_mapper0_sptr;
+
+gr_ofdm_bpsk_mapper0_sptr 
+gr_make_ofdm_bpsk_mapper0 (unsigned msgq_limit, 
+                         unsigned occupied_carriers, unsigned int fft_length,
+                         const std::vector< std::vector<gr_complex> > 
&known_symbols);
+
+/*!
+ * \brief take a stream of bytes in and map to a vector of complex
+ * constellation points suitable for IFFT input to be used in an ofdm
+ * modulator.  Simple BPSK version.
+ */
+
+class gr_ofdm_bpsk_mapper0 : public gr_sync_block
+{
+  friend gr_ofdm_bpsk_mapper0_sptr
+  gr_make_ofdm_bpsk_mapper0 (unsigned msgq_limit, 
+                           unsigned occupied_carriers, unsigned int fft_length,
+                           const std::vector<std::vector<gr_complex> > 
&known_symbols);  
+ protected:
+  gr_ofdm_bpsk_mapper0 (unsigned msgq_limit, 
+                      unsigned occupied_carriers, unsigned int fft_length,
+                      const std::vector<std::vector<gr_complex> > 
&known_symbols);
+
+ 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_ks_sent;
+  bool d_start_of_packet;
+  std::vector< std::vector<gr_complex> > d_known_symbols;
+
+ public:
+  ~gr_ofdm_bpsk_mapper0(void);
+
+  gr_msg_queue_sptr    msgq() const { return d_msgq; }
+
+  int work(int noutput_items,
+          gr_vector_const_void_star &input_items,
+          gr_vector_void_star &output_items);
+
+};
+
+
+#endif

Copied: 
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper0.i
 (from rev 5694, 
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper.i)
===================================================================
--- 
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper0.i
                           (rev 0)
+++ 
gnuradio/branches/features/ofdm/sync/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper0.i
   2007-06-05 23:18:13 UTC (rev 5696)
@@ -0,0 +1,45 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2007 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 2, 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.
+ */
+
+GR_SWIG_BLOCK_MAGIC(gr,ofdm_bpsk_mapper0);
+
+gr_ofdm_bpsk_mapper0_sptr 
+gr_make_ofdm_bpsk_mapper0 (unsigned int msgq_limit,
+                         unsigned int bits_per_symbol, 
+                         unsigned int fft_length,
+                         const std::vector< std::vector<gr_complex> > 
&known_symbols);
+
+class gr_ofdm_bpsk_mapper0 : public gr_sync_block
+{
+ protected:
+  gr_ofdm_bpsk_mapper0 (unsigned int msgq_limit,
+                      unsigned int bits_per_symbol,
+                      unsigned int fft_length,
+                      const std::vector< std::vector<gr_complex> > 
&known_symbols);
+
+ public:
+  gr_msg_queue_sptr msgq();
+
+  int work(int noutput_items,
+          gr_vector_const_void_star &input_items,
+          gr_vector_void_star &output_items);
+};





reply via email to

[Prev in Thread] Current Thread [Next in Thread]