From 29048b2a80b5865ffc41fa4401113c5826227e23 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Tue, 14 Jun 2016 13:31:59 +0200 Subject: 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 --- openbsc/include/openbsc/gsm_data_shared.h | 1 - openbsc/src/libcommon/gsm_data_shared.c | 13 ++----------- openbsc/src/osmo-bsc_mgcp/Makefile.am | 2 +- openbsc/src/utils/Makefile.am | 2 +- openbsc/tests/mgcp/Makefile.am | 8 +++++--- openbsc/tests/smpp/Makefile.am | 2 +- 6 files changed, 10 insertions(+), 18 deletions(-) diff --git a/openbsc/include/openbsc/gsm_data_shared.h b/openbsc/include/openbsc/gsm_data_shared.h index e46647cf5..d3a61afcd 100644 --- a/openbsc/include/openbsc/gsm_data_shared.h +++ b/openbsc/include/openbsc/gsm_data_shared.h @@ -787,7 +787,6 @@ struct gsm_bts_trx *gsm_bts_trx_num(const struct gsm_bts *bts, int num); const struct value_string gsm_pchant_names[12]; const struct value_string gsm_pchant_descs[12]; -const struct value_string gsm_lchant_names[8]; const char *gsm_pchan_name(enum gsm_phys_chan_config c); enum gsm_phys_chan_config gsm_pchan_parse(const char *name); const char *gsm_lchant_name(enum gsm_chan_t c); 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 diff --git a/openbsc/tests/mgcp/Makefile.am b/openbsc/tests/mgcp/Makefile.am index ec7cc99d8..82d6ac605 100644 --- a/openbsc/tests/mgcp/Makefile.am +++ b/openbsc/tests/mgcp/Makefile.am @@ -1,5 +1,5 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_srcdir) -AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) $(LIBOSMONETIF_CFLAGS) $(LIBOSMOSCCP_CFLAGS) $(COVERAGE_CFLAGS) $(LIBBCG729_CFLAGS) +AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_FLAGS) $(LIBOSMONETIF_CFLAGS) $(LIBOSMOSCCP_CFLAGS) $(COVERAGE_CFLAGS) $(LIBBCG729_CFLAGS) AM_LDFLAGS = $(COVERAGE_LDFLAGS) EXTRA_DIST = mgcp_test.ok mgcp_transcoding_test.ok @@ -15,7 +15,8 @@ mgcp_test_SOURCES = mgcp_test.c mgcp_test_LDADD = $(top_builddir)/src/libbsc/libbsc.a \ $(top_builddir)/src/libmgcp/libmgcp.a \ $(top_builddir)/src/libcommon/libcommon.a \ - $(LIBOSMOCORE_LIBS) -lrt -lm $(LIBOSMOSCCP_LIBS) $(LIBOSMOVTY_LIBS) \ + $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) \ + -lrt -lm $(LIBOSMOSCCP_LIBS) $(LIBOSMOVTY_LIBS) \ $(LIBRARY_DL) $(LIBOSMONETIF_LIBS) mgcp_transcoding_test_SOURCES = mgcp_transcoding_test.c @@ -24,5 +25,6 @@ mgcp_transcoding_test_LDADD = \ $(top_builddir)/src/libbsc/libbsc.a \ $(top_builddir)/src/libmgcp/libmgcp.a \ $(top_builddir)/src/libcommon/libcommon.a \ - $(LIBOSMOCORE_LIBS) $(LIBBCG729_LIBS) -lrt -lm $(LIBOSMOSCCP_LIBS) $(LIBOSMOVTY_LIBS) \ + $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) \ + $(LIBBCG729_LIBS) -lrt -lm $(LIBOSMOSCCP_LIBS) $(LIBOSMOVTY_LIBS) \ $(LIBRARY_DL) $(LIBOSMONETIF_LIBS) $(LIBRARY_GSM) diff --git a/openbsc/tests/smpp/Makefile.am b/openbsc/tests/smpp/Makefile.am index 9ab15c589..aab4de9e3 100644 --- a/openbsc/tests/smpp/Makefile.am +++ b/openbsc/tests/smpp/Makefile.am @@ -10,4 +10,4 @@ smpp_test_SOURCES = smpp_test.c \ $(top_builddir)/src/libmsc/smpp_utils.c smpp_test_LDADD = \ $(top_builddir)/src/libcommon/libcommon.a \ - $(LIBOSMOCORE_LIBS) + $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) -- cgit v1.2.3