Tweaks for gcc 4.3 based on patch from Marek Mahut <mmahut@fedoraproject.org>.

[debian/gnuradio] / gr-trellis / src / lib / trellis_permutation.cc

diff --git a/gr-trellis/src/lib/trellis_permutation.cc b/gr-trellis/src/lib/trellis_permutation.cc
index 78bdbaf461b181d75639c5743c4537a1702c73cd..c80d820cd18d187ff7bdc2f763a1bc4c75642dad 100644 (file)
--- a/gr-trellis/src/lib/trellis_permutation.cc
+++ b/gr-trellis/src/lib/trellis_permutation.cc
@@ -6,7 +6,7 @@
  * 
  * 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 2, or (at your option)
+ * 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,
@@ -16,8 +16,8 @@
  * 
  * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -27,22 +27,24 @@
 #include <trellis_permutation.h>
 #include <gr_io_signature.h>
 #include <iostream>
+#include <string.h>
 
 trellis_permutation_sptr 
-trellis_make_permutation (const int K, const std::vector<int> &TABLE, const size_t NBYTES)
+trellis_make_permutation (int K, const std::vector<int> &TABLE, int SYMS_PER_BLOCK, size_t NBYTES_INOUT)
 {
-  return trellis_permutation_sptr (new trellis_permutation (K,TABLE,NBYTES));
+  return trellis_permutation_sptr (new trellis_permutation (K,TABLE,SYMS_PER_BLOCK,NBYTES_INOUT));
 }
 
-trellis_permutation::trellis_permutation (const int K, const std::vector<int> &TABLE, const size_t NBYTES)
+trellis_permutation::trellis_permutation (int K, const std::vector<int> &TABLE, int SYMS_PER_BLOCK, size_t NBYTES_INOUT)
   : gr_sync_block ("permutation",
-                  gr_make_io_signature (1, -1, NBYTES),
-                  gr_make_io_signature (1, -1, NBYTES)),
+                  gr_make_io_signature (1, -1, NBYTES_INOUT),
+                  gr_make_io_signature (1, -1, NBYTES_INOUT)),
     d_K (K),
     d_TABLE (TABLE),
-    d_NBYTES (NBYTES)
+    d_SYMS_PER_BLOCK (SYMS_PER_BLOCK),
+    d_NBYTES_INOUT (NBYTES_INOUT)
 {
-    set_output_multiple (d_K);
+    set_output_multiple (d_K*SYMS_PER_BLOCK);
     //std::cout << d_K << "\n";
 }
 
@@ -56,16 +58,23 @@ trellis_permutation::work (int noutput_items,
   int nstreams = input_items.size();
   assert (input_items.size() == output_items.size());
   assert (noutput_items % d_K ==0);
-  //std::cout << noutput_items << "\n";
 
   for (int m=0;m<nstreams;m++) {
     const char *in = (const char *) input_items[m];
     char *out = (char *) output_items[m];
 
     // per stream processing
-    for (unsigned int i = 0; i < noutput_items; i++){
-      //std::cout << i << " " << i*d_NBYTES << " " << (d_K*(i/d_K)+d_TABLE[i%d_K])*d_NBYTES  << "\n";
-      memcpy(&(out[i*d_NBYTES]), &(in[(d_K*(i/d_K)+d_TABLE[i%d_K])*d_NBYTES]), d_NBYTES);
+    for (int i = 0; i < noutput_items/d_SYMS_PER_BLOCK; i++){
+      // Index i refers to blocks.
+      // Begining of packet (in blocks)
+      int i0 = d_K*(i/d_K); 
+      // position of block within packet (in blocks)
+      int j0 = i%d_K;
+      // new position of block within packet (in blocks)
+      int k0 = d_TABLE[j0];
+      memcpy(&(out[i*d_SYMS_PER_BLOCK*d_NBYTES_INOUT]), 
+             &(in[(i0+k0)*d_SYMS_PER_BLOCK*d_NBYTES_INOUT]), 
+             d_NBYTES_INOUT*d_SYMS_PER_BLOCK);
     }
     // end per stream processing
   }