diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2011-09-02 12:15:24 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2011-09-02 12:15:24 -0400 |
| commit | 492446d2ec6ed85d6437bb35caf4700b02930147 (patch) | |
| tree | 28ae6ce82b4d3879dd334625146ce3c8c0bb789f /gr-trellis/src/lib/trellis_permutation.h | |
| parent | 52f9290374a64fef2ff2c0f9199166bed27fc955 (diff) | |
| parent | 0f43bdb085f98e1182dbd940db9ed1fb52119186 (diff) | |
Merge branch 'master' into next
* master:
Minor fixes in turbo GRC blocks
Minor fixes in turbo GRC blocks and one more example added.
Added pccc combined turbo decoder and corresponding GRC block
More examples and turbo decoder blocks added.
Added more turbo encoder/decoder blocks and examples.
Added SCCC encoder/decoder grc blocksi and examples. Also moved all grc blocks related to trellis inside the gr-trellis/grc directory
added grc directory in gr-trellis
updated Makefile.am and block_tree.xml to reflect changes in grc file for gr-trellis
Moved grc files from grc/block to gr-trellis/grc
Diffstat (limited to 'gr-trellis/src/lib/trellis_permutation.h')
| -rw-r--r-- | gr-trellis/src/lib/trellis_permutation.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gr-trellis/src/lib/trellis_permutation.h b/gr-trellis/src/lib/trellis_permutation.h index 5505caf891..a5c858a8b8 100644 --- a/gr-trellis/src/lib/trellis_permutation.h +++ b/gr-trellis/src/lib/trellis_permutation.h @@ -30,7 +30,7 @@ class trellis_permutation; typedef boost::shared_ptr<trellis_permutation> trellis_permutation_sptr; -trellis_permutation_sptr trellis_make_permutation (int K, const std::vector<int> &TABLE, int SYMS_PER_BLOCK, size_t NBYTES_INOUT); +trellis_permutation_sptr trellis_make_permutation (int K, const std::vector<int> &TABLE, int SYMS_PER_BLOCK, size_t BYTES_PER_SYMBOL); /*! * \brief Permutation. @@ -39,18 +39,18 @@ trellis_permutation_sptr trellis_make_permutation (int K, const std::vector<int> class trellis_permutation : public gr_sync_block { private: - friend trellis_permutation_sptr trellis_make_permutation (int K, const std::vector<int> &TABLE, int SYMS_PER_BLOCK, size_t NBYTES_INOUT); + friend trellis_permutation_sptr trellis_make_permutation (int K, const std::vector<int> &TABLE, int SYMS_PER_BLOCK, size_t BYTES_PER_SYMBOL); int d_K; std::vector<int> d_TABLE; int d_SYMS_PER_BLOCK; - size_t d_NBYTES_INOUT; + size_t d_BYTES_PER_SYMBOL; trellis_permutation (int K, const std::vector<int> &TABLE, int SYMS_PER_BLOCK, size_t NBYTES); public: int K () const { return d_K; } const std::vector<int> & TABLE () const { return d_TABLE; } int SYMS_PER_BLOCK () const { return d_SYMS_PER_BLOCK; } - size_t NBYTES_INOUT () const { return d_NBYTES_INOUT; } + size_t BYTES_PER_SYMBOL () const { return d_BYTES_PER_SYMBOL; } int work (int noutput_items, gr_vector_const_void_star &input_items, |