1 files changed, 2 insertions, 141 deletions
diff --git a/gr-digital/lib/digital_costas_loop_cc.h b/gr-digital/lib/digital_costas_loop_cc.h
index 83edded194..7b2cd6dad7 100644
--- a/gr-digital/lib/digital_costas_loop_cc.h
+++ b/gr-digital/lib/digital_costas_loop_cc.h
@@ -25,6 +25,7 @@
 #define INCLUDED_DIGITAL_COSTAS_LOOP_CC_H
 
 #include <gr_sync_block.h>
+#include <gri_control_loop.h>
 #include <stdexcept>
 #include <fstream>
 
@@ -72,36 +73,17 @@ digital_make_costas_loop_cc (float loop_bw, int order
  *
  * \p order must be 2 or 4.
  */
-class digital_costas_loop_cc : public gr_sync_block
+class digital_costas_loop_cc : public gr_sync_block, public gri_control_loop
 {
   friend digital_costas_loop_cc_sptr
   digital_make_costas_loop_cc (float loop_bw, int order
 			       ) throw (std::invalid_argument);
 
-  float d_max_freq;
-  float d_min_freq;
   int d_order;
 
-  float d_loop_bw;
-  float d_damping;
-  float d_alpha;
-  float d_beta;
-
-  float d_phase;
-  float d_freq;
-
   digital_costas_loop_cc (float loop_bw, int order
 			  ) throw (std::invalid_argument);
   
-  /*! \brief update the system gains from the loop bandwidth and damping factor
-   *
-   *  This function updates the system gains based on the loop
-   *  bandwidth and damping factor of the system.
-   *  These two factors can be set separately through their own
-   *  set functions.
-   */
-  void update_gains();
-
   /*! \brief the phase detector circuit for 8th-order PSK loops
    *  \param sample complex sample
    *  \return the phase error
@@ -125,127 +107,6 @@ class digital_costas_loop_cc : public gr_sync_block
 
 public:
 
-  /*******************************************************************
-    SET FUNCTIONS
-  *******************************************************************/
-  
-  /*!
-   * \brief Set the loop bandwidth
-   *
-   * Set the loop filter's bandwidth to \p bw. This should be between 
-   * 2*pi/200 and 2*pi/100  (in rads/samp). It must also be a positive
-   * number.
-   *
-   * When a new damping factor is set, the gains, alpha and beta, of the loop
-   * are recalculated by a call to update_gains().
-   *
-   * \param bw    (float) new bandwidth
-   *
-   */
-  void set_loop_bandwidth(float bw);
-
-  /*!
-   * \brief Set the loop damping factor
-   *
-   * Set the loop filter's damping factor to \p df. The damping factor
-   * should be sqrt(2)/2.0 for critically damped systems.
-   * Set it to anything else only if you know what you are doing. It must
-   * be a number between 0 and 1.
-   *
-   * When a new damping factor is set, the gains, alpha and beta, of the loop
-   * are recalculated by a call to update_gains().
-   *
-   * \param df    (float) new damping factor
-   *
-   */
-  void set_damping_factor(float df);
-
-  /*!
-   * \brief Set the loop gain alpha
-   *
-   * Set's the loop filter's alpha gain parameter.
-   *
-   * This value should really only be set by adjusting the loop bandwidth
-   * and damping factor.
-   *
-   * \param alpha    (float) new alpha gain
-   *
-   */
-  void set_alpha(float alpha);
-
-  /*!
-   * \brief Set the loop gain beta
-   *
-   * Set's the loop filter's beta gain parameter.
-   *
-   * This value should really only be set by adjusting the loop bandwidth
-   * and damping factor.
-   *
-   * \param beta    (float) new beta gain
-   *
-   */
-  void set_beta(float beta);
-
-  /*!
-   * \brief Set the Costas loop's frequency.
-   *
-   * Set's the Costas Loop's frequency. While this is normally updated by the
-   * inner loop of the algorithm, it could be useful to manually initialize,
-   * set, or reset this under certain circumstances.
-   *
-   * \param freq    (float) new frequency
-   *
-   */
-  void set_frequency(float freq);
-
-  /*!
-   * \brief Set the Costas loop's phase.
-   *
-   * Set's the Costas Loop's phase. While this is normally updated by the
-   * inner loop of the algorithm, it could be useful to manually initialize,
-   * set, or reset this under certain circumstances.
-   *
-   * \param phase    (float) new phase
-   *
-   */
-  void set_phase(float phase);
-
-
-  /*******************************************************************
-    GET FUNCTIONS
-  *******************************************************************/
-
-  /*!
-   * \brief Returns the loop bandwidth
-   */
-  float get_loop_bandwidth() const;
-
-  /*!
-   * \brief Returns the loop damping factor
-   */
-  float get_damping_factor() const;
-
-  /*!
-   * \brief Returns the loop gain alpha
-   */
-  float get_alpha() const;
-
-  /*!
-   * \brief Returns the loop gain beta
-   */
-  float get_beta() const;
-
-  /*!
-   * \brief Get the Costas loop's frequency estimate
-   */
-  float get_frequency() const;
-
-  /*!
-   * \brief Get the Costas loop's phase estimate
-   */
-  float get_phase() const;
-
-  
   int work (int noutput_items,
 	    gr_vector_const_void_star &input_items,
 	    gr_vector_void_star &output_items);