Change in osmo-bsc[master]: VTY: add 'vamos-subslot' to activate a secondary lchan

[neels]

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/24380 )


Change subject: VTY: add 'vamos-subslot' to activate a secondary lchan
......................................................................

VTY: add 'vamos-subslot' to activate a secondary lchan

Related: SYS#5315 OS#4940
Change-Id: If44b6bdb78046502eb0b66529ae190a955d9978c
---
M src/osmo-bsc/bsc_vty.c
1 file changed, 20 insertions(+), 6 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/80/24380/1

diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c
index 1fdc66a..48f397e 100644
--- a/src/osmo-bsc/bsc_vty.c
+++ b/src/osmo-bsc/bsc_vty.c
@@ -6277,7 +6277,7 @@
  * manually in a given mode/codec.  This is useful for receiver
  * performance testing (FER/RBER/...) */
 DEFUN(lchan_act, lchan_act_cmd,
-	"bts <0-255> trx <0-255> timeslot <0-7> sub-slot <0-7> (activate|activate-vamos|deactivate) (hr|fr|efr|amr|sig) [<0-7>]",
+	"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>]",
 	BTS_NR_TRX_TS_SS_STR2
 	"Manual Channel Activation (e.g. for BER test)\n"
 	"Manual Channel Activation, in VAMOS mode\n"
@@ -6286,19 +6286,33 @@
 {
 	struct gsm_bts_trx_ts *ts;
 	struct gsm_lchan *lchan;
-	int ss_nr = atoi(argv[3]);
-	const char *act_str = argv[4];
-	const char *codec_str = argv[5];
+	bool vamos = (strcmp(argv[3], "vamos-sub-slot") == 0);
+	int ss_nr = atoi(argv[4]);
+	const char *act_str = argv[5];
+	const char *codec_str = argv[6];
 	int activate;
 	int amr_mode = -1;
 
-	if (argc > 6)
-		amr_mode = atoi(argv[6]);
+	if (argc > 7)
+		amr_mode = atoi(argv[7]);
 
 	ts = vty_get_ts(vty, argv[0], argv[1], argv[2]);
 	if (!ts)
 		return CMD_WARNING;
 
+	if (ss_nr >= ts->max_primary_lchans) {
+		vty_out(vty, "Invalid sub-slot number for this timeslot type%s", VTY_NEWLINE);
+		return CMD_WARNING;
+	}
+
+	if (vamos && !osmo_bts_has_feature(&ts->trx->bts->features, BTS_FEAT_VAMOS)) {
+		vty_out(vty, "BTS does not support VAMOS%s", VTY_NEWLINE);
+		return CMD_WARNING;
+	}
+
+	if (vamos)
+		ss_nr += ts->max_primary_lchans;
+
 	lchan = &ts->lchan[ss_nr];
 
 	if (!strcmp(act_str, "activate"))

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/24380
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: If44b6bdb78046502eb0b66529ae190a955d9978c
Gerrit-Change-Number: 24380
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210523/c14e01b8/attachment.htm>