diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-08 10:01:37 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-08 10:01:37 -0500 |
| commit | fe70fa72ea22a133874337da2d03d30611e5ab1c (patch) | |
| tree | 720a9e4e289e9a029fb363c635675daf91e5f77b /gr-analog/lib/frequency_modulator_fc_impl.cc | |
| parent | 0970c7eaa165c6dc7d70be55dbf3d272b88fc109 (diff) | |
blocks: removed all nco/vco and fxpt stuff from core; now in gr-blocks.
Moved the nco/vco tests to gr-blocks/test and enabled them.
Diffstat (limited to 'gr-analog/lib/frequency_modulator_fc_impl.cc')
| -rw-r--r-- | gr-analog/lib/frequency_modulator_fc_impl.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gr-analog/lib/frequency_modulator_fc_impl.cc b/gr-analog/lib/frequency_modulator_fc_impl.cc index 2da7ee15f1..ae8c95d02f 100644 --- a/gr-analog/lib/frequency_modulator_fc_impl.cc +++ b/gr-analog/lib/frequency_modulator_fc_impl.cc @@ -26,7 +26,7 @@ #include "frequency_modulator_fc_impl.h" #include <gr_io_signature.h> -#include <gr_fxpt.h> +#include <blocks/fxpt.h> #include <math.h> #include <boost/math/special_functions/trunc.hpp> @@ -70,8 +70,8 @@ namespace gr { float oi, oq; - gr_int32 angle = gr_fxpt::float_to_fixed (d_phase); - gr_fxpt::sincos(angle, &oq, &oi); + int32_t angle = gr::blocks::fxpt::float_to_fixed (d_phase); + gr::blocks::fxpt::sincos(angle, &oq, &oi); out[i] = gr_complex(oi, oq); } |