[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r5585 - gnuradio/branches/features/ofdm/receiver/gnura
From: |
trondeau |
Subject: |
[Commit-gnuradio] r5585 - gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/lib/gengen |
Date: |
Fri, 1 Jun 2007 10:23:41 -0600 (MDT) |
Author: trondeau
Date: 2007-06-01 10:23:40 -0600 (Fri, 01 Jun 2007)
New Revision: 5585
Modified:
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/lib/gengen/Makefile.gen
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/lib/gengen/generate_common.py
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/lib/gengen/gengen_generated.i
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/lib/gengen/gr_sample_and_hold_XX.cc.t
Log:
changing functions to use char input to signalling lines
Modified:
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/lib/gengen/Makefile.gen
===================================================================
---
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/lib/gengen/Makefile.gen
2007-06-01 15:02:25 UTC (rev 5584)
+++
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/lib/gengen/Makefile.gen
2007-06-01 16:23:40 UTC (rev 5585)
@@ -56,9 +56,9 @@
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 \
@@ -140,9 +140,9 @@
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 \
@@ -224,9 +224,9 @@
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 \
Modified:
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/lib/gengen/generate_common.py
===================================================================
---
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/lib/gengen/generate_common.py
2007-06-01 15:02:25 UTC (rev 5584)
+++
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/lib/gengen/generate_common.py
2007-06-01 16:23:40 UTC (rev 5585)
@@ -59,7 +59,7 @@
('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_peak_detector_XX', ('fb','ib','sb'))
)
Modified:
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/lib/gengen/gengen_generated.i
===================================================================
---
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/lib/gengen/gengen_generated.i
2007-06-01 15:02:25 UTC (rev 5584)
+++
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/lib/gengen/gengen_generated.i
2007-06-01 16:23:40 UTC (rev 5585)
@@ -56,9 +56,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>
@@ -140,9 +140,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>
Modified:
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t
===================================================================
---
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t
2007-06-01 15:02:25 UTC (rev 5584)
+++
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t
2007-06-01 16:23:40 UTC (rev 5585)
@@ -44,7 +44,7 @@
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 @@
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 @@
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",
Modified:
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/lib/gengen/gr_sample_and_hold_XX.cc.t
===================================================================
---
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/lib/gengen/gr_sample_and_hold_XX.cc.t
2007-06-01 15:02:25 UTC (rev 5584)
+++
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/lib/gengen/gr_sample_and_hold_XX.cc.t
2007-06-01 16:23:40 UTC (rev 5585)
@@ -37,7 +37,7 @@
@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 @@
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;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r5585 - gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/lib/gengen,
trondeau <=