aboutsummaryrefslogtreecommitdiffstats
path: root/openbsc/src/libcommon
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2016-06-14 13:31:59 +0200
committerHarald Welte <laforge@gnumonks.org>2016-06-18 11:34:21 +0000
commit29048b2a80b5865ffc41fa4401113c5826227e23 (patch)
tree2228a4eec4c8d8281062e6910e826bfeaf9fccf8 /openbsc/src/libcommon
parentf8e02aa4e3d87bbdc66819d3a56380881e24ce5a (diff)
rm dup: use channel type names from libosmocore
In gsm_lchant_name(enum gsm_chan_t), use the gsm_chan_t_names value strings from libosmocore instead of redefining the same strings. The list from libosmocore is also more complete, including CCCH and PDTCH. Add a todo comment to move to libosmocore. In consequence, libosmogsm linkage needs to be added to osmo-bsc_mgcp, mgcp_test, mgcp_transcoding_test and smpp_mirror, smpp_test. Change-Id: If65ee7c0619cbc0acb0a15045bd5a969442c93cc
Diffstat (limited to 'openbsc/src/libcommon')
-rw-r--r--openbsc/src/libcommon/gsm_data_shared.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/openbsc/src/libcommon/gsm_data_shared.c b/openbsc/src/libcommon/gsm_data_shared.c
index 9f9eb1eeb..e9eb4b058 100644
--- a/openbsc/src/libcommon/gsm_data_shared.c
+++ b/openbsc/src/libcommon/gsm_data_shared.c
@@ -92,19 +92,10 @@ enum gsm_phys_chan_config gsm_pchan_parse(const char *name)
return get_string_value(gsm_pchant_names, name);
}
-const struct value_string gsm_lchant_names[8] = {
- { GSM_LCHAN_NONE, "NONE" },
- { GSM_LCHAN_SDCCH, "SDCCH" },
- { GSM_LCHAN_TCH_F, "TCH/F" },
- { GSM_LCHAN_TCH_H, "TCH/H" },
- { GSM_LCHAN_UNKNOWN, "UNKNOWN" },
- { GSM_LCHAN_CBCH, "CBCH" },
- { 0, NULL }
-};
-
+/* TODO: move to libosmocore, next to gsm_chan_t_names? */
const char *gsm_lchant_name(enum gsm_chan_t c)
{
- return get_value_string(gsm_lchant_names, c);
+ return get_value_string(gsm_chan_t_names, c);
}
static const struct value_string lchan_s_names[] = {