<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24374">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">implement Channel Mode Modify to VAMOS mode<br><br>Related: SYS#5315 OS#4940<br>Change-Id: Ibf53f4797d7491b17a33946fd7d920f038362b4c<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/gsm_04_08_rr.c<br>M src/osmo-bsc/lchan_fsm.c<br>5 files changed, 149 insertions(+), 42 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/74/24374/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 e250a5d..5e2196c 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -626,6 +626,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> struct gsm_lchan {</span><br><span>@@ -739,6 +741,9 @@</span><br><span> /* Whether this lchan represents a secondary "shadow" lchan to multiplex a second MS onto a primary</span><br><span> * "normal" lchan */</span><br><span> bool is_secondary;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Whether this lchan is activated/modified into a mode that allows VAMOS multiplexing at this moment */</span><br><span style="color: hsl(120, 100%, 40%);">+ bool enabled;</span><br><span> } vamos;</span><br><span> </span><br><span> /* Circuit-Switched TSC Set in use, or -1 if no specific TSC Set was requested. The valid range is 1-4 as</span><br><span>diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c</span><br><span>index 4a80364..1b08e03 100644</span><br><span>--- a/src/osmo-bsc/abis_rsl.c</span><br><span>+++ b/src/osmo-bsc/abis_rsl.c</span><br><span>@@ -352,7 +352,8 @@</span><br><span> </span><br><span> static int channel_mode_from_lchan(struct rsl_ie_chan_mode *cm,</span><br><span> struct gsm_lchan *lchan,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct channel_mode_and_rate *ch_mode_rate)</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct channel_mode_and_rate *ch_mode_rate,</span><br><span style="color: hsl(120, 100%, 40%);">+ bool vamos)</span><br><span> {</span><br><span> int spd_ind;</span><br><span> memset(cm, 0, sizeof(*cm));</span><br><span>@@ -377,10 +378,10 @@</span><br><span> cm->chan_rt = RSL_CMOD_CRT_SDCCH;</span><br><span> break;</span><br><span> case GSM_LCHAN_TCH_F:</span><br><span style="color: hsl(0, 100%, 40%);">- cm->chan_rt = RSL_CMOD_CRT_TCH_Bm;</span><br><span style="color: hsl(120, 100%, 40%);">+ cm->chan_rt = vamos ? RSL_CMOD_CRT_OSMO_TCH_VAMOS_Bm : RSL_CMOD_CRT_TCH_Bm;</span><br><span> break;</span><br><span> case GSM_LCHAN_TCH_H:</span><br><span style="color: hsl(0, 100%, 40%);">- cm->chan_rt = RSL_CMOD_CRT_TCH_Lm;</span><br><span style="color: hsl(120, 100%, 40%);">+ cm->chan_rt = vamos ? RSL_CMOD_CRT_OSMO_TCH_VAMOS_Lm : RSL_CMOD_CRT_TCH_Lm;</span><br><span> break;</span><br><span> case GSM_LCHAN_NONE:</span><br><span> case GSM_LCHAN_UNKNOWN:</span><br><span>@@ -396,12 +397,15 @@</span><br><span> cm->chan_rate = 0;</span><br><span> break;</span><br><span> case GSM48_CMODE_SPEECH_V1:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM48_CMODE_SPEECH_V1_VAMOS:</span><br><span> cm->chan_rate = RSL_CMOD_SP_GSM1;</span><br><span> break;</span><br><span> case GSM48_CMODE_SPEECH_EFR:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM48_CMODE_SPEECH_V2_VAMOS:</span><br><span> cm->chan_rate = RSL_CMOD_SP_GSM2;</span><br><span> break;</span><br><span> case GSM48_CMODE_SPEECH_AMR:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM48_CMODE_SPEECH_V3_VAMOS:</span><br><span> cm->chan_rate = RSL_CMOD_SP_GSM3;</span><br><span> break;</span><br><span> case GSM48_CMODE_DATA_14k5:</span><br><span>@@ -501,6 +505,11 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+struct rsl_osmo_training_sequence_ie {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t tsc_set;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t tsc;</span><br><span style="color: hsl(120, 100%, 40%);">+} __attribute__ ((packed));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Chapter 8.4.1 */</span><br><span> int rsl_tx_chan_activ(struct gsm_lchan *lchan, uint8_t act_type, uint8_t ho_ref)</span><br><span> {</span><br><span>@@ -521,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);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = channel_mode_from_lchan(&cm, lchan, &lchan->activate.info.ch_mode_rate, false);</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>@@ -636,7 +645,7 @@</span><br><span> struct rsl_ie_chan_mode cm;</span><br><span> struct gsm_bts *bts = lchan->ts->trx->bts;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc = channel_mode_from_lchan(&cm, lchan, &lchan->modify.info.ch_mode_rate);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = channel_mode_from_lchan(&cm, lchan, &lchan->modify.info.ch_mode_rate, lchan->modify.info.vamos);</span><br><span> if (rc < 0)</span><br><span> return rc;</span><br><span> </span><br><span>@@ -667,6 +676,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->modify.info.vamos && lchan->modify.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->modify.tsc_set - 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ .tsc = lchan->modify.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> return abis_rsl_sendmsg(msg);</span><br><span>diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c</span><br><span>index caa72e4..8e64cd5 100644</span><br><span>--- a/src/osmo-bsc/bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/bsc_vty.c</span><br><span>@@ -192,6 +192,34 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* resolve a gsm_bts_trx_ts basd on the given numeric identifiers */</span><br><span style="color: hsl(120, 100%, 40%);">+static struct gsm_bts_trx_ts *vty_get_ts(struct vty *vty, const char *bts_str, const char *trx_str,</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *ts_str)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int bts_nr = atoi(bts_str);</span><br><span style="color: hsl(120, 100%, 40%);">+ int trx_nr = atoi(trx_str);</span><br><span style="color: hsl(120, 100%, 40%);">+ int ts_nr = atoi(ts_str);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx *trx;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx_ts *ts;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ bts = gsm_bts_num(gsmnet_from_vty(vty), bts_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!bts) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% No such BTS (%d)%s", bts_nr, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ trx = gsm_bts_trx_num(bts, trx_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!trx) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% No such TRX (%d)%s", trx_nr, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ts = &trx->ts[ts_nr];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return ts;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static void net_dump_nmstate(struct vty *vty, struct gsm_nm_state *nms)</span><br><span> {</span><br><span> vty_out(vty,"Oper '%s', Admin '%s', Avail '%s'%s",</span><br><span>@@ -1958,9 +1986,27 @@</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static int trigger_vamos_mode_modify(struct vty *vty, struct gsm_lchan *lchan, int tsc_set, int tsc)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct lchan_modify_info info = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .modify_for = MODIFY_FOR_VTY,</span><br><span style="color: hsl(120, 100%, 40%);">+ .ch_mode_rate = lchan->current_ch_mode_rate,</span><br><span style="color: hsl(120, 100%, 40%);">+ .requires_voice_stream = (lchan->fi_rtp != NULL),</span><br><span style="color: hsl(120, 100%, 40%);">+ .vamos = true,</span><br><span style="color: hsl(120, 100%, 40%);">+ .tsc_set = tsc_set,</span><br><span style="color: hsl(120, 100%, 40%);">+ .tsc = tsc,</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_mode_modify(lchan, &info);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #define MANUAL_HANDOVER_STR "Manually trigger handover (for debugging)\n"</span><br><span> #define MANUAL_ASSIGNMENT_STR "Manually trigger assignment (for debugging)\n"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define MANUAL_VAMOS_STR "Manually initiate VAMOS lchan multiplexing (for debugging)\n"</span><br><span style="color: hsl(120, 100%, 40%);">+#define MANUAL_VAMOS_MODIFY_STR "Send Channel Mode Modify to change an lchan to prepare it for serving a second MS via VAMOS\n"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> DEFUN(handover_subscr_conn,</span><br><span> handover_subscr_conn_cmd,</span><br><span> "bts <0-255> trx <0-255> timeslot <0-7> sub-slot <0-7> handover <0-255>",</span><br><span>@@ -2120,6 +2166,46 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define TSC_ARGS_OPT "[tsc] [<1-4>] [<0-7>]"</span><br><span style="color: hsl(120, 100%, 40%);">+#define TSC_ARGS_DOC \</span><br><span style="color: hsl(120, 100%, 40%);">+ "Provide specific TSC Set and Training Sequence Code\n" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "TSC Set\n" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "Training Sequence Code\n"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(vamos_modify_lchan, vamos_modify_lchan_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "vamos modify lchan <0-255> <0-255> <0-7> <0-1> " TSC_ARGS_OPT,</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Note above, only subslots 0-1 because only TCH/F and TCH/H make sense to be modified to VAMOS mode. */</span><br><span style="color: hsl(120, 100%, 40%);">+ MANUAL_VAMOS_STR</span><br><span style="color: hsl(120, 100%, 40%);">+ MANUAL_VAMOS_MODIFY_STR</span><br><span style="color: hsl(120, 100%, 40%);">+ "Pick a specific lchan to modify to VAMOS mode\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_TRX_TS_LCHAN_STR</span><br><span style="color: hsl(120, 100%, 40%);">+ TSC_ARGS_DOC)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx_ts *ts;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_lchan *lchan;</span><br><span style="color: hsl(120, 100%, 40%);">+ int ss_nr = atoi(argv[3]);</span><br><span style="color: hsl(120, 100%, 40%);">+ int tsc_set = (argc > 5) ? atoi(argv[5]) : -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ int tsc = (argc > 6) ? atoi(argv[6]) : -1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ts = vty_get_ts(vty, argv[0], argv[1], argv[2]);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!ts)</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ss_nr >= ts->max_primary_lchans) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "Invalid sub-slot number for this timeslot type%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!osmo_bts_has_feature(&ts->trx->bts->features, BTS_FEAT_VAMOS)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "BTS does not support VAMOS%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan = &ts->lchan[ss_nr];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return trigger_vamos_mode_modify(vty, lchan, tsc_set, tsc);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static void paging_dump_vty(struct vty *vty, struct gsm_paging_request *pag)</span><br><span> {</span><br><span> vty_out(vty, "Paging on BTS %u%s", pag->bts->nr, VTY_NEWLINE);</span><br><span>@@ -5967,34 +6053,6 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* resolve a gsm_bts_trx_ts basd on the given numeric identifiers */</span><br><span style="color: hsl(0, 100%, 40%);">-static struct gsm_bts_trx_ts *vty_get_ts(struct vty *vty, const char *bts_str, const char *trx_str,</span><br><span style="color: hsl(0, 100%, 40%);">- const char *ts_str)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int bts_nr = atoi(bts_str);</span><br><span style="color: hsl(0, 100%, 40%);">- int trx_nr = atoi(trx_str);</span><br><span style="color: hsl(0, 100%, 40%);">- int ts_nr = atoi(ts_str);</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts *bts;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts_trx *trx;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts_trx_ts *ts;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- bts = gsm_bts_num(gsmnet_from_vty(vty), bts_nr);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!bts) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% No such BTS (%d)%s", bts_nr, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- trx = gsm_bts_trx_num(bts, trx_nr);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!trx) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% No such TRX (%d)%s", trx_nr, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ts = &trx->ts[ts_nr];</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return ts;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> DEFUN(pdch_act, pdch_act_cmd,</span><br><span> "bts <0-255> trx <0-255> timeslot <0-7> pdch (activate|deactivate)",</span><br><span> BTS_NR_TRX_TS_STR2</span><br><span>@@ -7727,6 +7785,8 @@</span><br><span> install_element(ENABLE_NODE, &handover_any_to_arfcn_bsic_cmd);</span><br><span> /* See also handover commands added on net level from handover_vty.c */</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(ENABLE_NODE, &vamos_modify_lchan_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> logging_vty_add_cmds();</span><br><span> osmo_talloc_vty_add_cmds();</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c</span><br><span>index 8febd54..bb654b4 100644</span><br><span>--- a/src/osmo-bsc/gsm_04_08_rr.c</span><br><span>+++ b/src/osmo-bsc/gsm_04_08_rr.c</span><br><span>@@ -694,6 +694,8 @@</span><br><span> tsc = (lchan->modify.info.tsc >= 0) ? lchan->modify.info.tsc : gsm_ts_tsc(lchan->ts); /* FIXME */</span><br><span> gsm48_lchan2chan_desc(&cmm->chan_desc, lchan, tsc);</span><br><span> cmm->mode = mode;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->modify.info.vamos)</span><br><span style="color: hsl(120, 100%, 40%);">+ cmm->mode = gsm48_chan_mode_to_vamos(cmm->mode);</span><br><span> </span><br><span> /* in case of multi rate we need to attach a config */</span><br><span> if (lchan->modify.info.ch_mode_rate.chan_mode == GSM48_CMODE_SPEECH_AMR) {</span><br><span>@@ -706,6 +708,12 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->modify.info.vamos && lchan->modify.tsc_set > 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Add the Extended TSC Set IE. So far we only need a TSC Set sent for VAMOS.</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%);">+ msgb_tv_put(msg, 0x6d, (lchan->modify.tsc_set - 1) & 0x3);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return gsm48_sendmsg(msg);</span><br><span> }</span><br><span> </span><br><span>@@ -714,14 +722,20 @@</span><br><span> struct gsm48_hdr *gh = msgb_l3(msg);</span><br><span> struct gsm48_chan_mode_modify *mod =</span><br><span> (struct gsm48_chan_mode_modify *) gh->data;</span><br><span style="color: hsl(120, 100%, 40%);">+ enum gsm48_chan_mode expect_chan_mode;</span><br><span> </span><br><span> LOG_LCHAN(msg->lchan, LOGL_DEBUG, "CHANNEL MODE MODIFY ACK for %s\n",</span><br><span> gsm48_chan_mode_name(mod->mode));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (mod->mode != msg->lchan->modify.info.ch_mode_rate.chan_mode) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* The modify.info may indicate a non-VAMOS chan_mode, and indicate VAMOS-ness by info.vamos == true. Internally</span><br><span style="color: hsl(120, 100%, 40%);">+ * we convert the chan_mode to a VAMOS chan_mode then, leaving the info unchanged. Also do this change here. */</span><br><span style="color: hsl(120, 100%, 40%);">+ expect_chan_mode = msg->lchan->modify.info.ch_mode_rate.chan_mode;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (msg->lchan->modify.info.vamos)</span><br><span style="color: hsl(120, 100%, 40%);">+ expect_chan_mode = gsm48_chan_mode_to_vamos(expect_chan_mode);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mod->mode != expect_chan_mode) {</span><br><span> LOG_LCHAN(msg->lchan, LOGL_ERROR,</span><br><span> "CHANNEL MODE MODIFY ACK has wrong mode: Wanted: %s Got: %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- gsm48_chan_mode_name(msg->lchan->modify.info.ch_mode_rate.chan_mode),</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm48_chan_mode_name(expect_chan_mode),</span><br><span> gsm48_chan_mode_name(mod->mode));</span><br><span> return -1;</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 e25a6de..7344ddf 100644</span><br><span>--- a/src/osmo-bsc/lchan_fsm.c</span><br><span>+++ b/src/osmo-bsc/lchan_fsm.c</span><br><span>@@ -382,6 +382,17 @@</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 Mode Modify 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 Mode Modify 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%);">+ lchan_on_mode_modify_failure(lchan, info->modify_for, lchan->conn);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* To make sure that the lchan is actually allowed to initiate Mode Modify, feed through an FSM event. */</span><br><span> if (osmo_fsm_inst_dispatch(lchan->fi, LCHAN_EV_REQUEST_MODE_MODIFY, info)) {</span><br><span> LOG_LCHAN(lchan, LOGL_ERROR,</span><br><span>@@ -973,6 +984,7 @@</span><br><span> lchan->current_mr_conf = lchan->modify.mr_conf_filtered;</span><br><span> lchan->tsc_set = lchan->modify.tsc_set;</span><br><span> lchan->tsc = lchan->modify.tsc;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->vamos.enabled = lchan->modify.info.vamos;</span><br><span> </span><br><span> if (lchan->modify.info.requires_voice_stream</span><br><span> && !lchan->fi_rtp) {</span><br><span>@@ -1113,18 +1125,13 @@</span><br><span> /* FIXME: Add missing implementation to handle an already existing RTP voice stream on MODE MODIFY.</span><br><span> * there may be transitions from VOICE to SIGNALLING and also from VOICE to VOICE with a different</span><br><span> * codec. */</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->fi_rtp) {</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_fail("MODE MODIFY not implemented when RTP voice stream is already active (VOICE => SIGNALLING, VOICE/CODEC_A => VOICE/CODEC_B)\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> modif_info = data;</span><br><span> lchan->modify.info = *modif_info;</span><br><span> lchan->modify.concluded = false;</span><br><span> </span><br><span> use_mgwep_ci = lchan_use_mgw_endpoint_ci_bts(lchan);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (modif_info->ch_mode_rate.chan_mode == GSM48_CMODE_SPEECH_AMR) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gsm48_chan_mode_to_non_vamos(modif_info->ch_mode_rate.chan_mode) == GSM48_CMODE_SPEECH_AMR) {</span><br><span> if (lchan_mr_config(&lchan->modify.mr_conf_filtered, lchan, modif_info->ch_mode_rate.s15_s0)</span><br><span> < 0) {</span><br><span> lchan_fail("Can not generate multirate configuration IE\n");</span><br><span>@@ -1132,10 +1139,12 @@</span><br><span> }</span><br><span> }</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->modify.info.tsc_set > 0)</span><br><span> lchan->modify.tsc_set = lchan->modify.info.tsc_set;</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->modify.tsc_set = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->modify.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></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24374">change 24374</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/+/24374"/><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: Ibf53f4797d7491b17a33946fd7d920f038362b4c </div>
<div style="display:none"> Gerrit-Change-Number: 24374 </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>