<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/25791">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Move lchan_init_lapdm inside lchan_set_state(LCHAN_S_ACTIVE)<br><br>osmo-bts-trx/l1_if.c lchan_init_lapdm() for CCCH is already done when<br>trx_set_ts_as_pchan() calls:<br>"lchan_set_state(&ts->lchan[CCCH_LCHAN], LCHAN_S_ACTIVE);"<br><br>Change-Id: I7a9c3660b9aab57ff8765e2f1526349599630cd9<br>---<br>M src/common/lchan.c<br>M src/osmo-bts-lc15/oml.c<br>M src/osmo-bts-oc2g/oml.c<br>M src/osmo-bts-octphy/l1_oml.c<br>M src/osmo-bts-sysmo/oml.c<br>M src/osmo-bts-trx/l1_if.c<br>M src/osmo-bts-virtual/l1_if.c<br>7 files changed, 21 insertions(+), 41 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/lchan.c b/src/common/lchan.c</span><br><span>index 5d12952..28ea943 100644</span><br><span>--- a/src/common/lchan.c</span><br><span>+++ b/src/common/lchan.c</span><br><span>@@ -272,29 +272,34 @@</span><br><span> gsm_lchans_name(lchan->state), gsm_lchans_name(state));</span><br><span> lchan->state = state;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Early Immediate Assignment: if we have a cached early IA pending, send it upon becoming active, or discard it</span><br><span style="color: hsl(0, 100%, 40%);">- * when releasing. */</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->early_rr_ia) {</span><br><span style="color: hsl(0, 100%, 40%);">- switch (lchan->state) {</span><br><span style="color: hsl(0, 100%, 40%);">- case LCHAN_S_ACT_REQ:</span><br><span style="color: hsl(0, 100%, 40%);">- /* Activation is requested, keep the early IA until active. This allows the BSC to send the IA</span><br><span style="color: hsl(0, 100%, 40%);">- * even before a dynamic timeslot is done switching to a different pchan kind (experimental). */</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case LCHAN_S_ACTIVE:</span><br><span style="color: hsl(0, 100%, 40%);">- /* Activation is done, send the RR IA now. Delay a bit more to give Um time to let the lchan</span><br><span style="color: hsl(0, 100%, 40%);">- * light up for the MS */</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (lchan->state) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case LCHAN_S_ACT_REQ:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Early Immediate Assignment: Activation is requested, keep the</span><br><span style="color: hsl(120, 100%, 40%);">+ * early IA until active. This allows the BSC to send the IA</span><br><span style="color: hsl(120, 100%, 40%);">+ * even before a dynamic timeslot is done switching to a</span><br><span style="color: hsl(120, 100%, 40%);">+ * different pchan kind (experimental). */</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case LCHAN_S_ACTIVE:</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_init_lapdm(lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->early_rr_ia) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Early Immediate Assignment: Activation is done, send</span><br><span style="color: hsl(120, 100%, 40%);">+ * the RR IA now. Delay a bit more to give Um time to</span><br><span style="color: hsl(120, 100%, 40%);">+ * let the lchan light up for the MS */</span><br><span> osmo_timer_del(&lchan->early_rr_ia_delay);</span><br><span> osmo_timer_schedule(&lchan->early_rr_ia_delay, 0,</span><br><span> osmo_tdef_get(abis_T_defs, -15, OSMO_TDEF_US, -1));</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- /* Transition to any other state means whatever IA the BSC has sent shall now not be relevant</span><br><span style="color: hsl(0, 100%, 40%);">- * anymore. */</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->early_rr_ia) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Early Immediate Assignment: Transition to any other</span><br><span style="color: hsl(120, 100%, 40%);">+ * state means whatever IA the BSC has sent shall now</span><br><span style="color: hsl(120, 100%, 40%);">+ * not be relevant anymore. */</span><br><span> osmo_timer_del(&lchan->early_rr_ia_delay);</span><br><span> msgb_free(lchan->early_rr_ia);</span><br><span> lchan->early_rr_ia = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-bts-lc15/oml.c b/src/osmo-bts-lc15/oml.c</span><br><span>index 6169ef7..675e3fe 100644</span><br><span>--- a/src/osmo-bts-lc15/oml.c</span><br><span>+++ b/src/osmo-bts-lc15/oml.c</span><br><span>@@ -1197,10 +1197,6 @@</span><br><span> </span><br><span> enqueue_sapi_act_cmd(lchan, sapi, dir);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#warning "FIXME: Should this be in sapi_activate_cb?"</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_init_lapdm(lchan);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-bts-oc2g/oml.c b/src/osmo-bts-oc2g/oml.c</span><br><span>index ba85f36..d12571b 100644</span><br><span>--- a/src/osmo-bts-oc2g/oml.c</span><br><span>+++ b/src/osmo-bts-oc2g/oml.c</span><br><span>@@ -1212,10 +1212,6 @@</span><br><span> </span><br><span> enqueue_sapi_act_cmd(lchan, sapi, dir);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#warning "FIXME: Should this be in sapi_activate_cb?"</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_init_lapdm(lchan);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-bts-octphy/l1_oml.c b/src/osmo-bts-octphy/l1_oml.c</span><br><span>index 73ab9bd..5894c21 100644</span><br><span>--- a/src/osmo-bts-octphy/l1_oml.c</span><br><span>+++ b/src/osmo-bts-octphy/l1_oml.c</span><br><span>@@ -1107,9 +1107,6 @@</span><br><span> }</span><br><span> enqueue_sapi_act_cmd(lchan, sapi, dir);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_init_lapdm(lchan);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-bts-sysmo/oml.c b/src/osmo-bts-sysmo/oml.c</span><br><span>index 74af56b..ba60b76 100644</span><br><span>--- a/src/osmo-bts-sysmo/oml.c</span><br><span>+++ b/src/osmo-bts-sysmo/oml.c</span><br><span>@@ -1204,10 +1204,6 @@</span><br><span> continue;</span><br><span> enqueue_sapi_act_cmd(lchan, sapi, dir);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#warning "FIXME: Should this be in sapi_activate_cb?"</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_init_lapdm(lchan);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> return 0;</span><br><span> }</span><br><span> </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 9faae88..5ac3e31 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>@@ -165,10 +165,6 @@</span><br><span> if (rc != 0)</span><br><span> return osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_OPSTART_NACK,</span><br><span> (void*)(intptr_t)NM_NACK_CANT_PERFORM);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (trx == trx->bts->c0)</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_init_lapdm(&trx->ts[0].lchan[CCCH_LCHAN]);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* Send OPSTART ack */</span><br><span> return osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_OPSTART_ACK, NULL);</span><br><span> }</span><br><span>@@ -438,8 +434,6 @@</span><br><span> lchan->tch.amr_mr.bts_mode[3].mode,</span><br><span> amr_get_initial_mode(lchan),</span><br><span> (lchan->ho.active == 1));</span><br><span style="color: hsl(0, 100%, 40%);">- /* init lapdm */</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_init_lapdm(lchan);</span><br><span> /* set lchan active */</span><br><span> lchan_set_state(lchan, LCHAN_S_ACTIVE);</span><br><span> /* set initial ciphering */</span><br><span>diff --git a/src/osmo-bts-virtual/l1_if.c b/src/osmo-bts-virtual/l1_if.c</span><br><span>index a4a81bd..0d36db1 100644</span><br><span>--- a/src/osmo-bts-virtual/l1_if.c</span><br><span>+++ b/src/osmo-bts-virtual/l1_if.c</span><br><span>@@ -224,8 +224,6 @@</span><br><span> * / PRIM_INFO_ACTIVATE */</span><br><span> if (pinst->trx == pinst->trx->bts->c0) {</span><br><span> vbts_sched_start(pinst->trx->bts);</span><br><span style="color: hsl(0, 100%, 40%);">- /* init lapdm layer 3 callback for the trx on timeslot 0 == BCCH */</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_init_lapdm(&pinst->trx->ts[0].lchan[CCCH_LCHAN]);</span><br><span> /* FIXME: This is probably the wrong location to set the CCCH to active... the OML link def. needs to be reworked and fixed. */</span><br><span> pinst->trx->ts[0].lchan[CCCH_LCHAN].rel_act_kind = LCHAN_REL_ACT_OML;</span><br><span> lchan_set_state(&pinst->trx->ts[0].lchan[CCCH_LCHAN], LCHAN_S_ACTIVE);</span><br><span>@@ -392,8 +390,6 @@</span><br><span> lchan->tch.amr_mr.bts_mode[3].mode,</span><br><span> amr_get_initial_mode(lchan),</span><br><span> (lchan->ho.active == 1));</span><br><span style="color: hsl(0, 100%, 40%);">- /* init lapdm */</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_init_lapdm(lchan);</span><br><span> /* set lchan active */</span><br><span> lchan_set_state(lchan, LCHAN_S_ACTIVE);</span><br><span> /* set initial ciphering */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/25791">change 25791</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/+/25791"/><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: I7a9c3660b9aab57ff8765e2f1526349599630cd9 </div>
<div style="display:none"> Gerrit-Change-Number: 25791 </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: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </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>