diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-04-17 13:43:52 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-04-29 14:52:56 -0400 |
| commit | f3e2e07201c50033bf6c9d0c6a6f068557b4f17f (patch) | |
| tree | 140b3c2d20a951ffd4abd564c3378ee2e2f9fc7c /gr-analog/lib/pll_carriertracking_cc_impl.cc | |
| parent | 35303ae975a5b1bdecc2492bc96e2b8e89b62a3d (diff) | |
runtime: converting runtime core to gr namespace, gnuradio include dir.
Diffstat (limited to 'gr-analog/lib/pll_carriertracking_cc_impl.cc')
| -rw-r--r-- | gr-analog/lib/pll_carriertracking_cc_impl.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gr-analog/lib/pll_carriertracking_cc_impl.cc b/gr-analog/lib/pll_carriertracking_cc_impl.cc index 9213a5e681..0cc3f8b8ec 100644 --- a/gr-analog/lib/pll_carriertracking_cc_impl.cc +++ b/gr-analog/lib/pll_carriertracking_cc_impl.cc @@ -25,10 +25,10 @@ #endif #include "pll_carriertracking_cc_impl.h" -#include <gr_io_signature.h> -#include <gr_sincos.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/sincos.h> #include <math.h> -#include <gr_math.h> +#include <gnuradio/math.h> namespace gr { namespace analog { @@ -47,9 +47,9 @@ namespace gr { pll_carriertracking_cc_impl::pll_carriertracking_cc_impl(float loop_bw, float max_freq, float min_freq) - : gr_sync_block("pll_carriertracking_cc", - gr_make_io_signature(1, 1, sizeof(gr_complex)), - gr_make_io_signature(1, 1, sizeof(gr_complex))), + : sync_block("pll_carriertracking_cc", + io_signature::make(1, 1, sizeof(gr_complex)), + io_signature::make(1, 1, sizeof(gr_complex))), blocks::control_loop(loop_bw, max_freq, min_freq), d_locksig(0), d_lock_threshold(0), d_squelch_enable(false) { @@ -75,7 +75,7 @@ namespace gr { { float sample_phase; // sample_phase = atan2(sample.imag(),sample.real()); - sample_phase = gr_fast_atan2f(sample.imag(),sample.real()); + sample_phase = gr::fast_atan2f(sample.imag(),sample.real()); return mod_2pi(sample_phase-ref_phase); } @@ -109,7 +109,7 @@ namespace gr { float t_imag, t_real; for(int i = 0; i < noutput_items; i++) { - gr_sincosf(d_phase, &t_imag, &t_real); + gr::sincosf(d_phase, &t_imag, &t_real); optr[i] = iptr[i] * gr_complex(t_real, -t_imag); error = phase_detector(iptr[i], d_phase); |