summaryrefslogtreecommitdiff
path: root/gr-trellis
diff options
context:
space:
mode:
authorJosh Blum2011-07-28 09:39:53 -0700
committerJosh Blum2011-07-28 09:39:53 -0700
commit250f4ac60afdc5e502c8ab69ced8267f0e14e590 (patch)
tree74207dfa4707fd293c16452b6dad914d5882c231 /gr-trellis
parentc87a532824beb6d04ce4bc4cdfb66f9dbe5a8faf (diff)
parentaed2d2eacca0f045bb9594b20c1253776c342a08 (diff)
downloadgnuradio-250f4ac60afdc5e502c8ab69ced8267f0e14e590.tar.gz
gnuradio-250f4ac60afdc5e502c8ab69ced8267f0e14e590.tar.bz2
gnuradio-250f4ac60afdc5e502c8ab69ced8267f0e14e590.zip
Merge branch 'next' of gnuradio.org:gnuradio into next
Diffstat (limited to 'gr-trellis')
-rw-r--r--gr-trellis/src/lib/fsm.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/gr-trellis/src/lib/fsm.h b/gr-trellis/src/lib/fsm.h
index d38e08dd2..7dc7e0d9d 100644
--- a/gr-trellis/src/lib/fsm.h
+++ b/gr-trellis/src/lib/fsm.h
@@ -107,7 +107,7 @@ public:
* \brief Creates an FSMS describing ISI.
*
* \param mod_size modulation size
- * \param ch_lenth channel length
+ * \param ch_length channel length
*
*/
fsm(int mod_size, int ch_length);
@@ -126,14 +126,14 @@ public:
/*!
* \brief Creates an FSMS describing the joint trellis of two FSMs.
*
- * \param fsm1 first FSMS
- * \param fsm2 second FSMS
+ * \param FSM1 first FSMS
+ * \param FSM2 second FSMS
*/
fsm(const fsm &FSM1, const fsm &FSM2);
/*!
* \brief Creates an FSMS representing n stages through the originial FSM (AKA radix-n FSM).
*
- * \param original FSMS
+ * \param FSM Original FSMs
* \param n Number of stages.
*/
fsm(const fsm &FSM, int n);