diff options
Diffstat (limited to 'gr-atsc/lib')
82 files changed, 233 insertions, 233 deletions
diff --git a/gr-atsc/lib/GrAtscBitTimingLoop.cc b/gr-atsc/lib/GrAtscBitTimingLoop.cc index f2e666892b..835dc14a91 100644 --- a/gr-atsc/lib/GrAtscBitTimingLoop.cc +++ b/gr-atsc/lib/GrAtscBitTimingLoop.cc @@ -21,10 +21,10 @@ */ #include <cmath> -#include <atsc/GrAtscBitTimingLoop.h> +#include <gnuradio/atsc/GrAtscBitTimingLoop.h> #include "fpll_btloop_coupling.h" #include <algorithm> -#include <atsc/consts.h> +#include <gnuradio/atsc/consts.h> #include <stdio.h> #include <assert.h> diff --git a/gr-atsc/lib/GrAtscBitTimingLoop2.cc b/gr-atsc/lib/GrAtscBitTimingLoop2.cc index d856123fc3..536ca08720 100644 --- a/gr-atsc/lib/GrAtscBitTimingLoop2.cc +++ b/gr-atsc/lib/GrAtscBitTimingLoop2.cc @@ -20,9 +20,9 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/GrAtscBitTimingLoop2.h> +#include <gnuradio/atsc/GrAtscBitTimingLoop2.h> #include <algorithm> -#include <atsc/consts.h> +#include <gnuradio/atsc/consts.h> #include <stdio.h> #include <assert.h> diff --git a/gr-atsc/lib/GrAtscBitTimingLoop3.cc b/gr-atsc/lib/GrAtscBitTimingLoop3.cc index 647b34c151..14596900a9 100644 --- a/gr-atsc/lib/GrAtscBitTimingLoop3.cc +++ b/gr-atsc/lib/GrAtscBitTimingLoop3.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/GrAtscBitTimingLoop3.h> +#include <gnuradio/atsc/GrAtscBitTimingLoop3.h> #include <cmath> #include <cstdio> #include <assert.h> diff --git a/gr-atsc/lib/GrAtscConvert2xTo20.cc b/gr-atsc/lib/GrAtscConvert2xTo20.cc index ac22ee1258..296ae35302 100644 --- a/gr-atsc/lib/GrAtscConvert2xTo20.cc +++ b/gr-atsc/lib/GrAtscConvert2xTo20.cc @@ -20,8 +20,8 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/GrAtscConvert2xTo20.h> -#include <atsc/consts.h> +#include <gnuradio/atsc/GrAtscConvert2xTo20.h> +#include <gnuradio/atsc/consts.h> #include <cmath> #include <cstdio> diff --git a/gr-atsc/lib/GrAtscDataSegToSoftDataSeg.cc b/gr-atsc/lib/GrAtscDataSegToSoftDataSeg.cc index 2406c0c33d..a17927bf5b 100644 --- a/gr-atsc/lib/GrAtscDataSegToSoftDataSeg.cc +++ b/gr-atsc/lib/GrAtscDataSegToSoftDataSeg.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/GrAtscDataSegToSoftDataSeg.h> +#include <gnuradio/atsc/GrAtscDataSegToSoftDataSeg.h> // typedefs for fundamental i/o types diff --git a/gr-atsc/lib/GrAtscDeinterleaver.cc b/gr-atsc/lib/GrAtscDeinterleaver.cc index 69fac69aa8..dffa99e809 100644 --- a/gr-atsc/lib/GrAtscDeinterleaver.cc +++ b/gr-atsc/lib/GrAtscDeinterleaver.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/GrAtscDeinterleaver.h> +#include <gnuradio/atsc/GrAtscDeinterleaver.h> // typedefs for fundamental i/o types diff --git a/gr-atsc/lib/GrAtscDerandomizer.cc b/gr-atsc/lib/GrAtscDerandomizer.cc index ac1701d906..f6c1203bc9 100644 --- a/gr-atsc/lib/GrAtscDerandomizer.cc +++ b/gr-atsc/lib/GrAtscDerandomizer.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/GrAtscDerandomizer.h> +#include <gnuradio/atsc/GrAtscDerandomizer.h> // typedefs for fundamental i/o types diff --git a/gr-atsc/lib/GrAtscEqualizer.cc b/gr-atsc/lib/GrAtscEqualizer.cc index 3e9f8a0022..71e6723505 100644 --- a/gr-atsc/lib/GrAtscEqualizer.cc +++ b/gr-atsc/lib/GrAtscEqualizer.cc @@ -20,8 +20,8 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/GrAtscEqualizer.h> -#include <atsc/equalizer_impl.h> +#include <gnuradio/atsc/GrAtscEqualizer.h> +#include <gnuradio/atsc/equalizer_impl.h> // typedefs for fundamental i/o types diff --git a/gr-atsc/lib/GrAtscFPLL.cc b/gr-atsc/lib/GrAtscFPLL.cc index fc796c3c12..e0919e0181 100644 --- a/gr-atsc/lib/GrAtscFPLL.cc +++ b/gr-atsc/lib/GrAtscFPLL.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/GrAtscFPLL.h> +#include <gnuradio/atsc/GrAtscFPLL.h> #include <algorithm> #include "fpll_btloop_coupling.h" diff --git a/gr-atsc/lib/GrAtscFieldSyncChecker.cc b/gr-atsc/lib/GrAtscFieldSyncChecker.cc index 0aaa98e4f6..620962cbcd 100644 --- a/gr-atsc/lib/GrAtscFieldSyncChecker.cc +++ b/gr-atsc/lib/GrAtscFieldSyncChecker.cc @@ -20,9 +20,9 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/GrAtscFieldSyncChecker.h> -#include <atsc/create_atsci_fs_checker.h> -#include <atsc/fs_checker_impl.h> +#include <gnuradio/atsc/GrAtscFieldSyncChecker.h> +#include <gnuradio/atsc/create_atsci_fs_checker.h> +#include <gnuradio/atsc/fs_checker_impl.h> // typedefs for fundamental i/o types diff --git a/gr-atsc/lib/GrAtscFieldSyncCorrelator.cc b/gr-atsc/lib/GrAtscFieldSyncCorrelator.cc index 5d42d3b5a9..0abb1799f1 100644 --- a/gr-atsc/lib/GrAtscFieldSyncCorrelator.cc +++ b/gr-atsc/lib/GrAtscFieldSyncCorrelator.cc @@ -20,9 +20,9 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/GrAtscFieldSyncCorrelator.h> -#include <atsc/create_atsci_fs_correlator.h> -#include <atsc/fs_correlator_impl.h> +#include <gnuradio/atsc/GrAtscFieldSyncCorrelator.h> +#include <gnuradio/atsc/create_atsci_fs_correlator.h> +#include <gnuradio/atsc/fs_correlator_impl.h> // typedefs for fundamental i/o types diff --git a/gr-atsc/lib/GrAtscFieldSyncDemux.cc b/gr-atsc/lib/GrAtscFieldSyncDemux.cc index 171d25d23d..873b56eaf3 100644 --- a/gr-atsc/lib/GrAtscFieldSyncDemux.cc +++ b/gr-atsc/lib/GrAtscFieldSyncDemux.cc @@ -21,10 +21,10 @@ */ #include <cmath> -#include <atsc/GrAtscFieldSyncDemux.h> -#include <atsc/consts.h> -#include <atsc/types.h> -#include <atsc/syminfo_impl.h> +#include <gnuradio/atsc/GrAtscFieldSyncDemux.h> +#include <gnuradio/atsc/consts.h> +#include <gnuradio/atsc/types.h> +#include <gnuradio/atsc/syminfo_impl.h> #include <stdio.h> #include <assert.h> diff --git a/gr-atsc/lib/GrAtscFieldSyncMux.cc b/gr-atsc/lib/GrAtscFieldSyncMux.cc index 50ad55448d..4d514fd852 100644 --- a/gr-atsc/lib/GrAtscFieldSyncMux.cc +++ b/gr-atsc/lib/GrAtscFieldSyncMux.cc @@ -20,8 +20,8 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/GrAtscFieldSyncMux.h> -#include <atsc/pnXXX_impl.h> +#include <gnuradio/atsc/GrAtscFieldSyncMux.h> +#include <gnuradio/atsc/pnXXX_impl.h> // typedefs for fundamental i/o types diff --git a/gr-atsc/lib/GrAtscInterleaver.cc b/gr-atsc/lib/GrAtscInterleaver.cc index 58113bd5d4..f24dcaad15 100644 --- a/gr-atsc/lib/GrAtscInterleaver.cc +++ b/gr-atsc/lib/GrAtscInterleaver.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/GrAtscInterleaver.h> +#include <gnuradio/atsc/GrAtscInterleaver.h> // typedefs for fundamental i/o types diff --git a/gr-atsc/lib/GrAtscRSDecoder.cc b/gr-atsc/lib/GrAtscRSDecoder.cc index 211c569efd..f87edef6ae 100644 --- a/gr-atsc/lib/GrAtscRSDecoder.cc +++ b/gr-atsc/lib/GrAtscRSDecoder.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/GrAtscRSDecoder.h> +#include <gnuradio/atsc/GrAtscRSDecoder.h> // typedefs for fundamental i/o types diff --git a/gr-atsc/lib/GrAtscRSEncoder.cc b/gr-atsc/lib/GrAtscRSEncoder.cc index f7a457351b..deef98f180 100644 --- a/gr-atsc/lib/GrAtscRSEncoder.cc +++ b/gr-atsc/lib/GrAtscRSEncoder.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/GrAtscRSEncoder.h> +#include <gnuradio/atsc/GrAtscRSEncoder.h> // typedefs for fundamental i/o types diff --git a/gr-atsc/lib/GrAtscRandomizer.cc b/gr-atsc/lib/GrAtscRandomizer.cc index b4123c788f..bdf5e682ae 100644 --- a/gr-atsc/lib/GrAtscRandomizer.cc +++ b/gr-atsc/lib/GrAtscRandomizer.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/GrAtscRandomizer.h> +#include <gnuradio/atsc/GrAtscRandomizer.h> // typedefs for fundamental i/o types diff --git a/gr-atsc/lib/GrAtscSegSymSync.cc b/gr-atsc/lib/GrAtscSegSymSync.cc index 53d5d3b4bb..001f8a1bba 100644 --- a/gr-atsc/lib/GrAtscSegSymSync.cc +++ b/gr-atsc/lib/GrAtscSegSymSync.cc @@ -20,8 +20,8 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/GrAtscSegSymSync.h> -#include <atsc/GrAtscSegSymSyncImpl_export.h> +#include <gnuradio/atsc/GrAtscSegSymSync.h> +#include <gnuradio/atsc/GrAtscSegSymSyncImpl_export.h> #include <iostream> #include <assert.h> diff --git a/gr-atsc/lib/GrAtscSegSymSyncImpl.cc b/gr-atsc/lib/GrAtscSegSymSyncImpl.cc index 425ab36d11..bdb15a2b57 100644 --- a/gr-atsc/lib/GrAtscSegSymSyncImpl.cc +++ b/gr-atsc/lib/GrAtscSegSymSyncImpl.cc @@ -20,8 +20,8 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/GrAtscSegSymSyncImpl.h> -#include <atsc/GrAtscSegSymSyncImpl_export.h> +#include <gnuradio/atsc/GrAtscSegSymSyncImpl.h> +#include <gnuradio/atsc/GrAtscSegSymSyncImpl_export.h> #include <cmath> #include <assert.h> diff --git a/gr-atsc/lib/GrAtscTrellisEncoder.cc b/gr-atsc/lib/GrAtscTrellisEncoder.cc index abe67d2a9e..62f7f75b22 100644 --- a/gr-atsc/lib/GrAtscTrellisEncoder.cc +++ b/gr-atsc/lib/GrAtscTrellisEncoder.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/GrAtscTrellisEncoder.h> +#include <gnuradio/atsc/GrAtscTrellisEncoder.h> // typedefs for fundamental i/o types diff --git a/gr-atsc/lib/GrAtscViterbiDecoder.cc b/gr-atsc/lib/GrAtscViterbiDecoder.cc index 986fe001dc..272d457846 100644 --- a/gr-atsc/lib/GrAtscViterbiDecoder.cc +++ b/gr-atsc/lib/GrAtscViterbiDecoder.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/GrAtscViterbiDecoder.h> +#include <gnuradio/atsc/GrAtscViterbiDecoder.h> #include <iostream> // typedefs for fundamental i/o types diff --git a/gr-atsc/lib/atsc_bit_timing_loop.cc b/gr-atsc/lib/atsc_bit_timing_loop.cc index 7287eee19f..f75e724834 100644 --- a/gr-atsc/lib/atsc_bit_timing_loop.cc +++ b/gr-atsc/lib/atsc_bit_timing_loop.cc @@ -24,9 +24,9 @@ #include <config.h> #endif -#include <atsc/bit_timing_loop.h> -#include <gr_io_signature.h> -#include <atsc/consts.h> +#include <gnuradio/atsc/bit_timing_loop.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/atsc/consts.h> #include <string.h> // Input rate changed from 20MHz to 19.2 to support usrp at 3 * 6.4MHz @@ -42,12 +42,12 @@ atsc_make_bit_timing_loop() atsc_bit_timing_loop::atsc_bit_timing_loop() - : gr_block("atsc_bit_timing_loop", - gr_make_io_signature(1, 1, sizeof(float)), - gr_make_io_signature3(2, 3, sizeof(float), sizeof(float), sizeof(float))), - d_interp(ratio_of_rx_clock_to_symbol_freq), d_next_input(0), - d_rx_clock_to_symbol_freq (ratio_of_rx_clock_to_symbol_freq), - d_si(0) + : gr::block("atsc_bit_timing_loop", + gr::io_signature::make(1, 1, sizeof(float)), + gr::io_signature::make3(2, 3, sizeof(float), sizeof(float), sizeof(float))), + d_interp(ratio_of_rx_clock_to_symbol_freq), d_next_input(0), + d_rx_clock_to_symbol_freq (ratio_of_rx_clock_to_symbol_freq), + d_si(0) { reset(); } diff --git a/gr-atsc/lib/atsc_deinterleaver.cc b/gr-atsc/lib/atsc_deinterleaver.cc index bc6d742bf6..47507e58aa 100644 --- a/gr-atsc/lib/atsc_deinterleaver.cc +++ b/gr-atsc/lib/atsc_deinterleaver.cc @@ -24,9 +24,9 @@ #include <config.h> #endif -#include <atsc/deinterleaver.h> -#include <gr_io_signature.h> -#include <atsc/consts.h> +#include <gnuradio/atsc/deinterleaver.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/atsc/consts.h> atsc_deinterleaver_sptr @@ -36,9 +36,9 @@ atsc_make_deinterleaver() } atsc_deinterleaver::atsc_deinterleaver() - : gr_sync_block("atsc_deinterleaver", - gr_make_io_signature(1, 1, sizeof(atsc_mpeg_packet_rs_encoded)), - gr_make_io_signature(1, 1, sizeof(atsc_mpeg_packet_rs_encoded))) + : gr::sync_block("atsc_deinterleaver", + gr::io_signature::make(1, 1, sizeof(atsc_mpeg_packet_rs_encoded)), + gr::io_signature::make(1, 1, sizeof(atsc_mpeg_packet_rs_encoded))) { reset(); } diff --git a/gr-atsc/lib/atsc_depad.cc b/gr-atsc/lib/atsc_depad.cc index 7dd6ba1c68..b4872df2c9 100644 --- a/gr-atsc/lib/atsc_depad.cc +++ b/gr-atsc/lib/atsc_depad.cc @@ -24,9 +24,9 @@ #include <config.h> #endif -#include <atsc/depad.h> -#include <gr_io_signature.h> -#include <atsc/types.h> +#include <gnuradio/atsc/depad.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/atsc/types.h> atsc_depad_sptr atsc_make_depad() @@ -35,10 +35,10 @@ atsc_make_depad() } atsc_depad::atsc_depad() - : gr_sync_interpolator("atsc_depad", - gr_make_io_signature(1, 1, sizeof(atsc_mpeg_packet)), - gr_make_io_signature(1, 1, sizeof(unsigned char)), - ATSC_MPEG_PKT_LENGTH) + : gr::sync_interpolator("atsc_depad", + gr::io_signature::make(1, 1, sizeof(atsc_mpeg_packet)), + gr::io_signature::make(1, 1, sizeof(unsigned char)), + ATSC_MPEG_PKT_LENGTH) { reset(); } diff --git a/gr-atsc/lib/atsc_derandomizer.cc b/gr-atsc/lib/atsc_derandomizer.cc index 79b3612af4..e619aa6865 100644 --- a/gr-atsc/lib/atsc_derandomizer.cc +++ b/gr-atsc/lib/atsc_derandomizer.cc @@ -24,9 +24,9 @@ #include <config.h> #endif -#include <atsc/derandomizer.h> -#include <gr_io_signature.h> -#include <atsc/consts.h> +#include <gnuradio/atsc/derandomizer.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/atsc/consts.h> atsc_derandomizer_sptr @@ -36,9 +36,9 @@ atsc_make_derandomizer() } atsc_derandomizer::atsc_derandomizer() - : gr_sync_block("atsc_derandomizer", - gr_make_io_signature(1, 1, sizeof(atsc_mpeg_packet_no_sync)), - gr_make_io_signature(1, 1, sizeof(atsc_mpeg_packet))) + : gr::sync_block("atsc_derandomizer", + gr::io_signature::make(1, 1, sizeof(atsc_mpeg_packet_no_sync)), + gr::io_signature::make(1, 1, sizeof(atsc_mpeg_packet))) { reset(); } diff --git a/gr-atsc/lib/atsc_ds_to_softds.cc b/gr-atsc/lib/atsc_ds_to_softds.cc index 06ea9686c0..d4f79f829e 100644 --- a/gr-atsc/lib/atsc_ds_to_softds.cc +++ b/gr-atsc/lib/atsc_ds_to_softds.cc @@ -24,9 +24,9 @@ #include <config.h> #endif -#include <atsc/ds_to_softds.h> -#include <gr_io_signature.h> -#include <atsc/consts.h> +#include <gnuradio/atsc/ds_to_softds.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/atsc/consts.h> atsc_ds_to_softds_sptr @@ -36,9 +36,9 @@ atsc_make_ds_to_softds() } atsc_ds_to_softds::atsc_ds_to_softds() - : gr_sync_block("atsc_ds_to_softds", - gr_make_io_signature(1, 1, sizeof(atsc_data_segment)), - gr_make_io_signature(1, 1, sizeof(atsc_soft_data_segment))) + : gr::sync_block("atsc_ds_to_softds", + gr::io_signature::make(1, 1, sizeof(atsc_data_segment)), + gr::io_signature::make(1, 1, sizeof(atsc_soft_data_segment))) { reset(); } diff --git a/gr-atsc/lib/atsc_equalizer.cc b/gr-atsc/lib/atsc_equalizer.cc index 6838cc1547..2e00f5f374 100644 --- a/gr-atsc/lib/atsc_equalizer.cc +++ b/gr-atsc/lib/atsc_equalizer.cc @@ -24,11 +24,11 @@ #include <config.h> #endif -#include <atsc/equalizer.h> -#include <atsc/create_atsci_equalizer.h> -#include <gr_io_signature.h> -#include <atsc/consts.h> -#include <atsc/syminfo_impl.h> +#include <gnuradio/atsc/equalizer.h> +#include <gnuradio/atsc/create_atsci_equalizer.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/atsc/consts.h> +#include <gnuradio/atsc/syminfo_impl.h> atsc_equalizer_sptr @@ -39,9 +39,9 @@ atsc_make_equalizer() // had atsc_equalizer(atsci_equalizer *equalizer) atsc_equalizer::atsc_equalizer() - : gr_sync_block("atsc_equalizer", - gr_make_io_signature(2, 2, sizeof(float)), - gr_make_io_signature(2, 2, sizeof(float))) + : gr::sync_block("atsc_equalizer", + gr::io_signature::make(2, 2, sizeof(float)), + gr::io_signature::make(2, 2, sizeof(float))) { d_equalizer = create_atsci_equalizer_lms(); } diff --git a/gr-atsc/lib/atsc_field_sync_demux.cc b/gr-atsc/lib/atsc_field_sync_demux.cc index 7697a02c6a..69830f45ed 100644 --- a/gr-atsc/lib/atsc_field_sync_demux.cc +++ b/gr-atsc/lib/atsc_field_sync_demux.cc @@ -25,11 +25,11 @@ #endif #include <cmath> -#include <atsc/field_sync_demux.h> -#include <gr_io_signature.h> -#include <atsc/types.h> -#include <atsc/consts.h> -#include <atsc/syminfo_impl.h> +#include <gnuradio/atsc/field_sync_demux.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/atsc/types.h> +#include <gnuradio/atsc/consts.h> +#include <gnuradio/atsc/syminfo_impl.h> #include <stdio.h> #include <assert.h> #include <iostream> @@ -38,7 +38,7 @@ using std::cerr; using std::endl; -static const int DEC = ATSC_DATA_SEGMENT_LENGTH; // nominal decimation factor +static const int DEC = ATSC_DATA_SEGMENT_LENGTH; // nominal decimation factor atsc_field_sync_demux_sptr @@ -48,12 +48,12 @@ atsc_make_field_sync_demux() } atsc_field_sync_demux::atsc_field_sync_demux() - : gr_block("atsc_field_sync_demux", - gr_make_io_signature(2, 2, sizeof(float)), - gr_make_io_signature(1, 1, sizeof(atsc_soft_data_segment))), - d_locked(false), d_in_field2(true), d_segment_number(0), - d_next_input(0), d_lost_index(0), d_inputs0_index(0), - d_inputs0_size(0), d_consume(0) + : gr::block("atsc_field_sync_demux", + gr::io_signature::make(2, 2, sizeof(float)), + gr::io_signature::make(1, 1, sizeof(atsc_soft_data_segment))), + d_locked(false), d_in_field2(true), d_segment_number(0), + d_next_input(0), d_lost_index(0), d_inputs0_index(0), + d_inputs0_size(0), d_consume(0) { reset(); } diff --git a/gr-atsc/lib/atsc_field_sync_mux.cc b/gr-atsc/lib/atsc_field_sync_mux.cc index 578af9eff1..5520a74877 100644 --- a/gr-atsc/lib/atsc_field_sync_mux.cc +++ b/gr-atsc/lib/atsc_field_sync_mux.cc @@ -24,10 +24,10 @@ #include <config.h> #endif -#include <atsc/field_sync_mux.h> -#include <gr_io_signature.h> -#include <atsc/consts.h> -#include <atsc/pnXXX_impl.h> +#include <gnuradio/atsc/field_sync_mux.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/atsc/consts.h> +#include <gnuradio/atsc/pnXXX_impl.h> atsc_field_sync_mux_sptr @@ -37,9 +37,9 @@ atsc_make_field_sync_mux() } atsc_field_sync_mux::atsc_field_sync_mux() - : gr_sync_block("atsc_field_sync_mux", - gr_make_io_signature(1, 1, sizeof(atsc_data_segment)), - gr_make_io_signature(1, 1, sizeof(atsc_data_segment))) + : gr::sync_block("atsc_field_sync_mux", + gr::io_signature::make(1, 1, sizeof(atsc_data_segment)), + gr::io_signature::make(1, 1, sizeof(atsc_data_segment))) { reset(); } diff --git a/gr-atsc/lib/atsc_fpll.cc b/gr-atsc/lib/atsc_fpll.cc index 999a326bee..9a27674c0a 100644 --- a/gr-atsc/lib/atsc_fpll.cc +++ b/gr-atsc/lib/atsc_fpll.cc @@ -24,12 +24,12 @@ #include <config.h> #endif -#include <atsc/fpll.h> -#include <gr_io_signature.h> -#include <atsc/consts.h> +#include <gnuradio/atsc/fpll.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/atsc/consts.h> #include <algorithm> #include "fpll_btloop_coupling.h" -#include <gr_math.h> +#include <gnuradio/math.h> atsc_fpll_sptr atsc_make_fpll() @@ -51,9 +51,9 @@ static const float FPLL_AGC_RATE = 0.25e-6; atsc_fpll::atsc_fpll() - : gr_sync_block("atsc_fpll", - gr_make_io_signature(1, 1, sizeof(float)), - gr_make_io_signature(1, 1, sizeof(float))), + : gr::sync_block("atsc_fpll", + gr::io_signature::make(1, 1, sizeof(float)), + gr::io_signature::make(1, 1, sizeof(float))), initial_phase(0) { initial_freq = 5.75e6 - 3e6 + 0.31e6 + 5e3; // a_initial_freq; @@ -107,7 +107,7 @@ atsc_fpll::work (int noutput_items, // phase detector // float x = atan2 (filtered_Q, filtered_I); - float x = gr_fast_atan2f(filtered_Q, filtered_I); + float x = gr::fast_atan2f(filtered_Q, filtered_I); // avoid slamming filter with big transitions diff --git a/gr-atsc/lib/atsc_fs_checker.cc b/gr-atsc/lib/atsc_fs_checker.cc index 41d16d20be..28e771dfb5 100644 --- a/gr-atsc/lib/atsc_fs_checker.cc +++ b/gr-atsc/lib/atsc_fs_checker.cc @@ -24,12 +24,12 @@ #include <config.h> #endif -#include <atsc/fs_checker.h> -#include <atsc/create_atsci_fs_checker.h> -#include <atsc/fs_checker_impl.h> -#include <gr_io_signature.h> -#include <atsc/consts.h> -#include <atsc/syminfo_impl.h> +#include <gnuradio/atsc/fs_checker.h> +#include <gnuradio/atsc/create_atsci_fs_checker.h> +#include <gnuradio/atsc/fs_checker_impl.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/atsc/consts.h> +#include <gnuradio/atsc/syminfo_impl.h> atsc_fs_checker_sptr @@ -39,9 +39,9 @@ atsc_make_fs_checker() } atsc_fs_checker::atsc_fs_checker() - : gr_sync_block("atsc_fs_checker", - gr_make_io_signature(2, 2, sizeof(float)), - gr_make_io_signature(2, 2, sizeof(float))) + : gr::sync_block("atsc_fs_checker", + gr::io_signature::make(2, 2, sizeof(float)), + gr::io_signature::make(2, 2, sizeof(float))) { d_fsc = create_atsci_fs_checker(); } diff --git a/gr-atsc/lib/atsc_interleaver.cc b/gr-atsc/lib/atsc_interleaver.cc index e7c22316b5..ef8820abaf 100644 --- a/gr-atsc/lib/atsc_interleaver.cc +++ b/gr-atsc/lib/atsc_interleaver.cc @@ -24,9 +24,9 @@ #include <config.h> #endif -#include <atsc/interleaver.h> -#include <gr_io_signature.h> -#include <atsc/consts.h> +#include <gnuradio/atsc/interleaver.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/atsc/consts.h> atsc_interleaver_sptr @@ -36,9 +36,9 @@ atsc_make_interleaver() } atsc_interleaver::atsc_interleaver() - : gr_sync_block("atsc_interleaver", - gr_make_io_signature(1, 1, sizeof(atsc_mpeg_packet_rs_encoded)), - gr_make_io_signature(1, 1, sizeof(atsc_mpeg_packet_rs_encoded))) + : gr::sync_block("atsc_interleaver", + gr::io_signature::make(1, 1, sizeof(atsc_mpeg_packet_rs_encoded)), + gr::io_signature::make(1, 1, sizeof(atsc_mpeg_packet_rs_encoded))) { reset(); } diff --git a/gr-atsc/lib/atsc_pad.cc b/gr-atsc/lib/atsc_pad.cc index 9b181a8b78..776eb4ab05 100644 --- a/gr-atsc/lib/atsc_pad.cc +++ b/gr-atsc/lib/atsc_pad.cc @@ -24,9 +24,9 @@ #include <config.h> #endif -#include <atsc/pad.h> -#include <gr_io_signature.h> -#include <atsc/types.h> +#include <gnuradio/atsc/pad.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/atsc/types.h> static const int INTR = ATSC_MPEG_PKT_LENGTH; @@ -37,10 +37,10 @@ atsc_make_pad() } atsc_pad::atsc_pad() - : gr_sync_decimator("atsc_pad", - gr_make_io_signature(1, 1, sizeof(unsigned char)), - gr_make_io_signature(1, 1, sizeof(atsc_mpeg_packet)), - INTR) + : gr::sync_decimator("atsc_pad", + gr::io_signature::make(1, 1, sizeof(unsigned char)), + gr::io_signature::make(1, 1, sizeof(atsc_mpeg_packet)), + INTR) { reset(); } diff --git a/gr-atsc/lib/atsc_randomizer.cc b/gr-atsc/lib/atsc_randomizer.cc index 8f88c51a26..6ee61a9888 100644 --- a/gr-atsc/lib/atsc_randomizer.cc +++ b/gr-atsc/lib/atsc_randomizer.cc @@ -24,9 +24,9 @@ #include <config.h> #endif -#include <atsc/randomizer.h> -#include <gr_io_signature.h> -#include <atsc/consts.h> +#include <gnuradio/atsc/randomizer.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/atsc/consts.h> atsc_randomizer_sptr @@ -36,9 +36,9 @@ atsc_make_randomizer() } atsc_randomizer::atsc_randomizer() - : gr_sync_block("atsc_randomizer", - gr_make_io_signature(1, 1, sizeof(atsc_mpeg_packet)), - gr_make_io_signature(1, 1, sizeof(atsc_mpeg_packet_no_sync))) + : gr::sync_block("atsc_randomizer", + gr::io_signature::make(1, 1, sizeof(atsc_mpeg_packet)), + gr::io_signature::make(1, 1, sizeof(atsc_mpeg_packet_no_sync))) { reset(); } diff --git a/gr-atsc/lib/atsc_rs_decoder.cc b/gr-atsc/lib/atsc_rs_decoder.cc index 80ff41c2be..3891b3874d 100644 --- a/gr-atsc/lib/atsc_rs_decoder.cc +++ b/gr-atsc/lib/atsc_rs_decoder.cc @@ -24,9 +24,9 @@ #include <config.h> #endif -#include <atsc/rs_decoder.h> -#include <gr_io_signature.h> -#include <atsc/consts.h> +#include <gnuradio/atsc/rs_decoder.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/atsc/consts.h> atsc_rs_decoder_sptr @@ -36,9 +36,9 @@ atsc_make_rs_decoder() } atsc_rs_decoder::atsc_rs_decoder() - : gr_sync_block("atsc_rs_decoder", - gr_make_io_signature(1, 1, sizeof(atsc_mpeg_packet_rs_encoded)), - gr_make_io_signature(1, 1, sizeof(atsc_mpeg_packet_no_sync))) + : gr::sync_block("atsc_rs_decoder", + gr::io_signature::make(1, 1, sizeof(atsc_mpeg_packet_rs_encoded)), + gr::io_signature::make(1, 1, sizeof(atsc_mpeg_packet_no_sync))) { reset(); } diff --git a/gr-atsc/lib/atsc_rs_encoder.cc b/gr-atsc/lib/atsc_rs_encoder.cc index 9773f94489..b2b8cf7421 100644 --- a/gr-atsc/lib/atsc_rs_encoder.cc +++ b/gr-atsc/lib/atsc_rs_encoder.cc @@ -24,9 +24,9 @@ #include <config.h> #endif -#include <atsc/rs_encoder.h> -#include <gr_io_signature.h> -#include <atsc/consts.h> +#include <gnuradio/atsc/rs_encoder.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/atsc/consts.h> atsc_rs_encoder_sptr @@ -36,9 +36,9 @@ atsc_make_rs_encoder() } atsc_rs_encoder::atsc_rs_encoder() - : gr_sync_block("atsc_rs_encoder", - gr_make_io_signature(1, 1, sizeof(atsc_mpeg_packet_no_sync)), - gr_make_io_signature(1, 1, sizeof(atsc_mpeg_packet_rs_encoded))) + : gr::sync_block("atsc_rs_encoder", + gr::io_signature::make(1, 1, sizeof(atsc_mpeg_packet_no_sync)), + gr::io_signature::make(1, 1, sizeof(atsc_mpeg_packet_rs_encoded))) { reset(); } diff --git a/gr-atsc/lib/atsc_trellis_encoder.cc b/gr-atsc/lib/atsc_trellis_encoder.cc index 615864d971..fe8530d6d2 100644 --- a/gr-atsc/lib/atsc_trellis_encoder.cc +++ b/gr-atsc/lib/atsc_trellis_encoder.cc @@ -24,9 +24,9 @@ #include <config.h> #endif -#include <atsc/trellis_encoder.h> -#include <gr_io_signature.h> -#include <atsc/consts.h> +#include <gnuradio/atsc/trellis_encoder.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/atsc/consts.h> atsc_trellis_encoder_sptr @@ -36,9 +36,9 @@ atsc_make_trellis_encoder() } atsc_trellis_encoder::atsc_trellis_encoder() - : gr_sync_block("atsc_trellis_encoder", - gr_make_io_signature(1, 1, sizeof(atsc_mpeg_packet_rs_encoded)), - gr_make_io_signature(1, 1, sizeof(atsc_data_segment))) + : gr::sync_block("atsc_trellis_encoder", + gr::io_signature::make(1, 1, sizeof(atsc_mpeg_packet_rs_encoded)), + gr::io_signature::make(1, 1, sizeof(atsc_data_segment))) { set_output_multiple(atsci_trellis_encoder::NCODERS); reset(); diff --git a/gr-atsc/lib/atsc_viterbi_decoder.cc b/gr-atsc/lib/atsc_viterbi_decoder.cc index ca32c6d998..7f74bffc3b 100644 --- a/gr-atsc/lib/atsc_viterbi_decoder.cc +++ b/gr-atsc/lib/atsc_viterbi_decoder.cc @@ -24,9 +24,9 @@ #include <config.h> #endif -#include <atsc/viterbi_decoder.h> -#include <gr_io_signature.h> -#include <atsc/consts.h> +#include <gnuradio/atsc/viterbi_decoder.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/atsc/consts.h> #include <iostream> using std::cerr; @@ -39,9 +39,9 @@ atsc_make_viterbi_decoder() } atsc_viterbi_decoder::atsc_viterbi_decoder() - : gr_sync_block("atsc_viterbi_decoder", - gr_make_io_signature(1, 1, sizeof(atsc_soft_data_segment)), - gr_make_io_signature(1, 1, sizeof(atsc_mpeg_packet_rs_encoded))), + : gr::sync_block("atsc_viterbi_decoder", + gr::io_signature::make(1, 1, sizeof(atsc_soft_data_segment)), + gr::io_signature::make(1, 1, sizeof(atsc_mpeg_packet_rs_encoded))), last_start(-1) { set_output_multiple(atsci_viterbi_decoder::NCODERS); diff --git a/gr-atsc/lib/atsci_basic_trellis_encoder.cc b/gr-atsc/lib/atsci_basic_trellis_encoder.cc index a4fa3d6d83..589958220a 100644 --- a/gr-atsc/lib/atsci_basic_trellis_encoder.cc +++ b/gr-atsc/lib/atsci_basic_trellis_encoder.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/basic_trellis_encoder_impl.h> +#include <gnuradio/atsc/basic_trellis_encoder_impl.h> #include <assert.h> const unsigned char atsci_basic_trellis_encoder::next_state[32] = { diff --git a/gr-atsc/lib/atsci_data_interleaver.cc b/gr-atsc/lib/atsci_data_interleaver.cc index 9aa2541412..ec270071ad 100644 --- a/gr-atsc/lib/atsci_data_interleaver.cc +++ b/gr-atsc/lib/atsci_data_interleaver.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/data_interleaver_impl.h> +#include <gnuradio/atsc/data_interleaver_impl.h> void atsci_data_interleaver::interleave (atsc_mpeg_packet_rs_encoded &out, diff --git a/gr-atsc/lib/atsci_equalizer.cc b/gr-atsc/lib/atsci_equalizer.cc index 6646810a2b..9e58cddfc2 100644 --- a/gr-atsc/lib/atsci_equalizer.cc +++ b/gr-atsc/lib/atsci_equalizer.cc @@ -20,10 +20,10 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/equalizer_impl.h> +#include <gnuradio/atsc/equalizer_impl.h> #include <algorithm> #include <iostream> -#include <atsc/types.h> +#include <gnuradio/atsc/types.h> using std::cerr; using std::endl; diff --git a/gr-atsc/lib/atsci_equalizer_lms.cc b/gr-atsc/lib/atsci_equalizer_lms.cc index b4776faea6..9da93aebf0 100644 --- a/gr-atsc/lib/atsci_equalizer_lms.cc +++ b/gr-atsc/lib/atsci_equalizer_lms.cc @@ -20,10 +20,10 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/equalizer_lms_impl.h> +#include <gnuradio/atsc/equalizer_lms_impl.h> #include <assert.h> #include <algorithm> -#include <atsc/pnXXX_impl.h> +#include <gnuradio/atsc/pnXXX_impl.h> #include <stdio.h> diff --git a/gr-atsc/lib/atsci_equalizer_lms2.cc b/gr-atsc/lib/atsci_equalizer_lms2.cc index 2fad19b748..51097931ca 100644 --- a/gr-atsc/lib/atsci_equalizer_lms2.cc +++ b/gr-atsc/lib/atsci_equalizer_lms2.cc @@ -20,13 +20,13 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/equalizer_lms2_impl.h> +#include <gnuradio/atsc/equalizer_lms2_impl.h> #include <assert.h> #include <algorithm> -#include <atsc/pnXXX_impl.h> +#include <gnuradio/atsc/pnXXX_impl.h> #include <cmath> #include <stdlib.h> -#include <gr_math.h> +#include <gnuradio/math.h> #include <stdio.h> #include <boost/math/special_functions/fpclassify.hpp> diff --git a/gr-atsc/lib/atsci_equalizer_nop.cc b/gr-atsc/lib/atsci_equalizer_nop.cc index 61fed43d27..39cf2ea1f6 100644 --- a/gr-atsc/lib/atsci_equalizer_nop.cc +++ b/gr-atsc/lib/atsci_equalizer_nop.cc @@ -20,8 +20,8 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/equalizer_nop_impl.h> -#include <atsc/sync_tag_impl.h> +#include <gnuradio/atsc/equalizer_nop_impl.h> +#include <gnuradio/atsc/sync_tag_impl.h> #include <assert.h> atsci_equalizer_nop::atsci_equalizer_nop () diff --git a/gr-atsc/lib/atsci_exp2_lp.cc b/gr-atsc/lib/atsci_exp2_lp.cc index 93e15f7023..ae12db02c2 100644 --- a/gr-atsc/lib/atsci_exp2_lp.cc +++ b/gr-atsc/lib/atsci_exp2_lp.cc @@ -21,7 +21,7 @@ */ #include <atsc_consts.h> -#include <atsc/exp2_lp_impl.h> +#include <gnuradio/atsc/exp2_lp_impl.h> #include <stdexcept> #include <cmath> #include <iostream> diff --git a/gr-atsc/lib/atsci_fake_single_viterbi.cc b/gr-atsc/lib/atsci_fake_single_viterbi.cc index e94e7f0734..0e1eb6f3a4 100644 --- a/gr-atsc/lib/atsci_fake_single_viterbi.cc +++ b/gr-atsc/lib/atsci_fake_single_viterbi.cc @@ -21,7 +21,7 @@ */ #include <math.h> -#include <atsc/fake_single_viterbi_impl.h> +#include <gnuradio/atsc/fake_single_viterbi_impl.h> #include <iostream> #include <algorithm> diff --git a/gr-atsc/lib/atsci_fs_checker.cc b/gr-atsc/lib/atsci_fs_checker.cc index e43f88e33d..064edb2f77 100644 --- a/gr-atsc/lib/atsci_fs_checker.cc +++ b/gr-atsc/lib/atsci_fs_checker.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/fs_checker_impl.h> +#include <gnuradio/atsc/fs_checker_impl.h> // empty constructor atsci_fs_checker::atsci_fs_checker () diff --git a/gr-atsc/lib/atsci_fs_checker_naive.cc b/gr-atsc/lib/atsci_fs_checker_naive.cc index 392bf70399..96ec09ad1b 100644 --- a/gr-atsc/lib/atsci_fs_checker_naive.cc +++ b/gr-atsc/lib/atsci_fs_checker_naive.cc @@ -20,9 +20,9 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/fs_checker_naive_impl.h> -#include <atsc/syminfo_impl.h> -#include <atsc/pnXXX_impl.h> +#include <gnuradio/atsc/fs_checker_naive_impl.h> +#include <gnuradio/atsc/syminfo_impl.h> +#include <gnuradio/atsc/pnXXX_impl.h> #include <iostream> #include <cstring> diff --git a/gr-atsc/lib/atsci_fs_correlator.cc b/gr-atsc/lib/atsci_fs_correlator.cc index 1dccfc5e21..bc6db0de32 100644 --- a/gr-atsc/lib/atsci_fs_correlator.cc +++ b/gr-atsc/lib/atsci_fs_correlator.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/fs_correlator_impl.h> +#include <gnuradio/atsc/fs_correlator_impl.h> // empty constructor atsci_fs_correlator::atsci_fs_correlator () diff --git a/gr-atsc/lib/atsci_fs_correlator_naive.cc b/gr-atsc/lib/atsci_fs_correlator_naive.cc index 5bddcfa79c..1458dc8527 100644 --- a/gr-atsc/lib/atsci_fs_correlator_naive.cc +++ b/gr-atsc/lib/atsci_fs_correlator_naive.cc @@ -20,9 +20,9 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/fs_correlator_naive_impl.h> -#include <atsc/sync_tag_impl.h> -#include <atsc/pnXXX_impl.h> +#include <gnuradio/atsc/fs_correlator_naive_impl.h> +#include <gnuradio/atsc/sync_tag_impl.h> +#include <gnuradio/atsc/pnXXX_impl.h> #include <iostream> #include <cstring> diff --git a/gr-atsc/lib/atsci_pnXXX.cc b/gr-atsc/lib/atsci_pnXXX.cc index 93c9b22950..250d487c71 100644 --- a/gr-atsc/lib/atsci_pnXXX.cc +++ b/gr-atsc/lib/atsci_pnXXX.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/pnXXX_impl.h> +#include <gnuradio/atsc/pnXXX_impl.h> const unsigned char atsc_pn511[511] = { 0,0,0,0, 0,0,0,1, 0,1,1,1, 1,1,1,1, 1,1,0,0, 1,0,1,0, 1,0,1,0, 1,1,1,0, diff --git a/gr-atsc/lib/atsci_randomizer.cc b/gr-atsc/lib/atsci_randomizer.cc index 6deadfecf8..e9427c66ea 100644 --- a/gr-atsc/lib/atsci_randomizer.cc +++ b/gr-atsc/lib/atsci_randomizer.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/randomizer_impl.h> +#include <gnuradio/atsc/randomizer_impl.h> #include <assert.h> unsigned char atsci_randomizer::s_output_map[1 << 14]; diff --git a/gr-atsc/lib/atsci_reed_solomon.cc b/gr-atsc/lib/atsci_reed_solomon.cc index 6aff353b4e..49cbed1c78 100644 --- a/gr-atsc/lib/atsci_reed_solomon.cc +++ b/gr-atsc/lib/atsci_reed_solomon.cc @@ -20,12 +20,12 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/reed_solomon_impl.h> +#include <gnuradio/atsc/reed_solomon_impl.h> #include <assert.h> #include <string.h> extern "C" { -#include <fec/rs.h> +#include <gnuradio/fec/rs.h> } static const int rs_init_symsize = 8; diff --git a/gr-atsc/lib/atsci_root_raised_cosine.cc b/gr-atsc/lib/atsci_root_raised_cosine.cc index c5cedbd1fc..2a8cf928b9 100644 --- a/gr-atsc/lib/atsci_root_raised_cosine.cc +++ b/gr-atsc/lib/atsci_root_raised_cosine.cc @@ -20,9 +20,9 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/consts.h> -#include <atsc/root_raised_cosine_impl.h> -#include <filter/firdes.h> +#include <gnuradio/atsc/consts.h> +#include <gnuradio/atsc/root_raised_cosine_impl.h> +#include <gnuradio/filter/firdes.h> vector<float> atsc_root_raised_cosine::taps (double sampling_rate) diff --git a/gr-atsc/lib/atsci_root_raised_cosine_bandpass.cc b/gr-atsc/lib/atsci_root_raised_cosine_bandpass.cc index 5dd7705541..84f9f22cab 100644 --- a/gr-atsc/lib/atsci_root_raised_cosine_bandpass.cc +++ b/gr-atsc/lib/atsci_root_raised_cosine_bandpass.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/root_raised_cosine_bandpass_impl.h> +#include <gnuradio/atsc/root_raised_cosine_bandpass_impl.h> #include <iostream> #include <cmath> diff --git a/gr-atsc/lib/atsci_single_viterbi.cc b/gr-atsc/lib/atsci_single_viterbi.cc index f53f16c8e1..0458f80998 100644 --- a/gr-atsc/lib/atsci_single_viterbi.cc +++ b/gr-atsc/lib/atsci_single_viterbi.cc @@ -21,7 +21,7 @@ */ #include <math.h> -#include <atsc/single_viterbi_impl.h> +#include <gnuradio/atsc/single_viterbi_impl.h> #include <iostream> using std::cerr; diff --git a/gr-atsc/lib/atsci_sliding_correlator.cc b/gr-atsc/lib/atsci_sliding_correlator.cc index b79adfb53b..1e0498931d 100644 --- a/gr-atsc/lib/atsci_sliding_correlator.cc +++ b/gr-atsc/lib/atsci_sliding_correlator.cc @@ -20,8 +20,8 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/sliding_correlator_impl.h> -#include <atsc/pnXXX_impl.h> +#include <gnuradio/atsc/sliding_correlator_impl.h> +#include <gnuradio/atsc/pnXXX_impl.h> // #define TRY_BACKWARDS diff --git a/gr-atsc/lib/atsci_sssr.cc b/gr-atsc/lib/atsci_sssr.cc index 5deeda86ce..0906555738 100644 --- a/gr-atsc/lib/atsci_sssr.cc +++ b/gr-atsc/lib/atsci_sssr.cc @@ -20,13 +20,13 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/sssr_impl.h> +#include <gnuradio/atsc/sssr_impl.h> #include <algorithm> #include <cmath> #include <cstdio> #include <assert.h> -#include <atsc/diag_output_impl.h> -#include <gr_math.h> +#include <gnuradio/atsc/diag_output_impl.h> +#include <gnuradio/math.h> #include <stdio.h> #include <boost/math/special_functions/sign.hpp> #include <iostream> diff --git a/gr-atsc/lib/atsci_trellis_encoder.cc b/gr-atsc/lib/atsci_trellis_encoder.cc index 4e81c87e32..3037f5e0b4 100644 --- a/gr-atsc/lib/atsci_trellis_encoder.cc +++ b/gr-atsc/lib/atsci_trellis_encoder.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/trellis_encoder_impl.h> +#include <gnuradio/atsc/trellis_encoder_impl.h> #include <assert.h> #include <stdio.h> #include <string.h> diff --git a/gr-atsc/lib/atsci_viterbi_decoder.cc b/gr-atsc/lib/atsci_viterbi_decoder.cc index 26f5577de5..2179cb5a5c 100644 --- a/gr-atsc/lib/atsci_viterbi_decoder.cc +++ b/gr-atsc/lib/atsci_viterbi_decoder.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/viterbi_decoder.h> +#include <gnuradio/atsc/viterbi_decoder.h> #include <assert.h> #include <stdio.h> #include <cmath> diff --git a/gr-atsc/lib/atsci_vsbtx_lp.cc b/gr-atsc/lib/atsci_vsbtx_lp.cc index 4b6f82af3d..2de5cd7497 100644 --- a/gr-atsc/lib/atsci_vsbtx_lp.cc +++ b/gr-atsc/lib/atsci_vsbtx_lp.cc @@ -20,8 +20,8 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/consts.h> -#include <atsc/vsbtx_lp_impl.h> +#include <gnuradio/atsc/consts.h> +#include <gnuradio/atsc/vsbtx_lp_impl.h> #include <stdexcept> #include <cmath> #include <iostream> diff --git a/gr-atsc/lib/create_atsci_equalizer.cc b/gr-atsc/lib/create_atsci_equalizer.cc index 17874cdd47..2d3b1b1882 100644 --- a/gr-atsc/lib/create_atsci_equalizer.cc +++ b/gr-atsc/lib/create_atsci_equalizer.cc @@ -20,10 +20,10 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/create_atsci_equalizer.h> -#include <atsc/equalizer_nop_impl.h> -#include <atsc/equalizer_lms_impl.h> -#include <atsc/equalizer_lms2_impl.h> +#include <gnuradio/atsc/create_atsci_equalizer.h> +#include <gnuradio/atsc/equalizer_nop_impl.h> +#include <gnuradio/atsc/equalizer_lms_impl.h> +#include <gnuradio/atsc/equalizer_lms2_impl.h> atsci_equalizer * create_atsci_equalizer_nop () diff --git a/gr-atsc/lib/create_atsci_fs_checker.cc b/gr-atsc/lib/create_atsci_fs_checker.cc index 1eea7bcc01..98a904acb7 100644 --- a/gr-atsc/lib/create_atsci_fs_checker.cc +++ b/gr-atsc/lib/create_atsci_fs_checker.cc @@ -20,8 +20,8 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/create_atsci_fs_checker.h> -#include <atsc/fs_checker_naive_impl.h> +#include <gnuradio/atsc/create_atsci_fs_checker.h> +#include <gnuradio/atsc/fs_checker_naive_impl.h> atsci_fs_checker * create_atsci_fs_checker () diff --git a/gr-atsc/lib/create_atsci_fs_correlator.cc b/gr-atsc/lib/create_atsci_fs_correlator.cc index 021d315de9..1dd10e6812 100644 --- a/gr-atsc/lib/create_atsci_fs_correlator.cc +++ b/gr-atsc/lib/create_atsci_fs_correlator.cc @@ -20,8 +20,8 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/create_atsci_fs_correlator.h> -#include <atsc/fs_correlator_naive_impl.h> +#include <gnuradio/atsc/create_atsci_fs_correlator.h> +#include <gnuradio/atsc/fs_correlator_naive_impl.h> atsci_fs_correlator * create_atsci_fs_correlator () diff --git a/gr-atsc/lib/plinfo.cc b/gr-atsc/lib/plinfo.cc index 8ad28c6001..0a24f7a073 100644 --- a/gr-atsc/lib/plinfo.cc +++ b/gr-atsc/lib/plinfo.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/types.h> +#include <gnuradio/atsc/types.h> #include <assert.h> void diff --git a/gr-atsc/lib/qa_atsci_basic_trellis_encoder.h b/gr-atsc/lib/qa_atsci_basic_trellis_encoder.h index c1e6e8f8ce..6102d72071 100644 --- a/gr-atsc/lib/qa_atsci_basic_trellis_encoder.h +++ b/gr-atsc/lib/qa_atsci_basic_trellis_encoder.h @@ -25,7 +25,7 @@ #include <cppunit/extensions/HelperMacros.h> #include <cppunit/TestCase.h> -#include <atsc/basic_trellis_encoder_impl.h> +#include <gnuradio/atsc/basic_trellis_encoder_impl.h> class qa_atsci_basic_trellis_encoder : public CppUnit::TestCase { diff --git a/gr-atsc/lib/qa_atsci_data_interleaver.h b/gr-atsc/lib/qa_atsci_data_interleaver.h index 32c9e79c46..d7b94f8e2b 100644 --- a/gr-atsc/lib/qa_atsci_data_interleaver.h +++ b/gr-atsc/lib/qa_atsci_data_interleaver.h @@ -27,7 +27,7 @@ #include <cppunit/TestCase.h> #include <stdio.h> -#include <atsc/data_interleaver_impl.h> +#include <gnuradio/atsc/data_interleaver_impl.h> class qa_atsci_data_interleaver : public CppUnit::TestCase { public: diff --git a/gr-atsc/lib/qa_atsci_equalizer_nop.cc b/gr-atsc/lib/qa_atsci_equalizer_nop.cc index 927e23fdac..098d745db3 100644 --- a/gr-atsc/lib/qa_atsci_equalizer_nop.cc +++ b/gr-atsc/lib/qa_atsci_equalizer_nop.cc @@ -21,10 +21,10 @@ */ #include "qa_atsci_equalizer_nop.h" -#include <atsc/equalizer_impl.h> -#include <atsc/equalizer_nop_impl.h> -#include <atsc/pnXXX_impl.h> -#include <atsc/types.h> +#include <gnuradio/atsc/equalizer_impl.h> +#include <gnuradio/atsc/equalizer_nop_impl.h> +#include <gnuradio/atsc/pnXXX_impl.h> +#include <gnuradio/atsc/types.h> #include <cppunit/TestAssert.h> #include <assert.h> #include <iostream> diff --git a/gr-atsc/lib/qa_atsci_fake_single_viterbi.cc b/gr-atsc/lib/qa_atsci_fake_single_viterbi.cc index 88e2fdb929..e59bc3880b 100644 --- a/gr-atsc/lib/qa_atsci_fake_single_viterbi.cc +++ b/gr-atsc/lib/qa_atsci_fake_single_viterbi.cc @@ -26,9 +26,9 @@ #include <cppunit/TestAssert.h> #include <stdio.h> -#include <atsc/fake_single_viterbi_impl.h> +#include <gnuradio/atsc/fake_single_viterbi_impl.h> #include "qa_atsci_fake_single_viterbi.h" -#include <random.h> +#include <gnuradio/random.h> #include <string.h> diff --git a/gr-atsc/lib/qa_atsci_fake_single_viterbi.h b/gr-atsc/lib/qa_atsci_fake_single_viterbi.h index 373f4b6c67..42915ac6e8 100644 --- a/gr-atsc/lib/qa_atsci_fake_single_viterbi.h +++ b/gr-atsc/lib/qa_atsci_fake_single_viterbi.h @@ -26,8 +26,8 @@ #include <cppunit/extensions/HelperMacros.h> #include <cppunit/TestCase.h> -#include <atsc/fake_single_viterbi_impl.h> -#include <atsc/basic_trellis_encoder_impl.h> +#include <gnuradio/atsc/fake_single_viterbi_impl.h> +#include <gnuradio/atsc/basic_trellis_encoder_impl.h> class qa_atsci_fake_single_viterbi : public CppUnit::TestCase { private: diff --git a/gr-atsc/lib/qa_atsci_fs_correlator.cc b/gr-atsc/lib/qa_atsci_fs_correlator.cc index a00731ab4d..c416c22fbb 100644 --- a/gr-atsc/lib/qa_atsci_fs_correlator.cc +++ b/gr-atsc/lib/qa_atsci_fs_correlator.cc @@ -25,16 +25,16 @@ #endif #include "qa_atsci_fs_correlator.h" -#include <atsc/fs_correlator_impl.h> -#include <atsc/create_atsci_fs_correlator.h> -#include <atsc/sync_tag_impl.h> +#include <gnuradio/atsc/fs_correlator_impl.h> +#include <gnuradio/atsc/create_atsci_fs_correlator.h> +#include <gnuradio/atsc/sync_tag_impl.h> #include <stdlib.h> #include <algorithm> -#include <atsc/pnXXX_impl.h> -#include <atsc/types.h> +#include <gnuradio/atsc/pnXXX_impl.h> +#include <gnuradio/atsc/types.h> #include <cppunit/TestAssert.h> #include <assert.h> -#include <random.h> +#include <gnuradio/random.h> static float diff --git a/gr-atsc/lib/qa_atsci_randomizer.h b/gr-atsc/lib/qa_atsci_randomizer.h index 0255d8a4ae..e0e293e85c 100644 --- a/gr-atsc/lib/qa_atsci_randomizer.h +++ b/gr-atsc/lib/qa_atsci_randomizer.h @@ -25,7 +25,7 @@ #include <cppunit/extensions/HelperMacros.h> #include <cppunit/TestCase.h> -#include <atsc/randomizer_impl.h> +#include <gnuradio/atsc/randomizer_impl.h> class qa_atsci_randomizer : public CppUnit::TestCase { private: diff --git a/gr-atsc/lib/qa_atsci_reed_solomon.cc b/gr-atsc/lib/qa_atsci_reed_solomon.cc index 50acb76a01..f6c21dd8ce 100644 --- a/gr-atsc/lib/qa_atsci_reed_solomon.cc +++ b/gr-atsc/lib/qa_atsci_reed_solomon.cc @@ -27,7 +27,7 @@ #include <cppunit/TestAssert.h> #include <stdlib.h> #include <stdio.h> -#include <atsc/reed_solomon_impl.h> +#include <gnuradio/atsc/reed_solomon_impl.h> #include "qa_atsci_reed_solomon.h" #include <string.h> diff --git a/gr-atsc/lib/qa_atsci_reed_solomon.h b/gr-atsc/lib/qa_atsci_reed_solomon.h index 097d681302..0afcd1398b 100644 --- a/gr-atsc/lib/qa_atsci_reed_solomon.h +++ b/gr-atsc/lib/qa_atsci_reed_solomon.h @@ -26,7 +26,7 @@ #include <cppunit/extensions/HelperMacros.h> #include <cppunit/TestCase.h> -#include <atsc/reed_solomon_impl.h> +#include <gnuradio/atsc/reed_solomon_impl.h> class qa_atsci_reed_solomon : public CppUnit::TestCase { diff --git a/gr-atsc/lib/qa_atsci_single_viterbi.cc b/gr-atsc/lib/qa_atsci_single_viterbi.cc index be5187dc25..8291041a55 100644 --- a/gr-atsc/lib/qa_atsci_single_viterbi.cc +++ b/gr-atsc/lib/qa_atsci_single_viterbi.cc @@ -27,9 +27,9 @@ #include <cppunit/TestAssert.h> #include <stdlib.h> #include <stdio.h> -#include <atsc/single_viterbi_impl.h> +#include <gnuradio/atsc/single_viterbi_impl.h> #include "qa_atsci_single_viterbi.h" -#include <random.h> +#include <gnuradio/random.h> #include <string.h> diff --git a/gr-atsc/lib/qa_atsci_single_viterbi.h b/gr-atsc/lib/qa_atsci_single_viterbi.h index bfd911ab08..571988c559 100644 --- a/gr-atsc/lib/qa_atsci_single_viterbi.h +++ b/gr-atsc/lib/qa_atsci_single_viterbi.h @@ -26,8 +26,8 @@ #include <cppunit/extensions/HelperMacros.h> #include <cppunit/TestCase.h> -#include <atsc/single_viterbi_impl.h> -#include <atsc/basic_trellis_encoder_impl.h> +#include <gnuradio/atsc/single_viterbi_impl.h> +#include <gnuradio/atsc/basic_trellis_encoder_impl.h> class qa_atsci_single_viterbi : public CppUnit::TestCase { private: diff --git a/gr-atsc/lib/qa_atsci_sliding_correlator.h b/gr-atsc/lib/qa_atsci_sliding_correlator.h index 34f12cbcbc..ea02449711 100644 --- a/gr-atsc/lib/qa_atsci_sliding_correlator.h +++ b/gr-atsc/lib/qa_atsci_sliding_correlator.h @@ -27,7 +27,7 @@ #include <cppunit/TestCase.h> #include <stdio.h> -#include <atsc/sliding_correlator_impl.h> +#include <gnuradio/atsc/sliding_correlator_impl.h> class qa_atsci_sliding_correlator : public CppUnit::TestCase { diff --git a/gr-atsc/lib/qa_atsci_trellis_encoder.h b/gr-atsc/lib/qa_atsci_trellis_encoder.h index a93c0c3895..16567488c8 100644 --- a/gr-atsc/lib/qa_atsci_trellis_encoder.h +++ b/gr-atsc/lib/qa_atsci_trellis_encoder.h @@ -27,7 +27,7 @@ #include <cppunit/TestCase.h> #include <stdio.h> -#include <atsc/trellis_encoder_impl.h> +#include <gnuradio/atsc/trellis_encoder_impl.h> class qa_atsci_trellis_encoder : public CppUnit::TestCase { diff --git a/gr-atsc/lib/qa_atsci_viterbi_decoder.h b/gr-atsc/lib/qa_atsci_viterbi_decoder.h index 94b5ce21d2..47b2776af8 100644 --- a/gr-atsc/lib/qa_atsci_viterbi_decoder.h +++ b/gr-atsc/lib/qa_atsci_viterbi_decoder.h @@ -27,7 +27,7 @@ #include <cppunit/TestCase.h> #include <stdio.h> -#include <atsc/viterbi_decoder_impl.h> +#include <gnuradio/atsc/viterbi_decoder_impl.h> class qa_atsci_viterbi_decoder : public CppUnit::TestCase { diff --git a/gr-atsc/lib/qa_convolutional_interleaver.h b/gr-atsc/lib/qa_convolutional_interleaver.h index afe795a547..5fc73dd70c 100644 --- a/gr-atsc/lib/qa_convolutional_interleaver.h +++ b/gr-atsc/lib/qa_convolutional_interleaver.h @@ -26,7 +26,7 @@ #include <cppunit/extensions/HelperMacros.h> #include <cppunit/TestCase.h> -#include <atsc/convolutional_interleaver.h> +#include <gnuradio/atsc/convolutional_interleaver.h> class qa_convolutional_interleaver : public CppUnit::TestCase { private: diff --git a/gr-atsc/lib/qa_interleaver_fifo.h b/gr-atsc/lib/qa_interleaver_fifo.h index d0651b591f..9fea65a748 100644 --- a/gr-atsc/lib/qa_interleaver_fifo.h +++ b/gr-atsc/lib/qa_interleaver_fifo.h @@ -26,7 +26,7 @@ #include <cppunit/extensions/HelperMacros.h> #include <cppunit/TestCase.h> -#include <atsc/interleaver_fifo.h> +#include <gnuradio/atsc/interleaver_fifo.h> class qa_interleaver_fifo : public CppUnit::TestCase { private: diff --git a/gr-atsc/lib/test_atsci.cc b/gr-atsc/lib/test_atsci.cc index a3703d4d31..acea17a7ab 100644 --- a/gr-atsc/lib/test_atsci.cc +++ b/gr-atsc/lib/test_atsci.cc @@ -24,7 +24,7 @@ #include "config.h" #endif -#include <gr_unittests.h> +#include <gnuradio/unittests.h> #include <cppunit/TextTestRunner.h> #include <cppunit/XmlOutputter.h> #include "qa_atsci.h" |