abis_nm: fix some fallout regarding abis_nm migration to libosmocore
Thanks to Holger for noticing this.
This commit is contained in:
parent
15c6172a8d
commit
867d9f3985
|
@ -380,7 +380,7 @@ static int abis_nm_rx_statechg_rep(struct msgb *mb)
|
|||
if (TLVP_PRESENT(&tp, NM_ATT_ADM_STATE)) {
|
||||
new_state.administrative = *TLVP_VAL(&tp, NM_ATT_ADM_STATE);
|
||||
DEBUGPC(DNM, "ADM=%2s ",
|
||||
abis_nm_adm_name(new_state.administrative));
|
||||
abis_nm_adm_state_name(new_state.administrative));
|
||||
}
|
||||
DEBUGPC(DNM, "\n");
|
||||
|
||||
|
|
|
@ -86,7 +86,7 @@ DEFUN(oml_class_inst, oml_class_inst_cmd,
|
|||
return CMD_WARNING;
|
||||
|
||||
oms->bts = bts;
|
||||
oms->obj_class = get_string_value(abis_nm_obj_class_names, argv[1]);
|
||||
oms->obj_class = abis_nm_obj_class_name(argv[1]);
|
||||
oms->obj_inst[0] = atoi(argv[2]);
|
||||
oms->obj_inst[1] = atoi(argv[3]);
|
||||
oms->obj_inst[2] = atoi(argv[4]);
|
||||
|
@ -161,7 +161,7 @@ DEFUN(oml_chg_adm_state, oml_chg_adm_state_cmd,
|
|||
struct oml_node_state *oms = vty->index;
|
||||
enum abis_nm_adm_state state;
|
||||
|
||||
state = get_string_value(abis_nm_adm_state_names, argv[0]);
|
||||
state = abis_nm_adm_state_name(argv[0]);
|
||||
|
||||
abis_nm_chg_adm_state(oms->bts, oms->obj_class, oms->obj_inst[0],
|
||||
oms->obj_inst[1], oms->obj_inst[2], state);
|
||||
|
|
|
@ -132,8 +132,8 @@ static int dummy_config_write(struct vty *v)
|
|||
static void net_dump_nmstate(struct vty *vty, struct gsm_nm_state *nms)
|
||||
{
|
||||
vty_out(vty,"Oper '%s', Admin %u, Avail '%s'%s",
|
||||
nm_opstate_name(nms->operational), nms->administrative,
|
||||
nm_avail_name(nms->availability), VTY_NEWLINE);
|
||||
abis_nm_opstate_name(nms->operational), nms->administrative,
|
||||
abis_nm_avail_name(nms->availability), VTY_NEWLINE);
|
||||
}
|
||||
|
||||
static void dump_pchan_load_vty(struct vty *vty, char *prefix,
|
||||
|
|
|
@ -29,6 +29,7 @@
|
|||
#include <osmocom/core/linuxlist.h>
|
||||
#include <osmocom/core/talloc.h>
|
||||
#include <osmocom/gsm/gsm_utils.h>
|
||||
#include <osmocom/gsm/abis_nm.h>
|
||||
#include <osmocom/core/statistics.h>
|
||||
|
||||
#include <openbsc/gsm_data.h>
|
||||
|
@ -130,7 +131,7 @@ int gsm_bts_model_register(struct gsm_bts_model *model)
|
|||
if (bts_model_find(model->type))
|
||||
return -EEXIST;
|
||||
|
||||
tlv_def_patch(&model->nm_att_tlvdef, &nm_att_tlvdef);
|
||||
tlv_def_patch(&model->nm_att_tlvdef, &abis_nm_att_tlvdef);
|
||||
llist_add_tail(&model->list, &bts_models);
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue