diff options
| author | Tom Rondeau | 2011-09-02 12:14:57 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2011-09-02 12:14:57 -0400 |
| commit | 0f43bdb085f98e1182dbd940db9ed1fb52119186 (patch) | |
| tree | b210a92db1abc4fb430ab28fe0e5abd858501bf6 /gr-trellis/src/lib/trellis_permutation.h | |
| parent | 772518ceb9cebefb8bb8ecc9edd63570f38de514 (diff) | |
| parent | 02a32461e2f625f02ecbbe41354d59bf8dd5452b (diff) | |
| download | gnuradio-0f43bdb085f98e1182dbd940db9ed1fb52119186.tar.gz gnuradio-0f43bdb085f98e1182dbd940db9ed1fb52119186.tar.bz2 gnuradio-0f43bdb085f98e1182dbd940db9ed1fb52119186.zip | |
Merge branch 'turbo'
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 5505caf89..a5c858a8b 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, |