diff options
Diffstat (limited to 'gr-trellis')
60 files changed, 301 insertions, 298 deletions
diff --git a/gr-trellis/CMakeLists.txt b/gr-trellis/CMakeLists.txt index 80d8c39357..a3f0ad486c 100644 --- a/gr-trellis/CMakeLists.txt +++ b/gr-trellis/CMakeLists.txt @@ -100,7 +100,7 @@ CPACK_COMPONENT("trellis_swig" ######################################################################## # Add subdirectories ######################################################################## -add_subdirectory(include/trellis) +add_subdirectory(include/gnuradio/trellis) add_subdirectory(lib) add_subdirectory(doc) if(ENABLE_PYTHON) diff --git a/gr-trellis/include/trellis/CMakeLists.txt b/gr-trellis/include/gnuradio/trellis/CMakeLists.txt index b7ceea179e..b7ceea179e 100644 --- a/gr-trellis/include/trellis/CMakeLists.txt +++ b/gr-trellis/include/gnuradio/trellis/CMakeLists.txt diff --git a/gr-trellis/include/trellis/api.h b/gr-trellis/include/gnuradio/trellis/api.h index 8b85addd96..bdf5842864 100644 --- a/gr-trellis/include/trellis/api.h +++ b/gr-trellis/include/gnuradio/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/base.h b/gr-trellis/include/gnuradio/trellis/base.h index c69500d0df..c69500d0df 100644 --- a/gr-trellis/include/trellis/base.h +++ b/gr-trellis/include/gnuradio/trellis/base.h diff --git a/gr-trellis/include/trellis/calc_metric.h b/gr-trellis/include/gnuradio/trellis/calc_metric.h index b39267dc84..c85fcbff69 100644 --- a/gr-trellis/include/trellis/calc_metric.h +++ b/gr-trellis/include/gnuradio/trellis/calc_metric.h @@ -24,8 +24,8 @@ #define INCLUDED_CALC_METRIC_H #include <vector> -#include <gr_complex.h> -#include <digital/metric_type.h> +#include <gnuradio/gr_complex.h> +#include <gnuradio/digital/metric_type.h> namespace gr { namespace trellis { diff --git a/gr-trellis/include/trellis/constellation_metrics_cf.h b/gr-trellis/include/gnuradio/trellis/constellation_metrics_cf.h index f4b94223c7..01bfab0140 100644 --- a/gr-trellis/include/trellis/constellation_metrics_cf.h +++ b/gr-trellis/include/gnuradio/trellis/constellation_metrics_cf.h @@ -23,10 +23,10 @@ #ifndef INCLUDED_TRELLIS_CONSTELLATION_METRICS_CF_H #define INCLUDED_TRELLIS_CONSTELLATION_METRICS_CF_H -#include <trellis/api.h> -#include <gr_block.h> -#include <digital/constellation.h> -#include <digital/metric_type.h> +#include <gnuradio/trellis/api.h> +#include <gnuradio/block.h> +#include <gnuradio/digital/constellation.h> +#include <gnuradio/digital/metric_type.h> namespace gr { namespace trellis { @@ -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/core_algorithms.h b/gr-trellis/include/gnuradio/trellis/core_algorithms.h index 2292845629..aedff120d8 100644 --- a/gr-trellis/include/trellis/core_algorithms.h +++ b/gr-trellis/include/gnuradio/trellis/core_algorithms.h @@ -25,9 +25,9 @@ #include <cmath> #include <vector> -#include <digital/metric_type.h> -#include <trellis/fsm.h> -#include <trellis/interleaver.h> +#include <gnuradio/digital/metric_type.h> +#include <gnuradio/trellis/fsm.h> +#include <gnuradio/trellis/interleaver.h> namespace gr { namespace trellis { diff --git a/gr-trellis/include/trellis/encoder_XX.h.t b/gr-trellis/include/gnuradio/trellis/encoder_XX.h.t index 9ca7cb30ce..7ece5d3f21 100644 --- a/gr-trellis/include/trellis/encoder_XX.h.t +++ b/gr-trellis/include/gnuradio/trellis/encoder_XX.h.t @@ -25,9 +25,9 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/api.h> -#include <trellis/fsm.h> -#include <gr_sync_block.h> +#include <gnuradio/trellis/api.h> +#include <gnuradio/trellis/fsm.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/fsm.h b/gr-trellis/include/gnuradio/trellis/fsm.h index d88732b29b..cc8893f1e3 100644 --- a/gr-trellis/include/trellis/fsm.h +++ b/gr-trellis/include/gnuradio/trellis/fsm.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_TRELLIS_FSM_H #define INCLUDED_TRELLIS_FSM_H -#include <trellis/api.h> +#include <gnuradio/trellis/api.h> #include <vector> #include <iosfwd> diff --git a/gr-trellis/include/trellis/interleaver.h b/gr-trellis/include/gnuradio/trellis/interleaver.h index 35fff0ac88..2147db6600 100644 --- a/gr-trellis/include/trellis/interleaver.h +++ b/gr-trellis/include/gnuradio/trellis/interleaver.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_TRELLIS_INTERLEAVER_H #define INCLUDED_TRELLIS_INTERLEAVER_H -#include <trellis/api.h> +#include <gnuradio/trellis/api.h> #include <vector> namespace gr { diff --git a/gr-trellis/include/trellis/metrics_X.h.t b/gr-trellis/include/gnuradio/trellis/metrics_X.h.t index dab7924a8b..3f650faf0e 100644 --- a/gr-trellis/include/trellis/metrics_X.h.t +++ b/gr-trellis/include/gnuradio/trellis/metrics_X.h.t @@ -25,9 +25,9 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/api.h> -#include <trellis/calc_metric.h> -#include <gr_block.h> +#include <gnuradio/trellis/api.h> +#include <gnuradio/trellis/calc_metric.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/gnuradio/trellis/pccc_decoder_X.h.t index d5b6af7b87..affce07042 100644 --- a/gr-trellis/include/trellis/pccc_decoder_X.h.t +++ b/gr-trellis/include/gnuradio/trellis/pccc_decoder_X.h.t @@ -25,11 +25,11 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/api.h> -#include <trellis/fsm.h> -#include <trellis/interleaver.h> -#include <trellis/siso_type.h> -#include <gr_block.h> +#include <gnuradio/trellis/api.h> +#include <gnuradio/trellis/fsm.h> +#include <gnuradio/trellis/interleaver.h> +#include <gnuradio/trellis/siso_type.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/gnuradio/trellis/pccc_decoder_combined_XX.h.t index 87b110a945..719b0aa1e5 100644 --- a/gr-trellis/include/trellis/pccc_decoder_combined_XX.h.t +++ b/gr-trellis/include/gnuradio/trellis/pccc_decoder_combined_XX.h.t @@ -25,12 +25,12 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/api.h> -#include <trellis/fsm.h> -#include <trellis/interleaver.h> -#include <trellis/calc_metric.h> -#include <trellis/siso_type.h> -#include <gr_block.h> +#include <gnuradio/trellis/api.h> +#include <gnuradio/trellis/fsm.h> +#include <gnuradio/trellis/interleaver.h> +#include <gnuradio/trellis/calc_metric.h> +#include <gnuradio/trellis/siso_type.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/gnuradio/trellis/pccc_encoder_XX.h.t index 2a62b7520f..5308fe275d 100644 --- a/gr-trellis/include/trellis/pccc_encoder_XX.h.t +++ b/gr-trellis/include/gnuradio/trellis/pccc_encoder_XX.h.t @@ -25,10 +25,10 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/api.h> -#include <trellis/fsm.h> -#include <trellis/interleaver.h> -#include <gr_sync_block.h> +#include <gnuradio/trellis/api.h> +#include <gnuradio/trellis/fsm.h> +#include <gnuradio/trellis/interleaver.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/gnuradio/trellis/permutation.h index 0f974abb97..80b9fef641 100644 --- a/gr-trellis/include/trellis/permutation.h +++ b/gr-trellis/include/gnuradio/trellis/permutation.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_TRELLIS_PERMUTATION_H #define INCLUDED_TRELLIS_PERMUTATION_H -#include <trellis/api.h> +#include <gnuradio/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/quicksort_index.h b/gr-trellis/include/gnuradio/trellis/quicksort_index.h index 402962172a..402962172a 100644 --- a/gr-trellis/include/trellis/quicksort_index.h +++ b/gr-trellis/include/gnuradio/trellis/quicksort_index.h diff --git a/gr-trellis/include/trellis/sccc_decoder_X.h.t b/gr-trellis/include/gnuradio/trellis/sccc_decoder_X.h.t index 1a63facad9..cc1d86b709 100644 --- a/gr-trellis/include/trellis/sccc_decoder_X.h.t +++ b/gr-trellis/include/gnuradio/trellis/sccc_decoder_X.h.t @@ -25,11 +25,11 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/api.h> -#include <trellis/fsm.h> -#include <trellis/interleaver.h> -#include <trellis/siso_type.h> -#include <gr_block.h> +#include <gnuradio/trellis/api.h> +#include <gnuradio/trellis/fsm.h> +#include <gnuradio/trellis/interleaver.h> +#include <gnuradio/trellis/siso_type.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/gnuradio/trellis/sccc_decoder_combined_XX.h.t index f5f9bef464..699de12fd8 100644 --- a/gr-trellis/include/trellis/sccc_decoder_combined_XX.h.t +++ b/gr-trellis/include/gnuradio/trellis/sccc_decoder_combined_XX.h.t @@ -25,12 +25,12 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/api.h> -#include <trellis/fsm.h> -#include <trellis/interleaver.h> -#include <trellis/calc_metric.h> -#include <trellis/siso_type.h> -#include <gr_block.h> +#include <gnuradio/trellis/api.h> +#include <gnuradio/trellis/fsm.h> +#include <gnuradio/trellis/interleaver.h> +#include <gnuradio/trellis/calc_metric.h> +#include <gnuradio/trellis/siso_type.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/gnuradio/trellis/sccc_encoder_XX.h.t index f62a1e7cfb..85fad02eeb 100644 --- a/gr-trellis/include/trellis/sccc_encoder_XX.h.t +++ b/gr-trellis/include/gnuradio/trellis/sccc_encoder_XX.h.t @@ -25,10 +25,10 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/api.h> -#include <trellis/fsm.h> -#include <trellis/interleaver.h> -#include <gr_sync_block.h> +#include <gnuradio/trellis/api.h> +#include <gnuradio/trellis/fsm.h> +#include <gnuradio/trellis/interleaver.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/gnuradio/trellis/siso_combined_f.h index 48089f86e4..47c34ea81e 100644 --- a/gr-trellis/include/trellis/siso_combined_f.h +++ b/gr-trellis/include/gnuradio/trellis/siso_combined_f.h @@ -23,12 +23,12 @@ #ifndef INCLUDED_TRELLIS_SISO_COMBINED_F_H #define INCLUDED_TRELLIS_SISO_COMBINED_F_H -#include <trellis/api.h> -#include <trellis/fsm.h> -#include <trellis/siso_type.h> -#include <trellis/calc_metric.h> -#include <trellis/core_algorithms.h> -#include <gr_block.h> +#include <gnuradio/trellis/api.h> +#include <gnuradio/trellis/fsm.h> +#include <gnuradio/trellis/siso_type.h> +#include <gnuradio/trellis/calc_metric.h> +#include <gnuradio/trellis/core_algorithms.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/gnuradio/trellis/siso_f.h index 6d4d414f38..60c3349e11 100644 --- a/gr-trellis/include/trellis/siso_f.h +++ b/gr-trellis/include/gnuradio/trellis/siso_f.h @@ -23,11 +23,11 @@ #ifndef INCLUDED_TRELLIS_SISO_F_H #define INCLUDED_TRELLIS_SISO_F_H -#include <trellis/api.h> -#include <trellis/fsm.h> -#include <trellis/siso_type.h> -#include <trellis/core_algorithms.h> -#include <gr_block.h> +#include <gnuradio/trellis/api.h> +#include <gnuradio/trellis/fsm.h> +#include <gnuradio/trellis/siso_type.h> +#include <gnuradio/trellis/core_algorithms.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/siso_type.h b/gr-trellis/include/gnuradio/trellis/siso_type.h index 9167381164..9167381164 100644 --- a/gr-trellis/include/trellis/siso_type.h +++ b/gr-trellis/include/gnuradio/trellis/siso_type.h diff --git a/gr-trellis/include/trellis/viterbi_X.h.t b/gr-trellis/include/gnuradio/trellis/viterbi_X.h.t index 817c98508a..2d72cb5e09 100644 --- a/gr-trellis/include/trellis/viterbi_X.h.t +++ b/gr-trellis/include/gnuradio/trellis/viterbi_X.h.t @@ -25,10 +25,10 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/api.h> -#include <trellis/fsm.h> -#include <trellis/core_algorithms.h> -#include <gr_block.h> +#include <gnuradio/trellis/api.h> +#include <gnuradio/trellis/fsm.h> +#include <gnuradio/trellis/core_algorithms.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/gnuradio/trellis/viterbi_combined_XX.h.t index a2cc4b946c..2becf8bf18 100644 --- a/gr-trellis/include/trellis/viterbi_combined_XX.h.t +++ b/gr-trellis/include/gnuradio/trellis/viterbi_combined_XX.h.t @@ -25,11 +25,11 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/api.h> -#include <trellis/fsm.h> -#include <trellis/calc_metric.h> -#include <trellis/core_algorithms.h> -#include <gr_block.h> +#include <gnuradio/trellis/api.h> +#include <gnuradio/trellis/fsm.h> +#include <gnuradio/trellis/calc_metric.h> +#include <gnuradio/trellis/core_algorithms.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/base.cc b/gr-trellis/lib/base.cc index e9d0141e70..c5022dac83 100644 --- a/gr-trellis/lib/base.cc +++ b/gr-trellis/lib/base.cc @@ -23,7 +23,7 @@ #include <cstdio> #include <stdexcept> #include <cmath> -#include <trellis/base.h> +#include <gnuradio/trellis/base.h> namespace gr { namespace trellis { diff --git a/gr-trellis/lib/calc_metric.cc b/gr-trellis/lib/calc_metric.cc index 3c474e30fe..b95899940a 100644 --- a/gr-trellis/lib/calc_metric.cc +++ b/gr-trellis/lib/calc_metric.cc @@ -22,7 +22,7 @@ #include <float.h> #include <stdexcept> -#include <trellis/calc_metric.h> +#include <gnuradio/trellis/calc_metric.h> namespace gr { namespace trellis { 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/constellation_metrics_cf_impl.h b/gr-trellis/lib/constellation_metrics_cf_impl.h index 52018c4baa..a2f165857b 100644 --- a/gr-trellis/lib/constellation_metrics_cf_impl.h +++ b/gr-trellis/lib/constellation_metrics_cf_impl.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_TRELLIS_CONSTELLATION_METRICS_CF_IMPL_H #define INCLUDED_TRELLIS_CONSTELLATION_METRICS_CF_IMPL_H -#include <trellis/api.h> -#include <trellis/constellation_metrics_cf.h> +#include <gnuradio/trellis/api.h> +#include <gnuradio/trellis/constellation_metrics_cf.h> namespace gr { namespace trellis { diff --git a/gr-trellis/lib/core_algorithms.cc b/gr-trellis/lib/core_algorithms.cc index a704e5f9a6..a8a0174551 100644 --- a/gr-trellis/lib/core_algorithms.cc +++ b/gr-trellis/lib/core_algorithms.cc @@ -23,8 +23,8 @@ #include <cstring> #include <stdexcept> #include <iostream> -#include <trellis/core_algorithms.h> -#include <trellis/calc_metric.h> +#include <gnuradio/trellis/core_algorithms.h> +#include <gnuradio/trellis/calc_metric.h> namespace gr { namespace trellis { 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/encoder_XX_impl.h.t b/gr-trellis/lib/encoder_XX_impl.h.t index 949f1182de..ec2f82611e 100644 --- a/gr-trellis/lib/encoder_XX_impl.h.t +++ b/gr-trellis/lib/encoder_XX_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/@BASE_NAME@.h> +#include <gnuradio/trellis/@BASE_NAME@.h> namespace gr { namespace trellis { diff --git a/gr-trellis/lib/fsm.cc b/gr-trellis/lib/fsm.cc index 16efcd10f2..20eeed5c25 100644 --- a/gr-trellis/lib/fsm.cc +++ b/gr-trellis/lib/fsm.cc @@ -27,8 +27,8 @@ #include <stdexcept> #include <cmath> #include <stdlib.h> -#include <trellis/base.h> -#include <trellis/fsm.h> +#include <gnuradio/trellis/base.h> +#include <gnuradio/trellis/fsm.h> namespace gr { namespace trellis { diff --git a/gr-trellis/lib/interleaver.cc b/gr-trellis/lib/interleaver.cc index 27248a6d43..f24d625582 100644 --- a/gr-trellis/lib/interleaver.cc +++ b/gr-trellis/lib/interleaver.cc @@ -27,8 +27,8 @@ #include <fstream> #include <stdexcept> #include <cmath> -#include <trellis/quicksort_index.h> -#include <trellis/interleaver.h> +#include <gnuradio/trellis/quicksort_index.h> +#include <gnuradio/trellis/interleaver.h> namespace gr { namespace trellis { 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/metrics_X_impl.h.t b/gr-trellis/lib/metrics_X_impl.h.t index 0f52a8bc40..0cd7f0ba5b 100644 --- a/gr-trellis/lib/metrics_X_impl.h.t +++ b/gr-trellis/lib/metrics_X_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/@BASE_NAME@.h> +#include <gnuradio/trellis/@BASE_NAME@.h> namespace gr { namespace trellis { diff --git a/gr-trellis/lib/pccc_decoder_X_impl.cc.t b/gr-trellis/lib/pccc_decoder_X_impl.cc.t index 9bf85bc614..aa19884712 100644 --- a/gr-trellis/lib/pccc_decoder_X_impl.cc.t +++ b/gr-trellis/lib/pccc_decoder_X_impl.cc.t @@ -27,9 +27,9 @@ #endif #include "@NAME@.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <iostream> -#include <trellis/core_algorithms.h> +#include <gnuradio/trellis/core_algorithms.h> namespace gr { namespace trellis { @@ -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_X_impl.h.t b/gr-trellis/lib/pccc_decoder_X_impl.h.t index 9b61e34fde..43a7257fc5 100644 --- a/gr-trellis/lib/pccc_decoder_X_impl.h.t +++ b/gr-trellis/lib/pccc_decoder_X_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/@BASE_NAME@.h> +#include <gnuradio/trellis/@BASE_NAME@.h> namespace gr { namespace trellis { 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..15ea3ceecb 100644 --- a/gr-trellis/lib/pccc_decoder_combined_XX_impl.cc.t +++ b/gr-trellis/lib/pccc_decoder_combined_XX_impl.cc.t @@ -27,9 +27,9 @@ #endif #include "@NAME@.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <iostream> -#include <trellis/core_algorithms.h> +#include <gnuradio/trellis/core_algorithms.h> namespace gr { namespace trellis { @@ -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_decoder_combined_XX_impl.h.t b/gr-trellis/lib/pccc_decoder_combined_XX_impl.h.t index 4c3655f40d..7606017547 100644 --- a/gr-trellis/lib/pccc_decoder_combined_XX_impl.h.t +++ b/gr-trellis/lib/pccc_decoder_combined_XX_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/@BASE_NAME@.h> +#include <gnuradio/trellis/@BASE_NAME@.h> namespace gr { namespace trellis { 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/pccc_encoder_XX_impl.h.t b/gr-trellis/lib/pccc_encoder_XX_impl.h.t index 1eed3702be..f7d6967584 100644 --- a/gr-trellis/lib/pccc_encoder_XX_impl.h.t +++ b/gr-trellis/lib/pccc_encoder_XX_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/@BASE_NAME@.h> +#include <gnuradio/trellis/@BASE_NAME@.h> namespace gr { namespace trellis { 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/permutation_impl.h b/gr-trellis/lib/permutation_impl.h index 6e3ca2b2d7..2c7b28d62f 100644 --- a/gr-trellis/lib/permutation_impl.h +++ b/gr-trellis/lib/permutation_impl.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_TRELLIS_PERMUTATION_IMPL_H #define INCLUDED_TRELLIS_PERMUTATION_IMPL_H -#include <trellis/api.h> -#include <trellis/permutation.h> +#include <gnuradio/trellis/api.h> +#include <gnuradio/trellis/permutation.h> namespace gr { namespace trellis { diff --git a/gr-trellis/lib/quicksort_index.cc b/gr-trellis/lib/quicksort_index.cc index 02cd8a9134..2e7c21907a 100644 --- a/gr-trellis/lib/quicksort_index.cc +++ b/gr-trellis/lib/quicksort_index.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <trellis/quicksort_index.h> +#include <gnuradio/trellis/quicksort_index.h> namespace gr { namespace trellis { diff --git a/gr-trellis/lib/sccc_decoder_X_impl.cc.t b/gr-trellis/lib/sccc_decoder_X_impl.cc.t index 6eef46518d..d217bbccfb 100644 --- a/gr-trellis/lib/sccc_decoder_X_impl.cc.t +++ b/gr-trellis/lib/sccc_decoder_X_impl.cc.t @@ -27,9 +27,9 @@ #endif #include "@NAME@.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <iostream> -#include <trellis/core_algorithms.h> +#include <gnuradio/trellis/core_algorithms.h> namespace gr { namespace trellis { @@ -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_X_impl.h.t b/gr-trellis/lib/sccc_decoder_X_impl.h.t index 31f4edc4b8..c79e6ebbab 100644 --- a/gr-trellis/lib/sccc_decoder_X_impl.h.t +++ b/gr-trellis/lib/sccc_decoder_X_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/@BASE_NAME@.h> +#include <gnuradio/trellis/@BASE_NAME@.h> namespace gr { namespace trellis { 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..4acc560175 100644 --- a/gr-trellis/lib/sccc_decoder_combined_XX_impl.cc.t +++ b/gr-trellis/lib/sccc_decoder_combined_XX_impl.cc.t @@ -27,9 +27,9 @@ #endif #include "@NAME@.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <iostream> -#include <trellis/core_algorithms.h> +#include <gnuradio/trellis/core_algorithms.h> namespace gr { namespace trellis { @@ -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_decoder_combined_XX_impl.h.t b/gr-trellis/lib/sccc_decoder_combined_XX_impl.h.t index f3dbd1b4bb..6a38f0114f 100644 --- a/gr-trellis/lib/sccc_decoder_combined_XX_impl.h.t +++ b/gr-trellis/lib/sccc_decoder_combined_XX_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/@BASE_NAME@.h> +#include <gnuradio/trellis/@BASE_NAME@.h> namespace gr { namespace trellis { 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/sccc_encoder_XX_impl.h.t b/gr-trellis/lib/sccc_encoder_XX_impl.h.t index a3e582b5a0..fc64f2ade8 100644 --- a/gr-trellis/lib/sccc_encoder_XX_impl.h.t +++ b/gr-trellis/lib/sccc_encoder_XX_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/@BASE_NAME@.h> +#include <gnuradio/trellis/@BASE_NAME@.h> namespace gr { namespace trellis { 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_combined_f_impl.h b/gr-trellis/lib/siso_combined_f_impl.h index 27cef5e334..5035a0a83d 100644 --- a/gr-trellis/lib/siso_combined_f_impl.h +++ b/gr-trellis/lib/siso_combined_f_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_TRELLIS_SISO_COMBINED_F_IMPL_H #define INCLUDED_TRELLIS_SISO_COMBINED_F_IMPL_H -#include <trellis/siso_combined_f.h> +#include <gnuradio/trellis/siso_combined_f.h> namespace gr { namespace trellis { 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/siso_f_impl.h b/gr-trellis/lib/siso_f_impl.h index 40766b97fa..ca8f623aaf 100644 --- a/gr-trellis/lib/siso_f_impl.h +++ b/gr-trellis/lib/siso_f_impl.h @@ -23,11 +23,11 @@ #ifndef INCLUDED_TRELLIS_SISO_F_IMPL_H #define INCLUDED_TRELLIS_SISO_F_IMPL_H -#include <trellis/api.h> -#include <trellis/fsm.h> -#include <trellis/siso_type.h> -#include <trellis/core_algorithms.h> -#include <trellis/siso_f.h> +#include <gnuradio/trellis/api.h> +#include <gnuradio/trellis/fsm.h> +#include <gnuradio/trellis/siso_type.h> +#include <gnuradio/trellis/core_algorithms.h> +#include <gnuradio/trellis/siso_f.h> namespace gr { namespace trellis { 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_X_impl.h.t b/gr-trellis/lib/viterbi_X_impl.h.t index accaacc158..b9554e8c39 100644 --- a/gr-trellis/lib/viterbi_X_impl.h.t +++ b/gr-trellis/lib/viterbi_X_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/@BASE_NAME@.h> +#include <gnuradio/trellis/@BASE_NAME@.h> namespace gr { namespace trellis { 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) diff --git a/gr-trellis/lib/viterbi_combined_XX_impl.h.t b/gr-trellis/lib/viterbi_combined_XX_impl.h.t index df62001110..199e8c8e88 100644 --- a/gr-trellis/lib/viterbi_combined_XX_impl.h.t +++ b/gr-trellis/lib/viterbi_combined_XX_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <trellis/@BASE_NAME@.h> +#include <gnuradio/trellis/@BASE_NAME@.h> namespace gr { namespace trellis { diff --git a/gr-trellis/swig/CMakeLists.txt b/gr-trellis/swig/CMakeLists.txt index c11bf02e84..81c3e876f1 100644 --- a/gr-trellis/swig/CMakeLists.txt +++ b/gr-trellis/swig/CMakeLists.txt @@ -40,7 +40,10 @@ endif(ENABLE_GR_CTRLPORT) # Setup swig docs to depend on includes and pull in from build directory set(GR_SWIG_TARGET_DEPS trellis_generated_includes) set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/trellis_swig_doc.i) -set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/trellis) +set(GR_SWIG_DOC_DIRS + ${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/trellis + ${CMAKE_CURRENT_BINARY_DIR}/../include/gnuradio/trellis +) set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc) GR_SWIG_MAKE(trellis_swig trellis_swig.i) diff --git a/gr-trellis/swig/trellis_swig.i b/gr-trellis/swig/trellis_swig.i index d593926b0d..2848b31d62 100644 --- a/gr-trellis/swig/trellis_swig.i +++ b/gr-trellis/swig/trellis_swig.i @@ -27,133 +27,133 @@ //load generated python docstrings %include "trellis_swig_doc.i" -%include "digital/metric_type.h" -%include "digital/constellation.h" -%include "trellis/siso_type.h" -%include "trellis/fsm.h" -%include "trellis/interleaver.h" +%include "gnuradio/digital/metric_type.h" +%include "gnuradio/digital/constellation.h" +%include "gnuradio/trellis/siso_type.h" +%include "gnuradio/trellis/fsm.h" +%include "gnuradio/trellis/interleaver.h" %{ -#include "trellis/constellation_metrics_cf.h" -#include "trellis/permutation.h" -#include "trellis/siso_combined_f.h" -#include "trellis/siso_f.h" -#include "trellis/encoder_bb.h" -#include "trellis/encoder_bs.h" -#include "trellis/encoder_bi.h" -#include "trellis/encoder_ss.h" -#include "trellis/encoder_si.h" -#include "trellis/encoder_ii.h" -#include "trellis/sccc_encoder_bb.h" -#include "trellis/sccc_encoder_bs.h" -#include "trellis/sccc_encoder_bi.h" -#include "trellis/sccc_encoder_ss.h" -#include "trellis/sccc_encoder_si.h" -#include "trellis/sccc_encoder_ii.h" -#include "trellis/pccc_encoder_bb.h" -#include "trellis/pccc_encoder_bs.h" -#include "trellis/pccc_encoder_bi.h" -#include "trellis/pccc_encoder_ss.h" -#include "trellis/pccc_encoder_si.h" -#include "trellis/pccc_encoder_ii.h" -#include "trellis/metrics_s.h" -#include "trellis/metrics_i.h" -#include "trellis/metrics_f.h" -#include "trellis/metrics_c.h" -#include "trellis/pccc_decoder_b.h" -#include "trellis/pccc_decoder_s.h" -#include "trellis/pccc_decoder_i.h" -#include "trellis/pccc_decoder_combined_fb.h" -#include "trellis/pccc_decoder_combined_fs.h" -#include "trellis/pccc_decoder_combined_fi.h" -#include "trellis/pccc_decoder_combined_cb.h" -#include "trellis/pccc_decoder_combined_cs.h" -#include "trellis/pccc_decoder_combined_ci.h" -#include "trellis/viterbi_b.h" -#include "trellis/viterbi_s.h" -#include "trellis/viterbi_i.h" -#include "trellis/viterbi_combined_sb.h" -#include "trellis/viterbi_combined_ss.h" -#include "trellis/viterbi_combined_si.h" -#include "trellis/viterbi_combined_ib.h" -#include "trellis/viterbi_combined_is.h" -#include "trellis/viterbi_combined_ii.h" -#include "trellis/viterbi_combined_fb.h" -#include "trellis/viterbi_combined_fs.h" -#include "trellis/viterbi_combined_fi.h" -#include "trellis/viterbi_combined_cb.h" -#include "trellis/viterbi_combined_cs.h" -#include "trellis/viterbi_combined_ci.h" -#include "trellis/sccc_decoder_b.h" -#include "trellis/sccc_decoder_s.h" -#include "trellis/sccc_decoder_i.h" -#include "trellis/sccc_decoder_combined_fb.h" -#include "trellis/sccc_decoder_combined_fs.h" -#include "trellis/sccc_decoder_combined_fi.h" -#include "trellis/sccc_decoder_combined_cb.h" -#include "trellis/sccc_decoder_combined_cs.h" -#include "trellis/sccc_decoder_combined_ci.h" +#include "gnuradio/trellis/constellation_metrics_cf.h" +#include "gnuradio/trellis/permutation.h" +#include "gnuradio/trellis/siso_combined_f.h" +#include "gnuradio/trellis/siso_f.h" +#include "gnuradio/trellis/encoder_bb.h" +#include "gnuradio/trellis/encoder_bs.h" +#include "gnuradio/trellis/encoder_bi.h" +#include "gnuradio/trellis/encoder_ss.h" +#include "gnuradio/trellis/encoder_si.h" +#include "gnuradio/trellis/encoder_ii.h" +#include "gnuradio/trellis/sccc_encoder_bb.h" +#include "gnuradio/trellis/sccc_encoder_bs.h" +#include "gnuradio/trellis/sccc_encoder_bi.h" +#include "gnuradio/trellis/sccc_encoder_ss.h" +#include "gnuradio/trellis/sccc_encoder_si.h" +#include "gnuradio/trellis/sccc_encoder_ii.h" +#include "gnuradio/trellis/pccc_encoder_bb.h" +#include "gnuradio/trellis/pccc_encoder_bs.h" +#include "gnuradio/trellis/pccc_encoder_bi.h" +#include "gnuradio/trellis/pccc_encoder_ss.h" +#include "gnuradio/trellis/pccc_encoder_si.h" +#include "gnuradio/trellis/pccc_encoder_ii.h" +#include "gnuradio/trellis/metrics_s.h" +#include "gnuradio/trellis/metrics_i.h" +#include "gnuradio/trellis/metrics_f.h" +#include "gnuradio/trellis/metrics_c.h" +#include "gnuradio/trellis/pccc_decoder_b.h" +#include "gnuradio/trellis/pccc_decoder_s.h" +#include "gnuradio/trellis/pccc_decoder_i.h" +#include "gnuradio/trellis/pccc_decoder_combined_fb.h" +#include "gnuradio/trellis/pccc_decoder_combined_fs.h" +#include "gnuradio/trellis/pccc_decoder_combined_fi.h" +#include "gnuradio/trellis/pccc_decoder_combined_cb.h" +#include "gnuradio/trellis/pccc_decoder_combined_cs.h" +#include "gnuradio/trellis/pccc_decoder_combined_ci.h" +#include "gnuradio/trellis/viterbi_b.h" +#include "gnuradio/trellis/viterbi_s.h" +#include "gnuradio/trellis/viterbi_i.h" +#include "gnuradio/trellis/viterbi_combined_sb.h" +#include "gnuradio/trellis/viterbi_combined_ss.h" +#include "gnuradio/trellis/viterbi_combined_si.h" +#include "gnuradio/trellis/viterbi_combined_ib.h" +#include "gnuradio/trellis/viterbi_combined_is.h" +#include "gnuradio/trellis/viterbi_combined_ii.h" +#include "gnuradio/trellis/viterbi_combined_fb.h" +#include "gnuradio/trellis/viterbi_combined_fs.h" +#include "gnuradio/trellis/viterbi_combined_fi.h" +#include "gnuradio/trellis/viterbi_combined_cb.h" +#include "gnuradio/trellis/viterbi_combined_cs.h" +#include "gnuradio/trellis/viterbi_combined_ci.h" +#include "gnuradio/trellis/sccc_decoder_b.h" +#include "gnuradio/trellis/sccc_decoder_s.h" +#include "gnuradio/trellis/sccc_decoder_i.h" +#include "gnuradio/trellis/sccc_decoder_combined_fb.h" +#include "gnuradio/trellis/sccc_decoder_combined_fs.h" +#include "gnuradio/trellis/sccc_decoder_combined_fi.h" +#include "gnuradio/trellis/sccc_decoder_combined_cb.h" +#include "gnuradio/trellis/sccc_decoder_combined_cs.h" +#include "gnuradio/trellis/sccc_decoder_combined_ci.h" %} -%include "trellis/constellation_metrics_cf.h" -%include "trellis/permutation.h" -%include "trellis/siso_combined_f.h" -%include "trellis/siso_f.h" -%include "trellis/encoder_bb.h" -%include "trellis/encoder_bs.h" -%include "trellis/encoder_bi.h" -%include "trellis/encoder_ss.h" -%include "trellis/encoder_si.h" -%include "trellis/encoder_ii.h" -%include "trellis/sccc_encoder_bb.h" -%include "trellis/sccc_encoder_bs.h" -%include "trellis/sccc_encoder_bi.h" -%include "trellis/sccc_encoder_ss.h" -%include "trellis/sccc_encoder_si.h" -%include "trellis/sccc_encoder_ii.h" -%include "trellis/pccc_encoder_bb.h" -%include "trellis/pccc_encoder_bs.h" -%include "trellis/pccc_encoder_bi.h" -%include "trellis/pccc_encoder_ss.h" -%include "trellis/pccc_encoder_si.h" -%include "trellis/pccc_encoder_ii.h" -%include "trellis/metrics_s.h" -%include "trellis/metrics_i.h" -%include "trellis/metrics_f.h" -%include "trellis/metrics_c.h" -%include "trellis/pccc_decoder_b.h" -%include "trellis/pccc_decoder_s.h" -%include "trellis/pccc_decoder_i.h" -%include "trellis/pccc_decoder_combined_fb.h" -%include "trellis/pccc_decoder_combined_fs.h" -%include "trellis/pccc_decoder_combined_fi.h" -%include "trellis/pccc_decoder_combined_cb.h" -%include "trellis/pccc_decoder_combined_cs.h" -%include "trellis/pccc_decoder_combined_ci.h" -%include "trellis/viterbi_b.h" -%include "trellis/viterbi_s.h" -%include "trellis/viterbi_i.h" -%include "trellis/viterbi_combined_sb.h" -%include "trellis/viterbi_combined_ss.h" -%include "trellis/viterbi_combined_si.h" -%include "trellis/viterbi_combined_ib.h" -%include "trellis/viterbi_combined_is.h" -%include "trellis/viterbi_combined_ii.h" -%include "trellis/viterbi_combined_fb.h" -%include "trellis/viterbi_combined_fs.h" -%include "trellis/viterbi_combined_fi.h" -%include "trellis/viterbi_combined_cb.h" -%include "trellis/viterbi_combined_cs.h" -%include "trellis/viterbi_combined_ci.h" -%include "trellis/sccc_decoder_b.h" -%include "trellis/sccc_decoder_s.h" -%include "trellis/sccc_decoder_i.h" -%include "trellis/sccc_decoder_combined_fb.h" -%include "trellis/sccc_decoder_combined_fs.h" -%include "trellis/sccc_decoder_combined_fi.h" -%include "trellis/sccc_decoder_combined_cb.h" -%include "trellis/sccc_decoder_combined_cs.h" -%include "trellis/sccc_decoder_combined_ci.h" +%include "gnuradio/trellis/constellation_metrics_cf.h" +%include "gnuradio/trellis/permutation.h" +%include "gnuradio/trellis/siso_combined_f.h" +%include "gnuradio/trellis/siso_f.h" +%include "gnuradio/trellis/encoder_bb.h" +%include "gnuradio/trellis/encoder_bs.h" +%include "gnuradio/trellis/encoder_bi.h" +%include "gnuradio/trellis/encoder_ss.h" +%include "gnuradio/trellis/encoder_si.h" +%include "gnuradio/trellis/encoder_ii.h" +%include "gnuradio/trellis/sccc_encoder_bb.h" +%include "gnuradio/trellis/sccc_encoder_bs.h" +%include "gnuradio/trellis/sccc_encoder_bi.h" +%include "gnuradio/trellis/sccc_encoder_ss.h" +%include "gnuradio/trellis/sccc_encoder_si.h" +%include "gnuradio/trellis/sccc_encoder_ii.h" +%include "gnuradio/trellis/pccc_encoder_bb.h" +%include "gnuradio/trellis/pccc_encoder_bs.h" +%include "gnuradio/trellis/pccc_encoder_bi.h" +%include "gnuradio/trellis/pccc_encoder_ss.h" +%include "gnuradio/trellis/pccc_encoder_si.h" +%include "gnuradio/trellis/pccc_encoder_ii.h" +%include "gnuradio/trellis/metrics_s.h" +%include "gnuradio/trellis/metrics_i.h" +%include "gnuradio/trellis/metrics_f.h" +%include "gnuradio/trellis/metrics_c.h" +%include "gnuradio/trellis/pccc_decoder_b.h" +%include "gnuradio/trellis/pccc_decoder_s.h" +%include "gnuradio/trellis/pccc_decoder_i.h" +%include "gnuradio/trellis/pccc_decoder_combined_fb.h" +%include "gnuradio/trellis/pccc_decoder_combined_fs.h" +%include "gnuradio/trellis/pccc_decoder_combined_fi.h" +%include "gnuradio/trellis/pccc_decoder_combined_cb.h" +%include "gnuradio/trellis/pccc_decoder_combined_cs.h" +%include "gnuradio/trellis/pccc_decoder_combined_ci.h" +%include "gnuradio/trellis/viterbi_b.h" +%include "gnuradio/trellis/viterbi_s.h" +%include "gnuradio/trellis/viterbi_i.h" +%include "gnuradio/trellis/viterbi_combined_sb.h" +%include "gnuradio/trellis/viterbi_combined_ss.h" +%include "gnuradio/trellis/viterbi_combined_si.h" +%include "gnuradio/trellis/viterbi_combined_ib.h" +%include "gnuradio/trellis/viterbi_combined_is.h" +%include "gnuradio/trellis/viterbi_combined_ii.h" +%include "gnuradio/trellis/viterbi_combined_fb.h" +%include "gnuradio/trellis/viterbi_combined_fs.h" +%include "gnuradio/trellis/viterbi_combined_fi.h" +%include "gnuradio/trellis/viterbi_combined_cb.h" +%include "gnuradio/trellis/viterbi_combined_cs.h" +%include "gnuradio/trellis/viterbi_combined_ci.h" +%include "gnuradio/trellis/sccc_decoder_b.h" +%include "gnuradio/trellis/sccc_decoder_s.h" +%include "gnuradio/trellis/sccc_decoder_i.h" +%include "gnuradio/trellis/sccc_decoder_combined_fb.h" +%include "gnuradio/trellis/sccc_decoder_combined_fs.h" +%include "gnuradio/trellis/sccc_decoder_combined_fi.h" +%include "gnuradio/trellis/sccc_decoder_combined_cb.h" +%include "gnuradio/trellis/sccc_decoder_combined_cs.h" +%include "gnuradio/trellis/sccc_decoder_combined_ci.h" GR_SWIG_BLOCK_MAGIC2(trellis, constellation_metrics_cf); GR_SWIG_BLOCK_MAGIC2(trellis, permutation); |