<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/20840">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">measurement: count measurements for FACCH/H twice.<br><br>The FACCH/H replaces to voice frames in TCH/H. This means during the<br>transmission of a FACCH one measurement value less is handed up to the<br>higher layers. This needs to be compensated by adding a the FAACH/H<br>measurement twice (as if it were from two voice frames).<br><br>Change-Id: Id533bb3207bac40d00d77b484619f66ea5c0774d<br>Related: OS#4799<br>---<br>M include/osmo-bts/gsm_data.h<br>M src/common/l1sap.c<br>M src/common/measurement.c<br>3 files changed, 24 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/40/20840/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h</span><br><span>index 1c1c5d4..45a131c 100644</span><br><span>--- a/include/osmo-bts/gsm_data.h</span><br><span>+++ b/include/osmo-bts/gsm_data.h</span><br><span>@@ -111,6 +111,9 @@</span><br><span> uint8_t is_sub:1;</span><br><span> /* RSSI in dBm * -1 */</span><br><span> uint8_t inv_rssi;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* weight of the measurement report: 2 for FACCH on TCH/H, 1 for all</span><br><span style="color: hsl(120, 100%, 40%);">+ * other channels types. */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t weight;</span><br><span> };</span><br><span> </span><br><span> struct amr_mode {</span><br><span>diff --git a/src/common/l1sap.c b/src/common/l1sap.c</span><br><span>index c9ec9bf..710cd99 100644</span><br><span>--- a/src/common/l1sap.c</span><br><span>+++ b/src/common/l1sap.c</span><br><span>@@ -658,6 +658,7 @@</span><br><span> struct info_meas_ind_param *info_meas_ind;</span><br><span> struct ph_data_param *ph_data_ind;</span><br><span> struct ph_tch_param *ph_tch_ind;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t link_id = 0;</span><br><span> uint8_t chan_nr;</span><br><span> uint32_t fn;</span><br><span> uint8_t inv_rssi;</span><br><span>@@ -694,6 +695,7 @@</span><br><span> ph_data_ind = &l1sap->u.data;</span><br><span> if (ph_data_ind->rssi == 0)</span><br><span> return;</span><br><span style="color: hsl(120, 100%, 40%);">+ link_id = ph_data_ind->link_id;</span><br><span> chan_nr = ph_data_ind->chan_nr;</span><br><span> fn = ph_data_ind->fn;</span><br><span> inv_rssi = abs(ph_data_ind->rssi);</span><br><span>@@ -730,6 +732,22 @@</span><br><span> ulm.inv_rssi = inv_rssi;</span><br><span> ulm.is_sub = is_sub;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* TCH channels are multiplexed with a FACCH channel. In the case of</span><br><span style="color: hsl(120, 100%, 40%);">+ * TCH/F the FACCH has the same length (spread over 8 TDMA frames)</span><br><span style="color: hsl(120, 100%, 40%);">+ * as a regular voice TDMA frames. This means that we either get</span><br><span style="color: hsl(120, 100%, 40%);">+ * one voice frame or a SACCH frame every 4 bursts. For TCH/H the</span><br><span style="color: hsl(120, 100%, 40%);">+ * seizes are different. A voice frame spreads over 4 TDMA frames</span><br><span style="color: hsl(120, 100%, 40%);">+ * and a SACCH over 6 TDMA frames. This means we either get 2 voice</span><br><span style="color: hsl(120, 100%, 40%);">+ * frames every 4 bursts or we end up with a single SACCH frame. Since</span><br><span style="color: hsl(120, 100%, 40%);">+ * measurement results are trsamitted to l1sap together with the actual</span><br><span style="color: hsl(120, 100%, 40%);">+ * data. The data of one TCH/H SACCH frame actually covers the period</span><br><span style="color: hsl(120, 100%, 40%);">+ * of two voice frames, which means a TCH/H SACCH measurement has a</span><br><span style="color: hsl(120, 100%, 40%);">+ * weight of two. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ind_type == PRIM_PH_DATA && lchan->type == GSM_LCHAN_TCH_H && !L1SAP_IS_LINK_SACCH(link_id))</span><br><span style="color: hsl(120, 100%, 40%);">+ ulm.weight = 2;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ ulm.weight = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* we assume that symbol period is 1 bit: */</span><br><span> set_ms_to_data(lchan, ta_offs_256bits / 256, true);</span><br><span> </span><br><span>diff --git a/src/common/measurement.c b/src/common/measurement.c</span><br><span>index 22f783d..f73f43b 100644</span><br><span>--- a/src/common/measurement.c</span><br><span>+++ b/src/common/measurement.c</span><br><span>@@ -739,7 +739,9 @@</span><br><span> * interval. */</span><br><span> int lchan_meas_process_measurement(struct gsm_lchan *lchan, struct bts_ul_meas *ulm, uint32_t fn)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_new_ul_meas(lchan, ulm, fn);</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int i;</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < ulm->weight; i++)</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_new_ul_meas(lchan, ulm, fn);</span><br><span> return lchan_meas_check_compute(lchan, fn);</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/+/20840">change 20840</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/+/20840"/><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: Id533bb3207bac40d00d77b484619f66ea5c0774d </div>
<div style="display:none"> Gerrit-Change-Number: 20840 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>