Merged anastas/wip changes r3156:3218 into trunk.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3219 221aa14e-8319-0410-a670-987f0aec2ac5

1 files changed, 76 insertions, 0 deletions

diff --git a/gr-trellis/src/lib/trellis_encoder_ii.cc b/gr-trellis/src/lib/trellis_encoder_ii.cc
new file mode 100644
index 000000000..3469a235d
--- /dev/null
+++ b/gr-trellis/src/lib/trellis_encoder_ii.cc
@@ -0,0 +1,76 @@
+/* -*- 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 2, 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., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <trellis_encoder_ii.h>
+#include <gr_io_signature.h>
+#include <iostream>
+
+trellis_encoder_ii_sptr 
+trellis_make_encoder_ii (const fsm &FSM, const int ST)
+{
+  return trellis_encoder_ii_sptr (new trellis_encoder_ii (FSM,ST));
+}
+
+trellis_encoder_ii::trellis_encoder_ii (const fsm &FSM, const int ST)
+  : gr_sync_block ("encoder_ii",
+		   gr_make_io_signature (1, -1, sizeof (int)),
+		   gr_make_io_signature (1, -1, sizeof (int))),
+    d_FSM (FSM),
+    d_ST (ST)
+{
+}
+
+
+
+int 
+trellis_encoder_ii::work (int noutput_items,
+			gr_vector_const_void_star &input_items,
+			gr_vector_void_star &output_items)
+{
+  int d_ST_tmp;
+
+  assert (input_items.size() == output_items.size());
+  int nstreams = input_items.size();
+
+for (int m=0;m<nstreams;m++) {
+  const int *in = (const int *) input_items[m];
+  int *out = (int *) output_items[m];
+  d_ST_tmp = d_ST;
+
+// per stream processing
+
+  for (int i = 0; i < noutput_items; i++){
+    out[i] = (int) d_FSM.OS()[d_ST_tmp*d_FSM.I()+in[i]]; // direction of time?
+    d_ST_tmp = (int) d_FSM.NS()[d_ST_tmp*d_FSM.I()+in[i]];
+  }
+
+// end per stream processing
+}
+  d_ST = d_ST_tmp;
+
+  return noutput_items;
+}
+