[Commit-gnuradio] r7991 - gnuradio/branches/developers/trondeau/ofdm/gnuradio-core/src/lib/general

[trondeau]

Author: trondeau
Date: 2008-03-11 16:19:55 -0600 (Tue, 11 Mar 2008)
New Revision: 7991

Modified:
   
gnuradio/branches/developers/trondeau/ofdm/gnuradio-core/src/lib/general/gr_ofdm_mapper_bcv.cc
Log:
cleaning up and getting rid of a couple of warnings.

Modified: 
gnuradio/branches/developers/trondeau/ofdm/gnuradio-core/src/lib/general/gr_ofdm_mapper_bcv.cc
===================================================================
--- 
gnuradio/branches/developers/trondeau/ofdm/gnuradio-core/src/lib/general/gr_ofdm_mapper_bcv.cc
      2008-03-11 22:14:02 UTC (rev 7990)
+++ 
gnuradio/branches/developers/trondeau/ofdm/gnuradio-core/src/lib/general/gr_ofdm_mapper_bcv.cc
      2008-03-11 22:19:55 UTC (rev 7991)
@@ -76,7 +76,7 @@
   // residual nulls (if odd) will be packed on the right. 
   diff = (d_fft_length/4 - carriers.length())/2; 
 
-  int i,j,k;
+  unsigned int i,j,k;
   for(i = 0; i < carriers.length(); i++) {
     char c = carriers[i];                            // get the current hex 
character from the string
     for(j = 0; j < 4; j++) {                        // walk through all four 
bits
@@ -112,8 +112,6 @@
   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 Mapper:  ninput_items: %d   noutput_items: %d\n", 
ninput_items[0], noutput_items);
 
@@ -157,7 +155,6 @@
       d_resid |= (((1 << d_nresid)-1) & d_msgbytes) << (d_nbits - d_nresid);
       bits = d_resid;
 
-      //out[i + zeros_on_left] = d_constellation[bits];
       out[d_subcarrier_map[i]] = d_constellation[bits];
       i++;
 
@@ -172,15 +169,8 @@
        bits = ((1 << d_nbits)-1) & (d_msgbytes >> d_bit_offset);
        d_bit_offset += d_nbits;
        
-       //out[i + zeros_on_left] = d_constellation[bits];
        out[d_subcarrier_map[i]] = d_constellation[bits];
        i++;
-       
-       /*
-       printf("mod bit: %x  out: %.4f + j%.4f    resid: %x   nresid: %d    
bit_offset: %d\n", 
-              bits, out[i-1 + zeros_on_left].real(), out[i-1 + 
zeros_on_left].imag(), 
-              d_resid, d_nresid, d_bit_offset);
-       */
       }
       else {
        unsigned int extra = 8-d_bit_offset;
@@ -208,7 +198,6 @@
 
     //while(i < d_occupied_carriers) {   // finish filling out the symbol
     while(i < d_subcarrier_map.size()) {   // finish filling out the symbol
-      //out[i + zeros_on_left] = d_constellation[randsym()];
       out[d_subcarrier_map[i]] = d_constellation[randsym()];
 
       i++;