diff options
| author | Tom Rondeau | 2012-02-06 10:32:18 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2012-02-13 14:56:39 -0500 |
| commit | fb2a84add9706a046b4761021707d6bb97496a2e (patch) | |
| tree | d5c2f222428f382c080629ffe48caedc28c72c24 /gnuradio-core/src/lib/gengen | |
| parent | 298623615b249de459cd12b5507dab921fc3210b (diff) | |
| download | gnuradio-fb2a84add9706a046b4761021707d6bb97496a2e.tar.gz gnuradio-fb2a84add9706a046b4761021707d6bb97496a2e.tar.bz2 gnuradio-fb2a84add9706a046b4761021707d6bb97496a2e.zip | |
core: added volk version of add_ff.
Diffstat (limited to 'gnuradio-core/src/lib/gengen')
| -rw-r--r-- | gnuradio-core/src/lib/gengen/.gitignore | 3 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/gengen/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | gnuradio-core/src/lib/gengen/generate_common.py | 4 |
3 files changed, 3 insertions, 6 deletions
diff --git a/gnuradio-core/src/lib/gengen/.gitignore b/gnuradio-core/src/lib/gengen/.gitignore index 72c915cb8..b91d2f197 100644 --- a/gnuradio-core/src/lib/gengen/.gitignore +++ b/gnuradio-core/src/lib/gengen/.gitignore @@ -124,9 +124,6 @@ /gr_add_const_vss.cc /gr_add_const_vss.h /gr_add_const_vss.i -/gr_add_ff.cc -/gr_add_ff.h -/gr_add_ff.i /gr_add_ii.cc /gr_add_ii.h /gr_add_ii.i diff --git a/gnuradio-core/src/lib/gengen/CMakeLists.txt b/gnuradio-core/src/lib/gengen/CMakeLists.txt index c3c4a7a35..98b149e97 100644 --- a/gnuradio-core/src/lib/gengen/CMakeLists.txt +++ b/gnuradio-core/src/lib/gengen/CMakeLists.txt @@ -87,7 +87,7 @@ expand_h_cc_i(gr_sig_source_X s i f c) 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_add_XX ss ii cc) expand_h_cc_i(gr_sub_XX ss ii ff cc) expand_h_cc_i(gr_multiply_XX ss ii) expand_h_cc_i(gr_divide_XX 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 0c3d4579d..616cc4b06 100755 --- a/gnuradio-core/src/lib/gengen/generate_common.py +++ b/gnuradio-core/src/lib/gengen/generate_common.py @@ -41,7 +41,6 @@ reg_signatures = ['ss', 'ii', 'ff', 'cc'] reg_roots = [ 'gr_add_const_XX', - 'gr_add_XX', 'gr_sub_XX', 'gr_divide_XX', 'gr_mute_XX', @@ -66,7 +65,8 @@ others = ( ('gr_max_XX', ('ff','ii','ss')), ('gr_peak_detector_XX', ('fb','ib','sb')), ('gr_multiply_XX', ('ss','ii')), - ('gr_multiply_const_XX', ('ss','ii')) + ('gr_multiply_const_XX', ('ss','ii')), + ('gr_add_XX', ('ss','cc')) ) |