analog: implemented all AGC classes in gr-analog with QA code.

21 files changed, 1774 insertions, 1 deletions

diff --git a/gr-analog/include/analog/CMakeLists.txt b/gr-analog/include/analog/CMakeLists.txt
index d688d2c3d..7e95d88cd 100644
--- a/gr-analog/include/analog/CMakeLists.txt
+++ b/gr-analog/include/analog/CMakeLists.txt
@@ -77,8 +77,16 @@ install(FILES
     ${analog_generated_includes}
     api.h
     cpm.h
-    ctcss_squelch_ff.h
+    agc.h
+    agc2.h
     squelch_base_ff.h
+    agc_cc.h
+    agc_ff.h
+    agc2_cc.h
+    agc2_ff.h
+    ctcss_squelch_cc.h
+    ctcss_squelch_ff.h
+    feedforward_agc_cc.h
     DESTINATION ${GR_INCLUDE_DIR}/gnuradio/analog
     COMPONENT "analog_devel"
 )
diff --git a/gr-analog/include/analog/agc.h b/gr-analog/include/analog/agc.h
new file mode 100644
index 000000000..92d777fa1
--- /dev/null
+++ b/gr-analog/include/analog/agc.h
@@ -0,0 +1,136 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2012 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_ANALOG_AGC_H
+#define INCLUDED_ANALOG_AGC_H
+
+#include <analog/api.h>
+#include <gr_complex.h>
+#include <math.h>
+
+namespace gr {
+  namespace analog {
+    namespace kernel {
+
+      /*!
+       * \brief high performance Automatic Gain Control class for complex signals.
+       *
+       * For Power the absolute value of the complex number is used.
+       */
+      class ANALOG_API agc_cc
+      {
+      public:
+	agc_cc(float rate = 1e-4, float reference = 1.0,
+	       float gain = 1.0, float max_gain = 0.0)
+	  : _rate(rate), _reference(reference),
+	  _gain(gain), _max_gain(max_gain) {};
+
+	virtual ~agc_cc() {};
+
+	float rate() const      { return _rate; }
+	float reference() const { return _reference; }
+	float gain() const      { return _gain;  }
+	float max_gain() const   { return _max_gain; }
+
+	void set_rate(float rate) { _rate = rate; }
+	void set_reference(float reference) { _reference = reference; }
+	void set_gain(float gain) { _gain = gain; }
+	void set_max_gain(float max_gain) { _max_gain = max_gain; }
+
+	gr_complex scale(gr_complex input)
+	{
+	  gr_complex output = input * _gain;
+
+	  _gain +=  _rate * (_reference - sqrt(output.real()*output.real() +
+					       output.imag()*output.imag()));
+	  if(_max_gain > 0.0 && _gain > _max_gain) {
+	    _gain = _max_gain;
+	  }
+	  return output;
+	}
+
+	void scaleN(gr_complex output[], const gr_complex input[], unsigned n)
+	{
+	  for(unsigned i = 0; i < n; i++) {
+	    output[i] = scale (input[i]);
+	  }
+	}
+
+      protected:
+	float _rate;		// adjustment rate
+	float _reference;	// reference value
+	float _gain;		// current gain
+	float _max_gain;	// max allowable gain
+      };
+
+      /*!
+       * \brief high performance Automatic Gain Control class for float signals.
+       *
+       * Power is approximated by absolute value
+       */
+      class ANALOG_API agc_ff 
+      {
+      public:
+	agc_ff(float rate = 1e-4, float reference = 1.0,
+	       float gain = 1.0, float max_gain = 0.0)
+	  : _rate(rate), _reference(reference), _gain(gain),
+	  _max_gain(max_gain) {};
+
+	~agc_ff() {};
+
+	float rate () const      { return _rate; }
+	float reference () const { return _reference; }
+	float gain () const      { return _gain;  }
+	float max_gain () const  { return _max_gain; }
+
+	void set_rate (float rate) { _rate = rate; }
+	void set_reference (float reference) { _reference = reference; }
+	void set_gain (float gain) { _gain = gain; }
+	void set_max_gain (float max_gain) { _max_gain = max_gain; }
+
+	float scale (float input)
+	{
+	  float output = input * _gain;
+	  _gain += (_reference - fabsf (output)) * _rate;
+	  if(_max_gain > 0.0 && _gain > _max_gain)
+	    _gain = _max_gain;
+	  return output;
+	}
+
+	void scaleN(float output[], const float input[], unsigned n)
+	{
+	  for(unsigned i = 0; i < n; i++)
+	    output[i] = scale (input[i]);
+	}
+
+      protected:
+	float _rate;		// adjustment rate
+	float _reference;	// reference value
+	float _gain;		// current gain
+	float _max_gain;	// maximum gain
+      };
+
+    } /* namespace kernel */
+  } /* namespace analog */
+} /* namespace gr */
+
+#endif /* INCLUDED_ANALOG_AGC_H */
diff --git a/gr-analog/include/analog/agc2.h b/gr-analog/include/analog/agc2.h
new file mode 100644
index 000000000..75a203e9f
--- /dev/null
+++ b/gr-analog/include/analog/agc2.h
@@ -0,0 +1,160 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2012 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_ANALOG_AGC2_H
+#define INCLUDED_ANALOG_AGC2_H
+
+#include <analog/api.h>
+#include <gr_complex.h>
+#include <math.h>
+
+namespace gr {
+  namespace analog {
+    namespace kernel {
+
+      /*!
+       * \brief high performance Automatic Gain Control class
+       *
+       * For Power the absolute value of the complex number is used.
+       */
+      class ANALOG_API agc2_cc
+      {
+      public:
+	agc2_cc(float attack_rate = 1e-1, float decay_rate = 1e-2,
+		float reference = 1.0,
+		float gain = 1.0, float max_gain = 0.0)
+	  : _attack_rate(attack_rate), _decay_rate(decay_rate),
+	  _reference(reference),
+	  _gain(gain), _max_gain(max_gain) {};
+
+	float decay_rate() const  { return _decay_rate; }
+	float attack_rate() const { return _attack_rate; }
+	float reference() const   { return _reference; }
+	float gain() const        { return _gain;  }
+	float max_gain() const     { return _max_gain; }
+
+	void set_decay_rate(float rate) { _decay_rate = rate; }
+	void set_attack_rate(float rate) { _attack_rate = rate; }
+	void set_reference(float reference) { _reference = reference; }
+	void set_gain(float gain) { _gain = gain; }
+	void set_max_gain(float max_gain) { _max_gain = max_gain; }
+
+	gr_complex scale(gr_complex input)
+	{
+	  gr_complex output = input * _gain;
+
+	  float tmp = -_reference + sqrt(output.real()*output.real() +
+					 output.imag()*output.imag());
+	  float rate = _decay_rate;
+	  if((tmp) > _gain) {
+	    rate = _attack_rate;
+	  }
+	  _gain -= tmp*rate;
+
+	  // Not sure about this; will blow up if _gain < 0 (happens
+	  // when rates are too high), but is this the solution?
+	  if(_gain < 0.0)
+	    _gain = 10e-5;
+
+	  if(_max_gain > 0.0 && _gain > _max_gain) {
+	    _gain = _max_gain;
+	  }
+	  return output;
+	}
+
+	void scaleN(gr_complex output[], const gr_complex input[], unsigned n)
+	{
+	  for(unsigned i = 0; i < n; i++)
+	    output[i] = scale (input[i]);
+	}
+
+      protected:
+	float _attack_rate;	// attack rate for fast changing signals
+	float _decay_rate;	// decay rate for slow changing signals
+	float _reference;	// reference value
+	float _gain;		// current gain
+	float _max_gain;	// max allowable gain
+      };
+
+
+      class ANALOG_API agc2_ff
+      {
+      public:
+	agc2_ff(float attack_rate = 1e-1, float decay_rate = 1e-2,
+		float reference = 1.0,
+		float gain = 1.0, float max_gain = 0.0)
+	  : _attack_rate(attack_rate), _decay_rate(decay_rate),
+	  _reference(reference),
+	  _gain(gain), _max_gain(max_gain) {};
+
+	float attack_rate() const { return _attack_rate; }
+	float decay_rate() const  { return _decay_rate; }
+	float reference() const   { return _reference; }
+	float gain() const        { return _gain;  }
+	float max_gain() const    { return _max_gain; }
+
+	void set_attack_rate(float rate) { _attack_rate = rate; }
+	void set_decay_rate(float rate) { _decay_rate = rate; }
+	void set_reference(float reference) { _reference = reference; }
+	void set_gain(float gain) { _gain = gain; }
+	void set_max_gain(float max_gain) { _max_gain = max_gain; }
+
+	float scale(float input)
+	{
+	  float output = input * _gain;
+
+	  float tmp = (fabsf(output)) - _reference;
+	  float rate = _decay_rate;
+	  if(fabsf(tmp) > _gain) {
+	    rate = _attack_rate;
+	  }
+	  _gain -= tmp*rate;
+
+	  // Not sure about this
+	  if(_gain < 0.0)
+	    _gain = 10e-5;
+
+	  if(_max_gain > 0.0 && _gain > _max_gain) {
+	    _gain = _max_gain;
+	  }
+	  return output;
+	}
+
+	void scaleN(float output[], const float input[], unsigned n)
+	{
+	  for(unsigned i = 0; i < n; i++)
+	    output[i] = scale (input[i]);
+	}
+
+      protected:
+	float _attack_rate;     // attack_rate for fast changing signals
+	float _decay_rate;	// decay rate for slow changing signals
+	float _reference;	// reference value
+	float _gain;		// current gain
+	float _max_gain;	// maximum gain
+      };
+      
+    } /* namespace kernel */
+  } /* namespace analog */
+} /* namespace gr */
+
+#endif /* INCLUDED_ANALOG_AGC2_H */
diff --git a/gr-analog/include/analog/agc2_cc.h b/gr-analog/include/analog/agc2_cc.h
new file mode 100644
index 000000000..c922ccd4d
--- /dev/null
+++ b/gr-analog/include/analog/agc2_cc.h
@@ -0,0 +1,65 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2012 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_ANALOG_AGC2_CC_H
+#define INCLUDED_ANALOG_AGC2_CC_H
+
+#include <analog/api.h>
+#include <analog/agc2.h>
+#include <gr_sync_block.h>
+
+namespace gr {
+  namespace analog {
+
+    /*!
+     * \brief high performance Automatic Gain Control class
+     * \ingroup level_blk
+     *
+     * For Power the absolute value of the complex number is used.
+     */
+    class ANALOG_API agc2_cc : virtual public gr_sync_block
+    {
+    public:
+      // gr::analog::agc2_cc::sptr
+      typedef boost::shared_ptr<agc2_cc> sptr;
+            
+      static sptr make(float attack_rate = 1e-1, float decay_rate = 1e-2,
+		       float reference = 1.0,
+		       float gain = 1.0, float max_gain = 0.0);
+
+      virtual float attack_rate() const = 0;
+      virtual float decay_rate() const = 0;
+      virtual float reference() const = 0;
+      virtual float gain() const = 0;
+      virtual float max_gain() const = 0;
+      
+      virtual void set_attack_rate(float rate) = 0;
+      virtual void set_decay_rate(float rate) = 0;
+      virtual void set_reference(float reference) = 0;
+      virtual void set_gain(float gain) = 0;
+      virtual void set_max_gain(float max_gain) = 0;
+    };
+
+  } /* namespace analog */
+} /* namespace gr */
+
+#endif /* INCLUDED_ANALOG_AGC2_CC_H */
diff --git a/gr-analog/include/analog/agc2_ff.h b/gr-analog/include/analog/agc2_ff.h
new file mode 100644
index 000000000..27dd6d92e
--- /dev/null
+++ b/gr-analog/include/analog/agc2_ff.h
@@ -0,0 +1,65 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2006,2012 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_ANALOG_AGC2_FF_H
+#define INCLUDED_ANALOG_AGC2_FF_H
+
+#include <analog/api.h>
+#include <analog/agc2.h>
+#include <gr_sync_block.h>
+
+namespace gr {
+  namespace analog {
+
+    /*!
+     * \brief high performance Automatic Gain Control class
+     *
+     * \ingroup level_blk
+     * Power is approximated by absolute value
+     */
+    class ANALOG_API agc2_ff : virtual public gr_sync_block
+    {
+    public:
+      // gr::analog::agc2_ff::sptr
+      typedef boost::shared_ptr<agc2_ff> sptr;
+            
+      static sptr make(float attack_rate = 1e-1, float decay_rate = 1e-2,
+		       float reference = 1.0,
+		       float gain = 1.0, float max_gain = 0.0);
+
+      virtual float attack_rate() const = 0;
+      virtual float decay_rate() const = 0;
+      virtual float reference() const = 0;
+      virtual float gain() const = 0;
+      virtual float max_gain() const = 0;
+      
+      virtual void set_attack_rate(float rate) = 0;
+      virtual void set_decay_rate(float rate) = 0;
+      virtual void set_reference(float reference) = 0;
+      virtual void set_gain(float gain) = 0;
+      virtual void set_max_gain(float max_gain) = 0;
+    };
+
+  } /* namespace analog */
+} /* namespace gr */
+
+#endif /* INCLUDED_ANALOG_AGC2_FF_H */
diff --git a/gr-analog/include/analog/agc_cc.h b/gr-analog/include/analog/agc_cc.h
new file mode 100644
index 000000000..b2b1a9b43
--- /dev/null
+++ b/gr-analog/include/analog/agc_cc.h
@@ -0,0 +1,62 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2012 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_ANALOG_AGC_CC_H
+#define INCLUDED_ANALOG_AGC_CC_H
+
+#include <analog/api.h>
+#include <analog/agc.h>
+#include <gr_sync_block.h>
+
+namespace gr {
+  namespace analog {
+
+    /*!
+     * \brief high performance Automatic Gain Control class
+     * \ingroup level_blk
+     *
+     * For Power the absolute value of the complex number is used.
+     */
+    class ANALOG_API agc_cc : virtual public gr_sync_block
+    {
+    public:
+      // gr::analog::agc_cc::sptr
+      typedef boost::shared_ptr<agc_cc> sptr;
+            
+      static sptr make(float rate = 1e-4, float reference = 1.0,
+		       float gain = 1.0, float max_gain = 0.0);
+
+      virtual float rate() const = 0;
+      virtual float reference() const = 0;
+      virtual float gain() const = 0;
+      virtual float max_gain() const = 0;
+      
+      virtual void set_rate(float rate) = 0;
+      virtual void set_reference(float reference) = 0;
+      virtual void set_gain(float gain) = 0;
+      virtual void set_max_gain(float max_gain) = 0;
+    };
+
+  } /* namespace analog */
+} /* namespace gr */
+
+#endif /* INCLUDED_ANALOG_AGC_CC_H */
diff --git a/gr-analog/include/analog/agc_ff.h b/gr-analog/include/analog/agc_ff.h
new file mode 100644
index 000000000..30d1ae1fd
--- /dev/null
+++ b/gr-analog/include/analog/agc_ff.h
@@ -0,0 +1,62 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2006,2012 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_ANALOG_AGC_FF_H
+#define INCLUDED_ANALOG_AGC_FF_H
+
+#include <analog/api.h>
+#include <analog/agc.h>
+#include <gr_sync_block.h>
+
+namespace gr {
+  namespace analog {
+
+    /*!
+     * \brief high performance Automatic Gain Control class
+     * \ingroup level_blk
+     *
+     * Power is approximated by absolute value
+     */
+    class ANALOG_API agc_ff : virtual public gr_sync_block
+    {
+    public:
+      // gr::analog::agc_ff::sptr
+      typedef boost::shared_ptr<agc_ff> sptr;
+            
+      static sptr make(float rate = 1e-4, float reference = 1.0,
+		       float gain = 1.0, float max_gain = 0.0);
+      
+      virtual float rate() const = 0;
+      virtual float reference() const = 0;
+      virtual float gain() const = 0;
+      virtual float max_gain() const = 0;
+      
+      virtual void set_rate(float rate) = 0;
+      virtual void set_reference(float reference) = 0;
+      virtual void set_gain(float gain) = 0;
+      virtual void set_max_gain(float max_gain) = 0;
+    };
+
+  } /* namespace analog */
+} /* namespace gr */
+
+#endif /* INCLUDED_ANALOG_AGC_FF_H */
diff --git a/gr-analog/include/analog/feedforward_agc_cc.h b/gr-analog/include/analog/feedforward_agc_cc.h
new file mode 100644
index 000000000..9e259a4eb
--- /dev/null
+++ b/gr-analog/include/analog/feedforward_agc_cc.h
@@ -0,0 +1,48 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2012 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_ANALOG_FEEDFORWARD_AGC_CC_H
+#define INCLUDED_ANALOG_FEEDFORWARD_AGC_CC_H
+
+#include <analog/api.h>
+#include <gr_sync_block.h>
+
+namespace gr {
+  namespace analog {
+
+    /*!
+     * \brief Non-causal AGC which computes required gain based on max absolute value over nsamples
+     * \ingroup level_blk
+     */
+    class ANALOG_API feedforward_agc_cc : virtual public gr_sync_block
+    {
+    public:
+      // gr::analog::feedforward_agc_cc::sptr
+      typedef boost::shared_ptr<feedforward_agc_cc> sptr;
+      
+      static sptr make(int nsamples, float reference);
+    };
+    
+  } /* namespace analog */
+} /* namespace gr */
+
+#endif /* INCLUDED_GR_FEEDFORWARD_AGC_CC_H */
diff --git a/gr-analog/lib/CMakeLists.txt b/gr-analog/lib/CMakeLists.txt
index b0f7a17de..468957d98 100644
--- a/gr-analog/lib/CMakeLists.txt
+++ b/gr-analog/lib/CMakeLists.txt
@@ -104,8 +104,14 @@ endmacro(expand_cc)
 list(APPEND analog_sources
     ${generated_sources}
     cpm.cc
+    squelch_base_cc_impl.cc
     squelch_base_ff_impl.cc
+    agc_cc_impl.cc
+    agc_ff_impl.cc
+    agc2_cc_impl.cc
+    agc2_ff_impl.cc
     ctcss_squelch_ff_impl.cc
+    feedforward_agc_cc_impl.cc
 )
 
 list(APPEND analog_libs
diff --git a/gr-analog/lib/agc2_cc_impl.cc b/gr-analog/lib/agc2_cc_impl.cc
new file mode 100644
index 000000000..2ef18e5ab
--- /dev/null
+++ b/gr-analog/lib/agc2_cc_impl.cc
@@ -0,0 +1,70 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2010,2012 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 "agc2_cc_impl.h"
+#include <gr_io_signature.h>
+
+namespace gr {
+  namespace analog {
+
+    agc2_cc::sptr
+    agc2_cc::make(float attack_rate, float decay_rate,
+		  float reference,
+		  float gain, float max_gain)
+    {
+      return gnuradio::get_initial_sptr
+	(new agc2_cc_impl(attack_rate, decay_rate,
+			  reference, gain, max_gain));
+    }
+
+    agc2_cc_impl::agc2_cc_impl(float attack_rate, float decay_rate,
+			       float reference,
+			       float gain, float max_gain)
+      : gr_sync_block("agc2_cc",
+		      gr_make_io_signature(1, 1, sizeof(gr_complex)),
+		      gr_make_io_signature(1, 1, sizeof(gr_complex))),
+	kernel::agc2_cc(attack_rate, decay_rate,
+			reference, gain, max_gain)
+    {
+    }
+
+    agc2_cc_impl::~agc2_cc_impl()
+    {
+    }
+
+    int
+    agc2_cc_impl::work(int noutput_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];
+      scaleN(out, in, noutput_items);
+      return noutput_items;
+    }
+
+  } /* namespace analog */
+} /* namespace gr */
diff --git a/gr-analog/lib/agc2_cc_impl.h b/gr-analog/lib/agc2_cc_impl.h
new file mode 100644
index 000000000..98afc668a
--- /dev/null
+++ b/gr-analog/lib/agc2_cc_impl.h
@@ -0,0 +1,59 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2012 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_ANALOG_AGC2_IMPL_CC_H
+#define INCLUDED_ANALOG_AGC2_IMPL_CC_H
+
+#include <analog/agc2_cc.h>
+
+namespace gr {
+  namespace analog {
+
+    class agc2_cc_impl : public agc2_cc, kernel::agc2_cc
+    {
+    public:
+      agc2_cc_impl(float attack_rate = 1e-1, float decay_rate = 1e-2,
+		       float reference = 1.0,
+		       float gain = 1.0, float max_gain = 0.0);
+      ~agc2_cc_impl();
+
+      float attack_rate() const { return kernel::agc2_cc::attack_rate(); }
+      float decay_rate() const  { return kernel::agc2_cc::decay_rate(); }
+      float reference() const { return kernel::agc2_cc::reference(); }
+      float gain() const { return kernel::agc2_cc::gain(); }
+      float max_gain() const { return kernel::agc2_cc::max_gain(); }
+
+      void set_attack_rate(float rate) { kernel::agc2_cc::set_attack_rate(rate); }
+      void set_decay_rate(float rate) { kernel::agc2_cc::set_decay_rate(rate); }
+      void set_reference(float reference) { kernel::agc2_cc::set_reference(reference); }
+      void set_gain(float gain) { kernel::agc2_cc::set_gain(gain); }
+      void set_max_gain(float max_gain) { kernel::agc2_cc::set_max_gain(max_gain); }
+
+      int work(int noutput_items,
+	       gr_vector_const_void_star &input_items,
+	       gr_vector_void_star &output_items);
+    };
+
+  } /* namespace analog */
+} /* namespace gr */
+
+#endif /* INCLUDED_ANALOG_AGC2_CC_IMPL_H */
diff --git a/gr-analog/lib/agc2_ff_impl.cc b/gr-analog/lib/agc2_ff_impl.cc
new file mode 100644
index 000000000..e0cdd6c44
--- /dev/null
+++ b/gr-analog/lib/agc2_ff_impl.cc
@@ -0,0 +1,71 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2006,2010,2012 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 "agc2_ff_impl.h"
+#include <gr_io_signature.h>
+
+namespace gr {
+  namespace analog {
+
+    agc2_ff::sptr
+    agc2_ff::make(float attack_rate, float decay_rate,
+		  float reference,
+		  float gain, float max_gain)
+    {
+      return gnuradio::get_initial_sptr
+	(new agc2_ff_impl(attack_rate, decay_rate,
+			  reference,
+			  gain, max_gain));
+    }
+
+    agc2_ff_impl::~agc2_ff_impl()
+    {
+    }
+
+    agc2_ff_impl::agc2_ff_impl(float attack_rate, float decay_rate,
+			       float reference,
+			       float gain, float max_gain)
+      : gr_sync_block("agc2_ff",
+		      gr_make_io_signature(1, 1, sizeof(float)),
+		      gr_make_io_signature(1, 1, sizeof(float)))
+      , kernel::agc2_ff(attack_rate, decay_rate,
+			reference, gain, max_gain)
+    {
+    }
+
+    int
+    agc2_ff_impl::work(int noutput_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];
+      scaleN(out, in, noutput_items);
+      return noutput_items;
+    }
+
+  } /* namespace analog */
+} /* namespace gr */
diff --git a/gr-analog/lib/agc2_ff_impl.h b/gr-analog/lib/agc2_ff_impl.h
new file mode 100644
index 000000000..df33c8e44
--- /dev/null
+++ b/gr-analog/lib/agc2_ff_impl.h
@@ -0,0 +1,59 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2006,2012 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_ANALOG_AGC2_FF_IMPL_H
+#define INCLUDED_ANALOG_AGC2_FF_IMPL_H
+
+#include <analog/agc2_ff.h>
+
+namespace gr {
+  namespace analog {
+
+    class agc2_ff_impl : public agc2_ff, kernel::agc2_ff
+    {
+    public:
+      agc2_ff_impl(float attack_rate = 1e-1, float decay_rate = 1e-2,
+		   float reference = 1.0,
+		   float gain = 1.0, float max_gain = 0.0);
+      ~agc2_ff_impl();
+
+      float attack_rate() const { return kernel::agc2_ff::attack_rate(); }
+      float decay_rate() const  { return kernel::agc2_ff::decay_rate(); }
+      float reference() const { return kernel::agc2_ff::reference(); }
+      float gain() const { return kernel::agc2_ff::gain(); }
+      float max_gain() const { return kernel::agc2_ff::max_gain(); }
+
+      void set_attack_rate(float rate) { kernel::agc2_ff::set_attack_rate(rate); }
+      void set_decay_rate(float rate) { kernel::agc2_ff::set_decay_rate(rate); }
+      void set_reference(float reference) { kernel::agc2_ff::set_reference(reference); }
+      void set_gain(float gain) { kernel::agc2_ff::set_gain(gain); }
+      void set_max_gain(float max_gain) { kernel::agc2_ff::set_max_gain(max_gain); }
+
+      int work(int noutput_items,
+	       gr_vector_const_void_star &input_items,
+	       gr_vector_void_star &output_items);
+    };
+
+  } /* namespace analog */
+} /* namespace gr */
+
+#endif /* INCLUDED_ANALOG_AGC2_IMPL_FF_H */
diff --git a/gr-analog/lib/agc_cc_impl.cc b/gr-analog/lib/agc_cc_impl.cc
new file mode 100644
index 000000000..81e1f67f8
--- /dev/null
+++ b/gr-analog/lib/agc_cc_impl.cc
@@ -0,0 +1,66 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2010,2012 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 "agc_cc_impl.h"
+#include <gr_io_signature.h>
+
+namespace gr {
+  namespace analog {
+
+    agc_cc::sptr
+    agc_cc::make(float rate, float reference,
+		 float gain, float max_gain)
+    {
+      return gnuradio::get_initial_sptr
+	(new agc_cc_impl(rate, reference, gain, max_gain));
+    }
+
+    agc_cc_impl::agc_cc_impl(float rate, float reference,
+			     float gain, float max_gain)
+      : gr_sync_block("agc_cc",
+		      gr_make_io_signature(1, 1, sizeof(gr_complex)),
+		      gr_make_io_signature(1, 1, sizeof(gr_complex))),
+	kernel::agc_cc(rate, reference, gain, max_gain)
+    {
+    }
+
+    agc_cc_impl::~agc_cc_impl()
+    {
+    }
+
+    int
+    agc_cc_impl::work(int noutput_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];
+      scaleN(out, in, noutput_items);
+      return noutput_items;
+    }
+
+  } /* namespace analog */
+} /* namespace gr */
diff --git a/gr-analog/lib/agc_cc_impl.h b/gr-analog/lib/agc_cc_impl.h
new file mode 100644
index 000000000..822f46ef2
--- /dev/null
+++ b/gr-analog/lib/agc_cc_impl.h
@@ -0,0 +1,56 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2012 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_ANALOG_AGC_CC_IMPL_H
+#define INCLUDED_ANALOG_AGC_CC_IMPL_H
+
+#include <analog/agc_cc.h>
+
+namespace gr {
+  namespace analog {
+
+    class agc_cc_impl : public agc_cc, kernel::agc_cc
+    {
+    public:
+      agc_cc_impl(float rate = 1e-4, float reference = 1.0,
+		  float gain = 1.0, float max_gain = 0.0);
+      ~agc_cc_impl();
+
+      float rate() const { return kernel::agc_cc::rate(); }
+      float reference() const { return kernel::agc_cc::reference(); }
+      float gain() const { return kernel::agc_cc::gain(); }
+      float max_gain() const { return kernel::agc_cc::max_gain(); }
+
+      void set_rate(float rate) { kernel::agc_cc::set_rate(rate); }
+      void set_reference(float reference) { kernel::agc_cc::set_reference(reference); }
+      void set_gain(float gain) { kernel::agc_cc::set_gain(gain); }
+      void set_max_gain(float max_gain) { kernel::agc_cc::set_max_gain(max_gain); }
+
+      int work(int noutput_items,
+	       gr_vector_const_void_star &input_items,
+	       gr_vector_void_star &output_items);
+    };
+
+  } /* namespace analog */
+} /* namespace gr */
+
+#endif /* INCLUDED_ANALOG_AGC_CC_IMPL_H */
diff --git a/gr-analog/lib/agc_ff_impl.cc b/gr-analog/lib/agc_ff_impl.cc
new file mode 100644
index 000000000..a80b90c12
--- /dev/null
+++ b/gr-analog/lib/agc_ff_impl.cc
@@ -0,0 +1,64 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2006,2010,2012 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 "agc_ff_impl.h"
+#include <gr_io_signature.h>
+
+namespace gr {
+  namespace analog {
+
+    agc_ff::sptr
+    agc_ff::make(float rate, float reference, float gain, float max_gain)
+    {
+      return gnuradio::get_initial_sptr
+	(new agc_ff_impl(rate, reference, gain, max_gain));
+    }
+
+    agc_ff_impl::agc_ff_impl(float rate, float reference, float gain, float max_gain)
+      : gr_sync_block("agc_ff",
+		      gr_make_io_signature(1, 1, sizeof(float)),
+		      gr_make_io_signature(1, 1, sizeof(float))),
+	kernel::agc_ff(rate, reference, gain, max_gain)
+    {
+    }
+
+    agc_ff_impl::~agc_ff_impl()
+    {
+    }
+
+    int
+    agc_ff_impl::work(int noutput_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];
+      scaleN(out, in, noutput_items);
+      return noutput_items;
+    }
+
+  } /* namespace analog */
+} /* namespace gr */
diff --git a/gr-analog/lib/agc_ff_impl.h b/gr-analog/lib/agc_ff_impl.h
new file mode 100644
index 000000000..e309cca1b
--- /dev/null
+++ b/gr-analog/lib/agc_ff_impl.h
@@ -0,0 +1,56 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2005,2006,2012 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_ANALOG_AGC_FF_IMPL_H
+#define INCLUDED_ANALOG_AGC_FF_IMPL_H
+
+#include <analog/agc_ff.h>
+
+namespace gr {
+  namespace analog {
+
+    class agc_ff_impl : public agc_ff, kernel::agc_ff
+    {
+    public:
+      agc_ff_impl(float rate = 1e-4, float reference = 1.0,
+		  float gain = 1.0, float max_gain = 0.0);
+      ~agc_ff_impl();
+
+      float rate() const { return kernel::agc_ff::rate(); }
+      float reference() const { return kernel::agc_ff::reference(); }
+      float gain() const { return kernel::agc_ff::gain(); }
+      float max_gain() const { return kernel::agc_ff::max_gain(); }
+
+      void set_rate(float rate) { kernel::agc_ff::set_rate(rate); }
+      void set_reference(float reference) { kernel::agc_ff::set_reference(reference); }
+      void set_gain(float gain) { kernel::agc_ff::set_gain(gain); }
+      void set_max_gain(float max_gain) { kernel::agc_ff::set_max_gain(max_gain); }
+
+      int work(int noutput_items,
+	       gr_vector_const_void_star &input_items,
+	       gr_vector_void_star &output_items);
+    };
+
+  } /* namespace analog */
+} /* namespace gr */
+
+#endif /* INCLUDED_ANALOG_AGC_FF_IMPL_H */
diff --git a/gr-analog/lib/feedforward_agc_cc_impl.cc b/gr-analog/lib/feedforward_agc_cc_impl.cc
new file mode 100644
index 000000000..4796fdfc5
--- /dev/null
+++ b/gr-analog/lib/feedforward_agc_cc_impl.cc
@@ -0,0 +1,99 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2010,2012 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 "feedforward_agc_cc_impl.h"
+#include <gr_io_signature.h>
+#include <stdexcept>
+
+namespace gr {
+  namespace analog {
+
+    feedforward_agc_cc::sptr
+    feedforward_agc_cc::make(int nsamples, float reference)
+    {
+      return gnuradio::get_initial_sptr
+	(new feedforward_agc_cc_impl(nsamples, reference));
+    }
+
+    feedforward_agc_cc_impl::feedforward_agc_cc_impl(int nsamples, float reference)
+      : gr_sync_block("feedforward_agc_cc",
+		      gr_make_io_signature(1, 1, sizeof(gr_complex)),
+		      gr_make_io_signature(1, 1, sizeof(gr_complex))),
+	d_nsamples(nsamples), d_reference(reference)
+    {
+      if(nsamples < 1)
+	throw std::invalid_argument("feedforward_agc_cc_impl: nsamples must be >= 1");
+  
+      set_history(nsamples);
+    }
+
+    feedforward_agc_cc_impl::~feedforward_agc_cc_impl()
+    {
+    }
+
+    inline static float
+    mag_squared(gr_complex x)
+    {
+      return x.real() * x.real() + x.imag() * x.imag();
+    }
+
+    // approximate sqrt(x^2 + y^2)
+    inline static float
+    envelope(gr_complex x)
+    {
+      float r_abs = std::fabs(x.real());
+      float i_abs = std::fabs(x.imag());
+
+      if(r_abs > i_abs)
+	return r_abs + 0.4 * i_abs;
+      else
+	return i_abs + 0.4 * r_abs;
+    }
+
+    int
+    feedforward_agc_cc_impl::work(int noutput_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];
+      int nsamples = d_nsamples;
+      float gain;
+
+      for(int i = 0; i < noutput_items; i++) {
+	//float max_env = 1e-12;	// avoid divide by zero
+	float max_env = 1e-4;	// avoid divide by zero, indirectly set max gain
+	for(int j = 0; j < nsamples; j++) {
+	  max_env = std::max(max_env, envelope(in[i+j]));
+	}
+	gain = d_reference / max_env;
+	out[i] = gain * in[i];
+      }
+      return noutput_items;
+    }
+
+  } /* namespace analog */
+} /* namespace gr */
diff --git a/gr-analog/lib/feedforward_agc_cc_impl.h b/gr-analog/lib/feedforward_agc_cc_impl.h
new file mode 100644
index 000000000..60c7acada
--- /dev/null
+++ b/gr-analog/lib/feedforward_agc_cc_impl.h
@@ -0,0 +1,49 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,2012 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_ANALOG_FEEDFORWARD_AGC_CC_IMPL_H
+#define INCLUDED_ANALOG_FEEDFORWARD_AGC_CC_IMPL_H
+
+#include <analog/feedforward_agc_cc.h>
+
+namespace gr {
+  namespace analog {
+
+    class feedforward_agc_cc_impl : public feedforward_agc_cc
+    {
+    private:
+      int d_nsamples;
+      float d_reference;
+
+    public:
+      feedforward_agc_cc_impl(int nsamples, float reference);
+      ~feedforward_agc_cc_impl();
+
+      int work(int noutput_items,
+	       gr_vector_const_void_star &input_items,
+	       gr_vector_void_star &output_items);
+    };
+
+  } /* namespace analog */
+} /* namespace gr */
+
+#endif /* INCLUDED_ANALOG_FEEDFORWARD_AGC_CC_IMPL_H */
diff --git a/gr-analog/python/qa_agc.py b/gr-analog/python/qa_agc.py
new file mode 100755
index 000000000..dc4922cf8
--- /dev/null
+++ b/gr-analog/python/qa_agc.py
@@ -0,0 +1,495 @@
+#!/usr/bin/env python
+#
+# Copyright 2004,2007,2010,2012 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 analog_swig as analog
+import math
+
+test_output = False
+
+class test_agc (gr_unittest.TestCase):
+
+    def setUp (self):
+        self.tb = gr.top_block ()
+
+    def tearDown (self):
+        self.tb = None
+
+
+    def test_001_sets(self):
+        agc = analog.agc_cc(1e-3, 1, 1, 1000)
+
+	agc.set_rate(1)
+	agc.set_reference(1.1)
+	agc.set_gain(1.1)
+	agc.set_max_gain(100)
+
+        self.assertAlmostEqual(agc.rate(), 1)
+        self.assertAlmostEqual(agc.reference(), 1.1)
+        self.assertAlmostEqual(agc.gain(), 1.1)
+        self.assertAlmostEqual(agc.max_gain(), 100)
+
+    def test_001(self):
+        ''' Test the complex AGC loop (single rate input) '''
+        tb = self.tb
+
+        expected_result = (
+            (100.000244140625+7.2191943445432116e-07j),
+            (72.892257690429688+52.959323883056641j),
+            (25.089065551757812+77.216217041015625j),
+            (-22.611061096191406+69.589706420898438j),
+            (-53.357715606689453+38.766635894775391j),
+            (-59.458671569824219+3.4792964243024471e-07j),
+            (-43.373462677001953-31.512666702270508j),
+            (-14.94139289855957-45.984889984130859j),
+            (13.478158950805664-41.48150634765625j),
+            (31.838506698608398-23.132022857666016j),
+            (35.519271850585938-3.1176801940091536e-07j),
+            (25.942903518676758+18.848621368408203j),
+            (8.9492912292480469+27.5430908203125j),
+            (-8.0852642059326172+24.883890151977539j),
+            (-19.131628036499023+13.899936676025391j),
+            (-21.383295059204102+3.1281737733479531e-07j),
+            (-15.650330543518066-11.370632171630859j),
+            (-5.4110145568847656-16.65339469909668j),
+            (4.9008159637451172-15.083160400390625j),
+            (11.628337860107422-8.4484796524047852j),
+            (13.036135673522949-2.288476110834381e-07j),
+            (9.5726661682128906+6.954948902130127j),
+            (3.3216962814331055+10.223132133483887j),
+            (-3.0204284191131592+9.2959251403808594j),
+            (-7.1977195739746094+5.2294478416442871j),
+            (-8.1072216033935547+1.8976157889483147e-07j),
+            (-5.9838657379150391-4.3475332260131836j),
+            (-2.0879747867584229-6.4261269569396973j),
+            (1.9100792407989502-5.8786196708679199j),
+            (4.5814824104309082-3.3286411762237549j),
+            (5.1967458724975586-1.3684227440080576e-07j),
+            (3.8647139072418213+2.8078789710998535j),
+            (1.3594740629196167+4.1840314865112305j),
+            (-1.2544282674789429+3.8607344627380371j),
+            (-3.0366206169128418+2.2062335014343262j),
+            (-3.4781389236450195+1.1194014604143376e-07j),
+            (-2.6133756637573242-1.8987287282943726j),
+            (-0.9293016791343689-2.8600969314575195j),
+            (0.86727333068847656-2.6691930294036865j),
+            (2.1243946552276611-1.5434627532958984j),
+            (2.4633183479309082-8.6486437567145913e-08j),
+            (1.8744727373123169+1.3618841171264648j),
+            (0.67528903484344482+2.0783262252807617j),
+            (-0.63866174221038818+1.965599536895752j),
+            (-1.5857341289520264+1.152103066444397j),
+            (-1.8640764951705933+7.6355092915036948e-08j),
+            (-1.4381576776504517-1.0448826551437378j),
+            (-0.52529704570770264-1.6166983842849731j),
+            (0.50366902351379395-1.5501341819763184j),
+            (1.26766037940979-0.92100900411605835j))
+
+        sampling_freq = 100
+        src1 = gr.sig_source_c(sampling_freq, gr.GR_SIN_WAVE,
+                                sampling_freq * 0.10, 100.0)
+        dst1 = gr.vector_sink_c()
+        head = gr.head(gr.sizeof_gr_complex, int (5*sampling_freq * 0.10))
+
+        agc = analog.agc_cc(1e-3, 1, 1, 1000)
+
+        tb.connect(src1, head)
+        tb.connect(head, agc)
+        tb.connect(agc, dst1)
+
+        if test_output == True:
+            tb.connect(agc, gr.file_sink(gr.sizeof_gr_complex, "test_agc_cc.dat"))
+
+        tb.run()
+        dst_data = dst1.data()
+        self.assertComplexTuplesAlmostEqual(expected_result, dst_data, 4)
+
+    def test_002_sets(self):
+        agc = analog.agc_ff(1e-3, 1, 1, 1000)
+
+	agc.set_rate(1)
+	agc.set_reference(1.1)
+	agc.set_gain(1.1)
+	agc.set_max_gain(100)
+
+        self.assertAlmostEqual(agc.rate(), 1)
+        self.assertAlmostEqual(agc.reference(), 1.1)
+        self.assertAlmostEqual(agc.gain(), 1.1)
+        self.assertAlmostEqual(agc.max_gain(), 100)
+
+    def test_002(self):
+        ''' Test the floating point AGC loop (single rate input) '''
+        tb = self.tb
+
+        expected_result = (
+            7.2191943445432116e-07,
+            58.837181091308594,
+            89.700050354003906,
+            81.264183044433594,
+            45.506141662597656,
+            4.269894304798072e-07,
+            -42.948936462402344,
+            -65.50335693359375,
+            -59.368724822998047,
+            -33.261005401611328,
+            -4.683740257860336e-07,
+            31.423542022705078,
+            47.950984954833984,
+            43.485683441162109,
+            24.378345489501953,
+            5.7254135299444897e-07,
+            -23.062990188598633,
+            -35.218441009521484,
+            -31.964075088500977,
+            -17.934831619262695,
+            -5.0591745548445033e-07,
+            16.998210906982422,
+            25.982204437255859,
+            23.606258392333984,
+            13.260685920715332,
+            4.9936483037527069e-07,
+            -12.59880542755127,
+            -19.28221321105957,
+            -17.54347038269043,
+            -9.8700437545776367,
+            -4.188150626305287e-07,
+            9.4074573516845703,
+            14.422011375427246,
+            13.145503044128418,
+            7.41046142578125,
+            3.8512698097292741e-07,
+            -7.0924453735351562,
+            -10.896408081054688,
+            -9.9552040100097656,
+            -5.6262712478637695,
+            -3.1982864356905338e-07,
+            5.4131259918212891,
+            8.3389215469360352,
+            7.6409502029418945,
+            4.3320145606994629,
+            2.882407841298118e-07,
+            -4.194943904876709,
+            -6.4837145805358887,
+            -5.9621825218200684,
+            -3.3931560516357422)
+
+        sampling_freq = 100
+        src1 = gr.sig_source_f (sampling_freq, gr.GR_SIN_WAVE,
+                                sampling_freq * 0.10, 100.0)
+        dst1 = gr.vector_sink_f ()
+        head = gr.head (gr.sizeof_float, int (5*sampling_freq * 0.10))
+
+        agc = analog.agc_ff(1e-3, 1, 1, 1000)
+
+        tb.connect (src1, head)
+        tb.connect (head, agc)
+        tb.connect (agc, dst1)
+
+        if test_output == True:
+            tb.connect (agc, gr.file_sink(gr.sizeof_float, "test_agc_ff.dat"))
+
+        tb.run ()
+        dst_data = dst1.data ()
+        self.assertFloatTuplesAlmostEqual (expected_result, dst_data, 4)
+
+    def test_003_sets(self):
+        agc = analog.agc2_cc(1e-3, 1e-1, 1, 1, 1000)
+
+	agc.set_attack_rate(1)
+	agc.set_decay_rate(2)
+	agc.set_reference(1.1)
+	agc.set_gain(1.1)
+	agc.set_max_gain(100)
+
+        self.assertAlmostEqual(agc.attack_rate(), 1)
+        self.assertAlmostEqual(agc.decay_rate(), 2)
+        self.assertAlmostEqual(agc.reference(), 1.1)
+        self.assertAlmostEqual(agc.gain(), 1.1)
+        self.assertAlmostEqual(agc.max_gain(), 100)
+
+    def test_003(self):
+        ''' Test the complex AGC loop (attack and decay rate inputs) '''
+        tb = self.tb
+
+        expected_result = \
+                        ((100.000244140625+7.2191943445432116e-07j),
+                         (0.80881959199905396+0.58764183521270752j),
+                         (0.30894950032234192+0.95084899663925171j),
+                         (-0.30895623564720154+0.95086973905563354j),
+                         (-0.80887287855148315+0.58768033981323242j),
+                         (-0.99984413385391235+5.850709250410091e-09j),
+                         (-0.80889981985092163-0.58770018815994263j),
+                         (-0.30897706747055054-0.95093393325805664j),
+                         (0.30898112058639526-0.95094609260559082j),
+                         (0.80893135070800781-0.58772283792495728j),
+                         (0.99990922212600708-8.7766354184282136e-09j),
+                         (0.80894720554351807+0.58773452043533325j),
+                         (0.30899339914321899+0.95098406076431274j),
+                         (-0.30899572372436523+0.95099133253097534j),
+                         (-0.80896598100662231+0.58774799108505249j),
+                         (-0.99994778633117676+1.4628290578855285e-08j),
+                         (-0.80897533893585205-0.58775502443313599j),
+                         (-0.30900305509567261-0.95101380348205566j),
+                         (0.30900448560714722-0.95101797580718994j),
+                         (0.80898630619049072-0.58776277303695679j),
+                         (0.99997037649154663-1.7554345532744264e-08j),
+                         (0.80899184942245483+0.58776694536209106j),
+                         (0.30900871753692627+0.95103120803833008j),
+                         (-0.30900952219963074+0.95103377103805542j),
+                         (-0.8089984655380249+0.58777159452438354j),
+                         (-0.99998390674591064+2.3406109050938539e-08j),
+                         (-0.809001624584198-0.58777409791946411j),
+                         (-0.30901208519935608-0.95104163885116577j),
+                         (0.30901262164115906-0.95104306936264038j),
+                         (0.80900543928146362-0.587776780128479j),
+                         (0.99999171495437622-2.6332081404234486e-08j),
+                         (0.80900734663009644+0.58777821063995361j),
+                         (0.30901408195495605+0.95104765892028809j),
+                         (-0.30901429057121277+0.95104855298995972j),
+                         (-0.80900967121124268+0.58777981996536255j),
+                         (-0.99999648332595825+3.2183805842578295e-08j),
+                         (-0.80901080369949341-0.58778077363967896j),
+                         (-0.30901527404785156-0.95105135440826416j),
+                         (0.30901545286178589-0.95105189085006714j),
+                         (0.80901217460632324-0.58778166770935059j),
+                         (0.99999916553497314-3.5109700036173308e-08j),
+                         (0.809012770652771+0.58778214454650879j),
+                         (0.30901595950126648+0.9510534405708313j),
+                         (-0.30901598930358887+0.95105385780334473j),
+                         (-0.80901366472244263+0.58778274059295654j),
+                         (-1.0000008344650269+4.0961388947380328e-08j),
+                         (-0.8090139627456665-0.58778303861618042j),
+                         (-0.30901634693145752-0.95105475187301636j),
+                         (0.30901640653610229-0.95105493068695068j),
+                         (0.80901449918746948-0.5877833366394043j))
+
+        sampling_freq = 100
+        src1 = gr.sig_source_c(sampling_freq, gr.GR_SIN_WAVE,
+                                sampling_freq * 0.10, 100)
+        dst1 = gr.vector_sink_c()
+        head = gr.head(gr.sizeof_gr_complex, int(5*sampling_freq * 0.10))
+
+        agc = analog.agc2_cc(1e-2, 1e-3, 1, 1, 1000)
+
+        tb.connect(src1, head)
+        tb.connect(head, agc)
+        tb.connect(agc, dst1)
+
+        if test_output == True:
+            tb.connect(agc, gr.file_sink(gr.sizeof_gr_complex, "test_agc2_cc.dat"))
+
+        tb.run()
+        dst_data = dst1.data()
+        self.assertComplexTuplesAlmostEqual(expected_result, dst_data, 4)
+
+    def test_004_sets(self):
+        agc = analog.agc2_ff(1e-3, 1e-1, 1, 1, 1000)
+
+	agc.set_attack_rate(1)
+	agc.set_decay_rate(2)
+	agc.set_reference(1.1)
+	agc.set_gain(1.1)
+	agc.set_max_gain(100)
+
+        self.assertAlmostEqual(agc.attack_rate(), 1)
+        self.assertAlmostEqual(agc.decay_rate(), 2)
+        self.assertAlmostEqual(agc.reference(), 1.1)
+        self.assertAlmostEqual(agc.gain(), 1.1)
+        self.assertAlmostEqual(agc.max_gain(), 100)
+
+    def test_004(self):
+        ''' Test the floating point AGC loop (attack and decay rate inputs) '''
+        tb = self.tb
+
+        expected_result = \
+            (7.2191943445432116e-07,
+             58.837181091308594,
+             40.194305419921875,
+             2.9183335304260254,
+             0.67606079578399658,
+             8.6260438791896377e-09,
+             -1.4542514085769653,
+             -1.9210131168365479,
+             -1.0450780391693115,
+             -0.61939650774002075,
+             -1.2590258613442984e-08,
+             1.4308931827545166,
+             1.9054338932037354,
+             1.0443156957626343,
+             0.61937344074249268,
+             2.0983527804219193e-08,
+             -1.4308838844299316,
+             -1.9054274559020996,
+             -1.0443152189254761,
+             -0.61937344074249268,
+             -2.5180233009791664e-08,
+             1.4308837652206421,
+             1.9054274559020996,
+             1.0443154573440552,
+             0.61937344074249268,
+             3.3573645197293445e-08,
+             -1.4308838844299316,
+             -1.9054274559020996,
+             -1.0443152189254761,
+             -0.61937350034713745,
+             -3.7770352179222755e-08,
+             1.4308837652206421,
+             1.9054274559020996,
+             1.0443154573440552,
+             0.61937350034713745,
+             4.6163762590367696e-08,
+             -1.4308838844299316,
+             -1.9054274559020996,
+             -1.0443153381347656,
+             -0.61937344074249268,
+             -5.0360466019583328e-08,
+             1.4308837652206421,
+             1.9054274559020996,
+             1.0443155765533447,
+             0.61937344074249268,
+             5.8753879983441948e-08,
+             -1.4308837652206421,
+             -1.9054274559020996,
+             -1.0443153381347656,
+             -0.61937344074249268)
+
+        sampling_freq = 100
+        src1 = gr.sig_source_f(sampling_freq, gr.GR_SIN_WAVE,
+                               sampling_freq * 0.10, 100)
+        dst1 = gr.vector_sink_f()
+        head = gr.head(gr.sizeof_float, int(5*sampling_freq * 0.10))
+
+        agc = analog.agc2_ff(1e-2, 1e-3, 1, 1, 1000)
+
+        tb.connect(src1, head)
+        tb.connect(head, agc)
+        tb.connect(agc, dst1)
+
+        if test_output == True:
+            tb.connect(agc, gr.file_sink(gr.sizeof_float, "test_agc2_ff.dat"))
+
+        tb.run()
+        dst_data = dst1.data()
+        self.assertFloatTuplesAlmostEqual(expected_result, dst_data, 4)
+
+
+    def test_005(self):
+        ''' Test the complex AGC loop (attack and decay rate inputs) '''
+        tb = self.tb
+
+        expected_result = \
+                        ((100.000244140625+7.2191943445432116e-07j),
+                         (0.80881959199905396+0.58764183521270752j),
+                         (0.30894950032234192+0.95084899663925171j),
+                         (-0.30895623564720154+0.95086973905563354j),
+                         (-0.80887287855148315+0.58768033981323242j),
+                         (-0.99984413385391235+5.850709250410091e-09j),
+                         (-0.80889981985092163-0.58770018815994263j),
+                         (-0.30897706747055054-0.95093393325805664j),
+                         (0.30898112058639526-0.95094609260559082j),
+                         (0.80893135070800781-0.58772283792495728j),
+                         (0.99990922212600708-8.7766354184282136e-09j),
+                         (0.80894720554351807+0.58773452043533325j),
+                         (0.30899339914321899+0.95098406076431274j),
+                         (-0.30899572372436523+0.95099133253097534j),
+                         (-0.80896598100662231+0.58774799108505249j),
+                         (-0.99994778633117676+1.4628290578855285e-08j),
+                         (-0.80897533893585205-0.58775502443313599j),
+                         (-0.30900305509567261-0.95101380348205566j),
+                         (0.30900448560714722-0.95101797580718994j),
+                         (0.80898630619049072-0.58776277303695679j),
+                         (0.99997037649154663-1.7554345532744264e-08j),
+                         (0.80899184942245483+0.58776694536209106j),
+                         (0.30900871753692627+0.95103120803833008j),
+                         (-0.30900952219963074+0.95103377103805542j),
+                         (-0.8089984655380249+0.58777159452438354j),
+                         (-0.99998390674591064+2.3406109050938539e-08j),
+                         (-0.809001624584198-0.58777409791946411j),
+                         (-0.30901208519935608-0.95104163885116577j),
+                         (0.30901262164115906-0.95104306936264038j),
+                         (0.80900543928146362-0.587776780128479j),
+                         (0.99999171495437622-2.6332081404234486e-08j),
+                         (0.80900734663009644+0.58777821063995361j),
+                         (0.30901408195495605+0.95104765892028809j),
+                         (-0.30901429057121277+0.95104855298995972j),
+                         (-0.80900967121124268+0.58777981996536255j),
+                         (-0.99999648332595825+3.2183805842578295e-08j),
+                         (-0.80901080369949341-0.58778077363967896j),
+                         (-0.30901527404785156-0.95105135440826416j),
+                         (0.30901545286178589-0.95105189085006714j),
+                         (0.80901217460632324-0.58778166770935059j),
+                         (0.99999916553497314-3.5109700036173308e-08j),
+                         (0.809012770652771+0.58778214454650879j),
+                         (0.30901595950126648+0.9510534405708313j),
+                         (-0.30901598930358887+0.95105385780334473j),
+                         (-0.80901366472244263+0.58778274059295654j),
+                         (-1.0000008344650269+4.0961388947380328e-08j),
+                         (-0.8090139627456665-0.58778303861618042j),
+                         (-0.30901634693145752-0.95105475187301636j),
+                         (0.30901640653610229-0.95105493068695068j),
+                         (0.80901449918746948-0.5877833366394043j))
+
+        sampling_freq = 100
+        src1 = gr.sig_source_c(sampling_freq, gr.GR_SIN_WAVE,
+                               sampling_freq * 0.10, 100)
+        dst1 = gr.vector_sink_c()
+        head = gr.head(gr.sizeof_gr_complex, int(5*sampling_freq * 0.10))
+
+        agc = analog.agc2_cc(1e-2, 1e-3, 1, 1, 1000)
+
+        tb.connect(src1, head)
+        tb.connect(head, agc)
+        tb.connect(agc, dst1)
+
+        if test_output == True:
+            tb.connect(agc, gr.file_sink(gr.sizeof_gr_complex, "test_agc2_cc.dat"))
+
+        tb.run()
+        dst_data = dst1.data()
+        self.assertComplexTuplesAlmostEqual(expected_result, dst_data, 4)
+
+    def test_100(self):
+        ''' Test complex feedforward agc with constant input '''
+
+        length = 8
+        gain = 2
+        
+        input_data = 8*(0.0,) + 24*(1.0,) + 24*(0.0,)
+        expected_result = (8+length-1)*(0.0,) + 24*(gain*1.0,) + (0,)
+
+        src = gr.vector_source_c(input_data)
+        agc = analog.feedforward_agc_cc(8, 2.0)
+        dst = gr.vector_sink_c()
+        self.tb.connect(src, agc, dst)
+
+        if test_output == True:
+            self.tb.connect(agc, gr.file_sink(gr.sizeof_gr_complex,
+                                              "test_feedforward_cc.dat"))
+
+        self.tb.run()
+        dst_data = dst.data()[0:len(expected_result)]
+
+        self.assertComplexTuplesAlmostEqual(expected_result, dst_data, 4)
+
+
+if __name__ == '__main__':
+    gr_unittest.run(test_agc, "test_agc.xml")
diff --git a/gr-analog/swig/analog_swig.i b/gr-analog/swig/analog_swig.i
index 6d714dd0d..96e904fd6 100644
--- a/gr-analog/swig/analog_swig.i
+++ b/gr-analog/swig/analog_swig.i
@@ -28,12 +28,29 @@
 
 %{
 #include "analog/cpm.h"
+#include "analog/agc_cc.h"
+#include "analog/agc_ff.h"
+#include "analog/agc2_cc.h"
+#include "analog/agc2_ff.h"
 #include "analog/ctcss_squelch_ff.h"
+#include "analog/feedforward_agc_cc.h"
+#include "analog/squelch_base_cc.h"
 #include "analog/squelch_base_ff.h"
 %}
 
 %include "analog/cpm.h"
+%include "analog/agc_cc.h"
+%include "analog/agc_ff.h"
+%include "analog/agc2_cc.h"
+%include "analog/agc2_ff.h"
 %include "analog/ctcss_squelch_ff.h"
+%include "analog/feedforward_agc_cc.h"
+%include "analog/squelch_base_cc.h"
 %include "analog/squelch_base_ff.h"
 
+GR_SWIG_BLOCK_MAGIC2(analog, agc_cc);
+GR_SWIG_BLOCK_MAGIC2(analog, agc_ff);
+GR_SWIG_BLOCK_MAGIC2(analog, agc2_cc);
+GR_SWIG_BLOCK_MAGIC2(analog, agc2_ff);
 GR_SWIG_BLOCK_MAGIC2(analog, ctcss_squelch_ff);
+GR_SWIG_BLOCK_MAGIC2(analog, feedforward_agc_cc);