diff options
| author | Josh Blum | 2011-07-26 22:29:53 -0700 |
|---|---|---|
| committer | Josh Blum | 2011-07-26 22:29:53 -0700 |
| commit | 7919aa977544a5c30dd1a9e98fdf0d5f56750581 (patch) | |
| tree | e8ea3a856e41a1e3aca37e636129cc15d8be8d9f /gr-trellis/src | |
| parent | 097b9bd5b2374c381380bc26f40677f8bf470c25 (diff) | |
| parent | 302bd2d7125ba1a973433a9ef7cd9afba2d47438 (diff) | |
| download | gnuradio-7919aa977544a5c30dd1a9e98fdf0d5f56750581.tar.gz gnuradio-7919aa977544a5c30dd1a9e98fdf0d5f56750581.tar.bz2 gnuradio-7919aa977544a5c30dd1a9e98fdf0d5f56750581.zip | |
Merge branch 'next' of gnuradio.org:gnuradio into next
Diffstat (limited to 'gr-trellis/src')
| -rw-r--r-- | gr-trellis/src/lib/trellis_pccc_decoder_X.h.t | 2 | ||||
| -rw-r--r-- | gr-trellis/src/lib/trellis_sccc_decoder_X.h.t | 2 | ||||
| -rw-r--r-- | gr-trellis/src/lib/trellis_sccc_decoder_combined_XX.h.t | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/gr-trellis/src/lib/trellis_pccc_decoder_X.h.t b/gr-trellis/src/lib/trellis_pccc_decoder_X.h.t index faf34188c..a58a03264 100644 --- a/gr-trellis/src/lib/trellis_pccc_decoder_X.h.t +++ b/gr-trellis/src/lib/trellis_pccc_decoder_X.h.t @@ -51,9 +51,9 @@ TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ ( class TRELLIS_API @NAME@ : public gr_block { fsm d_FSM1; - fsm d_FSM2; int d_ST10; int d_ST1K; + fsm d_FSM2; int d_ST20; int d_ST2K; interleaver d_INTERLEAVER; diff --git a/gr-trellis/src/lib/trellis_sccc_decoder_X.h.t b/gr-trellis/src/lib/trellis_sccc_decoder_X.h.t index f3ba783b4..9857c6a34 100644 --- a/gr-trellis/src/lib/trellis_sccc_decoder_X.h.t +++ b/gr-trellis/src/lib/trellis_sccc_decoder_X.h.t @@ -51,9 +51,9 @@ TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ ( class TRELLIS_API @NAME@ : public gr_block { fsm d_FSMo; - fsm d_FSMi; int d_STo0; int d_SToK; + fsm d_FSMi; int d_STi0; int d_STiK; interleaver d_INTERLEAVER; diff --git a/gr-trellis/src/lib/trellis_sccc_decoder_combined_XX.h.t b/gr-trellis/src/lib/trellis_sccc_decoder_combined_XX.h.t index db0e494ca..5d2c2b85c 100644 --- a/gr-trellis/src/lib/trellis_sccc_decoder_combined_XX.h.t +++ b/gr-trellis/src/lib/trellis_sccc_decoder_combined_XX.h.t @@ -56,9 +56,9 @@ TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ ( class TRELLIS_API @NAME@ : public gr_block { fsm d_FSMo; - fsm d_FSMi; int d_STo0; int d_SToK; + fsm d_FSMi; int d_STi0; int d_STiK; interleaver d_INTERLEAVER; |