Somehow, these headers got duplicated. Removed from core, are in gr-digital.

5 files changed, 0 insertions, 403 deletions

diff --git a/gnuradio-core/src/lib/filter/gr_cma_equalizer_cc.h b/gnuradio-core/src/lib/filter/gr_cma_equalizer_cc.h
deleted file mode 100644
index 73916a315..000000000
--- a/gnuradio-core/src/lib/filter/gr_cma_equalizer_cc.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006 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_CMA_EQUALIZER_CC_H
-#define	INCLUDED_GR_CMA_EQUALIZER_CC_H
-
-#include <gr_core_api.h>
-#include <gr_adaptive_fir_ccf.h>
-
-class gr_cma_equalizer_cc;
-typedef boost::shared_ptr<gr_cma_equalizer_cc> gr_cma_equalizer_cc_sptr;
-
-GR_CORE_API gr_cma_equalizer_cc_sptr 
-gr_make_cma_equalizer_cc(int num_taps, float modulus, float mu);
-
-/*!
- * \brief Implements constant modulus adaptive filter on complex stream
- * \ingroup eq_blk
- */
-class GR_CORE_API gr_cma_equalizer_cc : public gr_adaptive_fir_ccf
-{
-private:
-  float d_modulus;
-  float d_mu;
-  
-  friend GR_CORE_API gr_cma_equalizer_cc_sptr gr_make_cma_equalizer_cc(int num_taps, float modulus, float mu);
-  gr_cma_equalizer_cc(int num_taps, float modulus, float mu);
-
-protected:
-
-  virtual float error(const gr_complex &out) 
-  { 
-    return (d_modulus - norm(out)); 
-  }
-
-  virtual void update_tap(float &tap, const gr_complex &in) 
-  {
-    tap += d_mu*d_error*abs(in);
-  }
-  
-public:
-};
-
-#endif
diff --git a/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.h b/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.h
deleted file mode 100644
index d1d29847c..000000000
--- a/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006 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_CONSTELLATION_DECODER_CB_H
-#define INCLUDED_GR_CONSTELLATION_DECODER_CB_H
-
-#include <gr_core_api.h>
-#include <gr_sync_block.h>
-#include <vector>
-
-class gr_constellation_decoder_cb;
-typedef boost::shared_ptr<gr_constellation_decoder_cb> gr_constellation_decoder_cb_sptr;
-
-GR_CORE_API gr_constellation_decoder_cb_sptr 
-	gr_make_constellation_decoder_cb (const std::vector<gr_complex> &sym_position,
-					  const std::vector<unsigned char> &sym_value_out);
-
-/*!
- * \brief Constellation Decoder
- * \ingroup coding_blk
- *
- */
-class GR_CORE_API gr_constellation_decoder_cb : public gr_sync_block
-{
-
- private:
-  std::vector<gr_complex> d_sym_position;
-  std::vector<unsigned char> d_sym_value_out;
-
-  friend GR_CORE_API gr_constellation_decoder_cb_sptr 
-		gr_make_constellation_decoder_cb (const std::vector<gr_complex> &sym_position, 						          const std::vector<unsigned char> &sym_value_out);
-  
-  gr_constellation_decoder_cb (const std::vector<gr_complex> &sym_position, 
-                               const std::vector<unsigned char> &sym_value_out);  //constructor
-
- public:
-  bool set_constellation(const std::vector<gr_complex> &sym_position, 
-                        const std::vector<unsigned char> &sym_value_out);
-
-  ~gr_constellation_decoder_cb();	//destructor
-
-  int work (int noutput_items,
-	    gr_vector_const_void_star &input_items,
-	    gr_vector_void_star &output_items);
-};
-
-#endif
diff --git a/gnuradio-core/src/lib/general/gr_costas_loop_cc.h b/gnuradio-core/src/lib/general/gr_costas_loop_cc.h
deleted file mode 100644
index 13b33d96c..000000000
--- a/gnuradio-core/src/lib/general/gr_costas_loop_cc.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2006 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_COSTAS_LOOP_CC_H
-#define INCLUDED_GR_COSTAS_LOOP_CC_H
-
-#include <gr_core_api.h>
-#include <gr_sync_block.h>
-#include <stdexcept>
-#include <fstream>
-
-
-/*! \brief A Costas loop carrier recovery module.
- * \ingroup sync_blk
- *  
- *  The Costas loop locks to the center frequency of a signal and
- *  downconverts it to baseband. The second (order=2) order loop is
- *  used for BPSK where the real part of the output signal is the
- *  baseband BPSK signal and the imaginary part is the error
- *  signal. When order=4, it can be used for quadrature modulations
- *  where both I and Q (real and imaginary) are outputted.
- *
- *  More details can be found online:
- *
- *  J. Feigin, "Practical Costas loop design: Designing a simple and inexpensive
- *  BPSK Costas loop carrier recovery circuit," RF signal processing, pp. 20-36,
- *  2002.
- *
- *  http://rfdesign.com/images/archive/0102Feigin20.pdf
- *  
- * \param alpha the loop gain used for phase adjustment
- * \param beta the loop gain for frequency adjustments
- * \param max_freq the maximum frequency deviation (radians/sample) the loop can handle
- * \param min_freq the minimum frequency deviation (radians/sample) the loop can handle
- * \param order the loop order, either 2 or 4
- */
-class gr_costas_loop_cc;
-typedef boost::shared_ptr<gr_costas_loop_cc> gr_costas_loop_cc_sptr;
-
-
-GR_CORE_API gr_costas_loop_cc_sptr 
-gr_make_costas_loop_cc (float alpha, float beta,
-			float max_freq, float min_freq, 
-			int order
-			) throw (std::invalid_argument);
-
-
-/*!
- * \brief Carrier tracking PLL for QPSK
- * \ingroup sync_blk
- * input: complex; output: complex
- * <br>The Costas loop can have two output streams:
- *    stream 1 is the baseband I and Q;
- *    stream 2 is the normalized frequency of the loop
- *
- * \p order must be 2 or 4.
- */
-class GR_CORE_API gr_costas_loop_cc : public gr_sync_block
-{
-  friend GR_CORE_API gr_costas_loop_cc_sptr gr_make_costas_loop_cc (float alpha, float beta,
-							float max_freq, float min_freq, 
-							int order
-							) throw (std::invalid_argument);
-
-  float d_alpha, d_beta, d_max_freq, d_min_freq, d_phase, d_freq;
-  int d_order;
-
-  gr_costas_loop_cc (float alpha, float beta,
-		     float max_freq, float min_freq, 
-		     int order
-		     ) throw (std::invalid_argument);
-
-  /*! \brief the phase detector circuit for 8th-order PSK loops
-   *  \param sample complex sample
-   *  \return the phase error
-   */
-  float phase_detector_8(gr_complex sample) const;    // for 8PSK
-
-  /*! \brief the phase detector circuit for fourth-order loops
-   *  \param sample complex sample
-   *  \return the phase error
-   */
-  float phase_detector_4(gr_complex sample) const;    // for QPSK
-
-  /*! \brief the phase detector circuit for second-order loops
-   *  \param sample a complex sample
-   *  \return the phase error
-   */
-  float phase_detector_2(gr_complex sample) const;    // for BPSK
-
-
-  float (gr_costas_loop_cc::*d_phase_detector)(gr_complex sample) const;
-
-public:
-
-  /*! \brief set the first order gain
-   *  \param alpha
-   */
-  void set_alpha(float alpha);
-
-  /*! \brief get the first order gain
-   * 
-   */
-  float alpha() const { return d_alpha; }
-  
-  /*! \brief set the second order gain
-   *  \param beta
-   */
-  void set_beta(float beta);
-
-  /*! \brief get the second order gain
-   * 
-   */
-  float beta() const { return d_beta; }
-  
-  int work (int noutput_items,
-	    gr_vector_const_void_star &input_items,
-	    gr_vector_void_star &output_items);
-
-  /*! \brief returns the current NCO frequency in radians/sample
-   *
-   */
-  float freq() const { return d_freq; }
-};
-
-#endif
diff --git a/gnuradio-core/src/lib/general/gr_lms_dfe_cc.h b/gnuradio-core/src/lib/general/gr_lms_dfe_cc.h
deleted file mode 100644
index 335b1883c..000000000
--- a/gnuradio-core/src/lib/general/gr_lms_dfe_cc.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005 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_LMS_DFE_CC_H
-#define INCLUDED_GR_LMS_DFE_CC_H
-
-#include <gr_core_api.h>
-#include <gr_sync_block.h>
-
-class gr_lms_dfe_cc;
-typedef boost::shared_ptr<gr_lms_dfe_cc> gr_lms_dfe_cc_sptr;
-
-GR_CORE_API gr_lms_dfe_cc_sptr gr_make_lms_dfe_cc (float lambda_ff, float lambda_fb,
-				       unsigned int num_fftaps, unsigned int num_fbtaps);
-
-/*!
- * \brief Least-Mean-Square Decision Feedback Equalizer (complex in/out)
- * \ingroup eq_blk
- */
-class GR_CORE_API gr_lms_dfe_cc : public gr_sync_block
-{
-  friend GR_CORE_API gr_lms_dfe_cc_sptr gr_make_lms_dfe_cc (float lambda_ff, float lambda_fb,
-						unsigned int num_fftaps, unsigned int num_fbtaps);
-  
-  float	d_lambda_ff;
-  float	d_lambda_fb;
-  std::vector<gr_complex>  d_ff_delayline;
-  std::vector<gr_complex>  d_fb_delayline;
-  std::vector<gr_complex>  d_ff_taps;
-  std::vector<gr_complex>  d_fb_taps;
-  unsigned int d_ff_index;
-  unsigned int d_fb_index;
-
-  gr_lms_dfe_cc (float lambda_ff, float lambda_fb, 
-		 unsigned int num_fftaps, unsigned int num_fbtaps);
-  gr_complex slicer_0deg(gr_complex baud);
-  gr_complex slicer_45deg(gr_complex baud);
-
-  public:
-  
-  int work (int noutput_items,
-	    gr_vector_const_void_star &input_items,
-	    gr_vector_void_star &output_items);
-};
-
-#endif
diff --git a/gnuradio-core/src/lib/general/gr_lms_dfe_ff.h b/gnuradio-core/src/lib/general/gr_lms_dfe_ff.h
deleted file mode 100644
index ed2aa9844..000000000
--- a/gnuradio-core/src/lib/general/gr_lms_dfe_ff.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005 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_LMS_DFE_FF_H
-#define INCLUDED_GR_LMS_DFE_FF_H
-
-#include <gr_core_api.h>
-#include <gr_sync_block.h>
-
-class gr_lms_dfe_ff;
-typedef boost::shared_ptr<gr_lms_dfe_ff> gr_lms_dfe_ff_sptr;
-
-GR_CORE_API gr_lms_dfe_ff_sptr gr_make_lms_dfe_ff (float lambda_ff, float lambda_fb,
-				       unsigned int num_fftaps, unsigned int num_fbtaps);
-
-/*!
- * \brief Least-Mean-Square Decision Feedback Equalizer (float in/out)
- * \ingroup eq_blk
- */
-class GR_CORE_API gr_lms_dfe_ff : public gr_sync_block
-{
-  friend GR_CORE_API gr_lms_dfe_ff_sptr gr_make_lms_dfe_ff (float lambda_ff, float lambda_fb,
-						unsigned int num_fftaps, unsigned int num_fbtaps);
-  
-  float	d_lambda_ff;
-  float	d_lambda_fb;
-  std::vector<float>  d_ff_delayline;
-  std::vector<float>  d_fb_delayline;
-  std::vector<float>  d_ff_taps;
-  std::vector<float>  d_fb_taps;
-  unsigned int d_ff_index;
-  unsigned int d_fb_index;
-
-  gr_lms_dfe_ff (float lambda_ff, float lambda_fb, 
-		 unsigned int num_fftaps, unsigned int num_fbtaps);
-  
-  public:
-  
-  int work (int noutput_items,
-	    gr_vector_const_void_star &input_items,
-	    gr_vector_void_star &output_items);
-};
-
-#endif