<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/25492">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">nm_*_fsm: Make sure adm state is LOCKED when entering state Disabled Offline<br><br>TS 12.21 Figure 2 states that Attribute Setting is done when in Disabled<br>Offline state, and unlocking must be done after attributes are set.<br>Finally, transition to state Enabled can only be done once attribute<br>setting, unlocking is done and Opstart is received.<br>Hence, at the start of this operative+avaialbility state "Disable Offline",<br>adminsitrative state is Locked by definition.<br><br>Change-Id: Ife5fa22f007897db8b0f15b28f3b72c9970d298a<br>---<br>M src/common/nm_bb_transc_fsm.c<br>M src/common/nm_bts_fsm.c<br>M src/common/nm_bts_sm_fsm.c<br>M src/common/nm_channel_fsm.c<br>M src/common/nm_radio_carrier_fsm.c<br>5 files changed, 5 insertions(+), 5 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/92/25492/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/nm_bb_transc_fsm.c b/src/common/nm_bb_transc_fsm.c</span><br><span>index c270f7d..1bb78f2 100644</span><br><span>--- a/src/common/nm_bb_transc_fsm.c</span><br><span>+++ b/src/common/nm_bb_transc_fsm.c</span><br><span>@@ -100,7 +100,7 @@</span><br><span>         int i;</span><br><span> </span><br><span>   bb_transc->mo.opstart_success = false;</span><br><span style="color: hsl(0, 100%, 40%);">-       oml_mo_state_chg(&bb_transc->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE, -1);</span><br><span style="color: hsl(120, 100%, 40%);">+        oml_mo_state_chg(&bb_transc->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE, NM_STATE_LOCKED);</span><br><span> </span><br><span>      if (prev_state == NM_BBTRANSC_ST_OP_ENABLED) {</span><br><span>               for (i = 0; i < TRX_NR_TS; i++) {</span><br><span>diff --git a/src/common/nm_bts_fsm.c b/src/common/nm_bts_fsm.c</span><br><span>index 9210e7a..cea7e6d 100644</span><br><span>--- a/src/common/nm_bts_fsm.c</span><br><span>+++ b/src/common/nm_bts_fsm.c</span><br><span>@@ -79,7 +79,7 @@</span><br><span> {</span><br><span>       struct gsm_bts *bts = (struct gsm_bts *)fi->priv;</span><br><span>         bts->mo.opstart_success = false;</span><br><span style="color: hsl(0, 100%, 40%);">-     oml_mo_state_chg(&bts->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE, -1);</span><br><span style="color: hsl(120, 100%, 40%);">+      oml_mo_state_chg(&bts->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE, NM_STATE_LOCKED);</span><br><span> }</span><br><span> </span><br><span> static void st_op_disabled_offline(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span>diff --git a/src/common/nm_bts_sm_fsm.c b/src/common/nm_bts_sm_fsm.c</span><br><span>index 267341e..d8ae5ff 100644</span><br><span>--- a/src/common/nm_bts_sm_fsm.c</span><br><span>+++ b/src/common/nm_bts_sm_fsm.c</span><br><span>@@ -77,7 +77,7 @@</span><br><span> {</span><br><span>     struct gsm_bts_sm *site_mgr = (struct gsm_bts_sm *)fi->priv;</span><br><span>      site_mgr->mo.opstart_success = false;</span><br><span style="color: hsl(0, 100%, 40%);">-        oml_mo_state_chg(&site_mgr->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE, -1);</span><br><span style="color: hsl(120, 100%, 40%);">+ oml_mo_state_chg(&site_mgr->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE, NM_STATE_LOCKED);</span><br><span> }</span><br><span> </span><br><span> static void st_op_disabled_offline(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span>diff --git a/src/common/nm_channel_fsm.c b/src/common/nm_channel_fsm.c</span><br><span>index e6c296f..7c13915 100644</span><br><span>--- a/src/common/nm_channel_fsm.c</span><br><span>+++ b/src/common/nm_channel_fsm.c</span><br><span>@@ -117,7 +117,7 @@</span><br><span> {</span><br><span>  struct gsm_bts_trx_ts *ts = (struct gsm_bts_trx_ts *)fi->priv;</span><br><span>    ts->mo.opstart_success = false;</span><br><span style="color: hsl(0, 100%, 40%);">-      oml_mo_state_chg(&ts->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE, -1);</span><br><span style="color: hsl(120, 100%, 40%);">+       oml_mo_state_chg(&ts->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE, NM_STATE_LOCKED);</span><br><span> }</span><br><span> </span><br><span> static void st_op_disabled_offline(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span>diff --git a/src/common/nm_radio_carrier_fsm.c b/src/common/nm_radio_carrier_fsm.c</span><br><span>index 2772f19..61feca3 100644</span><br><span>--- a/src/common/nm_radio_carrier_fsm.c</span><br><span>+++ b/src/common/nm_radio_carrier_fsm.c</span><br><span>@@ -82,7 +82,7 @@</span><br><span>       unsigned int i;</span><br><span> </span><br><span>  trx->mo.opstart_success = false;</span><br><span style="color: hsl(0, 100%, 40%);">-     oml_mo_state_chg(&trx->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE, -1);</span><br><span style="color: hsl(120, 100%, 40%);">+      oml_mo_state_chg(&trx->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE, NM_STATE_LOCKED);</span><br><span> </span><br><span>    if (prev_state == NM_RCARRIER_ST_OP_ENABLED) {</span><br><span>               for (i = 0; i < TRX_NR_TS; i++) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/25492">change 25492</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/+/25492"/><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: Ife5fa22f007897db8b0f15b28f3b72c9970d298a </div>
<div style="display:none"> Gerrit-Change-Number: 25492 </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>