abis_nm: remove abis_nm_obj_class_name / abis_nm_adm_state_name

and export the underlying raw value_string arrays instead:
abis_nm_obj_class_names / abis_nm_adm_state_names.

This permits the caller to use get_string_value() as well as
get_value_string().

2 files changed, 7 insertions, 16 deletions

diff --git a/include/osmocom/gsm/abis_nm.h b/include/osmocom/gsm/abis_nm.h
index fc096dc2..e7c3769d 100644
--- a/include/osmocom/gsm/abis_nm.h
+++ b/include/osmocom/gsm/abis_nm.h
@@ -9,16 +9,17 @@ const enum abis_nm_msgtype abis_nm_no_ack_nack[3];
 const enum abis_nm_msgtype abis_nm_sw_load_msgs[9];
 const enum abis_nm_msgtype abis_nm_nacks[33];
 
+const struct value_string abis_nm_obj_class_names[];
+const struct value_string abis_nm_adm_state_names[];
+
 const char *abis_nm_nack_cause_name(uint8_t cause);
 const char *abis_nm_nack_name(uint8_t nack);
 const char *abis_nm_event_type_name(uint8_t cause);
 const char *abis_nm_severity_name(uint8_t cause);
 const struct tlv_definition abis_nm_att_tlvdef;
-const char *abis_nm_obj_class_name(uint8_t oc);
 const char *abis_nm_opstate_name(uint8_t os);
 const char *abis_nm_avail_name(uint8_t avail);
 const char *abis_nm_test_name(uint8_t test);
-const char *abis_nm_adm_state_name(uint8_t adm);
 void abis_nm_debugp_foh(int ss, struct abis_om_fom_hdr *foh);
 
 #endif /* _OSMO_GSM_ABIS_NM_H */
diff --git a/src/gsm/abis_nm.c b/src/gsm/abis_nm.c
index 8e769df8..109c3bba 100644
--- a/src/gsm/abis_nm.c
+++ b/src/gsm/abis_nm.c
@@ -308,7 +308,7 @@ const struct tlv_definition abis_nm_att_tlvdef = {
 	},
 };
 
-static const struct value_string abis_nm_obj_class_names[] = {
+const struct value_string abis_nm_obj_class_names[] = {
 	{ NM_OC_SITE_MANAGER,	"SITE-MANAGER" },
 	{ NM_OC_BTS,		"BTS" },
 	{ NM_OC_RADIO_CARRIER,	"RADIO-CARRIER" },
@@ -329,11 +329,6 @@ static const struct value_string abis_nm_obj_class_names[] = {
 	{ 0,			NULL }
 };
 
-const char *abis_nm_obj_class_name(uint8_t oc)
-{
-	return get_value_string(abis_nm_obj_class_names, oc);
-}
-
 const char *abis_nm_opstate_name(uint8_t os)
 {
 	switch (os) {
@@ -384,7 +379,7 @@ const char *abis_nm_test_name(uint8_t test)
 	return get_value_string(test_names, test);
 }
 
-static const struct value_string abis_nm_adm_state_names[] = {
+const struct value_string abis_nm_adm_state_names[] = {
 	{ NM_STATE_LOCKED,	"Locked" },
 	{ NM_STATE_UNLOCKED,	"Unlocked" },
 	{ NM_STATE_SHUTDOWN,	"Shutdown" },
@@ -392,15 +387,10 @@ static const struct value_string abis_nm_adm_state_names[] = {
 	{ 0, NULL }
 };
 
-const char *abis_nm_adm_state_name(uint8_t adm)
-{
-	return get_value_string(abis_nm_adm_state_names, adm);
-}
-
 void abis_nm_debugp_foh(int ss, struct abis_om_fom_hdr *foh)
 {
 	DEBUGP(ss, "OC=%s(%02x) INST=(%02x,%02x,%02x) ",
-		abis_nm_obj_class_name(foh->obj_class), foh->obj_class,
-		foh->obj_inst.bts_nr, foh->obj_inst.trx_nr,
+		get_value_string(abis_nm_obj_class_names, foh->obj_class),
+		foh->obj_class, foh->obj_inst.bts_nr, foh->obj_inst.trx_nr,
 		foh->obj_inst.ts_nr);
 }