diff options
Diffstat (limited to 'gr-digital')
139 files changed, 500 insertions, 502 deletions
diff --git a/gr-digital/include/digital/additive_scrambler_bb.h b/gr-digital/include/digital/additive_scrambler_bb.h index bc4d4b36e9..9f0493b756 100644 --- a/gr-digital/include/digital/additive_scrambler_bb.h +++ b/gr-digital/include/digital/additive_scrambler_bb.h @@ -24,7 +24,7 @@ #define INCLUDED_DIGITAL_ADDITIVE_SCRAMBLER_BB_H #include <digital/api.h> -#include <gr_sync_block.h> +#include <gnuradio/sync_block.h> namespace gr { namespace digital { @@ -45,7 +45,7 @@ namespace gr { * processed, the shift register is reset to the seed value. * This allows processing fixed length vectors of samples. */ - class DIGITAL_API additive_scrambler_bb : virtual public gr_sync_block + class DIGITAL_API additive_scrambler_bb : virtual public sync_block { public: // gr::digital::additive_scrambler_bb::sptr diff --git a/gr-digital/include/digital/api.h b/gr-digital/include/digital/api.h index 815f7b6627..71ca19ad58 100644 --- a/gr-digital/include/digital/api.h +++ b/gr-digital/include/digital/api.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_DIGITAL_API_H #define INCLUDED_DIGITAL_API_H -#include <attributes.h> +#include <gnuradio/attributes.h> #ifdef gnuradio_digital_EXPORTS # define DIGITAL_API __GR_ATTR_EXPORT diff --git a/gr-digital/include/digital/binary_slicer_fb.h b/gr-digital/include/digital/binary_slicer_fb.h index 47e0246094..2d5bf6e51d 100644 --- a/gr-digital/include/digital/binary_slicer_fb.h +++ b/gr-digital/include/digital/binary_slicer_fb.h @@ -24,7 +24,7 @@ #define INCLUDED_DIGITAL_BINARY_SLICER_FB_H #include <digital/api.h> -#include <gr_sync_block.h> +#include <gnuradio/sync_block.h> namespace gr { namespace digital { @@ -37,7 +37,7 @@ namespace gr { * x < 0 --> 0 * x >= 0 --> 1 */ - class DIGITAL_API binary_slicer_fb : virtual public gr_sync_block + class DIGITAL_API binary_slicer_fb : virtual public sync_block { public: // gr::digital::binary_slicer_fb::sptr diff --git a/gr-digital/include/digital/chunks_to_symbols_XX.h.t b/gr-digital/include/digital/chunks_to_symbols_XX.h.t index 6ad10ae261..5d25e68943 100644 --- a/gr-digital/include/digital/chunks_to_symbols_XX.h.t +++ b/gr-digital/include/digital/chunks_to_symbols_XX.h.t @@ -26,7 +26,7 @@ #define @GUARD_NAME@ #include <digital/api.h> -#include <gr_sync_interpolator.h> +#include <gnuradio/sync_interpolator.h> namespace gr { namespace digital { @@ -52,7 +52,7 @@ namespace gr { * \sa gr::digital::chunks_to_symbols_sf, gr::digital::chunks_to_symbols_sc. */ - class DIGITAL_API @NAME@ : virtual public gr_sync_interpolator + class DIGITAL_API @NAME@ : virtual public sync_interpolator { public: // gr::digital::@BASE_NAME@::sptr diff --git a/gr-digital/include/digital/clock_recovery_mm_cc.h b/gr-digital/include/digital/clock_recovery_mm_cc.h index a7917e528a..e2c948ac4d 100644 --- a/gr-digital/include/digital/clock_recovery_mm_cc.h +++ b/gr-digital/include/digital/clock_recovery_mm_cc.h @@ -24,7 +24,7 @@ #define INCLUDED_DIGITAL_CLOCK_RECOVERY_MM_CC_H #include <digital/api.h> -#include <gr_block.h> +#include <gnuradio/block.h> namespace gr { namespace digital { @@ -44,7 +44,7 @@ namespace gr { * and Muller algorithm," Electronics Letters, Vol. 31, no. 13, 22 * June 1995, pp. 1032 - 1033. */ - class DIGITAL_API clock_recovery_mm_cc : virtual public gr_block + class DIGITAL_API clock_recovery_mm_cc : virtual public block { public: // gr::digital::clock_recovery_mm_cc::sptr diff --git a/gr-digital/include/digital/clock_recovery_mm_ff.h b/gr-digital/include/digital/clock_recovery_mm_ff.h index 491f3ec21a..e5a229c704 100644 --- a/gr-digital/include/digital/clock_recovery_mm_ff.h +++ b/gr-digital/include/digital/clock_recovery_mm_ff.h @@ -24,7 +24,7 @@ #define INCLUDED_DIGITAL_CLOCK_RECOVERY_MM_FF_H #include <digital/api.h> -#include <gr_block.h> +#include <gnuradio/block.h> namespace gr { namespace digital { @@ -41,7 +41,7 @@ namespace gr { * Estimation and Signal Processing" by Heinrich Meyr, Marc * Moeneclaey, & Stefan Fechtel. ISBN 0-471-50275-8. */ - class DIGITAL_API clock_recovery_mm_ff : virtual public gr_block + class DIGITAL_API clock_recovery_mm_ff : virtual public block { public: // gr::digital::clock_recovery_mm_ff::sptr diff --git a/gr-digital/include/digital/cma_equalizer_cc.h b/gr-digital/include/digital/cma_equalizer_cc.h index 0ccd1c21ba..bfe851e689 100644 --- a/gr-digital/include/digital/cma_equalizer_cc.h +++ b/gr-digital/include/digital/cma_equalizer_cc.h @@ -24,7 +24,7 @@ #define INCLUDED_DIGITAL_CMA_EQUALIZER_CC_H #include <digital/api.h> -#include <gr_sync_decimator.h> +#include <gnuradio/sync_decimator.h> namespace gr { namespace digital { @@ -41,7 +41,7 @@ namespace gr { * Transactions on Communications, Vol. 28, No. 11, pp. 1867 - * 1875, 1980. */ - class DIGITAL_API cma_equalizer_cc: virtual public gr_sync_decimator + class DIGITAL_API cma_equalizer_cc: virtual public sync_decimator { protected: virtual gr_complex error(const gr_complex &out) = 0; diff --git a/gr-digital/include/digital/constellation.h b/gr-digital/include/digital/constellation.h index a5e490b428..d81cac478e 100644 --- a/gr-digital/include/digital/constellation.h +++ b/gr-digital/include/digital/constellation.h @@ -26,7 +26,7 @@ #include <digital/api.h> #include <digital/metric_type.h> #include <boost/enable_shared_from_this.hpp> -#include <gr_complex.h> +#include <gnuradio/gr_complex.h> #include <vector> namespace gr { diff --git a/gr-digital/include/digital/constellation_decoder_cb.h b/gr-digital/include/digital/constellation_decoder_cb.h index 39cc6ac822..fd6e3d0ec3 100644 --- a/gr-digital/include/digital/constellation_decoder_cb.h +++ b/gr-digital/include/digital/constellation_decoder_cb.h @@ -25,7 +25,7 @@ #include <digital/api.h> #include <digital/constellation.h> -#include <gr_block.h> +#include <gnuradio/block.h> namespace gr { namespace digital { @@ -40,7 +40,7 @@ namespace gr { * object. */ class DIGITAL_API constellation_decoder_cb - : virtual public gr_block + : virtual public block { public: // gr::digital::constellation_decoder_cb::sptr diff --git a/gr-digital/include/digital/constellation_receiver_cb.h b/gr-digital/include/digital/constellation_receiver_cb.h index 31138974ef..255ae4da67 100644 --- a/gr-digital/include/digital/constellation_receiver_cb.h +++ b/gr-digital/include/digital/constellation_receiver_cb.h @@ -25,7 +25,7 @@ #include <digital/api.h> #include <digital/constellation.h> -#include <gr_block.h> +#include <gnuradio/block.h> namespace gr { namespace digital { @@ -43,7 +43,7 @@ namespace gr { * the NCO are updated according to this error. */ class DIGITAL_API constellation_receiver_cb - : virtual public gr_block + : virtual public block { public: // gr::digital::constellation_receiver_cb::sptr diff --git a/gr-digital/include/digital/correlate_access_code_bb.h b/gr-digital/include/digital/correlate_access_code_bb.h index 12c0f39961..544d427f60 100644 --- a/gr-digital/include/digital/correlate_access_code_bb.h +++ b/gr-digital/include/digital/correlate_access_code_bb.h @@ -24,7 +24,7 @@ #define INCLUDED_DIGITAL_CORRELATE_ACCESS_CODE_BB_H #include <digital/api.h> -#include <gr_sync_block.h> +#include <gnuradio/sync_block.h> #include <string> namespace gr { @@ -45,7 +45,7 @@ namespace gr { * the corresponding data bit is the first data bit following the * access code. Otherwise the flag bit is 0. */ - class DIGITAL_API correlate_access_code_bb : virtual public gr_sync_block + class DIGITAL_API correlate_access_code_bb : virtual public sync_block { public: // gr::digital::correlate_access_code_bb::sptr diff --git a/gr-digital/include/digital/correlate_access_code_tag_bb.h b/gr-digital/include/digital/correlate_access_code_tag_bb.h index 5e04aa0b6e..51d088e82f 100644 --- a/gr-digital/include/digital/correlate_access_code_tag_bb.h +++ b/gr-digital/include/digital/correlate_access_code_tag_bb.h @@ -24,7 +24,7 @@ #define INCLUDED_DIGITAL_CORRELATE_ACCESS_CODE_TAG_BB_H #include <digital/api.h> -#include <gr_sync_block.h> +#include <gnuradio/sync_block.h> #include <string> namespace gr { @@ -42,7 +42,7 @@ namespace gr { * key name [tag_name], specified in the constructor. Used for * searching an input data stream for preambles, etc. */ - class DIGITAL_API correlate_access_code_tag_bb : virtual public gr_sync_block + class DIGITAL_API correlate_access_code_tag_bb : virtual public sync_block { public: // gr::digital::correlate_access_code_tag_bb::sptr diff --git a/gr-digital/include/digital/costas_loop_cc.h b/gr-digital/include/digital/costas_loop_cc.h index 8ac0444cb8..555d5ad09f 100644 --- a/gr-digital/include/digital/costas_loop_cc.h +++ b/gr-digital/include/digital/costas_loop_cc.h @@ -24,8 +24,8 @@ #define INCLUDED_DIGITAL_COSTAS_LOOP_CC_H #include <digital/api.h> -#include <blocks/control_loop.h> -#include <gr_sync_block.h> +#include <gnuradio/blocks/control_loop.h> +#include <gnuradio/sync_block.h> namespace gr { namespace digital { @@ -56,7 +56,7 @@ namespace gr { * stream 2 is the normalized frequency of the loop */ class DIGITAL_API costas_loop_cc - : virtual public gr_sync_block, + : virtual public sync_block, virtual public blocks::control_loop { public: diff --git a/gr-digital/include/digital/cpmmod_bc.h b/gr-digital/include/digital/cpmmod_bc.h index 85fb0fae81..1597d5d7db 100644 --- a/gr-digital/include/digital/cpmmod_bc.h +++ b/gr-digital/include/digital/cpmmod_bc.h @@ -24,7 +24,7 @@ #define INCLUDED_DIGITAL_CPMMOD_BC_H #include <digital/api.h> -#include <gr_hier_block2.h> +#include <gnuradio/hier_block2.h> #include <analog/cpm.h> namespace gr { @@ -46,7 +46,7 @@ namespace gr { * The modulator will silently accept any other inputs, though. * The output is the phase-modulated signal. */ - class DIGITAL_API cpmmod_bc : virtual public gr_hier_block2 + class DIGITAL_API cpmmod_bc : virtual public hier_block2 { public: // gr::digital::cpmmod_bc::sptr diff --git a/gr-digital/include/digital/crc32.h b/gr-digital/include/digital/crc32.h index 180719bf73..a10960084d 100644 --- a/gr-digital/include/digital/crc32.h +++ b/gr-digital/include/digital/crc32.h @@ -25,7 +25,7 @@ #include <digital/api.h> #include <string> -#include <gr_types.h> +#include <gnuradio/types.h> namespace gr { namespace digital { diff --git a/gr-digital/include/digital/crc32_bb.h b/gr-digital/include/digital/crc32_bb.h index 52f056c716..8b44e79efa 100644 --- a/gr-digital/include/digital/crc32_bb.h +++ b/gr-digital/include/digital/crc32_bb.h @@ -25,7 +25,7 @@ #define INCLUDED_DIGITAL_CRC32_BB_H #include <digital/api.h> -#include <gr_tagged_stream_block.h> +#include <gnuradio/tagged_stream_block.h> namespace gr { namespace digital { @@ -42,7 +42,7 @@ namespace gr { * Output: The same bytes as incoming, but trailing a CRC32 of the packet. * The tag is re-set to the new length. */ - class DIGITAL_API crc32_bb : virtual public gr_tagged_stream_block + class DIGITAL_API crc32_bb : virtual public tagged_stream_block { public: typedef boost::shared_ptr<crc32_bb> sptr; diff --git a/gr-digital/include/digital/descrambler_bb.h b/gr-digital/include/digital/descrambler_bb.h index 9fa1d68425..5494f3fac1 100644 --- a/gr-digital/include/digital/descrambler_bb.h +++ b/gr-digital/include/digital/descrambler_bb.h @@ -24,7 +24,7 @@ #define INCLUDED_GR_DESCRAMBLER_BB_H #include <digital/api.h> -#include <gr_sync_block.h> +#include <gnuradio/sync_block.h> namespace gr { namespace digital { @@ -38,7 +38,7 @@ namespace gr { * the LSB only of the input data stream, i.e., on an "unpacked * binary" stream, and produces the same format on its output. */ - class DIGITAL_API descrambler_bb : virtual public gr_sync_block + class DIGITAL_API descrambler_bb : virtual public sync_block { public: // gr::digital::descrambler_bb::sptr diff --git a/gr-digital/include/digital/diff_decoder_bb.h b/gr-digital/include/digital/diff_decoder_bb.h index 0b28b2a553..bb1b254f27 100644 --- a/gr-digital/include/digital/diff_decoder_bb.h +++ b/gr-digital/include/digital/diff_decoder_bb.h @@ -24,7 +24,7 @@ #define INCLUDED_GR_DIFF_DECODER_BB_H #include <digital/api.h> -#include <gr_sync_block.h> +#include <gnuradio/sync_block.h> namespace gr { namespace digital { @@ -37,7 +37,7 @@ namespace gr { * Uses current and previous symbols and the alphabet modulus to * perform differential decoding. */ - class DIGITAL_API diff_decoder_bb : virtual public gr_sync_block + class DIGITAL_API diff_decoder_bb : virtual public sync_block { public: // gr::digital::diff_decoder_bb::sptr diff --git a/gr-digital/include/digital/diff_encoder_bb.h b/gr-digital/include/digital/diff_encoder_bb.h index ef9d0970a0..20ef12dae6 100644 --- a/gr-digital/include/digital/diff_encoder_bb.h +++ b/gr-digital/include/digital/diff_encoder_bb.h @@ -24,7 +24,7 @@ #define INCLUDED_GR_DIFF_ENCODER_BB_H #include <digital/api.h> -#include <gr_sync_block.h> +#include <gnuradio/sync_block.h> namespace gr { namespace digital { @@ -37,7 +37,7 @@ namespace gr { * Uses current and previous symbols and the alphabet modulus to * perform differential encoding. */ - class DIGITAL_API diff_encoder_bb : virtual public gr_sync_block + class DIGITAL_API diff_encoder_bb : virtual public sync_block { public: // gr::digital::diff_encoder_bb::sptr diff --git a/gr-digital/include/digital/diff_phasor_cc.h b/gr-digital/include/digital/diff_phasor_cc.h index e2bf2bce59..803f025ce0 100644 --- a/gr-digital/include/digital/diff_phasor_cc.h +++ b/gr-digital/include/digital/diff_phasor_cc.h @@ -24,7 +24,7 @@ #define INCLUDED_GR_DIFF_PHASOR_CC_H #include <digital/api.h> -#include <gr_sync_block.h> +#include <gnuradio/sync_block.h> namespace gr { namespace digital { @@ -39,7 +39,7 @@ namespace gr { * * out[i] = in[i] * conj(in[i-1]); */ - class DIGITAL_API diff_phasor_cc : virtual public gr_sync_block + class DIGITAL_API diff_phasor_cc : virtual public sync_block { public: // gr::digital::diff_phasor_cc::sptr diff --git a/gr-digital/include/digital/fll_band_edge_cc.h b/gr-digital/include/digital/fll_band_edge_cc.h index 0bf3471112..9802f825b1 100644 --- a/gr-digital/include/digital/fll_band_edge_cc.h +++ b/gr-digital/include/digital/fll_band_edge_cc.h @@ -24,8 +24,8 @@ #define INCLUDED_DIGITAL_FLL_BAND_EDGE_CC_H #include <digital/api.h> -#include <gr_sync_block.h> -#include <blocks/control_loop.h> +#include <gnuradio/sync_block.h> +#include <gnuradio/blocks/control_loop.h> namespace gr { namespace digital { @@ -81,7 +81,7 @@ namespace gr { * large. */ class DIGITAL_API fll_band_edge_cc - : virtual public gr_sync_block, + : virtual public sync_block, virtual public blocks::control_loop { public: diff --git a/gr-digital/include/digital/framer_sink_1.h b/gr-digital/include/digital/framer_sink_1.h index b562778704..e317ada5bd 100644 --- a/gr-digital/include/digital/framer_sink_1.h +++ b/gr-digital/include/digital/framer_sink_1.h @@ -24,8 +24,8 @@ #define INCLUDED_GR_FRAMER_SINK_1_H #include <digital/api.h> -#include <gr_sync_block.h> -#include <gr_msg_queue.h> +#include <gnuradio/sync_block.h> +#include <gnuradio/msg_queue.h> namespace gr { namespace digital { @@ -48,7 +48,7 @@ namespace gr { * the corresponding bit is the the first bit of the packet. That * is, this bit is the first one after the access code. */ - class DIGITAL_API framer_sink_1 : virtual public gr_sync_block + class DIGITAL_API framer_sink_1 : virtual public sync_block { public: // gr::digital::framer_sink_1::sptr @@ -59,7 +59,7 @@ namespace gr { * * \param target_queue The message queue where frames go. */ - static sptr make(gr_msg_queue_sptr target_queue); + static sptr make(msg_queue::sptr target_queue); }; } /* namespace digital */ diff --git a/gr-digital/include/digital/glfsr_source_b.h b/gr-digital/include/digital/glfsr_source_b.h index 7fefb747aa..1a08b5a328 100644 --- a/gr-digital/include/digital/glfsr_source_b.h +++ b/gr-digital/include/digital/glfsr_source_b.h @@ -24,7 +24,7 @@ #define INCLUDED_GR_GLFSR_SOURCE_B_H #include <digital/api.h> -#include <gr_sync_block.h> +#include <gnuradio/sync_block.h> namespace gr { namespace digital { @@ -33,7 +33,7 @@ namespace gr { * \brief Galois LFSR pseudo-random source * \ingroup waveform_generators_blk */ - class DIGITAL_API glfsr_source_b : virtual public gr_sync_block + class DIGITAL_API glfsr_source_b : virtual public sync_block { public: // gr::digital::glfsr_source_b::sptr diff --git a/gr-digital/include/digital/glfsr_source_f.h b/gr-digital/include/digital/glfsr_source_f.h index e591498d8c..bf840dc3b2 100644 --- a/gr-digital/include/digital/glfsr_source_f.h +++ b/gr-digital/include/digital/glfsr_source_f.h @@ -24,7 +24,7 @@ #define INCLUDED_GR_GLFSR_SOURCE_F_H #include <digital/api.h> -#include <gr_sync_block.h> +#include <gnuradio/sync_block.h> namespace gr { namespace digital { @@ -33,7 +33,7 @@ namespace gr { * \brief Galois LFSR pseudo-random source generating float outputs -1.0 - 1.0. * \ingroup waveform_generators_blk */ - class DIGITAL_API glfsr_source_f : virtual public gr_sync_block + class DIGITAL_API glfsr_source_f : virtual public sync_block { public: // gr::digital::glfsr_source_f::sptr diff --git a/gr-digital/include/digital/header_payload_demux.h b/gr-digital/include/digital/header_payload_demux.h index 1427062d77..da703fb5fb 100644 --- a/gr-digital/include/digital/header_payload_demux.h +++ b/gr-digital/include/digital/header_payload_demux.h @@ -23,7 +23,7 @@ #define INCLUDED_DIGITAL_HEADER_PAYLOAD_DEMUX_H #include <digital/api.h> -#include <gr_block.h> +#include <gnuradio/block.h> namespace gr { namespace digital { @@ -59,7 +59,7 @@ namespace gr { * A special case are tags on items that make up the guard interval. These are copied * to the first item of the following symbol. */ - class DIGITAL_API header_payload_demux : virtual public gr_block + class DIGITAL_API header_payload_demux : virtual public block { public: typedef boost::shared_ptr<header_payload_demux> sptr; diff --git a/gr-digital/include/digital/kurtotic_equalizer_cc.h b/gr-digital/include/digital/kurtotic_equalizer_cc.h index be8c5f5cc2..e15e962776 100644 --- a/gr-digital/include/digital/kurtotic_equalizer_cc.h +++ b/gr-digital/include/digital/kurtotic_equalizer_cc.h @@ -24,7 +24,7 @@ #define INCLUDED_DIGITAL_KURTOTIC_EQUALIZER_CC_H #include <digital/api.h> -#include <gr_sync_decimator.h> +#include <gnuradio/sync_decimator.h> namespace gr { namespace digital { @@ -41,7 +41,7 @@ namespace gr { * Robotics and Vision, Vol. 3, Dec. 2004, pp. 2052 - 2057." */ class DIGITAL_API kurtotic_equalizer_cc : - virtual public gr_sync_decimator + virtual public sync_decimator { protected: virtual gr_complex error(const gr_complex &out) = 0; diff --git a/gr-digital/include/digital/lms_dd_equalizer_cc.h b/gr-digital/include/digital/lms_dd_equalizer_cc.h index 7286c9ad3c..ca8d882358 100644 --- a/gr-digital/include/digital/lms_dd_equalizer_cc.h +++ b/gr-digital/include/digital/lms_dd_equalizer_cc.h @@ -24,7 +24,7 @@ #define INCLUDED_DIGITAL_LMS_DD_EQUALIZER_CC_H #include <digital/api.h> -#include <gr_sync_decimator.h> +#include <gnuradio/sync_decimator.h> #include <digital/constellation.h> namespace gr { @@ -65,7 +65,7 @@ namespace gr { * Prentice Hall, 1996. */ class DIGITAL_API lms_dd_equalizer_cc : - virtual public gr_sync_decimator + virtual public sync_decimator { protected: virtual gr_complex error(const gr_complex &out) = 0; diff --git a/gr-digital/include/digital/map_bb.h b/gr-digital/include/digital/map_bb.h index 0a55a61213..4ad04b95cb 100644 --- a/gr-digital/include/digital/map_bb.h +++ b/gr-digital/include/digital/map_bb.h @@ -24,7 +24,7 @@ #define INCLUDED_GR_MAP_BB_H #include <digital/api.h> -#include <gr_sync_block.h> +#include <gnuradio/sync_block.h> namespace gr { namespace digital { @@ -40,7 +40,7 @@ namespace gr { * * -> output[i] = map[input[i]] */ - class DIGITAL_API map_bb : virtual public gr_sync_block + class DIGITAL_API map_bb : virtual public sync_block { public: // gr::digital::map_bb::sptr diff --git a/gr-digital/include/digital/mpsk_receiver_cc.h b/gr-digital/include/digital/mpsk_receiver_cc.h index 68874d178e..fcf4030978 100644 --- a/gr-digital/include/digital/mpsk_receiver_cc.h +++ b/gr-digital/include/digital/mpsk_receiver_cc.h @@ -24,7 +24,7 @@ #define INCLUDED_DIGITAL_MPSK_RECEIVER_CC_H #include <digital/api.h> -#include <gr_block.h> +#include <gnuradio/block.h> namespace gr { namespace digital { @@ -65,7 +65,7 @@ namespace gr { * self-noise. * */ - class DIGITAL_API mpsk_receiver_cc : virtual public gr_block + class DIGITAL_API mpsk_receiver_cc : virtual public block { public: // gr::digital::mpsk_receiver_cc::sptr diff --git a/gr-digital/include/digital/mpsk_snr_est.h b/gr-digital/include/digital/mpsk_snr_est.h index f9edcbd05a..30c20e755e 100644 --- a/gr-digital/include/digital/mpsk_snr_est.h +++ b/gr-digital/include/digital/mpsk_snr_est.h @@ -24,7 +24,7 @@ #define INCLUDED_DIGITAL_MPSK_SNR_EST_H #include <digital/api.h> -#include <gr_complex.h> +#include <gnuradio/gr_complex.h> namespace gr { namespace digital { diff --git a/gr-digital/include/digital/mpsk_snr_est_cc.h b/gr-digital/include/digital/mpsk_snr_est_cc.h index 14e8ca3b20..45acda5764 100644 --- a/gr-digital/include/digital/mpsk_snr_est_cc.h +++ b/gr-digital/include/digital/mpsk_snr_est_cc.h @@ -25,7 +25,7 @@ #include <digital/api.h> #include <digital/mpsk_snr_est.h> -#include <gr_sync_block.h> +#include <gnuradio/sync_block.h> namespace gr { namespace digital { @@ -49,7 +49,7 @@ namespace gr { * amount of error should be assumed and/or estimated for real * channel conditions. */ - class DIGITAL_API mpsk_snr_est_cc : virtual public gr_sync_block + class DIGITAL_API mpsk_snr_est_cc : virtual public sync_block { public: // gr::digital::mpsk_snr_est_cc::sptr diff --git a/gr-digital/include/digital/ofdm_carrier_allocator_cvc.h b/gr-digital/include/digital/ofdm_carrier_allocator_cvc.h index 2eaeb75611..9ada039b31 100644 --- a/gr-digital/include/digital/ofdm_carrier_allocator_cvc.h +++ b/gr-digital/include/digital/ofdm_carrier_allocator_cvc.h @@ -25,7 +25,7 @@ #define INCLUDED_DIGITAL_OFDM_CARRIER_ALLOCATOR_CVC_H #include <digital/api.h> -#include <gr_tagged_stream_block.h> +#include <gnuradio/tagged_stream_block.h> namespace gr { namespace digital { @@ -57,7 +57,7 @@ namespace gr { * \p fft_len-1 both identify the carrier below the DC carrier. * */ - class DIGITAL_API ofdm_carrier_allocator_cvc : virtual public gr_tagged_stream_block + class DIGITAL_API ofdm_carrier_allocator_cvc : virtual public tagged_stream_block { public: typedef boost::shared_ptr<ofdm_carrier_allocator_cvc> sptr; diff --git a/gr-digital/include/digital/ofdm_chanest_vcvc.h b/gr-digital/include/digital/ofdm_chanest_vcvc.h index 0607743d57..cfea140a9b 100644 --- a/gr-digital/include/digital/ofdm_chanest_vcvc.h +++ b/gr-digital/include/digital/ofdm_chanest_vcvc.h @@ -24,7 +24,7 @@ #define INCLUDED_DIGITAL_OFDM_CHANEST_VCVC_H #include <digital/api.h> -#include <gr_block.h> +#include <gnuradio/block.h> namespace gr { namespace digital { @@ -53,7 +53,7 @@ namespace gr { * Communications, IEEE Transactions on, 1997. * [2] K.D. Kammeyer, "Nachrichtenuebertragung," Chapter. 16.3.2. */ - class DIGITAL_API ofdm_chanest_vcvc : virtual public gr_block + class DIGITAL_API ofdm_chanest_vcvc : virtual public block { public: typedef boost::shared_ptr<ofdm_chanest_vcvc> sptr; diff --git a/gr-digital/include/digital/ofdm_cyclic_prefixer.h b/gr-digital/include/digital/ofdm_cyclic_prefixer.h index f8e45edd90..e924adb92d 100644 --- a/gr-digital/include/digital/ofdm_cyclic_prefixer.h +++ b/gr-digital/include/digital/ofdm_cyclic_prefixer.h @@ -24,7 +24,7 @@ #define INCLUDED_DIGITAL_OFDM_CYCLIC_PREFIXER_H #include <digital/api.h> -#include <gr_tagged_stream_block.h> +#include <gnuradio/tagged_stream_block.h> namespace gr { namespace digital { @@ -46,7 +46,7 @@ namespace gr { * * The pulse shape is a raised cosine in the time domain. */ - class DIGITAL_API ofdm_cyclic_prefixer : virtual public gr_tagged_stream_block + class DIGITAL_API ofdm_cyclic_prefixer : virtual public tagged_stream_block { public: typedef boost::shared_ptr<ofdm_cyclic_prefixer> sptr; diff --git a/gr-digital/include/digital/ofdm_equalizer_base.h b/gr-digital/include/digital/ofdm_equalizer_base.h index 4e3a88d589..a0b9c76673 100644 --- a/gr-digital/include/digital/ofdm_equalizer_base.h +++ b/gr-digital/include/digital/ofdm_equalizer_base.h @@ -23,8 +23,8 @@ #define INCLUDED_DIGITAL_OFDM_EQUALIZER_BASE_H #include <digital/api.h> -#include <gr_tags.h> -#include <gr_complex.h> +#include <gnuradio/tags.h> +#include <gnuradio/gr_complex.h> #include <boost/enable_shared_from_this.hpp> namespace gr { @@ -55,7 +55,7 @@ namespace gr { gr_complex *frame, int n_sym, const std::vector<gr_complex> &initial_taps = std::vector<gr_complex>(), - const std::vector<gr_tag_t> &tags = std::vector<gr_tag_t>()) = 0; + const std::vector<tag_t> &tags = std::vector<tag_t>()) = 0; //! Return the current channel state virtual void get_channel_state(std::vector<gr_complex> &taps) = 0; int fft_len() { return d_fft_len; }; diff --git a/gr-digital/include/digital/ofdm_equalizer_simpledfe.h b/gr-digital/include/digital/ofdm_equalizer_simpledfe.h index 7bf6950965..b81f3c7022 100644 --- a/gr-digital/include/digital/ofdm_equalizer_simpledfe.h +++ b/gr-digital/include/digital/ofdm_equalizer_simpledfe.h @@ -80,7 +80,7 @@ namespace gr { void equalize(gr_complex *frame, int n_sym, const std::vector<gr_complex> &initial_taps = std::vector<gr_complex>(), - const std::vector<gr_tag_t> &tags = std::vector<gr_tag_t>()); + const std::vector<tag_t> &tags = std::vector<tag_t>()); /* * \param fft_len FFT length diff --git a/gr-digital/include/digital/ofdm_equalizer_static.h b/gr-digital/include/digital/ofdm_equalizer_static.h index 6507479f4b..3856871c99 100644 --- a/gr-digital/include/digital/ofdm_equalizer_static.h +++ b/gr-digital/include/digital/ofdm_equalizer_static.h @@ -67,7 +67,7 @@ namespace gr { void equalize(gr_complex *frame, int n_sym, const std::vector<gr_complex> &initial_taps = std::vector<gr_complex>(), - const std::vector<gr_tag_t> &tags = std::vector<gr_tag_t>()); + const std::vector<tag_t> &tags = std::vector<tag_t>()); /* * \param fft_len FFT length diff --git a/gr-digital/include/digital/ofdm_frame_acquisition.h b/gr-digital/include/digital/ofdm_frame_acquisition.h index b8f8ff7662..cf2ae27e21 100644 --- a/gr-digital/include/digital/ofdm_frame_acquisition.h +++ b/gr-digital/include/digital/ofdm_frame_acquisition.h @@ -24,7 +24,7 @@ #define INCLUDED_DIGITAL_OFDM_FRAME_ACQUISITION_H #include <digital/api.h> -#include <gr_block.h> +#include <gnuradio/block.h> #include <vector> namespace gr { @@ -49,7 +49,7 @@ namespace gr { * equalization on all subcarriers. This corrects for the phase * and amplitude distortion caused by the channel. */ - class DIGITAL_API ofdm_frame_acquisition : virtual public gr_block + class DIGITAL_API ofdm_frame_acquisition : virtual public block { public: // gr::digital::ofdm_frame_acquisition::sptr diff --git a/gr-digital/include/digital/ofdm_frame_equalizer_vcvc.h b/gr-digital/include/digital/ofdm_frame_equalizer_vcvc.h index f8e15fb577..e0ecb6a004 100644 --- a/gr-digital/include/digital/ofdm_frame_equalizer_vcvc.h +++ b/gr-digital/include/digital/ofdm_frame_equalizer_vcvc.h @@ -24,7 +24,7 @@ #include <digital/api.h> #include <digital/ofdm_equalizer_base.h> -#include <gr_tagged_stream_block.h> +#include <gnuradio/tagged_stream_block.h> namespace gr { namespace digital { @@ -38,7 +38,7 @@ namespace gr { * Input: a tagged series of OFDM symbols. * Output: The same as the input, but equalized. */ - class DIGITAL_API ofdm_frame_equalizer_vcvc : virtual public gr_tagged_stream_block + class DIGITAL_API ofdm_frame_equalizer_vcvc : virtual public tagged_stream_block { public: typedef boost::shared_ptr<ofdm_frame_equalizer_vcvc> sptr; diff --git a/gr-digital/include/digital/ofdm_frame_sink.h b/gr-digital/include/digital/ofdm_frame_sink.h index ff31bad919..9408578554 100644 --- a/gr-digital/include/digital/ofdm_frame_sink.h +++ b/gr-digital/include/digital/ofdm_frame_sink.h @@ -24,8 +24,8 @@ #define INCLUDED_DIGITAL_OFDM_FRAME_SINK_H #include <digital/api.h> -#include <gr_sync_block.h> -#include <gr_msg_queue.h> +#include <gnuradio/sync_block.h> +#include <gnuradio/msg_queue.h> namespace gr { namespace digital { @@ -42,7 +42,7 @@ namespace gr { * reference to an object to do the demapping and slicing for a * given modulation type. */ - class DIGITAL_API ofdm_frame_sink : virtual public gr_sync_block + class DIGITAL_API ofdm_frame_sink : virtual public sync_block { public: // gr::digital::ofdm_frame_sink::sptr @@ -60,7 +60,7 @@ namespace gr { */ static sptr make(const std::vector<gr_complex> &sym_position, const std::vector<char> &sym_value_out, - gr_msg_queue_sptr target_queue, + msg_queue::sptr target_queue, int occupied_tones, float phase_gain=0.25, float freq_gain=0.25*0.25/4); }; diff --git a/gr-digital/include/digital/ofdm_insert_preamble.h b/gr-digital/include/digital/ofdm_insert_preamble.h index a9ad61e1d0..8abe4772b7 100644 --- a/gr-digital/include/digital/ofdm_insert_preamble.h +++ b/gr-digital/include/digital/ofdm_insert_preamble.h @@ -23,7 +23,7 @@ #define INCLUDED_DIGITAL_OFDM_INSERT_PREAMBLE_H #include <digital/api.h> -#include <gr_block.h> +#include <gnuradio/block.h> #include <vector> namespace gr { @@ -55,7 +55,7 @@ namespace gr { * symbol is the first symbol, otherwise 0. * </pre> */ - class DIGITAL_API ofdm_insert_preamble : virtual public gr_block + class DIGITAL_API ofdm_insert_preamble : virtual public block { public: // gr::digital::ofdm_insert_preamble::sptr diff --git a/gr-digital/include/digital/ofdm_mapper_bcv.h b/gr-digital/include/digital/ofdm_mapper_bcv.h index 49ae9adc92..9719ab3e86 100644 --- a/gr-digital/include/digital/ofdm_mapper_bcv.h +++ b/gr-digital/include/digital/ofdm_mapper_bcv.h @@ -24,8 +24,8 @@ #define INCLUDED_DIGITAL_OFDM_MAPPER_BCV_H #include <digital/api.h> -#include <gr_sync_block.h> -#include <gr_msg_queue.h> +#include <gnuradio/sync_block.h> +#include <gnuradio/msg_queue.h> namespace gr { namespace digital { @@ -39,7 +39,7 @@ namespace gr { * \details * Abstract class must be subclassed with specific mapping. */ - class DIGITAL_API ofdm_mapper_bcv : virtual public gr_sync_block + class DIGITAL_API ofdm_mapper_bcv : virtual public sync_block { public: // gr::digital::ofdm_mapper_bcv::sptr @@ -58,7 +58,7 @@ namespace gr { unsigned occupied_carriers, unsigned int fft_length); - virtual gr_msg_queue_sptr msgq() const = 0; + virtual msg_queue::sptr msgq() const = 0; }; } /* namespace digital */ diff --git a/gr-digital/include/digital/ofdm_sampler.h b/gr-digital/include/digital/ofdm_sampler.h index 5df16be3e4..10c43c28ef 100644 --- a/gr-digital/include/digital/ofdm_sampler.h +++ b/gr-digital/include/digital/ofdm_sampler.h @@ -24,7 +24,7 @@ #define INCLUDED_DIGITAL_OFDM_SAMPLER_H #include <digital/api.h> -#include <gr_sync_block.h> +#include <gnuradio/sync_block.h> namespace gr { namespace digital { @@ -33,7 +33,7 @@ namespace gr { * \brief does the rest of the OFDM stuff * \ingroup ofdm_blk */ - class DIGITAL_API ofdm_sampler : virtual public gr_block + class DIGITAL_API ofdm_sampler : virtual public block { public: // gr::digital::ofdm_sampler::sptr diff --git a/gr-digital/include/digital/ofdm_serializer_vcc.h b/gr-digital/include/digital/ofdm_serializer_vcc.h index f02b0f85bb..6210821699 100644 --- a/gr-digital/include/digital/ofdm_serializer_vcc.h +++ b/gr-digital/include/digital/ofdm_serializer_vcc.h @@ -23,7 +23,7 @@ #define INCLUDED_DIGITAL_OFDM_SERIALIZER_VCC_H #include <digital/api.h> -#include <gr_tagged_stream_block.h> +#include <gnuradio/tagged_stream_block.h> #include <digital/ofdm_carrier_allocator_cvc.h> namespace gr { @@ -49,7 +49,7 @@ namespace gr { * Input: Complex vectors of length \p fft_len * Output: Complex scalars, in the same order as specified in occupied_carriers. */ - class DIGITAL_API ofdm_serializer_vcc : virtual public gr_tagged_stream_block + class DIGITAL_API ofdm_serializer_vcc : virtual public tagged_stream_block { public: typedef boost::shared_ptr<ofdm_serializer_vcc> sptr; diff --git a/gr-digital/include/digital/ofdm_sync_sc_cfb.h b/gr-digital/include/digital/ofdm_sync_sc_cfb.h index 84f3e704a3..db01e14dc7 100644 --- a/gr-digital/include/digital/ofdm_sync_sc_cfb.h +++ b/gr-digital/include/digital/ofdm_sync_sc_cfb.h @@ -25,7 +25,7 @@ #define INCLUDED_DIGITAL_OFDM_SYNC_SC_CFB_H #include <digital/api.h> -#include <gr_hier_block2.h> +#include <gnuradio/hier_block2.h> namespace gr { namespace digital { @@ -61,7 +61,7 @@ namespace gr { * [1] Schmidl, T.M. and Cox, D.C., "Robust frequency and timing synchronization for OFDM", * Communications, IEEE Transactions on, 1997. */ - class DIGITAL_API ofdm_sync_sc_cfb : virtual public gr_hier_block2 + class DIGITAL_API ofdm_sync_sc_cfb : virtual public hier_block2 { public: typedef boost::shared_ptr<ofdm_sync_sc_cfb> sptr; diff --git a/gr-digital/include/digital/packet_header_default.h b/gr-digital/include/digital/packet_header_default.h index e4c994593f..0e619c9a95 100644 --- a/gr-digital/include/digital/packet_header_default.h +++ b/gr-digital/include/digital/packet_header_default.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_DIGITAL_PACKET_HEADER_DEFAULT_H #define INCLUDED_DIGITAL_PACKET_HEADER_DEFAULT_H -#include <gr_tags.h> +#include <gnuradio/tags.h> #include <digital/api.h> #include <boost/enable_shared_from_this.hpp> @@ -79,7 +79,7 @@ namespace gr { virtual bool header_formatter( long packet_len, unsigned char *out, - const std::vector<gr_tag_t> &tags=std::vector<gr_tag_t>() + const std::vector<tag_t> &tags=std::vector<tag_t>() ); /*! @@ -89,7 +89,7 @@ namespace gr { */ virtual bool header_parser( const unsigned char *header, - std::vector<gr_tag_t> &tags); + std::vector<tag_t> &tags); static sptr make( long header_len, diff --git a/gr-digital/include/digital/packet_header_ofdm.h b/gr-digital/include/digital/packet_header_ofdm.h index 30d6a953cd..734c04692a 100644 --- a/gr-digital/include/digital/packet_header_ofdm.h +++ b/gr-digital/include/digital/packet_header_ofdm.h @@ -60,7 +60,7 @@ namespace gr { */ bool header_parser( const unsigned char *header, - std::vector<gr_tag_t> &tags); + std::vector<tag_t> &tags); /*! * \param occupied_carriers See carrier allocator diff --git a/gr-digital/include/digital/packet_headergenerator_bb.h b/gr-digital/include/digital/packet_headergenerator_bb.h index 426f49dee5..52e260f446 100644 --- a/gr-digital/include/digital/packet_headergenerator_bb.h +++ b/gr-digital/include/digital/packet_headergenerator_bb.h @@ -23,7 +23,7 @@ #define INCLUDED_PACKET_HEADERGENERATOR_BB_H #include <digital/api.h> -#include <gr_tagged_stream_block.h> +#include <gnuradio/tagged_stream_block.h> #include <digital/packet_header_default.h> namespace gr { @@ -41,7 +41,7 @@ namespace gr { * or a subclass thereof). If only a number of bits is specified, a * default header is generated (see packet_header_default). */ - class DIGITAL_API packet_headergenerator_bb : virtual public gr_tagged_stream_block + class DIGITAL_API packet_headergenerator_bb : virtual public tagged_stream_block { public: typedef boost::shared_ptr<packet_headergenerator_bb> sptr; diff --git a/gr-digital/include/digital/packet_headerparser_b.h b/gr-digital/include/digital/packet_headerparser_b.h index cdf76f1209..a387cd7282 100644 --- a/gr-digital/include/digital/packet_headerparser_b.h +++ b/gr-digital/include/digital/packet_headerparser_b.h @@ -23,7 +23,7 @@ #define INCLUDED_DIGITAL_PACKET_HEADERPARSER_B_H #include <digital/api.h> -#include <gr_sync_block.h> +#include <gnuradio/sync_block.h> #include <digital/packet_header_default.h> namespace gr { @@ -46,7 +46,7 @@ namespace gr { * If only a header length is given, this block uses the default header * format. */ - class DIGITAL_API packet_headerparser_b : virtual public gr_sync_block + class DIGITAL_API packet_headerparser_b : virtual public sync_block { public: typedef boost::shared_ptr<packet_headerparser_b> sptr; diff --git a/gr-digital/include/digital/packet_sink.h b/gr-digital/include/digital/packet_sink.h index 42f826535f..41992d98eb 100644 --- a/gr-digital/include/digital/packet_sink.h +++ b/gr-digital/include/digital/packet_sink.h @@ -24,8 +24,8 @@ #define INCLUDED_GR_PACKET_SINK_H #include <digital/api.h> -#include <gr_sync_block.h> -#include <gr_msg_queue.h> +#include <gnuradio/sync_block.h> +#include <gnuradio/msg_queue.h> namespace gr { namespace digital { @@ -53,7 +53,7 @@ namespace gr { * generally be replaced with a correlate access code and frame * sink blocks. */ - class DIGITAL_API packet_sink : virtual public gr_sync_block + class DIGITAL_API packet_sink : virtual public sync_block { public: // gr::digital::packet_sink::sptr @@ -67,7 +67,7 @@ namespace gr { * \param threshold Number of bits that can be incorrect in the \p sync_vector. */ static sptr make(const std::vector<unsigned char>& sync_vector, - gr_msg_queue_sptr target_queue, + msg_queue::sptr target_queue, int threshold=-1); //! return true if we detect carrier diff --git a/gr-digital/include/digital/pfb_clock_sync_ccf.h b/gr-digital/include/digital/pfb_clock_sync_ccf.h index 2cdb55ca4a..29da5dff48 100644 --- a/gr-digital/include/digital/pfb_clock_sync_ccf.h +++ b/gr-digital/include/digital/pfb_clock_sync_ccf.h @@ -26,7 +26,7 @@ #include <digital/api.h> #include <filter/fir_filter.h> -#include <gr_block.h> +#include <gnuradio/block.h> namespace gr { namespace digital { @@ -146,7 +146,7 @@ namespace gr { * was added to better work with equalizers, which do a better job * of modeling the channel if they have 2 samps/sym. */ - class DIGITAL_API pfb_clock_sync_ccf : virtual public gr_block + class DIGITAL_API pfb_clock_sync_ccf : virtual public block { public: // gr::digital::pfb_clock_sync_ccf::sptr diff --git a/gr-digital/include/digital/pfb_clock_sync_fff.h b/gr-digital/include/digital/pfb_clock_sync_fff.h index f0fc6df314..8c18a1788a 100644 --- a/gr-digital/include/digital/pfb_clock_sync_fff.h +++ b/gr-digital/include/digital/pfb_clock_sync_fff.h @@ -25,7 +25,7 @@ #include <digital/api.h> #include <filter/fir_filter.h> -#include <gr_block.h> +#include <gnuradio/block.h> namespace gr { namespace digital { @@ -145,7 +145,7 @@ namespace gr { * was added to better work with equalizers, which do a better job * of modeling the channel if they have 2 samps/sym. */ - class DIGITAL_API pfb_clock_sync_fff : virtual public gr_block + class DIGITAL_API pfb_clock_sync_fff : virtual public block { public: // gr::digital::pfb_clock_sync_fff::sptr diff --git a/gr-digital/include/digital/pn_correlator_cc.h b/gr-digital/include/digital/pn_correlator_cc.h index 147983f892..ae3ebe9ef4 100644 --- a/gr-digital/include/digital/pn_correlator_cc.h +++ b/gr-digital/include/digital/pn_correlator_cc.h @@ -24,7 +24,7 @@ #define INCLUDED_GR_PN_CORRELATOR_CC_H #include <digital/api.h> -#include <gr_sync_decimator.h> +#include <gnuradio/sync_decimator.h> namespace gr { namespace digital { @@ -38,7 +38,7 @@ namespace gr { * against reference PN code, one sample per PN code period. The * PN sequence is generated using a GLFSR. */ - class DIGITAL_API pn_correlator_cc : virtual public gr_sync_decimator + class DIGITAL_API pn_correlator_cc : virtual public sync_decimator { public: // gr::digital::pn_correlator_cc::sptr diff --git a/gr-digital/include/digital/probe_density_b.h b/gr-digital/include/digital/probe_density_b.h index b0343d2cfb..f2ed8f9441 100644 --- a/gr-digital/include/digital/probe_density_b.h +++ b/gr-digital/include/digital/probe_density_b.h @@ -22,7 +22,7 @@ #define INCLUDED_GR_PROBE_DENSITY_B_H #include <digital/api.h> -#include <gr_sync_block.h> +#include <gnuradio/sync_block.h> namespace gr { namespace digital { @@ -37,7 +37,7 @@ namespace gr { * If you send this block a stream of unpacked bytes, it will tell * you what the bit density is. */ - class DIGITAL_API probe_density_b : virtual public gr_sync_block + class DIGITAL_API probe_density_b : virtual public sync_block { public: // gr::digital::probe_density_b::sptr diff --git a/gr-digital/include/digital/probe_mpsk_snr_est_c.h b/gr-digital/include/digital/probe_mpsk_snr_est_c.h index 289940cdd1..98a4bbcc2e 100644 --- a/gr-digital/include/digital/probe_mpsk_snr_est_c.h +++ b/gr-digital/include/digital/probe_mpsk_snr_est_c.h @@ -25,7 +25,7 @@ #include <digital/api.h> #include <digital/mpsk_snr_est.h> -#include <gr_sync_block.h> +#include <gnuradio/sync_block.h> namespace gr { namespace digital { @@ -46,7 +46,7 @@ namespace gr { * conditions; some amount of error should be assumed and/or * estimated for real channel conditions. */ - class DIGITAL_API probe_mpsk_snr_est_c : virtual public gr_sync_block + class DIGITAL_API probe_mpsk_snr_est_c : virtual public sync_block { public: // gr::digital::probe_mpsk_snr_est_c::sptr diff --git a/gr-digital/include/digital/scrambler_bb.h b/gr-digital/include/digital/scrambler_bb.h index 6360662dae..2c6b97571f 100644 --- a/gr-digital/include/digital/scrambler_bb.h +++ b/gr-digital/include/digital/scrambler_bb.h @@ -24,7 +24,7 @@ #define INCLUDED_GR_SCRAMBLER_BB_H #include <digital/api.h> -#include <gr_sync_block.h> +#include <gnuradio/sync_block.h> namespace gr { namespace digital { @@ -38,7 +38,7 @@ namespace gr { * i.e., on an "unpacked binary" stream, and produces the same * format on its output. */ - class DIGITAL_API scrambler_bb : virtual public gr_sync_block + class DIGITAL_API scrambler_bb : virtual public sync_block { public: // gr::digital::scrambler_bb::sptr diff --git a/gr-digital/include/digital/simple_correlator.h b/gr-digital/include/digital/simple_correlator.h index 5cb7ddc6ee..05863cbf35 100644 --- a/gr-digital/include/digital/simple_correlator.h +++ b/gr-digital/include/digital/simple_correlator.h @@ -24,7 +24,7 @@ #define INCLUDED_GR_SIMPLE_CORRELATOR_H #include <digital/api.h> -#include <gr_block.h> +#include <gnuradio/block.h> namespace gr { namespace digital { @@ -34,7 +34,7 @@ namespace gr { * \ingroup packet_operators_blk * \ingroup deprecated_blk */ - class DIGITAL_API simple_correlator : virtual public gr_block + class DIGITAL_API simple_correlator : virtual public block { public: // gr::digital::simple_correlator::sptr diff --git a/gr-digital/include/digital/simple_framer.h b/gr-digital/include/digital/simple_framer.h index 951e13d8f2..ad17e97d53 100644 --- a/gr-digital/include/digital/simple_framer.h +++ b/gr-digital/include/digital/simple_framer.h @@ -24,7 +24,7 @@ #define INCLUDED_GR_SIMPLE_FRAMER_H #include <digital/api.h> -#include <gr_block.h> +#include <gnuradio/block.h> namespace gr { namespace digital { @@ -39,7 +39,7 @@ namespace gr { * frame is prepended with the GRSF_SYNC (defind in * simple_framer_sync.h) and an 8-bit sequence number. */ - class DIGITAL_API simple_framer : virtual public gr_block + class DIGITAL_API simple_framer : virtual public block { public: // gr::digital::simple_framer::sptr diff --git a/gr-digital/lib/additive_scrambler_bb_impl.cc b/gr-digital/lib/additive_scrambler_bb_impl.cc index 8238f2d988..8f2229e6b6 100644 --- a/gr-digital/lib/additive_scrambler_bb_impl.cc +++ b/gr-digital/lib/additive_scrambler_bb_impl.cc @@ -25,7 +25,7 @@ #endif #include "additive_scrambler_bb_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace digital { @@ -41,9 +41,9 @@ namespace gr { int seed, int len, int count) - : gr_sync_block("additive_scrambler_bb", - gr_make_io_signature(1, 1, sizeof(unsigned char)), - gr_make_io_signature(1, 1, sizeof(unsigned char))), + : sync_block("additive_scrambler_bb", + io_signature::make(1, 1, sizeof(unsigned char)), + io_signature::make(1, 1, sizeof(unsigned char))), d_lfsr(mask, seed, len), d_count(count), d_bits(0), d_len(len), d_seed(seed) diff --git a/gr-digital/lib/binary_slicer_fb_impl.cc b/gr-digital/lib/binary_slicer_fb_impl.cc index f8a9cf22de..335e2e549a 100644 --- a/gr-digital/lib/binary_slicer_fb_impl.cc +++ b/gr-digital/lib/binary_slicer_fb_impl.cc @@ -25,8 +25,8 @@ #endif #include "binary_slicer_fb_impl.h" -#include <gr_io_signature.h> -#include <gr_math.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/math.h> namespace gr { namespace digital { @@ -37,9 +37,9 @@ namespace gr { } binary_slicer_fb_impl::binary_slicer_fb_impl() - : gr_sync_block("binary_slicer_fb", - gr_make_io_signature(1, 1, sizeof(float)), - gr_make_io_signature(1, 1, sizeof(unsigned char))) + : sync_block("binary_slicer_fb", + io_signature::make(1, 1, sizeof(float)), + io_signature::make(1, 1, sizeof(unsigned char))) { } @@ -56,7 +56,7 @@ namespace gr { unsigned char *out = (unsigned char *)output_items[0]; for(int i = 0; i < noutput_items; i++) { - out[i] = gr_binary_slicer(in[i]); + out[i] = gr::binary_slicer(in[i]); } return noutput_items; diff --git a/gr-digital/lib/chunks_to_symbols_XX_impl.cc.t b/gr-digital/lib/chunks_to_symbols_XX_impl.cc.t index 39eca32db6..3ecb8c17e5 100644 --- a/gr-digital/lib/chunks_to_symbols_XX_impl.cc.t +++ b/gr-digital/lib/chunks_to_symbols_XX_impl.cc.t @@ -27,7 +27,7 @@ #endif #include "@NAME@.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <assert.h> namespace gr { @@ -41,9 +41,9 @@ namespace gr { } @IMPL_NAME@::@IMPL_NAME@(const std::vector<@O_TYPE@> &symbol_table, const int D) - : gr_sync_interpolator("@BASE_NAME@", - gr_make_io_signature(1, -1, sizeof(@I_TYPE@)), - gr_make_io_signature(1, -1, sizeof(@O_TYPE@)), + : sync_interpolator("@BASE_NAME@", + io_signature::make(1, -1, sizeof(@I_TYPE@)), + io_signature::make(1, -1, sizeof(@O_TYPE@)), D), d_D(D), d_symbol_table(symbol_table) { diff --git a/gr-digital/lib/clock_recovery_mm_cc_impl.cc b/gr-digital/lib/clock_recovery_mm_cc_impl.cc index 168d9f7772..124b85efb6 100644 --- a/gr-digital/lib/clock_recovery_mm_cc_impl.cc +++ b/gr-digital/lib/clock_recovery_mm_cc_impl.cc @@ -25,9 +25,9 @@ #endif #include "clock_recovery_mm_cc_impl.h" -#include <gr_io_signature.h> -#include <gr_prefs.h> -#include <gr_math.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/prefs.h> +#include <gnuradio/math.h> #include <stdexcept> #include <iostream> @@ -50,13 +50,13 @@ namespace gr { clock_recovery_mm_cc_impl::clock_recovery_mm_cc_impl(float omega, float gain_omega, float mu, float gain_mu, float omega_relative_limit) - : gr_block("clock_recovery_mm_cc", - gr_make_io_signature(1, 1, sizeof(gr_complex)), - gr_make_io_signature2(1, 2, sizeof(gr_complex), sizeof(float))), + : block("clock_recovery_mm_cc", + io_signature::make(1, 1, sizeof(gr_complex)), + io_signature::make2(1, 2, sizeof(gr_complex), sizeof(float))), d_mu(mu), d_omega(omega), d_gain_omega(gain_omega), d_omega_relative_limit(omega_relative_limit), d_gain_mu(gain_mu), d_last_sample(0), d_interp(new filter::mmse_fir_interpolator_cc()), - d_verbose(gr_prefs::singleton()->get_bool("clock_recovery_mm_cc", "verbose", false)), + d_verbose(prefs::singleton()->get_bool("clock_recovery_mm_cc", "verbose", false)), d_p_2T(0), d_p_1T(0), d_p_0T(0), d_c_2T(0), d_c_1T(0), d_c_0T(0) { if(omega <= 0.0) @@ -147,9 +147,9 @@ namespace gr { out[oo++] = d_p_0T; // limit mm_val - mm_val = gr_branchless_clip(mm_val,4.0); + mm_val = gr::branchless_clip(mm_val,4.0); d_omega = d_omega + d_gain_omega * mm_val; - d_omega = d_omega_mid + gr_branchless_clip(d_omega-d_omega_mid, d_omega_relative_limit); + d_omega = d_omega_mid + gr::branchless_clip(d_omega-d_omega_mid, d_omega_relative_limit); d_mu = d_mu + d_omega + d_gain_mu * mm_val; ii += (int)floor(d_mu); @@ -180,10 +180,10 @@ namespace gr { out[oo++] = d_p_0T; // limit mm_val - mm_val = gr_branchless_clip(mm_val,1.0); + mm_val = gr::branchless_clip(mm_val,1.0); d_omega = d_omega + d_gain_omega * mm_val; - d_omega = d_omega_mid + gr_branchless_clip(d_omega-d_omega_mid, d_omega_relative_limit); + d_omega = d_omega_mid + gr::branchless_clip(d_omega-d_omega_mid, d_omega_relative_limit); d_mu = d_mu + d_omega + d_gain_mu * mm_val; ii += (int)floor(d_mu); diff --git a/gr-digital/lib/clock_recovery_mm_ff_impl.cc b/gr-digital/lib/clock_recovery_mm_ff_impl.cc index 4ac3e40c5d..6c16777ed7 100644 --- a/gr-digital/lib/clock_recovery_mm_ff_impl.cc +++ b/gr-digital/lib/clock_recovery_mm_ff_impl.cc @@ -25,8 +25,8 @@ #endif #include "clock_recovery_mm_ff_impl.h" -#include <gr_io_signature.h> -#include <gr_math.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/math.h> #include <stdexcept> namespace gr { @@ -46,9 +46,9 @@ namespace gr { clock_recovery_mm_ff_impl::clock_recovery_mm_ff_impl(float omega, float gain_omega, float mu, float gain_mu, float omega_relative_limit) - : gr_block("clock_recovery_mm_ff", - gr_make_io_signature(1, 1, sizeof(float)), - gr_make_io_signature(1, 1, sizeof(float))), + : block("clock_recovery_mm_ff", + io_signature::make(1, 1, sizeof(float)), + io_signature::make(1, 1, sizeof(float))), d_mu(mu), d_gain_mu(gain_mu), d_gain_omega(gain_omega), d_omega_relative_limit(omega_relative_limit), d_last_sample(0), d_interp(new filter::mmse_fir_interpolator_ff()) @@ -104,7 +104,7 @@ namespace gr { d_last_sample = out[oo]; d_omega = d_omega + d_gain_omega * mm_val; - d_omega = d_omega_mid + gr_branchless_clip(d_omega-d_omega_mid, d_omega_relative_limit); + d_omega = d_omega_mid + gr::branchless_clip(d_omega-d_omega_mid, d_omega_relative_limit); d_mu = d_mu + d_omega + d_gain_mu * mm_val; ii += (int)floor(d_mu); diff --git a/gr-digital/lib/cma_equalizer_cc_impl.cc b/gr-digital/lib/cma_equalizer_cc_impl.cc index e4e6c56466..6f11e617bb 100644 --- a/gr-digital/lib/cma_equalizer_cc_impl.cc +++ b/gr-digital/lib/cma_equalizer_cc_impl.cc @@ -25,7 +25,7 @@ #endif #include "cma_equalizer_cc_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace digital { @@ -41,9 +41,9 @@ namespace gr { cma_equalizer_cc_impl::cma_equalizer_cc_impl(int num_taps, float modulus, float mu, int sps) - : gr_sync_decimator("cma_equalizer_cc", - gr_make_io_signature(1, 1, sizeof(gr_complex)), - gr_make_io_signature(1, 1, sizeof(gr_complex)), + : sync_decimator("cma_equalizer_cc", + io_signature::make(1, 1, sizeof(gr_complex)), + io_signature::make(1, 1, sizeof(gr_complex)), sps), fir_filter_ccc(sps, std::vector<gr_complex>(num_taps, gr_complex(0,0))), d_new_taps(num_taps, gr_complex(0,0)), @@ -79,8 +79,8 @@ namespace gr { cma_equalizer_cc_impl::error(const gr_complex &out) { gr_complex error = out*(norm(out) - d_modulus); - float re = gr_clip(error.real(), 1.0); - float im = gr_clip(error.imag(), 1.0); + float re = gr::clip(error.real(), 1.0); + float im = gr::clip(error.imag(), 1.0); return gr_complex(re, im); } diff --git a/gr-digital/lib/cma_equalizer_cc_impl.h b/gr-digital/lib/cma_equalizer_cc_impl.h index 553501bf46..5c45209dc8 100644 --- a/gr-digital/lib/cma_equalizer_cc_impl.h +++ b/gr-digital/lib/cma_equalizer_cc_impl.h @@ -25,7 +25,7 @@ #include <digital/cma_equalizer_cc.h> #include <filter/fir_filter.h> -#include <gr_math.h> +#include <gnuradio/math.h> #include <stdexcept> namespace gr { diff --git a/gr-digital/lib/constellation.cc b/gr-digital/lib/constellation.cc index d249c493ad..13d6029a06 100644 --- a/gr-digital/lib/constellation.cc +++ b/gr-digital/lib/constellation.cc @@ -24,10 +24,10 @@ #include "config.h" #endif -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <digital/constellation.h> -#include <gr_math.h> -#include <gr_complex.h> +#include <gnuradio/math.h> +#include <gnuradio/gr_complex.h> #include <math.h> #include <iostream> #include <stdlib.h> diff --git a/gr-digital/lib/constellation_decoder_cb_impl.cc b/gr-digital/lib/constellation_decoder_cb_impl.cc index e764ccc629..e8075d2225 100644 --- a/gr-digital/lib/constellation_decoder_cb_impl.cc +++ b/gr-digital/lib/constellation_decoder_cb_impl.cc @@ -25,7 +25,7 @@ #endif #include "constellation_decoder_cb_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace digital { @@ -39,9 +39,9 @@ namespace gr { constellation_decoder_cb_impl:: constellation_decoder_cb_impl(constellation_sptr constellation) - : gr_block("constellation_decoder_cb", - gr_make_io_signature(1, 1, sizeof(gr_complex)), - gr_make_io_signature(1, 1, sizeof(unsigned char))), + : block("constellation_decoder_cb", + io_signature::make(1, 1, sizeof(gr_complex)), + io_signature::make(1, 1, sizeof(unsigned char))), d_constellation(constellation), d_dim(constellation->dimensionality()) { diff --git a/gr-digital/lib/constellation_receiver_cb_impl.cc b/gr-digital/lib/constellation_receiver_cb_impl.cc index 30be24aab9..cd44386ea0 100644 --- a/gr-digital/lib/constellation_receiver_cb_impl.cc +++ b/gr-digital/lib/constellation_receiver_cb_impl.cc @@ -25,10 +25,9 @@ #endif #include "constellation_receiver_cb_impl.h" -#include <gr_io_signature.h> -#include <gr_prefs.h> -#include <gr_math.h> -#include <gr_expj.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/math.h> +#include <gnuradio/expj.h> #include <stdexcept> namespace gr { @@ -51,9 +50,9 @@ namespace gr { static std::vector<int> iosig(ios, ios+sizeof(ios)/sizeof(int)); constellation_receiver_cb_impl::constellation_receiver_cb_impl(constellation_sptr constellation, float loop_bw, float fmin, float fmax) - : gr_block("constellation_receiver_cb", - gr_make_io_signature(1, 1, sizeof(gr_complex)), - gr_make_io_signaturev(1, 5, iosig)), + : block("constellation_receiver_cb", + io_signature::make(1, 1, sizeof(gr_complex)), + io_signature::makev(1, 5, iosig)), blocks::control_loop(loop_bw, fmax, fmin), d_constellation(constellation), d_current_const_point(0) diff --git a/gr-digital/lib/constellation_receiver_cb_impl.h b/gr-digital/lib/constellation_receiver_cb_impl.h index 7c34518340..47453e67bc 100644 --- a/gr-digital/lib/constellation_receiver_cb_impl.h +++ b/gr-digital/lib/constellation_receiver_cb_impl.h @@ -24,9 +24,9 @@ #define INCLUDED_DIGITAL_CONSTELLATION_RECEIVER_CB_IMPL_H #include <digital/constellation_receiver_cb.h> -#include <attributes.h> -#include <gr_complex.h> -#include <blocks/control_loop.h> +#include <gnuradio/attributes.h> +#include <gnuradio/gr_complex.h> +#include <gnuradio/blocks/control_loop.h> namespace gr { namespace digital { diff --git a/gr-digital/lib/correlate_access_code_bb_impl.cc b/gr-digital/lib/correlate_access_code_bb_impl.cc index 0ada203c65..dea831dfbc 100644 --- a/gr-digital/lib/correlate_access_code_bb_impl.cc +++ b/gr-digital/lib/correlate_access_code_bb_impl.cc @@ -25,8 +25,8 @@ #endif #include "correlate_access_code_bb_impl.h" -#include <gr_io_signature.h> -#include <blocks/count_bits.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/blocks/count_bits.h> #include <stdexcept> #include <cstdio> @@ -44,9 +44,9 @@ namespace gr { correlate_access_code_bb_impl::correlate_access_code_bb_impl( const std::string &access_code, int threshold) - : gr_sync_block("correlate_access_code_bb", - gr_make_io_signature(1, 1, sizeof(char)), - gr_make_io_signature(1, 1, sizeof(char))), + : sync_block("correlate_access_code_bb", + io_signature::make(1, 1, sizeof(char)), + io_signature::make(1, 1, sizeof(char))), d_data_reg(0), d_flag_reg(0), d_flag_bit(0), d_mask(0), d_threshold(threshold) { diff --git a/gr-digital/lib/correlate_access_code_tag_bb_impl.cc b/gr-digital/lib/correlate_access_code_tag_bb_impl.cc index 8ac601bb9d..0d64caa7ab 100644 --- a/gr-digital/lib/correlate_access_code_tag_bb_impl.cc +++ b/gr-digital/lib/correlate_access_code_tag_bb_impl.cc @@ -25,9 +25,9 @@ #endif #include "correlate_access_code_tag_bb_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <stdexcept> -#include <blocks/count_bits.h> +#include <gnuradio/blocks/count_bits.h> #include <cstdio> #include <iostream> @@ -49,9 +49,9 @@ namespace gr { correlate_access_code_tag_bb_impl::correlate_access_code_tag_bb_impl( const std::string &access_code, int threshold, const std::string &tag_name) - : gr_sync_block("correlate_access_code_tag_bb", - gr_make_io_signature(1, 1, sizeof(char)), - gr_make_io_signature(1, 1, sizeof(char))), + : sync_block("correlate_access_code_tag_bb", + io_signature::make(1, 1, sizeof(char)), + io_signature::make(1, 1, sizeof(char))), d_data_reg(0), d_mask(0), d_threshold(threshold), d_len(0) { diff --git a/gr-digital/lib/costas_loop_cc_impl.cc b/gr-digital/lib/costas_loop_cc_impl.cc index fcdd45045b..a0b1edf509 100644 --- a/gr-digital/lib/costas_loop_cc_impl.cc +++ b/gr-digital/lib/costas_loop_cc_impl.cc @@ -25,10 +25,10 @@ #endif #include "costas_loop_cc_impl.h" -#include <gr_io_signature.h> -#include <gr_expj.h> -#include <gr_sincos.h> -#include <gr_math.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/expj.h> +#include <gnuradio/sincos.h> +#include <gnuradio/math.h> namespace gr { namespace digital { @@ -41,9 +41,9 @@ namespace gr { } costas_loop_cc_impl::costas_loop_cc_impl(float loop_bw, int order) - : gr_sync_block("costas_loop_cc", - gr_make_io_signature(1, 1, sizeof(gr_complex)), - gr_make_io_signature2(1, 2, sizeof(gr_complex), sizeof(float))), + : sync_block("costas_loop_cc", + io_signature::make(1, 1, sizeof(gr_complex)), + io_signature::make2(1, 2, sizeof(gr_complex), sizeof(float))), blocks::control_loop(loop_bw, 1.0, -1.0), d_order(order), d_phase_detector(NULL) { @@ -132,7 +132,7 @@ namespace gr { optr[i] = iptr[i] * nco_out; error = (*this.*d_phase_detector)(optr[i]); - error = gr_branchless_clip(error, 1.0); + error = gr::branchless_clip(error, 1.0); advance_loop(error); phase_wrap(); @@ -147,7 +147,7 @@ namespace gr { optr[i] = iptr[i] * nco_out; error = (*this.*d_phase_detector)(optr[i]); - error = gr_branchless_clip(error, 1.0); + error = gr::branchless_clip(error, 1.0); advance_loop(error); phase_wrap(); diff --git a/gr-digital/lib/cpmmod_bc_impl.cc b/gr-digital/lib/cpmmod_bc_impl.cc index 763a4cc1e2..4b2457f90e 100644 --- a/gr-digital/lib/cpmmod_bc_impl.cc +++ b/gr-digital/lib/cpmmod_bc_impl.cc @@ -23,7 +23,7 @@ #endif #include "cpmmod_bc_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace digital { @@ -55,9 +55,9 @@ namespace gr { analog::cpm::cpm_type type, float h, int samples_per_sym, int L, double beta) - : gr_hier_block2(name, - gr_make_io_signature(1, 1, sizeof(char)), - gr_make_io_signature2(1, 1, sizeof(gr_complex), sizeof(float))), + : hier_block2(name, + io_signature::make(1, 1, sizeof(char)), + io_signature::make2(1, 1, sizeof(gr_complex), sizeof(float))), d_type(type), d_index(h), d_sps(samples_per_sym), d_length(L), d_beta(beta), d_taps(analog::cpm::phase_response(type, samples_per_sym, L, beta)), d_char_to_float(blocks::char_to_float::make()), diff --git a/gr-digital/lib/cpmmod_bc_impl.h b/gr-digital/lib/cpmmod_bc_impl.h index 9cfec4959e..7ae150100c 100644 --- a/gr-digital/lib/cpmmod_bc_impl.h +++ b/gr-digital/lib/cpmmod_bc_impl.h @@ -24,7 +24,7 @@ #define INCLUDED_DIGITAL_CPMMOD_BC_IMPL_H #include <digital/cpmmod_bc.h> -#include <blocks/char_to_float.h> +#include <gnuradio/blocks/char_to_float.h> #include <analog/frequency_modulator_fc.h> #include <filter/interp_fir_filter_fff.h> diff --git a/gr-digital/lib/crc32_bb_impl.cc b/gr-digital/lib/crc32_bb_impl.cc index 89cc0d1083..5a72d528ab 100644 --- a/gr-digital/lib/crc32_bb_impl.cc +++ b/gr-digital/lib/crc32_bb_impl.cc @@ -24,7 +24,7 @@ #include "config.h" #endif -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include "crc32_bb_impl.h" #include <digital/crc32.h> @@ -38,9 +38,9 @@ namespace gr { } crc32_bb_impl::crc32_bb_impl(bool check, const std::string& lengthtagname) - : gr_tagged_stream_block("crc32_bb", - gr_make_io_signature(1, 1, sizeof (char)), - gr_make_io_signature(1, 1, sizeof (char)), + : tagged_stream_block("crc32_bb", + io_signature::make(1, 1, sizeof (char)), + io_signature::make(1, 1, sizeof (char)), lengthtagname), d_check(check) { @@ -85,7 +85,7 @@ namespace gr { memcpy((void *) (out + packet_length), &crc, 4); // FIXME big-endian/little-endian, this might be wrong } - std::vector<gr_tag_t> tags; + std::vector<tag_t> tags; get_tags_in_range(tags, 0, nitems_read(0), nitems_read(0)+packet_length); for (size_t i = 0; i < tags.size(); i++) { tags[i].offset -= nitems_read(0); diff --git a/gr-digital/lib/descrambler_bb_impl.cc b/gr-digital/lib/descrambler_bb_impl.cc index 8124df37ef..69e9dd0cef 100644 --- a/gr-digital/lib/descrambler_bb_impl.cc +++ b/gr-digital/lib/descrambler_bb_impl.cc @@ -25,7 +25,7 @@ #endif #include "descrambler_bb_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace digital { @@ -38,9 +38,9 @@ namespace gr { } descrambler_bb_impl::descrambler_bb_impl(int mask, int seed, int len) - : gr_sync_block("descrambler_bb", - gr_make_io_signature(1, 1, sizeof(unsigned char)), - gr_make_io_signature(1, 1, sizeof(unsigned char))), + : sync_block("descrambler_bb", + io_signature::make(1, 1, sizeof(unsigned char)), + io_signature::make(1, 1, sizeof(unsigned char))), d_lfsr(mask, seed, len) { } diff --git a/gr-digital/lib/diff_decoder_bb_impl.cc b/gr-digital/lib/diff_decoder_bb_impl.cc index 74c247a830..f0e1de0935 100644 --- a/gr-digital/lib/diff_decoder_bb_impl.cc +++ b/gr-digital/lib/diff_decoder_bb_impl.cc @@ -25,7 +25,7 @@ #endif #include "diff_decoder_bb_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace digital { @@ -37,9 +37,9 @@ namespace gr { } diff_decoder_bb_impl::diff_decoder_bb_impl(unsigned int modulus) - : gr_sync_block("diff_decoder_bb", - gr_make_io_signature(1, 1, sizeof(unsigned char)), - gr_make_io_signature(1, 1, sizeof(unsigned char))), + : sync_block("diff_decoder_bb", + io_signature::make(1, 1, sizeof(unsigned char)), + io_signature::make(1, 1, sizeof(unsigned char))), d_modulus(modulus) { set_history(2); // need to look at two inputs diff --git a/gr-digital/lib/diff_decoder_bb_impl.h b/gr-digital/lib/diff_decoder_bb_impl.h index 56a15ba128..2e06d3cf5f 100644 --- a/gr-digital/lib/diff_decoder_bb_impl.h +++ b/gr-digital/lib/diff_decoder_bb_impl.h @@ -24,7 +24,7 @@ #define INCLUDED_GR_DIFF_DECODER_BB_IMPL_H #include <digital/diff_decoder_bb.h> -#include <gr_sync_block.h> +#include <gnuradio/sync_block.h> namespace gr { namespace digital { diff --git a/gr-digital/lib/diff_encoder_bb_impl.cc b/gr-digital/lib/diff_encoder_bb_impl.cc index 411efe006c..529aade3db 100644 --- a/gr-digital/lib/diff_encoder_bb_impl.cc +++ b/gr-digital/lib/diff_encoder_bb_impl.cc @@ -25,7 +25,7 @@ #endif #include "diff_encoder_bb_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace digital { @@ -38,9 +38,9 @@ namespace gr { } diff_encoder_bb_impl::diff_encoder_bb_impl(unsigned int modulus) - : gr_sync_block("diff_encoder_bb", - gr_make_io_signature(1, 1, sizeof(unsigned char)), - gr_make_io_signature(1, 1, sizeof(unsigned char))), + : sync_block("diff_encoder_bb", + io_signature::make(1, 1, sizeof(unsigned char)), + io_signature::make(1, 1, sizeof(unsigned char))), d_last_out(0), d_modulus(modulus) { } diff --git a/gr-digital/lib/diff_phasor_cc_impl.cc b/gr-digital/lib/diff_phasor_cc_impl.cc index 0e7a108121..0e70a4bf62 100644 --- a/gr-digital/lib/diff_phasor_cc_impl.cc +++ b/gr-digital/lib/diff_phasor_cc_impl.cc @@ -25,7 +25,7 @@ #endif #include "diff_phasor_cc_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace digital { @@ -38,9 +38,9 @@ namespace gr { } diff_phasor_cc_impl::diff_phasor_cc_impl() - : gr_sync_block("diff_phasor_cc", - gr_make_io_signature(1, 1, sizeof(gr_complex)), - gr_make_io_signature(1, 1, sizeof(gr_complex))) + : sync_block("diff_phasor_cc", + io_signature::make(1, 1, sizeof(gr_complex)), + io_signature::make(1, 1, sizeof(gr_complex))) { set_history(2); } diff --git a/gr-digital/lib/diff_phasor_cc_impl.h b/gr-digital/lib/diff_phasor_cc_impl.h index 844fc826d8..7e06b35ad4 100644 --- a/gr-digital/lib/diff_phasor_cc_impl.h +++ b/gr-digital/lib/diff_phasor_cc_impl.h @@ -24,7 +24,7 @@ #define INCLUDED_GR_DIFF_PHASOR_CC_IMPL_H #include <digital/diff_phasor_cc.h> -#include <gr_sync_block.h> +#include <gnuradio/sync_block.h> namespace gr { namespace digital { diff --git a/gr-digital/lib/fll_band_edge_cc_impl.cc b/gr-digital/lib/fll_band_edge_cc_impl.cc index c438b813f4..d67f13a412 100644 --- a/gr-digital/lib/fll_band_edge_cc_impl.cc +++ b/gr-digital/lib/fll_band_edge_cc_impl.cc @@ -25,8 +25,8 @@ #endif #include "fll_band_edge_cc_impl.h" -#include <gr_io_signature.h> -#include <gr_expj.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/expj.h> #include <cstdio> namespace gr { @@ -55,9 +55,9 @@ namespace gr { static std::vector<int> iosig(ios, ios+sizeof(ios)/sizeof(int)); fll_band_edge_cc_impl::fll_band_edge_cc_impl(float samps_per_sym, float rolloff, int filter_size, float bandwidth) - : gr_sync_block("fll_band_edge_cc", - gr_make_io_signature(1, 1, sizeof(gr_complex)), - gr_make_io_signaturev(1, 4, iosig)), + : sync_block("fll_band_edge_cc", + io_signature::make(1, 1, sizeof(gr_complex)), + io_signature::makev(1, 4, iosig)), blocks::control_loop(bandwidth, M_TWOPI*(2.0/samps_per_sym), -M_TWOPI*(2.0/samps_per_sym)), d_updated(false) diff --git a/gr-digital/lib/fll_band_edge_cc_impl.h b/gr-digital/lib/fll_band_edge_cc_impl.h index 9eb3e6e7ae..6237b53cff 100644 --- a/gr-digital/lib/fll_band_edge_cc_impl.h +++ b/gr-digital/lib/fll_band_edge_cc_impl.h @@ -24,7 +24,7 @@ #define INCLUDED_DIGITAL_FLL_BAND_EDGE_CC_IMPL_H #include <digital/fll_band_edge_cc.h> -#include <blocks/control_loop.h> +#include <gnuradio/blocks/control_loop.h> #include <filter/fir_filter.h> namespace gr { diff --git a/gr-digital/lib/framer_sink_1_impl.cc b/gr-digital/lib/framer_sink_1_impl.cc index 1dda5ca50c..76347101a4 100644 --- a/gr-digital/lib/framer_sink_1_impl.cc +++ b/gr-digital/lib/framer_sink_1_impl.cc @@ -25,7 +25,7 @@ #endif #include "framer_sink_1_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <cstdio> #include <string> @@ -71,16 +71,16 @@ namespace gr { } framer_sink_1::sptr - framer_sink_1::make(gr_msg_queue_sptr target_queue) + framer_sink_1::make(msg_queue::sptr target_queue) { return gnuradio::get_initial_sptr (new framer_sink_1_impl(target_queue)); } - framer_sink_1_impl::framer_sink_1_impl(gr_msg_queue_sptr target_queue) - : gr_sync_block("framer_sink_1", - gr_make_io_signature(1, 1, sizeof(unsigned char)), - gr_make_io_signature(0, 0, 0)), + framer_sink_1_impl::framer_sink_1_impl(msg_queue::sptr target_queue) + : sync_block("framer_sink_1", + io_signature::make(1, 1, sizeof(unsigned char)), + io_signature::make(0, 0, 0)), d_target_queue(target_queue) { enter_search(); @@ -139,8 +139,8 @@ namespace gr { if(d_packetlen == 0) { // check for zero-length payload // build a zero-length message // NOTE: passing header field as arg1 is not scalable - gr_message_sptr msg = - gr_make_message(0, d_packet_whitener_offset, 0, 0); + message::sptr msg = + message::make(0, d_packet_whitener_offset, 0, 0); d_target_queue->insert_tail(msg); // send it msg.reset(); // free it up @@ -168,8 +168,8 @@ namespace gr { if(d_packetlen_cnt == d_packetlen) { // packet is filled // build a message // NOTE: passing header field as arg1 is not scalable - gr_message_sptr msg = - gr_make_message(0, d_packet_whitener_offset, 0, d_packetlen_cnt); + message::sptr msg = + message::make(0, d_packet_whitener_offset, 0, d_packetlen_cnt); memcpy(msg->msg(), d_packet, d_packetlen_cnt); d_target_queue->insert_tail(msg); // send it diff --git a/gr-digital/lib/framer_sink_1_impl.h b/gr-digital/lib/framer_sink_1_impl.h index ff2839acbf..d30c1f316d 100644 --- a/gr-digital/lib/framer_sink_1_impl.h +++ b/gr-digital/lib/framer_sink_1_impl.h @@ -36,17 +36,17 @@ namespace gr { static const int MAX_PKT_LEN = 4096; static const int HEADERBITLEN = 32; - gr_msg_queue_sptr d_target_queue; // where to send the packet when received - state_t d_state; - unsigned int d_header; // header bits - int d_headerbitlen_cnt; // how many so far + msg_queue::sptr d_target_queue; // where to send the packet when received + state_t d_state; + unsigned int d_header; // header bits + int d_headerbitlen_cnt; // how many so far - unsigned char d_packet[MAX_PKT_LEN]; // assembled payload - unsigned char d_packet_byte; // byte being assembled - int d_packet_byte_index; // which bit of d_packet_byte we're working on - int d_packetlen; // length of packet - int d_packet_whitener_offset; // offset into whitener string to use - int d_packetlen_cnt; // how many so far + unsigned char d_packet[MAX_PKT_LEN]; // assembled payload + unsigned char d_packet_byte; // byte being assembled + int d_packet_byte_index; // which bit of d_packet_byte we're working on + int d_packetlen; // length of packet + int d_packet_whitener_offset; // offset into whitener string to use + int d_packetlen_cnt; // how many so far protected: void enter_search(); @@ -69,7 +69,7 @@ namespace gr { } public: - framer_sink_1_impl(gr_msg_queue_sptr target_queue); + framer_sink_1_impl(msg_queue::sptr target_queue); ~framer_sink_1_impl(); int work(int noutput_items, diff --git a/gr-digital/lib/glfsr_source_b_impl.cc b/gr-digital/lib/glfsr_source_b_impl.cc index e4171d80e7..260bd45c24 100644 --- a/gr-digital/lib/glfsr_source_b_impl.cc +++ b/gr-digital/lib/glfsr_source_b_impl.cc @@ -25,7 +25,7 @@ #endif #include "glfsr_source_b_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <stdexcept> namespace gr { @@ -40,9 +40,9 @@ namespace gr { glfsr_source_b_impl::glfsr_source_b_impl(int degree, bool repeat, int mask, int seed) - : gr_sync_block("glfsr_source_b", - gr_make_io_signature(0, 0, 0), - gr_make_io_signature(1, 1, sizeof(unsigned char))), + : sync_block("glfsr_source_b", + io_signature::make(0, 0, 0), + io_signature::make(1, 1, sizeof(unsigned char))), d_repeat(repeat), d_index(0) { if(degree < 1 || degree > 32) diff --git a/gr-digital/lib/glfsr_source_f_impl.cc b/gr-digital/lib/glfsr_source_f_impl.cc index 1e0ee2d85e..cb637df4ea 100644 --- a/gr-digital/lib/glfsr_source_f_impl.cc +++ b/gr-digital/lib/glfsr_source_f_impl.cc @@ -26,7 +26,7 @@ #endif #include "glfsr_source_f_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <stdexcept> namespace gr { @@ -41,9 +41,9 @@ namespace gr { glfsr_source_f_impl::glfsr_source_f_impl(int degree, bool repeat, int mask, int seed) - : gr_sync_block("glfsr_source_f", - gr_make_io_signature(0, 0, 0), - gr_make_io_signature(1, 1, sizeof(float))), + : sync_block("glfsr_source_f", + io_signature::make(0, 0, 0), + io_signature::make(1, 1, sizeof(float))), d_repeat(repeat), d_index(0) { if(degree < 1 || degree > 32) diff --git a/gr-digital/lib/header_payload_demux_impl.cc b/gr-digital/lib/header_payload_demux_impl.cc index a2e81c5b8e..79e2d3770d 100644 --- a/gr-digital/lib/header_payload_demux_impl.cc +++ b/gr-digital/lib/header_payload_demux_impl.cc @@ -24,7 +24,7 @@ #endif #include <climits> -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include "header_payload_demux_impl.h" namespace gr { @@ -70,9 +70,9 @@ namespace gr { const std::string &trigger_tag_key, bool output_symbols, size_t itemsize - ) : gr_block("header_payload_demux", - gr_make_io_signature2(1, 2, itemsize, sizeof(char)), - gr_make_io_signature(2, 2, (output_symbols ? itemsize * items_per_symbol : itemsize))), + ) : block("header_payload_demux", + io_signature::make2(1, 2, itemsize, sizeof(char)), + io_signature::make(2, 2, (output_symbols ? itemsize * items_per_symbol : itemsize))), d_header_len(header_len), d_items_per_symbol(items_per_symbol), d_gi(guard_interval), @@ -199,7 +199,7 @@ namespace gr { } } if (d_uses_trigger_tag) { - std::vector<gr_tag_t> tags; + std::vector<tag_t> tags; get_tags_in_range(tags, 0, nitems_read(0), nitems_read(0)+noutput_items); uint64_t min_offset = ULLONG_MAX; int tag_index = -1; @@ -250,7 +250,7 @@ namespace gr { void header_payload_demux_impl::copy_symbol(const unsigned char *&in, unsigned char *&out, int port, int &nread, int &nproduced) { - std::vector<gr_tag_t> tags; + std::vector<tag_t> tags; memcpy((void *) out, (void *) (in + d_gi * d_itemsize), d_itemsize * d_items_per_symbol diff --git a/gr-digital/lib/kurtotic_equalizer_cc_impl.cc b/gr-digital/lib/kurtotic_equalizer_cc_impl.cc index c3be3b5d06..edf2f34452 100644 --- a/gr-digital/lib/kurtotic_equalizer_cc_impl.cc +++ b/gr-digital/lib/kurtotic_equalizer_cc_impl.cc @@ -25,7 +25,7 @@ #endif #include "kurtotic_equalizer_cc_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <volk/volk.h> namespace gr { @@ -39,9 +39,9 @@ namespace gr { } kurtotic_equalizer_cc_impl::kurtotic_equalizer_cc_impl(int num_taps, float mu) - : gr_sync_decimator("kurtotic_equalizer_cc", - gr_make_io_signature(1, 1, sizeof(gr_complex)), - gr_make_io_signature(1, 1, sizeof(gr_complex)), + : sync_decimator("kurtotic_equalizer_cc", + io_signature::make(1, 1, sizeof(gr_complex)), + io_signature::make(1, 1, sizeof(gr_complex)), 1), filter::kernel::fir_filter_ccc(1, std::vector<gr_complex>(num_taps, gr_complex(0,0))) { diff --git a/gr-digital/lib/kurtotic_equalizer_cc_impl.h b/gr-digital/lib/kurtotic_equalizer_cc_impl.h index 0f2ff23808..41178c3eb8 100644 --- a/gr-digital/lib/kurtotic_equalizer_cc_impl.h +++ b/gr-digital/lib/kurtotic_equalizer_cc_impl.h @@ -25,7 +25,7 @@ #include <digital/kurtotic_equalizer_cc.h> #include <filter/fir_filter.h> -#include <gr_math.h> +#include <gnuradio/math.h> #include <stdexcept> namespace gr { @@ -73,8 +73,8 @@ namespace gr { (sign(d_u) * (nrm*cnj - 2.0f*d_p*cnj - conj(d_q)*out) - abs(d_u)*cnj); - float re = gr_clip(F.real(), 1.0); - float im = gr_clip(F.imag(), 1.0); + float re = gr::clip(F.real(), 1.0); + float im = gr::clip(F.imag(), 1.0); return gr_complex(re, im); } diff --git a/gr-digital/lib/lms_dd_equalizer_cc_impl.cc b/gr-digital/lib/lms_dd_equalizer_cc_impl.cc index 15008ca8e7..530b3aa6fd 100644 --- a/gr-digital/lib/lms_dd_equalizer_cc_impl.cc +++ b/gr-digital/lib/lms_dd_equalizer_cc_impl.cc @@ -25,8 +25,8 @@ #endif #include "lms_dd_equalizer_cc_impl.h" -#include <gr_io_signature.h> -#include <gr_misc.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/misc.h> #include <volk/volk.h> namespace gr { @@ -45,9 +45,9 @@ namespace gr { lms_dd_equalizer_cc_impl::lms_dd_equalizer_cc_impl(int num_taps, float mu, int sps, constellation_sptr cnst) - : gr_sync_decimator("lms_dd_equalizer_cc", - gr_make_io_signature(1, 1, sizeof(gr_complex)), - gr_make_io_signature(1, 1, sizeof(gr_complex)), + : sync_decimator("lms_dd_equalizer_cc", + io_signature::make(1, 1, sizeof(gr_complex)), + io_signature::make(1, 1, sizeof(gr_complex)), sps), fir_filter_ccc(sps, std::vector<gr_complex>(num_taps, gr_complex(0,0))), d_new_taps(num_taps, gr_complex(0,0)), diff --git a/gr-digital/lib/map_bb_impl.cc b/gr-digital/lib/map_bb_impl.cc index 4ea91835a9..c4f9209a88 100644 --- a/gr-digital/lib/map_bb_impl.cc +++ b/gr-digital/lib/map_bb_impl.cc @@ -25,7 +25,7 @@ #endif #include "map_bb_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace digital { @@ -37,9 +37,9 @@ namespace gr { } map_bb_impl::map_bb_impl(const std::vector<int> &map) - : gr_sync_block("map_bb", - gr_make_io_signature(1, 1, sizeof(unsigned char)), - gr_make_io_signature(1, 1, sizeof(unsigned char))) + : sync_block("map_bb", + io_signature::make(1, 1, sizeof(unsigned char)), + io_signature::make(1, 1, sizeof(unsigned char))) { set_map(map); } diff --git a/gr-digital/lib/map_bb_impl.h b/gr-digital/lib/map_bb_impl.h index 59f1e834b7..356bf8bde6 100644 --- a/gr-digital/lib/map_bb_impl.h +++ b/gr-digital/lib/map_bb_impl.h @@ -24,7 +24,7 @@ #define INCLUDED_GR_MAP_BB_IMPL_H #include <digital/map_bb.h> -#include <thread/thread.h> +#include <gnuradio/thread/thread.h> namespace gr { namespace digital { diff --git a/gr-digital/lib/mpsk_receiver_cc_impl.cc b/gr-digital/lib/mpsk_receiver_cc_impl.cc index ea11b7cdaa..0d7464a0fb 100644 --- a/gr-digital/lib/mpsk_receiver_cc_impl.cc +++ b/gr-digital/lib/mpsk_receiver_cc_impl.cc @@ -25,10 +25,9 @@ #endif #include "mpsk_receiver_cc_impl.h" -#include <gr_io_signature.h> -#include <gr_prefs.h> -#include <gr_math.h> -#include <gr_expj.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/math.h> +#include <gnuradio/expj.h> #include <stdexcept> namespace gr { @@ -60,9 +59,9 @@ namespace gr { float mu, float gain_mu, float omega, float gain_omega, float omega_rel) - : gr_block("mpsk_receiver_cc", - gr_make_io_signature(1, 1, sizeof(gr_complex)), - gr_make_io_signature(1, 1, sizeof(gr_complex))), + : block("mpsk_receiver_cc", + io_signature::make(1, 1, sizeof(gr_complex)), + io_signature::make(1, 1, sizeof(gr_complex))), blocks::control_loop(loop_bw, fmax, fmin), d_M(M), d_theta(theta), d_current_const_point(0), @@ -163,14 +162,14 @@ namespace gr { float mpsk_receiver_cc_impl::phase_error_detector_generic(gr_complex sample) const { - //return gr_fast_atan2f(sample*conj(d_constellation[d_current_const_point])); + //return gr::fast_atan2f(sample*conj(d_constellation[d_current_const_point])); return -arg(sample*conj(d_constellation[d_current_const_point])); } unsigned int mpsk_receiver_cc_impl::decision_bpsk(gr_complex sample) const { - return (gr_branchless_binary_slicer(sample.real()) ^ 1); + return (gr::branchless_binary_slicer(sample.real()) ^ 1); //return gr_binary_slicer(sample.real()) ^ 1; } @@ -179,8 +178,8 @@ namespace gr { { unsigned int index; - //index = gr_branchless_quad_0deg_slicer(sample); - index = gr_quad_0deg_slicer(sample); + //index = gr::branchless_quad_0deg_slicer(sample); + index = gr::quad_0deg_slicer(sample); return index; } @@ -257,10 +256,10 @@ namespace gr { y = (d_p_0T - d_p_2T) * conj(d_c_1T); u = y - x; mm_error = u.real(); // the error signal is in the real part - mm_error = gr_branchless_clip(mm_error, 1.0); // limit mm_val + mm_error = gr::branchless_clip(mm_error, 1.0); // limit mm_val d_omega = d_omega + d_gain_omega * mm_error; // update omega based on loop error - d_omega = d_omega_mid + gr_branchless_clip(d_omega-d_omega_mid, d_omega_rel); // make sure we don't walk away + d_omega = d_omega_mid + gr::branchless_clip(d_omega-d_omega_mid, d_omega_rel); // make sure we don't walk away d_mu += d_omega + d_gain_mu * mm_error; // update mu based on loop error diff --git a/gr-digital/lib/mpsk_receiver_cc_impl.h b/gr-digital/lib/mpsk_receiver_cc_impl.h index ed53d0f2e4..c8807c2a4e 100644 --- a/gr-digital/lib/mpsk_receiver_cc_impl.h +++ b/gr-digital/lib/mpsk_receiver_cc_impl.h @@ -24,9 +24,9 @@ #define INCLUDED_DIGITAL_MPSK_RECEIVER_CC_IMPL_H #include <digital/mpsk_receiver_cc.h> -#include <attributes.h> -#include <blocks/control_loop.h> -#include <gr_complex.h> +#include <gnuradio/attributes.h> +#include <gnuradio/blocks/control_loop.h> +#include <gnuradio/gr_complex.h> #include <fstream> #include <filter/mmse_fir_interpolator_cc.h> diff --git a/gr-digital/lib/mpsk_snr_est_cc_impl.cc b/gr-digital/lib/mpsk_snr_est_cc_impl.cc index 6d11dd315c..07a411e4c5 100644 --- a/gr-digital/lib/mpsk_snr_est_cc_impl.cc +++ b/gr-digital/lib/mpsk_snr_est_cc_impl.cc @@ -25,7 +25,7 @@ #endif #include "mpsk_snr_est_cc_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <cstdio> namespace gr { @@ -43,9 +43,9 @@ namespace gr { mpsk_snr_est_cc_impl::mpsk_snr_est_cc_impl(snr_est_type_t type, int tag_nsamples, double alpha) - : gr_sync_block("mpsk_snr_est_cc", - gr_make_io_signature(1, 1, sizeof(gr_complex)), - gr_make_io_signature(1, 1, sizeof(gr_complex))) + : sync_block("mpsk_snr_est_cc", + io_signature::make(1, 1, sizeof(gr_complex)), + io_signature::make(1, 1, sizeof(gr_complex))) { d_snr_est = NULL; diff --git a/gr-digital/lib/mpsk_snr_est_cc_impl.h b/gr-digital/lib/mpsk_snr_est_cc_impl.h index 530d223aec..49bf078457 100644 --- a/gr-digital/lib/mpsk_snr_est_cc_impl.h +++ b/gr-digital/lib/mpsk_snr_est_cc_impl.h @@ -25,7 +25,7 @@ #include <digital/api.h> #include <digital/mpsk_snr_est_cc.h> -#include <gr_sync_block.h> +#include <gnuradio/sync_block.h> namespace gr { namespace digital { diff --git a/gr-digital/lib/ofdm_carrier_allocator_cvc_impl.cc b/gr-digital/lib/ofdm_carrier_allocator_cvc_impl.cc index afeb10e1d5..467718e424 100644 --- a/gr-digital/lib/ofdm_carrier_allocator_cvc_impl.cc +++ b/gr-digital/lib/ofdm_carrier_allocator_cvc_impl.cc @@ -24,7 +24,7 @@ #include "config.h" #endif -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include "ofdm_carrier_allocator_cvc_impl.h" namespace gr { @@ -62,9 +62,9 @@ namespace gr { const std::vector<std::vector<gr_complex> > &sync_words, const std::string &len_tag_key, const bool output_is_shifted - ) : gr_tagged_stream_block("ofdm_carrier_allocator_cvc", - gr_make_io_signature(1, 1, sizeof (gr_complex)), - gr_make_io_signature(1, 1, sizeof (gr_complex) * fft_len), len_tag_key), + ) : tagged_stream_block("ofdm_carrier_allocator_cvc", + io_signature::make(1, 1, sizeof (gr_complex)), + io_signature::make(1, 1, sizeof (gr_complex) * fft_len), len_tag_key), d_fft_len(fft_len), d_occupied_carriers(occupied_carriers), d_pilot_carriers(pilot_carriers), @@ -140,7 +140,7 @@ namespace gr { { const gr_complex *in = (const gr_complex *) input_items[0]; gr_complex *out = (gr_complex *) output_items[0]; - std::vector<gr_tag_t> tags; + std::vector<tag_t> tags; memset((void *) out, 0x00, sizeof(gr_complex) * d_fft_len * noutput_items); // Copy Sync word diff --git a/gr-digital/lib/ofdm_chanest_vcvc_impl.cc b/gr-digital/lib/ofdm_chanest_vcvc_impl.cc index d0d8faba59..a4025cc381 100644 --- a/gr-digital/lib/ofdm_chanest_vcvc_impl.cc +++ b/gr-digital/lib/ofdm_chanest_vcvc_impl.cc @@ -24,7 +24,7 @@ #include "config.h" #endif -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include "ofdm_chanest_vcvc_impl.h" namespace gr { @@ -46,9 +46,9 @@ namespace gr { } ofdm_chanest_vcvc_impl::ofdm_chanest_vcvc_impl(const std::vector<gr_complex> &sync_symbol1, const std::vector<gr_complex> &sync_symbol2, int n_data_symbols, int eq_noise_red_len, int max_carr_offset, bool force_one_sync_symbol) - : gr_block("ofdm_chanest_vcvc", - gr_make_io_signature(1, 1, sizeof (gr_complex) * sync_symbol1.size()), - gr_make_io_signature(1, 1, sizeof (gr_complex) * sync_symbol1.size())), + : block("ofdm_chanest_vcvc", + io_signature::make(1, 1, sizeof (gr_complex) * sync_symbol1.size()), + io_signature::make(1, 1, sizeof (gr_complex) * sync_symbol1.size())), d_fft_len(sync_symbol1.size()), d_n_data_syms(n_data_symbols), d_n_sync_syms(1), @@ -241,7 +241,7 @@ namespace gr { in += framesize * d_fft_len; out += d_n_data_syms * d_fft_len; - std::vector<gr_tag_t> tags; + std::vector<tag_t> tags; this->get_tags_in_range(tags, 0, this->nitems_read(0)+i*framesize, this->nitems_read(0)+(i+1)*framesize); diff --git a/gr-digital/lib/ofdm_cyclic_prefixer_impl.cc b/gr-digital/lib/ofdm_cyclic_prefixer_impl.cc index d48c5f7e45..9db7273e26 100644 --- a/gr-digital/lib/ofdm_cyclic_prefixer_impl.cc +++ b/gr-digital/lib/ofdm_cyclic_prefixer_impl.cc @@ -24,7 +24,7 @@ #include "config.h" #endif -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include "ofdm_cyclic_prefixer_impl.h" namespace gr { @@ -38,9 +38,9 @@ namespace gr { ofdm_cyclic_prefixer_impl::ofdm_cyclic_prefixer_impl(size_t input_size, size_t output_size, int rolloff_len, const std::string &len_tag_key) - : gr_tagged_stream_block ("ofdm_cyclic_prefixer", - gr_make_io_signature (1, 1, input_size*sizeof(gr_complex)), - gr_make_io_signature (1, 1, sizeof(gr_complex)), + : tagged_stream_block ("ofdm_cyclic_prefixer", + io_signature::make (1, 1, input_size*sizeof(gr_complex)), + io_signature::make (1, 1, sizeof(gr_complex)), len_tag_key), d_fft_len(input_size), d_output_size(output_size), @@ -140,7 +140,7 @@ namespace gr { } d_delay_line.assign(d_delay_line.size(), 0); } - std::vector<gr_tag_t> tags; + std::vector<tag_t> tags; get_tags_in_range( tags, 0, nitems_read(0), nitems_read(0)+symbols_to_read diff --git a/gr-digital/lib/ofdm_equalizer_simpledfe.cc b/gr-digital/lib/ofdm_equalizer_simpledfe.cc index fcb0e18cbf..a822c6cc60 100644 --- a/gr-digital/lib/ofdm_equalizer_simpledfe.cc +++ b/gr-digital/lib/ofdm_equalizer_simpledfe.cc @@ -78,7 +78,7 @@ namespace gr { ofdm_equalizer_simpledfe::equalize(gr_complex *frame, int n_sym, const std::vector<gr_complex> &initial_taps, - const std::vector<gr_tag_t> &tags) + const std::vector<tag_t> &tags) { if (!initial_taps.empty()) { d_channel_state = initial_taps; diff --git a/gr-digital/lib/ofdm_equalizer_static.cc b/gr-digital/lib/ofdm_equalizer_static.cc index 8601eff430..72c7d14064 100644 --- a/gr-digital/lib/ofdm_equalizer_static.cc +++ b/gr-digital/lib/ofdm_equalizer_static.cc @@ -70,7 +70,7 @@ namespace gr { ofdm_equalizer_static::equalize(gr_complex *frame, int n_sym, const std::vector<gr_complex> &initial_taps, - const std::vector<gr_tag_t> &tags) + const std::vector<tag_t> &tags) { d_channel_state = initial_taps; diff --git a/gr-digital/lib/ofdm_frame_acquisition_impl.cc b/gr-digital/lib/ofdm_frame_acquisition_impl.cc index 1f45338d8f..2c2d6eff7a 100644 --- a/gr-digital/lib/ofdm_frame_acquisition_impl.cc +++ b/gr-digital/lib/ofdm_frame_acquisition_impl.cc @@ -25,9 +25,9 @@ #endif #include "ofdm_frame_acquisition_impl.h" -#include <gr_io_signature.h> -#include <gr_expj.h> -#include <gr_math.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/expj.h> +#include <gnuradio/math.h> #include <cstdio> namespace gr { @@ -54,9 +54,9 @@ namespace gr { unsigned int cplen, const std::vector<gr_complex> &known_symbol, unsigned int max_fft_shift_len) - : gr_block("ofdm_frame_acquisition", - gr_make_io_signature2(2, 2, sizeof(gr_complex)*fft_length, sizeof(char)*fft_length), - gr_make_io_signature2(2, 2, sizeof(gr_complex)*occupied_carriers, sizeof(char))), + : block("ofdm_frame_acquisition", + io_signature::make2(2, 2, sizeof(gr_complex)*fft_length, sizeof(char)*fft_length), + io_signature::make2(2, 2, sizeof(gr_complex)*occupied_carriers, sizeof(char))), d_occupied_carriers(occupied_carriers), d_fft_length(fft_length), d_cplen(cplen), diff --git a/gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.cc b/gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.cc index 68050f24b1..8546eb119b 100644 --- a/gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.cc +++ b/gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.cc @@ -23,7 +23,7 @@ #include "config.h" #endif -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include "ofdm_frame_equalizer_vcvc_impl.h" namespace gr { @@ -49,9 +49,9 @@ namespace gr { const std::string &len_tag_key, bool propagate_channel_state, int fixed_frame_len - ) : gr_tagged_stream_block("ofdm_frame_equalizer_vcvc", - gr_make_io_signature(1, 1, sizeof (gr_complex) * equalizer->fft_len()), - gr_make_io_signature(1, 1, sizeof (gr_complex) * equalizer->fft_len()), + ) : tagged_stream_block("ofdm_frame_equalizer_vcvc", + io_signature::make(1, 1, sizeof (gr_complex) * equalizer->fft_len()), + io_signature::make(1, 1, sizeof (gr_complex) * equalizer->fft_len()), len_tag_key), d_fft_len(equalizer->fft_len()), d_eq(equalizer), @@ -85,7 +85,7 @@ namespace gr { frame_len = ninput_items[0]; } - std::vector<gr_tag_t> tags; + std::vector<tag_t> tags; get_tags_in_range(tags, 0, nitems_read(0), nitems_read(0)+1); for (unsigned i = 0; i < tags.size(); i++) { if (pmt::symbol_to_string(tags[i].key) == "ofdm_sync_chan_taps") { diff --git a/gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.h b/gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.h index 81789e22c4..c219052148 100644 --- a/gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.h +++ b/gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.h @@ -38,7 +38,7 @@ namespace gr { protected: // These aren't really necessary, so let's override them with nuthin' - void remove_length_tags(const std::vector<std::vector<gr_tag_t> > &tags) {}; + void remove_length_tags(const std::vector<std::vector<tag_t> > &tags) {}; void update_length_tags(int n_produced, int n_ports) {}; public: diff --git a/gr-digital/lib/ofdm_frame_sink_impl.cc b/gr-digital/lib/ofdm_frame_sink_impl.cc index d2f00d3a45..b2e4f44ec9 100644 --- a/gr-digital/lib/ofdm_frame_sink_impl.cc +++ b/gr-digital/lib/ofdm_frame_sink_impl.cc @@ -25,9 +25,9 @@ #endif #include "ofdm_frame_sink_impl.h" -#include <gr_io_signature.h> -#include <gr_expj.h> -#include <gr_math.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/expj.h> +#include <gnuradio/math.h> #include <cmath> #include <cstdio> #include <stdexcept> @@ -186,7 +186,7 @@ namespace gr { ofdm_frame_sink::sptr ofdm_frame_sink::make(const std::vector<gr_complex> &sym_position, const std::vector<char> &sym_value_out, - gr_msg_queue_sptr target_queue, + msg_queue::sptr target_queue, int occupied_carriers, float phase_gain, float freq_gain) { @@ -198,12 +198,12 @@ namespace gr { ofdm_frame_sink_impl::ofdm_frame_sink_impl(const std::vector<gr_complex> &sym_position, const std::vector<char> &sym_value_out, - gr_msg_queue_sptr target_queue, + msg_queue::sptr target_queue, int occupied_carriers, float phase_gain, float freq_gain) - : gr_sync_block("ofdm_frame_sink", - gr_make_io_signature2(2, 2, sizeof(gr_complex)*occupied_carriers, sizeof(char)), - gr_make_io_signature(1, 1, sizeof(gr_complex)*occupied_carriers)), + : sync_block("ofdm_frame_sink", + io_signature::make2(2, 2, sizeof(gr_complex)*occupied_carriers, sizeof(char)), + io_signature::make(1, 1, sizeof(gr_complex)*occupied_carriers)), d_target_queue(target_queue), d_occupied_carriers(occupied_carriers), d_byte_offset(0), d_partial_byte(0), d_resid(0), d_nresid(0),d_phase(0),d_freq(0), @@ -357,8 +357,8 @@ namespace gr { } if(d_packetlen_cnt == d_packetlen) { - gr_message_sptr msg = - gr_make_message(0, d_packet_whitener_offset, 0, d_packetlen); + message::sptr msg = + message::make(0, d_packet_whitener_offset, 0, d_packetlen); memcpy(msg->msg(), d_packet, d_packetlen_cnt); d_target_queue->insert_tail(msg); // send it msg.reset(); // free it up @@ -389,8 +389,8 @@ namespace gr { if (d_packetlen_cnt == d_packetlen){ // packet is filled // build a message // NOTE: passing header field as arg1 is not scalable - gr_message_sptr msg = - gr_make_message(0, d_packet_whitener_offset, 0, d_packetlen_cnt); + message::sptr msg = + message::make(0, d_packet_whitener_offset, 0, d_packetlen_cnt); memcpy(msg->msg(), d_packet, d_packetlen_cnt); d_target_queue->insert_tail(msg); // send it diff --git a/gr-digital/lib/ofdm_frame_sink_impl.h b/gr-digital/lib/ofdm_frame_sink_impl.h index 49d5d6b5c0..dcf4a06163 100644 --- a/gr-digital/lib/ofdm_frame_sink_impl.h +++ b/gr-digital/lib/ofdm_frame_sink_impl.h @@ -36,7 +36,7 @@ namespace gr { static const int MAX_PKT_LEN = 4096; static const int HEADERBYTELEN = 4; - gr_msg_queue_sptr d_target_queue; // where to send the packet when received + msg_queue::sptr d_target_queue; // where to send the packet when received state_t d_state; unsigned int d_header; // header bits int d_headerbytelen_cnt; // how many so far @@ -90,7 +90,7 @@ namespace gr { public: ofdm_frame_sink_impl(const std::vector<gr_complex> &sym_position, const std::vector<char> &sym_value_out, - gr_msg_queue_sptr target_queue, + msg_queue::sptr target_queue, int occupied_tones, float phase_gain=0.25, float freq_gain=0.25*0.25/4); ~ofdm_frame_sink_impl(); diff --git a/gr-digital/lib/ofdm_insert_preamble_impl.cc b/gr-digital/lib/ofdm_insert_preamble_impl.cc index 100e69e22c..dcc3a900a4 100644 --- a/gr-digital/lib/ofdm_insert_preamble_impl.cc +++ b/gr-digital/lib/ofdm_insert_preamble_impl.cc @@ -24,7 +24,7 @@ #endif #include "ofdm_insert_preamble_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <stdexcept> #include <iostream> #include <string> @@ -42,11 +42,11 @@ namespace gr { ofdm_insert_preamble_impl::ofdm_insert_preamble_impl(int fft_length, const std::vector<std::vector<gr_complex> > &preamble) - : gr_block("ofdm_insert_preamble", - gr_make_io_signature2(1, 2, + : block("ofdm_insert_preamble", + io_signature::make2(1, 2, sizeof(gr_complex)*fft_length, sizeof(char)), - gr_make_io_signature2(1, 2, + io_signature::make2(1, 2, sizeof(gr_complex)*fft_length, sizeof(char))), d_fft_length(fft_length), diff --git a/gr-digital/lib/ofdm_mapper_bcv_impl.cc b/gr-digital/lib/ofdm_mapper_bcv_impl.cc index 5b5359d7b9..b241a3be71 100644 --- a/gr-digital/lib/ofdm_mapper_bcv_impl.cc +++ b/gr-digital/lib/ofdm_mapper_bcv_impl.cc @@ -25,7 +25,7 @@ #endif #include "ofdm_mapper_bcv_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <stdexcept> #include <string> @@ -49,11 +49,11 @@ namespace gr { unsigned int msgq_limit, unsigned int occupied_carriers, unsigned int fft_length) - : gr_sync_block("ofdm_mapper_bcv", - gr_make_io_signature(0, 0, 0), - gr_make_io_signature2(1, 2, sizeof(gr_complex)*fft_length, sizeof(char))), + : sync_block("ofdm_mapper_bcv", + io_signature::make(0, 0, 0), + io_signature::make2(1, 2, sizeof(gr_complex)*fft_length, sizeof(char))), d_constellation(constellation), - d_msgq(gr_make_msg_queue(msgq_limit)), d_msg_offset(0), d_eof(false), + d_msgq(msg_queue::make(msgq_limit)), d_msg_offset(0), d_eof(false), d_occupied_carriers(occupied_carriers), d_fft_length(fft_length), d_bit_offset(0), diff --git a/gr-digital/lib/ofdm_mapper_bcv_impl.h b/gr-digital/lib/ofdm_mapper_bcv_impl.h index 6459ed73d8..2754b0a04b 100644 --- a/gr-digital/lib/ofdm_mapper_bcv_impl.h +++ b/gr-digital/lib/ofdm_mapper_bcv_impl.h @@ -24,7 +24,7 @@ #define INCLUDED_DIGITAL_OFDM_MAPPER_BCV_IMPL_H #include <digital/ofdm_mapper_bcv.h> -#include <gr_message.h> +#include <gnuradio/message.h> #include <vector> namespace gr { @@ -34,10 +34,10 @@ namespace gr { { private: std::vector<gr_complex> d_constellation; - gr_msg_queue_sptr d_msgq; - gr_message_sptr d_msg; - unsigned d_msg_offset; - bool d_eof; + msg_queue::sptr d_msgq; + message::sptr d_msg; + unsigned d_msg_offset; + bool d_eof; unsigned int d_occupied_carriers; unsigned int d_fft_length; @@ -61,7 +61,7 @@ namespace gr { unsigned int fft_length); ~ofdm_mapper_bcv_impl(void); - gr_msg_queue_sptr msgq() const { return d_msgq; } + msg_queue::sptr msgq() const { return d_msgq; } int work(int noutput_items, gr_vector_const_void_star &input_items, diff --git a/gr-digital/lib/ofdm_sampler_impl.cc b/gr-digital/lib/ofdm_sampler_impl.cc index 0724b7cf26..dd6197dfc7 100644 --- a/gr-digital/lib/ofdm_sampler_impl.cc +++ b/gr-digital/lib/ofdm_sampler_impl.cc @@ -25,8 +25,8 @@ #endif #include "ofdm_sampler_impl.h" -#include <gr_io_signature.h> -#include <gr_expj.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/expj.h> #include <cstdio> namespace gr { @@ -44,9 +44,9 @@ namespace gr { ofdm_sampler_impl::ofdm_sampler_impl(unsigned int fft_length, unsigned int symbol_length, unsigned int timeout) - : gr_block("ofdm_sampler", - gr_make_io_signature2(2, 2, sizeof(gr_complex), sizeof(char)), - gr_make_io_signature2(2, 2, sizeof(gr_complex)*fft_length, sizeof(char)*fft_length)), + : block("ofdm_sampler", + io_signature::make2(2, 2, sizeof(gr_complex), sizeof(char)), + io_signature::make2(2, 2, sizeof(gr_complex)*fft_length, sizeof(char)*fft_length)), d_state(STATE_NO_SIG), d_timeout_max(timeout), d_fft_length(fft_length), d_symbol_length(symbol_length) { diff --git a/gr-digital/lib/ofdm_sampler_impl.h b/gr-digital/lib/ofdm_sampler_impl.h index 369447465f..a562bc54b3 100644 --- a/gr-digital/lib/ofdm_sampler_impl.h +++ b/gr-digital/lib/ofdm_sampler_impl.h @@ -24,7 +24,7 @@ #define INCLUDED_DIGITAL_OFDM_SAMPLER_IMPL_H #include <digital/ofdm_sampler.h> -#include <gr_sync_block.h> +#include <gnuradio/sync_block.h> namespace gr { namespace digital { diff --git a/gr-digital/lib/ofdm_serializer_vcc_impl.cc b/gr-digital/lib/ofdm_serializer_vcc_impl.cc index 09c0039a1c..9ca6d59ec9 100644 --- a/gr-digital/lib/ofdm_serializer_vcc_impl.cc +++ b/gr-digital/lib/ofdm_serializer_vcc_impl.cc @@ -23,7 +23,7 @@ #include "config.h" #endif -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include "ofdm_serializer_vcc_impl.h" namespace gr { @@ -75,9 +75,9 @@ namespace gr { const std::string &packet_len_tag_key, int symbols_skipped, bool input_is_shifted) - : gr_tagged_stream_block ("ofdm_serializer_vcc", - gr_make_io_signature(1, 1, sizeof (gr_complex) * fft_len), - gr_make_io_signature(1, 1, sizeof (gr_complex)), + : tagged_stream_block ("ofdm_serializer_vcc", + io_signature::make(1, 1, sizeof (gr_complex) * fft_len), + io_signature::make(1, 1, sizeof (gr_complex)), len_tag_key), d_fft_len(fft_len), d_occupied_carriers(occupied_carriers), @@ -143,7 +143,7 @@ namespace gr { long packet_length = 0; // Output frame int carr_offset = 0; - std::vector<gr_tag_t> tags; + std::vector<tag_t> tags; // Packet mode if (!d_length_tag_key_str.empty()) { get_tags_in_range(tags, 0, nitems_read(0), nitems_read(0)+1); diff --git a/gr-digital/lib/ofdm_sync_sc_cfb_impl.cc b/gr-digital/lib/ofdm_sync_sc_cfb_impl.cc index 822b9021e2..4486808425 100644 --- a/gr-digital/lib/ofdm_sync_sc_cfb_impl.cc +++ b/gr-digital/lib/ofdm_sync_sc_cfb_impl.cc @@ -24,18 +24,18 @@ #include "config.h" #endif -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include "ofdm_sync_sc_cfb_impl.h" -#include <blocks/plateau_detector_fb.h> -#include <blocks/complex_to_arg.h> -#include <blocks/complex_to_mag_squared.h> -#include <blocks/conjugate_cc.h> -#include <blocks/delay.h> -#include <blocks/divide_ff.h> -#include <blocks/multiply_cc.h> -#include <blocks/multiply_ff.h> -#include <blocks/sample_and_hold_ff.h> +#include <gnuradio/blocks/plateau_detector_fb.h> +#include <gnuradio/blocks/complex_to_arg.h> +#include <gnuradio/blocks/complex_to_mag_squared.h> +#include <gnuradio/blocks/conjugate_cc.h> +#include <gnuradio/blocks/delay.h> +#include <gnuradio/blocks/divide_ff.h> +#include <gnuradio/blocks/multiply_cc.h> +#include <gnuradio/blocks/multiply_ff.h> +#include <gnuradio/blocks/sample_and_hold_ff.h> #include <filter/fir_filter_ccf.h> #include <filter/fir_filter_fff.h> @@ -49,12 +49,12 @@ namespace gr { } ofdm_sync_sc_cfb_impl::ofdm_sync_sc_cfb_impl(int fft_len, int cp_len) - : gr_hier_block2 ("ofdm_sync_sc_cfb", - gr_make_io_signature(1, 1, sizeof (gr_complex)), + : hier_block2 ("ofdm_sync_sc_cfb", + io_signature::make(1, 1, sizeof (gr_complex)), #ifndef SYNC_ADD_DEBUG_OUTPUT - gr_make_io_signature2(2, 2, sizeof (float), sizeof (unsigned char))) + io_signature::make2(2, 2, sizeof (float), sizeof (unsigned char))) #else - gr_make_io_signature3(3, 3, sizeof (float), sizeof (unsigned char), sizeof (float))) + io_signature::make3(3, 3, sizeof (float), sizeof (unsigned char), sizeof (float))) #endif { std::vector<float> ma_taps(fft_len/2, 1.0); diff --git a/gr-digital/lib/packet_header_default.cc b/gr-digital/lib/packet_header_default.cc index ef5e44ac8d..8299e5625e 100644 --- a/gr-digital/lib/packet_header_default.cc +++ b/gr-digital/lib/packet_header_default.cc @@ -64,7 +64,7 @@ namespace gr { bool packet_header_default::header_formatter( long packet_len, unsigned char *out, - const std::vector<gr_tag_t> &tags + const std::vector<tag_t> &tags ) { packet_len &= 0x0FFF; @@ -91,11 +91,11 @@ namespace gr { bool packet_header_default::header_parser( const unsigned char *in, - std::vector<gr_tag_t> &tags) + std::vector<tag_t> &tags) { unsigned header_len = 0; unsigned header_num = 0; - gr_tag_t tag; + tag_t tag; int k = 0; // Position in "in" for (int i = 0; i < 12 && k < d_header_len; i += d_bits_per_byte, k++) { diff --git a/gr-digital/lib/packet_header_ofdm.cc b/gr-digital/lib/packet_header_ofdm.cc index cd42273285..bf0f642932 100644 --- a/gr-digital/lib/packet_header_ofdm.cc +++ b/gr-digital/lib/packet_header_ofdm.cc @@ -85,7 +85,7 @@ namespace gr { bool packet_header_ofdm::header_parser( const unsigned char *in, - std::vector<gr_tag_t> &tags) + std::vector<tag_t> &tags) { if (!packet_header_default::header_parser(in, tags)) { return false; @@ -108,7 +108,7 @@ namespace gr { frame_len++; i += d_occupied_carriers[k].size(); } - gr_tag_t tag; + tag_t tag; tag.key = d_frame_len_tag_key; tag.value = pmt::from_long(frame_len); tags.push_back(tag); diff --git a/gr-digital/lib/packet_headergenerator_bb_impl.cc b/gr-digital/lib/packet_headergenerator_bb_impl.cc index 3232858148..a0191fe85a 100644 --- a/gr-digital/lib/packet_headergenerator_bb_impl.cc +++ b/gr-digital/lib/packet_headergenerator_bb_impl.cc @@ -24,7 +24,7 @@ #endif #include <boost/format.hpp> -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include "packet_headergenerator_bb_impl.h" namespace gr { @@ -57,9 +57,9 @@ namespace gr { const gr::digital::packet_header_default::sptr &header_formatter, const std::string &len_tag_key ) - : gr_tagged_stream_block("packet_headergenerator_bb_impl", - gr_make_io_signature(1, 1, sizeof (char)), - gr_make_io_signature(1, 1, sizeof (char)), + : tagged_stream_block("packet_headergenerator_bb_impl", + io_signature::make(1, 1, sizeof (char)), + io_signature::make(1, 1, sizeof (char)), len_tag_key), d_formatter(header_formatter) { diff --git a/gr-digital/lib/packet_headergenerator_bb_impl.h b/gr-digital/lib/packet_headergenerator_bb_impl.h index ce60fdf76c..aaad42aebc 100644 --- a/gr-digital/lib/packet_headergenerator_bb_impl.h +++ b/gr-digital/lib/packet_headergenerator_bb_impl.h @@ -39,7 +39,7 @@ namespace gr { ); ~packet_headergenerator_bb_impl(); - void remove_length_tags(const std::vector<std::vector<gr_tag_t> > &tags) {}; + void remove_length_tags(const std::vector<std::vector<tag_t> > &tags) {}; int calculate_output_stream_length(const gr_vector_int &ninput_items) { return d_formatter->header_len(); }; int work(int noutput_items, diff --git a/gr-digital/lib/packet_headerparser_b_impl.cc b/gr-digital/lib/packet_headerparser_b_impl.cc index 17e5e85091..d55a3bd303 100644 --- a/gr-digital/lib/packet_headerparser_b_impl.cc +++ b/gr-digital/lib/packet_headerparser_b_impl.cc @@ -24,7 +24,7 @@ #endif #include <boost/format.hpp> -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include "packet_headerparser_b_impl.h" #define msg_port_id pmt::mp("header_data") @@ -48,9 +48,9 @@ namespace gr { } packet_headerparser_b_impl::packet_headerparser_b_impl(const gr::digital::packet_header_default::sptr &header_formatter) - : gr_sync_block("packet_headerparser_b", - gr_make_io_signature(1, 1, sizeof (unsigned char)), - gr_make_io_signature(0, 0, 0)), + : sync_block("packet_headerparser_b", + io_signature::make(1, 1, sizeof (unsigned char)), + io_signature::make(0, 0, 0)), d_header_formatter(header_formatter) { message_port_register_out(msg_port_id); @@ -72,7 +72,7 @@ namespace gr { return 0; } - std::vector<gr_tag_t> tags; + std::vector<tag_t> tags; if (!d_header_formatter->header_parser(in, tags)) { GR_LOG_INFO(d_logger, boost::format("Detected an invalid packet at item %1%") % nitems_read(0)); message_port_pub(msg_port_id, pmt::PMT_F); diff --git a/gr-digital/lib/packet_sink_impl.cc b/gr-digital/lib/packet_sink_impl.cc index 1d79b3d717..56a3d8b395 100644 --- a/gr-digital/lib/packet_sink_impl.cc +++ b/gr-digital/lib/packet_sink_impl.cc @@ -25,14 +25,14 @@ #endif #include "packet_sink_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <cstdio> #include <errno.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> #include <stdexcept> -#include <blocks/count_bits.h> +#include <gnuradio/blocks/count_bits.h> #include <string.h> namespace gr { @@ -79,17 +79,17 @@ static const int DEFAULT_THRESHOLD = 12; packet_sink::sptr packet_sink::make(const std::vector<unsigned char>& sync_vector, - gr_msg_queue_sptr target_queue, int threshold) + msg_queue::sptr target_queue, int threshold) { return gnuradio::get_initial_sptr (new packet_sink_impl(sync_vector, target_queue, threshold)); } packet_sink_impl::packet_sink_impl(const std::vector<unsigned char>& sync_vector, - gr_msg_queue_sptr target_queue, int threshold) - : gr_sync_block("packet_sink", - gr_make_io_signature(1, 1, sizeof(float)), - gr_make_io_signature(0, 0, 0)), + msg_queue::sptr target_queue, int threshold) + : sync_block("packet_sink", + io_signature::make(1, 1, sizeof(float)), + io_signature::make(0, 0, 0)), d_target_queue(target_queue), d_threshold(threshold == -1 ? DEFAULT_THRESHOLD : threshold) { d_sync_vector = 0; @@ -184,7 +184,7 @@ static const int DEFAULT_THRESHOLD = 12; if(d_packetlen_cnt == d_packetlen) { // packet is filled // build a message - gr_message_sptr msg = gr_make_message(0, 0, 0, d_packetlen_cnt); + message::sptr msg = message::make(0, 0, 0, d_packetlen_cnt); memcpy(msg->msg(), d_packet, d_packetlen_cnt); d_target_queue->insert_tail(msg); // send it diff --git a/gr-digital/lib/packet_sink_impl.h b/gr-digital/lib/packet_sink_impl.h index a63db7a142..a6c80629c6 100644 --- a/gr-digital/lib/packet_sink_impl.h +++ b/gr-digital/lib/packet_sink_impl.h @@ -36,7 +36,7 @@ namespace gr { static const int MAX_PKT_LEN = 4096; static const int HEADERBITLEN = 32; - gr_msg_queue_sptr d_target_queue; // where to send the packet when received + msg_queue::sptr d_target_queue; // where to send the packet when received unsigned long long d_sync_vector; // access code to locate start of packet unsigned int d_threshold; // how many bits may be wrong in sync vector @@ -45,7 +45,7 @@ namespace gr { unsigned long long d_shift_reg; // used to look for sync_vector unsigned int d_header; // header bits - int d_headerbitlen_cnt;// how many so far + int d_headerbitlen_cnt;// how many so far unsigned char d_packet[MAX_PKT_LEN]; // assembled payload unsigned char d_packet_byte; // byte being assembled @@ -75,7 +75,7 @@ namespace gr { public: packet_sink_impl(const std::vector<unsigned char>& sync_vector, - gr_msg_queue_sptr target_queue, + msg_queue::sptr target_queue, int threshold=-1); ~packet_sink_impl(); diff --git a/gr-digital/lib/pfb_clock_sync_ccf_impl.cc b/gr-digital/lib/pfb_clock_sync_ccf_impl.cc index 3c4a0e8ad4..685c0e6150 100644 --- a/gr-digital/lib/pfb_clock_sync_ccf_impl.cc +++ b/gr-digital/lib/pfb_clock_sync_ccf_impl.cc @@ -28,8 +28,8 @@ #include <cmath> #include "pfb_clock_sync_ccf_impl.h" -#include <gr_io_signature.h> -#include <gr_math.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/math.h> namespace gr { namespace digital { @@ -58,9 +58,9 @@ namespace gr { float init_phase, float max_rate_deviation, int osps) - : gr_block("pfb_clock_sync_ccf", - gr_make_io_signature(1, 1, sizeof(gr_complex)), - gr_make_io_signaturev(1, 4, iosig)), + : block("pfb_clock_sync_ccf", + io_signature::make(1, 1, sizeof(gr_complex)), + io_signature::makev(1, 4, iosig)), d_updated(false), d_nfilters(filter_size), d_max_dev(max_rate_deviation), d_osps(osps), d_error(0), d_out_idx(0) @@ -443,7 +443,7 @@ namespace gr { d_k = d_k + d_alpha*d_error; // Keep our rate within a good range - d_rate_f = gr_branchless_clip(d_rate_f, d_max_dev); + d_rate_f = gr::branchless_clip(d_rate_f, d_max_dev); i+=d_osps; count += (int)floor(d_sps); diff --git a/gr-digital/lib/pfb_clock_sync_fff_impl.cc b/gr-digital/lib/pfb_clock_sync_fff_impl.cc index fb60192324..236738c550 100644 --- a/gr-digital/lib/pfb_clock_sync_fff_impl.cc +++ b/gr-digital/lib/pfb_clock_sync_fff_impl.cc @@ -28,8 +28,8 @@ #include <cmath> #include "pfb_clock_sync_fff_impl.h" -#include <gr_io_signature.h> -#include <gr_math.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/math.h> namespace gr { namespace digital { @@ -58,9 +58,9 @@ namespace gr { float init_phase, float max_rate_deviation, int osps) - : gr_block("pfb_clock_sync_fff", - gr_make_io_signature(1, 1, sizeof(float)), - gr_make_io_signaturev(1, 4, iosig)), + : block("pfb_clock_sync_fff", + io_signature::make(1, 1, sizeof(float)), + io_signature::makev(1, 4, iosig)), d_updated(false), d_nfilters(filter_size), d_max_dev(max_rate_deviation), d_osps(osps), d_error(0), d_out_idx(0) @@ -421,7 +421,7 @@ namespace gr { d_k = d_k + d_alpha*d_error; // Keep our rate within a good range - d_rate_f = gr_branchless_clip(d_rate_f, d_max_dev); + d_rate_f = gr::branchless_clip(d_rate_f, d_max_dev); i+=d_osps; count += (int)floor(d_sps); diff --git a/gr-digital/lib/pn_correlator_cc_impl.cc b/gr-digital/lib/pn_correlator_cc_impl.cc index da0bdbefe9..649b73be14 100644 --- a/gr-digital/lib/pn_correlator_cc_impl.cc +++ b/gr-digital/lib/pn_correlator_cc_impl.cc @@ -25,7 +25,7 @@ #endif #include "pn_correlator_cc_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace digital { @@ -40,9 +40,9 @@ namespace gr { pn_correlator_cc_impl::pn_correlator_cc_impl(int degree, int mask, int seed) - : gr_sync_decimator("pn_correlator_cc", - gr_make_io_signature(1, 1, sizeof(gr_complex)), - gr_make_io_signature(1, 1, sizeof(gr_complex)), + : sync_decimator("pn_correlator_cc", + io_signature::make(1, 1, sizeof(gr_complex)), + io_signature::make(1, 1, sizeof(gr_complex)), (unsigned int)((1ULL << degree)-1)) // PN code length { d_len = (unsigned int)((1ULL << degree)-1); diff --git a/gr-digital/lib/probe_density_b_impl.cc b/gr-digital/lib/probe_density_b_impl.cc index 532930ad1b..d718d4b44d 100644 --- a/gr-digital/lib/probe_density_b_impl.cc +++ b/gr-digital/lib/probe_density_b_impl.cc @@ -23,7 +23,7 @@ #endif #include "probe_density_b_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <iostream> namespace gr { @@ -37,9 +37,9 @@ namespace gr { } probe_density_b_impl::probe_density_b_impl(double alpha) - : gr_sync_block("density_b", - gr_make_io_signature(1, 1, sizeof(char)), - gr_make_io_signature(0, 0, 0)) + : sync_block("density_b", + io_signature::make(1, 1, sizeof(char)), + io_signature::make(0, 0, 0)) { set_alpha(alpha); d_density = 1.0; diff --git a/gr-digital/lib/probe_mpsk_snr_est_c_impl.cc b/gr-digital/lib/probe_mpsk_snr_est_c_impl.cc index fb71bdc110..6fa7c1bd0d 100644 --- a/gr-digital/lib/probe_mpsk_snr_est_c_impl.cc +++ b/gr-digital/lib/probe_mpsk_snr_est_c_impl.cc @@ -25,7 +25,7 @@ #endif #include "probe_mpsk_snr_est_c_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <cstdio> namespace gr { @@ -43,9 +43,9 @@ namespace gr { probe_mpsk_snr_est_c_impl::probe_mpsk_snr_est_c_impl(snr_est_type_t type, int msg_nsamples, double alpha) - : gr_sync_block("probe_mpsk_snr_est_c", - gr_make_io_signature(1, 1, sizeof(gr_complex)), - gr_make_io_signature(0, 0, 0)) + : sync_block("probe_mpsk_snr_est_c", + io_signature::make(1, 1, sizeof(gr_complex)), + io_signature::make(0, 0, 0)) { d_snr_est = NULL; diff --git a/gr-digital/lib/scrambler_bb_impl.cc b/gr-digital/lib/scrambler_bb_impl.cc index d656fe2430..3b32833419 100644 --- a/gr-digital/lib/scrambler_bb_impl.cc +++ b/gr-digital/lib/scrambler_bb_impl.cc @@ -25,7 +25,7 @@ #endif #include "scrambler_bb_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace digital { @@ -38,9 +38,9 @@ namespace gr { } scrambler_bb_impl::scrambler_bb_impl(int mask, int seed, int len) - : gr_sync_block("scrambler_bb", - gr_make_io_signature(1, 1, sizeof(unsigned char)), - gr_make_io_signature(1, 1, sizeof(unsigned char))), + : sync_block("scrambler_bb", + io_signature::make(1, 1, sizeof(unsigned char)), + io_signature::make(1, 1, sizeof(unsigned char))), d_lfsr(mask, seed, len) { } diff --git a/gr-digital/lib/scrambler_bb_impl.h b/gr-digital/lib/scrambler_bb_impl.h index 8525e7ef5c..31a0e294ba 100644 --- a/gr-digital/lib/scrambler_bb_impl.h +++ b/gr-digital/lib/scrambler_bb_impl.h @@ -24,7 +24,7 @@ #define INCLUDED_GR_SCRAMBLER_BB_IMPL_H #include <digital/scrambler_bb.h> -#include <gr_sync_block.h> +#include <gnuradio/sync_block.h> #include <digital/lfsr.h> namespace gr { diff --git a/gr-digital/lib/simple_correlator_impl.cc b/gr-digital/lib/simple_correlator_impl.cc index 6b35b4cf0d..37ee137525 100644 --- a/gr-digital/lib/simple_correlator_impl.cc +++ b/gr-digital/lib/simple_correlator_impl.cc @@ -26,8 +26,8 @@ #include "simple_correlator_impl.h" #include <digital/simple_framer_sync.h> -#include <gr_io_signature.h> -#include <blocks/count_bits.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/blocks/count_bits.h> #include <assert.h> #include <stdexcept> #include <string.h> @@ -46,9 +46,9 @@ namespace gr { } simple_correlator_impl::simple_correlator_impl(int payload_bytesize) - : gr_block("simple_correlator", - gr_make_io_signature(1, 1, sizeof(float)), - gr_make_io_signature(1, 1, sizeof(unsigned char))), + : block("simple_correlator", + io_signature::make(1, 1, sizeof(float)), + io_signature::make(1, 1, sizeof(unsigned char))), d_payload_bytesize(payload_bytesize), d_state(ST_LOOKING), d_osi(0), d_bblen((payload_bytesize + GRSF_PAYLOAD_OVERHEAD) * GRSF_BITS_PER_BYTE), diff --git a/gr-digital/lib/simple_framer_impl.cc b/gr-digital/lib/simple_framer_impl.cc index ff7e3ab614..64e70d5cfb 100644 --- a/gr-digital/lib/simple_framer_impl.cc +++ b/gr-digital/lib/simple_framer_impl.cc @@ -26,7 +26,7 @@ #include "simple_framer_impl.h" #include <digital/simple_framer_sync.h> -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <assert.h> #include <string> @@ -41,9 +41,9 @@ namespace gr { } simple_framer_impl::simple_framer_impl(int payload_bytesize) - : gr_block("simple_framer", - gr_make_io_signature(1, 1, sizeof(unsigned char)), - gr_make_io_signature(1, 1, sizeof(unsigned char))), + : block("simple_framer", + io_signature::make(1, 1, sizeof(unsigned char)), + io_signature::make(1, 1, sizeof(unsigned char))), d_seqno (0), d_payload_bytesize (payload_bytesize), d_input_block_size (payload_bytesize), d_output_block_size (payload_bytesize + GRSF_OVERHEAD) diff --git a/gr-digital/python/qa_crc32_bb.py b/gr-digital/python/qa_crc32_bb.py index 6f5249ca08..4991f49e14 100755 --- a/gr-digital/python/qa_crc32_bb.py +++ b/gr-digital/python/qa_crc32_bb.py @@ -36,7 +36,7 @@ class qa_crc32_bb (gr_unittest.TestCase): """ Make sure the output of a CRC set is 4 bytes longer than the input. """ data = range(16) tag_name = "len" - tag = gr.gr_tag_t() + tag = gr.tag_t() tag.offset = 0 tag.key = pmt.string_to_symbol(tag_name) tag.value = pmt.from_long(len(data)) @@ -53,7 +53,7 @@ class qa_crc32_bb (gr_unittest.TestCase): is the same as the input. """ data = (0, 1, 2, 3, 4, 5, 6, 7, 8) tag_name = "len" - tag = gr.gr_tag_t() + tag = gr.tag_t() tag.offset = 0 tag.key = pmt.string_to_symbol(tag_name) tag.value = pmt.from_long(len(data)) @@ -70,23 +70,23 @@ class qa_crc32_bb (gr_unittest.TestCase): tag_name = "length" pack_len = 8 packets = range(pack_len*2) - tag1 = gr.gr_tag_t() + tag1 = gr.tag_t() tag1.offset = 0 tag1.key = pmt.string_to_symbol(tag_name) tag1.value = pmt.from_long(pack_len) - tag2 = gr.gr_tag_t() + tag2 = gr.tag_t() tag2.offset = pack_len tag2.key = pmt.string_to_symbol(tag_name) tag2.value = pmt.from_long(pack_len) - testtag1 = gr.gr_tag_t() + testtag1 = gr.tag_t() testtag1.offset = 1 testtag1.key = pmt.string_to_symbol("tag1") testtag1.value = pmt.from_long(0) - testtag2 = gr.gr_tag_t() + testtag2 = gr.tag_t() testtag2.offset = pack_len testtag2.key = pmt.string_to_symbol("tag2") testtag2.value = pmt.from_long(0) - testtag3 = gr.gr_tag_t() + testtag3 = gr.tag_t() testtag3.offset = len(packets)-1 testtag3.key = pmt.string_to_symbol("tag3") testtag3.value = pmt.from_long(0) @@ -112,7 +112,7 @@ class qa_crc32_bb (gr_unittest.TestCase): """ Corrupt the data and make sure it fails CRC test. """ data = (0, 1, 2, 3, 4, 5, 6, 7) tag_name = "len" - tag = gr.gr_tag_t() + tag = gr.tag_t() tag.offset = 0 tag.key = pmt.string_to_symbol(tag_name) tag.value = pmt.from_long(len(data)) @@ -130,11 +130,11 @@ class qa_crc32_bb (gr_unittest.TestCase): """ Make sure tags on the CRC aren't lost. """ data = (0, 1, 2, 3, 4, 5, 6, 7, 8, 230, 166, 39, 8) tag_name = "len" - tag = gr.gr_tag_t() + tag = gr.tag_t() tag.offset = 0 tag.key = pmt.string_to_symbol(tag_name) tag.value = pmt.from_long(len(data)) - testtag = gr.gr_tag_t() + testtag = gr.tag_t() testtag.offset = len(data)-1 testtag.key = pmt.string_to_symbol('tag1') testtag.value = pmt.from_long(0) diff --git a/gr-digital/python/qa_ofdm_carrier_allocator_cvc.py b/gr-digital/python/qa_ofdm_carrier_allocator_cvc.py index f5c72fb87e..c0c9929646 100755 --- a/gr-digital/python/qa_ofdm_carrier_allocator_cvc.py +++ b/gr-digital/python/qa_ofdm_carrier_allocator_cvc.py @@ -46,7 +46,7 @@ class qa_digital_carrier_allocator_cvc (gr_unittest.TestCase): expected_result = tuple(sync_word[0] + [1j, 0, 0, 1, 2, 3]) # ^ DC carrier tag_name = "len" - tag = gr.gr_tag_t() + tag = gr.tag_t() tag.offset = 0 tag.key = pmt.string_to_symbol(tag_name) tag.value = pmt.from_long(len(tx_symbols)) @@ -74,7 +74,7 @@ class qa_digital_carrier_allocator_cvc (gr_unittest.TestCase): expected_result = (1j, 0, 1, 2, 3) # ^ DC carrier tag_name = "len" - tag = gr.gr_tag_t() + tag = gr.tag_t() tag.offset = 0 tag.key = pmt.string_to_symbol(tag_name) tag.value = pmt.from_long(len(tx_symbols)) @@ -100,7 +100,7 @@ class qa_digital_carrier_allocator_cvc (gr_unittest.TestCase): pilot_carriers = ((3,),) expected_result = (1j, 0, 1, 0, 2, 3) tag_name = "len" - tag = gr.gr_tag_t() + tag = gr.tag_t() tag.offset = 0 tag.key = pmt.string_to_symbol(tag_name) tag.value = pmt.from_long(len(tx_symbols)) @@ -134,27 +134,27 @@ class qa_digital_carrier_allocator_cvc (gr_unittest.TestCase): 0, 13, 1j, 14, 15, 0, 0, 0, 0, 0, 0, 0, 0, 2j, 0, 0) fft_len = 16 tag_name = "len" - tag1 = gr.gr_tag_t() + tag1 = gr.tag_t() tag1.offset = 0 tag1.key = pmt.string_to_symbol(tag_name) tag1.value = pmt.from_long(len(tx_symbols)) - tag2 = gr.gr_tag_t() + tag2 = gr.tag_t() tag2.offset = len(tx_symbols) tag2.key = pmt.string_to_symbol(tag_name) tag2.value = pmt.from_long(len(tx_symbols)) - testtag1 = gr.gr_tag_t() + testtag1 = gr.tag_t() testtag1.offset = 0 testtag1.key = pmt.string_to_symbol('tag1') testtag1.value = pmt.from_long(0) - testtag2 = gr.gr_tag_t() + testtag2 = gr.tag_t() testtag2.offset = 7 # On the 2nd OFDM symbol testtag2.key = pmt.string_to_symbol('tag2') testtag2.value = pmt.from_long(0) - testtag3 = gr.gr_tag_t() + testtag3 = gr.tag_t() testtag3.offset = len(tx_symbols)+1 # First OFDM symbol of packet 2 testtag3.key = pmt.string_to_symbol('tag3') testtag3.value = pmt.from_long(0) - testtag4 = gr.gr_tag_t() + testtag4 = gr.tag_t() testtag4.offset = 2*len(tx_symbols)-1 # Last OFDM symbol of packet 2 testtag4.key = pmt.string_to_symbol('tag4') testtag4.value = pmt.from_long(0) diff --git a/gr-digital/python/qa_ofdm_chanest_vcvc.py b/gr-digital/python/qa_ofdm_chanest_vcvc.py index d095bbcd9c..b11bb4c556 100755 --- a/gr-digital/python/qa_ofdm_chanest_vcvc.py +++ b/gr-digital/python/qa_ofdm_chanest_vcvc.py @@ -61,11 +61,11 @@ class qa_ofdm_sync_eqinit_vcvc (gr_unittest.TestCase): tx_data = shift_tuple(sync_symbol1, carr_offset) + \ shift_tuple(sync_symbol2, carr_offset) + \ shift_tuple(data_symbol, carr_offset) - tag1 = gr.gr_tag_t() + tag1 = gr.tag_t() tag1.offset = 0 tag1.key = pmt.string_to_symbol("test_tag_1") tag1.value = pmt.from_long(23) - tag2 = gr.gr_tag_t() + tag2 = gr.tag_t() tag2.offset = 2 tag2.key = pmt.string_to_symbol("test_tag_2") tag2.value = pmt.from_long(42) diff --git a/gr-digital/python/qa_ofdm_cyclic_prefixer.py b/gr-digital/python/qa_ofdm_cyclic_prefixer.py index 0469b3f970..69091d8d00 100755 --- a/gr-digital/python/qa_ofdm_cyclic_prefixer.py +++ b/gr-digital/python/qa_ofdm_cyclic_prefixer.py @@ -67,11 +67,11 @@ class test_ofdm_cyclic_prefixer (gr_unittest.TestCase): tag_name = "length" expected_result = (7.0/2, 8, 1, 2, 3, 4, 5, 6, 7, 8, # 1.0/2 7.0/2+1.0/2, 8, 1, 2, 3, 4, 5, 6, 7, 8, 1.0/2) - tag = gr.gr_tag_t() + tag = gr.tag_t() tag.offset = 0 tag.key = pmt.string_to_symbol(tag_name) tag.value = pmt.from_long(2) - tag2 = gr.gr_tag_t() + tag2 = gr.tag_t() tag2.offset = 1 tag2.key = pmt.string_to_symbol("random_tag") tag2.value = pmt.from_long(42) diff --git a/gr-digital/python/qa_ofdm_frame_equalizer_vcvc.py b/gr-digital/python/qa_ofdm_frame_equalizer_vcvc.py index cb087da2f4..a7cf78e928 100755 --- a/gr-digital/python/qa_ofdm_frame_equalizer_vcvc.py +++ b/gr-digital/python/qa_ofdm_frame_equalizer_vcvc.py @@ -40,11 +40,11 @@ class qa_ofdm_frame_equalizer_vcvc (gr_unittest.TestCase): n_syms = 3 len_tag_key = "frame_len" tx_data = (1,) * fft_len * n_syms - len_tag = gr.gr_tag_t() + len_tag = gr.tag_t() len_tag.offset = 0 len_tag.key = pmt.string_to_symbol(len_tag_key) len_tag.value = pmt.from_long(n_syms) - chan_tag = gr.gr_tag_t() + chan_tag = gr.tag_t() chan_tag.offset = 0 chan_tag.key = pmt.string_to_symbol("ofdm_sync_chan_taps") chan_tag.value = pmt.init_c32vector(fft_len, (1,) * fft_len) @@ -85,11 +85,11 @@ class qa_ofdm_frame_equalizer_vcvc (gr_unittest.TestCase): idx2 = idx+2*fft_len channel[idx2] = channel[idx2] * numpy.exp(1j * 0 * numpy.pi * (numpy.random.rand()-.5)) len_tag_key = "frame_len" - len_tag = gr.gr_tag_t() + len_tag = gr.tag_t() len_tag.offset = 0 len_tag.key = pmt.string_to_symbol(len_tag_key) len_tag.value = pmt.from_long(4) - chan_tag = gr.gr_tag_t() + chan_tag = gr.tag_t() chan_tag.offset = 0 chan_tag.key = pmt.string_to_symbol("ofdm_sync_chan_taps") chan_tag.value = pmt.init_c32vector(fft_len, channel[:fft_len]) @@ -167,11 +167,11 @@ class qa_ofdm_frame_equalizer_vcvc (gr_unittest.TestCase): idx2 = idx+2*fft_len channel[idx2] = channel[idx2] * numpy.exp(1j * 0 * numpy.pi * (numpy.random.rand()-.5)) len_tag_key = "frame_len" - len_tag = gr.gr_tag_t() + len_tag = gr.tag_t() len_tag.offset = 0 len_tag.key = pmt.string_to_symbol(len_tag_key) len_tag.value = pmt.from_long(4) - chan_tag = gr.gr_tag_t() + chan_tag = gr.tag_t() chan_tag.offset = 0 chan_tag.key = pmt.string_to_symbol("ofdm_sync_chan_taps") chan_tag.value = pmt.init_c32vector(fft_len, channel[:fft_len]) diff --git a/gr-digital/python/qa_ofdm_serializer_vcc.py b/gr-digital/python/qa_ofdm_serializer_vcc.py index d0f0bf6449..4449c1a24d 100755 --- a/gr-digital/python/qa_ofdm_serializer_vcc.py +++ b/gr-digital/python/qa_ofdm_serializer_vcc.py @@ -47,7 +47,7 @@ class qa_ofdm_serializer_vcc (gr_unittest.TestCase): occupied_carriers = ((1, 3, 4, 11, 12, 14), (1, 2, 4, 11, 13, 14),) n_syms = len(tx_symbols)/fft_len tag_name = "len" - tag = gr.gr_tag_t() + tag = gr.tag_t() tag.offset = 0 tag.key = pmt.string_to_symbol(tag_name) tag.value = pmt.from_long(n_syms) @@ -74,11 +74,11 @@ class qa_ofdm_serializer_vcc (gr_unittest.TestCase): occupied_carriers = ((1, 3, 4, 11, 12, 14), (1, 2, 4, 11, 13, 14),) n_syms = len(tx_symbols)/fft_len tag_name = "len" - tag = gr.gr_tag_t() + tag = gr.tag_t() tag.offset = 0 tag.key = pmt.string_to_symbol(tag_name) tag.value = pmt.from_long(n_syms) - offsettag = gr.gr_tag_t() + offsettag = gr.tag_t() offsettag.offset = 0 offsettag.key = pmt.string_to_symbol("ofdm_sync_carr_offset") offsettag.value = pmt.from_long(carr_offset) @@ -104,7 +104,7 @@ class qa_ofdm_serializer_vcc (gr_unittest.TestCase): sync_word = (range(fft_len),) tx_data = tuple([numpy.random.randint(0, 10) for x in range(4 * n_syms)]) tag_name = "len" - tag = gr.gr_tag_t() + tag = gr.tag_t() tag.offset = 0 tag.key = pmt.string_to_symbol(tag_name) tag.value = pmt.from_long(len(tx_data)) @@ -139,11 +139,11 @@ class qa_ofdm_serializer_vcc (gr_unittest.TestCase): tx_data = tuple([numpy.random.randint(0, 10) for x in range(4 * n_syms)]) #tx_data = (1,) * occupied_carriers[0] * n_syms tag_name = "len" - tag = gr.gr_tag_t() + tag = gr.tag_t() tag.offset = 0 tag.key = pmt.string_to_symbol(tag_name) tag.value = pmt.from_long(len(tx_data)) - offsettag = gr.gr_tag_t() + offsettag = gr.tag_t() offsettag.offset = 0 offsettag.key = pmt.string_to_symbol("ofdm_sync_carr_offset") offsettag.value = pmt.from_long(carr_offset) @@ -182,11 +182,11 @@ class qa_ofdm_serializer_vcc (gr_unittest.TestCase): occupied_carriers = ((1, 3, 4, 11, 12, 14), (1, 2, 4, 11, 13, 14),) n_syms = len(tx_symbols)/fft_len tag_name = "len" - tag = gr.gr_tag_t() + tag = gr.tag_t() tag.offset = 0 tag.key = pmt.string_to_symbol(tag_name) tag.value = pmt.from_long(n_syms) - tag2 = gr.gr_tag_t() + tag2 = gr.tag_t() tag2.offset = 0 tag2.key = pmt.string_to_symbol("packet_len") tag2.value = pmt.from_long(len(expected_result)) diff --git a/gr-digital/python/qa_packet_headergenerator_bb.py b/gr-digital/python/qa_packet_headergenerator_bb.py index 03d3af3010..0471385afd 100755 --- a/gr-digital/python/qa_packet_headergenerator_bb.py +++ b/gr-digital/python/qa_packet_headergenerator_bb.py @@ -36,15 +36,15 @@ class qa_packet_headergenerator_bb (gr_unittest.TestCase): # 3 PDUs: | | | data = (1, 2, 3, 4, 1, 2) + tuple(range(25)) tagname = "packet_len" - tag1 = gr.gr_tag_t() + tag1 = gr.tag_t() tag1.offset = 0 tag1.key = pmt.string_to_symbol(tagname) tag1.value = pmt.from_long(4) - tag2 = gr.gr_tag_t() + tag2 = gr.tag_t() tag2.offset = 4 tag2.key = pmt.string_to_symbol(tagname) tag2.value = pmt.from_long(2) - tag3 = gr.gr_tag_t() + tag3 = gr.tag_t() tag3.offset = 6 tag3.key = pmt.string_to_symbol(tagname) tag3.value = pmt.from_long(25) @@ -65,15 +65,15 @@ class qa_packet_headergenerator_bb (gr_unittest.TestCase): # 3 PDUs: | | | | data = (1, 2, 3, 4, 1, 2, 1, 2, 3, 4) tagname = "packet_len" - tag1 = gr.gr_tag_t() + tag1 = gr.tag_t() tag1.offset = 0 tag1.key = pmt.string_to_symbol(tagname) tag1.value = pmt.from_long(4) - tag2 = gr.gr_tag_t() + tag2 = gr.tag_t() tag2.offset = 4 tag2.key = pmt.string_to_symbol(tagname) tag2.value = pmt.from_long(2) - tag3 = gr.gr_tag_t() + tag3 = gr.tag_t() tag3.offset = 6 tag3.key = pmt.string_to_symbol(tagname) tag3.value = pmt.from_long(4) @@ -95,15 +95,15 @@ class qa_packet_headergenerator_bb (gr_unittest.TestCase): # 3 PDUs: | | | | data = (1, 2, 3, 4, 1, 2, 1, 2, 3, 4) tagname = "packet_len" - tag1 = gr.gr_tag_t() + tag1 = gr.tag_t() tag1.offset = 0 tag1.key = pmt.string_to_symbol(tagname) tag1.value = pmt.from_long(4) - tag2 = gr.gr_tag_t() + tag2 = gr.tag_t() tag2.offset = 4 tag2.key = pmt.string_to_symbol(tagname) tag2.value = pmt.from_long(2) - tag3 = gr.gr_tag_t() + tag3 = gr.tag_t() tag3.offset = 6 tag3.key = pmt.string_to_symbol(tagname) tag3.value = pmt.from_long(4) @@ -125,15 +125,15 @@ class qa_packet_headergenerator_bb (gr_unittest.TestCase): # 3 PDUs: | | | | data = (1, 2, 3, 4, 1, 2, 1, 2, 3, 4) tagname = "packet_len" - tag1 = gr.gr_tag_t() + tag1 = gr.tag_t() tag1.offset = 0 tag1.key = pmt.string_to_symbol(tagname) tag1.value = pmt.from_long(4) - tag2 = gr.gr_tag_t() + tag2 = gr.tag_t() tag2.offset = 4 tag2.key = pmt.string_to_symbol(tagname) tag2.value = pmt.from_long(2) - tag3 = gr.gr_tag_t() + tag3 = gr.tag_t() tag3.offset = 6 tag3.key = pmt.string_to_symbol(tagname) tag3.value = pmt.from_long(4) diff --git a/gr-digital/python/utils/tagged_streams.py b/gr-digital/python/utils/tagged_streams.py index f2a58ffe1e..c7edbf61eb 100644 --- a/gr-digital/python/utils/tagged_streams.py +++ b/gr-digital/python/utils/tagged_streams.py @@ -27,7 +27,7 @@ def make_lengthtags(lengths, offsets, tagname='length', vlen=1): tags = [] assert(len(offsets) == len(lengths)) for offset, length in zip(offsets, lengths): - tag = gr.gr_tag_t() + tag = gr.tag_t() tag.offset = offset/vlen tag.key = pmt.string_to_symbol(tagname) tag.value = pmt.from_long(length/vlen) @@ -124,7 +124,7 @@ def packets_to_vectors(packets, lengthtagname, vlen=1): offset = 0 for packet in packets: data.extend(packet) - tag = gr.gr_tag_t() + tag = gr.tag_t() tag.offset = offset/vlen tag.key = pmt.string_to_symbol(lengthtagname) tag.value = pmt.from_long(len(packet)/vlen) diff --git a/gr-digital/swig/digital_swig.i b/gr-digital/swig/digital_swig.i index 54f9c64e2d..a721e6ec52 100644 --- a/gr-digital/swig/digital_swig.i +++ b/gr-digital/swig/digital_swig.i @@ -32,9 +32,9 @@ %include "analog/cpm.h" %{ -#include <blocks/control_loop.h> +#include <gnuradio/blocks/control_loop.h> %} -%include <blocks/control_loop.h> +%include <gnuradio/blocks/control_loop.h> %{ #include "digital/additive_scrambler_bb.h" |