diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-18 12:50:11 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-18 12:50:11 -0400 |
| commit | 435b1d166f0c7092bbd5e1f788e75dbb6ade3a4b (patch) | |
| tree | 66332e47e3b889d980a0f01a0857df9ea5d4137e /gr-analog/lib | |
| parent | 5f839d93c97a2ac86001dbabdfc3941cf23410a1 (diff) | |
Revert "blocks: removed all nco/vco and fxpt stuff from core; now in gr-blocks."
This reverts commit fe70fa72ea22a133874337da2d03d30611e5ab1c.
Conflicts:
gnuradio-core/src/lib/general/CMakeLists.txt
gnuradio-core/src/lib/general/general.i
gnuradio-core/src/tests/CMakeLists.txt
Diffstat (limited to 'gr-analog/lib')
| -rw-r--r-- | gr-analog/lib/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-analog/lib/frequency_modulator_fc_impl.cc | 6 | ||||
| -rw-r--r-- | gr-analog/lib/sig_source_X_impl.h.t | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/gr-analog/lib/CMakeLists.txt b/gr-analog/lib/CMakeLists.txt index a1d03da653..92a523946d 100644 --- a/gr-analog/lib/CMakeLists.txt +++ b/gr-analog/lib/CMakeLists.txt @@ -27,7 +27,6 @@ include_directories( ${GR_ANALOG_INCLUDE_DIRS} ${GR_FILTER_INCLUDE_DIRS} ${GR_FFT_INCLUDE_DIRS} - ${GR_BLOCKS_INCLUDE_DIRS} ${GNURADIO_CORE_INCLUDE_DIRS} ${VOLK_INCLUDE_DIRS} ${GRUEL_INCLUDE_DIRS} @@ -161,7 +160,6 @@ list(APPEND analog_libs volk gnuradio-core gnuradio-filter - gnuradio-blocks ${Boost_LIBRARIES} ) diff --git a/gr-analog/lib/frequency_modulator_fc_impl.cc b/gr-analog/lib/frequency_modulator_fc_impl.cc index ae8c95d02f..2da7ee15f1 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 <blocks/fxpt.h> +#include <gr_fxpt.h> #include <math.h> #include <boost/math/special_functions/trunc.hpp> @@ -70,8 +70,8 @@ namespace gr { float oi, oq; - int32_t angle = gr::blocks::fxpt::float_to_fixed (d_phase); - gr::blocks::fxpt::sincos(angle, &oq, &oi); + gr_int32 angle = gr_fxpt::float_to_fixed (d_phase); + gr_fxpt::sincos(angle, &oq, &oi); out[i] = gr_complex(oi, oq); } diff --git a/gr-analog/lib/sig_source_X_impl.h.t b/gr-analog/lib/sig_source_X_impl.h.t index 4fed9a060a..50f1791270 100644 --- a/gr-analog/lib/sig_source_X_impl.h.t +++ b/gr-analog/lib/sig_source_X_impl.h.t @@ -27,7 +27,7 @@ #include <analog/@BASE_NAME@.h> #include <gr_sync_block.h> -#include <blocks/fxpt_nco.h> +#include <gr_fxpt_nco.h> namespace gr { namespace analog { @@ -40,7 +40,7 @@ namespace gr { double d_frequency; double d_ampl; @TYPE@ d_offset; - gr::blocks::fxpt_nco d_nco; + gr_fxpt_nco d_nco; public: @IMPL_NAME@(double sampling_freq, gr_waveform_t waveform, |