<p>tnt has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/18118">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">om2k: Dispatch TS_EV_OML_READY to TS FSM only when it's actually ready<br><br>Signed-off-by: Sylvain Munaut <tnt@246tNt.com><br>Change-Id: Ic2a84ea406e9a39332313d63b27d73f334d4e0a0<br>---<br>M src/osmo-bsc/abis_om2000.c<br>1 file changed, 10 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/18/18118/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/abis_om2000.c b/src/osmo-bsc/abis_om2000.c</span><br><span>index 304f873..c75732c 100644</span><br><span>--- a/src/osmo-bsc/abis_om2000.c</span><br><span>+++ b/src/osmo-bsc/abis_om2000.c</span><br><span>@@ -2019,7 +2019,7 @@</span><br><span> </span><br><span> struct om2k_trx_fsm_priv {</span><br><span>  struct gsm_bts_trx *trx;</span><br><span style="color: hsl(0, 100%, 40%);">-        uint8_t next_ts_nr;</span><br><span style="color: hsl(120, 100%, 40%);">+   uint8_t cur_ts_nr;</span><br><span> };</span><br><span> </span><br><span> static void om2k_trx_s_init(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span>@@ -2063,8 +2063,8 @@</span><br><span>    /* Initialize Timeslots after TX */</span><br><span>  osmo_fsm_inst_state_chg(fi, OM2K_TRX_S_WAIT_TS,</span><br><span>                              TRX_FSM_TIMEOUT, 0);</span><br><span style="color: hsl(0, 100%, 40%);">-    otfp->next_ts_nr = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-        ts = &otfp->trx->ts[otfp->next_ts_nr++];</span><br><span style="color: hsl(120, 100%, 40%);">+ otfp->cur_ts_nr = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+       ts = &otfp->trx->ts[otfp->cur_ts_nr];</span><br><span>   om2k_mo_fsm_start(fi, OM2K_TRX_EVT_TS_DONE, otfp->trx,</span><br><span>                      &ts->rbs2000.om2k_mo);</span><br><span> }</span><br><span>@@ -2074,9 +2074,14 @@</span><br><span>        struct om2k_trx_fsm_priv *otfp = fi->priv;</span><br><span>        struct gsm_bts_trx_ts *ts;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  if (otfp->next_ts_nr < 8) {</span><br><span style="color: hsl(120, 100%, 40%);">+     /* notify TS is ready */</span><br><span style="color: hsl(120, 100%, 40%);">+      ts = &otfp->trx->ts[otfp->cur_ts_nr];</span><br><span style="color: hsl(120, 100%, 40%);">+    osmo_fsm_inst_dispatch(ts->fi, TS_EV_OML_READY, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   /* next ? */</span><br><span style="color: hsl(120, 100%, 40%);">+  if (++otfp->cur_ts_nr < 8) {</span><br><span>           /* iterate to the next timeslot */</span><br><span style="color: hsl(0, 100%, 40%);">-              ts = &otfp->trx->ts[otfp->next_ts_nr++];</span><br><span style="color: hsl(120, 100%, 40%);">+         ts = &otfp->trx->ts[otfp->cur_ts_nr];</span><br><span>           om2k_mo_fsm_start(fi, OM2K_TRX_EVT_TS_DONE, otfp->trx,</span><br><span>                              &ts->rbs2000.om2k_mo);</span><br><span>      } else {</span><br><span>@@ -2820,7 +2825,6 @@</span><br><span>             om2k_mo_init(&ts->rbs2000.om2k_mo, OM2K_MO_CLS_TS,</span><br><span>                            bts->nr, trx->nr, i);</span><br><span>          OSMO_ASSERT(ts->fi);</span><br><span style="color: hsl(0, 100%, 40%);">-         osmo_fsm_inst_dispatch(ts->fi, TS_EV_OML_READY, NULL);</span><br><span>    }</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/18118">change 18118</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-bsc/+/18118"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ic2a84ea406e9a39332313d63b27d73f334d4e0a0 </div>
<div style="display:none"> Gerrit-Change-Number: 18118 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: tnt <tnt@246tNt.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>