From d4f6b86a9bdea09c2c158b9982559a727f8c6a0b Mon Sep 17 00:00:00 2001
From: Tom Rondeau <trondeau@vt.edu>
Date: Sun, 17 Mar 2013 12:24:38 -0400
Subject: blocks: converting references to vector source/sink, null
source/sink, nop, copy, head, skiphead, vector_map, and annotator blocks to
use gr-blocks.
---
gr-trellis/python/qa_trellis.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'gr-trellis/python')
diff --git a/gr-trellis/python/qa_trellis.py b/gr-trellis/python/qa_trellis.py
index 983a749af6..07097f906c 100755
--- a/gr-trellis/python/qa_trellis.py
+++ b/gr-trellis/python/qa_trellis.py
@@ -108,7 +108,7 @@ class trellis_tb(gr.top_block):
# TX
src = gr.lfsr_32k_source_s()
# packet size in shorts
- src_head = gr.head (gr.sizeof_short, packet_size/16)
+ src_head = blocks.head(gr.sizeof_short, packet_size/16)
# unpack shorts to symbols compatible with the FSM input cardinality
s2fsmi = blocks.packed_to_unpacked_ss(bitspersymbol, gr.GR_MSB_FIRST)
# initial FSM state = 0
--
cgit v1.2.3
From 0183e3ed10c551fefdbb0ed095d896cf01699a54 Mon Sep 17 00:00:00 2001
From: Tom Rondeau <trondeau@vt.edu>
Date: Mon, 18 Mar 2013 13:13:48 -0400
Subject: blocks: removing lfsr and friends from core; now in gr-blocks.
---
docs/sphinx/source/gr/index.rst | 8 -
docs/sphinx/source/gr/sink_blk.rst | 1 -
docs/sphinx/source/gr/source_blk.rst | 5 -
gnuradio-core/src/lib/general/CMakeLists.txt | 4 -
gnuradio-core/src/lib/general/general.i | 4 -
.../src/lib/general/gr_check_lfsr_32k_s.cc | 169 ---------------------
.../src/lib/general/gr_check_lfsr_32k_s.h | 103 -------------
.../src/lib/general/gr_check_lfsr_32k_s.i | 36 -----
.../src/lib/general/gr_lfsr_32k_source_s.cc | 70 ---------
.../src/lib/general/gr_lfsr_32k_source_s.h | 61 --------
.../src/lib/general/gr_lfsr_32k_source_s.i | 31 ----
gnuradio-core/src/lib/general/gri_lfsr_15_1_0.h | 60 --------
gnuradio-core/src/lib/general/gri_lfsr_32k.h | 80 ----------
gr-analog/lib/CMakeLists.txt | 1 +
gr-blocks/lib/check_lfsr_32k_s_impl.cc | 8 +-
gr-digital/examples/gen_whitener.py | 2 +-
gr-trellis/doc/gr-trellis.xml | 4 +-
gr-trellis/doc/test_tcm.py | 4 +-
gr-trellis/doc/test_tcm.py.xml | 4 +-
gr-trellis/examples/python/test_pccc_turbo1.py | 4 +-
gr-trellis/examples/python/test_sccc_hard.py | 4 +-
gr-trellis/examples/python/test_sccc_soft.py | 4 +-
gr-trellis/examples/python/test_sccc_turbo.py | 4 +-
gr-trellis/examples/python/test_sccc_turbo1.py | 4 +-
gr-trellis/examples/python/test_sccc_turbo2.py | 4 +-
gr-trellis/examples/python/test_tcm.py | 4 +-
gr-trellis/examples/python/test_tcm_bit.py | 4 +-
gr-trellis/examples/python/test_tcm_combined.py | 4 +-
gr-trellis/examples/python/test_tcm_parallel.py | 4 +-
.../examples/python/test_turbo_equalization.py | 4 +-
.../examples/python/test_viterbi_equalization.py | 4 +-
gr-trellis/python/qa_trellis.py | 4 +-
32 files changed, 38 insertions(+), 669 deletions(-)
delete mode 100644 docs/sphinx/source/gr/source_blk.rst
delete mode 100644 gnuradio-core/src/lib/general/gr_check_lfsr_32k_s.cc
delete mode 100644 gnuradio-core/src/lib/general/gr_check_lfsr_32k_s.h
delete mode 100644 gnuradio-core/src/lib/general/gr_check_lfsr_32k_s.i
delete mode 100644 gnuradio-core/src/lib/general/gr_lfsr_32k_source_s.cc
delete mode 100644 gnuradio-core/src/lib/general/gr_lfsr_32k_source_s.h
delete mode 100644 gnuradio-core/src/lib/general/gr_lfsr_32k_source_s.i
delete mode 100644 gnuradio-core/src/lib/general/gri_lfsr_15_1_0.h
delete mode 100644 gnuradio-core/src/lib/general/gri_lfsr_32k.h
(limited to 'gr-trellis/python')
diff --git a/docs/sphinx/source/gr/index.rst b/docs/sphinx/source/gr/index.rst
index 64bf9355fd..777ec7fa68 100644
--- a/docs/sphinx/source/gr/index.rst
+++ b/docs/sphinx/source/gr/index.rst
@@ -15,13 +15,6 @@ Top Block and Hierarchical Block Base Classes
gnuradio.gr.top_block
gnuradio.gr.hier_block2
-Signal Sources
-^^^^^^^^^^^^^^
-
-.. autosummary::
- :nosignatures:
-
- gnuradio.gr.lfsr_32k_source_s
Signal Sinks
^^^^^^^^^^^^
@@ -29,7 +22,6 @@ Signal Sinks
.. autosummary::
:nosignatures:
- gnuradio.gr.check_lfsr_32k_s
gnuradio.gr.histo_sink_f
gnuradio.gr.oscope_sink_f
diff --git a/docs/sphinx/source/gr/sink_blk.rst b/docs/sphinx/source/gr/sink_blk.rst
index 9c2c859765..06fea4dcf9 100644
--- a/docs/sphinx/source/gr/sink_blk.rst
+++ b/docs/sphinx/source/gr/sink_blk.rst
@@ -1,6 +1,5 @@
gnuradio.gr: Signal Sinks
=========================
-.. autooldblock:: gnuradio.gr.check_lfsr_32k_s
.. autooldblock:: gnuradio.gr.histo_sink_f
.. autooldblock:: gnuradio.gr.oscope_sink_f
diff --git a/docs/sphinx/source/gr/source_blk.rst b/docs/sphinx/source/gr/source_blk.rst
deleted file mode 100644
index 18e7e679a9..0000000000
--- a/docs/sphinx/source/gr/source_blk.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-gnuradio.gr: Signal Sources
-===========================
-
-.. autooldblock:: gnuradio.gr.lfsr_32k_source_s
-
diff --git a/gnuradio-core/src/lib/general/CMakeLists.txt b/gnuradio-core/src/lib/general/CMakeLists.txt
index 334bfad248..d85039fe60 100644
--- a/gnuradio-core/src/lib/general/CMakeLists.txt
+++ b/gnuradio-core/src/lib/general/CMakeLists.txt
@@ -113,8 +113,6 @@ install(FILES
${CMAKE_CURRENT_SOURCE_DIR}/gr_test_types.h
${CMAKE_CURRENT_SOURCE_DIR}/gr_vco.h
${CMAKE_CURRENT_SOURCE_DIR}/gri_debugger_hook.h
- ${CMAKE_CURRENT_SOURCE_DIR}/gri_lfsr_15_1_0.h
- ${CMAKE_CURRENT_SOURCE_DIR}/gri_lfsr_32k.h
${CMAKE_CURRENT_SOURCE_DIR}/malloc16.h
${CMAKE_CURRENT_SOURCE_DIR}/random.h
DESTINATION ${GR_INCLUDE_DIR}/gnuradio
@@ -139,9 +137,7 @@ endif(ENABLE_PYTHON)
set(gr_core_general_triple_threats
complex_vec_test
gr_block_gateway
- gr_check_lfsr_32k_s
gr_feval
- gr_lfsr_32k_source_s
gr_prefs
gr_test
)
diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i
index 3a32e838ea..68b963702c 100644
--- a/gnuradio-core/src/lib/general/general.i
+++ b/gnuradio-core/src/lib/general/general.i
@@ -22,8 +22,6 @@
%{
-#include <gr_lfsr_32k_source_s.h>
-#include <gr_check_lfsr_32k_s.h>
#include <gr_prefs.h>
#include <gr_constants.h>
#include <gr_test_types.h>
@@ -33,8 +31,6 @@
#include <gr_endianness.h>
%}
-%include "gr_lfsr_32k_source_s.i"
-%include "gr_check_lfsr_32k_s.i"
%include "gr_prefs.i"
%include "gr_constants.i"
%include "gr_test_types.h"
diff --git a/gnuradio-core/src/lib/general/gr_check_lfsr_32k_s.cc b/gnuradio-core/src/lib/general/gr_check_lfsr_32k_s.cc
deleted file mode 100644
index 088b8c38ae..0000000000
--- a/gnuradio-core/src/lib/general/gr_check_lfsr_32k_s.cc
+++ /dev/null
@@ -1,169 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2010 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 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gr_check_lfsr_32k_s.h>
-#include <gr_io_signature.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-gr_check_lfsr_32k_s_sptr
-gr_make_check_lfsr_32k_s ()
-{
- return gnuradio::get_initial_sptr(new gr_check_lfsr_32k_s ());
-}
-
-gr_check_lfsr_32k_s::gr_check_lfsr_32k_s ()
- : gr_sync_block ("gr_check_lfsr_32k",
- gr_make_io_signature (1, 1, sizeof (short)),
- gr_make_io_signature (0, 0, 0)),
- d_state(SEARCHING), d_history (0), d_ntotal (0), d_nright (0),
- d_runlength (0), d_index(0)
-{
- gri_lfsr_32k lfsr;
-
- for (int i = 0; i < BUFSIZE; i++)
- d_buffer[i] = lfsr.next_short ();
-
- enter_SEARCHING ();
-}
-
-int
-gr_check_lfsr_32k_s::work (int noutput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items)
-{
- unsigned short *in = (unsigned short *) input_items[0];
-
- for (int i = 0; i < noutput_items; i++){
- unsigned short x = in[i];
- unsigned short expected;
-
- switch (d_state){
-
- case MATCH0:
- if (x == d_buffer[0])
- enter_MATCH1 ();
- break;
-
- case MATCH1:
- if (x == d_buffer[1])
- enter_MATCH2 ();
- else
- enter_MATCH0 ();
- break;
-
- case MATCH2:
- if (x == d_buffer[2])
- enter_LOCKED ();
- else
- enter_MATCH0 ();
- break;
-
- case LOCKED:
- expected = d_buffer[d_index];
- d_index = d_index + 1;
- if (d_index >= BUFSIZE)
- d_index = 0;
-
- if (x == expected)
- right ();
- else {
- wrong ();
- log_error (expected, x);
- if (wrong_three_times ())
- enter_SEARCHING ();
- }
- break;
-
- default:
- abort ();
- }
-
- d_ntotal++;
- }
-
- return noutput_items;
-}
-
-void
-gr_check_lfsr_32k_s::enter_SEARCHING ()
-{
- d_state = SEARCHING;
- wrong (); // reset history
- wrong ();
- wrong ();
-
- d_runlength = 0;
- d_index = 0; // reset LFSR to beginning
-
- if (0)
- fprintf (stdout, "gr_check_lfsr_32k: enter_SEARCHING at offset %8ld (0x%08lx)\n",
- d_ntotal, d_ntotal);
-
- enter_MATCH0 ();
-}
-
-void
-gr_check_lfsr_32k_s::enter_MATCH0 ()
-{
- d_state = MATCH0;
-}
-
-void
-gr_check_lfsr_32k_s::enter_MATCH1 ()
-{
- d_state = MATCH1;
-}
-
-void
-gr_check_lfsr_32k_s::enter_MATCH2 ()
-{
- d_state = MATCH2;
-}
-
-void
-gr_check_lfsr_32k_s::enter_LOCKED ()
-{
- d_state = LOCKED;
- right (); // setup history
- right ();
- right ();
-
- d_index = 3; // already matched first 3 items
-
- if (0)
- fprintf (stdout, "gr_check_lfsr_32k: enter_LOCKED at offset %8ld (0x%08lx)\n",
- d_ntotal, d_ntotal);
-}
-
-void
-gr_check_lfsr_32k_s::log_error (unsigned short expected, unsigned short actual)
-{
- if (0)
- fprintf (stdout,
- "gr_check_lfsr_32k: expected %5d (0x%04x) got %5d (0x%04x) offset %8ld (0x%08lx)\n",
- expected, expected, actual, actual, d_ntotal, d_ntotal);
-}
diff --git a/gnuradio-core/src/lib/general/gr_check_lfsr_32k_s.h b/gnuradio-core/src/lib/general/gr_check_lfsr_32k_s.h
deleted file mode 100644
index 2f980b427b..0000000000
--- a/gnuradio-core/src/lib/general/gr_check_lfsr_32k_s.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 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 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-#ifndef INCLUDED_GR_CHECK_LFSR_32K_S_H
-#define INCLUDED_GR_CHECK_LFSR_32K_S_H
-
-#include <gr_core_api.h>
-#include <gr_sync_block.h>
-#include <gri_lfsr_32k.h>
-
-
-class gr_check_lfsr_32k_s;
-typedef boost::shared_ptr<gr_check_lfsr_32k_s> gr_check_lfsr_32k_s_sptr;
-
-GR_CORE_API gr_check_lfsr_32k_s_sptr gr_make_check_lfsr_32k_s ();
-
-/*!
- * \brief sink that checks if its input stream consists of a lfsr_32k sequence.
- * \ingroup sink_blk
- *
- * This sink is typically used along with gr_lfsr_32k_source_s to test
- * the USRP using its digital loopback mode.
- */
-class GR_CORE_API gr_check_lfsr_32k_s : public gr_sync_block
-{
- friend GR_CORE_API gr_check_lfsr_32k_s_sptr gr_make_check_lfsr_32k_s ();
-
- enum state {
- SEARCHING, // searching for synchronization
- MATCH0,
- MATCH1,
- MATCH2,
- LOCKED // is locked
- };
-
- state d_state;
- unsigned int d_history; // bitmask of decisions
-
- long d_ntotal; // total number of shorts
- long d_nright; // # of correct shorts
- long d_runlength; // # of correct shorts in a row
-
- static const int BUFSIZE = 2048 - 1; // ensure pattern isn't packet aligned
- int d_index;
- unsigned short d_buffer[BUFSIZE];
-
-
- gr_check_lfsr_32k_s ();
-
- void enter_SEARCHING ();
- void enter_MATCH0 ();
- void enter_MATCH1 ();
- void enter_MATCH2 ();
- void enter_LOCKED ();
-
- void right (){
- d_history = (d_history << 1) | 0x1;
- d_nright++;
- d_runlength++;
- }
-
- void wrong (){
- d_history = (d_history << 1) | 0x0;
- d_runlength = 0;
- }
-
- bool right_three_times () { return (d_history & 0x7) == 0x7; }
- bool wrong_three_times () { return (d_history & 0x7) == 0x0; }
-
- void log_error (unsigned short expected, unsigned short actual);
-
- public:
-
- int work (int noutput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items);
-
- long ntotal () const { return d_ntotal; }
- long nright () const { return d_nright; }
- long runlength () const { return d_runlength; }
-
-};
-
-
-#endif /* INCLUDED_GR_CHECK_LFSR_32K_S_H */
diff --git a/gnuradio-core/src/lib/general/gr_check_lfsr_32k_s.i b/gnuradio-core/src/lib/general/gr_check_lfsr_32k_s.i
deleted file mode 100644
index 34d4a0b0c1..0000000000
--- a/gnuradio-core/src/lib/general/gr_check_lfsr_32k_s.i
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 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 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-GR_SWIG_BLOCK_MAGIC(gr,check_lfsr_32k_s)
-
-gr_check_lfsr_32k_s_sptr gr_make_check_lfsr_32k_s ();
-
-class gr_check_lfsr_32k_s : public gr_sync_block
-{
- private:
- gr_check_lfsr_32k_s ();
-
-public:
- long ntotal () const;
- long nright () const;
- long runlength () const;
-};
diff --git a/gnuradio-core/src/lib/general/gr_lfsr_32k_source_s.cc b/gnuradio-core/src/lib/general/gr_lfsr_32k_source_s.cc
deleted file mode 100644
index c9a8742486..0000000000
--- a/gnuradio-core/src/lib/general/gr_lfsr_32k_source_s.cc
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2010 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 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <gr_lfsr_32k_source_s.h>
-#include <gr_io_signature.h>
-#include <stdexcept>
-
-
-gr_lfsr_32k_source_s_sptr
-gr_make_lfsr_32k_source_s ()
-{
- return gnuradio::get_initial_sptr(new gr_lfsr_32k_source_s ());
-}
-
-
-gr_lfsr_32k_source_s::gr_lfsr_32k_source_s ()
- : gr_sync_block ("lfsr_32k_source_s",
- gr_make_io_signature (0, 0, 0),
- gr_make_io_signature (1, 1, sizeof (short))),
- d_index (0)
-{
- gri_lfsr_32k lfsr;
-
- for (int i = 0; i < BUFSIZE; i++)
- d_buffer[i] = lfsr.next_short ();
-}
-
-int
-gr_lfsr_32k_source_s::work (int noutput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items)
-{
- short *out = (short *) output_items[0];
- short *buf = d_buffer;
- int index = d_index;
-
- for (int i = 0; i < noutput_items; i++){
- out[i] = buf[index];
- // index = (index + 1) & (BUFSIZE - 1);
- index = index + 1;
- if (index >= BUFSIZE)
- index = 0;
- }
-
- d_index = index;
- return noutput_items;
-}
diff --git a/gnuradio-core/src/lib/general/gr_lfsr_32k_source_s.h b/gnuradio-core/src/lib/general/gr_lfsr_32k_source_s.h
deleted file mode 100644
index db107652ad..0000000000
--- a/gnuradio-core/src/lib/general/gr_lfsr_32k_source_s.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 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 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GR_LFSR_32K_SOURCE_S_H
-#define INCLUDED_GR_LFSR_32K_SOURCE_S_H
-
-#include <gr_core_api.h>
-#include <gr_sync_block.h>
-#include <gri_lfsr_32k.h>
-
-class gr_lfsr_32k_source_s;
-typedef boost::shared_ptr<gr_lfsr_32k_source_s> gr_lfsr_32k_source_s_sptr;
-
-GR_CORE_API gr_lfsr_32k_source_s_sptr gr_make_lfsr_32k_source_s ();
-
-/*!
- * \brief LFSR pseudo-random source with period of 2^15 bits (2^11 shorts)
- * \ingroup source_blk
- *
- * This source is typically used along with gr_check_lfsr_32k_s to test
- * the USRP using its digital loopback mode.
- */
-class GR_CORE_API gr_lfsr_32k_source_s : public gr_sync_block
-{
- friend GR_CORE_API gr_lfsr_32k_source_s_sptr gr_make_lfsr_32k_source_s ();
-
-
- static const int BUFSIZE = 2048 - 1; // ensure pattern isn't packet aligned
- int d_index;
- short d_buffer[BUFSIZE];
-
- gr_lfsr_32k_source_s ();
-
- public:
-
- virtual int work (int noutput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items);
-};
-
-
-#endif
diff --git a/gnuradio-core/src/lib/general/gr_lfsr_32k_source_s.i b/gnuradio-core/src/lib/general/gr_lfsr_32k_source_s.i
deleted file mode 100644
index c2dc1c61b7..0000000000
--- a/gnuradio-core/src/lib/general/gr_lfsr_32k_source_s.i
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 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 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-GR_SWIG_BLOCK_MAGIC(gr,lfsr_32k_source_s);
-
-gr_lfsr_32k_source_s_sptr gr_make_lfsr_32k_source_s ();
-
-class gr_lfsr_32k_source_s : public gr_sync_block
-{
- private:
- gr_lfsr_32k_source_s ();
-};
diff --git a/gnuradio-core/src/lib/general/gri_lfsr_15_1_0.h b/gnuradio-core/src/lib/general/gri_lfsr_15_1_0.h
deleted file mode 100644
index 578739f7ef..0000000000
--- a/gnuradio-core/src/lib/general/gri_lfsr_15_1_0.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 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 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GRI_LFSR_15_1_0_H
-#define INCLUDED_GRI_LFSR_15_1_0_H
-
-#include <gr_core_api.h>
-
-/*!
- * \brief Linear Feedback Shift Register using primitive polynomial x^15 + x + 1
- * \ingroup misc
- *
- * Generates a maximal length pseudo-random sequence of length 2^15 - 1 bits.
- */
-
-class GR_CORE_API gri_lfsr_15_1_0 {
- unsigned long d_sr; // shift register
-
- public:
-
- gri_lfsr_15_1_0 () { reset (); }
-
- void reset () { d_sr = 0x7fff; }
-
- int next_bit (){
- d_sr = ((((d_sr >> 1) ^ d_sr) & 0x1) << 14) | (d_sr >> 1);
- return d_sr & 0x1;
- }
-
- int next_byte (){
- int v = 0;
- for (int i = 0; i < 8; i++){
- v >>= 1;
- if (next_bit ())
- v |= 0x80;
- }
- return v;
- }
-};
-
-#endif /* INCLUDED_GRI_LFSR_15_1_0_H */
\ No newline at end of file
diff --git a/gnuradio-core/src/lib/general/gri_lfsr_32k.h b/gnuradio-core/src/lib/general/gri_lfsr_32k.h
deleted file mode 100644
index e84512b9a6..0000000000
--- a/gnuradio-core/src/lib/general/gri_lfsr_32k.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 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 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_GRI_LFSR_32k_H
-#define INCLUDED_GRI_LFSR_32k_H
-
-#include <gr_core_api.h>
-#include <gri_lfsr_15_1_0.h>
-
-/*!
- * \brief generate pseudo-random sequence of length 32768 bits.
- * \ingroup misc
- *
- * This is based on gri_lfsr_15_1_0 with an extra 0 added at the end
- * of the sequence.
- */
-
-class GR_CORE_API gri_lfsr_32k {
- gri_lfsr_15_1_0 d_lfsr;
- unsigned int d_count;
-
- public:
- gri_lfsr_32k () { reset (); }
-
- void reset (){
- d_lfsr.reset ();
- d_count = 0;
- }
-
- int next_bit (){
- if (d_count == 32767){
- d_count = 0;
- return 0;
- }
- d_count++;
- return d_lfsr.next_bit ();
- }
-
- int next_byte (){
- int v = 0;
- for (int i = 0; i < 8; i++){
- v >>= 1;
- if (next_bit ())
- v |= 0x80;
- }
- return v;
- }
-
- int next_short (){
- int v = 0;
- for (int i = 0; i < 16; i++){
- v >>= 1;
- if (next_bit ())
- v |= 0x8000;
- }
- return v;
- }
-
-};
-
-#endif /* INCLUDED_GRI_LFSR_32k_H */
diff --git a/gr-analog/lib/CMakeLists.txt b/gr-analog/lib/CMakeLists.txt
index 92a523946d..48fbb71b2f 100644
--- a/gr-analog/lib/CMakeLists.txt
+++ b/gr-analog/lib/CMakeLists.txt
@@ -27,6 +27,7 @@ include_directories(
${GR_ANALOG_INCLUDE_DIRS}
${GR_FILTER_INCLUDE_DIRS}
${GR_FFT_INCLUDE_DIRS}
+ ${GR_BLOCKS_INCLUDE_DIRS}
${GNURADIO_CORE_INCLUDE_DIRS}
${VOLK_INCLUDE_DIRS}
${GRUEL_INCLUDE_DIRS}
diff --git a/gr-blocks/lib/check_lfsr_32k_s_impl.cc b/gr-blocks/lib/check_lfsr_32k_s_impl.cc
index b8e88003a2..5664067591 100644
--- a/gr-blocks/lib/check_lfsr_32k_s_impl.cc
+++ b/gr-blocks/lib/check_lfsr_32k_s_impl.cc
@@ -40,7 +40,7 @@ namespace gr {
}
check_lfsr_32k_s_impl::check_lfsr_32k_s_impl()
- : gr_sync_block("gr_check_lfsr_32k",
+ : gr_sync_block("check_lfsr_32k",
gr_make_io_signature(1, 1, sizeof(short)),
gr_make_io_signature(0, 0, 0)),
d_state(SEARCHING), d_history(0), d_ntotal(0), d_nright(0),
@@ -127,7 +127,7 @@ namespace gr {
d_index = 0; // reset LFSR to beginning
if(0)
- fprintf(stdout, "gr_check_lfsr_32k: enter_SEARCHING at offset %8ld (0x%08lx)\n",
+ fprintf(stdout, "check_lfsr_32k: enter_SEARCHING at offset %8ld (0x%08lx)\n",
d_ntotal, d_ntotal);
enter_MATCH0();
@@ -162,7 +162,7 @@ namespace gr {
d_index = 3; // already matched first 3 items
if(0)
- fprintf(stdout, "gr_check_lfsr_32k: enter_LOCKED at offset %8ld (0x%08lx)\n",
+ fprintf(stdout, "check_lfsr_32k: enter_LOCKED at offset %8ld (0x%08lx)\n",
d_ntotal, d_ntotal);
}
@@ -171,7 +171,7 @@ namespace gr {
{
if(0)
fprintf(stdout,
- "gr_check_lfsr_32k: expected %5d (0x%04x) got %5d (0x%04x) offset %8ld (0x%08lx)\n",
+ "check_lfsr_32k: expected %5d (0x%04x) got %5d (0x%04x) offset %8ld (0x%08lx)\n",
expected, expected, actual, actual, d_ntotal, d_ntotal);
}
diff --git a/gr-digital/examples/gen_whitener.py b/gr-digital/examples/gen_whitener.py
index 0e8a97bf2b..63616605ba 100755
--- a/gr-digital/examples/gen_whitener.py
+++ b/gr-digital/examples/gen_whitener.py
@@ -37,7 +37,7 @@ class my_graph(gr.top_block):
parser.print_help()
raise SystemExit, 1
- src = gr.lfsr_32k_source_s()
+ src = blocks.lfsr_32k_source_s()
head = blocks.head(gr.sizeof_short, 2048)
self.dst = blocks.vector_sink_s()
self.connect(src, head, self.dst)
diff --git a/gr-trellis/doc/gr-trellis.xml b/gr-trellis/doc/gr-trellis.xml
index 335c77a39f..6ffbb9ec2c 100644
--- a/gr-trellis/doc/gr-trellis.xml
+++ b/gr-trellis/doc/gr-trellis.xml
@@ -570,7 +570,7 @@ and an initial state (which is set to 0 in this example).
</para>
<programlisting>
15 # TX
- 16 src = gr.lfsr_32k_source_s()
+ 16 src = blocks.lfsr_32k_source_s()
17 src_head = blocks.head (gr.sizeof_short,Kb/16) # packet size in shorts
18 s2fsmi = blocks.packed_to_unpacked_ss(bitspersymbol,gr.GR_MSB_FIRST) # unpack shorts to symbols compatible with the FSM input cardinality
19 enc = trellis.encoder_ss(f,0) # initial state = 0
@@ -647,7 +647,7 @@ are then packed to shorts and compared with the transmitted sequence.
<programlisting>
28 va = trellis.viterbi_s(f,K,0,-1) # Put -1 if the Initial/Final states are not set.
29 fsmi2s = blocks.unpacked_to_packed_ss(bitspersymbol,gr.GR_MSB_FIRST) # pack FSM input symbols to shorts
- 30 dst = gr.check_lfsr_32k_s();
+ 30 dst = blocks.check_lfsr_32k_s();
</programlisting>
diff --git a/gr-trellis/doc/test_tcm.py b/gr-trellis/doc/test_tcm.py
index 6bfa083ae2..61ab00f1c8 100644
--- a/gr-trellis/doc/test_tcm.py
+++ b/gr-trellis/doc/test_tcm.py
@@ -19,7 +19,7 @@ def run_test (f,Kb,bitspersymbol,K,dimensionality,constellation,N0,seed):
tb = gr.top_block ()
# TX
- src = gr.lfsr_32k_source_s()
+ src = blocks.lfsr_32k_source_s()
src_head = blocks.head (gr.sizeof_short,Kb/16) # packet size in shorts
s2fsmi = blocks.packed_to_unpacked_ss(bitspersymbol,gr.GR_MSB_FIRST) # unpack shorts to symbols compatible with the FSM input cardinality
enc = trellis.encoder_ss(f,0) # initial state = 0
@@ -33,7 +33,7 @@ def run_test (f,Kb,bitspersymbol,K,dimensionality,constellation,N0,seed):
metrics = trellis.metrics_f(f.O(),dimensionality,constellation,digital.TRELLIS_EUCLIDEAN) # data preprocessing to generate metrics for Viterbi
va = trellis.viterbi_s(f,K,0,-1) # Put -1 if the Initial/Final states are not set.
fsmi2s = blocks.unpacked_to_packed_ss(bitspersymbol,gr.GR_MSB_FIRST) # pack FSM input symbols to shorts
- dst = gr.check_lfsr_32k_s();
+ dst = blocks.check_lfsr_32k_s();
tb.connect (src,src_head,s2fsmi,enc,mod)
tb.connect (mod,(add,0))
diff --git a/gr-trellis/doc/test_tcm.py.xml b/gr-trellis/doc/test_tcm.py.xml
index c66363098b..77009b5859 100644
--- a/gr-trellis/doc/test_tcm.py.xml
+++ b/gr-trellis/doc/test_tcm.py.xml
@@ -15,7 +15,7 @@
13 tb = gr.top_block ()
14
15 # TX
- 16 src = gr.lfsr_32k_source_s()
+ 16 src = blocks.lfsr_32k_source_s()
17 src_head = blocks.head (gr.sizeof_short,Kb/16) # packet size in shorts
18 s2fsmi = blocks.packed_to_unpacked_ss(bitspersymbol,gr.GR_MSB_FIRST) # unpack shorts to symbols compatible with the FSM input cardinality
19 enc = trellis.encoder_ss(f,0) # initial state = 0
@@ -29,7 +29,7 @@
27 metrics = trellis.metrics_f(f.O(),dimensionality,constellation,trellis.TRELLIS_EUCLIDEAN) # data preprocessing to generate metrics for Viterbi
28 va = trellis.viterbi_s(f,K,0,-1) # Put -1 if the Initial/Final states are not set.
29 fsmi2s = blocks.unpacked_to_packed_ss(bitspersymbol,gr.GR_MSB_FIRST) # pack FSM input symbols to shorts
- 30 dst = gr.check_lfsr_32k_s();
+ 30 dst = blocks.check_lfsr_32k_s();
31
32 tb.connect (src,src_head,s2fsmi,enc,mod)
33 tb.connect (mod,(add,0))
diff --git a/gr-trellis/examples/python/test_pccc_turbo1.py b/gr-trellis/examples/python/test_pccc_turbo1.py
index 8234726be0..7104aa5039 100755
--- a/gr-trellis/examples/python/test_pccc_turbo1.py
+++ b/gr-trellis/examples/python/test_pccc_turbo1.py
@@ -19,7 +19,7 @@ def run_test (fo,fi,interleaver,Kb,bitspersymbol,K,dimensionality,constellation,
# TX
- src = gr.lfsr_32k_source_s()
+ src = blocks.lfsr_32k_source_s()
src_head = blocks.head (gr.sizeof_short,Kb/16) # packet size in shorts
s2fsmi = blocks.packed_to_unpacked_ss(bitspersymbol,gr.GR_MSB_FIRST) # unpack shorts to symbols compatible with the outer FSM input cardinality
#src = blocks.vector_source_s([0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1],False)
@@ -37,7 +37,7 @@ def run_test (fo,fi,interleaver,Kb,bitspersymbol,K,dimensionality,constellation,
dec = trellis.pccc_decoder_s(fo,0,-1,fi,0,-1,interleaver,K,IT,trellis.TRELLIS_MIN_SUM)
fsmi2s = blocks.unpacked_to_packed_ss(bitspersymbol,gr.GR_MSB_FIRST) # pack FSM input symbols to shorts
- dst = gr.check_lfsr_32k_s()
+ dst = blocks.check_lfsr_32k_s()
tb.connect (src,src_head,s2fsmi,enc,mod)
#tb.connect (src,enc,mod)
diff --git a/gr-trellis/examples/python/test_sccc_hard.py b/gr-trellis/examples/python/test_sccc_hard.py
index 6cb85111a3..83393df4dc 100755
--- a/gr-trellis/examples/python/test_sccc_hard.py
+++ b/gr-trellis/examples/python/test_sccc_hard.py
@@ -19,7 +19,7 @@ def run_test (fo,fi,interleaver,Kb,bitspersymbol,K,dimensionality,constellation,
# TX
- src = gr.lfsr_32k_source_s()
+ src = blocks.lfsr_32k_source_s()
src_head = blocks.head(gr.sizeof_short,Kb/16) # packet size in shorts
s2fsmi = blocks.packed_to_unpacked_ss(bitspersymbol,gr.GR_MSB_FIRST) # unpack shorts to symbols compatible with the outer FSM input cardinality
enc_out = trellis.encoder_ss(fo,0) # initial state = 0
@@ -38,7 +38,7 @@ def run_test (fo,fi,interleaver,Kb,bitspersymbol,K,dimensionality,constellation,
metrics_out = trellis.metrics_s(fo.O(),1,[0,1,2,3],digital.TRELLIS_HARD_SYMBOL) # data preprocessing to generate metrics for outer Viterbi (hard decisions)
va_out = trellis.viterbi_s(fo,K,0,-1) # Put -1 if the Initial/Final states are not set.
fsmi2s = blocks.unpacked_to_packed_ss(bitspersymbol,gr.GR_MSB_FIRST) # pack FSM input symbols to shorts
- dst = gr.check_lfsr_32k_s()
+ dst = blocks.check_lfsr_32k_s()
tb.connect (src,src_head,s2fsmi,enc_out,inter,enc_in,mod)
tb.connect (mod,(add,0))
diff --git a/gr-trellis/examples/python/test_sccc_soft.py b/gr-trellis/examples/python/test_sccc_soft.py
index 782d2f9134..25d26e0025 100755
--- a/gr-trellis/examples/python/test_sccc_soft.py
+++ b/gr-trellis/examples/python/test_sccc_soft.py
@@ -19,7 +19,7 @@ def run_test (fo,fi,interleaver,Kb,bitspersymbol,K,dimensionality,constellation,
# TX
- src = gr.lfsr_32k_source_s()
+ src = blocks.lfsr_32k_source_s()
src_head = blocks.head (gr.sizeof_short,Kb/16) # packet size in shorts
s2fsmi = blocks.packed_to_unpacked_ss(bitspersymbol,gr.GR_MSB_FIRST) # unpack shorts to symbols compatible with the outer FSM input cardinality
enc_out = trellis.encoder_ss(fo,0) # initial state = 0
@@ -38,7 +38,7 @@ def run_test (fo,fi,interleaver,Kb,bitspersymbol,K,dimensionality,constellation,
deinter = trellis.permutation(interleaver.K(),interleaver.DEINTER(),fi.I(),gr.sizeof_float)
va_out = trellis.viterbi_s(fo,K,0,-1) # Put -1 if the Initial/Final states are not set.
fsmi2s = blocks.unpacked_to_packed_ss(bitspersymbol,gr.GR_MSB_FIRST) # pack FSM input symbols to shorts
- dst = gr.check_lfsr_32k_s()
+ dst = blocks.check_lfsr_32k_s()
tb.connect (src,src_head,s2fsmi,enc_out,inter,enc_in,mod)
tb.connect (mod,(add,0))
diff --git a/gr-trellis/examples/python/test_sccc_turbo.py b/gr-trellis/examples/python/test_sccc_turbo.py
index 2a1e742a3b..08004e8a0d 100755
--- a/gr-trellis/examples/python/test_sccc_turbo.py
+++ b/gr-trellis/examples/python/test_sccc_turbo.py
@@ -59,7 +59,7 @@ def run_test (fo,fi,interleaver,Kb,bitspersymbol,K,dimensionality,constellation,
# TX
- src = gr.lfsr_32k_source_s()
+ src = blocks.lfsr_32k_source_s()
src_head = blocks.head(gr.sizeof_short,Kb/16) # packet size in shorts
s2fsmi = blocks.packed_to_unpacked_ss(bitspersymbol,gr.GR_MSB_FIRST) # unpack shorts to symbols compatible with the outer FSM input cardinality
enc_out = trellis.encoder_ss(fo,0) # initial state = 0
@@ -75,7 +75,7 @@ def run_test (fo,fi,interleaver,Kb,bitspersymbol,K,dimensionality,constellation,
(head,tail) = make_rx(tb,fo,fi,dimensionality,constellation,K,interleaver,IT,Es,N0,trellis.TRELLIS_MIN_SUM)
#(head,tail) = make_rx(tb,fo,fi,dimensionality,constellation,K,interleaver,IT,Es,N0,trellis.TRELLIS_SUM_PRODUCT)
fsmi2s = blocks.unpacked_to_packed_ss(bitspersymbol,gr.GR_MSB_FIRST) # pack FSM input symbols to shorts
- dst = gr.check_lfsr_32k_s()
+ dst = blocks.check_lfsr_32k_s()
tb.connect (src,src_head,s2fsmi,enc_out,inter,enc_in,mod)
tb.connect (mod,(add,0))
diff --git a/gr-trellis/examples/python/test_sccc_turbo1.py b/gr-trellis/examples/python/test_sccc_turbo1.py
index 6c5a01d681..528a79d011 100755
--- a/gr-trellis/examples/python/test_sccc_turbo1.py
+++ b/gr-trellis/examples/python/test_sccc_turbo1.py
@@ -18,7 +18,7 @@ def run_test (fo,fi,interleaver,Kb,bitspersymbol,K,dimensionality,constellation,
tb = gr.top_block ()
# TX
- src = gr.lfsr_32k_source_s()
+ src = blocks.lfsr_32k_source_s()
src_head = blocks.head(gr.sizeof_short,Kb/16) # packet size in shorts
s2fsmi = blocks.packed_to_unpacked_ss(bitspersymbol,gr.GR_MSB_FIRST) # unpack shorts to symbols compatible with the outer FSM input cardinality
enc = trellis.sccc_encoder_ss(fo,0,fi,0,interleaver,K)
@@ -31,7 +31,7 @@ def run_test (fo,fi,interleaver,Kb,bitspersymbol,K,dimensionality,constellation,
# RX
dec = trellis.sccc_decoder_combined_fs(fo,0,-1,fi,0,-1,interleaver,K,IT,trellis.TRELLIS_MIN_SUM,dimensionality,constellation,digital.TRELLIS_EUCLIDEAN,1.0)
fsmi2s = blocks.unpacked_to_packed_ss(bitspersymbol,gr.GR_MSB_FIRST) # pack FSM input symbols to shorts
- dst = gr.check_lfsr_32k_s()
+ dst = blocks.check_lfsr_32k_s()
#tb.connect (src,src_head,s2fsmi,enc_out,inter,enc_in,mod)
tb.connect (src,src_head,s2fsmi,enc,mod)
diff --git a/gr-trellis/examples/python/test_sccc_turbo2.py b/gr-trellis/examples/python/test_sccc_turbo2.py
index 40b8e03260..d7f26c4e13 100755
--- a/gr-trellis/examples/python/test_sccc_turbo2.py
+++ b/gr-trellis/examples/python/test_sccc_turbo2.py
@@ -18,7 +18,7 @@ def run_test (fo,fi,interleaver,Kb,bitspersymbol,K,dimensionality,constellation,
tb = gr.top_block ()
# TX
- src = gr.lfsr_32k_source_s()
+ src = blocks.lfsr_32k_source_s()
src_head = blocks.head(gr.sizeof_short,Kb/16) # packet size in shorts
s2fsmi = blocks.packed_to_unpacked_ss(bitspersymbol,gr.GR_MSB_FIRST) # unpack shorts to symbols compatible with the outer FSM input cardinality
enc = trellis.sccc_encoder_ss(fo,0,fi,0,interleaver,K)
@@ -33,7 +33,7 @@ def run_test (fo,fi,interleaver,Kb,bitspersymbol,K,dimensionality,constellation,
scale = blocks.multiply_const_ff(1.0/N0)
dec = trellis.sccc_decoder_s(fo,0,-1,fi,0,-1,interleaver,K,IT,trellis.TRELLIS_MIN_SUM)
fsmi2s = blocks.unpacked_to_packed_ss(bitspersymbol,gr.GR_MSB_FIRST) # pack FSM input symbols to shorts
- dst = gr.check_lfsr_32k_s()
+ dst = blocks.check_lfsr_32k_s()
#tb.connect (src,src_head,s2fsmi,enc_out,inter,enc_in,mod)
tb.connect (src,src_head,s2fsmi,enc,mod)
diff --git a/gr-trellis/examples/python/test_tcm.py b/gr-trellis/examples/python/test_tcm.py
index 79e2958842..bf9710aa1c 100755
--- a/gr-trellis/examples/python/test_tcm.py
+++ b/gr-trellis/examples/python/test_tcm.py
@@ -25,7 +25,7 @@ def run_test (f,Kb,bitspersymbol,K,dimensionality,constellation,N0,seed):
#for i in range(Kb-1*16): # last 16 bits = 0 to drive the final state to 0
#packet[i] = random.randint(0, 1) # random 0s and 1s
#src = blocks.vector_source_s(packet,False)
- src = gr.lfsr_32k_source_s()
+ src = blocks.lfsr_32k_source_s()
src_head = blocks.head(gr.sizeof_short,Kb/16) # packet size in shorts
#b2s = blocks.unpacked_to_packed_ss(1,gr.GR_MSB_FIRST) # pack bits in shorts
s2fsmi = blocks.packed_to_unpacked_ss(bitspersymbol,gr.GR_MSB_FIRST) # unpack shorts to symbols compatible with the FSM input cardinality
@@ -42,7 +42,7 @@ def run_test (f,Kb,bitspersymbol,K,dimensionality,constellation,N0,seed):
fsmi2s = blocks.unpacked_to_packed_ss(bitspersymbol,gr.GR_MSB_FIRST) # pack FSM input symbols to shorts
#s2b = blocks.packed_to_unpacked_ss(1,gr.GR_MSB_FIRST) # unpack shorts to bits
#dst = blocks.vector_sink_s();
- dst = gr.check_lfsr_32k_s()
+ dst = blocks.check_lfsr_32k_s()
tb.connect (src,src_head,s2fsmi,enc,mod)
diff --git a/gr-trellis/examples/python/test_tcm_bit.py b/gr-trellis/examples/python/test_tcm_bit.py
index f921584ab9..7880f0ea53 100755
--- a/gr-trellis/examples/python/test_tcm_bit.py
+++ b/gr-trellis/examples/python/test_tcm_bit.py
@@ -25,7 +25,7 @@ def run_test (f,Kb,bitspersymbol,K,dimensionality,constellation,N0,seed):
for i in range(Kb-1*16): # last 16 bits = 0 to drive the final state to 0
packet[i] = random.randint(0, 1) # random 0s and 1s
src = blocks.vector_source_s(packet,False)
- #src = gr.lfsr_32k_source_s()
+ #src = blocks.lfsr_32k_source_s()
#src_head = blocks.head (gr.sizeof_short,Kb/16) # packet size in shorts
b2s = blocks.unpacked_to_packed_ss(1,gr.GR_MSB_FIRST) # pack bits in shorts
s2fsmi = blocks.packed_to_unpacked_ss(bitspersymbol,gr.GR_MSB_FIRST) # unpack shorts to symbols compatible with the FSM input cardinality
@@ -44,7 +44,7 @@ def run_test (f,Kb,bitspersymbol,K,dimensionality,constellation,N0,seed):
fsmi2s = blocks.unpacked_to_packed_ss(bitspersymbol,gr.GR_MSB_FIRST) # pack FSM input symbols to shorts
s2b = blocks.packed_to_unpacked_ss(1,gr.GR_MSB_FIRST) # unpack shorts to bits
dst = blocks.vector_sink_s();
- #dst = gr.check_lfsr_32k_s();
+ #dst = blocks.check_lfsr_32k_s();
#tb.connect (src,src_head,s2fsmi,enc,mod)
diff --git a/gr-trellis/examples/python/test_tcm_combined.py b/gr-trellis/examples/python/test_tcm_combined.py
index 5bce13899b..697e3cc64a 100755
--- a/gr-trellis/examples/python/test_tcm_combined.py
+++ b/gr-trellis/examples/python/test_tcm_combined.py
@@ -19,7 +19,7 @@ def run_test (f,Kb,bitspersymbol,K,dimensionality,constellation,N0,seed):
tb = gr.top_block ()
# TX
- src = gr.lfsr_32k_source_s()
+ src = blocks.lfsr_32k_source_s()
src_head = blocks.head(gr.sizeof_short,Kb/16) # packet size in shorts
s2fsmi = blocks.packed_to_unpacked_ss(bitspersymbol,gr.GR_MSB_FIRST) # unpack shorts to symbols compatible with the FSM input cardinality
enc = trellis.encoder_ss(f,0) # initial state = 0
@@ -34,7 +34,7 @@ def run_test (f,Kb,bitspersymbol,K,dimensionality,constellation,N0,seed):
# RX
va = trellis.viterbi_combined_fs(f,K,0,-1,dimensionality,constellation,digital.TRELLIS_EUCLIDEAN) # Put -1 if the Initial/Final states are not set.
fsmi2s = blocks.unpacked_to_packed_ss(bitspersymbol,gr.GR_MSB_FIRST) # pack FSM input symbols to shorts
- dst = gr.check_lfsr_32k_s();
+ dst = blocks.check_lfsr_32k_s();
tb.connect (src,src_head,s2fsmi,enc,mod)
diff --git a/gr-trellis/examples/python/test_tcm_parallel.py b/gr-trellis/examples/python/test_tcm_parallel.py
index f87b12c444..e4456890f0 100755
--- a/gr-trellis/examples/python/test_tcm_parallel.py
+++ b/gr-trellis/examples/python/test_tcm_parallel.py
@@ -19,7 +19,7 @@ def run_test (f,Kb,bitspersymbol,K,dimensionality,constellation,N0,seed,P):
tb = gr.top_block ()
# TX
- src = gr.lfsr_32k_source_s()
+ src = blocks.lfsr_32k_source_s()
src_head = blocks.head(gr.sizeof_short,Kb/16*P) # packet size in shorts
s2fsmi=blocks.packed_to_unpacked_ss(bitspersymbol,gr.GR_MSB_FIRST) # unpack shorts to symbols compatible with the FSM input cardinality
s2p = blocks.stream_to_streams(gr.sizeof_short,P) # serial to parallel
@@ -38,7 +38,7 @@ def run_test (f,Kb,bitspersymbol,K,dimensionality,constellation,N0,seed,P):
va = trellis.viterbi_s(f,K,0,-1) # Put -1 if the Initial/Final states are not set.
p2s = block.streams_to_stream(gr.sizeof_short,P) # parallel to serial
fsmi2s=blocks.unpacked_to_packed_ss(bitspersymbol,gr.GR_MSB_FIRST) # pack FSM input symbols to shorts
- dst = gr.check_lfsr_32k_s()
+ dst = blocks.check_lfsr_32k_s()
tb.connect (src,src_head,s2fsmi,s2p)
for i in range(P):
diff --git a/gr-trellis/examples/python/test_turbo_equalization.py b/gr-trellis/examples/python/test_turbo_equalization.py
index c82d8dcb41..b2d58a6014 100755
--- a/gr-trellis/examples/python/test_turbo_equalization.py
+++ b/gr-trellis/examples/python/test_turbo_equalization.py
@@ -57,7 +57,7 @@ def run_test (fo,fi,interleaver,Kb,bitspersymbol,K,dimensionality,tot_constellat
tb = gr.top_block ()
# TX
- src = gr.lfsr_32k_source_s()
+ src = blocks.lfsr_32k_source_s()
src_head = blocks.head(gr.sizeof_short,Kb/16) # packet size in shorts
s2fsmi = blocks.packed_to_unpacked_ss(bitspersymbol,gr.GR_MSB_FIRST) # unpack shorts to symbols compatible with the iouter FSM input cardinality
enc_out = trellis.encoder_ss(fo,0) # initial state = 0
@@ -73,7 +73,7 @@ def run_test (fo,fi,interleaver,Kb,bitspersymbol,K,dimensionality,tot_constellat
# RX
(head,tail) = make_rx(tb,fo,fi,dimensionality,tot_constellation,K,interleaver,IT,Es,N0,trellis.TRELLIS_MIN_SUM)
fsmi2s = blocks.unpacked_to_packed_ss(bitspersymbol,gr.GR_MSB_FIRST) # pack FSM input symbols to shorts
- dst = gr.check_lfsr_32k_s();
+ dst = blocks.check_lfsr_32k_s();
tb.connect (src,src_head,s2fsmi,enc_out,inter,enc_in,mod)
tb.connect (mod,(add,0))
diff --git a/gr-trellis/examples/python/test_viterbi_equalization.py b/gr-trellis/examples/python/test_viterbi_equalization.py
index f1e61f90cb..987f171b2a 100755
--- a/gr-trellis/examples/python/test_viterbi_equalization.py
+++ b/gr-trellis/examples/python/test_viterbi_equalization.py
@@ -17,7 +17,7 @@ def run_test (f,Kb,bitspersymbol,K,dimensionality,tot_constellation,N0,seed):
tb = gr.top_block ()
# TX
- src = gr.lfsr_32k_source_s()
+ src = blocks.lfsr_32k_source_s()
src_head = blocks.head (gr.sizeof_short,Kb/16) # packet size in shorts
s2fsmi = blocks.packed_to_unpacked_ss(bitspersymbol,gr.GR_MSB_FIRST) # unpack shorts to symbols compatible with the FSM input cardinality
enc = trellis.encoder_ss(f,0) # initial state = 0
@@ -32,7 +32,7 @@ def run_test (f,Kb,bitspersymbol,K,dimensionality,tot_constellation,N0,seed):
metrics = trellis.metrics_f(f.O(),dimensionality,tot_constellation,digital.TRELLIS_EUCLIDEAN) # data preprocessing to generate metrics for Viterbi
va = trellis.viterbi_s(f,K,0,-1) # Put -1 if the Initial/Final states are not set.
fsmi2s = blocks.unpacked_to_packed_ss(bitspersymbol,gr.GR_MSB_FIRST) # pack FSM input symbols to shorts
- dst = gr.check_lfsr_32k_s();
+ dst = blocks.check_lfsr_32k_s();
tb.connect (src,src_head,s2fsmi,enc,mod)
tb.connect (mod,(add,0))
diff --git a/gr-trellis/python/qa_trellis.py b/gr-trellis/python/qa_trellis.py
index 07097f906c..b0a2f8a745 100755
--- a/gr-trellis/python/qa_trellis.py
+++ b/gr-trellis/python/qa_trellis.py
@@ -106,7 +106,7 @@ class trellis_tb(gr.top_block):
K = packet_size/bitspersymbol
# TX
- src = gr.lfsr_32k_source_s()
+ src = blocks.lfsr_32k_source_s()
# packet size in shorts
src_head = blocks.head(gr.sizeof_short, packet_size/16)
# unpack shorts to symbols compatible with the FSM input cardinality
@@ -127,7 +127,7 @@ class trellis_tb(gr.top_block):
# pack FSM input symbols to shorts
fsmi2s = blocks.unpacked_to_packed_ss(bitspersymbol, gr.GR_MSB_FIRST)
# check the output
- self.dst = gr.check_lfsr_32k_s()
+ self.dst = blocks.check_lfsr_32k_s()
self.connect (src, src_head, s2fsmi, enc, mod)
self.connect (mod, (add, 0))
--
cgit v1.2.3