[Commit-gnuradio] r9498 - gnuradio/branches/developers/trondeau/warnings/gnuradio-core/src/lib/general

[trondeau]

Author: trondeau
Date: 2008-09-04 16:51:15 -0600 (Thu, 04 Sep 2008)
New Revision: 9498

Modified:
   
gnuradio/branches/developers/trondeau/warnings/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.cc
   
gnuradio/branches/developers/trondeau/warnings/gnuradio-core/src/lib/general/gr_ofdm_mapper_bcv.cc
Log:
fixing subcarrier distribution

Modified: 
gnuradio/branches/developers/trondeau/warnings/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.cc
===================================================================
--- 
gnuradio/branches/developers/trondeau/warnings/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.cc
  2008-09-04 06:36:40 UTC (rev 9497)
+++ 
gnuradio/branches/developers/trondeau/warnings/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.cc
  2008-09-04 22:51:15 UTC (rev 9498)
@@ -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/branches/developers/trondeau/warnings/gnuradio-core/src/lib/general/gr_ofdm_mapper_bcv.cc
===================================================================
--- 
gnuradio/branches/developers/trondeau/warnings/gnuradio-core/src/lib/general/gr_ofdm_mapper_bcv.cc
  2008-09-04 06:36:40 UTC (rev 9497)
+++ 
gnuradio/branches/developers/trondeau/warnings/gnuradio-core/src/lib/general/gr_ofdm_mapper_bcv.cc
  2008-09-04 22:51:15 UTC (rev 9498)
@@ -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);
   }