Merge branch '8psk' of https://github.com/trondeau/gnuradio into 8psk

1 files changed, 85 insertions, 0 deletions

diff --git a/gr-digital/lib/digital_lms_dd_equalizer_cc.cc b/gr-digital/lib/digital_lms_dd_equalizer_cc.cc
new file mode 100644
index 000000000..e2c2f16f2
--- /dev/null
+++ b/gr-digital/lib/digital_lms_dd_equalizer_cc.cc
@@ -0,0 +1,85 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2011 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 <digital_lms_dd_equalizer_cc.h>
+#include <gr_io_signature.h>
+#include <gr_misc.h>
+#include <iostream>
+
+digital_lms_dd_equalizer_cc_sptr
+digital_make_lms_dd_equalizer_cc(int num_taps, float mu, int sps,
+				 digital_constellation_sptr cnst)
+{
+  return gnuradio::get_initial_sptr(new digital_lms_dd_equalizer_cc(num_taps, mu,
+								    sps, cnst));
+}
+
+digital_lms_dd_equalizer_cc::digital_lms_dd_equalizer_cc(int num_taps, float mu,
+							 int sps,
+							 digital_constellation_sptr cnst)
+  : gr_adaptive_fir_ccc("lms_dd_equalizer_cc", sps,
+			std::vector<gr_complex>(num_taps, gr_complex(0,0))),
+    d_taps(num_taps), d_cnst(cnst)
+{
+  set_gain(mu);
+  if (num_taps > 0)
+    d_taps[num_taps/2] = 1.0;
+}
+
+
+
+
+/*
+int
+digital_lms_dd_equalizer_cc::work (int noutput_items,
+				   gr_vector_const_void_star &input_items,
+				   gr_vector_void_star &output_items)
+{
+  const gr_complex *in = (const gr_complex *) input_items[0];
+  gr_complex *out = (gr_complex *) output_items[0];
+  
+  gr_complex acc, decision, error;
+
+  for(int i = 0; i < noutput_items; i++) {
+    acc = 0;
+
+    // Compute output
+    for (size_t j=0; j < d_taps.size(); j++) 
+      acc += in[i+j] * conj(d_taps[j]);
+    
+    d_cnst->map_to_points(d_cnst->decision_maker(&acc), &decision);
+    error = decision - acc;
+    
+    //  Update taps
+    for (size_t j=0; j < d_taps.size(); j++)
+      d_taps[j] += d_mu * conj(error) * in[i+j];
+    
+    out[i] = acc;
+  }
+
+  return noutput_items;
+}
+*/