adding patterned interleaver block

7 files changed, 242 insertions, 0 deletions

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 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##Vector to Stream
+###################################################
+ -->
+<block>
+	<name>Patterned Interleaver</name>
+	<key>blocks_patterned_interleaver</key>
+	<import>from gnuradio import blocks</import>
+	<make>blocks.patterned_interleaver($type.size*$vlen, $pattern)</make>
+	<param>
+		<name>IO Type</name>
+		<key>type</key>
+		<type>enum</type>
+		<option>
+			<name>Complex</name>
+			<key>complex</key>
+			<opt>size:gr.sizeof_gr_complex</opt>
+		</option>
+		<option>
+			<name>Float</name>
+			<key>float</key>
+			<opt>size:gr.sizeof_float</opt>
+		</option>
+		<option>
+			<name>Int</name>
+			<key>int</key>
+			<opt>size:gr.sizeof_int</opt>
+		</option>
+		<option>
+			<name>Short</name>
+			<key>short</key>
+			<opt>size:gr.sizeof_short</opt>
+		</option>
+		<option>
+			<name>Byte</name>
+			<key>byte</key>
+			<opt>size:gr.sizeof_char</opt>
+		</option>
+	</param>
+	<param>
+		<name>Pattern</name>
+		<key>pattern</key>
+		<value>[0,0,1,2]</value>
+		<type>int_vector</type>
+	</param>
+	<param>
+		<name>Vec Length</name>
+		<key>vlen</key>
+		<value>1</value>
+		<type>int</type>
+	</param>
+	<check>$vlen &gt;= 1</check>
+	<sink>
+		<name>in</name>
+		<type>$type</type>
+		<vlen>$vlen</vlen>
+        <nports>1+max($pattern)</nports>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>$type</type>
+		<vlen>$vlen</vlen>
+	</source>
+</block>
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 <blocks/api.h>
+#include <gr_block.h>
+
+namespace gr {
+  namespace blocks {
+
+    class BLOCKS_API patterned_interleaver : virtual public gr_block
+    {
+    public:
+      
+      typedef boost::shared_ptr<patterned_interleaver> sptr;
+
+      static sptr make(size_t itemsize, std::vector<int> 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 <gr_io_signature.h>
+
+namespace gr {
+  namespace blocks {
+
+    patterned_interleaver::sptr patterned_interleaver::make(size_t itemsize, std::vector<int> pattern)
+    {
+      return gnuradio::get_initial_sptr(new patterned_interleaver_impl(itemsize, pattern));
+    }
+
+    patterned_interleaver_impl::patterned_interleaver_impl(size_t itemsize, std::vector<int> 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<const char*> ii;
+      for(size_t i=0; i<input_items.size(); i++){
+        ii.push_back((const char*)input_items[i]);
+        }
+
+      char *oo = (char *) output_items[0];
+      
+      for(size_t i=0; i<nblks; i++){
+        for(size_t j=0; j<d_pattern.size(); j++){
+          memcpy(oo, ii[j], d_itemsize);
+          oo += d_itemsize;
+          ii[j] += d_itemsize;
+          }
+        }
+            
+      for(size_t i=0; i<d_pattern.size(); i++){
+        consume(i, d_pattern[i]*nblks );
+      }
+      return nblks*d_pattern.size();
+    }
+
+    void patterned_interleaver_impl::forecast (int noutput_items,
+        gr_vector_int &ninput_items_required){
+            int nblks = noutput_items / d_pattern.size();
+            for(size_t i=0; i<ninput_items_required.size(); i++){
+                ninput_items_required[i] = d_counts[i] * nblks;
+            }
+        }
+
+  } /* namespace blocks */
+} /* namespace gr */
diff --git a/gr-blocks/lib/patterned_interleaver_impl.h b/gr-blocks/lib/patterned_interleaver_impl.h
new file mode 100644
index 000000000..4266c9636
--- /dev/null
+++ b/gr-blocks/lib/patterned_interleaver_impl.h
@@ -0,0 +1,61 @@
+/* -*- 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.
+ */
+
+#ifndef INCLUDED_PATTERNED_INTERLEAVER_IMPL_H
+#define INCLUDED_PATTERNED_INTERLEAVER_IMPL_H
+
+#include <blocks/patterned_interleaver.h>
+#include <boost/foreach.hpp>
+
+namespace gr {
+  namespace blocks {
+
+    class BLOCKS_API patterned_interleaver_impl : public patterned_interleaver
+    {
+    public:
+      patterned_interleaver_impl(size_t itemsize, std::vector<int> 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<int> 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<int> d_pattern;
+      std::vector<int> 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);