From f3e2e07201c50033bf6c9d0c6a6f068557b4f17f Mon Sep 17 00:00:00 2001
From: Tom Rondeau <trondeau@vt.edu>
Date: Wed, 17 Apr 2013 13:43:52 -0400
Subject: runtime: converting runtime core to gr namespace, gnuradio include
dir.
---
gr-digital/include/digital/additive_scrambler_bb.h | 4 ++--
gr-digital/include/digital/api.h | 2 +-
gr-digital/include/digital/binary_slicer_fb.h | 4 ++--
gr-digital/include/digital/chunks_to_symbols_XX.h.t | 4 ++--
gr-digital/include/digital/clock_recovery_mm_cc.h | 4 ++--
gr-digital/include/digital/clock_recovery_mm_ff.h | 4 ++--
gr-digital/include/digital/cma_equalizer_cc.h | 4 ++--
gr-digital/include/digital/constellation.h | 2 +-
gr-digital/include/digital/constellation_decoder_cb.h | 4 ++--
gr-digital/include/digital/constellation_receiver_cb.h | 4 ++--
gr-digital/include/digital/correlate_access_code_bb.h | 4 ++--
gr-digital/include/digital/correlate_access_code_tag_bb.h | 4 ++--
gr-digital/include/digital/costas_loop_cc.h | 6 +++---
gr-digital/include/digital/cpmmod_bc.h | 4 ++--
gr-digital/include/digital/crc32.h | 2 +-
gr-digital/include/digital/crc32_bb.h | 4 ++--
gr-digital/include/digital/descrambler_bb.h | 4 ++--
gr-digital/include/digital/diff_decoder_bb.h | 4 ++--
gr-digital/include/digital/diff_encoder_bb.h | 4 ++--
gr-digital/include/digital/diff_phasor_cc.h | 4 ++--
gr-digital/include/digital/fll_band_edge_cc.h | 6 +++---
gr-digital/include/digital/framer_sink_1.h | 8 ++++----
gr-digital/include/digital/glfsr_source_b.h | 4 ++--
gr-digital/include/digital/glfsr_source_f.h | 4 ++--
gr-digital/include/digital/header_payload_demux.h | 4 ++--
gr-digital/include/digital/kurtotic_equalizer_cc.h | 4 ++--
gr-digital/include/digital/lms_dd_equalizer_cc.h | 4 ++--
gr-digital/include/digital/map_bb.h | 4 ++--
gr-digital/include/digital/mpsk_receiver_cc.h | 4 ++--
gr-digital/include/digital/mpsk_snr_est.h | 2 +-
gr-digital/include/digital/mpsk_snr_est_cc.h | 4 ++--
gr-digital/include/digital/ofdm_carrier_allocator_cvc.h | 4 ++--
gr-digital/include/digital/ofdm_chanest_vcvc.h | 4 ++--
gr-digital/include/digital/ofdm_cyclic_prefixer.h | 4 ++--
gr-digital/include/digital/ofdm_equalizer_base.h | 6 +++---
gr-digital/include/digital/ofdm_equalizer_simpledfe.h | 2 +-
gr-digital/include/digital/ofdm_equalizer_static.h | 2 +-
gr-digital/include/digital/ofdm_frame_acquisition.h | 4 ++--
gr-digital/include/digital/ofdm_frame_equalizer_vcvc.h | 4 ++--
gr-digital/include/digital/ofdm_frame_sink.h | 8 ++++----
gr-digital/include/digital/ofdm_insert_preamble.h | 4 ++--
gr-digital/include/digital/ofdm_mapper_bcv.h | 8 ++++----
gr-digital/include/digital/ofdm_sampler.h | 4 ++--
gr-digital/include/digital/ofdm_serializer_vcc.h | 4 ++--
gr-digital/include/digital/ofdm_sync_sc_cfb.h | 4 ++--
gr-digital/include/digital/packet_header_default.h | 6 +++---
gr-digital/include/digital/packet_header_ofdm.h | 2 +-
gr-digital/include/digital/packet_headergenerator_bb.h | 4 ++--
gr-digital/include/digital/packet_headerparser_b.h | 4 ++--
gr-digital/include/digital/packet_sink.h | 8 ++++----
gr-digital/include/digital/pfb_clock_sync_ccf.h | 4 ++--
gr-digital/include/digital/pfb_clock_sync_fff.h | 4 ++--
gr-digital/include/digital/pn_correlator_cc.h | 4 ++--
gr-digital/include/digital/probe_density_b.h | 4 ++--
gr-digital/include/digital/probe_mpsk_snr_est_c.h | 4 ++--
gr-digital/include/digital/scrambler_bb.h | 4 ++--
gr-digital/include/digital/simple_correlator.h | 4 ++--
gr-digital/include/digital/simple_framer.h | 4 ++--
58 files changed, 121 insertions(+), 121 deletions(-)
(limited to 'gr-digital/include/digital')
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
--
cgit v1.2.3