summaryrefslogtreecommitdiff
path: root/gr-trellis/lib
diff options
context:
space:
mode:
authorTom Rondeau <trondeau@vt.edu>2013-04-17 13:43:52 -0400
committerTom Rondeau <trondeau@vt.edu>2013-04-29 14:52:56 -0400
commitf3e2e07201c50033bf6c9d0c6a6f068557b4f17f (patch)
tree140b3c2d20a951ffd4abd564c3378ee2e2f9fc7c /gr-trellis/lib
parent35303ae975a5b1bdecc2492bc96e2b8e89b62a3d (diff)
runtime: converting runtime core to gr namespace, gnuradio include dir.
Diffstat (limited to 'gr-trellis/lib')
-rw-r--r--gr-trellis/lib/constellation_metrics_cf_impl.cc8
-rw-r--r--gr-trellis/lib/encoder_XX_impl.cc.t8
-rw-r--r--gr-trellis/lib/metrics_X_impl.cc.t8
-rw-r--r--gr-trellis/lib/pccc_decoder_X_impl.cc.t8
-rw-r--r--gr-trellis/lib/pccc_decoder_combined_XX_impl.cc.t8
-rw-r--r--gr-trellis/lib/pccc_encoder_XX_impl.cc.t8
-rw-r--r--gr-trellis/lib/permutation_impl.cc8
-rw-r--r--gr-trellis/lib/sccc_decoder_X_impl.cc.t8
-rw-r--r--gr-trellis/lib/sccc_decoder_combined_XX_impl.cc.t8
-rw-r--r--gr-trellis/lib/sccc_encoder_XX_impl.cc.t8
-rw-r--r--gr-trellis/lib/siso_combined_f_impl.cc8
-rw-r--r--gr-trellis/lib/siso_f_impl.cc8
-rw-r--r--gr-trellis/lib/viterbi_X_impl.cc.t8
-rw-r--r--gr-trellis/lib/viterbi_combined_XX_impl.cc.t8
14 files changed, 56 insertions, 56 deletions
diff --git a/gr-trellis/lib/constellation_metrics_cf_impl.cc b/gr-trellis/lib/constellation_metrics_cf_impl.cc
index 18d3095802..6aa7dce6c8 100644
--- a/gr-trellis/lib/constellation_metrics_cf_impl.cc
+++ b/gr-trellis/lib/constellation_metrics_cf_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "constellation_metrics_cf_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <assert.h>
#include <stdexcept>
#include <iostream>
@@ -43,9 +43,9 @@ namespace gr {
constellation_metrics_cf_impl::constellation_metrics_cf_impl(digital::constellation_sptr constellation,
digital::trellis_metric_type_t TYPE)
- : gr_block("constellation_metrics_cf",
- gr_make_io_signature(1, -1, sizeof(gr_complex)),
- gr_make_io_signature(1, -1, sizeof(float))),
+ : block("constellation_metrics_cf",
+ io_signature::make(1, -1, sizeof(gr_complex)),
+ io_signature::make(1, -1, sizeof(float))),
d_constellation(constellation),
d_TYPE(TYPE),
d_O(constellation->arity()),
diff --git a/gr-trellis/lib/encoder_XX_impl.cc.t b/gr-trellis/lib/encoder_XX_impl.cc.t
index fdda593d45..4b11e3c06d 100644
--- a/gr-trellis/lib/encoder_XX_impl.cc.t
+++ b/gr-trellis/lib/encoder_XX_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include "@NAME@.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <iostream>
namespace gr {
@@ -41,9 +41,9 @@ namespace gr {
}
@IMPL_NAME@::@IMPL_NAME@(const fsm &FSM, int ST)
- : gr_sync_block("@BASE_NAME@",
- gr_make_io_signature(1, -1, sizeof(@I_TYPE@)),
- gr_make_io_signature(1, -1, sizeof(@O_TYPE@))),
+ : sync_block("@BASE_NAME@",
+ io_signature::make(1, -1, sizeof(@I_TYPE@)),
+ io_signature::make(1, -1, sizeof(@O_TYPE@))),
d_FSM(FSM),
d_ST(ST)
{
diff --git a/gr-trellis/lib/metrics_X_impl.cc.t b/gr-trellis/lib/metrics_X_impl.cc.t
index c74051c53e..499bd8b9cd 100644
--- a/gr-trellis/lib/metrics_X_impl.cc.t
+++ b/gr-trellis/lib/metrics_X_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include "@NAME@.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <assert.h>
#include <stdexcept>
#include <iostream>
@@ -45,9 +45,9 @@ namespace gr {
@IMPL_NAME@::@IMPL_NAME@(int O, int D, const std::vector<@I_TYPE@> &TABLE,
digital::trellis_metric_type_t TYPE)
- : gr_block("@BASE_NAME@",
- gr_make_io_signature(1, -1, sizeof (@I_TYPE@)),
- gr_make_io_signature(1, -1, sizeof (float))),
+ : block("@BASE_NAME@",
+ io_signature::make(1, -1, sizeof (@I_TYPE@)),
+ io_signature::make(1, -1, sizeof (float))),
d_O(O), d_D(D), d_TYPE(TYPE), d_TABLE(TABLE)
{
set_relative_rate (1.0 * d_O / ((double) d_D));
diff --git a/gr-trellis/lib/pccc_decoder_X_impl.cc.t b/gr-trellis/lib/pccc_decoder_X_impl.cc.t
index 9bf85bc614..1d5e14ca25 100644
--- a/gr-trellis/lib/pccc_decoder_X_impl.cc.t
+++ b/gr-trellis/lib/pccc_decoder_X_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include "@NAME@.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <iostream>
#include <trellis/core_algorithms.h>
@@ -59,9 +59,9 @@ namespace gr {
int blocklength,
int repetitions,
siso_type_t SISO_TYPE)
- : gr_block("@BASE_NAME@",
- gr_make_io_signature(1, 1, sizeof(float)),
- gr_make_io_signature(1, 1, sizeof(@O_TYPE@))),
+ : block("@BASE_NAME@",
+ io_signature::make(1, 1, sizeof(float)),
+ io_signature::make(1, 1, sizeof(@O_TYPE@))),
d_FSM1(FSM1), d_ST10(ST10), d_ST1K(ST1K),
d_FSM2(FSM2), d_ST20(ST20), d_ST2K(ST2K),
d_INTERLEAVER(INTERLEAVER),
diff --git a/gr-trellis/lib/pccc_decoder_combined_XX_impl.cc.t b/gr-trellis/lib/pccc_decoder_combined_XX_impl.cc.t
index 21a5c0b3ae..f5f5a9311c 100644
--- a/gr-trellis/lib/pccc_decoder_combined_XX_impl.cc.t
+++ b/gr-trellis/lib/pccc_decoder_combined_XX_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include "@NAME@.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <iostream>
#include <trellis/core_algorithms.h>
@@ -64,9 +64,9 @@ namespace gr {
const std::vector<@I_TYPE@> &TABLE,
digital::trellis_metric_type_t METRIC_TYPE,
float scaling)
- : gr_block("@BASE_NAME@",
- gr_make_io_signature(1, 1, sizeof(@I_TYPE@)),
- gr_make_io_signature(1, 1, sizeof(@O_TYPE@))),
+ : block("@BASE_NAME@",
+ io_signature::make(1, 1, sizeof(@I_TYPE@)),
+ io_signature::make(1, 1, sizeof(@O_TYPE@))),
d_FSMo(FSMo), d_STo0(STo0), d_SToK(SToK),
d_FSMi(FSMi), d_STi0(STi0), d_STiK(STiK),
d_INTERLEAVER(INTERLEAVER),
diff --git a/gr-trellis/lib/pccc_encoder_XX_impl.cc.t b/gr-trellis/lib/pccc_encoder_XX_impl.cc.t
index 4e804729a2..119bff6ddb 100644
--- a/gr-trellis/lib/pccc_encoder_XX_impl.cc.t
+++ b/gr-trellis/lib/pccc_encoder_XX_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include "@NAME@.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <iostream>
namespace gr {
@@ -47,9 +47,9 @@ namespace gr {
const fsm &FSM2, int ST2,
const interleaver &INTERLEAVER,
int blocklength)
- : gr_sync_block("@BASE_NAME@",
- gr_make_io_signature(1, 1, sizeof(@I_TYPE@)),
- gr_make_io_signature(1, 1, sizeof(@O_TYPE@))),
+ : sync_block("@BASE_NAME@",
+ io_signature::make(1, 1, sizeof(@I_TYPE@)),
+ io_signature::make(1, 1, sizeof(@O_TYPE@))),
d_FSM1(FSM1), d_ST1(ST1),
d_FSM2(FSM2), d_ST2(ST2),
d_INTERLEAVER(INTERLEAVER),
diff --git a/gr-trellis/lib/permutation_impl.cc b/gr-trellis/lib/permutation_impl.cc
index da82e46832..06bba1e11f 100644
--- a/gr-trellis/lib/permutation_impl.cc
+++ b/gr-trellis/lib/permutation_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "permutation_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <iostream>
#include <string.h>
@@ -42,9 +42,9 @@ namespace gr {
permutation_impl::permutation_impl(int K, const std::vector<int> &TABLE,
int SYMS_PER_BLOCK, size_t BYTES_PER_SYMBOL)
- : gr_sync_block("permutation",
- gr_make_io_signature(1, -1, BYTES_PER_SYMBOL),
- gr_make_io_signature(1, -1, BYTES_PER_SYMBOL)),
+ : sync_block("permutation",
+ io_signature::make(1, -1, BYTES_PER_SYMBOL),
+ io_signature::make(1, -1, BYTES_PER_SYMBOL)),
d_K(K), d_TABLE(TABLE),
d_SYMS_PER_BLOCK(SYMS_PER_BLOCK),
d_BYTES_PER_SYMBOL(BYTES_PER_SYMBOL)
diff --git a/gr-trellis/lib/sccc_decoder_X_impl.cc.t b/gr-trellis/lib/sccc_decoder_X_impl.cc.t
index 6eef46518d..c45f14bfdb 100644
--- a/gr-trellis/lib/sccc_decoder_X_impl.cc.t
+++ b/gr-trellis/lib/sccc_decoder_X_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include "@NAME@.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <iostream>
#include <trellis/core_algorithms.h>
@@ -56,9 +56,9 @@ namespace gr {
int blocklength,
int repetitions,
siso_type_t SISO_TYPE)
- : gr_block("@BASE_NAME@",
- gr_make_io_signature(1, 1, sizeof(float)),
- gr_make_io_signature(1, 1, sizeof(@O_TYPE@))),
+ : block("@BASE_NAME@",
+ io_signature::make(1, 1, sizeof(float)),
+ io_signature::make(1, 1, sizeof(@O_TYPE@))),
d_FSMo(FSMo), d_STo0(STo0), d_SToK(SToK),
d_FSMi(FSMi), d_STi0(STi0), d_STiK(STiK),
d_INTERLEAVER(INTERLEAVER),
diff --git a/gr-trellis/lib/sccc_decoder_combined_XX_impl.cc.t b/gr-trellis/lib/sccc_decoder_combined_XX_impl.cc.t
index 717f2c8e49..6d3ecf6aea 100644
--- a/gr-trellis/lib/sccc_decoder_combined_XX_impl.cc.t
+++ b/gr-trellis/lib/sccc_decoder_combined_XX_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include "@NAME@.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <iostream>
#include <trellis/core_algorithms.h>
@@ -64,9 +64,9 @@ namespace gr {
const std::vector<@I_TYPE@> &TABLE,
digital::trellis_metric_type_t METRIC_TYPE,
float scaling)
- : gr_block("@BASE_NAME@",
- gr_make_io_signature(1, 1, sizeof(@I_TYPE@)),
- gr_make_io_signature(1, 1, sizeof(@O_TYPE@))),
+ : block("@BASE_NAME@",
+ io_signature::make(1, 1, sizeof(@I_TYPE@)),
+ io_signature::make(1, 1, sizeof(@O_TYPE@))),
d_FSMo(FSMo), d_STo0(STo0), d_SToK(SToK),
d_FSMi(FSMi), d_STi0(STi0), d_STiK(STiK),
d_INTERLEAVER(INTERLEAVER),
diff --git a/gr-trellis/lib/sccc_encoder_XX_impl.cc.t b/gr-trellis/lib/sccc_encoder_XX_impl.cc.t
index 390e65c4f3..9924b3c7d2 100644
--- a/gr-trellis/lib/sccc_encoder_XX_impl.cc.t
+++ b/gr-trellis/lib/sccc_encoder_XX_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include "@NAME@.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <iostream>
namespace gr {
@@ -47,9 +47,9 @@ namespace gr {
const fsm &FSMi, int STi,
const interleaver &INTERLEAVER,
int blocklength)
- : gr_sync_block("@BASE_NAME@",
- gr_make_io_signature(1, 1, sizeof(@I_TYPE@)),
- gr_make_io_signature(1, 1, sizeof(@O_TYPE@))),
+ : sync_block("@BASE_NAME@",
+ io_signature::make(1, 1, sizeof(@I_TYPE@)),
+ io_signature::make(1, 1, sizeof(@O_TYPE@))),
d_FSMo(FSMo), d_STo(STo),
d_FSMi(FSMi), d_STi(STi),
d_INTERLEAVER(INTERLEAVER),
diff --git a/gr-trellis/lib/siso_combined_f_impl.cc b/gr-trellis/lib/siso_combined_f_impl.cc
index 7514d46747..d30f5cc4bb 100644
--- a/gr-trellis/lib/siso_combined_f_impl.cc
+++ b/gr-trellis/lib/siso_combined_f_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "siso_combined_f_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <stdexcept>
#include <assert.h>
#include <iostream>
@@ -54,9 +54,9 @@ namespace gr {
siso_type_t SISO_TYPE,
int D, const std::vector<float> &TABLE,
digital::trellis_metric_type_t TYPE)
- : gr_block("siso_combined_f",
- gr_make_io_signature(1, -1, sizeof(float)),
- gr_make_io_signature(1, -1, sizeof(float))),
+ : block("siso_combined_f",
+ io_signature::make(1, -1, sizeof(float)),
+ io_signature::make(1, -1, sizeof(float))),
d_FSM(FSM), d_K(K), d_S0(S0), d_SK(SK),
d_POSTI(POSTI), d_POSTO(POSTO),
d_SISO_TYPE(SISO_TYPE),
diff --git a/gr-trellis/lib/siso_f_impl.cc b/gr-trellis/lib/siso_f_impl.cc
index b0484f6f37..d699cecaec 100644
--- a/gr-trellis/lib/siso_f_impl.cc
+++ b/gr-trellis/lib/siso_f_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "siso_f_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <stdexcept>
#include <assert.h>
#include <iostream>
@@ -49,9 +49,9 @@ namespace gr {
int S0, int SK,
bool POSTI, bool POSTO,
siso_type_t SISO_TYPE)
- : gr_block("siso_f",
- gr_make_io_signature(1, -1, sizeof(float)),
- gr_make_io_signature(1, -1, sizeof(float))),
+ : block("siso_f",
+ io_signature::make(1, -1, sizeof(float)),
+ io_signature::make(1, -1, sizeof(float))),
d_FSM(FSM), d_K(K),
d_S0(S0),d_SK(SK),
d_POSTI(POSTI), d_POSTO(POSTO),
diff --git a/gr-trellis/lib/viterbi_X_impl.cc.t b/gr-trellis/lib/viterbi_X_impl.cc.t
index 5097cc2053..247424b3f3 100644
--- a/gr-trellis/lib/viterbi_X_impl.cc.t
+++ b/gr-trellis/lib/viterbi_X_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include "@NAME@.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <iostream>
namespace gr {
@@ -45,9 +45,9 @@ namespace gr {
@IMPL_NAME@::@IMPL_NAME@(const fsm &FSM, int K,
int S0, int SK)
- : gr_block("@BASE_NAME@",
- gr_make_io_signature(1, -1, sizeof(float)),
- gr_make_io_signature(1, -1, sizeof(@TYPE@))),
+ : block("@BASE_NAME@",
+ io_signature::make(1, -1, sizeof(float)),
+ io_signature::make(1, -1, sizeof(@TYPE@))),
d_FSM(FSM), d_K(K), d_S0(S0), d_SK(SK)//,
//d_trace(FSM.S()*K)
{
diff --git a/gr-trellis/lib/viterbi_combined_XX_impl.cc.t b/gr-trellis/lib/viterbi_combined_XX_impl.cc.t
index 95175bef95..c7cf10e567 100644
--- a/gr-trellis/lib/viterbi_combined_XX_impl.cc.t
+++ b/gr-trellis/lib/viterbi_combined_XX_impl.cc.t
@@ -27,7 +27,7 @@
#endif
#include "@NAME@.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <iostream>
namespace gr {
@@ -49,9 +49,9 @@ namespace gr {
int S0, int SK, int D,
const std::vector<@I_TYPE@> &TABLE,
digital::trellis_metric_type_t TYPE)
- : gr_block("@BASE_NAME@",
- gr_make_io_signature(1, -1, sizeof(@I_TYPE@)),
- gr_make_io_signature(1, -1, sizeof(@O_TYPE@))),
+ : block("@BASE_NAME@",
+ io_signature::make(1, -1, sizeof(@I_TYPE@)),
+ io_signature::make(1, -1, sizeof(@O_TYPE@))),
d_FSM(FSM), d_K(K), d_S0(S0), d_SK(SK), d_D(D),
d_TABLE(TABLE), d_TYPE(TYPE)//,
//d_trace(FSM.S()*K)
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-23 10:14:44 +0000