[Commit-gnuradio] r9531 - gnuradio/trunk/gnuradio-core/src/lib/general

[trondeau]

Author: trondeau
Date: 2008-09-07 21:43:36 -0600 (Sun, 07 Sep 2008)
New Revision: 9531

Removed:
   gnuradio/trunk/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper.cc
   gnuradio/trunk/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper.h
   gnuradio/trunk/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper.i
   gnuradio/trunk/gnuradio-core/src/lib/general/gr_ofdm_qam_mapper.cc
   gnuradio/trunk/gnuradio-core/src/lib/general/gr_ofdm_qam_mapper.h
   gnuradio/trunk/gnuradio-core/src/lib/general/gr_ofdm_qam_mapper.i
   gnuradio/trunk/gnuradio-core/src/lib/general/gr_ofdm_qpsk_mapper.cc
   gnuradio/trunk/gnuradio-core/src/lib/general/gr_ofdm_qpsk_mapper.h
   gnuradio/trunk/gnuradio-core/src/lib/general/gr_ofdm_qpsk_mapper.i
Modified:
   gnuradio/trunk/gnuradio-core/src/lib/general/Makefile.am
   gnuradio/trunk/gnuradio-core/src/lib/general/general.i
   gnuradio/trunk/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.cc
   gnuradio/trunk/gnuradio-core/src/lib/general/gr_ofdm_mapper_bcv.cc
Log:
merging branch -r9485:9498 to fix some warnings. This merge removes some of the 
old OFDM mappers that were specific to BPSK, QPSK, and QAM constellations. 
These were never really used and should not be.

Modified: gnuradio/trunk/gnuradio-core/src/lib/general/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/general/Makefile.am    2008-09-08 
02:47:20 UTC (rev 9530)
+++ gnuradio/trunk/gnuradio-core/src/lib/general/Makefile.am    2008-09-08 
03:43:36 UTC (rev 9531)
@@ -105,10 +105,6 @@
         gr_ofdm_cyclic_prefixer.cc      \
         gr_ofdm_demapper_vcb.cc         \
         gr_ofdm_mapper_bcv.cc           \
-        gr_ofdm_bpsk_demapper.cc        \
-        gr_ofdm_bpsk_mapper.cc          \
-        gr_ofdm_qpsk_mapper.cc          \
-        gr_ofdm_qam_mapper.cc          \
        gr_ofdm_frame_sink.cc           \
        gr_ofdm_insert_preamble.cc      \
         gr_ofdm_sampler.cc              \
@@ -255,10 +251,6 @@
         gr_ofdm_cyclic_prefixer.h       \
         gr_ofdm_demapper_vcb.h          \
         gr_ofdm_mapper_bcv.h            \
-        gr_ofdm_bpsk_mapper.h           \
-        gr_ofdm_qpsk_mapper.h          \
-        gr_ofdm_qam_mapper.h           \
-        gr_ofdm_bpsk_demapper.h         \
         gr_ofdm_frame_sink.h           \
        gr_ofdm_insert_preamble.h       \
        gr_ofdm_sampler.h               \
@@ -408,10 +400,6 @@
         gr_ofdm_cyclic_prefixer.i       \
         gr_ofdm_demapper_vcb.i          \
         gr_ofdm_mapper_bcv.i            \
-        gr_ofdm_bpsk_demapper.i         \
-        gr_ofdm_bpsk_mapper.i           \
-        gr_ofdm_qpsk_mapper.i          \
-        gr_ofdm_qam_mapper.i           \
         gr_ofdm_frame_sink.i           \
        gr_ofdm_insert_preamble.i       \
        gr_ofdm_sampler.i               \

Modified: gnuradio/trunk/gnuradio-core/src/lib/general/general.i
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/general/general.i      2008-09-08 
02:47:20 UTC (rev 9530)
+++ gnuradio/trunk/gnuradio-core/src/lib/general/general.i      2008-09-08 
03:43:36 UTC (rev 9531)
@@ -95,11 +95,7 @@
 #include <gr_probe_signal_f.h>
 #include <gr_ofdm_frame_acquisition.h>
 #include <gr_ofdm_cyclic_prefixer.h>
-#include <gr_ofdm_bpsk_demapper.h>
 #include <gr_ofdm_mapper_bcv.h>
-#include <gr_ofdm_bpsk_mapper.h>
-#include <gr_ofdm_qpsk_mapper.h>
-#include <gr_ofdm_qam_mapper.h>
 #include <gr_ofdm_frame_sink.h>
 #include <gr_ofdm_insert_preamble.h>
 #include <gr_ofdm_sampler.h>
@@ -208,11 +204,7 @@
 %include "gr_probe_signal_f.i"
 %include "gr_ofdm_frame_acquisition.i"
 %include "gr_ofdm_cyclic_prefixer.i"
-%include "gr_ofdm_bpsk_demapper.i"
 %include "gr_ofdm_mapper_bcv.i"
-%include "gr_ofdm_bpsk_mapper.i"
-%include "gr_ofdm_qpsk_mapper.i"
-%include "gr_ofdm_qam_mapper.i"
 %include "gr_ofdm_frame_sink.i"
 %include "gr_ofdm_insert_preamble.i"
 %include "gr_ofdm_sampler.i"

Deleted: gnuradio/trunk/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper.cc

Deleted: gnuradio/trunk/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper.h

Deleted: gnuradio/trunk/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper.i

Modified: gnuradio/trunk/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.cc
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.cc  
2008-09-08 02:47:20 UTC (rev 9530)
+++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.cc  
2008-09-08 03:43:36 UTC (rev 9531)
@@ -227,11 +227,11 @@
     char c[2] = {0,0};
 
     diff_left = (int)ceil((float)diff/2.0f);  // number of carriers to put on 
the left side
-    c[0] = abc[((1 << diff_left) - 1)];       // convert to bits and move to 
ASCI integer
+    c[0] = abc[(1 << diff_left) - 1];         // convert to bits and move to 
ASCI integer
     carriers.insert(0, c);
     
     diff_right = diff - diff_left;           // number of carriers to put on 
the right side
-    c[0] = abc[(0xF^(1 << diff_left) - 1)];   // convert to bits and move to 
ASCI integer
+    c[0] = abc[0xF^((1 << diff_right) - 1)];  // convert to bits and move to 
ASCI integer
     carriers.insert(carriers.length(), c);
   }
 

Modified: gnuradio/trunk/gnuradio-core/src/lib/general/gr_ofdm_mapper_bcv.cc
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_ofdm_mapper_bcv.cc  
2008-09-08 02:47:20 UTC (rev 9530)
+++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_ofdm_mapper_bcv.cc  
2008-09-08 03:43:36 UTC (rev 9531)
@@ -84,11 +84,11 @@
     char c[2] = {0,0};
 
     diff_left = (int)ceil((float)diff/2.0f);   // number of carriers to put on 
the left side
-    c[0] = abc[((1 << diff_left) - 1)];        // convert to bits and move to 
ASCI integer
+    c[0] = abc[(1 << diff_left) - 1];          // convert to bits and move to 
ASCI integer
     carriers.insert(0, c);
     
     diff_right = diff - diff_left;            // number of carriers to put on 
the right side
-    c[0] = abc[(0xF^(1 << diff_left) - 1)];    // convert to bits and move to 
ASCI integer
+    c[0] = abc[0xF^((1 << diff_right) - 1)];   // convert to bits and move to 
ASCI integer
         carriers.insert(carriers.length(), c);
   }
   

Deleted: gnuradio/trunk/gnuradio-core/src/lib/general/gr_ofdm_qam_mapper.cc

Deleted: gnuradio/trunk/gnuradio-core/src/lib/general/gr_ofdm_qam_mapper.h

Deleted: gnuradio/trunk/gnuradio-core/src/lib/general/gr_ofdm_qam_mapper.i

Deleted: gnuradio/trunk/gnuradio-core/src/lib/general/gr_ofdm_qpsk_mapper.cc

Deleted: gnuradio/trunk/gnuradio-core/src/lib/general/gr_ofdm_qpsk_mapper.h

Deleted: gnuradio/trunk/gnuradio-core/src/lib/general/gr_ofdm_qpsk_mapper.i