diff options
| author | andriy gelman <andriy.gelman@gmail.com> | 2018-02-21 17:57:55 -0500 |
|---|---|---|
| committer | Marcus Müller <marcus@hostalia.de> | 2018-04-28 15:54:32 +0200 |
| commit | 3d244b94cf4612a87e0d95e5ab24da4a5fc6aae2 (patch) | |
| tree | b4423e82d710ff8e1a7ec8a7ffbd1e795d9adcdc /gr-dtv/lib/dvbt | |
| parent | e0beb54aac18de2f1c3f5076213f03bbe096cd59 (diff) | |
Clean-up: Remove unused private variables (Issue #1621, #1622, #1624)
Diffstat (limited to 'gr-dtv/lib/dvbt')
| -rw-r--r-- | gr-dtv/lib/dvbt/dvbt_convolutional_interleaver_impl.cc | 2 | ||||
| -rw-r--r-- | gr-dtv/lib/dvbt/dvbt_convolutional_interleaver_impl.h | 1 | ||||
| -rw-r--r-- | gr-dtv/lib/dvbt/dvbt_inner_coder_impl.cc | 3 | ||||
| -rw-r--r-- | gr-dtv/lib/dvbt/dvbt_inner_coder_impl.h | 4 | ||||
| -rw-r--r-- | gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.cc | 2 | ||||
| -rw-r--r-- | gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.h | 1 | ||||
| -rw-r--r-- | gr-dtv/lib/dvbt/dvbt_reed_solomon_dec_impl.h | 1 |
7 files changed, 3 insertions, 11 deletions
diff --git a/gr-dtv/lib/dvbt/dvbt_convolutional_interleaver_impl.cc b/gr-dtv/lib/dvbt/dvbt_convolutional_interleaver_impl.cc index e29ec8cfe2..ee440bc789 100644 --- a/gr-dtv/lib/dvbt/dvbt_convolutional_interleaver_impl.cc +++ b/gr-dtv/lib/dvbt/dvbt_convolutional_interleaver_impl.cc @@ -43,7 +43,7 @@ namespace gr { : sync_interpolator("dvbt_convolutional_interleaver", io_signature::make(1, 1, sizeof (unsigned char) * I * blocks), io_signature::make(1, 1, sizeof (unsigned char)), I * blocks), - d_blocks(blocks), d_I(I), d_M(M) + d_I(I), d_M(M) { //Positions are shift registers (FIFOs) //of length i*M diff --git a/gr-dtv/lib/dvbt/dvbt_convolutional_interleaver_impl.h b/gr-dtv/lib/dvbt/dvbt_convolutional_interleaver_impl.h index 2de1fab282..391e0ef77c 100644 --- a/gr-dtv/lib/dvbt/dvbt_convolutional_interleaver_impl.h +++ b/gr-dtv/lib/dvbt/dvbt_convolutional_interleaver_impl.h @@ -31,7 +31,6 @@ namespace gr { class dvbt_convolutional_interleaver_impl : public dvbt_convolutional_interleaver { private: - int d_blocks; int d_I; int d_M; std::vector< std::deque<unsigned char> * > d_shift; diff --git a/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.cc b/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.cc index e26c0eb8d9..5384b6ac87 100644 --- a/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.cc +++ b/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.cc @@ -131,8 +131,7 @@ namespace gr { io_signature::make(1, 1, sizeof (unsigned char) * noutput)), config(constellation, hierarchy, coderate, coderate), d_ninput(ninput), d_noutput(noutput), - d_reg(0), - d_bitcount(0) + d_reg(0) { //Determine k - input of encoder d_k = config.d_cr_k; diff --git a/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.h b/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.h index d472b1f60c..7c31c1897d 100644 --- a/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.h +++ b/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.h @@ -40,10 +40,6 @@ namespace gr { int d_reg; - //counts the bits in the bytes - //in input stream - int d_bitcount; - // Code rate k/n int d_k; int d_n; diff --git a/gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.cc b/gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.cc index 079d948163..afd338a8fc 100644 --- a/gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.cc +++ b/gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.cc @@ -235,7 +235,7 @@ namespace gr { : block("dvbt_ofdm_sym_acquisition", io_signature::make(1, 1, sizeof (gr_complex) * blocks), io_signature::make(1, 1, sizeof (gr_complex) * blocks * fft_length)), - d_blocks(blocks), d_fft_length(fft_length), d_cp_length(cp_length), d_snr(snr), \ + d_fft_length(fft_length), d_cp_length(cp_length), d_snr(snr), \ d_phase(0.0), d_phaseinc(0.0), d_cp_found(0), d_nextphaseinc(0), d_nextpos(0), \ d_initial_acquisition(0), d_cp_start(0), \ d_to_consume(0), d_to_out(0), d_consumed(0), d_out(0) diff --git a/gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.h b/gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.h index 0964361b1e..e4fe1dc50a 100644 --- a/gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.h +++ b/gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.h @@ -29,7 +29,6 @@ namespace gr { class dvbt_ofdm_sym_acquisition_impl : public dvbt_ofdm_sym_acquisition { private: - int d_blocks; int d_fft_length; int d_cp_length; float d_snr; diff --git a/gr-dtv/lib/dvbt/dvbt_reed_solomon_dec_impl.h b/gr-dtv/lib/dvbt/dvbt_reed_solomon_dec_impl.h index 2d9b24809d..39a45c4521 100644 --- a/gr-dtv/lib/dvbt/dvbt_reed_solomon_dec_impl.h +++ b/gr-dtv/lib/dvbt/dvbt_reed_solomon_dec_impl.h @@ -41,7 +41,6 @@ namespace gr { int d_nerrors_corrected_count; int d_bad_packet_count; int d_total_packets; - int d_total_bits; void *d_rs; /* Reed-Solomon characteristics structure */ int decode(unsigned char &out, const unsigned char &in); |