Merged branch 'msgq' from http://gnuradio.org/git/jblum.git

[debian/gnuradio] / gnuradio-core / src / lib / gengen / generate_common.py

diff --git a/gnuradio-core/src/lib/gengen/generate_common.py b/gnuradio-core/src/lib/gengen/generate_common.py
index aaf15f04ac5e5e0a7e26943d3ed86130c40b1500..9bd6bcc9cce2535ced3aaae37c6ef449ba7bb84c 100755 (executable)
--- a/gnuradio-core/src/lib/gengen/generate_common.py
+++ b/gnuradio-core/src/lib/gengen/generate_common.py
@@ -1,12 +1,12 @@
 #!/usr/bin/env python
 #
-# Copyright 2004,2006,2007 Free Software Foundation, Inc.
+# Copyright 2004,2006,2007,2008,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
 # GNU Radio is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 # 
 # GNU Radio is distributed in the hope that it will be useful,
@@ -47,10 +47,10 @@ reg_roots = [
     'gr_multiply_XX',
     'gr_divide_XX',
     'gr_mute_XX',
-    'gr_add_vXX',
-    'gr_multiply_vXX',
     'gr_add_const_vXX',
     'gr_multiply_const_vXX',
+    'gr_integrate_XX',
+    'gr_moving_average_XX',
     ]
 
 # other blocks
@@ -58,10 +58,15 @@ others = (
     ('gr_chunks_to_symbols_XX',     ('bf', 'bc', 'sf', 'sc', 'if', 'ic')),
     ('gr_unpacked_to_packed_XX',    ('bb','ss','ii')),
     ('gr_packed_to_unpacked_XX',    ('bb','ss','ii')),
+    ('gr_xor_XX',                   ('bb','ss','ii')),
+    ('gr_and_XX',                   ('bb','ss','ii')),
+    ('gr_and_const_XX',             ('bb','ss','ii')),
+    ('gr_or_XX',                    ('bb','ss','ii')),
+    ('gr_not_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'))
     )