<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/25526">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bts-trx: Get rid of check_transceiver_availability_trx()<br><br>Get rid of this helper function, which is a remain of past epochs<br>(pre-FSM). In the current uses, there's only 2 real cases: the "if" path<br>upon SET BTS ATTR received (and even that one should be moved as per<br>what the code comment states), and the one happening when the TRX is<br>closed.<br><br>it really makes no sense to DISABLE the TRX as a result of SET BTS ATTR.<br><br>Change-Id: I48adfeecd722684152c589bcba827079b0a78c3a<br>---<br>M src/osmo-bts-trx/l1_if.c<br>1 file changed, 10 insertions(+), 24 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/26/25526/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c</span><br><span>index a3282ee..0b96017 100644</span><br><span>--- a/src/osmo-bts-trx/l1_if.c</span><br><span>+++ b/src/osmo-bts-trx/l1_if.c</span><br><span>@@ -87,26 +87,6 @@</span><br><span> return l1h;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void check_transceiver_availability_trx(struct trx_l1h *l1h, int avail)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct phy_instance *pinst = l1h->phy_inst;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts_trx *trx = pinst->trx;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* HACK, we should change state when we receive first clock from</span><br><span style="color: hsl(0, 100%, 40%);">- * transceiver */</span><br><span style="color: hsl(0, 100%, 40%);">- if (avail) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* signal availability */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!pinst->u.osmotrx.sw_act_reported) {</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_SW_ACT, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(trx->bb_transc.mo.fi, NM_EV_SW_ACT, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- pinst->u.osmotrx.sw_act_reported = true;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_DISABLE, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(trx->bb_transc.mo.fi, NM_EV_DISABLE, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> int bts_model_lchan_deactivate(struct gsm_lchan *lchan)</span><br><span> {</span><br><span> if (lchan->rel_act_kind == LCHAN_REL_ACT_REACT) {</span><br><span>@@ -211,7 +191,8 @@</span><br><span> osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_CLOSE, NULL);</span><br><span> </span><br><span> /* Set to Operational State: Disabled */</span><br><span style="color: hsl(0, 100%, 40%);">- check_transceiver_availability_trx(l1h, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_DISABLE, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(trx->bb_transc.mo.fi, NM_EV_DISABLE, NULL);</span><br><span> }</span><br><span> </span><br><span> /* on RSL failure, deactivate transceiver */</span><br><span>@@ -234,7 +215,6 @@</span><br><span> struct trx_l1h *l1h = pinst->u.osmotrx.hdl;</span><br><span> uint8_t bsic = bts->bsic;</span><br><span> struct gsm_bts_trx *trx;</span><br><span style="color: hsl(0, 100%, 40%);">- struct phy_link *plink;</span><br><span> </span><br><span> /* ARFCN for C0 is assigned during Set BTS Attr, see oml.c */</span><br><span> osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_CFG_ARFCN, (void*)(intptr_t)pinst->trx->arfcn);</span><br><span>@@ -242,10 +222,16 @@</span><br><span> llist_for_each_entry(trx, &bts->trx_list, list) {</span><br><span> pinst = trx_phy_instance(trx);</span><br><span> l1h = pinst->u.osmotrx.hdl;</span><br><span style="color: hsl(0, 100%, 40%);">- plink = pinst->phy_link;</span><br><span> </span><br><span> osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_CFG_BSIC, (void*)(intptr_t)bsic);</span><br><span style="color: hsl(0, 100%, 40%);">- check_transceiver_availability_trx(l1h, phy_link_state_get(plink) != PHY_LINK_SHUTDOWN);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* signal availability */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!pinst->u.osmotrx.sw_act_reported) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* HACK, we should change state when we receive first clock from</span><br><span style="color: hsl(120, 100%, 40%);">+ * transceiver */</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_SW_ACT, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(trx->bb_transc.mo.fi, NM_EV_SW_ACT, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ pinst->u.osmotrx.sw_act_reported = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> return 0;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/25526">change 25526</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/+/25526"/><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: I48adfeecd722684152c589bcba827079b0a78c3a </div>
<div style="display:none"> Gerrit-Change-Number: 25526 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>