From 450714b19cb5cc5ac9f630e30058ff1469f76f83 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sat, 27 May 2017 14:15:39 +0200 Subject: vty: Remove command for manual channel activation/deactivation OsmoBTS won't run without being connected to a BSC. The BTS wouldn't start to transmit if the BSC doesn't properly initialize it. So if we want to activate some channels manually for testing, we should do so from the BSC, and not inside the BTS code. Doing this in the BTS means that the BSC is not aware of it and might want to use that channel for something else meanwhile. Osmo{BSC,NITB} has gained ability to manually activate a channel from the VTY in Change-Id I44fc3904678eb48bd3ab1a3da8c0c265fa082e0d as can be seen at https://gerrit.osmocom.org/2759 So let's remove the old/obsoleted code here. Change-Id: I7ba0301b55cc283aa6a441899f84357e28a97321 --- src/common/vty.c | 60 -------------------------------------------------------- 1 file changed, 60 deletions(-) (limited to 'src') diff --git a/src/common/vty.c b/src/common/vty.c index 44c742c9..de9b23fc 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -1050,64 +1050,6 @@ DEFUN(no_bts_t_t_l_loopback, return CMD_SUCCESS; } -DEFUN(bts_t_t_l_activate, - bts_t_t_l_activate_cmd, - "bts <0-0> trx <0-0> ts <0-7> lchan <0-1> activate", - BTS_T_T_L_STR "Manually activate a logical channel (FOR TEST USE ONLY! Will disrupt normal operation of the channel)\n") -{ - struct gsm_network *net = gsmnet_from_vty(vty); - struct gsm_lchan *lchan; - int rc; - - lchan = resolve_lchan(net, argv, 0); - if (!lchan) { - vty_out(vty, "%% can't find BTS%s", VTY_NEWLINE); - return CMD_WARNING; - } - - /* set channel configuration */ - /* TODO: let user choose speech mode */ - lchan->tch_mode = GSM48_CMODE_SPEECH_V1; - lchan->rsl_cmode = RSL_CMOD_SPD_SPEECH; - /* no encryption */ - memset(&lchan->encr, 0, sizeof(lchan->encr)); - - /* activate the channel */ - lchan->rel_act_kind = LCHAN_REL_ACT_OML; - rc = l1sap_chan_act(lchan->ts->trx, gsm_lchan2chan_nr(lchan), NULL); - if (rc < 0) { - vty_out(vty, "%% can't activate channel%s", VTY_NEWLINE); - return CMD_WARNING; - } - - return CMD_SUCCESS; -} - -DEFUN(bts_t_t_l_deactivate, - bts_t_t_l_deactivate_cmd, - "bts <0-0> trx <0-0> ts <0-7> lchan <0-1> deactivate", - BTS_T_T_L_STR "Deactivate a manually activated channel (DO NOT apply to channels activated by BSC or NITB)\n") -{ - struct gsm_network *net = gsmnet_from_vty(vty); - struct gsm_lchan *lchan; - int rc; - - lchan = resolve_lchan(net, argv, 0); - if (!lchan) { - vty_out(vty, "%% can't find BTS%s", VTY_NEWLINE); - return CMD_WARNING; - } - - /* deactivate the channel */ - rc = l1sap_chan_rel(lchan->ts->trx, gsm_lchan2chan_nr(lchan)); - if (rc < 0) { - vty_out(vty, "%% can't deactivate channel%s", VTY_NEWLINE); - return CMD_WARNING; - } - - return CMD_SUCCESS; -} - int bts_vty_init(struct gsm_bts *bts, const struct log_info *cat) { cfg_trx_gsmtap_sapi_cmd.string = vty_cmd_string_from_valstr(bts, gsmtap_sapi_names, @@ -1166,8 +1108,6 @@ int bts_vty_init(struct gsm_bts *bts, const struct log_info *cat) install_element(ENABLE_NODE, &bts_t_t_l_jitter_buf_cmd); install_element(ENABLE_NODE, &bts_t_t_l_loopback_cmd); install_element(ENABLE_NODE, &no_bts_t_t_l_loopback_cmd); - install_element(ENABLE_NODE, &bts_t_t_l_activate_cmd); - install_element(ENABLE_NODE, &bts_t_t_l_deactivate_cmd); install_element(CONFIG_NODE, &cfg_phy_cmd); install_node(&phy_node, config_write_phy); -- cgit v1.2.3