Changeset 7809

Timestamp:

02/24/08 11:31:10

Author:

jcorgan

Message:

Applied changesets r7735 and r7739 on trunk to release branch.

Files:

• gnuradio/branches/releases/3.1/gnuradio-core/src/lib/gengen (modified) (1 prop)
• gnuradio/branches/releases/3.1/gnuradio-core/src/lib/gengen/Makefile.am (modified) (1 diff)
• gnuradio/branches/releases/3.1/gnuradio-core/src/lib/gengen/Makefile.gen (modified) (9 diffs)
• gnuradio/branches/releases/3.1/gnuradio-core/src/lib/gengen/generate_common.py (modified) (2 diffs)
• gnuradio/branches/releases/3.1/gnuradio-core/src/lib/gengen/gengen_generated.i (modified) (6 diffs)
• gnuradio/branches/releases/3.1/gnuradio-core/src/lib/gengen/gr_and_XX.cc.t (copied) (copied from gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_and_XX.cc.t)
• gnuradio/branches/releases/3.1/gnuradio-core/src/lib/gengen/gr_and_XX.h.t (copied) (copied from gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_and_XX.h.t)
• gnuradio/branches/releases/3.1/gnuradio-core/src/lib/gengen/gr_and_XX.i.t (copied) (copied from gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_and_XX.i.t)
• gnuradio/branches/releases/3.1/gnuradio-core/src/lib/gengen/gr_not_XX.cc.t (copied) (copied from gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_not_XX.cc.t)
• gnuradio/branches/releases/3.1/gnuradio-core/src/lib/gengen/gr_not_XX.h.t (copied) (copied from gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_not_XX.h.t)
• gnuradio/branches/releases/3.1/gnuradio-core/src/lib/gengen/gr_not_XX.i.t (copied) (copied from gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_not_XX.i.t)
• gnuradio/branches/releases/3.1/gnuradio-core/src/lib/gengen/gr_or_XX.cc.t (copied) (copied from gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_or_XX.cc.t)
• gnuradio/branches/releases/3.1/gnuradio-core/src/lib/gengen/gr_or_XX.h.t (copied) (copied from gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_or_XX.h.t)
• gnuradio/branches/releases/3.1/gnuradio-core/src/lib/gengen/gr_or_XX.i.t (copied) (copied from gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_or_XX.i.t)
• gnuradio/branches/releases/3.1/gnuradio-core/src/lib/gengen/gr_xor_XX.cc.t (copied) (copied from gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_xor_XX.cc.t)
• gnuradio/branches/releases/3.1/gnuradio-core/src/lib/gengen/gr_xor_XX.h.t (copied) (copied from gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_xor_XX.h.t)
• gnuradio/branches/releases/3.1/gnuradio-core/src/lib/gengen/gr_xor_XX.i.t (copied) (copied from gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_xor_XX.i.t)
• gnuradio/branches/releases/3.1/gnuradio-core/src/python/gnuradio/gr/qa_boolean_operators.py (copied) (copied from gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/qa_boolean_operators.py) (1 diff)

gnuradio/branches/releases/3.1/gnuradio-core/src/lib/gengen/Makefile.am

@@ -95 +95 @@
-        gr_vector_sink_X.cc.t           \
-        gr_vector_sink_X.h.t            \
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-# include $(srcdir)/Makefile.gen

gnuradio/branches/releases/3.1/gnuradio-core/src/lib/gengen/Makefile.gen

@@ -20 +20 @@
-        gr_add_vii.h \
-        gr_add_vss.h \
+        gr_and_bb.h \
+        gr_and_ii.h \
+        gr_and_ss.h \
-        gr_argmax_fs.h \
-        gr_argmax_is.h \
@@ -60 +63 @@
-        gr_noise_source_i.h \
-        gr_noise_source_s.h \
+        gr_not_bb.h \
+        gr_not_ii.h \
+        gr_not_ss.h \
+        gr_or_bb.h \
+        gr_or_ii.h \
+        gr_or_ss.h \
-        gr_packed_to_unpacked_bb.h \
-        gr_packed_to_unpacked_ii.h \
@@ -90 +99 @@
-        gr_vector_source_f.h \
-        gr_vector_source_i.h \
-
+
+
+
+
-
-GENERATED_I = \
@@ -110 +122 @@
-        gr_add_vii.i \
-        gr_add_vss.i \
+        gr_and_bb.i \
+        gr_and_ii.i \
+        gr_and_ss.i \
-        gr_argmax_fs.i \
-        gr_argmax_is.i \
@@ -150 +165 @@
-        gr_noise_source_i.i \
-        gr_noise_source_s.i \
+        gr_not_bb.i \
+        gr_not_ii.i \
+        gr_not_ss.i \
+        gr_or_bb.i \
+        gr_or_ii.i \
+        gr_or_ss.i \
-        gr_packed_to_unpacked_bb.i \
-        gr_packed_to_unpacked_ii.i \
@@ -180 +201 @@
-        gr_vector_source_f.i \
-        gr_vector_source_i.i \
-
+
+
+
+
-
-GENERATED_CC = \
@@ -200 +224 @@
-        gr_add_vii.cc \
-        gr_add_vss.cc \
+        gr_and_bb.cc \
+        gr_and_ii.cc \
+        gr_and_ss.cc \
-        gr_argmax_fs.cc \
-        gr_argmax_is.cc \
@@ -240 +267 @@
-        gr_noise_source_i.cc \
-        gr_noise_source_s.cc \
+        gr_not_bb.cc \
+        gr_not_ii.cc \
+        gr_not_ss.cc \
+        gr_or_bb.cc \
+        gr_or_ii.cc \
+        gr_or_ss.cc \
-        gr_packed_to_unpacked_bb.cc \
-        gr_packed_to_unpacked_ii.cc \
@@ -270 +303 @@
-        gr_vector_source_f.cc \
-        gr_vector_source_i.cc \
-
+
+
+
+
-

gnuradio/branches/releases/3.1/gnuradio-core/src/lib/gengen/generate_common.py

@@ -1 +1 @@
-#!/usr/bin/env python
-#
-
+,2008
-# 
-# This file is part of GNU Radio
@@ -59 +59 @@
-    ('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_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')),

gnuradio/branches/releases/3.1/gnuradio-core/src/lib/gengen/gengen_generated.i

@@ -20 +20 @@
-#include <gr_add_vii.h>
-#include <gr_add_vss.h>
+#include <gr_and_bb.h>
+#include <gr_and_ii.h>
+#include <gr_and_ss.h>
-#include <gr_argmax_fs.h>
-#include <gr_argmax_is.h>
@@ -60 +63 @@
-#include <gr_noise_source_i.h>
-#include <gr_noise_source_s.h>
+#include <gr_not_bb.h>
+#include <gr_not_ii.h>
+#include <gr_not_ss.h>
+#include <gr_or_bb.h>
+#include <gr_or_ii.h>
+#include <gr_or_ss.h>
-#include <gr_packed_to_unpacked_bb.h>
-#include <gr_packed_to_unpacked_ii.h>
@@ -91 +100 @@
-#include <gr_vector_source_i.h>
-#include <gr_vector_source_s.h>
+#include <gr_xor_bb.h>
+#include <gr_xor_ii.h>
+#include <gr_xor_ss.h>
-%}
-
@@ -110 +122 @@
-%include <gr_add_vii.i>
-%include <gr_add_vss.i>
+%include <gr_and_bb.i>
+%include <gr_and_ii.i>
+%include <gr_and_ss.i>
-%include <gr_argmax_fs.i>
-%include <gr_argmax_is.i>
@@ -150 +165 @@
-%include <gr_noise_source_i.i>
-%include <gr_noise_source_s.i>
+%include <gr_not_bb.i>
+%include <gr_not_ii.i>
+%include <gr_not_ss.i>
+%include <gr_or_bb.i>
+%include <gr_or_ii.i>
+%include <gr_or_ss.i>
-%include <gr_packed_to_unpacked_bb.i>
-%include <gr_packed_to_unpacked_ii.i>
@@ -181 +202 @@
-%include <gr_vector_source_i.i>
-%include <gr_vector_source_s.i>
+%include <gr_xor_bb.i>
+%include <gr_xor_ii.i>
+%include <gr_xor_ss.i>

gnuradio/branches/releases/3.1/gnuradio-core/src/python/gnuradio/gr/qa_boolean_operators.py

@@ -86 +86 @@
-                      expected_result, op)
-
+    def test_and_ss (self):
+        src1_data =       (1,  2,  3,  0x5004,   0x1150)
+        src2_data =       (8,  2,  1 , 0x0508,   0x1105)
+        expected_result = (0,  2,  1,  0x0000,   0x1100)
+        op = gr.and_ss ()
+        self.help_ss ((src1_data, src2_data),
+                      expected_result, op)
+
+    def test_and_bb (self):
+        src1_data =       (1,  2, 2,  3,  0x04,   0x50)
+        src2_data =       (8,  2, 2,  1,  0x08,   0x05)
+        src3_data =       (8,  2, 1,  1,  0x08,   0x05)
+        expected_result = (0,  2, 0,  1,  0x00,   0x00)
+        op = gr.and_bb ()
+        self.help_bb ((src1_data, src2_data, src3_data),
+                      expected_result, op)
+
+    def test_and_ii (self):
+        src1_data =       (1,  2,  3,  0x50005004,   0x11001150)
+        src2_data =       (8,  2,  1 , 0x05000508,   0x11001105)
+        expected_result = (0,  2,  1,  0x00000000,   0x11001100)
+        op = gr.and_ii ()
+        self.help_ii ((src1_data, src2_data),
+                      expected_result, op)
+
+    def test_or_ss (self):
+        src1_data =       (1,  2,  3,  0x5004,   0x1150)
+        src2_data =       (8,  2,  1 , 0x0508,   0x1105)
+        expected_result = (9,  2,  3,  0x550C,   0x1155)
+        op = gr.or_ss ()
+        self.help_ss ((src1_data, src2_data),
+                      expected_result, op)
+
+    def test_or_bb (self):
+        src1_data =       (1,  2, 2,  3,  0x04,   0x50)
+        src2_data =       (8,  2, 2,  1 , 0x08,   0x05)
+        src3_data =       (8,  2, 1,  1 , 0x08,   0x05)
+        expected_result = (9,  2, 3,  3,  0x0C,   0x55)
+        op = gr.or_bb ()
+        self.help_bb ((src1_data, src2_data, src3_data),
+                      expected_result, op)
+
+    def test_or_ii (self):
+        src1_data =       (1,  2,  3,  0x50005004,   0x11001150)
+        src2_data =       (8,  2,  1 , 0x05000508,   0x11001105)
+        expected_result = (9,  2,  3,  0x5500550C,   0x11001155)
+        op = gr.or_ii ()
+        self.help_ii ((src1_data, src2_data),
+                      expected_result, op)
+
+    def test_not_ss (self):
+        src1_data =       (1,      2,      3,       0x5004,   0x1150)
+        expected_result = (~1,     ~2,      ~3,       ~0x5004,   ~0x1150)
+        op = gr.not_ss ()
+        self.help_ss ((((src1_data),)),
+                      expected_result, op)
+
+    def test_not_bb (self):
+        src1_data =       (1,     2,    2,     3,     0x04,   0x50)
+        expected_result = (0xFE,  0xFD, 0xFD,  0xFC,  0xFB,   0xAF)
+        op = gr.not_bb ()
+        self.help_bb (((src1_data), ),
+                      expected_result, op)
+
+    def test_not_ii (self):
+        src1_data =       (1,    2,  3,  0x50005004,   0x11001150)
+        expected_result = (~1 , ~2, ~3, ~0x50005004,  ~0x11001150)
+        op = gr.not_ii ()
+        self.help_ii (((src1_data),),
+                      expected_result, op)
+
-
-