Remove unused RRLP options/codec
RRLP is handled in OsmoMSC after the split from NITB, so let's remove any bogus VTY commands left over in the BSC. Change-Id: Ib626f43a3a3ca69dfc127afe5832eb58f7fb6a38
This commit is contained in:
parent
d9956d91ba
commit
faacb090f6
|
@ -12,7 +12,6 @@ network
|
|||
encryption a5 0
|
||||
neci 0
|
||||
paging any use tch 0
|
||||
rrlp mode none
|
||||
mm info 0
|
||||
handover 0
|
||||
handover window rxlev averaging 10
|
||||
|
|
|
@ -11,7 +11,6 @@ network
|
|||
encryption a5 0
|
||||
neci 0
|
||||
paging any use tch 0
|
||||
rrlp mode none
|
||||
mm info 0
|
||||
handover 0
|
||||
handover window rxlev averaging 10
|
||||
|
|
|
@ -44,7 +44,6 @@ noinst_HEADERS = \
|
|||
pcu_if.h \
|
||||
pcuif_proto.h \
|
||||
rest_octets.h \
|
||||
rrlp.h \
|
||||
rs232.h \
|
||||
signal.h \
|
||||
socket.h \
|
||||
|
|
|
@ -332,11 +332,6 @@ struct gsm_network {
|
|||
/* timer to expire old location updates */
|
||||
struct osmo_timer_list subscr_expire_timer;
|
||||
|
||||
/* Radio Resource Location Protocol (TS 04.31) */
|
||||
struct {
|
||||
enum rrlp_mode mode;
|
||||
} rrlp;
|
||||
|
||||
enum gsm_chan_t ctype_by_chreq[_NUM_CHREQ_T];
|
||||
|
||||
/* Use a TCH for handling requests of type paging any */
|
||||
|
@ -520,9 +515,6 @@ static inline int is_e1_bts(struct gsm_bts *bts)
|
|||
enum gsm_auth_policy gsm_auth_policy_parse(const char *arg);
|
||||
const char *gsm_auth_policy_name(enum gsm_auth_policy policy);
|
||||
|
||||
enum rrlp_mode rrlp_mode_parse(const char *arg);
|
||||
const char *rrlp_mode_name(enum rrlp_mode mode);
|
||||
|
||||
enum bts_gprs_mode bts_gprs_mode_parse(const char *arg, int *valid);
|
||||
const char *bts_gprs_mode_name(enum bts_gprs_mode mode);
|
||||
int bts_gprs_mode_is_compat(struct gsm_bts *bts, enum bts_gprs_mode mode);
|
||||
|
|
|
@ -34,14 +34,6 @@ struct osmo_bsc_data;
|
|||
|
||||
struct osmo_bsc_sccp_con;
|
||||
|
||||
/* RRLP mode of operation */
|
||||
enum rrlp_mode {
|
||||
RRLP_MODE_NONE,
|
||||
RRLP_MODE_MS_BASED,
|
||||
RRLP_MODE_MS_PREF,
|
||||
RRLP_MODE_ASS_PREF,
|
||||
};
|
||||
|
||||
/* Channel Request reason */
|
||||
enum gsm_chreq_reason_t {
|
||||
GSM_CHREQ_REASON_EMERG,
|
||||
|
|
|
@ -1,7 +0,0 @@
|
|||
#ifndef _RRLP_H
|
||||
#define _RRLP_H
|
||||
|
||||
void on_dso_load_rrlp(void);
|
||||
|
||||
#endif /* _RRLP_H */
|
||||
|
|
@ -180,8 +180,6 @@ static void net_dump_vty(struct vty *vty, struct gsm_network *net)
|
|||
VTY_NEWLINE);
|
||||
vty_out(vty, " Use TCH for Paging any: %d%s", net->pag_any_tch,
|
||||
VTY_NEWLINE);
|
||||
vty_out(vty, " RRLP Mode: %s%s", rrlp_mode_name(net->rrlp.mode),
|
||||
VTY_NEWLINE);
|
||||
vty_out(vty, " MM Info: %s%s", net->send_mm_info ? "On" : "Off",
|
||||
VTY_NEWLINE);
|
||||
vty_out(vty, " Handover: %s%s", net->handover.active ? "On" : "Off",
|
||||
|
@ -817,8 +815,6 @@ static int config_write_net(struct vty *vty)
|
|||
vty_out(vty, " encryption a5 %u%s", gsmnet->a5_encryption, VTY_NEWLINE);
|
||||
vty_out(vty, " neci %u%s", gsmnet->neci, VTY_NEWLINE);
|
||||
vty_out(vty, " paging any use tch %d%s", gsmnet->pag_any_tch, VTY_NEWLINE);
|
||||
vty_out(vty, " rrlp mode %s%s", rrlp_mode_name(gsmnet->rrlp.mode),
|
||||
VTY_NEWLINE);
|
||||
vty_out(vty, " mm info %u%s", gsmnet->send_mm_info, VTY_NEWLINE);
|
||||
vty_out(vty, " handover %u%s", gsmnet->handover.active, VTY_NEWLINE);
|
||||
vty_out(vty, " handover window rxlev averaging %u%s",
|
||||
|
|
|
@ -133,22 +133,6 @@ DEFUN(cfg_net_encryption,
|
|||
return CMD_SUCCESS;
|
||||
}
|
||||
|
||||
DEFUN(cfg_net_rrlp_mode, cfg_net_rrlp_mode_cmd,
|
||||
"rrlp mode (none|ms-based|ms-preferred|ass-preferred)",
|
||||
"Radio Resource Location Protocol\n"
|
||||
"Set the Radio Resource Location Protocol Mode\n"
|
||||
"Don't send RRLP request\n"
|
||||
"Request MS-based location\n"
|
||||
"Request any location, prefer MS-based\n"
|
||||
"Request any location, prefer MS-assisted\n")
|
||||
{
|
||||
struct gsm_network *gsmnet = gsmnet_from_vty(vty);
|
||||
|
||||
gsmnet->rrlp.mode = rrlp_mode_parse(argv[0]);
|
||||
|
||||
return CMD_SUCCESS;
|
||||
}
|
||||
|
||||
DEFUN(cfg_net_mm_info, cfg_net_mm_info_cmd,
|
||||
"mm info (0|1)",
|
||||
"Mobility Management\n"
|
||||
|
@ -282,7 +266,6 @@ int common_cs_vty_init(struct gsm_network *network,
|
|||
install_element(GSMNET_NODE, &cfg_net_name_long_cmd);
|
||||
install_element(GSMNET_NODE, &cfg_net_reject_cause_cmd);
|
||||
install_element(GSMNET_NODE, &cfg_net_encryption_cmd);
|
||||
install_element(GSMNET_NODE, &cfg_net_rrlp_mode_cmd);
|
||||
install_element(GSMNET_NODE, &cfg_net_mm_info_cmd);
|
||||
install_element(GSMNET_NODE, &cfg_net_timezone_cmd);
|
||||
install_element(GSMNET_NODE, &cfg_net_timezone_dst_cmd);
|
||||
|
|
|
@ -138,24 +138,6 @@ const char *gsm_auth_policy_name(enum gsm_auth_policy policy)
|
|||
return get_value_string(auth_policy_names, policy);
|
||||
}
|
||||
|
||||
static const struct value_string rrlp_mode_names[] = {
|
||||
{ RRLP_MODE_NONE, "none" },
|
||||
{ RRLP_MODE_MS_BASED, "ms-based" },
|
||||
{ RRLP_MODE_MS_PREF, "ms-preferred" },
|
||||
{ RRLP_MODE_ASS_PREF, "ass-preferred" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
enum rrlp_mode rrlp_mode_parse(const char *arg)
|
||||
{
|
||||
return get_string_value(rrlp_mode_names, arg);
|
||||
}
|
||||
|
||||
const char *rrlp_mode_name(enum rrlp_mode mode)
|
||||
{
|
||||
return get_value_string(rrlp_mode_names, mode);
|
||||
}
|
||||
|
||||
static const struct value_string bts_gprs_mode_names[] = {
|
||||
{ BTS_GPRS_NONE, "none" },
|
||||
{ BTS_GPRS_GPRS, "gprs" },
|
||||
|
|
Loading…
Reference in New Issue