From cdc59ff5ccd55459068391da5e7b533fa9324842 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Mon, 23 May 2011 20:42:26 +0200 Subject: abis_nm: Some more fall-out from the abis_nm move to libosmocore we want get_string_value(), not the equivalent of get_value_string() --- openbsc/src/libbsc/abis_nm.c | 3 ++- openbsc/src/libbsc/abis_nm_vty.c | 4 ++-- openbsc/src/libbsc/bsc_vty.c | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/openbsc/src/libbsc/abis_nm.c b/openbsc/src/libbsc/abis_nm.c index c47695e89..5bcc985b2 100644 --- a/openbsc/src/libbsc/abis_nm.c +++ b/openbsc/src/libbsc/abis_nm.c @@ -380,7 +380,8 @@ 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_state_name(new_state.administrative)); + get_value_string(abis_nm_adm_state_names, + 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 d043c352a..3a16b2b7f 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 = abis_nm_obj_class_name(argv[1]); + oms->obj_class = get_string_value(abis_nm_obj_class_names, 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 = abis_nm_adm_state_name(argv[0]); + state = get_string_value(abis_nm_adm_state_names, 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 f1e964cd6..a72ff21c1 100644 --- a/openbsc/src/libbsc/bsc_vty.c +++ b/openbsc/src/libbsc/bsc_vty.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include -- cgit v1.2.3