Merge branch 'master' of git.osmocom.org:libosmocore

1 files changed, 5 insertions, 2 deletions

diff --git a/include/osmocom/gsm/abis_nm.h b/include/osmocom/gsm/abis_nm.h
index 04e4575d..dcc8d4bb 100644
--- a/include/osmocom/gsm/abis_nm.h
+++ b/include/osmocom/gsm/abis_nm.h
@@ -9,16 +9,19 @@ 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];
 
+extern const struct value_string abis_nm_obj_class_names[];
+extern 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_name(uint8_t adm);
 void abis_nm_debugp_foh(int ss, struct abis_om_fom_hdr *foh);
 
+int abis_nm_chcomb4pchan(enum gsm_phys_chan_config pchan);
+enum abis_nm_chan_comb abis_nm_pchan4chcomb(uint8_t chcomb);
 #endif /* _OSMO_GSM_ABIS_NM_H */