diff options
| -rw-r--r-- | gr-trellis/src/lib/Makefile.am | 6 | ||||
| -rw-r--r-- | gr-trellis/src/lib/Makefile.gen | 45 | ||||
| -rw-r--r-- | gr-trellis/src/lib/generate_trellis.py | 4 | ||||
| -rw-r--r-- | gr-trellis/src/lib/trellis_generated.i | 30 |
4 files changed, 65 insertions, 20 deletions
diff --git a/gr-trellis/src/lib/Makefile.am b/gr-trellis/src/lib/Makefile.am index ee7004928..ef27bf580 100644 --- a/gr-trellis/src/lib/Makefile.am +++ b/gr-trellis/src/lib/Makefile.am @@ -44,9 +44,9 @@ CODE_GENERATOR = \ trellis_metrics_X.cc.t \ trellis_metrics_X.h.t \ trellis_metrics_X.i.t \ - trellis_viterbi_combined_X.cc.t \ - trellis_viterbi_combined_X.h.t \ - trellis_viterbi_combined_X.i.t \ + trellis_viterbi_combined_XX.cc.t \ + trellis_viterbi_combined_XX.h.t \ + trellis_viterbi_combined_XX.i.t \ trellis_viterbi_X.cc.t \ trellis_viterbi_X.h.t \ trellis_viterbi_X.i.t diff --git a/gr-trellis/src/lib/Makefile.gen b/gr-trellis/src/lib/Makefile.gen index 7a47ea3a7..6a3f83387 100644 --- a/gr-trellis/src/lib/Makefile.gen +++ b/gr-trellis/src/lib/Makefile.gen @@ -13,9 +13,18 @@ GENERATED_H = \ trellis_metrics_i.h \ trellis_metrics_s.h \ trellis_viterbi_b.h \ - trellis_viterbi_combined_b.h \ - trellis_viterbi_combined_i.h \ - trellis_viterbi_combined_s.h \ + trellis_viterbi_combined_cb.h \ + trellis_viterbi_combined_ci.h \ + trellis_viterbi_combined_cs.h \ + trellis_viterbi_combined_fb.h \ + trellis_viterbi_combined_fi.h \ + trellis_viterbi_combined_fs.h \ + trellis_viterbi_combined_ib.h \ + trellis_viterbi_combined_ii.h \ + trellis_viterbi_combined_is.h \ + trellis_viterbi_combined_sb.h \ + trellis_viterbi_combined_si.h \ + trellis_viterbi_combined_ss.h \ trellis_viterbi_i.h \ trellis_viterbi_s.h @@ -31,9 +40,18 @@ GENERATED_I = \ trellis_metrics_i.i \ trellis_metrics_s.i \ trellis_viterbi_b.i \ - trellis_viterbi_combined_b.i \ - trellis_viterbi_combined_i.i \ - trellis_viterbi_combined_s.i \ + trellis_viterbi_combined_cb.i \ + trellis_viterbi_combined_ci.i \ + trellis_viterbi_combined_cs.i \ + trellis_viterbi_combined_fb.i \ + trellis_viterbi_combined_fi.i \ + trellis_viterbi_combined_fs.i \ + trellis_viterbi_combined_ib.i \ + trellis_viterbi_combined_ii.i \ + trellis_viterbi_combined_is.i \ + trellis_viterbi_combined_sb.i \ + trellis_viterbi_combined_si.i \ + trellis_viterbi_combined_ss.i \ trellis_viterbi_i.i \ trellis_viterbi_s.i @@ -49,9 +67,18 @@ GENERATED_CC = \ trellis_metrics_i.cc \ trellis_metrics_s.cc \ trellis_viterbi_b.cc \ - trellis_viterbi_combined_b.cc \ - trellis_viterbi_combined_i.cc \ - trellis_viterbi_combined_s.cc \ + trellis_viterbi_combined_cb.cc \ + trellis_viterbi_combined_ci.cc \ + trellis_viterbi_combined_cs.cc \ + trellis_viterbi_combined_fb.cc \ + trellis_viterbi_combined_fi.cc \ + trellis_viterbi_combined_fs.cc \ + trellis_viterbi_combined_ib.cc \ + trellis_viterbi_combined_ii.cc \ + trellis_viterbi_combined_is.cc \ + trellis_viterbi_combined_sb.cc \ + trellis_viterbi_combined_si.cc \ + trellis_viterbi_combined_ss.cc \ trellis_viterbi_i.cc \ trellis_viterbi_s.cc diff --git a/gr-trellis/src/lib/generate_trellis.py b/gr-trellis/src/lib/generate_trellis.py index e23ec4ad7..2af5e2354 100644 --- a/gr-trellis/src/lib/generate_trellis.py +++ b/gr-trellis/src/lib/generate_trellis.py @@ -30,14 +30,14 @@ other_roots = [ 'trellis_encoder_XX', 'trellis_metrics_X', 'trellis_viterbi_X', - 'trellis_viterbi_combined_X', + 'trellis_viterbi_combined_XX', ] other_signatures = ( ['bb','bs','bi','ss','si','ii'], ['s','i','f','c'], ['b','s','i'], - ['b','s','i'], + ['sb','ss','si','ib','is','ii','fb','fs','fi','cb','cs','ci'], ) diff --git a/gr-trellis/src/lib/trellis_generated.i b/gr-trellis/src/lib/trellis_generated.i index 464ffacb3..7a379bdc1 100644 --- a/gr-trellis/src/lib/trellis_generated.i +++ b/gr-trellis/src/lib/trellis_generated.i @@ -13,9 +13,18 @@ #include <trellis_metrics_i.h> #include <trellis_metrics_s.h> #include <trellis_viterbi_b.h> -#include <trellis_viterbi_combined_b.h> -#include <trellis_viterbi_combined_i.h> -#include <trellis_viterbi_combined_s.h> +#include <trellis_viterbi_combined_cb.h> +#include <trellis_viterbi_combined_ci.h> +#include <trellis_viterbi_combined_cs.h> +#include <trellis_viterbi_combined_fb.h> +#include <trellis_viterbi_combined_fi.h> +#include <trellis_viterbi_combined_fs.h> +#include <trellis_viterbi_combined_ib.h> +#include <trellis_viterbi_combined_ii.h> +#include <trellis_viterbi_combined_is.h> +#include <trellis_viterbi_combined_sb.h> +#include <trellis_viterbi_combined_si.h> +#include <trellis_viterbi_combined_ss.h> #include <trellis_viterbi_i.h> #include <trellis_viterbi_s.h> %} @@ -31,8 +40,17 @@ %include <trellis_metrics_i.i> %include <trellis_metrics_s.i> %include <trellis_viterbi_b.i> -%include <trellis_viterbi_combined_b.i> -%include <trellis_viterbi_combined_i.i> -%include <trellis_viterbi_combined_s.i> +%include <trellis_viterbi_combined_cb.i> +%include <trellis_viterbi_combined_ci.i> +%include <trellis_viterbi_combined_cs.i> +%include <trellis_viterbi_combined_fb.i> +%include <trellis_viterbi_combined_fi.i> +%include <trellis_viterbi_combined_fs.i> +%include <trellis_viterbi_combined_ib.i> +%include <trellis_viterbi_combined_ii.i> +%include <trellis_viterbi_combined_is.i> +%include <trellis_viterbi_combined_sb.i> +%include <trellis_viterbi_combined_si.i> +%include <trellis_viterbi_combined_ss.i> %include <trellis_viterbi_i.i> %include <trellis_viterbi_s.i> |