diff options
Diffstat (limited to 'gr-trellis')
30 files changed, 86 insertions, 86 deletions
diff --git a/gr-trellis/include/trellis/api.h b/gr-trellis/include/trellis/api.h index 8b85addd96..bdf5842864 100644 --- a/gr-trellis/include/trellis/api.h +++ b/gr-trellis/include/trellis/api.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_TRELLIS_API_H #define INCLUDED_TRELLIS_API_H -#include <attributes.h> +#include <gnuradio/attributes.h> #ifdef gnuradio_trellis_EXPORTS # define TRELLIS_API __GR_ATTR_EXPORT diff --git a/gr-trellis/include/trellis/calc_metric.h b/gr-trellis/include/trellis/calc_metric.h index b39267dc84..46d83c301f 100644 --- a/gr-trellis/include/trellis/calc_metric.h +++ b/gr-trellis/include/trellis/calc_metric.h @@ -24,7 +24,7 @@ #define INCLUDED_CALC_METRIC_H #include <vector> -#include <gr_complex.h> +#include <gnuradio/gr_complex.h> #include <digital/metric_type.h> namespace gr { diff --git a/gr-trellis/include/trellis/constellation_metrics_cf.h b/gr-trellis/include/trellis/constellation_metrics_cf.h index f4b94223c7..5a728ad96c 100644 --- a/gr-trellis/include/trellis/constellation_metrics_cf.h +++ b/gr-trellis/include/trellis/constellation_metrics_cf.h @@ -24,7 +24,7 @@ #define INCLUDED_TRELLIS_CONSTELLATION_METRICS_CF_H #include <trellis/api.h> -#include <gr_block.h> +#include <gnuradio/block.h> #include <digital/constellation.h> #include <digital/metric_type.h> @@ -35,7 +35,7 @@ namespace gr { * \brief Evaluate metrics for use by the Viterbi algorithm. * \ingroup trellis_coding_blk */ - class TRELLIS_API constellation_metrics_cf : virtual public gr_block + class TRELLIS_API constellation_metrics_cf : virtual public block { public: // gr::trellis::constellation_metrics_cf::sptr diff --git a/gr-trellis/include/trellis/encoder_XX.h.t b/gr-trellis/include/trellis/encoder_XX.h.t index 9ca7cb30ce..3901797204 100644 --- a/gr-trellis/include/trellis/encoder_XX.h.t +++ b/gr-trellis/include/trellis/encoder_XX.h.t @@ -27,7 +27,7 @@ #include <trellis/api.h> #include <trellis/fsm.h> -#include <gr_sync_block.h> +#include <gnuradio/sync_block.h> namespace gr { namespace trellis { @@ -36,7 +36,7 @@ namespace gr { * \brief Convolutional encoder. * \ingroup trellis_coding_blk */ - class TRELLIS_API @NAME@ : virtual public gr_sync_block + class TRELLIS_API @NAME@ : virtual public sync_block { public: // gr::trellis::@BASE_NAME@::sptr diff --git a/gr-trellis/include/trellis/metrics_X.h.t b/gr-trellis/include/trellis/metrics_X.h.t index dab7924a8b..d0b8806b62 100644 --- a/gr-trellis/include/trellis/metrics_X.h.t +++ b/gr-trellis/include/trellis/metrics_X.h.t @@ -27,7 +27,7 @@ #include <trellis/api.h> #include <trellis/calc_metric.h> -#include <gr_block.h> +#include <gnuradio/block.h> namespace gr { namespace trellis { @@ -36,7 +36,7 @@ namespace gr { * \brief Evaluate metrics for use by the Viterbi algorithm. * \ingroup trellis_coding_blk */ - class TRELLIS_API @NAME@ : virtual public gr_block + class TRELLIS_API @NAME@ : virtual public block { public: // gr::trellis::@BASE_NAME@::sptr diff --git a/gr-trellis/include/trellis/pccc_decoder_X.h.t b/gr-trellis/include/trellis/pccc_decoder_X.h.t index d5b6af7b87..7f87250bec 100644 --- a/gr-trellis/include/trellis/pccc_decoder_X.h.t +++ b/gr-trellis/include/trellis/pccc_decoder_X.h.t @@ -29,7 +29,7 @@ #include <trellis/fsm.h> #include <trellis/interleaver.h> #include <trellis/siso_type.h> -#include <gr_block.h> +#include <gnuradio/block.h> #include <vector> namespace gr { @@ -38,7 +38,7 @@ namespace gr { /*! * \ingroup trellis_coding_blk */ - class TRELLIS_API @NAME@ : virtual public gr_block + class TRELLIS_API @NAME@ : virtual public block { public: // gr::trellis::@BASE_NAME@::sptr diff --git a/gr-trellis/include/trellis/pccc_decoder_combined_XX.h.t b/gr-trellis/include/trellis/pccc_decoder_combined_XX.h.t index 87b110a945..be9db5a146 100644 --- a/gr-trellis/include/trellis/pccc_decoder_combined_XX.h.t +++ b/gr-trellis/include/trellis/pccc_decoder_combined_XX.h.t @@ -30,7 +30,7 @@ #include <trellis/interleaver.h> #include <trellis/calc_metric.h> #include <trellis/siso_type.h> -#include <gr_block.h> +#include <gnuradio/block.h> #include <vector> namespace gr { @@ -39,7 +39,7 @@ namespace gr { /*! * \ingroup trellis_coding_blk */ - class TRELLIS_API @NAME@ : virtual public gr_block + class TRELLIS_API @NAME@ : virtual public block { public: // gr::trellis::@BASE_NAME@::sptr diff --git a/gr-trellis/include/trellis/pccc_encoder_XX.h.t b/gr-trellis/include/trellis/pccc_encoder_XX.h.t index 2a62b7520f..c5d4a2f253 100644 --- a/gr-trellis/include/trellis/pccc_encoder_XX.h.t +++ b/gr-trellis/include/trellis/pccc_encoder_XX.h.t @@ -28,7 +28,7 @@ #include <trellis/api.h> #include <trellis/fsm.h> #include <trellis/interleaver.h> -#include <gr_sync_block.h> +#include <gnuradio/sync_block.h> #include <vector> namespace gr { @@ -38,7 +38,7 @@ namespace gr { * \brief PCCC encoder. * \ingroup trellis_coding_blk */ - class TRELLIS_API @NAME@ : virtual public gr_sync_block + class TRELLIS_API @NAME@ : virtual public sync_block { public: // gr::trellis::@BASE_NAME@::sptr diff --git a/gr-trellis/include/trellis/permutation.h b/gr-trellis/include/trellis/permutation.h index 0f974abb97..7bac7340d9 100644 --- a/gr-trellis/include/trellis/permutation.h +++ b/gr-trellis/include/trellis/permutation.h @@ -25,7 +25,7 @@ #include <trellis/api.h> #include <vector> -#include <gr_sync_block.h> +#include <gnuradio/sync_block.h> namespace gr { namespace trellis { @@ -34,7 +34,7 @@ namespace gr { * \brief Permutation. * \ingroup trellis_coding_blk */ - class TRELLIS_API permutation : virtual public gr_sync_block + class TRELLIS_API permutation : virtual public sync_block { public: // gr::trellis::permutation::sptr diff --git a/gr-trellis/include/trellis/sccc_decoder_X.h.t b/gr-trellis/include/trellis/sccc_decoder_X.h.t index 1a63facad9..1e19bbe950 100644 --- a/gr-trellis/include/trellis/sccc_decoder_X.h.t +++ b/gr-trellis/include/trellis/sccc_decoder_X.h.t @@ -29,7 +29,7 @@ #include <trellis/fsm.h> #include <trellis/interleaver.h> #include <trellis/siso_type.h> -#include <gr_block.h> +#include <gnuradio/block.h> #include <vector> namespace gr { @@ -38,7 +38,7 @@ namespace gr { /*! * \ingroup trellis_coding_blk */ - class TRELLIS_API @NAME@ : virtual public gr_block + class TRELLIS_API @NAME@ : virtual public block { public: // gr::trellis::@BASE_NAME@::sptr diff --git a/gr-trellis/include/trellis/sccc_decoder_combined_XX.h.t b/gr-trellis/include/trellis/sccc_decoder_combined_XX.h.t index f5f9bef464..a7c7c4c723 100644 --- a/gr-trellis/include/trellis/sccc_decoder_combined_XX.h.t +++ b/gr-trellis/include/trellis/sccc_decoder_combined_XX.h.t @@ -30,7 +30,7 @@ #include <trellis/interleaver.h> #include <trellis/calc_metric.h> #include <trellis/siso_type.h> -#include <gr_block.h> +#include <gnuradio/block.h> #include <vector> namespace gr { @@ -39,7 +39,7 @@ namespace gr { /*! * \ingroup trellis_coding_blk */ - class TRELLIS_API @NAME@ : virtual public gr_block + class TRELLIS_API @NAME@ : virtual public block { public: // gr::trellis::@BASE_NAME@::sptr diff --git a/gr-trellis/include/trellis/sccc_encoder_XX.h.t b/gr-trellis/include/trellis/sccc_encoder_XX.h.t index f62a1e7cfb..3c1d334d08 100644 --- a/gr-trellis/include/trellis/sccc_encoder_XX.h.t +++ b/gr-trellis/include/trellis/sccc_encoder_XX.h.t @@ -28,7 +28,7 @@ #include <trellis/api.h> #include <trellis/fsm.h> #include <trellis/interleaver.h> -#include <gr_sync_block.h> +#include <gnuradio/sync_block.h> #include <vector> namespace gr { @@ -38,7 +38,7 @@ namespace gr { * \brief SCCC encoder. * \ingroup trellis_coding_blk */ - class TRELLIS_API @NAME@ : virtual public gr_sync_block + class TRELLIS_API @NAME@ : virtual public sync_block { public: // gr::trellis::@BASE_NAME@::sptr diff --git a/gr-trellis/include/trellis/siso_combined_f.h b/gr-trellis/include/trellis/siso_combined_f.h index 48089f86e4..0997b3fdfa 100644 --- a/gr-trellis/include/trellis/siso_combined_f.h +++ b/gr-trellis/include/trellis/siso_combined_f.h @@ -28,7 +28,7 @@ #include <trellis/siso_type.h> #include <trellis/calc_metric.h> #include <trellis/core_algorithms.h> -#include <gr_block.h> +#include <gnuradio/block.h> namespace gr { namespace trellis { @@ -36,7 +36,7 @@ namespace gr { /*! * \ingroup trellis_coding_blk */ - class TRELLIS_API siso_combined_f : virtual public gr_block + class TRELLIS_API siso_combined_f : virtual public block { public: // gr::trellis::siso_combined_f::sptr diff --git a/gr-trellis/include/trellis/siso_f.h b/gr-trellis/include/trellis/siso_f.h index 6d4d414f38..7b5351a838 100644 --- a/gr-trellis/include/trellis/siso_f.h +++ b/gr-trellis/include/trellis/siso_f.h @@ -27,7 +27,7 @@ #include <trellis/fsm.h> #include <trellis/siso_type.h> #include <trellis/core_algorithms.h> -#include <gr_block.h> +#include <gnuradio/block.h> namespace gr { namespace trellis { @@ -35,7 +35,7 @@ namespace gr { /*! * \ingroup trellis_coding_blk */ - class TRELLIS_API siso_f : virtual public gr_block + class TRELLIS_API siso_f : virtual public block { public: // gr::trellis::siso_f::sptr diff --git a/gr-trellis/include/trellis/viterbi_X.h.t b/gr-trellis/include/trellis/viterbi_X.h.t index 817c98508a..574888ec12 100644 --- a/gr-trellis/include/trellis/viterbi_X.h.t +++ b/gr-trellis/include/trellis/viterbi_X.h.t @@ -28,7 +28,7 @@ #include <trellis/api.h> #include <trellis/fsm.h> #include <trellis/core_algorithms.h> -#include <gr_block.h> +#include <gnuradio/block.h> namespace gr { namespace trellis { @@ -36,7 +36,7 @@ namespace gr { /*! * \ingroup trellis_coding_blk */ - class TRELLIS_API @NAME@ : virtual public gr_block + class TRELLIS_API @NAME@ : virtual public block { public: // gr::trellis::@BASE_NAME@::sptr diff --git a/gr-trellis/include/trellis/viterbi_combined_XX.h.t b/gr-trellis/include/trellis/viterbi_combined_XX.h.t index a2cc4b946c..465b5f518f 100644 --- a/gr-trellis/include/trellis/viterbi_combined_XX.h.t +++ b/gr-trellis/include/trellis/viterbi_combined_XX.h.t @@ -29,7 +29,7 @@ #include <trellis/fsm.h> #include <trellis/calc_metric.h> #include <trellis/core_algorithms.h> -#include <gr_block.h> +#include <gnuradio/block.h> namespace gr { namespace trellis { @@ -37,7 +37,7 @@ namespace gr { /*! * \ingroup trellis_coding_blk */ - class TRELLIS_API @NAME@ : virtual public gr_block + class TRELLIS_API @NAME@ : virtual public block { public: // gr::trellis::@BASE_NAME@::sptr diff --git a/gr-trellis/lib/constellation_metrics_cf_impl.cc b/gr-trellis/lib/constellation_metrics_cf_impl.cc index 18d3095802..6aa7dce6c8 100644 --- a/gr-trellis/lib/constellation_metrics_cf_impl.cc +++ b/gr-trellis/lib/constellation_metrics_cf_impl.cc @@ -25,7 +25,7 @@ #endif #include "constellation_metrics_cf_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <assert.h> #include <stdexcept> #include <iostream> @@ -43,9 +43,9 @@ namespace gr { constellation_metrics_cf_impl::constellation_metrics_cf_impl(digital::constellation_sptr constellation, digital::trellis_metric_type_t TYPE) - : gr_block("constellation_metrics_cf", - gr_make_io_signature(1, -1, sizeof(gr_complex)), - gr_make_io_signature(1, -1, sizeof(float))), + : block("constellation_metrics_cf", + io_signature::make(1, -1, sizeof(gr_complex)), + io_signature::make(1, -1, sizeof(float))), d_constellation(constellation), d_TYPE(TYPE), d_O(constellation->arity()), diff --git a/gr-trellis/lib/encoder_XX_impl.cc.t b/gr-trellis/lib/encoder_XX_impl.cc.t index fdda593d45..4b11e3c06d 100644 --- a/gr-trellis/lib/encoder_XX_impl.cc.t +++ b/gr-trellis/lib/encoder_XX_impl.cc.t @@ -27,7 +27,7 @@ #endif #include "@NAME@.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <iostream> namespace gr { @@ -41,9 +41,9 @@ namespace gr { } @IMPL_NAME@::@IMPL_NAME@(const fsm &FSM, int ST) - : gr_sync_block("@BASE_NAME@", - gr_make_io_signature(1, -1, sizeof(@I_TYPE@)), - gr_make_io_signature(1, -1, sizeof(@O_TYPE@))), + : sync_block("@BASE_NAME@", + io_signature::make(1, -1, sizeof(@I_TYPE@)), + io_signature::make(1, -1, sizeof(@O_TYPE@))), d_FSM(FSM), d_ST(ST) { diff --git a/gr-trellis/lib/metrics_X_impl.cc.t b/gr-trellis/lib/metrics_X_impl.cc.t index c74051c53e..499bd8b9cd 100644 --- a/gr-trellis/lib/metrics_X_impl.cc.t +++ b/gr-trellis/lib/metrics_X_impl.cc.t @@ -27,7 +27,7 @@ #endif #include "@NAME@.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <assert.h> #include <stdexcept> #include <iostream> @@ -45,9 +45,9 @@ namespace gr { @IMPL_NAME@::@IMPL_NAME@(int O, int D, const std::vector<@I_TYPE@> &TABLE, digital::trellis_metric_type_t TYPE) - : gr_block("@BASE_NAME@", - gr_make_io_signature(1, -1, sizeof (@I_TYPE@)), - gr_make_io_signature(1, -1, sizeof (float))), + : block("@BASE_NAME@", + io_signature::make(1, -1, sizeof (@I_TYPE@)), + io_signature::make(1, -1, sizeof (float))), d_O(O), d_D(D), d_TYPE(TYPE), d_TABLE(TABLE) { set_relative_rate (1.0 * d_O / ((double) d_D)); diff --git a/gr-trellis/lib/pccc_decoder_X_impl.cc.t b/gr-trellis/lib/pccc_decoder_X_impl.cc.t index 9bf85bc614..1d5e14ca25 100644 --- a/gr-trellis/lib/pccc_decoder_X_impl.cc.t +++ b/gr-trellis/lib/pccc_decoder_X_impl.cc.t @@ -27,7 +27,7 @@ #endif #include "@NAME@.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <iostream> #include <trellis/core_algorithms.h> @@ -59,9 +59,9 @@ namespace gr { int blocklength, int repetitions, siso_type_t SISO_TYPE) - : gr_block("@BASE_NAME@", - gr_make_io_signature(1, 1, sizeof(float)), - gr_make_io_signature(1, 1, sizeof(@O_TYPE@))), + : block("@BASE_NAME@", + io_signature::make(1, 1, sizeof(float)), + io_signature::make(1, 1, sizeof(@O_TYPE@))), d_FSM1(FSM1), d_ST10(ST10), d_ST1K(ST1K), d_FSM2(FSM2), d_ST20(ST20), d_ST2K(ST2K), d_INTERLEAVER(INTERLEAVER), diff --git a/gr-trellis/lib/pccc_decoder_combined_XX_impl.cc.t b/gr-trellis/lib/pccc_decoder_combined_XX_impl.cc.t index 21a5c0b3ae..f5f5a9311c 100644 --- a/gr-trellis/lib/pccc_decoder_combined_XX_impl.cc.t +++ b/gr-trellis/lib/pccc_decoder_combined_XX_impl.cc.t @@ -27,7 +27,7 @@ #endif #include "@NAME@.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <iostream> #include <trellis/core_algorithms.h> @@ -64,9 +64,9 @@ namespace gr { const std::vector<@I_TYPE@> &TABLE, digital::trellis_metric_type_t METRIC_TYPE, float scaling) - : gr_block("@BASE_NAME@", - gr_make_io_signature(1, 1, sizeof(@I_TYPE@)), - gr_make_io_signature(1, 1, sizeof(@O_TYPE@))), + : block("@BASE_NAME@", + io_signature::make(1, 1, sizeof(@I_TYPE@)), + io_signature::make(1, 1, sizeof(@O_TYPE@))), d_FSMo(FSMo), d_STo0(STo0), d_SToK(SToK), d_FSMi(FSMi), d_STi0(STi0), d_STiK(STiK), d_INTERLEAVER(INTERLEAVER), diff --git a/gr-trellis/lib/pccc_encoder_XX_impl.cc.t b/gr-trellis/lib/pccc_encoder_XX_impl.cc.t index 4e804729a2..119bff6ddb 100644 --- a/gr-trellis/lib/pccc_encoder_XX_impl.cc.t +++ b/gr-trellis/lib/pccc_encoder_XX_impl.cc.t @@ -27,7 +27,7 @@ #endif #include "@NAME@.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <iostream> namespace gr { @@ -47,9 +47,9 @@ namespace gr { const fsm &FSM2, int ST2, const interleaver &INTERLEAVER, int blocklength) - : gr_sync_block("@BASE_NAME@", - gr_make_io_signature(1, 1, sizeof(@I_TYPE@)), - gr_make_io_signature(1, 1, sizeof(@O_TYPE@))), + : sync_block("@BASE_NAME@", + io_signature::make(1, 1, sizeof(@I_TYPE@)), + io_signature::make(1, 1, sizeof(@O_TYPE@))), d_FSM1(FSM1), d_ST1(ST1), d_FSM2(FSM2), d_ST2(ST2), d_INTERLEAVER(INTERLEAVER), diff --git a/gr-trellis/lib/permutation_impl.cc b/gr-trellis/lib/permutation_impl.cc index da82e46832..06bba1e11f 100644 --- a/gr-trellis/lib/permutation_impl.cc +++ b/gr-trellis/lib/permutation_impl.cc @@ -25,7 +25,7 @@ #endif #include "permutation_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <iostream> #include <string.h> @@ -42,9 +42,9 @@ namespace gr { permutation_impl::permutation_impl(int K, const std::vector<int> &TABLE, int SYMS_PER_BLOCK, size_t BYTES_PER_SYMBOL) - : gr_sync_block("permutation", - gr_make_io_signature(1, -1, BYTES_PER_SYMBOL), - gr_make_io_signature(1, -1, BYTES_PER_SYMBOL)), + : sync_block("permutation", + io_signature::make(1, -1, BYTES_PER_SYMBOL), + io_signature::make(1, -1, BYTES_PER_SYMBOL)), d_K(K), d_TABLE(TABLE), d_SYMS_PER_BLOCK(SYMS_PER_BLOCK), d_BYTES_PER_SYMBOL(BYTES_PER_SYMBOL) diff --git a/gr-trellis/lib/sccc_decoder_X_impl.cc.t b/gr-trellis/lib/sccc_decoder_X_impl.cc.t index 6eef46518d..c45f14bfdb 100644 --- a/gr-trellis/lib/sccc_decoder_X_impl.cc.t +++ b/gr-trellis/lib/sccc_decoder_X_impl.cc.t @@ -27,7 +27,7 @@ #endif #include "@NAME@.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <iostream> #include <trellis/core_algorithms.h> @@ -56,9 +56,9 @@ namespace gr { int blocklength, int repetitions, siso_type_t SISO_TYPE) - : gr_block("@BASE_NAME@", - gr_make_io_signature(1, 1, sizeof(float)), - gr_make_io_signature(1, 1, sizeof(@O_TYPE@))), + : block("@BASE_NAME@", + io_signature::make(1, 1, sizeof(float)), + io_signature::make(1, 1, sizeof(@O_TYPE@))), d_FSMo(FSMo), d_STo0(STo0), d_SToK(SToK), d_FSMi(FSMi), d_STi0(STi0), d_STiK(STiK), d_INTERLEAVER(INTERLEAVER), diff --git a/gr-trellis/lib/sccc_decoder_combined_XX_impl.cc.t b/gr-trellis/lib/sccc_decoder_combined_XX_impl.cc.t index 717f2c8e49..6d3ecf6aea 100644 --- a/gr-trellis/lib/sccc_decoder_combined_XX_impl.cc.t +++ b/gr-trellis/lib/sccc_decoder_combined_XX_impl.cc.t @@ -27,7 +27,7 @@ #endif #include "@NAME@.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <iostream> #include <trellis/core_algorithms.h> @@ -64,9 +64,9 @@ namespace gr { const std::vector<@I_TYPE@> &TABLE, digital::trellis_metric_type_t METRIC_TYPE, float scaling) - : gr_block("@BASE_NAME@", - gr_make_io_signature(1, 1, sizeof(@I_TYPE@)), - gr_make_io_signature(1, 1, sizeof(@O_TYPE@))), + : block("@BASE_NAME@", + io_signature::make(1, 1, sizeof(@I_TYPE@)), + io_signature::make(1, 1, sizeof(@O_TYPE@))), d_FSMo(FSMo), d_STo0(STo0), d_SToK(SToK), d_FSMi(FSMi), d_STi0(STi0), d_STiK(STiK), d_INTERLEAVER(INTERLEAVER), diff --git a/gr-trellis/lib/sccc_encoder_XX_impl.cc.t b/gr-trellis/lib/sccc_encoder_XX_impl.cc.t index 390e65c4f3..9924b3c7d2 100644 --- a/gr-trellis/lib/sccc_encoder_XX_impl.cc.t +++ b/gr-trellis/lib/sccc_encoder_XX_impl.cc.t @@ -27,7 +27,7 @@ #endif #include "@NAME@.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <iostream> namespace gr { @@ -47,9 +47,9 @@ namespace gr { const fsm &FSMi, int STi, const interleaver &INTERLEAVER, int blocklength) - : gr_sync_block("@BASE_NAME@", - gr_make_io_signature(1, 1, sizeof(@I_TYPE@)), - gr_make_io_signature(1, 1, sizeof(@O_TYPE@))), + : sync_block("@BASE_NAME@", + io_signature::make(1, 1, sizeof(@I_TYPE@)), + io_signature::make(1, 1, sizeof(@O_TYPE@))), d_FSMo(FSMo), d_STo(STo), d_FSMi(FSMi), d_STi(STi), d_INTERLEAVER(INTERLEAVER), diff --git a/gr-trellis/lib/siso_combined_f_impl.cc b/gr-trellis/lib/siso_combined_f_impl.cc index 7514d46747..d30f5cc4bb 100644 --- a/gr-trellis/lib/siso_combined_f_impl.cc +++ b/gr-trellis/lib/siso_combined_f_impl.cc @@ -25,7 +25,7 @@ #endif #include "siso_combined_f_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <stdexcept> #include <assert.h> #include <iostream> @@ -54,9 +54,9 @@ namespace gr { siso_type_t SISO_TYPE, int D, const std::vector<float> &TABLE, digital::trellis_metric_type_t TYPE) - : gr_block("siso_combined_f", - gr_make_io_signature(1, -1, sizeof(float)), - gr_make_io_signature(1, -1, sizeof(float))), + : block("siso_combined_f", + io_signature::make(1, -1, sizeof(float)), + io_signature::make(1, -1, sizeof(float))), d_FSM(FSM), d_K(K), d_S0(S0), d_SK(SK), d_POSTI(POSTI), d_POSTO(POSTO), d_SISO_TYPE(SISO_TYPE), diff --git a/gr-trellis/lib/siso_f_impl.cc b/gr-trellis/lib/siso_f_impl.cc index b0484f6f37..d699cecaec 100644 --- a/gr-trellis/lib/siso_f_impl.cc +++ b/gr-trellis/lib/siso_f_impl.cc @@ -25,7 +25,7 @@ #endif #include "siso_f_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <stdexcept> #include <assert.h> #include <iostream> @@ -49,9 +49,9 @@ namespace gr { int S0, int SK, bool POSTI, bool POSTO, siso_type_t SISO_TYPE) - : gr_block("siso_f", - gr_make_io_signature(1, -1, sizeof(float)), - gr_make_io_signature(1, -1, sizeof(float))), + : block("siso_f", + io_signature::make(1, -1, sizeof(float)), + io_signature::make(1, -1, sizeof(float))), d_FSM(FSM), d_K(K), d_S0(S0),d_SK(SK), d_POSTI(POSTI), d_POSTO(POSTO), diff --git a/gr-trellis/lib/viterbi_X_impl.cc.t b/gr-trellis/lib/viterbi_X_impl.cc.t index 5097cc2053..247424b3f3 100644 --- a/gr-trellis/lib/viterbi_X_impl.cc.t +++ b/gr-trellis/lib/viterbi_X_impl.cc.t @@ -27,7 +27,7 @@ #endif #include "@NAME@.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <iostream> namespace gr { @@ -45,9 +45,9 @@ namespace gr { @IMPL_NAME@::@IMPL_NAME@(const fsm &FSM, int K, int S0, int SK) - : gr_block("@BASE_NAME@", - gr_make_io_signature(1, -1, sizeof(float)), - gr_make_io_signature(1, -1, sizeof(@TYPE@))), + : block("@BASE_NAME@", + io_signature::make(1, -1, sizeof(float)), + io_signature::make(1, -1, sizeof(@TYPE@))), d_FSM(FSM), d_K(K), d_S0(S0), d_SK(SK)//, //d_trace(FSM.S()*K) { diff --git a/gr-trellis/lib/viterbi_combined_XX_impl.cc.t b/gr-trellis/lib/viterbi_combined_XX_impl.cc.t index 95175bef95..c7cf10e567 100644 --- a/gr-trellis/lib/viterbi_combined_XX_impl.cc.t +++ b/gr-trellis/lib/viterbi_combined_XX_impl.cc.t @@ -27,7 +27,7 @@ #endif #include "@NAME@.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <iostream> namespace gr { @@ -49,9 +49,9 @@ namespace gr { int S0, int SK, int D, const std::vector<@I_TYPE@> &TABLE, digital::trellis_metric_type_t TYPE) - : gr_block("@BASE_NAME@", - gr_make_io_signature(1, -1, sizeof(@I_TYPE@)), - gr_make_io_signature(1, -1, sizeof(@O_TYPE@))), + : block("@BASE_NAME@", + io_signature::make(1, -1, sizeof(@I_TYPE@)), + io_signature::make(1, -1, sizeof(@O_TYPE@))), d_FSM(FSM), d_K(K), d_S0(S0), d_SK(SK), d_D(D), d_TABLE(TABLE), d_TYPE(TYPE)//, //d_trace(FSM.S()*K) |