11 files changed, 201 insertions, 79 deletions
diff --git a/gnuradio-core/src/guile/tests/general_ctors.test b/gnuradio-core/src/guile/tests/general_ctors.test
index 06cd395330..eb0e5876e6 100644
--- a/gnuradio-core/src/guile/tests/general_ctors.test
+++ b/gnuradio-core/src/guile/tests/general_ctors.test
@@ -200,9 +200,6 @@
 ;;; ./general/gr_map_bb.h
 (pass-if (true? (gr:map-bb #(1 2))))
 
-;;; ./general/gr_mpsk_receiver_cc.h
-(pass-if (true? (gr:mpsk-receiver-cc 1 1 1 1 1 1 1 1 1 1 1)))
-
 ;;; ./general/gr_nlog10_ff.h
 (pass-if (true? (gr:nlog10-ff 1 1 1)))
 
diff --git a/gnuradio-core/src/lib/general/Makefile.am b/gnuradio-core/src/lib/general/Makefile.am
index 7382df7214..e63d8930bc 100644
--- a/gnuradio-core/src/lib/general/Makefile.am
+++ b/gnuradio-core/src/lib/general/Makefile.am
@@ -92,7 +92,6 @@ libgeneral_la_SOURCES = 		\
 	gr_lfsr_32k_source_s.cc		\
 	gr_map_bb.cc			\
 	gr_misc.cc			\
-	gr_mpsk_receiver_cc.cc		\
 	gr_nlog10_ff.cc			\
 	gr_nop.cc			\
 	gr_null_sink.cc			\
@@ -246,7 +245,6 @@ grinclude_HEADERS = 			\
 	gr_math.h			\
 	gr_misc.h			\
 	gr_nco.h			\
-	gr_mpsk_receiver_cc.h		\
 	gr_nlog10_ff.h			\
 	gr_nop.h			\
 	gr_null_sink.h			\
@@ -403,7 +401,6 @@ swiginclude_HEADERS =			\
 	gr_kludge_copy.i		\
 	gr_lfsr_32k_source_s.i		\
 	gr_map_bb.i			\
-	gr_mpsk_receiver_cc.i		\
 	gr_nlog10_ff.i			\
 	gr_nop.i			\
 	gr_null_sink.i			\
diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i
index d10b6ecfb2..c43622400b 100644
--- a/gnuradio-core/src/lib/general/general.i
+++ b/gnuradio-core/src/lib/general/general.i
@@ -69,7 +69,6 @@
 #include <gr_nlog10_ff.h>
 #include <gr_fake_channel_coder_pp.h>
 #include <gr_throttle.h>
-#include <gr_mpsk_receiver_cc.h>
 #include <gr_stream_mux.h>
 #include <gr_stream_to_streams.h>
 #include <gr_streams_to_stream.h>
@@ -187,7 +186,6 @@
 %include "gr_nlog10_ff.i"
 %include "gr_fake_channel_coder_pp.i"
 %include "gr_throttle.i"
-%include "gr_mpsk_receiver_cc.i"
 %include "gr_stream_mux.i"
 %include "gr_stream_to_streams.i"
 %include "gr_streams_to_stream.i"
diff --git a/gr-digital/lib/Makefile.am b/gr-digital/lib/Makefile.am
index e3cbbe7ea6..86b98726b8 100644
--- a/gr-digital/lib/Makefile.am
+++ b/gr-digital/lib/Makefile.am
@@ -37,7 +37,8 @@ grinclude_HEADERS = 				\
 	digital_crc32.h				\
 	digital_lms_dd_equalizer_cc.h		\
 	digital_kurtotic_equalizer_cc.h 	\
-	digital_metric_type.h
+	digital_metric_type.h			\
+	digital_mpsk_receiver_cc.h
 
 lib_LTLIBRARIES = libgnuradio-digital.la
 
@@ -53,7 +54,8 @@ libgnuradio_digital_la_SOURCES = 		\
 	digital_cma_equalizer_cc.cc		\
 	digital_crc32.cc			\
 	digital_lms_dd_equalizer_cc.cc		\
-	digital_kurtotic_equalizer_cc.cc
+	digital_kurtotic_equalizer_cc.cc	\
+	digital_mpsk_receiver_cc.cc
 
 libgnuradio_digital_la_LIBADD =	\
 	$(GNURADIO_CORE_LA)
diff --git a/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc b/gr-digital/lib/digital_mpsk_receiver_cc.cc
index bc51c67693..3b2ea98404 100644
--- a/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc
+++ b/gr-digital/lib/digital_mpsk_receiver_cc.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2005,2006,2007,2010 Free Software Foundation, Inc.
+ * Copyright 2005,2006,2007,2010,2011 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
  *
@@ -26,7 +26,7 @@
 
 #include <gr_io_signature.h>
 #include <gr_prefs.h>
-#include <gr_mpsk_receiver_cc.h>
+#include <digital_mpsk_receiver_cc.h>
 #include <stdexcept>
 #include <gr_math.h>
 #include <gr_expj.h>
@@ -39,21 +39,21 @@
 
 // Public constructor
 
-gr_mpsk_receiver_cc_sptr 
-gr_make_mpsk_receiver_cc(unsigned int M, float theta,
+digital_mpsk_receiver_cc_sptr 
+digital_make_mpsk_receiver_cc(unsigned int M, float theta,
 			 float alpha, float beta,
 			 float fmin, float fmax,
 			 float mu, float gain_mu, 
 			 float omega, float gain_omega, float omega_rel)
 {
-  return gnuradio::get_initial_sptr(new gr_mpsk_receiver_cc (M, theta, 
+  return gnuradio::get_initial_sptr(new digital_mpsk_receiver_cc (M, theta, 
 							    alpha, beta,
 							    fmin, fmax,
 							    mu, gain_mu, 
 							    omega, gain_omega, omega_rel));
 }
 
-gr_mpsk_receiver_cc::gr_mpsk_receiver_cc (unsigned int M, float theta, 
+digital_mpsk_receiver_cc::digital_mpsk_receiver_cc (unsigned int M, float theta, 
 					  float alpha, float beta,
 					  float fmin, float fmax,
 					  float mu, float gain_mu, 
@@ -90,29 +90,29 @@ gr_mpsk_receiver_cc::gr_mpsk_receiver_cc (unsigned int M, float theta,
   // Select a phase detector and a decision maker for the modulation order
   switch(d_M) {
   case 2:  // optimized algorithms for BPSK
-    d_phase_error_detector = &gr_mpsk_receiver_cc::phase_error_detector_bpsk; //bpsk;
-    d_decision = &gr_mpsk_receiver_cc::decision_bpsk;
+    d_phase_error_detector = &digital_mpsk_receiver_cc::phase_error_detector_bpsk; //bpsk;
+    d_decision = &digital_mpsk_receiver_cc::decision_bpsk;
     break;
 
   case 4: // optimized algorithms for QPSK
-    d_phase_error_detector = &gr_mpsk_receiver_cc::phase_error_detector_qpsk; //qpsk;
-    d_decision = &gr_mpsk_receiver_cc::decision_qpsk;
+    d_phase_error_detector = &digital_mpsk_receiver_cc::phase_error_detector_qpsk; //qpsk;
+    d_decision = &digital_mpsk_receiver_cc::decision_qpsk;
     break;
 
   default: // generic algorithms for any M (power of 2?) but not pretty
-    d_phase_error_detector = &gr_mpsk_receiver_cc::phase_error_detector_generic;
-    d_decision = &gr_mpsk_receiver_cc::decision_generic;
+    d_phase_error_detector = &digital_mpsk_receiver_cc::phase_error_detector_generic;
+    d_decision = &digital_mpsk_receiver_cc::decision_generic;
     break;
   }
 }
 
-gr_mpsk_receiver_cc::~gr_mpsk_receiver_cc ()
+digital_mpsk_receiver_cc::~digital_mpsk_receiver_cc ()
 {
   delete d_interp;
 }
 
 void
-gr_mpsk_receiver_cc::forecast(int noutput_items, gr_vector_int &ninput_items_required)
+digital_mpsk_receiver_cc::forecast(int noutput_items, gr_vector_int &ninput_items_required)
 {
   unsigned ninputs = ninput_items_required.size();
   for (unsigned i=0; i < ninputs; i++)
@@ -121,7 +121,7 @@ gr_mpsk_receiver_cc::forecast(int noutput_items, gr_vector_int &ninput_items_req
 
 // FIXME add these back in an test difference in performance
 float
-gr_mpsk_receiver_cc::phase_error_detector_qpsk(gr_complex sample) const
+digital_mpsk_receiver_cc::phase_error_detector_qpsk(gr_complex sample) const
 {
   float phase_error = 0;
   if(fabsf(sample.real()) > fabsf(sample.imag())) {
@@ -141,26 +141,26 @@ gr_mpsk_receiver_cc::phase_error_detector_qpsk(gr_complex sample) const
 }
 
 float
-gr_mpsk_receiver_cc::phase_error_detector_bpsk(gr_complex sample) const
+digital_mpsk_receiver_cc::phase_error_detector_bpsk(gr_complex sample) const
 {
   return -(sample.real()*sample.imag());
 }
 
-float gr_mpsk_receiver_cc::phase_error_detector_generic(gr_complex sample) const
+float digital_mpsk_receiver_cc::phase_error_detector_generic(gr_complex sample) const
 {
   //return gr_fast_atan2f(sample*conj(d_constellation[d_current_const_point]));
   return -arg(sample*conj(d_constellation[d_current_const_point]));
 }
 
 unsigned int
-gr_mpsk_receiver_cc::decision_bpsk(gr_complex sample) const
+digital_mpsk_receiver_cc::decision_bpsk(gr_complex sample) const
 {
   return (gr_branchless_binary_slicer(sample.real()) ^ 1);
   //return gr_binary_slicer(sample.real()) ^ 1;
 }
 
 unsigned int
-gr_mpsk_receiver_cc::decision_qpsk(gr_complex sample) const
+digital_mpsk_receiver_cc::decision_qpsk(gr_complex sample) const
 {
   unsigned int index;
 
@@ -170,7 +170,7 @@ gr_mpsk_receiver_cc::decision_qpsk(gr_complex sample) const
 }
 
 unsigned int
-gr_mpsk_receiver_cc::decision_generic(gr_complex sample) const
+digital_mpsk_receiver_cc::decision_generic(gr_complex sample) const
 {
   unsigned int min_m = 0;
   float min_s = 65535;
@@ -191,7 +191,7 @@ gr_mpsk_receiver_cc::decision_generic(gr_complex sample) const
 
 
 void
-gr_mpsk_receiver_cc::make_constellation()
+digital_mpsk_receiver_cc::make_constellation()
 {
   for(unsigned int m=0; m < d_M; m++) {
     d_constellation.push_back(gr_expj((M_TWOPI/d_M)*m));
@@ -199,7 +199,7 @@ gr_mpsk_receiver_cc::make_constellation()
 }
 
 void
-gr_mpsk_receiver_cc::mm_sampler(const gr_complex symbol)
+digital_mpsk_receiver_cc::mm_sampler(const gr_complex symbol)
 {
   gr_complex sample, nco;
 
@@ -222,7 +222,7 @@ gr_mpsk_receiver_cc::mm_sampler(const gr_complex symbol)
 }
 
 void
-gr_mpsk_receiver_cc::mm_error_tracking(gr_complex sample)
+digital_mpsk_receiver_cc::mm_error_tracking(gr_complex sample)
 {
   gr_complex u, x, y;
   float mm_error = 0;
@@ -259,7 +259,7 @@ gr_mpsk_receiver_cc::mm_error_tracking(gr_complex sample)
 
 
 void
-gr_mpsk_receiver_cc::phase_error_tracking(gr_complex sample)
+digital_mpsk_receiver_cc::phase_error_tracking(gr_complex sample)
 {
   float phase_error = 0;
 
@@ -286,10 +286,10 @@ gr_mpsk_receiver_cc::phase_error_tracking(gr_complex sample)
 }
 
 int
-gr_mpsk_receiver_cc::general_work (int noutput_items,
-				   gr_vector_int &ninput_items,
-				   gr_vector_const_void_star &input_items,
-				   gr_vector_void_star &output_items)
+digital_mpsk_receiver_cc::general_work (int noutput_items,
+					gr_vector_int &ninput_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];
diff --git a/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.h b/gr-digital/lib/digital_mpsk_receiver_cc.h
index f17b68aa0d..bcb06e17c9 100644
--- a/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.h
+++ b/gr-digital/lib/digital_mpsk_receiver_cc.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2007 Free Software Foundation, Inc.
+ * Copyright 2004,2007,2011 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
  *
@@ -20,8 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef INCLUDED_GR_MPSK_RECEIVER_CC_H
-#define	INCLUDED_GR_MPSK_RECEIVER_CC_H
+#ifndef INCLUDED_DIGITAL_MPSK_RECEIVER_CC_H
+#define	INCLUDED_DIGITAL_MPSK_RECEIVER_CC_H
 
 #include <gruel/attributes.h>
 #include <gr_block.h>
@@ -30,16 +30,16 @@
 
 class gri_mmse_fir_interpolator_cc;
 
-class gr_mpsk_receiver_cc;
-typedef boost::shared_ptr<gr_mpsk_receiver_cc> gr_mpsk_receiver_cc_sptr;
+class digital_mpsk_receiver_cc;
+typedef boost::shared_ptr<digital_mpsk_receiver_cc> digital_mpsk_receiver_cc_sptr;
 
 // public constructor
-gr_mpsk_receiver_cc_sptr 
-gr_make_mpsk_receiver_cc (unsigned int M, float theta, 
-			  float alpha, float beta,
-			  float fmin, float fmax,
-			  float mu, float gain_mu, 
-			  float omega, float gain_omega, float omega_rel);
+digital_mpsk_receiver_cc_sptr 
+digital_make_mpsk_receiver_cc (unsigned int M, float theta, 
+			       float alpha, float beta,
+			       float fmin, float fmax,
+			       float mu, float gain_mu, 
+			       float omega, float gain_omega, float omega_rel);
 
 /*!
  * \brief This block takes care of receiving M-PSK modulated signals through phase, frequency, and symbol
@@ -70,10 +70,10 @@ gr_make_mpsk_receiver_cc (unsigned int M, float theta,
  *
  */
 
-class gr_mpsk_receiver_cc : public gr_block
+class digital_mpsk_receiver_cc : public gr_block
 {
  public:
-  ~gr_mpsk_receiver_cc ();
+  ~digital_mpsk_receiver_cc ();
   void forecast(int noutput_items, gr_vector_int &ninput_items_required);
   int general_work (int noutput_items,
 		    gr_vector_int &ninput_items,
@@ -159,11 +159,11 @@ protected:
    * The constructor also chooses which phase detector and decision maker to use in the work loop based on the
    * value of M.
    */
-  gr_mpsk_receiver_cc (unsigned int M, float theta, 
-		       float alpha, float beta,
-		       float fmin, float fmax,
-		       float mu, float gain_mu, 
-		       float omega, float gain_omega, float omega_rel);
+  digital_mpsk_receiver_cc (unsigned int M, float theta, 
+			    float alpha, float beta,
+			    float fmin, float fmax,
+			    float mu, float gain_mu, 
+			    float omega, float gain_omega, float omega_rel);
 
   void make_constellation();
   void mm_sampler(const gr_complex symbol);
@@ -270,7 +270,7 @@ protected:
    *
    * \return index into d_constellation point that is the closest to the recieved sample
  */
-  unsigned int (gr_mpsk_receiver_cc::*d_decision)(gr_complex sample) const; // pointer to decision function
+  unsigned int (digital_mpsk_receiver_cc::*d_decision)(gr_complex sample) const; // pointer to decision function
 
 
   std::vector<gr_complex> d_constellation;
@@ -290,7 +290,7 @@ protected:
    * This is a function pointer that is set in the constructor to point to the proper phase error detector
    * function for the specified constellation order.
  */
-  float (gr_mpsk_receiver_cc::*d_phase_error_detector)(gr_complex sample) const;
+  float (digital_mpsk_receiver_cc::*d_phase_error_detector)(gr_complex sample) const;
 
 
   //! get interpolated value
@@ -305,12 +305,12 @@ protected:
   //! index to delay line
   unsigned int d_dl_idx;
 
-  friend gr_mpsk_receiver_cc_sptr
-  gr_make_mpsk_receiver_cc (unsigned int M, float theta,
-			    float alpha, float beta,
-			    float fmin, float fmax,
-			    float mu, float gain_mu, 
-			    float omega, float gain_omega, float omega_rel);
+  friend digital_mpsk_receiver_cc_sptr
+  digital_make_mpsk_receiver_cc (unsigned int M, float theta,
+				 float alpha, float beta,
+				 float fmin, float fmax,
+				 float mu, float gain_mu, 
+				 float omega, float gain_omega, float omega_rel);
 };
 
 #endif
diff --git a/gr-digital/python/Makefile.am b/gr-digital/python/Makefile.am
index 09be67f3a5..eea4dba955 100644
--- a/gr-digital/python/Makefile.am
+++ b/gr-digital/python/Makefile.am
@@ -41,7 +41,8 @@ noinst_PYTHON = \
 	qa_correlate_access_code.py	\
 	qa_costas_loop_cc.py		\
 	qa_crc32.py			\
-	qa_lms_equalizer.py
+	qa_lms_equalizer.py		\
+	qa_mpsk_receiver.py
 
 digital_PYTHON = \
 	__init__.py	\
diff --git a/gr-digital/python/qa_mpsk_receiver.py b/gr-digital/python/qa_mpsk_receiver.py
new file mode 100644
index 0000000000..7e9a76e1f2
--- /dev/null
+++ b/gr-digital/python/qa_mpsk_receiver.py
@@ -0,0 +1,123 @@
+#!/usr/bin/env python
+#
+# 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.
+# 
+
+from gnuradio import gr, gr_unittest
+import digital_swig, psk2
+import random, cmath
+
+class test_mpsk_receiver(gr_unittest.TestCase):
+
+    def setUp (self):
+        self.tb = gr.top_block ()
+
+    def tearDown (self):
+        self.tb = None
+
+    def test01 (self):
+        # Test BPSK sync
+        M = 2
+        theta = 0
+        alpha = 0.1
+        beta = 0.25*alpha*alpha
+        fmin = -0.5
+        fmax = 0.5
+        mu = 0.25
+        gain_mu = 0.01
+        omega = 2
+        gain_omega = 0.001
+        omega_rel = 0.001
+
+        self.test = digital_swig.mpsk_receiver_cc(M, theta, alpha, beta,
+                                                  fmin, fmax, mu, gain_mu,
+                                                  omega, gain_omega,
+                                                  omega_rel)
+        
+        data = 1000*[complex(1,0), complex(1,0), complex(-1,0), complex(-1,0)]
+        self.src = gr.vector_source_c(data, False)
+        self.snk = gr.vector_sink_c()
+
+        self.tb.connect(self.src, self.test, self.snk)
+        self.tb.run()
+        
+        expected_result = 1000*[complex(-0.5,0), complex(0.5,0)]
+        dst_data = self.snk.data()
+
+        # Only compare last Ncmp samples
+        Ncmp = 100
+        len_e = len(expected_result)
+        len_d = len(dst_data)
+        expected_result = expected_result[len_e - Ncmp:]
+        dst_data = dst_data[len_d - Ncmp:]
+
+        #print expected_result
+        #print dst_data
+        
+        self.assertComplexTuplesAlmostEqual (expected_result, dst_data, 1)
+
+
+    def test02 (self):
+        # Test QPSK sync
+        M = 4
+        theta = 0
+        alpha = 0.1
+        beta = 0.25*alpha*alpha
+        fmin = -0.5
+        fmax = 0.5
+        mu = 0.25
+        gain_mu = 0.01
+        omega = 2
+        gain_omega = 0.001
+        omega_rel = 0.001
+
+        self.test = digital_swig.mpsk_receiver_cc(M, theta, alpha, beta,
+                                                  fmin, fmax, mu, gain_mu,
+                                                  omega, gain_omega,
+                                                  omega_rel)
+        
+        data = 1000*[complex( 0.707,  0.707), complex( 0.707,  0.707),
+                     complex(-0.707,  0.707), complex(-0.707,  0.707),
+                     complex(-0.707, -0.707), complex(-0.707, -0.707),
+                     complex( 0.707, -0.707), complex( 0.707, -0.707)]
+        self.src = gr.vector_source_c(data, False)
+        self.snk = gr.vector_sink_c()
+
+        self.tb.connect(self.src, self.test, self.snk)
+        self.tb.run()
+        
+        expected_result = 1000*[complex(1.2, 0), complex(0, 1.2),
+                                complex(-1.2, 0), complex(0, -1.2)]
+        dst_data = self.snk.data()
+
+        # Only compare last Ncmp samples
+        Ncmp = 100
+        len_e = len(expected_result)
+        len_d = len(dst_data)
+        expected_result = expected_result[len_e - Ncmp:]
+        dst_data = dst_data[len_d - Ncmp:]
+
+        #print expected_result
+        #print dst_data
+        
+        self.assertComplexTuplesAlmostEqual (expected_result, dst_data, 1)
+
+if __name__ == '__main__':
+    gr_unittest.run(test_mpsk_receiver, "test_mpsk_receiver.xml")
diff --git a/gr-digital/swig/Makefile.am b/gr-digital/swig/Makefile.am
index 0a4176fc1c..08fb140acd 100644
--- a/gr-digital/swig/Makefile.am
+++ b/gr-digital/swig/Makefile.am
@@ -69,7 +69,8 @@ digital_swig_swiginclude_headers =		\
 	digital_cma_equalizer_cc.i		\
 	digital_crc32.i				\
 	digital_lms_dd_equalizer_cc.i		\
-	digital_kurtotic_equalizer_cc.i
+	digital_kurtotic_equalizer_cc.i		\
+	digital_mpsk_receiver_cc.i
 
 digital_swig_swig_args = \
 	-I$(abs_top_srcdir)/gr-digital/lib \
diff --git a/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.i b/gr-digital/swig/digital_mpsk_receiver_cc.i
index 88cb43e045..cdc9f661b5 100644
--- a/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.i
+++ b/gr-digital/swig/digital_mpsk_receiver_cc.i
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004,2011 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -20,21 +20,22 @@
  * Boston, MA 02110-1301, USA.
  */
 
-GR_SWIG_BLOCK_MAGIC(gr,mpsk_receiver_cc);
+GR_SWIG_BLOCK_MAGIC(digital,mpsk_receiver_cc);
 
-gr_mpsk_receiver_cc_sptr gr_make_mpsk_receiver_cc (unsigned int M, float theta,
-						   float alpha, float beta,
-						   float fmin, float fmax,
-						   float mu, float gain_mu, 
-						   float omega, float gain_omega, float omega_rel);
-class gr_mpsk_receiver_cc : public gr_block
+digital_mpsk_receiver_cc_sptr digital_make_mpsk_receiver_cc (unsigned int M, float theta,
+							     float alpha, float beta,
+							     float fmin, float fmax,
+							     float mu, float gain_mu, 
+							     float omega, float gain_omega,
+							     float omega_rel);
+class digital_mpsk_receiver_cc : public gr_block
 {
  private:
-  gr_mpsk_receiver_cc (unsigned int M,float theta,
-				float alpha, float beta,
-				float fmin, float fmax,
-				float mu, float gain_mu, 
-				float omega, float gain_omega, float omega_rel);
+  digital_mpsk_receiver_cc (unsigned int M,float theta,
+			    float alpha, float beta,
+			    float fmin, float fmax,
+			    float mu, float gain_mu, 
+			    float omega, float gain_omega, float omega_rel);
 public:
   float mu() const { return d_mu;}
   float omega() const { return d_omega;}
diff --git a/gr-digital/swig/digital_swig.i b/gr-digital/swig/digital_swig.i
index bc7c9b0d9e..cfaadcaea4 100644
--- a/gr-digital/swig/digital_swig.i
+++ b/gr-digital/swig/digital_swig.i
@@ -34,6 +34,7 @@
 #include "digital_crc32.h"
 #include "digital_kurtotic_equalizer_cc.h"
 #include "digital_lms_dd_equalizer_cc.h"
+#include "digital_mpsk_receiver_cc.h"
 %}
 
 %include "digital_binary_slicer_fb.i"
@@ -48,6 +49,7 @@
 %include "digital_crc32.i"
 %include "digital_kurtotic_equalizer_cc.i"
 %include "digital_lms_dd_equalizer_cc.i"
+%include "digital_mpsk_receiver_cc.i"
 
 #if SWIGGUILE
 %scheme %{