diff options
author | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2016-06-14 13:31:59 +0200 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2016-06-18 11:34:21 +0000 |
commit | 29048b2a80b5865ffc41fa4401113c5826227e23 (patch) | |
tree | 2228a4eec4c8d8281062e6910e826bfeaf9fccf8 /openbsc/src | |
parent | f8e02aa4e3d87bbdc66819d3a56380881e24ce5a (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')
-rw-r--r-- | openbsc/src/libcommon/gsm_data_shared.c | 13 | ||||
-rw-r--r-- | openbsc/src/osmo-bsc_mgcp/Makefile.am | 2 | ||||
-rw-r--r-- | openbsc/src/utils/Makefile.am | 2 |
3 files changed, 4 insertions, 13 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[] = { diff --git a/openbsc/src/osmo-bsc_mgcp/Makefile.am b/openbsc/src/osmo-bsc_mgcp/Makefile.am index 949cb6401..a48f24b00 100644 --- a/openbsc/src/osmo-bsc_mgcp/Makefile.am +++ b/openbsc/src/osmo-bsc_mgcp/Makefile.am @@ -9,6 +9,6 @@ osmo_bsc_mgcp_SOURCES = mgcp_main.c osmo_bsc_mgcp_LDADD = $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libmgcp/libmgcp.a -lrt \ - $(LIBOSMOVTY_LIBS) $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOVTY_LIBS) $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) \ $(LIBOSMONETIF_LIBS) $(LIBBCG729_LIBS) \ $(LIBRARY_GSM) diff --git a/openbsc/src/utils/Makefile.am b/openbsc/src/utils/Makefile.am index 4521130be..5a2e2d2b9 100644 --- a/openbsc/src/utils/Makefile.am +++ b/openbsc/src/utils/Makefile.am @@ -27,7 +27,7 @@ isdnsync_SOURCES = isdnsync.c smpp_mirror_SOURCES = smpp_mirror.c smpp_mirror_LDADD = $(top_builddir)/src/libcommon/libcommon.a \ - $(LIBOSMOCORE_LIBS) $(LIBSMPP34_LIBS) + $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBSMPP34_LIBS) meas_vis_SOURCES = meas_vis.c meas_vis_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) -lcdk -lncurses |