diff options
| author | Tom Rondeau | 2011-12-29 11:27:56 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2011-12-29 11:27:56 -0500 |
| commit | 55ff1160c9e0d49028c52296fa920428d30fd7c3 (patch) | |
| tree | b602220ffbcfd2f2a7dec1828a923c6c0e756133 /gr-digital/lib | |
| parent | 74c53aa4c5b9aeac590b803b12601bcc9c8b9b60 (diff) | |
| download | gnuradio-55ff1160c9e0d49028c52296fa920428d30fd7c3.tar.gz gnuradio-55ff1160c9e0d49028c52296fa920428d30fd7c3.tar.bz2 gnuradio-55ff1160c9e0d49028c52296fa920428d30fd7c3.zip | |
digital: fixing up blocks to use SNR est classes more appropriately.
Diffstat (limited to 'gr-digital/lib')
| -rw-r--r-- | gr-digital/lib/digital_impl_mpsk_snr_est.cc | 15 | ||||
| -rw-r--r-- | gr-digital/lib/digital_mpsk_snr_est_cc.cc | 7 |
2 files changed, 11 insertions, 11 deletions
diff --git a/gr-digital/lib/digital_impl_mpsk_snr_est.cc b/gr-digital/lib/digital_impl_mpsk_snr_est.cc index aa0d4ffb9..8adc6ffed 100644 --- a/gr-digital/lib/digital_impl_mpsk_snr_est.cc +++ b/gr-digital/lib/digital_impl_mpsk_snr_est.cc @@ -50,8 +50,7 @@ digital_impl_mpsk_snr_est::alpha() const int digital_impl_mpsk_snr_est::update(int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) + gr_vector_const_void_star &input_items) { throw std::runtime_error("digital_impl_mpsk_snr_est: Unimplemented"); } @@ -77,8 +76,7 @@ digital_impl_mpsk_snr_est_simple::digital_impl_mpsk_snr_est_simple( int digital_impl_mpsk_snr_est_simple::update( int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) + gr_vector_const_void_star &input_items) { const gr_complex *in = (const gr_complex *) input_items[0]; @@ -117,8 +115,7 @@ digital_impl_mpsk_snr_est_skew::digital_impl_mpsk_snr_est_skew( int digital_impl_mpsk_snr_est_skew::update( int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) + gr_vector_const_void_star &input_items) { const gr_complex *in = (const gr_complex *) input_items[0]; @@ -164,8 +161,7 @@ digital_impl_mpsk_snr_est_m2m4::digital_impl_mpsk_snr_est_m2m4( int digital_impl_mpsk_snr_est_m2m4::update( int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) + gr_vector_const_void_star &input_items) { const gr_complex *in = (const gr_complex *) input_items[0]; @@ -202,8 +198,7 @@ digital_impl_mpsk_snr_est_svn::digital_impl_mpsk_snr_est_svn( int digital_impl_mpsk_snr_est_svn::update( int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) + gr_vector_const_void_star &input_items) { const gr_complex *in = (const gr_complex *) input_items[0]; diff --git a/gr-digital/lib/digital_mpsk_snr_est_cc.cc b/gr-digital/lib/digital_mpsk_snr_est_cc.cc index 0830b4a4d..7d75dbb8b 100644 --- a/gr-digital/lib/digital_mpsk_snr_est_cc.cc +++ b/gr-digital/lib/digital_mpsk_snr_est_cc.cc @@ -63,7 +63,12 @@ digital_mpsk_snr_est_cc::work(int noutput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) { - return d_snr_est->update(noutput_items, input_items, output_items); + // This is a pass-through block; copy input to output + memcpy(output_items[0], input_items[0], + noutput_items * sizeof(gr_complex)); + + // Update the SNR estimate registers from the current inputs + return d_snr_est->update(noutput_items, input_items); } double |