4 files changed, 12 insertions, 43 deletions
diff --git a/gr-analog/include/analog/pll_carriertracking_cc.h b/gr-analog/include/analog/pll_carriertracking_cc.h
index 3596429d4..0812d650f 100644
--- a/gr-analog/include/analog/pll_carriertracking_cc.h
+++ b/gr-analog/include/analog/pll_carriertracking_cc.h
@@ -24,6 +24,7 @@
 #define INCLUDED_ANALOG_PLL_CARRIERTRACKING_CC_H
 
 #include <analog/api.h>
+#include <blocks/control_loop.h>
 #include <gr_sync_block.h>
 
 namespace gr {
@@ -45,7 +46,9 @@ namespace gr {
      * and should be set around pi/200 -- 2pi/100.  \sa
      * pll_freqdet_cf, pll_carriertracking_cc
      */
-    class ANALOG_API pll_carriertracking_cc : virtual public gr_sync_block
+    class ANALOG_API pll_carriertracking_cc
+      : virtual public gr_sync_block,
+        virtual public blocks::control_loop
     {
     public:
       // gr::analog::pll_carriertracking_cc::sptr
diff --git a/gr-analog/include/analog/pll_freqdet_cf.h b/gr-analog/include/analog/pll_freqdet_cf.h
index 613e85263..8ffbc5968 100644
--- a/gr-analog/include/analog/pll_freqdet_cf.h
+++ b/gr-analog/include/analog/pll_freqdet_cf.h
@@ -24,6 +24,7 @@
 #define INCLUDED_ANALOG_PLL_FREQDET_CF_H
 
 #include <analog/api.h>
+#include <blocks/control_loop.h>
 #include <gr_sync_block.h>
 
 namespace gr {
@@ -44,7 +45,9 @@ namespace gr {
      * around pi/200 -- 2pi/100.
      * \sa pll_refout_cc, pll_carriertracking_cc
      */
-    class ANALOG_API pll_freqdet_cf : virtual public gr_sync_block
+    class ANALOG_API pll_freqdet_cf
+      : virtual public gr_sync_block,
+        virtual public blocks::control_loop
     {
     public:
       // gr::analog::pll_freqdet_cf::sptr
diff --git a/gr-analog/include/analog/pll_refout_cc.h b/gr-analog/include/analog/pll_refout_cc.h
index a18d177e6..1ba907262 100644
--- a/gr-analog/include/analog/pll_refout_cc.h
+++ b/gr-analog/include/analog/pll_refout_cc.h
@@ -24,6 +24,7 @@
 #define INCLUDED_ANALOG_PLL_REFOUT_CC_H
 
 #include <analog/api.h>
+#include <blocks/control_loop.h>
 #include <gr_sync_block.h>
 
 namespace gr {
@@ -45,7 +46,9 @@ namespace gr {
      * and should be set around pi/200 -- 2pi/100.  \sa
      * pll_freqdet_cf, pll_carriertracking_cc
      */
-    class ANALOG_API pll_refout_cc : virtual public gr_sync_block
+    class ANALOG_API pll_refout_cc 
+      : virtual public gr_sync_block,
+        virtual public blocks::control_loop
     {
     public:
       // gr::analog::pll_refout_cc::sptr
diff --git a/gr-analog/include/analog/sincos.h b/gr-analog/include/analog/sincos.h
deleted file mode 100644
index a71164c88..000000000
--- a/gr-analog/include/analog/sincos.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2002,2004,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_SINCOS_H
-#define INCLUDED_ANALOG_SINCOS_H
-
-#include <analog/api.h>
-
-namespace gr {
-  namespace analog {
-
-  //! compute double sine and cosine at the same time
-  ANALOG_API void sincos(double x, double *sin, double *cos);
-
-  //! compute floating point sine and cosine at the same time
-  ANALOG_API void sincosf(float x, float *sin, float *cos);
-
-  } /* namespace analog */
-} /* namespace gr */
-
-#endif /* INCLUDED_ANALOG_SINCOS_H */