<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/17197">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, but someone else must approve
  pespin: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Do not depend on pcu_direct flag when populating ph_data_ind<br><br>The struct members ber10k, ta_offs_256bits and lqual_cb in ph_data_ind<br>are only populated when the pcu_direct flag is not set.<br><br>The pcu_direct flag is set when the pcu is directly attached to the phy<br>and all pcu related traffic (pdtch) is handled without sending it through<br>osmo-bts-sysmo. For those cases osmo_bts_sysmo will not make use of<br>those struct members, even if they were populated. When the PCU is not<br>directly attached the data is needed because it is sent through the<br>pcu_sock to the PCU.<br><br>Lets remove the check because it is not required. Also in future patches<br>where measurement indications and data / tch indicatins are merged the<br>struct members are also needed to carry the measurement information for<br>SACCH as well.<br><br>Change-Id: Iaa37bb62af4f5eb4b6e684cb754e68d11e6fd676<br>---<br>M src/osmo-bts-litecell15/l1_if.c<br>M src/osmo-bts-oc2g/l1_if.c<br>M src/osmo-bts-sysmo/l1_if.c<br>3 files changed, 12 insertions(+), 15 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-litecell15/l1_if.c b/src/osmo-bts-litecell15/l1_if.c</span><br><span>index 989cc10..abf48bc 100644</span><br><span>--- a/src/osmo-bts-litecell15/l1_if.c</span><br><span>+++ b/src/osmo-bts-litecell15/l1_if.c</span><br><span>@@ -1024,11 +1024,10 @@</span><br><span>        l1sap->u.data.chan_nr = chan_nr;</span><br><span>  l1sap->u.data.fn = fn;</span><br><span>    l1sap->u.data.rssi = rssi;</span><br><span style="color: hsl(0, 100%, 40%);">-   if (!pcu_direct) {</span><br><span style="color: hsl(0, 100%, 40%);">-              l1sap->u.data.ber10k = data_ind->measParam.fBer * 10000;</span><br><span style="color: hsl(0, 100%, 40%);">-          l1sap->u.data.ta_offs_256bits = data_ind->measParam.i16BurstTiming*64;</span><br><span style="color: hsl(0, 100%, 40%);">-            l1sap->u.data.lqual_cb = data_ind->measParam.fLinkQuality * 10;</span><br><span style="color: hsl(0, 100%, 40%);">-   }</span><br><span style="color: hsl(120, 100%, 40%);">+     l1sap->u.data.ber10k = data_ind->measParam.fBer * 10000;</span><br><span style="color: hsl(120, 100%, 40%);">+        l1sap->u.data.ta_offs_256bits = data_ind->measParam.i16BurstTiming*64;</span><br><span style="color: hsl(120, 100%, 40%);">+  l1sap->u.data.lqual_cb = data_ind->measParam.fLinkQuality * 10;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>      return l1sap_up(trx, l1sap);</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-bts-oc2g/l1_if.c b/src/osmo-bts-oc2g/l1_if.c</span><br><span>index 9816979..b46c528 100644</span><br><span>--- a/src/osmo-bts-oc2g/l1_if.c</span><br><span>+++ b/src/osmo-bts-oc2g/l1_if.c</span><br><span>@@ -1081,11 +1081,10 @@</span><br><span>     l1sap->u.data.chan_nr = chan_nr;</span><br><span>  l1sap->u.data.fn = fn;</span><br><span>    l1sap->u.data.rssi = rssi;</span><br><span style="color: hsl(0, 100%, 40%);">-   if (!pcu_direct) {</span><br><span style="color: hsl(0, 100%, 40%);">-              l1sap->u.data.ber10k = data_ind->measParam.fBer * 10000;</span><br><span style="color: hsl(0, 100%, 40%);">-          l1sap->u.data.ta_offs_256bits = data_ind->measParam.i16BurstTiming*64;</span><br><span style="color: hsl(0, 100%, 40%);">-            l1sap->u.data.lqual_cb = data_ind->measParam.fLinkQuality * 10;</span><br><span style="color: hsl(0, 100%, 40%);">-   }</span><br><span style="color: hsl(120, 100%, 40%);">+     l1sap->u.data.ber10k = data_ind->measParam.fBer * 10000;</span><br><span style="color: hsl(120, 100%, 40%);">+        l1sap->u.data.ta_offs_256bits = data_ind->measParam.i16BurstTiming*64;</span><br><span style="color: hsl(120, 100%, 40%);">+  l1sap->u.data.lqual_cb = data_ind->measParam.fLinkQuality * 10;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>      return l1sap_up(trx, l1sap);</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c</span><br><span>index db0dfb5..a891f48 100644</span><br><span>--- a/src/osmo-bts-sysmo/l1_if.c</span><br><span>+++ b/src/osmo-bts-sysmo/l1_if.c</span><br><span>@@ -1010,11 +1010,10 @@</span><br><span>         l1sap->u.data.chan_nr = chan_nr;</span><br><span>  l1sap->u.data.fn = fn;</span><br><span>    l1sap->u.data.rssi = (int8_t) (data_ind->measParam.fRssi);</span><br><span style="color: hsl(0, 100%, 40%);">-        if (!pcu_direct) { /* FIXME: if pcu_direct=1, then this is not set, what to do in pcu_tx_data_ind() in this case ?*/</span><br><span style="color: hsl(0, 100%, 40%);">-            l1sap->u.data.ber10k = data_ind->measParam.fBer * 10000;</span><br><span style="color: hsl(0, 100%, 40%);">-          l1sap->u.data.ta_offs_256bits = data_ind->measParam.i16BurstTiming * 64;</span><br><span style="color: hsl(0, 100%, 40%);">-          l1sap->u.data.lqual_cb = data_ind->measParam.fLinkQuality * 10;</span><br><span style="color: hsl(0, 100%, 40%);">-   }</span><br><span style="color: hsl(120, 100%, 40%);">+     l1sap->u.data.ber10k = data_ind->measParam.fBer * 10000;</span><br><span style="color: hsl(120, 100%, 40%);">+        l1sap->u.data.ta_offs_256bits = data_ind->measParam.i16BurstTiming * 64;</span><br><span style="color: hsl(120, 100%, 40%);">+        l1sap->u.data.lqual_cb = data_ind->measParam.fLinkQuality * 10;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>      /* copy data from L1 primitive to L1SAP primitive */</span><br><span>         sap_msg->l2h = msgb_put(sap_msg, data_ind->msgUnitParam.u8Size);</span><br><span>       memcpy(sap_msg->l2h, data_ind->msgUnitParam.u8Buffer,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/17197">change 17197</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/+/17197"/><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: Iaa37bb62af4f5eb4b6e684cb754e68d11e6fd676 </div>
<div style="display:none"> Gerrit-Change-Number: 17197 </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-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>