<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/22906">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ta_control: make 'struct bts_ul_meas' parameters const<br><br>The only reason why it was not 'const' is that in lchan_new_ul_meas()<br>we may need to overwrite 'ulm->is_sub'. This can still be done after<br>memcpy()ing a new set of samples to the destination buffer.<br><br>Change-Id: I0cabf75f8e0bf793c01225a4a8433e994c93f562<br>Related: OS#5024<br>---<br>M include/osmo-bts/measurement.h<br>M src/common/measurement.c<br>M tests/meas/meas_test.c<br>3 files changed, 19 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/06/22906/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/measurement.h b/include/osmo-bts/measurement.h</span><br><span>index 8e91c33..45f275f 100644</span><br><span>--- a/include/osmo-bts/measurement.h</span><br><span>+++ b/include/osmo-bts/measurement.h</span><br><span>@@ -4,11 +4,15 @@</span><br><span> #define MEAS_MAX_TIMING_ADVANCE 63</span><br><span> #define MEAS_MIN_TIMING_ADVANCE 0</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int lchan_new_ul_meas(struct gsm_lchan *lchan, struct bts_ul_meas *ulm, uint32_t fn);</span><br><span style="color: hsl(120, 100%, 40%);">+int lchan_new_ul_meas(struct gsm_lchan *lchan,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct bts_ul_meas *ulm,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t fn);</span><br><span> </span><br><span> int lchan_meas_check_compute(struct gsm_lchan *lchan, uint32_t fn);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int lchan_meas_process_measurement(struct gsm_lchan *lchan, struct bts_ul_meas *ulm, uint32_t fn);</span><br><span style="color: hsl(120, 100%, 40%);">+int lchan_meas_process_measurement(struct gsm_lchan *lchan,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct bts_ul_meas *ulm,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t fn);</span><br><span> </span><br><span> void lchan_meas_reset(struct gsm_lchan *lchan);</span><br><span> </span><br><span>diff --git a/src/common/measurement.c b/src/common/measurement.c</span><br><span>index 95d60f6..03afaa3 100644</span><br><span>--- a/src/common/measurement.c</span><br><span>+++ b/src/common/measurement.c</span><br><span>@@ -318,9 +318,12 @@</span><br><span> </span><br><span> /* receive a L1 uplink measurement from L1 (this function is only used</span><br><span> * internally, it is public to call it from unit-tests) */</span><br><span style="color: hsl(0, 100%, 40%);">-int lchan_new_ul_meas(struct gsm_lchan *lchan, struct bts_ul_meas *ulm, uint32_t fn)</span><br><span style="color: hsl(120, 100%, 40%);">+int lchan_new_ul_meas(struct gsm_lchan *lchan,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct bts_ul_meas *ulm,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t fn)</span><br><span> {</span><br><span> uint32_t fn_mod = fn % modulus_by_lchan(lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bts_ul_meas *dest;</span><br><span> </span><br><span> if (lchan->state != LCHAN_S_ACTIVE) {</span><br><span> LOGPFN(DMEAS, LOGL_NOTICE, fn,</span><br><span>@@ -336,19 +339,19 @@</span><br><span> return -ENOSPC;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ dest = &lchan->meas.uplink[lchan->meas.num_ul_meas++];</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(dest, ulm, sizeof(*ulm));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* We expect the lower layers to mark AMR SID_UPDATE frames already as such.</span><br><span> * In this function, we only deal with the common logic as per the TS 45.008 tables */</span><br><span> if (!ulm->is_sub)</span><br><span style="color: hsl(0, 100%, 40%);">- ulm->is_sub = ts45008_83_is_sub(lchan, fn);</span><br><span style="color: hsl(120, 100%, 40%);">+ dest->is_sub = ts45008_83_is_sub(lchan, fn);</span><br><span> </span><br><span> DEBUGPFN(DMEAS, fn, "%s adding measurement (ber10k=%u, ta_offs=%d, ci=%0.2f, is_sub=%u, rssi=-%u), num_ul_meas=%d, fn_mod=%u\n",</span><br><span> gsm_lchan_name(lchan), ulm->ber10k, ulm->ta_offs_256bits,</span><br><span style="color: hsl(0, 100%, 40%);">- ulm->c_i, ulm->is_sub, ulm->inv_rssi, lchan->meas.num_ul_meas,</span><br><span style="color: hsl(120, 100%, 40%);">+ ulm->c_i, dest->is_sub, ulm->inv_rssi, lchan->meas.num_ul_meas,</span><br><span> fn_mod);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(&lchan->meas.uplink[lchan->meas.num_ul_meas++], ulm,</span><br><span style="color: hsl(0, 100%, 40%);">- sizeof(*ulm));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> lchan->meas.last_fn = fn;</span><br><span> </span><br><span> return 0;</span><br><span>@@ -757,7 +760,9 @@</span><br><span> * l1sap.c every time a measurement indication is received. It collects the</span><br><span> * measurement samples and automatically detects the end of the measurement</span><br><span> * interval. */</span><br><span style="color: hsl(0, 100%, 40%);">-int lchan_meas_process_measurement(struct gsm_lchan *lchan, struct bts_ul_meas *ulm, uint32_t fn)</span><br><span style="color: hsl(120, 100%, 40%);">+int lchan_meas_process_measurement(struct gsm_lchan *lchan,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct bts_ul_meas *ulm,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t fn)</span><br><span> {</span><br><span> lchan_new_ul_meas(lchan, ulm, fn);</span><br><span> return lchan_meas_check_compute(lchan, fn);</span><br><span>diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c</span><br><span>index 174abbe..d129336 100644</span><br><span>--- a/tests/meas/meas_test.c</span><br><span>+++ b/tests/meas/meas_test.c</span><br><span>@@ -89,7 +89,7 @@</span><br><span> </span><br><span> /* feed uplink measurements into the code */</span><br><span> for (i = 0; i < mtc->ulm_count; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_new_ul_meas(lchan, (struct bts_ul_meas *) &mtc->ulm[i], fn);</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_new_ul_meas(lchan, &mtc->ulm[i], fn);</span><br><span> fn += 1;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/22906">change 22906</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-bts/+/22906"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I0cabf75f8e0bf793c01225a4a8433e994c93f562 </div>
<div style="display:none"> Gerrit-Change-Number: 22906 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>