diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2021-05-23 16:58:11 +0200 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2021-06-10 16:15:35 +0200 |
| commit | a99899ea967439f4063a3b5f6abb8d0ed6ddbcd2 (patch) | |
| tree | c8be927fc6053a820b1ab5abeff35b86bad148ba | |
| parent | bb843d10a99e0d8ec015144b8b520ebf1c2c8c51 (diff) | |
VTY: add 'vamos-subslot' to activate a secondary lchan
| -rw-r--r-- | src/osmo-bsc/bsc_vty.c | 30 | ||||
| -rw-r--r-- | tests/osmo-bsc.vty | 7 |
2 files changed, 27 insertions, 10 deletions
diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 3eedffb9d..71a0f0b7d 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -6297,8 +6297,10 @@ static int lchan_act_trx(struct vty *vty, struct gsm_bts_trx *trx, int activate) * 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_NR_TRX_TS_SS_STR2 + "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_STR2 + "Primary sub-slot\n" "VAMOS secondary shadow subslot, range <0-1>, only valid for TCH type timeslots\n" + SS_NR_STR "Manual Channel Activation (e.g. for BER test)\n" "Manual Channel Activation, in VAMOS mode\n" "Manual Channel Deactivation (e.g. for BER test)\n" @@ -6306,19 +6308,33 @@ DEFUN(lchan_act, lchan_act_cmd, { 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")) diff --git a/tests/osmo-bsc.vty b/tests/osmo-bsc.vty index c7e9e6de3..cbd498538 100644 --- a/tests/osmo-bsc.vty +++ b/tests/osmo-bsc.vty @@ -33,7 +33,7 @@ OsmoBSC# bts 0 trx 0 timeslot 0 sub-slot 0 modify vamos tsc 1 0 ? OsmoBSC# list ... - 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>] ... OsmoBSC# bts? @@ -59,8 +59,9 @@ OsmoBSC# bts 0 trx 0 timeslot ? <0-7> Timeslot Number OsmoBSC# bts 0 trx 0 timeslot 0 ? - pdch Packet Data Channel - sub-slot Sub-slot for manual command + pdch Packet Data Channel + sub-slot Primary sub-slot + vamos-sub-slot VAMOS secondary shadow subslot, range <0-1>, only valid for TCH type timeslots OsmoBSC# bts 0 trx 0 timeslot 0 sub-slot ? <0-7> Sub-slot Number |