<p>Hoernchen <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/19379">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Hoernchen: Looks good to me, approved; Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bts-trx: prov_fsm: Fix mess with 1 event having 2 names<br><br>They were both half implemented but named differently, due to myself<br>adding them during the initial FSM implementation. This prevents<br>osmo-bts-trx sending a POWEROFF when OML link is dropped.<br><br>Related: SYS#4864<br>Change-Id: Ic2dab864b6d4075dfb9a1e4acfd9af013c9c46fe<br>---<br>M src/osmo-bts-trx/l1_if.c<br>M src/osmo-bts-trx/trx_provision_fsm.c<br>M src/osmo-bts-trx/trx_provision_fsm.h<br>3 files changed, 2 insertions(+), 4 deletions(-)<br><br></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 bc936c0..cd7ecc0 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>@@ -232,7 +232,7 @@</span><br><span>       struct phy_instance *pinst = trx_phy_instance(trx);</span><br><span>  struct trx_l1h *l1h = pinst->u.osmotrx.hdl;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-      osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_POWEROFF, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+     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>     check_transceiver_availability_trx(l1h, 0);</span><br><span>diff --git a/src/osmo-bts-trx/trx_provision_fsm.c b/src/osmo-bts-trx/trx_provision_fsm.c</span><br><span>index 420ee24..f075e98 100644</span><br><span>--- a/src/osmo-bts-trx/trx_provision_fsm.c</span><br><span>+++ b/src/osmo-bts-trx/trx_provision_fsm.c</span><br><span>@@ -583,7 +583,7 @@</span><br><span>       },</span><br><span>   [TRX_PROV_ST_OPEN_POWERON] = {</span><br><span>               .in_event_mask =</span><br><span style="color: hsl(0, 100%, 40%);">-                        X(TRX_PROV_EV_POWEROFF) |</span><br><span style="color: hsl(120, 100%, 40%);">+                     X(TRX_PROV_EV_CLOSE) |</span><br><span>                       X(TRX_PROV_EV_CFG_TS),</span><br><span>               .out_state_mask =</span><br><span>                    X(TRX_PROV_ST_OPEN_WAIT_POWEROFF_CNF) |</span><br><span>@@ -619,7 +619,6 @@</span><br><span>        OSMO_VALUE_STRING(TRX_PROV_EV_SETTSC_CNF),</span><br><span>   OSMO_VALUE_STRING(TRX_PROV_EV_SETFORMAT_CNF),</span><br><span>        OSMO_VALUE_STRING(TRX_PROV_EV_POWERON_CNF),</span><br><span style="color: hsl(0, 100%, 40%);">-     OSMO_VALUE_STRING(TRX_PROV_EV_POWEROFF),</span><br><span>     OSMO_VALUE_STRING(TRX_PROV_EV_POWEROFF_CNF),</span><br><span>         OSMO_VALUE_STRING(TRX_PROV_EV_CLOSE),</span><br><span>        { 0, NULL }</span><br><span>diff --git a/src/osmo-bts-trx/trx_provision_fsm.h b/src/osmo-bts-trx/trx_provision_fsm.h</span><br><span>index 1583270..0f80088 100644</span><br><span>--- a/src/osmo-bts-trx/trx_provision_fsm.h</span><br><span>+++ b/src/osmo-bts-trx/trx_provision_fsm.h</span><br><span>@@ -54,7 +54,6 @@</span><br><span>         TRX_PROV_EV_SETTSC_CNF,</span><br><span>      TRX_PROV_EV_SETFORMAT_CNF,</span><br><span>   TRX_PROV_EV_POWERON_CNF,</span><br><span style="color: hsl(0, 100%, 40%);">-        TRX_PROV_EV_POWEROFF,</span><br><span>        TRX_PROV_EV_POWEROFF_CNF,</span><br><span>    TRX_PROV_EV_CLOSE,</span><br><span> };</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/19379">change 19379</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/+/19379"/><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: Ic2dab864b6d4075dfb9a1e4acfd9af013c9c46fe </div>
<div style="display:none"> Gerrit-Change-Number: 19379 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Hoernchen <ewild@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-MessageType: merged </div>