<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/14687">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Move Access Burst link quality handling to L1SAP<br><br>Change-Id: I893ec9c6c2ebad71ea68b2dc5f9f5094dfc43b78<br>Depends: (libosmocore) Ie2a66ebd040b61d6daf49e04bf8a84d3d64764ee<br>---<br>M src/common/l1sap.c<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>M src/osmo-bts-trx/scheduler_trx.c<br>5 files changed, 14 insertions(+), 18 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/87/14687/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/l1sap.c b/src/common/l1sap.c</span><br><span>index 79af8e2..f07e79c 100644</span><br><span>--- a/src/common/l1sap.c</span><br><span>+++ b/src/common/l1sap.c</span><br><span>@@ -1272,6 +1272,14 @@</span><br><span> return false;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Link quality defined by C/I (Carrier-to-Interference ratio) */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rach_ind->lqual_cb < bts->min_qual_rach) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPFN(DL1C, LOGL_INFO, rach_ind->fn, "Ignoring RACH request: "</span><br><span style="color: hsl(120, 100%, 40%);">+ "link quality (%d) below the minimum (%d)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ rach_ind->lqual_cb, bts->min_qual_rach);</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return true;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-bts-litecell15/l1_if.c b/src/osmo-bts-litecell15/l1_if.c</span><br><span>index 77b72bd..5c969f0 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>@@ -1003,12 +1003,6 @@</span><br><span> int rc;</span><br><span> struct ph_rach_ind_param rach_ind_param;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: this should be deprecated/obsoleted as it bypasses rach.busy counting */</span><br><span style="color: hsl(0, 100%, 40%);">- if (ra_ind->measParam.fLinkQuality * 10 < bts->min_qual_rach) {</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_free(l1p_msg);</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> dump_meas_res(LOGL_DEBUG, &ra_ind->measParam);</span><br><span> </span><br><span> if ((ra_ind->msgUnitParam.u8Size != 1) &&</span><br><span>@@ -1029,6 +1023,7 @@</span><br><span> .rssi = (int8_t) ra_ind->measParam.fRssi,</span><br><span> .ber10k = (unsigned int) (ra_ind->measParam.fBer * 10000.0),</span><br><span> .acc_delay_256bits = ra_ind->measParam.i16BurstTiming * 64,</span><br><span style="color: hsl(120, 100%, 40%);">+ .lqual_cb = ra_ind->measParam.fLinkQuality * 10, /* centiBels */</span><br><span> };</span><br><span> </span><br><span> lchan = l1if_hLayer_to_lchan(trx, (uint32_t)ra_ind->hLayer2);</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 9affc89..7df4147 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>@@ -1059,12 +1059,6 @@</span><br><span> int rc;</span><br><span> struct ph_rach_ind_param rach_ind_param;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: this should be deprecated/obsoleted as it bypasses rach.busy counting */</span><br><span style="color: hsl(0, 100%, 40%);">- if (ra_ind->measParam.fLinkQuality * 10 < bts->min_qual_rach) {</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_free(l1p_msg);</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> dump_meas_res(LOGL_DEBUG, &ra_ind->measParam);</span><br><span> </span><br><span> if ((ra_ind->msgUnitParam.u8Size != 1) &&</span><br><span>@@ -1085,6 +1079,7 @@</span><br><span> .rssi = (int8_t) ra_ind->measParam.fRssi,</span><br><span> .ber10k = (unsigned int) (ra_ind->measParam.fBer * 10000.0),</span><br><span> .acc_delay_256bits = ra_ind->measParam.i16BurstTiming * 64,</span><br><span style="color: hsl(120, 100%, 40%);">+ .lqual_cb = ra_ind->measParam.fLinkQuality * 10, /* centiBels */</span><br><span> };</span><br><span> </span><br><span> lchan = l1if_hLayer_to_lchan(trx, (uint32_t)ra_ind->hLayer2);</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 975bd34..9c28e3a 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>@@ -997,12 +997,6 @@</span><br><span> int rc;</span><br><span> struct ph_rach_ind_param rach_ind_param;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: this should be deprecated/obsoleted as it bypasses rach.busy counting */</span><br><span style="color: hsl(0, 100%, 40%);">- if (ra_ind->measParam.fLinkQuality * 10 < bts->min_qual_rach) {</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_free(l1p_msg);</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> dump_meas_res(LOGL_DEBUG, &ra_ind->measParam);</span><br><span> </span><br><span> if ((ra_ind->msgUnitParam.u8Size != 1) &&</span><br><span>@@ -1024,6 +1018,7 @@</span><br><span> .rssi = (int8_t) ra_ind->measParam.fRssi,</span><br><span> .ber10k = (unsigned int) (ra_ind->measParam.fBer * 10000.0),</span><br><span> .acc_delay_256bits = ra_ind->measParam.i16BurstTiming * 64,</span><br><span style="color: hsl(120, 100%, 40%);">+ .lqual_cb = ra_ind->measParam.fLinkQuality * 10, /* centiBels */</span><br><span> };</span><br><span> </span><br><span> lchan = l1if_hLayer_to_lchan(trx, ra_ind->hLayer2);</span><br><span>diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c</span><br><span>index b10ca26..56483f3 100644</span><br><span>--- a/src/osmo-bts-trx/scheduler_trx.c</span><br><span>+++ b/src/osmo-bts-trx/scheduler_trx.c</span><br><span>@@ -816,6 +816,9 @@</span><br><span> l1sap.u.rach_ind.rssi = bi->rssi;</span><br><span> l1sap.u.rach_ind.fn = bi->fn;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* FIXME: check for TRX_BI_F_CI_CB, and use the value from UL.ind */</span><br><span style="color: hsl(120, 100%, 40%);">+ l1sap.u.rach_ind.lqual_cb = l1t->trx->bts->min_qual_rach;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Decode RACH depending on its synch. sequence */</span><br><span> switch (synch_seq) {</span><br><span> case RACH_SYNCH_SEQ_TS1:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/14687">change 14687</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/+/14687"/><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: I893ec9c6c2ebad71ea68b2dc5f9f5094dfc43b78 </div>
<div style="display:none"> Gerrit-Change-Number: 14687 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>