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 70b5a595bcb9a802e18f8b635dd3f4a74cd8c082..9bd6bcc9cce2535ced3aaae37c6ef449ba7bb84c 100755 (executable)
--- a/gnuradio-core/src/lib/gengen/generate_common.py
+++ b/gnuradio-core/src/lib/gengen/generate_common.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2004,2006,2007,2008 Free Software Foundation, Inc.
+# Copyright 2004,2006,2007,2008,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -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
@@ -59,6 +59,10 @@ others = (
     ('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_argmax_XX',                ('fs','is','ss')),
     ('gr_max_XX',                   ('ff','ii','ss')),