summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Habets <thomas@habets.se>2019-12-21 17:38:45 +0000
committerMartin Braun <martin.braun@ettus.com>2020-01-06 15:38:02 -0800
commitb1afefa6b2f95cd1da9cf7736df8416f3654f79e (patch)
tree70eefa6596d68ec691cdd8154c7e40fd5d0ff109
parent911844e77970401069e503ac6c447878778f81ae (diff)
gr-digital/symbol_sync: More const
Diffstat
-rw-r--r--gr-digital/lib/symbol_sync_cc_impl.cc16
-rw-r--r--gr-digital/lib/symbol_sync_cc_impl.h8
-rw-r--r--gr-digital/lib/symbol_sync_ff_impl.cc16
-rw-r--r--gr-digital/lib/symbol_sync_ff_impl.h8
4 files changed, 24 insertions, 24 deletions
diff --git a/gr-digital/lib/symbol_sync_cc_impl.cc b/gr-digital/lib/symbol_sync_cc_impl.cc
index 8e90285abd..5faf7871fa 100644
--- a/gr-digital/lib/symbol_sync_cc_impl.cc
+++ b/gr-digital/lib/symbol_sync_cc_impl.cc
@@ -297,11 +297,11 @@ void symbol_sync_cc_impl::propagate_tags(uint64_t nitems_rd,
// on and after the interpolated input sample, up to half way to
// the next output sample.
- uint64_t mid_period_offset =
+ const uint64_t mid_period_offset =
nitems_rd + d_filter_delay + static_cast<uint64_t>(iidx) +
static_cast<uint64_t>(llroundf(iidx_fraction + inst_output_period / 2.0f));
- uint64_t output_offset = nitems_wr + static_cast<uint64_t>(oidx);
+ const uint64_t output_offset = nitems_wr + static_cast<uint64_t>(oidx);
int i;
std::vector<tag_t>::iterator t;
@@ -323,7 +323,7 @@ void symbol_sync_cc_impl::save_expiring_tags(uint64_t nitems_rd, int consumed)
// Tags that have already been propagated, have already been erased
// from d_tags.
- uint64_t consumed_offset = nitems_rd + static_cast<uint64_t>(consumed);
+ const uint64_t consumed_offset = nitems_rd + static_cast<uint64_t>(consumed);
std::vector<tag_t>::iterator t;
for (t = d_tags.begin(); t != d_tags.end();) {
@@ -378,7 +378,7 @@ void symbol_sync_cc_impl::emit_optional_output(int oidx,
void symbol_sync_cc_impl::forecast(int noutput_items,
gr_vector_int& ninput_items_required)
{
- unsigned ninputs = ninput_items_required.size();
+ const unsigned ninputs = ninput_items_required.size();
// The '+ 2' in the expression below is an effort to always have at
// least one output sample, even if the main loop decides it has to
@@ -387,7 +387,7 @@ void symbol_sync_cc_impl::forecast(int noutput_items,
// The d_clock->get_max_avg_period() is also an effort to do the same,
// in case we have the worst case allowable clock timing deviation on
// input.
- int answer = static_cast<int>(ceilf(static_cast<float>(noutput_items + 2) *
+ const int answer = static_cast<int>(ceilf(static_cast<float>(noutput_items + 2) *
d_clock->get_max_avg_period() / d_osps)) +
static_cast<int>(d_interp->ntaps());
@@ -401,7 +401,7 @@ int symbol_sync_cc_impl::general_work(int noutput_items,
gr_vector_void_star& output_items)
{
// max input to consume
- int ni = ninput_items[0] - static_cast<int>(d_interp->ntaps());
+ const int ni = ninput_items[0] - static_cast<int>(d_interp->ntaps());
if (ni <= 0)
return 0;
@@ -419,8 +419,8 @@ int symbol_sync_cc_impl::general_work(int noutput_items,
int look_ahead_phase_n = 0;
float look_ahead_phase_wrapped = 0.0f;
- uint64_t nitems_rd = nitems_read(0);
- uint64_t nitems_wr = nitems_written(0);
+ const uint64_t nitems_rd = nitems_read(0);
+ const uint64_t nitems_wr = nitems_written(0);
uint64_t sync_tag_offset;
float sync_timing_offset;
float sync_clock_period;
diff --git a/gr-digital/lib/symbol_sync_cc_impl.h b/gr-digital/lib/symbol_sync_cc_impl.h
index e203db2a39..c6893b8789 100644
--- a/gr-digital/lib/symbol_sync_cc_impl.h
+++ b/gr-digital/lib/symbol_sync_cc_impl.h
@@ -102,15 +102,15 @@ private:
float d_avg_clock_period;
// Block output
- float d_osps;
- int d_osps_n;
+ const float d_osps;
+ const int d_osps_n;
// Tag Propagation and Symbol Clock Tracking Reset/Resync
uint64_t d_filter_delay; // interpolator filter delay
std::vector<tag_t> d_tags;
std::vector<tag_t> d_new_tags;
- pmt::pmt_t d_time_est_key;
- pmt::pmt_t d_clock_est_key;
+ const pmt::pmt_t d_time_est_key;
+ const pmt::pmt_t d_clock_est_key;
// Optional Diagnostic Outputs
int d_noutputs;
diff --git a/gr-digital/lib/symbol_sync_ff_impl.cc b/gr-digital/lib/symbol_sync_ff_impl.cc
index 9b8fd07215..948731a60f 100644
--- a/gr-digital/lib/symbol_sync_ff_impl.cc
+++ b/gr-digital/lib/symbol_sync_ff_impl.cc
@@ -306,11 +306,11 @@ void symbol_sync_ff_impl::propagate_tags(uint64_t nitems_rd,
// on and after the interpolated input sample, up to half way to
// the next output sample.
- uint64_t mid_period_offset =
+ const uint64_t mid_period_offset =
nitems_rd + d_filter_delay + static_cast<uint64_t>(iidx) +
static_cast<uint64_t>(llroundf(iidx_fraction + inst_output_period / 2.0f));
- uint64_t output_offset = nitems_wr + static_cast<uint64_t>(oidx);
+ const uint64_t output_offset = nitems_wr + static_cast<uint64_t>(oidx);
int i;
std::vector<tag_t>::iterator t;
@@ -332,7 +332,7 @@ void symbol_sync_ff_impl::save_expiring_tags(uint64_t nitems_rd, int consumed)
// Tags that have already been propagated, have already been erased
// from d_tags.
- uint64_t consumed_offset = nitems_rd + static_cast<uint64_t>(consumed);
+ const uint64_t consumed_offset = nitems_rd + static_cast<uint64_t>(consumed);
std::vector<tag_t>::iterator t;
for (t = d_tags.begin(); t != d_tags.end();) {
@@ -387,7 +387,7 @@ void symbol_sync_ff_impl::emit_optional_output(int oidx,
void symbol_sync_ff_impl::forecast(int noutput_items,
gr_vector_int& ninput_items_required)
{
- unsigned ninputs = ninput_items_required.size();
+ const unsigned ninputs = ninput_items_required.size();
// The '+ 2' in the expression below is an effort to always have at
// least one output sample, even if the main loop decides it has to
@@ -396,7 +396,7 @@ void symbol_sync_ff_impl::forecast(int noutput_items,
// The d_clock->get_max_avg_period() is also an effort to do the same,
// in case we have the worst case allowable clock timing deviation on
// input.
- int answer = static_cast<int>(ceilf(static_cast<float>(noutput_items + 2) *
+ const int answer = static_cast<int>(ceilf(static_cast<float>(noutput_items + 2) *
d_clock->get_max_avg_period() / d_osps)) +
static_cast<int>(d_interp->ntaps());
@@ -410,7 +410,7 @@ int symbol_sync_ff_impl::general_work(int noutput_items,
gr_vector_void_star& output_items)
{
// max input to consume
- int ni = ninput_items[0] - static_cast<int>(d_interp->ntaps());
+ const int ni = ninput_items[0] - static_cast<int>(d_interp->ntaps());
if (ni <= 0)
return 0;
@@ -428,8 +428,8 @@ int symbol_sync_ff_impl::general_work(int noutput_items,
int look_ahead_phase_n = 0;
float look_ahead_phase_wrapped = 0.0f;
- uint64_t nitems_rd = nitems_read(0);
- uint64_t nitems_wr = nitems_written(0);
+ const uint64_t nitems_rd = nitems_read(0);
+ const uint64_t nitems_wr = nitems_written(0);
uint64_t sync_tag_offset;
float sync_timing_offset;
float sync_clock_period;
diff --git a/gr-digital/lib/symbol_sync_ff_impl.h b/gr-digital/lib/symbol_sync_ff_impl.h
index 64e3d05b80..c06049b8c3 100644
--- a/gr-digital/lib/symbol_sync_ff_impl.h
+++ b/gr-digital/lib/symbol_sync_ff_impl.h
@@ -103,15 +103,15 @@ private:
float d_avg_clock_period;
// Block output
- float d_osps;
- int d_osps_n;
+ const float d_osps;
+ const int d_osps_n;
// Tag Propagation and Symbol Clock Tracking Reset/Resync
uint64_t d_filter_delay; // interpolator filter delay
std::vector<tag_t> d_tags;
std::vector<tag_t> d_new_tags;
- pmt::pmt_t d_time_est_key;
- pmt::pmt_t d_clock_est_key;
+ const pmt::pmt_t d_time_est_key;
+ const pmt::pmt_t d_clock_est_key;
// Optional Diagnostic Outputs
int d_noutputs;
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-23 22:01:29 +0000