summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2011-05-23 20:30:39 +0200
committerHarald Welte <laforge@gnumonks.org>2011-05-23 20:30:39 +0200
commit867d9f39852f33afdfa6ca7def56c856239e31cb (patch)
treecdf54b51ae5c3ef284d7465a23ded865ab99c6f5
parent15c6172a8d49b612587e03022ce5726aa83a4828 (diff)
abis_nm: fix some fallout regarding abis_nm migration to libosmocore
Thanks to Holger for noticing this.
-rw-r--r--openbsc/src/libbsc/abis_nm.c2
-rw-r--r--openbsc/src/libbsc/abis_nm_vty.c4
-rw-r--r--openbsc/src/libbsc/bsc_vty.c4
-rw-r--r--openbsc/src/libcommon/gsm_data.c3
4 files changed, 7 insertions, 6 deletions
diff --git a/openbsc/src/libbsc/abis_nm.c b/openbsc/src/libbsc/abis_nm.c
index c9062d526..c47695e89 100644
--- a/openbsc/src/libbsc/abis_nm.c
+++ b/openbsc/src/libbsc/abis_nm.c
@@ -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");
diff --git a/openbsc/src/libbsc/abis_nm_vty.c b/openbsc/src/libbsc/abis_nm_vty.c
index 3a16b2b7f..d043c352a 100644
--- a/openbsc/src/libbsc/abis_nm_vty.c
+++ b/openbsc/src/libbsc/abis_nm_vty.c
@@ -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);
diff --git a/openbsc/src/libbsc/bsc_vty.c b/openbsc/src/libbsc/bsc_vty.c
index 12f9ffd9f..f1e964cd6 100644
--- a/openbsc/src/libbsc/bsc_vty.c
+++ b/openbsc/src/libbsc/bsc_vty.c
@@ -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,
diff --git a/openbsc/src/libcommon/gsm_data.c b/openbsc/src/libcommon/gsm_data.c
index 480eb8018..54e7a6338 100644
--- a/openbsc/src/libcommon/gsm_data.c
+++ b/openbsc/src/libcommon/gsm_data.c
@@ -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;
}