<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10491">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cosmetic: unify measurement sample handling in one function<br><br>In l1sap.c we call lchan_new_ul_meas() and lchan_meas_check_compute()<br>directly in sequence. Lets unify thos two steps inside measurement.c so<br>that we only need to call one function from l1sap.c.<br><br>Change-Id: If48bc7442dfaab8c36b93949f741de6e836e792a<br>Related: OS#2975<br>---<br>M include/osmo-bts/measurement.h<br>M src/common/l1sap.c<br>M src/common/measurement.c<br>3 files changed, 16 insertions(+), 5 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/91/10491/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 e32c8e8..283b0ff 100644</span><br><span>--- a/include/osmo-bts/measurement.h</span><br><span>+++ b/include/osmo-bts/measurement.h</span><br><span>@@ -8,4 +8,6 @@</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(120, 100%, 40%);">+void 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%);">+</span><br><span> #endif</span><br><span>diff --git a/src/common/l1sap.c b/src/common/l1sap.c</span><br><span>index 8936674..00ead8d 100644</span><br><span>--- a/src/common/l1sap.c</span><br><span>+++ b/src/common/l1sap.c</span><br><span>@@ -528,11 +528,7 @@</span><br><span>    /* we assume that symbol period is 1 bit: */</span><br><span>         set_ms_to_data(lchan, info_meas_ind->ta_offs_256bits / 256, true);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-       lchan_new_ul_meas(lchan, &ulm, info_meas_ind->fn);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-       /* Check measurement period end and prepare the UL measurment</span><br><span style="color: hsl(0, 100%, 40%);">-    * report at Meas period End*/</span><br><span style="color: hsl(0, 100%, 40%);">-  lchan_meas_check_compute(lchan, info_meas_ind->fn);</span><br><span style="color: hsl(120, 100%, 40%);">+        lchan_meas_process_measurement(lchan, &ulm, info_meas_ind->fn);</span><br><span> </span><br><span>   return 0;</span><br><span> }</span><br><span>diff --git a/src/common/measurement.c b/src/common/measurement.c</span><br><span>index 01f1e5d..a75b54d 100644</span><br><span>--- a/src/common/measurement.c</span><br><span>+++ b/src/common/measurement.c</span><br><span>@@ -477,3 +477,16 @@</span><br><span> </span><br><span>       return 1;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Process a single uplink measurement sample. This function is called from</span><br><span style="color: hsl(120, 100%, 40%);">+ * l1sap.c every time a measurement indication is received. It collects the</span><br><span style="color: hsl(120, 100%, 40%);">+ * measurement samples and automatically detects the end oft the measurement</span><br><span style="color: hsl(120, 100%, 40%);">+ * interval. */</span><br><span style="color: hsl(120, 100%, 40%);">+void 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%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+      lchan_new_ul_meas(lchan, ulm, fn);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+  /* Check measurement period end and prepare the UL</span><br><span style="color: hsl(120, 100%, 40%);">+     * measurment report at Meas period End */</span><br><span style="color: hsl(120, 100%, 40%);">+    lchan_meas_check_compute(lchan, fn);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10491">change 10491</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/10491"/><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-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: If48bc7442dfaab8c36b93949f741de6e836e792a </div>
<div style="display:none"> Gerrit-Change-Number: 10491 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>