<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/25528">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bts-trx: Submit TRX SW_ACT when PHY becomes connected<br><br>Once the TRXC link is available, we can signal SW_ACT which will<br>transit rcarrier and bbtransc NM FSMs to Disabled Offline and announce<br>availability to be configured to the BSC through transmission of<br>Software Activated Report.<br><br>Change-Id: I6e62ec2fdd4cae58b52d83fa851552f7ed51c821<br>---<br>M include/osmo-bts/phy_link.h<br>M src/osmo-bts-trx/l1_if.c<br>M src/osmo-bts-trx/trx_provision_fsm.c<br>3 files changed, 4 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/phy_link.h b/include/osmo-bts/phy_link.h</span><br><span>index 4b8a863..78fe6b9 100644</span><br><span>--- a/include/osmo-bts/phy_link.h</span><br><span>+++ b/include/osmo-bts/phy_link.h</span><br><span>@@ -112,7 +112,6 @@</span><br><span> } sysmobts;</span><br><span> struct {</span><br><span> struct trx_l1h *hdl;</span><br><span style="color: hsl(0, 100%, 40%);">- bool sw_act_reported;</span><br><span> struct trx_dl_burst_req br[TRX_NR_TS];</span><br><span> } osmotrx;</span><br><span> struct {</span><br><span>diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c</span><br><span>index df2531e..f35c9ba 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>@@ -224,14 +224,6 @@</span><br><span> l1h = pinst->u.osmotrx.hdl;</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%);">- /* 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%);">- /* 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%);">- 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> }</span><br><span> </span><br><span> return 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 660360d..6041073 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>@@ -33,6 +33,7 @@</span><br><span> #include <osmo-bts/bts_model.h></span><br><span> #include <osmo-bts/bts.h></span><br><span> #include <osmo-bts/rsl.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmo-bts/nm_common_fsm.h></span><br><span> </span><br><span> #include "l1_if.h"</span><br><span> #include "trx_provision_fsm.h"</span><br><span>@@ -332,6 +333,9 @@</span><br><span> trx_if_cmd_rfmute(l1h, pinst->trx->mo.nm_state.administrative != NM_STATE_UNLOCKED);</span><br><span> else</span><br><span> trx_if_cmd_rfmute(l1h, true);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(pinst->trx->mo.fi, NM_EV_SW_ACT, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(pinst->trx->bb_transc.mo.fi, NM_EV_SW_ACT, NULL);</span><br><span> }</span><br><span> </span><br><span> static void st_open_poweroff(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/25528">change 25528</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/+/25528"/><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: I6e62ec2fdd4cae58b52d83fa851552f7ed51c821 </div>
<div style="display:none"> Gerrit-Change-Number: 25528 </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: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>