3 files changed, 52 insertions, 8 deletions
diff --git a/gr-digital/lib/digital_impl_mpsk_snr_est.cc b/gr-digital/lib/digital_impl_mpsk_snr_est.cc
index 8adc6ffed..87ac84e04 100644
--- a/gr-digital/lib/digital_impl_mpsk_snr_est.cc
+++ b/gr-digital/lib/digital_impl_mpsk_snr_est.cc
@@ -187,7 +187,51 @@ digital_impl_mpsk_snr_est_m2m4::snr()
 /********************************************************************/
 
 
-digital_impl_mpsk_snr_est_svn::digital_impl_mpsk_snr_est_svn(
+digital_impl_snr_est_m2m4::digital_impl_snr_est_m2m4(
+		   double alpha, double ka, double kw) :
+  digital_impl_mpsk_snr_est(alpha)
+{
+  d_y1 = 0;
+  d_y2 = 0;
+  d_ka = ka;
+  d_kw = kw;
+}
+
+int
+digital_impl_snr_est_m2m4::update(
+		 int noutput_items,
+		 gr_vector_const_void_star &input_items)
+{
+  const gr_complex *in = (const gr_complex *) input_items[0];
+
+  for (int i = 0; i < noutput_items; i++) {
+    double y1 = abs(in[i])*abs(in[i]);
+    d_y1 = d_alpha*y1 + d_beta*d_y1;
+
+    double y2 = abs(in[i])*abs(in[i])*abs(in[i])*abs(in[i]);
+    d_y2 = d_alpha*y2 + d_beta*d_y2;
+  }
+  return noutput_items;
+}
+
+double
+digital_impl_snr_est_m2m4::snr()
+{
+  double M2 = d_y1;
+  double M4 = d_y2;
+  double s = M2*(d_kw - 2) + 
+    sqrt((4.0-d_ka*d_kw)*M2*M2 + M4*(d_ka+d_kw-4.0)) /
+    (d_ka + d_kw - 4.0);
+  double n = M2 - s;
+  
+  return 10.0*log10(s / n);
+}
+
+
+/********************************************************************/
+
+
+digital_impl_mpsk_snr_est_svr::digital_impl_mpsk_snr_est_svr(
 		   double alpha) :
   digital_impl_mpsk_snr_est(alpha)
 {
@@ -196,7 +240,7 @@ digital_impl_mpsk_snr_est_svn::digital_impl_mpsk_snr_est_svn(
 }
 
 int
-digital_impl_mpsk_snr_est_svn::update(
+digital_impl_mpsk_snr_est_svr::update(
 		 int noutput_items,
 		 gr_vector_const_void_star &input_items)
 {
@@ -215,7 +259,7 @@ digital_impl_mpsk_snr_est_svn::update(
 }
 
 double
-digital_impl_mpsk_snr_est_svn::snr()
+digital_impl_mpsk_snr_est_svr::snr()
 {
   double x = d_y1 / (d_y2 - d_y1);
   return 10.0*log10(2.*((x-1) + sqrt(x*(x-1))));
diff --git a/gr-digital/lib/digital_mpsk_snr_est_cc.cc b/gr-digital/lib/digital_mpsk_snr_est_cc.cc
index 7d75dbb8b..b71ac0022 100644
--- a/gr-digital/lib/digital_mpsk_snr_est_cc.cc
+++ b/gr-digital/lib/digital_mpsk_snr_est_cc.cc
@@ -67,7 +67,7 @@ digital_mpsk_snr_est_cc::work(int noutput_items,
   memcpy(output_items[0], input_items[0],
 	 noutput_items * sizeof(gr_complex));
 
-  // Update the SNR estimate registers from the current inputs
+  // Update the SNR estimate registers from the current 
   return d_snr_est->update(noutput_items, input_items);
 }
 
@@ -110,8 +110,8 @@ digital_mpsk_snr_est_cc::set_type(snr_est_type_t t)
   case(SNR_EST_M2M4):
     d_snr_est = new digital_impl_mpsk_snr_est_m2m4(d_alpha);
     break;
-  case(SNR_EST_SVN):
-    d_snr_est = new digital_impl_mpsk_snr_est_svn(d_alpha);
+  case(SNR_EST_SVR):
+    d_snr_est = new digital_impl_mpsk_snr_est_svr(d_alpha);
     break;
   default:
     throw std::invalid_argument("digital_mpsk_snr_est_cc: unknown type specified.\n");
diff --git a/gr-digital/lib/digital_probe_mpsk_snr_est_c.cc b/gr-digital/lib/digital_probe_mpsk_snr_est_c.cc
index 259074e13..07f4e93de 100644
--- a/gr-digital/lib/digital_probe_mpsk_snr_est_c.cc
+++ b/gr-digital/lib/digital_probe_mpsk_snr_est_c.cc
@@ -106,8 +106,8 @@ digital_probe_mpsk_snr_est_c::set_type(snr_est_type_t t)
   case(SNR_EST_M2M4):
     d_snr_est = new digital_impl_mpsk_snr_est_m2m4(d_alpha);
     break;
-  case(SNR_EST_SVN):
-    d_snr_est = new digital_impl_mpsk_snr_est_svn(d_alpha);
+  case(SNR_EST_SVR):
+    d_snr_est = new digital_impl_mpsk_snr_est_svr(d_alpha);
     break;
   default:
     throw std::invalid_argument("digital_probe_mpsk_snr_est_c: unknown type specified.\n");