[PATCH] openbsc[master]: rm dup: use channel type names from libosmocore

[Neels Hofmeyr]

Review at  https://gerrit.osmocom.org/267

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 and smpp_mirror, smpp_test.

Change-Id: If65ee7c0619cbc0acb0a15045bd5a969442c93cc
---
M openbsc/include/openbsc/gsm_data_shared.h
M openbsc/src/libcommon/gsm_data_shared.c
M openbsc/src/osmo-bsc_mgcp/Makefile.am
M openbsc/src/utils/Makefile.am
M openbsc/tests/mgcp/Makefile.am
M openbsc/tests/smpp/Makefile.am
6 files changed, 7 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/67/267/1

diff --git a/openbsc/include/openbsc/gsm_data_shared.h b/openbsc/include/openbsc/gsm_data_shared.h
index 8ed11b6..1070f0a 100644
--- a/openbsc/include/openbsc/gsm_data_shared.h
+++ b/openbsc/include/openbsc/gsm_data_shared.h
@@ -774,7 +774,6 @@
 
 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 9f9eb1e..e9eb4b0 100644
--- a/openbsc/src/libcommon/gsm_data_shared.c
+++ b/openbsc/src/libcommon/gsm_data_shared.c
@@ -92,19 +92,10 @@
 	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 949cb64..a48f24b 100644
--- a/openbsc/src/osmo-bsc_mgcp/Makefile.am
+++ b/openbsc/src/osmo-bsc_mgcp/Makefile.am
@@ -9,6 +9,6 @@
 
 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 4521130..5a2e2d2 100644
--- a/openbsc/src/utils/Makefile.am
+++ b/openbsc/src/utils/Makefile.am
@@ -27,7 +27,7 @@
 
 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 ec7cc99..76aa656 100644
--- a/openbsc/tests/mgcp/Makefile.am
+++ b/openbsc/tests/mgcp/Makefile.am
@@ -15,7 +15,8 @@
 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
diff --git a/openbsc/tests/smpp/Makefile.am b/openbsc/tests/smpp/Makefile.am
index 9ab15c5..aab4de9 100644
--- a/openbsc/tests/smpp/Makefile.am
+++ b/openbsc/tests/smpp/Makefile.am
@@ -10,4 +10,4 @@
 	$(top_builddir)/src/libmsc/smpp_utils.c
 smpp_test_LDADD = \
 	$(top_builddir)/src/libcommon/libcommon.a \
-	$(LIBOSMOCORE_LIBS)
+	$(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)

-- 
To view, visit https://gerrit.osmocom.org/267
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If65ee7c0619cbc0acb0a15045bd5a969442c93cc
Gerrit-PatchSet: 1
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>