merge ordm/receiver branch -r5574:5659. Reworks OFDM receiver with refactored OFDM blocks. A few bug fixes for other blocks have also been slipped in.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@5661 221aa14e-8319-0410-a670-987f0aec2ac5

5 files changed, 23 insertions, 23 deletions

diff --git a/gnuradio-core/src/lib/gengen/Makefile.gen b/gnuradio-core/src/lib/gengen/Makefile.gen
index ceb8692b4..238622bdd 100644
--- a/gnuradio-core/src/lib/gengen/Makefile.gen
+++ b/gnuradio-core/src/lib/gengen/Makefile.gen
@@ -62,9 +62,9 @@ GENERATED_H = \
 	gr_packed_to_unpacked_bb.h \
 	gr_packed_to_unpacked_ii.h \
 	gr_packed_to_unpacked_ss.h \
-	gr_peak_detector_ff.h \
-	gr_peak_detector_ii.h \
-	gr_peak_detector_ss.h \
+	gr_peak_detector_fb.h \
+	gr_peak_detector_ib.h \
+	gr_peak_detector_sb.h \
 	gr_sample_and_hold_bb.h \
 	gr_sample_and_hold_ff.h \
 	gr_sample_and_hold_ii.h \
@@ -152,9 +152,9 @@ GENERATED_I = \
 	gr_packed_to_unpacked_bb.i \
 	gr_packed_to_unpacked_ii.i \
 	gr_packed_to_unpacked_ss.i \
-	gr_peak_detector_ff.i \
-	gr_peak_detector_ii.i \
-	gr_peak_detector_ss.i \
+	gr_peak_detector_fb.i \
+	gr_peak_detector_ib.i \
+	gr_peak_detector_sb.i \
 	gr_sample_and_hold_bb.i \
 	gr_sample_and_hold_ff.i \
 	gr_sample_and_hold_ii.i \
@@ -242,9 +242,9 @@ GENERATED_CC = \
 	gr_packed_to_unpacked_bb.cc \
 	gr_packed_to_unpacked_ii.cc \
 	gr_packed_to_unpacked_ss.cc \
-	gr_peak_detector_ff.cc \
-	gr_peak_detector_ii.cc \
-	gr_peak_detector_ss.cc \
+	gr_peak_detector_fb.cc \
+	gr_peak_detector_ib.cc \
+	gr_peak_detector_sb.cc \
 	gr_sample_and_hold_bb.cc \
 	gr_sample_and_hold_ff.cc \
 	gr_sample_and_hold_ii.cc \
diff --git a/gnuradio-core/src/lib/gengen/generate_common.py b/gnuradio-core/src/lib/gengen/generate_common.py
index aaf15f04a..c049438a2 100755
--- a/gnuradio-core/src/lib/gengen/generate_common.py
+++ b/gnuradio-core/src/lib/gengen/generate_common.py
@@ -59,9 +59,9 @@ others = (
     ('gr_unpacked_to_packed_XX',    ('bb','ss','ii')),
     ('gr_packed_to_unpacked_XX',    ('bb','ss','ii')),
     ('gr_sample_and_hold_XX',       ('bb','ss','ii','ff')),
-    ('gr_peak_detector_XX',         ('ff','ii','ss')),
     ('gr_argmax_XX',                ('fs','is','ss')),
     ('gr_max_XX',                   ('ff','ii','ss')),
+    ('gr_peak_detector_XX',         ('fb','ib','sb'))
     )
 
 
diff --git a/gnuradio-core/src/lib/gengen/gengen_generated.i b/gnuradio-core/src/lib/gengen/gengen_generated.i
index bab1f03e6..26dd3f41a 100644
--- a/gnuradio-core/src/lib/gengen/gengen_generated.i
+++ b/gnuradio-core/src/lib/gengen/gengen_generated.i
@@ -62,9 +62,9 @@
 #include <gr_packed_to_unpacked_bb.h>
 #include <gr_packed_to_unpacked_ii.h>
 #include <gr_packed_to_unpacked_ss.h>
-#include <gr_peak_detector_ff.h>
-#include <gr_peak_detector_ii.h>
-#include <gr_peak_detector_ss.h>
+#include <gr_peak_detector_fb.h>
+#include <gr_peak_detector_ib.h>
+#include <gr_peak_detector_sb.h>
 #include <gr_sample_and_hold_bb.h>
 #include <gr_sample_and_hold_ff.h>
 #include <gr_sample_and_hold_ii.h>
@@ -152,9 +152,9 @@
 %include <gr_packed_to_unpacked_bb.i>
 %include <gr_packed_to_unpacked_ii.i>
 %include <gr_packed_to_unpacked_ss.i>
-%include <gr_peak_detector_ff.i>
-%include <gr_peak_detector_ii.i>
-%include <gr_peak_detector_ss.i>
+%include <gr_peak_detector_fb.i>
+%include <gr_peak_detector_ib.i>
+%include <gr_peak_detector_sb.i>
 %include <gr_sample_and_hold_bb.i>
 %include <gr_sample_and_hold_ff.i>
 %include <gr_sample_and_hold_ii.i>
diff --git a/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t b/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t
index 812ec9fd2..19a5b98aa 100644
--- a/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t
+++ b/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t
@@ -44,7 +44,7 @@ gr_make_@BASE_NAME@ (float threshold_factor_rise,
 		int look_ahead, float alpha)
   : gr_sync_block ("@BASE_NAME@",
 		   gr_make_io_signature (1, 1, sizeof (@I_TYPE@)),
-		   gr_make_io_signature (1, 1, sizeof (@O_TYPE@))),
+		   gr_make_io_signature (1, 1, sizeof (char))),
     d_threshold_factor_rise(threshold_factor_rise), 
     d_threshold_factor_fall(threshold_factor_fall),
     d_look_ahead(look_ahead), d_avg_alpha(alpha), d_avg(0), d_found(0)
@@ -57,9 +57,9 @@ int
 	      gr_vector_void_star &output_items)
 {
   @I_TYPE@ *iptr = (@I_TYPE@ *) input_items[0];
-  @O_TYPE@ *optr = (@O_TYPE@ *) output_items[0];
+  char *optr = (char *) output_items[0];
 
-  memset(optr, 0, noutput_items*sizeof(@O_TYPE@));
+  memset(optr, 0, noutput_items*sizeof(char));
 
   @I_TYPE@ peak_val = -(@I_TYPE@)INFINITY;
   int peak_ind = 0;
@@ -90,7 +90,7 @@ int
 	i++;
       }
       else {
-	optr[peak_ind] = (@O_TYPE@)1;
+	optr[peak_ind] = 1;
 	state = 0;
 	peak_val = -(@I_TYPE@)INFINITY;
 	//printf("Leaving  State 1: Peak: %f  Peak Ind: %d   i: %d  noutput_items: %d\n", 
diff --git a/gnuradio-core/src/lib/gengen/gr_sample_and_hold_XX.cc.t b/gnuradio-core/src/lib/gengen/gr_sample_and_hold_XX.cc.t
index 3b9715575..3f2c5f6f1 100644
--- a/gnuradio-core/src/lib/gengen/gr_sample_and_hold_XX.cc.t
+++ b/gnuradio-core/src/lib/gengen/gr_sample_and_hold_XX.cc.t
@@ -37,7 +37,7 @@ gr_make_@BASE_NAME@ ()
 
 @NAME@::@NAME@ ()
   : gr_sync_block ("@BASE_NAME@",
-		   gr_make_io_signature (2, 2, sizeof (@I_TYPE@)),
+		   gr_make_io_signature2 (2, 2, sizeof (@I_TYPE@), sizeof(char)),
 		   gr_make_io_signature (1, 1, sizeof (@O_TYPE@))),
     d_data(0)
 {
@@ -49,11 +49,11 @@ int
 		   gr_vector_void_star &output_items)
 {
   @I_TYPE@ *iptr = (@I_TYPE@ *) input_items[0];
-  @I_TYPE@ *ctrl = (@I_TYPE@ *) input_items[1];
+  const char *ctrl = (const char *) input_items[1];
   @O_TYPE@ *optr = (@O_TYPE@ *) output_items[0];
 
   for (int i = 0; i < noutput_items; i++){
-    if(ctrl[i] > 0.5) {
+    if(ctrl[i]) {
       d_data = iptr[i];
     }
     optr[i] = d_data;