<p>neels <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24380">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
neels: Looks good to me, approved
dexter: Looks good to me, but someone else must approve
pespin: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">VTY: add 'vamos-subslot' to activate a secondary lchan<br><br>Related: SYS#5315 OS#4940<br>Change-Id: If44b6bdb78046502eb0b66529ae190a955d9978c<br>---<br>M src/osmo-bsc/bsc_vty.c<br>M tests/osmo-bsc.vty<br>2 files changed, 27 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c</span><br><span>index 3eedffb..71a0f0b 100644</span><br><span>--- a/src/osmo-bsc/bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/bsc_vty.c</span><br><span>@@ -6297,8 +6297,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|activate-vamos|deactivate) (hr|fr|efr|amr|sig) [<0-7>]",</span><br><span style="color: hsl(0, 100%, 40%);">- BTS_NR_TRX_TS_SS_STR2</span><br><span style="color: hsl(120, 100%, 40%);">+ "bts <0-255> trx <0-255> timeslot <0-7> (sub-slot|vamos-sub-slot) <0-7> (activate|activate-vamos|deactivate) (hr|fr|efr|amr|sig) [<0-7>]",</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_NR_TRX_TS_STR2</span><br><span style="color: hsl(120, 100%, 40%);">+ "Primary sub-slot\n" "VAMOS secondary shadow subslot, range <0-1>, only valid for TCH type timeslots\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ SS_NR_STR</span><br><span> "Manual Channel Activation (e.g. for BER test)\n"</span><br><span> "Manual Channel Activation, in VAMOS mode\n"</span><br><span> "Manual Channel Deactivation (e.g. for BER test)\n"</span><br><span>@@ -6306,19 +6308,33 @@</span><br><span> {</span><br><span> struct gsm_bts_trx_ts *ts;</span><br><span> struct gsm_lchan *lchan;</span><br><span style="color: hsl(0, 100%, 40%);">- int ss_nr = atoi(argv[3]);</span><br><span style="color: hsl(0, 100%, 40%);">- const char *act_str = argv[4];</span><br><span style="color: hsl(0, 100%, 40%);">- const char *codec_str = argv[5];</span><br><span style="color: hsl(120, 100%, 40%);">+ bool vamos = (strcmp(argv[3], "vamos-sub-slot") == 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ int ss_nr = atoi(argv[4]);</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *act_str = argv[5];</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *codec_str = argv[6];</span><br><span> int activate;</span><br><span> int amr_mode = -1;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (argc > 6)</span><br><span style="color: hsl(0, 100%, 40%);">- amr_mode = atoi(argv[6]);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (argc > 7)</span><br><span style="color: hsl(120, 100%, 40%);">+ amr_mode = atoi(argv[7]);</span><br><span> </span><br><span> ts = vty_get_ts(vty, argv[0], argv[1], argv[2]);</span><br><span> if (!ts)</span><br><span> return CMD_WARNING;</span><br><span> </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 (vamos && !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%);">+ if (vamos)</span><br><span style="color: hsl(120, 100%, 40%);">+ ss_nr += ts->max_primary_lchans;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> lchan = &ts->lchan[ss_nr];</span><br><span> </span><br><span> if (!strcmp(act_str, "activate"))</span><br><span>diff --git a/tests/osmo-bsc.vty b/tests/osmo-bsc.vty</span><br><span>index c7e9e6d..cbd4985 100644</span><br><span>--- a/tests/osmo-bsc.vty</span><br><span>+++ b/tests/osmo-bsc.vty</span><br><span>@@ -33,7 +33,7 @@</span><br><span> </span><br><span> OsmoBSC# list</span><br><span> ...</span><br><span style="color: hsl(0, 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 style="color: hsl(120, 100%, 40%);">+ bts <0-255> trx <0-255> timeslot <0-7> (sub-slot|vamos-sub-slot) <0-7> (activate|activate-vamos|deactivate) (hr|fr|efr|amr|sig) [<0-7>]</span><br><span> ...</span><br><span> </span><br><span> OsmoBSC# bts?</span><br><span>@@ -59,8 +59,9 @@</span><br><span> <0-7> Timeslot Number</span><br><span> </span><br><span> OsmoBSC# bts 0 trx 0 timeslot 0 ?</span><br><span style="color: hsl(0, 100%, 40%);">- pdch Packet Data Channel</span><br><span style="color: hsl(0, 100%, 40%);">- sub-slot Sub-slot for manual command</span><br><span style="color: hsl(120, 100%, 40%);">+ pdch Packet Data Channel</span><br><span style="color: hsl(120, 100%, 40%);">+ sub-slot Primary sub-slot</span><br><span style="color: hsl(120, 100%, 40%);">+ vamos-sub-slot VAMOS secondary shadow subslot, range <0-1>, only valid for TCH type timeslots</span><br><span> </span><br><span> OsmoBSC# bts 0 trx 0 timeslot 0 sub-slot ?</span><br><span> <0-7> Sub-slot Number</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24380">change 24380</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/+/24380"/><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: If44b6bdb78046502eb0b66529ae190a955d9978c </div>
<div style="display:none"> Gerrit-Change-Number: 24380 </div>
<div style="display:none"> Gerrit-PatchSet: 26 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@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: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>