diff options
| author | Johnathan Corgan | 2012-03-13 17:38:12 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2012-03-13 17:38:12 -0700 |
| commit | 62c6323bdb06d7d3f103d3a75265d45ae6ce00b4 (patch) | |
| tree | 7f995aba5eb3f2e0bfeac3a4114307fd2c5a6f3a /gnuradio-core/src/lib/gengen/generate_common.py | |
| parent | 83c6ee03ada6a44788421ebfe813b7d594fc8a7a (diff) | |
| parent | 8e013157752f1b42665430fde0f1c6f7d7147153 (diff) | |
| download | gnuradio-62c6323bdb06d7d3f103d3a75265d45ae6ce00b4.tar.gz gnuradio-62c6323bdb06d7d3f103d3a75265d45ae6ce00b4.tar.bz2 gnuradio-62c6323bdb06d7d3f103d3a75265d45ae6ce00b4.zip | |
Merge remote branch 'gnuradio/maint' into gr-uhd-set-user-register
Diffstat (limited to 'gnuradio-core/src/lib/gengen/generate_common.py')
| -rwxr-xr-x | gnuradio-core/src/lib/gengen/generate_common.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnuradio-core/src/lib/gengen/generate_common.py b/gnuradio-core/src/lib/gengen/generate_common.py index 9bd6bcc9c..6da2044e0 100755 --- a/gnuradio-core/src/lib/gengen/generate_common.py +++ b/gnuradio-core/src/lib/gengen/generate_common.py @@ -41,10 +41,7 @@ reg_signatures = ['ss', 'ii', 'ff', 'cc'] reg_roots = [ 'gr_add_const_XX', - 'gr_multiply_const_XX', - 'gr_add_XX', 'gr_sub_XX', - 'gr_multiply_XX', 'gr_divide_XX', 'gr_mute_XX', 'gr_add_const_vXX', @@ -66,7 +63,10 @@ others = ( ('gr_sample_and_hold_XX', ('bb','ss','ii','ff')), ('gr_argmax_XX', ('fs','is','ss')), ('gr_max_XX', ('ff','ii','ss')), - ('gr_peak_detector_XX', ('fb','ib','sb')) + ('gr_peak_detector_XX', ('fb','ib','sb')), + ('gr_multiply_XX', ('ss','ii')), + ('gr_multiply_const_XX', ('ss','ii')), + ('gr_add_XX', ('ss','cc','ii')) ) |