digital: moved clock_recovery_ff/cc to gr-digital.

8 files changed, 0 insertions, 663 deletions

diff --git a/gnuradio-core/src/lib/general/Makefile.am b/gnuradio-core/src/lib/general/Makefile.am
index a58f88594..f1f5eff43 100644
--- a/gnuradio-core/src/lib/general/Makefile.am
+++ b/gnuradio-core/src/lib/general/Makefile.am
@@ -49,8 +49,6 @@ libgeneral_la_SOURCES = 		\
 	gr_check_counting_s.cc		\
 	gr_check_lfsr_32k_s.cc		\
 	gr_circular_file.cc		\
-	gr_clock_recovery_mm_cc.cc	\
-	gr_clock_recovery_mm_ff.cc	\
 	gr_complex_to_interleaved_short.cc \
 	gr_complex_to_xxx.cc		\
 	gr_conjugate_cc.cc		\
@@ -205,8 +203,6 @@ grinclude_HEADERS = 			\
 	gr_check_counting_s.h		\
 	gr_check_lfsr_32k_s.h		\
 	gr_circular_file.h		\
-	gr_clock_recovery_mm_cc.h	\
-	gr_clock_recovery_mm_ff.h	\
 	gr_complex_to_interleaved_short.h \
 	gr_complex_to_xxx.h		\
 	gr_conjugate_cc.h		\
@@ -378,8 +374,6 @@ swiginclude_HEADERS =			\
 	gr_char_to_float.i		\
 	gr_check_counting_s.i		\
 	gr_check_lfsr_32k_s.i		\
-	gr_clock_recovery_mm_cc.i	\
-	gr_clock_recovery_mm_ff.i	\
 	gr_complex_to_interleaved_short.i \
 	gr_complex_to_xxx.i		\
 	gr_conjugate_cc.i		\
diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i
index 0dde39a66..7b735f2db 100644
--- a/gnuradio-core/src/lib/general/general.i
+++ b/gnuradio-core/src/lib/general/general.i
@@ -79,8 +79,6 @@
 #include <gr_vco_f.h>
 #include <gr_crc32.h>
 #include <gr_threshold_ff.h>
-#include <gr_clock_recovery_mm_ff.h>
-#include <gr_clock_recovery_mm_cc.h>
 #include <gr_packet_sink.h>
 #include <gr_lms_dfe_cc.h>
 #include <gr_lms_dfe_ff.h>
@@ -204,8 +202,6 @@
 %include "gr_vco_f.i"
 %include "gr_crc32.i"
 %include "gr_threshold_ff.i"
-%include "gr_clock_recovery_mm_ff.i"
-%include "gr_clock_recovery_mm_cc.i"
 %include "gr_packet_sink.i"
 %include "gr_lms_dfe_cc.i"
 %include "gr_lms_dfe_ff.i"
diff --git a/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc b/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc
deleted file mode 100644
index 7c20f7fd9..000000000
--- a/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc
+++ /dev/null
@@ -1,215 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005,2006,2010 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 <gr_io_signature.h>
-#include <gr_prefs.h>
-#include <gr_clock_recovery_mm_cc.h>
-#include <gri_mmse_fir_interpolator_cc.h>
-#include <stdexcept>
-#include <cstdio>
-
-
-// Public constructor
-static const int FUDGE = 16;
-
-gr_clock_recovery_mm_cc_sptr 
-gr_make_clock_recovery_mm_cc(float omega, float gain_omega, float mu, float gain_mu,
-			     float omega_relative_limit)
-{
-  return gnuradio::get_initial_sptr(new gr_clock_recovery_mm_cc (omega, 
-								    gain_omega, 
-								    mu,
-								    gain_mu,
-								    omega_relative_limit));
-}
-
-gr_clock_recovery_mm_cc::gr_clock_recovery_mm_cc (float omega, float gain_omega, float mu, 
-						  float gain_mu, float omega_relative_limit)
-  : gr_block ("clock_recovery_mm_cc",
-	      gr_make_io_signature (1, 1, sizeof (gr_complex)),
-	      gr_make_io_signature (1, 2, sizeof (gr_complex))),
-    d_mu (mu), d_omega(omega), d_gain_omega(gain_omega), 
-    d_omega_relative_limit(omega_relative_limit), 
-    d_gain_mu(gain_mu), d_last_sample(0), d_interp(new gri_mmse_fir_interpolator_cc()),
-    d_verbose(gr_prefs::singleton()->get_bool("clock_recovery_mm_cc", "verbose", false)),
-    d_p_2T(0), d_p_1T(0), d_p_0T(0), d_c_2T(0), d_c_1T(0), d_c_0T(0)
-{
-  if (omega <= 0.0)
-    throw std::out_of_range ("clock rate must be > 0");
-  if (gain_mu <  0  || gain_omega < 0)
-    throw std::out_of_range ("Gains must be non-negative");
-
-  set_omega(omega);			// also sets min and max omega
-  set_relative_rate (1.0 / omega);
-  set_history(3);			// ensure 2 extra input sample is available
-}
-
-gr_clock_recovery_mm_cc::~gr_clock_recovery_mm_cc ()
-{
-  delete d_interp;
-}
-
-void
-gr_clock_recovery_mm_cc::forecast(int noutput_items, gr_vector_int &ninput_items_required)
-{
-  unsigned ninputs = ninput_items_required.size();
-  for (unsigned i=0; i < ninputs; i++)
-    ninput_items_required[i] =
-      (int) ceil((noutput_items * d_omega) + d_interp->ntaps()) + FUDGE;
-}
-
-gr_complex
-gr_clock_recovery_mm_cc::slicer_0deg (gr_complex sample)
-{
-  float real=0, imag=0;
-
-  if(sample.real() > 0)
-    real = 1;
-  if(sample.imag() > 0)
-    imag = 1;
-  return gr_complex(real,imag);
-}
-
-gr_complex
-gr_clock_recovery_mm_cc::slicer_45deg (gr_complex sample)
-{
-  float real= -1, imag = -1;
-  if(sample.real() > 0)
-    real=1;
-  if(sample.imag() > 0)
-    imag = 1;
-  return gr_complex(real,imag);
-}
-
-/*
-  Modified Mueller and Muller clock recovery circuit
-  Based:
-     G. R. Danesfahani, T.G. Jeans, "Optimisation of modified Mueller and Muller 
-     algorithm,"  Electronics Letters, Vol. 31, no. 13,  22 June 1995, pp. 1032 - 1033.
-*/
-
-int
-gr_clock_recovery_mm_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];
-  gr_complex *foptr = (gr_complex *) output_items[1];
-
-  bool write_foptr = output_items.size() >= 2;
-  
-  int  ii = 0;				// input index
-  int  oo = 0;				// output index
-  int  ni = ninput_items[0] - d_interp->ntaps() - FUDGE;  // don't use more input than this
-
-  assert(d_mu >= 0.0);
-  assert(d_mu <= 1.0);
-
-  float mm_val=0;
-  gr_complex u, x, y;
-
-  // This loop writes the error to the second output, if it exists
-  if (write_foptr) {
-    while(oo < noutput_items && ii < ni) {
-      d_p_2T = d_p_1T;
-      d_p_1T = d_p_0T;
-      d_p_0T = d_interp->interpolate (&in[ii], d_mu);
-
-      d_c_2T = d_c_1T;
-      d_c_1T = d_c_0T;
-      d_c_0T = slicer_0deg(d_p_0T);
-      
-      x = (d_c_0T - d_c_2T) * conj(d_p_1T);
-      y = (d_p_0T - d_p_2T) * conj(d_c_1T);
-      u = y - x;
-      mm_val = u.real();
-      out[oo++] = d_p_0T;
-      
-      // limit mm_val
-      mm_val = gr_branchless_clip(mm_val,1.0);
-      d_omega = d_omega + d_gain_omega * mm_val;
-      d_omega = d_omega_mid + gr_branchless_clip(d_omega-d_omega_mid, d_omega_relative_limit);   // make sure we don't walk away
-
-      d_mu = d_mu + d_omega + d_gain_mu * mm_val;
-      ii += (int)floor(d_mu);
-      d_mu -= floor(d_mu);
-            
-      // write the error signal to the second output
-      foptr[oo-1] = gr_complex(d_mu,0);
-      
-      if (ii < 0)	// clamp it.  This should only happen with bogus input
-	ii = 0;
-    }
-  }
-  // This loop does not write to the second output (ugly, but faster)
-  else {
-    while(oo < noutput_items && ii < ni) {
-      d_p_2T = d_p_1T;
-      d_p_1T = d_p_0T;
-      d_p_0T = d_interp->interpolate (&in[ii], d_mu);
-
-      d_c_2T = d_c_1T;
-      d_c_1T = d_c_0T;
-      d_c_0T = slicer_0deg(d_p_0T);
-      
-      x = (d_c_0T - d_c_2T) * conj(d_p_1T);
-      y = (d_p_0T - d_p_2T) * conj(d_c_1T);
-      u = y - x;
-      mm_val = u.real();
-      out[oo++] = d_p_0T;
-      
-      // limit mm_val
-      mm_val = gr_branchless_clip(mm_val,1.0);
-      
-      d_omega = d_omega + d_gain_omega * mm_val;
-      d_omega = d_omega_mid + gr_branchless_clip(d_omega-d_omega_mid, d_omega_relative_limit);   // make sure we don't walk away
-      
-      d_mu = d_mu + d_omega + d_gain_mu * mm_val;
-      ii += (int)floor(d_mu);
-      d_mu -= floor(d_mu);
-      
-      if(d_verbose) {
-	printf("%f\t%f\n", d_omega, d_mu);
-      }
-            
-      if (ii < 0)	// clamp it.  This should only happen with bogus input
-	ii = 0;
-    }
-  }
-
-  if (ii > 0){
-    if (ii > ninput_items[0]){
-      fprintf(stderr, "gr_clock_recovery_mm_cc: ii > ninput_items[0] (%d > %d)\n",
-	      ii, ninput_items[0]);
-      assert(0);
-    }
-    consume_each (ii);
-  }
-
-  return oo;
-}
diff --git a/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.h b/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.h
deleted file mode 100644
index 04227a145..000000000
--- a/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* -*- 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 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.
- */
-
-#ifndef INCLUDED_GR_CLOCK_RECOVERY_MM_CC_H
-#define	INCLUDED_GR_CLOCK_RECOVERY_MM_CC_H
-
-#include <gr_block.h>
-#include <gr_complex.h>
-#include <gr_math.h>
-
-class gri_mmse_fir_interpolator_cc;
-
-class gr_clock_recovery_mm_cc;
-typedef boost::shared_ptr<gr_clock_recovery_mm_cc> gr_clock_recovery_mm_cc_sptr;
-
-// public constructor
-gr_clock_recovery_mm_cc_sptr 
-gr_make_clock_recovery_mm_cc (float omega, float gain_omega, float mu, float gain_mu,
-			      float omega_relative_limit=0.001);
-
-/*!
- * \brief Mueller and Müller (M&M) based clock recovery block with complex input, complex output.
- * \ingroup sync_blk
- *
- * This implements the Mueller and Müller (M&M) discrete-time error-tracking synchronizer.
- * The complex version here is based on:
- * Modified Mueller and Muller clock recovery circuit
- * Based:
- *    G. R. Danesfahani, T.G. Jeans, "Optimisation of modified Mueller and Muller 
- *    algorithm,"  Electronics Letters, Vol. 31, no. 13,  22 June 1995, pp. 1032 - 1033.
- */
-class gr_clock_recovery_mm_cc : public gr_block
-{
- public:
-  ~gr_clock_recovery_mm_cc ();
-  void forecast(int noutput_items, gr_vector_int &ninput_items_required);
-  int general_work (int noutput_items,
-		    gr_vector_int &ninput_items,
-		    gr_vector_const_void_star &input_items,
-		    gr_vector_void_star &output_items);
-  float mu() const { return d_mu;}
-  float omega() const { return d_omega;}
-  float gain_mu() const { return d_gain_mu;}
-  float gain_omega() const { return d_gain_omega;}
-  void set_verbose (bool verbose) { d_verbose = verbose; }
-
-  void set_gain_mu (float gain_mu) { d_gain_mu = gain_mu; }
-  void set_gain_omega (float gain_omega) { d_gain_omega = gain_omega; }
-  void set_mu (float mu) { d_mu = mu; }
-  void set_omega (float omega) { 
-    d_omega = omega;
-    d_min_omega = omega*(1.0 - d_omega_relative_limit);
-    d_max_omega = omega*(1.0 + d_omega_relative_limit);
-    d_omega_mid = 0.5*(d_min_omega+d_max_omega);
-  }
-
-protected:
-  gr_clock_recovery_mm_cc (float omega, float gain_omega, float mu, float gain_mu,
-			   float omega_relative_limi);
-
- private:
-  float 			d_mu;
-  float 			d_omega;
-  float                         d_gain_omega;
-  float				d_min_omega;	        // minimum allowed omega
-  float				d_max_omega;	        // maximum allowed omeg
-  float				d_omega_relative_limit;	// used to compute min and max omega
-  float                         d_omega_mid;
-  float                         d_gain_mu;
-  gr_complex                    d_last_sample;
-  gri_mmse_fir_interpolator_cc 	*d_interp;
-  bool			        d_verbose;
-
-  gr_complex                    d_p_2T;
-  gr_complex                    d_p_1T;
-  gr_complex                    d_p_0T;
-
-  gr_complex                    d_c_2T;
-  gr_complex                    d_c_1T;
-  gr_complex                    d_c_0T;
-
-  gr_complex slicer_0deg (gr_complex sample);
-  gr_complex slicer_45deg (gr_complex sample);
-
-  friend gr_clock_recovery_mm_cc_sptr
-  gr_make_clock_recovery_mm_cc (float omega, float gain_omega, float mu, float gain_mu, 
-				float omega_relative_limit);
-};
-
-#endif
diff --git a/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.i b/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.i
deleted file mode 100644
index 27eb70b95..000000000
--- a/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.i
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- 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 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.
- */
-
-GR_SWIG_BLOCK_MAGIC(gr,clock_recovery_mm_cc);
-
-gr_clock_recovery_mm_cc_sptr
-gr_make_clock_recovery_mm_cc (float omega, float gain_omega,
-			      float mu, float gain_mu,
-			      float omega_relative_limit) throw(std::exception);
-
-class gr_clock_recovery_mm_cc : public gr_sync_block
-{
- private:
-  gr_clock_recovery_mm_cc (float omega, float gain_omega, float mu, 
-			   float gain_mu, float omega_relative_limit);
-
-public:
-  float mu() const { return d_mu;}
-  float omega() const { return d_omega;}
-  float gain_mu() const { return d_gain_mu;}
-  float gain_omega() const { return d_gain_omega;}
-
-  void set_gain_mu (float gain_mu) { d_gain_mu = gain_mu; }
-  void set_gain_omega (float gain_omega) { d_gain_omega = gain_omega; }
-  void set_mu (float omega) { d_mu = mu; }
-  void set_omega (float omega) { d_omega = omega; 
-                                 d_min_omega = omega*(1.0 - d_omega_relative_limit);
-				 d_max_omega = omega*(1.0 + d_omega_relative_limit);
-                               }
-  void set_verbose (bool verbose) { d_verbose = verbose; }
-};
diff --git a/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.cc b/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.cc
deleted file mode 100644
index bb5a27071..000000000
--- a/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.cc
+++ /dev/null
@@ -1,137 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004,2010 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 <gr_io_signature.h>
-#include <gr_clock_recovery_mm_ff.h>
-#include <gri_mmse_fir_interpolator.h>
-#include <stdexcept>
-
-#define DEBUG_CR_MM_FF	0		// must be defined as 0 or 1
-
-// Public constructor
-
-gr_clock_recovery_mm_ff_sptr 
-gr_make_clock_recovery_mm_ff(float omega, float gain_omega, float mu, float gain_mu,
-			     float omega_relative_limit)
-{
-  return gnuradio::get_initial_sptr(new gr_clock_recovery_mm_ff (omega,
-								    gain_omega, 
-								    mu,
-								    gain_mu,
-								    omega_relative_limit));
-}
-
-gr_clock_recovery_mm_ff::gr_clock_recovery_mm_ff (float omega, float gain_omega, float mu, float gain_mu,
-						  float omega_relative_limit)
-  : gr_block ("clock_recovery_mm_ff",
-	      gr_make_io_signature (1, 1, sizeof (float)),
-	      gr_make_io_signature (1, 1, sizeof (float))),
-    d_mu (mu), d_gain_omega(gain_omega), d_gain_mu(gain_mu),
-    d_last_sample(0), d_interp(new gri_mmse_fir_interpolator()),
-    d_logfile(0), d_omega_relative_limit(omega_relative_limit)
-{
-  if (omega <  1)
-    throw std::out_of_range ("clock rate must be > 0");
-  if (gain_mu <  0  || gain_omega < 0)
-    throw std::out_of_range ("Gains must be non-negative");
-
-  set_omega(omega);			// also sets min and max omega
-  set_relative_rate (1.0 / omega);
-
-  if (DEBUG_CR_MM_FF)
-    d_logfile = fopen("cr_mm_ff.dat", "wb");
-}
-
-gr_clock_recovery_mm_ff::~gr_clock_recovery_mm_ff ()
-{
-  delete d_interp;
-
-  if (DEBUG_CR_MM_FF && d_logfile){
-    fclose(d_logfile);
-    d_logfile = 0;
-  }
-}
-
-void
-gr_clock_recovery_mm_ff::forecast(int noutput_items, gr_vector_int &ninput_items_required)
-{
-  unsigned ninputs = ninput_items_required.size();
-  for (unsigned i=0; i < ninputs; i++)
-    ninput_items_required[i] =
-      (int) ceil((noutput_items * d_omega) + d_interp->ntaps());
-}
-
-static inline float
-slice(float x)
-{
-  return x < 0 ? -1.0F : 1.0F;
-}
-
-/*
- * This implements the Mueller and Müller (M&M) discrete-time error-tracking synchronizer.
- *
- * See "Digital Communication Receivers: Synchronization, Channel
- * Estimation and Signal Processing" by Heinrich Meyr, Marc Moeneclaey, & Stefan Fechtel.
- * ISBN 0-471-50275-8.
- */
-int
-gr_clock_recovery_mm_ff::general_work (int noutput_items,
-				       gr_vector_int &ninput_items,
-				       gr_vector_const_void_star &input_items,
-				       gr_vector_void_star &output_items)
-{
-  const float *in = (const float *) input_items[0];
-  float *out = (float *) output_items[0];
-
-  int 	ii = 0;				// input index
-  int  	oo = 0;				// output index
-  int   ni = ninput_items[0] - d_interp->ntaps(); // don't use more input than this
-  float mm_val;
-
-  while (oo < noutput_items && ii < ni ){
-
-    // produce output sample
-    out[oo] = d_interp->interpolate (&in[ii], d_mu);
-    mm_val = slice(d_last_sample) * out[oo] - slice(out[oo]) * d_last_sample;
-    d_last_sample = out[oo];
-
-    d_omega = d_omega + d_gain_omega * mm_val;
-    d_omega = d_omega_mid + gr_branchless_clip(d_omega-d_omega_mid, d_omega_relative_limit);   // make sure we don't walk away
-    d_mu = d_mu + d_omega + d_gain_mu * mm_val;
-
-    ii += (int) floor(d_mu);
-    d_mu = d_mu - floor(d_mu);
-    oo++;
-
-    if (DEBUG_CR_MM_FF && d_logfile){
-      fwrite(&d_omega, sizeof(d_omega), 1, d_logfile);
-    }
-  }
-
-  consume_each (ii);
-
-  return oo;
-}
diff --git a/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.h b/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.h
deleted file mode 100644
index d2ec6d3e6..000000000
--- a/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* -*- 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 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.
- */
-
-#ifndef INCLUDED_GR_CLOCK_RECOVERY_MM_FF_H
-#define	INCLUDED_GR_CLOCK_RECOVERY_MM_FF_H
-
-#include <gr_block.h>
-#include <gr_math.h>
-#include <stdio.h>
-
-class gri_mmse_fir_interpolator;
-
-class gr_clock_recovery_mm_ff;
-typedef boost::shared_ptr<gr_clock_recovery_mm_ff> gr_clock_recovery_mm_ff_sptr;
-
-// public constructor
-gr_clock_recovery_mm_ff_sptr 
-gr_make_clock_recovery_mm_ff (float omega, float gain_omega, float mu, float gain_mu,
-			      float omega_relative_limit=0.001);
-
-/*!
- * \brief Mueller and Müller (M&M) based clock recovery block with float input, float output.
- * \ingroup sync_blk
- *
- * This implements the Mueller and Müller (M&M) discrete-time error-tracking synchronizer.
- *
- * See "Digital Communication Receivers: Synchronization, Channel
- * Estimation and Signal Processing" by Heinrich Meyr, Marc Moeneclaey, & Stefan Fechtel.
- * ISBN 0-471-50275-8.
- */
-class gr_clock_recovery_mm_ff : public gr_block
-{
- public:
-  ~gr_clock_recovery_mm_ff ();
-  void forecast(int noutput_items, gr_vector_int &ninput_items_required);
-  int general_work (int noutput_items,
-		    gr_vector_int &ninput_items,
-		    gr_vector_const_void_star &input_items,
-		    gr_vector_void_star &output_items);
-  float mu() const { return d_mu;}
-  float omega() const { return d_omega;}
-  float gain_mu() const { return d_gain_mu;}
-  float gain_omega() const { return d_gain_omega;}
-
-  void set_gain_mu (float gain_mu) { d_gain_mu = gain_mu; }
-  void set_gain_omega (float gain_omega) { d_gain_omega = gain_omega; }
-  void set_mu (float mu) { d_mu = mu; }
-  void set_omega (float omega){
-    d_omega = omega;
-    d_min_omega = omega*(1.0 - d_omega_relative_limit);
-    d_max_omega = omega*(1.0 + d_omega_relative_limit);
-    d_omega_mid = 0.5*(d_min_omega+d_max_omega);
-  }
-
-protected:
-  gr_clock_recovery_mm_ff (float omega, float gain_omega, float mu, float gain_mu,
-			   float omega_relative_limit);
-
- private:
-  float 			d_mu;		// fractional sample position [0.0, 1.0]
-  float 			d_omega;	// nominal frequency
-  float				d_min_omega;	// minimum allowed omega 
-  float                         d_omega_mid; 	// average omega
-  float				d_max_omega;	// maximum allowed omega
-  float                         d_gain_omega;	// gain for adjusting omega
-  float                         d_gain_mu;	// gain for adjusting mu
-  float                         d_last_sample;
-  gri_mmse_fir_interpolator 	*d_interp;
-  FILE				*d_logfile;
-  float				d_omega_relative_limit;	// used to compute min and max omega
-
-  friend gr_clock_recovery_mm_ff_sptr
-  gr_make_clock_recovery_mm_ff (float omega, float gain_omega, float mu, float gain_mu,
-				float omega_relative_limit);
-};
-
-#endif
diff --git a/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.i b/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.i
deleted file mode 100644
index 1b2437000..000000000
--- a/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.i
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- 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 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.
- */
-
-GR_SWIG_BLOCK_MAGIC(gr,clock_recovery_mm_ff);
-
-gr_clock_recovery_mm_ff_sptr
-gr_make_clock_recovery_mm_ff (float omega, float gain_omega,
-			      float mu, float gain_mu,
-			      float omega_relative_limit=0.001) throw(std::exception);
-
-class gr_clock_recovery_mm_ff : public gr_sync_block
-{
- private:
-  gr_clock_recovery_mm_ff (float omega, float gain_omega, float mu, float gain_mu,
-			   float omega_relative_limit);
-
-public:
-  float mu() const;
-  float omega() const;
-  float gain_mu() const;
-  float gain_omega() const;
-
-  void set_gain_mu (float gain_mu);
-  void set_gain_omega (float gain_omega);
-  void set_mu (float omega);
-  void set_omega (float omega);
-};