diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2011-08-27 16:44:15 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2011-08-27 16:44:15 -0400 |
| commit | 2edf5df55faf494e54fe8ddc5e23d0b767cd82e4 (patch) | |
| tree | 8beb26e957c7db1edea006a2677c54a50f59bd93 /gr-trellis/src | |
| parent | 20e992b24ee70e515f08e8c5c2386c054141890f (diff) | |
| parent | 6f79b8be8f7edb8cc6f18b6a12ede2858d65b681 (diff) | |
Merge branch 'maint' of gnuradio.org:gnuradio into maint
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 ff4b7a1f8c..2a5b43df6c 100644 --- a/gr-trellis/src/lib/trellis_pccc_decoder_X.h.t +++ b/gr-trellis/src/lib/trellis_pccc_decoder_X.h.t @@ -50,9 +50,9 @@ typedef boost::shared_ptr<@NAME@> @SPTR_NAME@; class @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 3adb8a5b7e..93c9ac9b8c 100644 --- a/gr-trellis/src/lib/trellis_sccc_decoder_X.h.t +++ b/gr-trellis/src/lib/trellis_sccc_decoder_X.h.t @@ -50,9 +50,9 @@ typedef boost::shared_ptr<@NAME@> @SPTR_NAME@; class @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 146c265167..225a07ffe4 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 @@ -55,9 +55,9 @@ typedef boost::shared_ptr<@NAME@> @SPTR_NAME@; class @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; |