<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24375">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">implement CHANnel ACTIVate to VAMOS mode<br><br>Related: SYS#5315 OS#4940<br>Change-Id: If3ac584e4223ef7656c7fedc3bf11df87e4309ec<br>---<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/abis_rsl.c<br>M src/osmo-bsc/bsc_vty.c<br>M src/osmo-bsc/lchan_fsm.c<br>4 files changed, 38 insertions(+), 3 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/75/24375/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h</span><br><span>index 5e2196c..8ce5a91 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -602,6 +602,8 @@</span><br><span> /* TSC to use, or -1 for automatically determining the TSC to use. Valid range is 0 to 7, as described in 3GPP</span><br><span> * TS 45.002. */</span><br><span> int tsc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ bool vamos;</span><br><span> };</span><br><span> </span><br><span> enum lchan_modify_for {</span><br><span>diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c</span><br><span>index 1b08e03..476cc3a 100644</span><br><span>--- a/src/osmo-bsc/abis_rsl.c</span><br><span>+++ b/src/osmo-bsc/abis_rsl.c</span><br><span>@@ -530,7 +530,7 @@</span><br><span> /* PDCH activation is a job for rsl_tx_dyn_ts_pdch_act_deact(); */</span><br><span> OSMO_ASSERT(act_type != RSL_ACT_OSMO_PDCH);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc = channel_mode_from_lchan(&cm, lchan, &lchan->activate.info.ch_mode_rate, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = channel_mode_from_lchan(&cm, lchan, &lchan->activate.info.ch_mode_rate, lchan->activate.info.vamos);</span><br><span> if (rc < 0) {</span><br><span> LOGP(DRSL, LOGL_ERROR,</span><br><span> "%s Cannot find channel mode from lchan type\n",</span><br><span>@@ -616,6 +616,16 @@</span><br><span> </span><br><span> rep_acch_cap_for_bts(lchan, msg);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Selecting a specific TSC Set is only applicable to VAMOS mode */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->activate.info.vamos && lchan->activate.tsc_set >= 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct rsl_osmo_training_sequence_ie tsie = {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Convert from spec conforming "human readable" TSC Set 1-4 to 0-3 on the wire */</span><br><span style="color: hsl(120, 100%, 40%);">+ .tsc_set = lchan->activate.tsc_set - 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ .tsc = lchan->activate.tsc,</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_tlv_put(msg, RSL_IE_OSMO_TRAINING_SEQUENCE, sizeof(tsie), (uint8_t*)&tsie);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> msg->dst = rsl_chan_link(lchan);</span><br><span> </span><br><span> rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_CHAN_ACT_TOTAL]);</span><br><span>diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c</span><br><span>index 8e64cd5..ed54b67 100644</span><br><span>--- a/src/osmo-bsc/bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/bsc_vty.c</span><br><span>@@ -6195,6 +6195,13 @@</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (activate == 2 || lchan->vamos.is_secondary) {</span><br><span style="color: hsl(120, 100%, 40%);">+ info.vamos = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ info.tsc_set = lchan->vamos.is_secondary ? 1 : 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ info.tsc = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ info.ch_mode_rate.chan_mode = gsm48_chan_mode_to_vamos(info.ch_mode_rate.chan_mode);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> vty_out(vty, "%% activating lchan %s as %s%s", gsm_lchan_name(lchan), gsm_chan_t_name(lchan->type),</span><br><span> VTY_NEWLINE);</span><br><span> lchan_activate(lchan, &info);</span><br><span>@@ -6267,9 +6274,10 @@</span><br><span> * manually in a given mode/codec. This is useful for receiver</span><br><span> * performance testing (FER/RBER/...) */</span><br><span> DEFUN(lchan_act, lchan_act_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "bts <0-255> trx <0-255> timeslot <0-7> sub-slot <0-7> (activate|deactivate) (hr|fr|efr|amr|sig) [<0-7>]",</span><br><span style="color: hsl(120, 100%, 40%);">+ "bts <0-255> trx <0-255> timeslot <0-7> sub-slot <0-7> (activate|activate-vamos|deactivate) (hr|fr|efr|amr|sig) [<0-7>]",</span><br><span> BTS_NR_TRX_TS_SS_STR2</span><br><span> "Manual Channel Activation (e.g. for BER test)\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Manual Channel Activation, in VAMOS mode\n"</span><br><span> "Manual Channel Deactivation (e.g. for BER test)\n"</span><br><span> "Half-Rate v1\n" "Full-Rate\n" "Enhanced Full Rate\n" "Adaptive Multi-Rate\n" "Signalling\n" "AMR Mode\n")</span><br><span> {</span><br><span>@@ -6292,6 +6300,8 @@</span><br><span> </span><br><span> if (!strcmp(act_str, "activate"))</span><br><span> activate = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (!strcmp(act_str, "activate-vamos"))</span><br><span style="color: hsl(120, 100%, 40%);">+ activate = 2;</span><br><span> else</span><br><span> activate = 0;</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c</span><br><span>index 7344ddf..f20c147 100644</span><br><span>--- a/src/osmo-bsc/lchan_fsm.c</span><br><span>+++ b/src/osmo-bsc/lchan_fsm.c</span><br><span>@@ -311,6 +311,16 @@</span><br><span> </span><br><span> OSMO_ASSERT(lchan && info);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if ((info->vamos || lchan->vamos.is_secondary)</span><br><span style="color: hsl(120, 100%, 40%);">+ && !osmo_bts_has_feature(&lchan->ts->trx->bts->features, BTS_FEAT_VAMOS)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->last_error = talloc_strdup(lchan->ts->trx, "VAMOS related channel activation requested,"</span><br><span style="color: hsl(120, 100%, 40%);">+ " but BTS does not support VAMOS");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_LCHAN(lchan, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "VAMOS related channel activation requested, but BTS %u does not support VAMOS\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->ts->trx->bts->nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ goto abort;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (!lchan_state_is(lchan, LCHAN_ST_UNUSED))</span><br><span> goto abort;</span><br><span> </span><br><span>@@ -726,10 +736,12 @@</span><br><span> </span><br><span> lchan->encr = lchan->activate.info.encr;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* If enabling VAMOS mode and no specific TSC Set was selected, make sure to select a sane TSC Set by</span><br><span style="color: hsl(120, 100%, 40%);">+ * default: Set 1 for the primary and Set 2 for the shadow lchan. For non-VAMOS lchans, TSC Set 1. */</span><br><span> if (lchan->activate.info.tsc_set > 0)</span><br><span> lchan->activate.tsc_set = lchan->activate.info.tsc_set;</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->activate.tsc_set = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->activate.tsc_set = lchan->vamos.is_secondary ? 2 : 1;</span><br><span> </span><br><span> /* Use the TSC provided in the modification request, if any. Otherwise use the timeslot's configured</span><br><span> * TSC. */</span><br><span>@@ -808,6 +820,7 @@</span><br><span> </span><br><span> lchan->current_ch_mode_rate = lchan->activate.info.ch_mode_rate;</span><br><span> lchan->current_mr_conf = lchan->activate.mr_conf_filtered;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->vamos.enabled = lchan->activate.info.vamos;</span><br><span> lchan->tsc_set = lchan->activate.tsc_set;</span><br><span> lchan->tsc = lchan->activate.tsc;</span><br><span> LOG_LCHAN(lchan, LOGL_INFO, "Rx Activ ACK %s\n",</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24375">change 24375</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/+/24375"/><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: If3ac584e4223ef7656c7fedc3bf11df87e4309ec </div>
<div style="display:none"> Gerrit-Change-Number: 24375 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>