<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/25472">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
osmith: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">nm_*_fsm: Add missing item in event mask list for state ENABLED<br><br>Change-Id: Iebaa7dcfc01978cee2e4b08609503eb4e25598b7<br>---<br>M src/common/nm_bb_transc_fsm.c<br>M src/common/nm_radio_carrier_fsm.c<br>2 files changed, 12 insertions(+), 6 deletions(-)<br><br></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 0e21a91..cffd9ea 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>@@ -188,7 +188,8 @@</span><br><span> X(NM_EV_RSL_UP) |</span><br><span> X(NM_EV_RSL_DOWN) |</span><br><span> X(NM_EV_PHYLINK_UP) |</span><br><span style="color: hsl(0, 100%, 40%);">- X(NM_EV_PHYLINK_DOWN),</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_EV_PHYLINK_DOWN) |</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_EV_DISABLE),</span><br><span> .out_state_mask =</span><br><span> X(NM_BBTRANSC_ST_OP_DISABLED_OFFLINE),</span><br><span> .name = "DISABLED_NOTINSTALLED",</span><br><span>@@ -202,7 +203,8 @@</span><br><span> X(NM_EV_RSL_UP) |</span><br><span> X(NM_EV_RSL_DOWN) |</span><br><span> X(NM_EV_PHYLINK_UP) |</span><br><span style="color: hsl(0, 100%, 40%);">- X(NM_EV_PHYLINK_DOWN),</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_EV_PHYLINK_DOWN) |</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_EV_DISABLE),</span><br><span> .out_state_mask =</span><br><span> X(NM_BBTRANSC_ST_OP_ENABLED),</span><br><span> .name = "DISABLED_OFFLINE",</span><br><span>@@ -212,7 +214,8 @@</span><br><span> [NM_BBTRANSC_ST_OP_ENABLED] = {</span><br><span> .in_event_mask =</span><br><span> X(NM_EV_RSL_DOWN) |</span><br><span style="color: hsl(0, 100%, 40%);">- X(NM_EV_PHYLINK_DOWN),</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_EV_PHYLINK_DOWN) |</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_EV_DISABLE),</span><br><span> .out_state_mask =</span><br><span> X(NM_BBTRANSC_ST_OP_DISABLED_OFFLINE),</span><br><span> .name = "ENABLED",</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 800cac2..ad5fc04 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>@@ -178,7 +178,8 @@</span><br><span> X(NM_EV_RSL_UP) |</span><br><span> X(NM_EV_RSL_DOWN) |</span><br><span> X(NM_EV_PHYLINK_UP) |</span><br><span style="color: hsl(0, 100%, 40%);">- X(NM_EV_PHYLINK_DOWN),</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_EV_PHYLINK_DOWN) |</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_EV_DISABLE),</span><br><span> .out_state_mask =</span><br><span> X(NM_RCARRIER_ST_OP_DISABLED_OFFLINE),</span><br><span> .name = "DISABLED_NOTINSTALLED",</span><br><span>@@ -192,7 +193,8 @@</span><br><span> X(NM_EV_RSL_UP) |</span><br><span> X(NM_EV_RSL_DOWN) |</span><br><span> X(NM_EV_PHYLINK_UP) |</span><br><span style="color: hsl(0, 100%, 40%);">- X(NM_EV_PHYLINK_DOWN),</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_EV_PHYLINK_DOWN) |</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_EV_DISABLE),</span><br><span> .out_state_mask =</span><br><span> X(NM_RCARRIER_ST_OP_ENABLED),</span><br><span> .name = "DISABLED_OFFLINE",</span><br><span>@@ -202,7 +204,8 @@</span><br><span> [NM_RCARRIER_ST_OP_ENABLED] = {</span><br><span> .in_event_mask =</span><br><span> X(NM_EV_RSL_DOWN) |</span><br><span style="color: hsl(0, 100%, 40%);">- X(NM_EV_PHYLINK_DOWN),</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_EV_PHYLINK_DOWN) |</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NM_EV_DISABLE),</span><br><span> .out_state_mask =</span><br><span> X(NM_RCARRIER_ST_OP_DISABLED_OFFLINE),</span><br><span> .name = "ENABLED",</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/25472">change 25472</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/+/25472"/><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: Iebaa7dcfc01978cee2e4b08609503eb4e25598b7 </div>
<div style="display:none"> Gerrit-Change-Number: 25472 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>