[Commit-gnuradio] r7195 - gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/general

[trondeau]

Author: trondeau
Date: 2007-12-15 10:26:44 -0700 (Sat, 15 Dec 2007)
New Revision: 7195

Modified:
   
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.cc
Log:
fixed output of frame sink to get derotated symbols out

Modified: 
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.cc
===================================================================
--- 
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.cc
     2007-12-15 07:46:10 UTC (rev 7194)
+++ 
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.cc
     2007-12-15 17:26:44 UTC (rev 7195)
@@ -117,13 +117,14 @@
       gr_complex sigrot = in[i]*carrier*d_dfe[i];
       
       if(d_derotated_output != NULL){
-       *d_derotated_output = sigrot;
-
+       //*d_derotated_output = sigrot;
+       d_derotated_output[i] = sigrot;
+       
        if (VERBOSE)
          fprintf(stderr, "Sigrot: %.4f + j%.4f  => output: %.4f + j%.4f\n",
               sigrot.real(), sigrot.imag(), (*d_derotated_output).real(), 
(*d_derotated_output).imag());
 
-       d_derotated_output++;
+       //d_derotated_output++;
       }
       
       //fprintf(stderr, "%f+j%f  = %d\n", sigrot.real(), sigrot.imag(), 
slicer(in[i])); 
@@ -196,7 +197,7 @@
                                       float phase_gain, float freq_gain)
   : gr_sync_block ("ofdm_frame_sink",
                   gr_make_io_signature2 (2, 2, 
sizeof(gr_complex)*occupied_carriers, sizeof(char)),
-                  gr_make_io_signature (1, 1, sizeof(gr_complex))),
+                  gr_make_io_signature (1, 1, 
sizeof(gr_complex)*occupied_carriers)),
     d_target_queue(target_queue), d_occupied_carriers(occupied_carriers), 
     d_byte_offset(0), d_partial_byte(0),
     d_resid(0), 
d_nresid(0),d_phase(0),d_freq(0),d_phase_gain(phase_gain),d_freq_gain(freq_gain),
@@ -350,6 +351,6 @@
     assert(0);
     
   } // switch
-  
+
   return 1;
 }