diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-02-04 11:05:25 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-02-13 14:56:39 -0500 |
| commit | 47c390286d49e00498a3443a3dcb9f83d11c7ecc (patch) | |
| tree | f5379c23b2ae1735bac9ea361ef202e01aba59da /gnuradio-core/src/lib/gengen | |
| parent | f028a198cb47e0486ad41a29bd3b3dcf0663d766 (diff) | |
core: new multiply_const_ff and multiply_ff blocks done using Volk.
Diffstat (limited to 'gnuradio-core/src/lib/gengen')
| -rw-r--r-- | gnuradio-core/src/lib/gengen/.gitignore | 6 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/gengen/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | gnuradio-core/src/lib/gengen/generate_common.py | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/gnuradio-core/src/lib/gengen/.gitignore b/gnuradio-core/src/lib/gengen/.gitignore index 4422ae0dd2..72c915cb81 100644 --- a/gnuradio-core/src/lib/gengen/.gitignore +++ b/gnuradio-core/src/lib/gengen/.gitignore @@ -202,9 +202,6 @@ /gr_max_ss.cc /gr_max_ss.h /gr_max_ss.i -/gr_multiply_const_ff.cc -/gr_multiply_const_ff.h -/gr_multiply_const_ff.i /gr_multiply_const_ii.cc /gr_multiply_const_ii.h /gr_multiply_const_ii.i @@ -223,9 +220,6 @@ /gr_multiply_const_vss.cc /gr_multiply_const_vss.h /gr_multiply_const_vss.i -/gr_multiply_ff.cc -/gr_multiply_ff.h -/gr_multiply_ff.i /gr_multiply_ii.cc /gr_multiply_ii.h /gr_multiply_ii.i diff --git a/gnuradio-core/src/lib/gengen/CMakeLists.txt b/gnuradio-core/src/lib/gengen/CMakeLists.txt index 83213dc04d..c3c4a7a359 100644 --- a/gnuradio-core/src/lib/gengen/CMakeLists.txt +++ b/gnuradio-core/src/lib/gengen/CMakeLists.txt @@ -89,7 +89,7 @@ expand_h_cc_i(gr_add_const_XX ss ii ff cc sf) expand_h_cc_i(gr_multiply_const_XX ss ii) expand_h_cc_i(gr_add_XX ss ii ff cc) expand_h_cc_i(gr_sub_XX ss ii ff cc) -expand_h_cc_i(gr_multiply_XX ss ii ff) +expand_h_cc_i(gr_multiply_XX ss ii) expand_h_cc_i(gr_divide_XX ss ii ff cc) expand_h_cc_i(gr_mute_XX ss ii ff cc) expand_h_cc_i(gr_add_const_vXX ss ii ff cc) diff --git a/gnuradio-core/src/lib/gengen/generate_common.py b/gnuradio-core/src/lib/gengen/generate_common.py index 5caa7098b3..0c3d4579db 100755 --- a/gnuradio-core/src/lib/gengen/generate_common.py +++ b/gnuradio-core/src/lib/gengen/generate_common.py @@ -65,7 +65,7 @@ others = ( ('gr_argmax_XX', ('fs','is','ss')), ('gr_max_XX', ('ff','ii','ss')), ('gr_peak_detector_XX', ('fb','ib','sb')), - ('gr_multiply_XX', ('ss','ii','ff')), + ('gr_multiply_XX', ('ss','ii')), ('gr_multiply_const_XX', ('ss','ii')) ) |