From ff81c844713b5234622ceb906af219a569d0914f Mon Sep 17 00:00:00 2001
From: Tim O'Shea
Date: Wed, 28 Nov 2012 14:52:36 -0800
Subject: adding patterned interleaver block
---
gr-blocks/grc/blocks_patterned_interleaver.xml | 66 ++++++++++++++++++
gr-blocks/include/blocks/CMakeLists.txt | 1 +
gr-blocks/include/blocks/patterned_interleaver.h | 23 +++++++
gr-blocks/lib/CMakeLists.txt | 1 +
gr-blocks/lib/patterned_interleaver_impl.cc | 87 ++++++++++++++++++++++++
gr-blocks/lib/patterned_interleaver_impl.h | 61 +++++++++++++++++
gr-blocks/swig/blocks_swig.i | 3 +
7 files changed, 242 insertions(+)
create mode 100644 gr-blocks/grc/blocks_patterned_interleaver.xml
create mode 100644 gr-blocks/include/blocks/patterned_interleaver.h
create mode 100644 gr-blocks/lib/patterned_interleaver_impl.cc
create mode 100644 gr-blocks/lib/patterned_interleaver_impl.h
(limited to 'gr-blocks')
diff --git a/gr-blocks/grc/blocks_patterned_interleaver.xml b/gr-blocks/grc/blocks_patterned_interleaver.xml
new file mode 100644
index 000000000..8dd0fac41
--- /dev/null
+++ b/gr-blocks/grc/blocks_patterned_interleaver.xml
@@ -0,0 +1,66 @@
+
+
+
+ Patterned Interleaver
+ blocks_patterned_interleaver
+ from gnuradio import blocks
+ blocks.patterned_interleaver($type.size*$vlen, $pattern)
+
+ IO Type
+ type
+ enum
+
+
+
+
+
+
+
+ Pattern
+ pattern
+ [0,0,1,2]
+ int_vector
+
+
+ Vec Length
+ vlen
+ 1
+ int
+
+ $vlen >= 1
+
+ in
+ $type
+ $vlen
+ 1+max($pattern)
+
+
+ out
+ $type
+ $vlen
+
+
diff --git a/gr-blocks/include/blocks/CMakeLists.txt b/gr-blocks/include/blocks/CMakeLists.txt
index ac674528f..787fddba3 100644
--- a/gr-blocks/include/blocks/CMakeLists.txt
+++ b/gr-blocks/include/blocks/CMakeLists.txt
@@ -118,6 +118,7 @@ install(FILES
multiply_const_cc.h
multiply_const_ff.h
nlog10_ff.h
+ patterned_interleaver.h
repeat.h
short_to_char.h
short_to_float.h
diff --git a/gr-blocks/include/blocks/patterned_interleaver.h b/gr-blocks/include/blocks/patterned_interleaver.h
new file mode 100644
index 000000000..cfcdac6e7
--- /dev/null
+++ b/gr-blocks/include/blocks/patterned_interleaver.h
@@ -0,0 +1,23 @@
+#ifndef INCLUDED_BLOCKS_PATTERNED_INTERLEAVER_H
+#define INCLUDED_BLOCKS_PATTERNED_INTERLEAVER_H
+
+#include
+#include
+
+namespace gr {
+ namespace blocks {
+
+ class BLOCKS_API patterned_interleaver : virtual public gr_block
+ {
+ public:
+
+ typedef boost::shared_ptr sptr;
+
+ static sptr make(size_t itemsize, std::vector pattern);
+ };
+
+ }
+}
+
+#endif
+
diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt
index 0b6c89298..3a8ffac75 100644
--- a/gr-blocks/lib/CMakeLists.txt
+++ b/gr-blocks/lib/CMakeLists.txt
@@ -160,6 +160,7 @@ list(APPEND gr_blocks_sources
multiply_const_cc_impl.cc
multiply_const_ff_impl.cc
nlog10_ff_impl.cc
+ patterned_interleaver_impl.cc
repeat_impl.cc
short_to_char_impl.cc
short_to_float_impl.cc
diff --git a/gr-blocks/lib/patterned_interleaver_impl.cc b/gr-blocks/lib/patterned_interleaver_impl.cc
new file mode 100644
index 000000000..c53ba03d7
--- /dev/null
+++ b/gr-blocks/lib/patterned_interleaver_impl.cc
@@ -0,0 +1,87 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 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 "patterned_interleaver_impl.h"
+#include
+
+namespace gr {
+ namespace blocks {
+
+ patterned_interleaver::sptr patterned_interleaver::make(size_t itemsize, std::vector pattern)
+ {
+ return gnuradio::get_initial_sptr(new patterned_interleaver_impl(itemsize, pattern));
+ }
+
+ patterned_interleaver_impl::patterned_interleaver_impl(size_t itemsize, std::vector pattern)
+ : gr_block ("patterned_interleaver",
+ gr_make_io_signature (pattern_max(pattern)+1, pattern_max(pattern)+1, itemsize),
+ gr_make_io_signature (1, 1, itemsize)),
+ d_pattern(pattern), d_counts( pattern_max(pattern)+1, 0), d_itemsize(itemsize)
+ {
+ BOOST_FOREACH( int i, d_pattern)
+ { d_counts[i]++; }
+ set_output_multiple(d_pattern.size());
+ }
+
+ int
+ patterned_interleaver_impl::general_work(int noutput_items,
+ gr_vector_int &ninput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items)
+ {
+ size_t nblks = noutput_items/d_pattern.size();
+
+ std::vector ii;
+ for(size_t i=0; i
+#include
+
+namespace gr {
+ namespace blocks {
+
+ class BLOCKS_API patterned_interleaver_impl : public patterned_interleaver
+ {
+ public:
+ patterned_interleaver_impl(size_t itemsize, std::vector pattern);
+
+ int general_work(int noutput_items,
+ gr_vector_int &ninput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items);
+
+ int pattern_max(std::vector pattern){
+ int mval(0);
+ BOOST_FOREACH( int i, pattern)
+ { mval = std::max(mval, i); }
+ return mval;
+ }
+
+ void forecast (int noutput_items,
+ gr_vector_int &ninput_items_required);
+
+ std::vector d_pattern;
+ std::vector d_counts;
+ size_t d_itemsize;
+
+ };
+
+ } /* namespace blocks */
+} /* namespace gr */
+
+#endif
diff --git a/gr-blocks/swig/blocks_swig.i b/gr-blocks/swig/blocks_swig.i
index 45b259498..7ec6bb423 100644
--- a/gr-blocks/swig/blocks_swig.i
+++ b/gr-blocks/swig/blocks_swig.i
@@ -93,6 +93,7 @@
#include "blocks/not_bb.h"
#include "blocks/not_ss.h"
#include "blocks/not_ii.h"
+#include "blocks/patterned_interleaver.h"
#include "blocks/or_bb.h"
#include "blocks/or_ss.h"
#include "blocks/or_ii.h"
@@ -181,6 +182,7 @@
%include "blocks/not_bb.h"
%include "blocks/not_ss.h"
%include "blocks/not_ii.h"
+%include "blocks/patterned_interleaver.h"
%include "blocks/or_bb.h"
%include "blocks/or_ss.h"
%include "blocks/or_ii.h"
@@ -268,6 +270,7 @@ GR_SWIG_BLOCK_MAGIC2(blocks, nlog10_ff);
GR_SWIG_BLOCK_MAGIC2(blocks, not_bb);
GR_SWIG_BLOCK_MAGIC2(blocks, not_ss);
GR_SWIG_BLOCK_MAGIC2(blocks, not_ii);
+GR_SWIG_BLOCK_MAGIC2(blocks, patterned_interleaver);
GR_SWIG_BLOCK_MAGIC2(blocks, or_bb);
GR_SWIG_BLOCK_MAGIC2(blocks, or_ss);
GR_SWIG_BLOCK_MAGIC2(blocks, or_ii);
--
cgit