From 61dc63e354e1a68317f72d485bea4b6a0194e863 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Mon, 23 May 2011 20:30:17 +0200 Subject: rename abis_nm_adm_name() to abis_nm_adm_state_name() --- src/gsm/abis_nm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gsm/abis_nm.c') diff --git a/src/gsm/abis_nm.c b/src/gsm/abis_nm.c index acea4ed5..8e769df8 100644 --- a/src/gsm/abis_nm.c +++ b/src/gsm/abis_nm.c @@ -392,7 +392,7 @@ static const struct value_string abis_nm_adm_state_names[] = { { 0, NULL } }; -const char *abis_nm_adm_name(uint8_t adm) +const char *abis_nm_adm_state_name(uint8_t adm) { return get_value_string(abis_nm_adm_state_names, adm); } -- cgit v1.2.3 From ea4b12aa5ddc054547926f5eca0e036268c1e98e Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Mon, 23 May 2011 20:41:31 +0200 Subject: 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(). --- src/gsm/abis_nm.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'src/gsm/abis_nm.c') 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); } -- cgit v1.2.3 From 11c7193ad8ceb4f3898799dc44b700b8b93a59b8 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Tue, 24 May 2011 17:15:12 +0200 Subject: Import abis_nm_{chcomb4pchan,pchan4chcomb}() from openbsc --- src/gsm/abis_nm.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'src/gsm/abis_nm.c') diff --git a/src/gsm/abis_nm.c b/src/gsm/abis_nm.c index 109c3bba..a82194fd 100644 --- a/src/gsm/abis_nm.c +++ b/src/gsm/abis_nm.c @@ -21,9 +21,12 @@ */ #include +#include + #include #include #include +#include #include #include @@ -394,3 +397,32 @@ void abis_nm_debugp_foh(int ss, struct abis_om_fom_hdr *foh) foh->obj_class, foh->obj_inst.bts_nr, foh->obj_inst.trx_nr, foh->obj_inst.ts_nr); } + +static const enum abis_nm_chan_comb chcomb4pchan[] = { + [GSM_PCHAN_CCCH] = NM_CHANC_mainBCCH, + [GSM_PCHAN_CCCH_SDCCH4] = NM_CHANC_BCCHComb, + [GSM_PCHAN_TCH_F] = NM_CHANC_TCHFull, + [GSM_PCHAN_TCH_H] = NM_CHANC_TCHHalf, + [GSM_PCHAN_SDCCH8_SACCH8C] = NM_CHANC_SDCCH, + [GSM_PCHAN_PDCH] = NM_CHANC_IPAC_PDCH, + [GSM_PCHAN_TCH_F_PDCH] = NM_CHANC_IPAC_TCHFull_PDCH, + /* FIXME: bounds check */ +}; + +int abis_nm_chcomb4pchan(enum gsm_phys_chan_config pchan) +{ + if (pchan < ARRAY_SIZE(chcomb4pchan)) + return chcomb4pchan[pchan]; + + return -EINVAL; +} + +enum abis_nm_chan_comb abis_nm_pchan4chcomb(uint8_t chcomb) +{ + int i; + for (i = 0; i < ARRAY_SIZE(chcomb4pchan); i++) { + if (chcomb4pchan[i] == chcomb) + return i; + } + return GSM_PCHAN_NONE; +} -- cgit v1.2.3