diff options
| author | Ben Reynwar <ben@reynwar.net> | 2013-05-19 02:55:33 -0700 |
|---|---|---|
| committer | Ben Reynwar <ben@reynwar.net> | 2013-05-19 02:55:33 -0700 |
| commit | bb01988e75d50d82cbb44c1a49c86c1d08f05665 (patch) | |
| tree | 0528dac14476d37f2cde7374a8fcb3428f879c69 /gr-analog/lib/pll_refout_cc_impl.cc | |
| parent | e4f0319eced22c112f7e6a4cc45bc2036d285332 (diff) | |
| parent | 0fa219774dcf9141ae91204f948c029b05673f3f (diff) | |
Merged in next_docs branch.
Diffstat (limited to 'gr-analog/lib/pll_refout_cc_impl.cc')
| -rw-r--r-- | gr-analog/lib/pll_refout_cc_impl.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gr-analog/lib/pll_refout_cc_impl.cc b/gr-analog/lib/pll_refout_cc_impl.cc index 3f0ccc7df5..157961318a 100644 --- a/gr-analog/lib/pll_refout_cc_impl.cc +++ b/gr-analog/lib/pll_refout_cc_impl.cc @@ -25,10 +25,10 @@ #endif #include "pll_refout_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 { @@ -45,9 +45,9 @@ namespace gr { } pll_refout_cc_impl::pll_refout_cc_impl(float loop_bw, float max_freq, float min_freq) - : gr_sync_block("pll_refout_cc", - gr_make_io_signature(1, 1, sizeof(gr_complex)), - gr_make_io_signature(1, 1, sizeof(gr_complex))), + : sync_block("pll_refout_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) { } @@ -71,7 +71,7 @@ namespace gr { pll_refout_cc_impl::phase_detector(gr_complex sample,float ref_phase) { float sample_phase; - 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); } @@ -88,7 +88,7 @@ namespace gr { int size = noutput_items; while(size-- > 0) { - gr_sincosf(d_phase,&t_imag,&t_real); + gr::sincosf(d_phase,&t_imag,&t_real); *optr++ = gr_complex(t_real,t_imag); error = phase_detector(*iptr++,d_phase); |