<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/17539">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">scheduler: always call ul handler on nope ind<br><br>When a nope indication is received from the TRX normally a separate<br>handler (.nope_fn) is called. It turned out that calling the ul handler<br>(.ul_fn) on nope indications is the usual case, so lets remove the<br>.nope_fn member and call the ul handler whenever we get nope indications<br>from the trx.<br><br>Change-Id: Ice45d5986610d9bcef2a7e41f0a395ec779e3928<br>Related: OS#4461<br>---<br>M include/osmo-bts/scheduler_backend.h<br>M src/common/scheduler.c<br>2 files changed, 2 insertions(+), 19 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/39/17539/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/scheduler_backend.h b/include/osmo-bts/scheduler_backend.h</span><br><span>index aa2d6e9..4959853 100644</span><br><span>--- a/include/osmo-bts/scheduler_backend.h</span><br><span>+++ b/include/osmo-bts/scheduler_backend.h</span><br><span>@@ -31,8 +31,6 @@</span><br><span> trx_sched_dl_func *dl_fn;</span><br><span> /*! \brief function to call when burst received from PHY */</span><br><span> trx_sched_ul_func *ul_fn;</span><br><span style="color: hsl(0, 100%, 40%);">- /*! \brief function to call when NOPE.ind received from PHY */</span><br><span style="color: hsl(0, 100%, 40%);">- trx_sched_ul_func *nope_fn;</span><br><span> /*! \brief channel flags, see TRX_CHAN_FLAG_* */</span><br><span> uint8_t flags;</span><br><span> };</span><br><span>diff --git a/src/common/scheduler.c b/src/common/scheduler.c</span><br><span>index e8df537..39bb9a4 100644</span><br><span>--- a/src/common/scheduler.c</span><br><span>+++ b/src/common/scheduler.c</span><br><span>@@ -365,7 +365,6 @@</span><br><span> .rts_fn = rts_data_fn,</span><br><span> .dl_fn = tx_data_fn,</span><br><span> .ul_fn = rx_data_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_data_fn,</span><br><span> },</span><br><span> [TRXC_SACCHTH_0] = {</span><br><span> .name = "SACCH/TH(0)", /* 3GPP TS 05.02, section 3.3.4.1 */</span><br><span>@@ -377,7 +376,6 @@</span><br><span> .rts_fn = rts_data_fn,</span><br><span> .dl_fn = tx_data_fn,</span><br><span> .ul_fn = rx_data_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_data_fn,</span><br><span> },</span><br><span> [TRXC_SACCHTH_1] = {</span><br><span> .name = "SACCH/TH(1)", /* 3GPP TS 05.02, section 3.3.4.1 */</span><br><span>@@ -389,7 +387,6 @@</span><br><span> .rts_fn = rts_data_fn,</span><br><span> .dl_fn = tx_data_fn,</span><br><span> .ul_fn = rx_data_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_data_fn,</span><br><span> },</span><br><span> [TRXC_SACCH4_0] = {</span><br><span> .name = "SACCH/4(0)", /* 3GPP TS 05.02, section 3.3.4.1 */</span><br><span>@@ -401,7 +398,6 @@</span><br><span> .rts_fn = rts_data_fn,</span><br><span> .dl_fn = tx_data_fn,</span><br><span> .ul_fn = rx_data_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_data_fn,</span><br><span> },</span><br><span> [TRXC_SACCH4_1] = {</span><br><span> .name = "SACCH/4(1)", /* 3GPP TS 05.02, section 3.3.4.1 */</span><br><span>@@ -413,7 +409,6 @@</span><br><span> .rts_fn = rts_data_fn,</span><br><span> .dl_fn = tx_data_fn,</span><br><span> .ul_fn = rx_data_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_data_fn,</span><br><span> },</span><br><span> [TRXC_SACCH4_2] = {</span><br><span> .name = "SACCH/4(2)", /* 3GPP TS 05.02, section 3.3.4.1 */</span><br><span>@@ -425,7 +420,6 @@</span><br><span> .rts_fn = rts_data_fn,</span><br><span> .dl_fn = tx_data_fn,</span><br><span> .ul_fn = rx_data_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_data_fn,</span><br><span> },</span><br><span> [TRXC_SACCH4_3] = {</span><br><span> .name = "SACCH/4(3)", /* 3GPP TS 05.02, section 3.3.4.1 */</span><br><span>@@ -437,7 +431,6 @@</span><br><span> .rts_fn = rts_data_fn,</span><br><span> .dl_fn = tx_data_fn,</span><br><span> .ul_fn = rx_data_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_data_fn,</span><br><span> },</span><br><span> [TRXC_SACCH8_0] = {</span><br><span> .name = "SACCH/8(0)", /* 3GPP TS 05.02, section 3.3.4.1 */</span><br><span>@@ -449,7 +442,6 @@</span><br><span> .rts_fn = rts_data_fn,</span><br><span> .dl_fn = tx_data_fn,</span><br><span> .ul_fn = rx_data_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_data_fn,</span><br><span> },</span><br><span> [TRXC_SACCH8_1] = {</span><br><span> .name = "SACCH/8(1)", /* 3GPP TS 05.02, section 3.3.4.1 */</span><br><span>@@ -461,7 +453,6 @@</span><br><span> .rts_fn = rts_data_fn,</span><br><span> .dl_fn = tx_data_fn,</span><br><span> .ul_fn = rx_data_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_data_fn,</span><br><span> },</span><br><span> [TRXC_SACCH8_2] = {</span><br><span> .name = "SACCH/8(2)", /* 3GPP TS 05.02, section 3.3.4.1 */</span><br><span>@@ -473,7 +464,6 @@</span><br><span> .rts_fn = rts_data_fn,</span><br><span> .dl_fn = tx_data_fn,</span><br><span> .ul_fn = rx_data_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_data_fn,</span><br><span> },</span><br><span> [TRXC_SACCH8_3] = {</span><br><span> .name = "SACCH/8(3)", /* 3GPP TS 05.02, section 3.3.4.1 */</span><br><span>@@ -485,7 +475,6 @@</span><br><span> .rts_fn = rts_data_fn,</span><br><span> .dl_fn = tx_data_fn,</span><br><span> .ul_fn = rx_data_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_data_fn,</span><br><span> },</span><br><span> [TRXC_SACCH8_4] = {</span><br><span> .name = "SACCH/8(4)", /* 3GPP TS 05.02, section 3.3.4.1 */</span><br><span>@@ -497,7 +486,6 @@</span><br><span> .rts_fn = rts_data_fn,</span><br><span> .dl_fn = tx_data_fn,</span><br><span> .ul_fn = rx_data_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_data_fn,</span><br><span> },</span><br><span> [TRXC_SACCH8_5] = {</span><br><span> .name = "SACCH/8(5)", /* 3GPP TS 05.02, section 3.3.4.1 */</span><br><span>@@ -509,7 +497,6 @@</span><br><span> .rts_fn = rts_data_fn,</span><br><span> .dl_fn = tx_data_fn,</span><br><span> .ul_fn = rx_data_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_data_fn,</span><br><span> },</span><br><span> [TRXC_SACCH8_6] = {</span><br><span> .name = "SACCH/8(6)", /* 3GPP TS 05.02, section 3.3.4.1 */</span><br><span>@@ -521,7 +508,6 @@</span><br><span> .rts_fn = rts_data_fn,</span><br><span> .dl_fn = tx_data_fn,</span><br><span> .ul_fn = rx_data_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_data_fn,</span><br><span> },</span><br><span> [TRXC_SACCH8_7] = {</span><br><span> .name = "SACCH/8(7)", /* 3GPP TS 05.02, section 3.3.4.1 */</span><br><span>@@ -533,7 +519,6 @@</span><br><span> .rts_fn = rts_data_fn,</span><br><span> .dl_fn = tx_data_fn,</span><br><span> .ul_fn = rx_data_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- .nope_fn = rx_data_fn,</span><br><span> },</span><br><span> [TRXC_PDTCH] = {</span><br><span> .name = "PDTCH", /* 3GPP TS 05.02, sections 3.2.4, 3.3.2.4 */</span><br><span>@@ -1391,9 +1376,9 @@</span><br><span> l1cs->last_tdma_fn = bi->fn;</span><br><span> l1cs->proc_tdma_fs++;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* handle NOPE indications (if the handler is present) */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* handle NOPE indications (if an ul handler is present) */</span><br><span> if (bi->flags & TRX_BI_F_NOPE_IND) {</span><br><span style="color: hsl(0, 100%, 40%);">- func = trx_chan_desc[chan].nope_fn;</span><br><span style="color: hsl(120, 100%, 40%);">+ func = trx_chan_desc[chan].ul_fn;</span><br><span> if (!func)</span><br><span> return 0;</span><br><span> return func(l1t, chan, bid, bi);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/17539">change 17539</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/+/17539"/><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: Ice45d5986610d9bcef2a7e41f0a395ec779e3928 </div>
<div style="display:none"> Gerrit-Change-Number: 17539 </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>