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-atsc | |
| 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-atsc')
| -rw-r--r-- | gr-atsc/include/atsc/fpll.h | 4 | ||||
| -rw-r--r-- | gr-atsc/lib/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/gr-atsc/include/atsc/fpll.h b/gr-atsc/include/atsc/fpll.h index 00d6b1e54e..2bffc327eb 100644 --- a/gr-atsc/include/atsc/fpll.h +++ b/gr-atsc/include/atsc/fpll.h @@ -25,7 +25,7 @@ #include <atsc/api.h> #include <gr_sync_block.h> -#include <blocks/nco.h> +#include <gr_nco.h> #include <filter/single_pole_iir.h> #include <analog/agc.h> #include <stdio.h> @@ -70,7 +70,7 @@ public: double initial_freq; double initial_phase; bool debug_no_update; - blocks::nco<float,float> nco; + gr_nco<float,float> nco; analog::kernel::agc_ff agc; // automatic gain control filter::single_pole_iir<float,float,float> afci; filter::single_pole_iir<float,float,float> afcq; diff --git a/gr-atsc/lib/CMakeLists.txt b/gr-atsc/lib/CMakeLists.txt index b30581be79..df9cc7c396 100644 --- a/gr-atsc/lib/CMakeLists.txt +++ b/gr-atsc/lib/CMakeLists.txt @@ -27,7 +27,6 @@ include_directories( ${GR_FILTER_INCLUDE_DIRS} ${GR_ANALOG_INCLUDE_DIRS} ${GR_FEC_INCLUDE_DIRS} - ${GR_BLOCKS_INCLUDE_DIRS} ${GNURADIO_CORE_INCLUDE_DIRS} ${GRUEL_INCLUDE_DIRS} ${LOG4CPP_INCLUDE_DIRS} @@ -121,7 +120,6 @@ list(APPEND atsc_libs gnuradio-analog gnuradio-core gnuradio-fec - gnuradio-blocks ${Boost_LIBRARIES} ${LOG4CPP_LIBRARIES} ) |