Neels Hofmeyr has submitted this change and it was merged.

Change subject: drop libcommon-cs completely
......................................................................


drop libcommon-cs completely

Change-Id: I07d4a48af3154ee4d904686f230a51b8b8a94ff9
---
M configure.ac
M include/osmocom/bsc/Makefile.am
M include/osmocom/bsc/common_bsc.h
D include/osmocom/bsc/common_cs.h
M include/osmocom/bsc/gsm_data.h
M src/Makefile.am
M src/ipaccess/Makefile.am
M src/libbsc/Makefile.am
M src/libbsc/bsc_vty.c
M src/libbsc/net_init.c
D src/libcommon-cs/Makefile.am
D src/libcommon-cs/common_cs.c
D src/libcommon-cs/common_cs_vty.c
M src/osmo-bsc/Makefile.am
M src/osmo-bsc/osmo_bsc_filter.c
M src/osmo-bsc_nat/Makefile.am
M src/osmo-bsc_nat/bsc_nat.c
M src/utils/Makefile.am
M tests/abis/Makefile.am
M tests/bsc-nat/Makefile.am
M tests/bsc/Makefile.am
M tests/bssap/Makefile.am
M tests/channel/Makefile.am
M tests/gsm0408/Makefile.am
M tests/nanobts_omlattr/Makefile.am
M tests/subscr/Makefile.am
26 files changed, 2 insertions(+), 114 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/configure.ac b/configure.ac
index b2644fe..dac222f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -150,7 +150,6 @@
     src/Makefile
     src/libbsc/Makefile
     src/libfilter/Makefile
-    src/libcommon-cs/Makefile
     src/osmo-bsc/Makefile
     src/ipaccess/Makefile
     src/utils/Makefile
diff --git a/include/osmocom/bsc/Makefile.am b/include/osmocom/bsc/Makefile.am
index c503a50..f975947 100644
--- a/include/osmocom/bsc/Makefile.am
+++ b/include/osmocom/bsc/Makefile.am
@@ -16,7 +16,6 @@
        chan_alloc.h \
        common.h \
        common_bsc.h \
-       common_cs.h \
        ctrl.h \
        debug.h \
        e1_config.h \
diff --git a/include/osmocom/bsc/common_bsc.h b/include/osmocom/bsc/common_bsc.h
index 32e5097..d3c7ff5 100644
--- a/include/osmocom/bsc/common_bsc.h
+++ b/include/osmocom/bsc/common_bsc.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <stdint.h>
-#include <osmocom/bsc/common_cs.h>
 
 struct gsm_network *bsc_network_init(void *ctx,
                                     uint16_t country_code,
diff --git a/include/osmocom/bsc/common_cs.h b/include/osmocom/bsc/common_cs.h
deleted file mode 100644
index b6a8ed8..0000000
--- a/include/osmocom/bsc/common_cs.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-#include <osmocom/gsm/protocol/gsm_04_08.h>
-
-struct msgb;
-struct gsm_network;
-
-struct vty;
diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h
index 8af594f..d1a901e 100644
--- a/include/osmocom/bsc/gsm_data.h
+++ b/include/osmocom/bsc/gsm_data.h
@@ -17,7 +17,6 @@
 
 #include <osmocom/bsc/common.h>
 #include <osmocom/bsc/rest_octets.h>
-#include <osmocom/bsc/common_cs.h>
 
 #include <osmocom/core/bitvec.h>
 #include <osmocom/gsm/gsm_utils.h>
diff --git a/src/Makefile.am b/src/Makefile.am
index 28b070e..fc9bf8e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,7 +21,6 @@
 
 # Libraries
 SUBDIRS = \
-       libcommon-cs \
        libbsc \
        libfilter \
        $(NULL)
diff --git a/src/ipaccess/Makefile.am b/src/ipaccess/Makefile.am
index 0301d3a..a6195b9 100644
--- a/src/ipaccess/Makefile.am
+++ b/src/ipaccess/Makefile.am
@@ -46,7 +46,6 @@
 # FIXME: resolve the bogus dependencies patched around here:
 ipaccess_config_LDADD = \
        $(top_builddir)/src/libbsc/libbsc.a \
-       $(top_builddir)/src/libcommon-cs/libcommon-cs.a \
        $(OSMO_LIBS) \
        $(NULL)
 
diff --git a/src/libbsc/Makefile.am b/src/libbsc/Makefile.am
index e68ada8..e8e69c7 100644
--- a/src/libbsc/Makefile.am
+++ b/src/libbsc/Makefile.am
@@ -19,8 +19,6 @@
        libbsc.a \
        $(NULL)
 
-libbsc_a_LIBADD = $(top_builddir)/src/libcommon-cs/libcommon-cs.a
-
 libbsc_a_SOURCES = \
        abis_nm.c \
        abis_nm_vty.c \
diff --git a/src/libbsc/bsc_vty.c b/src/libbsc/bsc_vty.c
index 1407061..f1cbb54 100644
--- a/src/libbsc/bsc_vty.c
+++ b/src/libbsc/bsc_vty.c
@@ -56,7 +56,6 @@
 #include <osmocom/bsc/bsc_msc_data.h>
 #include <osmocom/bsc/osmo_bsc_rf.h>
 #include <osmocom/bsc/pcu_if.h>
-#include <osmocom/bsc/common_cs.h>
 #include <osmocom/bsc/handover.h>
 #include <osmocom/bsc/handover_cfg.h>
 #include <osmocom/bsc/handover_vty.h>
diff --git a/src/libbsc/net_init.c b/src/libbsc/net_init.c
index c5c7c5e..90f668f 100644
--- a/src/libbsc/net_init.c
+++ b/src/libbsc/net_init.c
@@ -17,7 +17,6 @@
  *
  */
 
-#include <osmocom/bsc/common_cs.h>
 #include <osmocom/bsc/osmo_bsc.h>
 #include <osmocom/bsc/bsc_msc_data.h>
 #include <osmocom/bsc/gsm_04_08_utils.h>
diff --git a/src/libcommon-cs/Makefile.am b/src/libcommon-cs/Makefile.am
deleted file mode 100644
index e549509..0000000
--- a/src/libcommon-cs/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-AM_CPPFLAGS = \
-       $(all_includes) \
-       -I$(top_srcdir)/include \
-       -I$(top_builddir) \
-       $(NULL)
-
-AM_CFLAGS = \
-       -Wall \
-       $(LIBOSMOCORE_CFLAGS) \
-       $(LIBOSMOGSM_CFLAGS) \
-       $(LIBOSMOVTY_CFLAGS) \
-       $(LIBOSMOABIS_CFLAGS) \
-       $(LIBOSMOSIGTRAN_CFLAGS) \
-       $(COVERAGE_CFLAGS) \
-       $(NULL)
-
-noinst_LIBRARIES = libcommon-cs.a
-
-libcommon_cs_a_SOURCES = \
-       common_cs.c \
-       common_cs_vty.c
diff --git a/src/libcommon-cs/common_cs.c b/src/libcommon-cs/common_cs.c
deleted file mode 100644
index 9307f63..0000000
--- a/src/libcommon-cs/common_cs.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Code used by both libbsc and libmsc (common_cs means "BSC or MSC").
- *
- * (C) 2016 by sysmocom s.m.f.c. <i...@sysmocom.de>
- * (C) 2008-2010 by Harald Welte <lafo...@gnumonks.org>
- * (C) 2014 by Holger Hans Peter Freyther
- * All Rights Reserved
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <stdbool.h>
-
-#include <osmocom/gsm/gsm0480.h>
-#include <osmocom/gsm/gsm48.h>
-
-#include <osmocom/bsc/common_cs.h>
-#include <osmocom/bsc/gsm_data.h>
-#include <osmocom/bsc/gsm_data.h>
-#include <osmocom/bsc/gsm_04_08_utils.h>
-
diff --git a/src/libcommon-cs/common_cs_vty.c b/src/libcommon-cs/common_cs_vty.c
deleted file mode 100644
index 684c55f..0000000
--- a/src/libcommon-cs/common_cs_vty.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Code used by both libbsc and libmsc (common_cs means "BSC or MSC").
- *
- * (C) 2016 by sysmocom s.m.f.c. <i...@sysmocom.de>
- * (C) 2008-2010 by Harald Welte <lafo...@gnumonks.org>
- * All Rights Reserved
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <osmocom/core/utils.h>
-
-#include <osmocom/vty/command.h>
-#include <osmocom/vty/logging.h>
-#include <osmocom/vty/stats.h>
-
-#include <osmocom/bsc/vty.h>
-
-#include <osmocom/bsc/gsm_data.h>
-
diff --git a/src/osmo-bsc/Makefile.am b/src/osmo-bsc/Makefile.am
index 50f9c78..3019470 100644
--- a/src/osmo-bsc/Makefile.am
+++ b/src/osmo-bsc/Makefile.am
@@ -42,7 +42,6 @@
 osmo_bsc_LDADD = \
        $(top_builddir)/src/libfilter/libfilter.a \
        $(top_builddir)/src/libbsc/libbsc.a \
-       $(top_builddir)/src/libcommon-cs/libcommon-cs.a \
        $(LIBOSMOCORE_LIBS) \
        $(LIBOSMOGSM_LIBS) \
        $(LIBOSMOVTY_LIBS) \
diff --git a/src/osmo-bsc/osmo_bsc_filter.c b/src/osmo-bsc/osmo_bsc_filter.c
index 78b2c05..5399b7a 100644
--- a/src/osmo-bsc/osmo_bsc_filter.c
+++ b/src/osmo-bsc/osmo_bsc_filter.c
@@ -26,6 +26,7 @@
 #include <osmocom/bsc/bsc_subscriber.h>
 #include <osmocom/bsc/debug.h>
 #include <osmocom/bsc/paging.h>
+#include <osmocom/bsc/gsm_04_08_utils.h>
 
 #include <stdlib.h>
 
diff --git a/src/osmo-bsc_nat/Makefile.am b/src/osmo-bsc_nat/Makefile.am
index 83ef850..2675651 100644
--- a/src/osmo-bsc_nat/Makefile.am
+++ b/src/osmo-bsc_nat/Makefile.am
@@ -40,7 +40,6 @@
 osmo_bsc_nat_LDADD = \
        $(top_builddir)/src/libfilter/libfilter.a \
        $(top_builddir)/src/libbsc/libbsc.a \
-       $(top_builddir)/src/libcommon-cs/libcommon-cs.a \
        $(LIBOSMOSCCP_LIBS) \
        $(LIBOSMOCORE_LIBS) \
        $(LIBOSMOGSM_LIBS) \
diff --git a/src/osmo-bsc_nat/bsc_nat.c b/src/osmo-bsc_nat/bsc_nat.c
index cf67d9b..a5dbf97 100644
--- a/src/osmo-bsc_nat/bsc_nat.c
+++ b/src/osmo-bsc_nat/bsc_nat.c
@@ -47,6 +47,7 @@
 #include <osmocom/bsc/ipaccess.h>
 #include <osmocom/bsc/abis_nm.h>
 #include <osmocom/bsc/vty.h>
+#include <osmocom/bsc/gsm_04_08_utils.h>
 
 #include <osmocom/ctrl/control_cmd.h>
 #include <osmocom/ctrl/control_if.h>
diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
index 354f2b2..983a3bb 100644
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am
@@ -48,7 +48,6 @@
 
 bs11_config_LDADD = \
        $(top_builddir)/src/libbsc/libbsc.a \
-       $(top_builddir)/src/libcommon-cs/libcommon-cs.a \
        $(LIBOSMOCORE_LIBS) \
        $(LIBOSMOGSM_LIBS) \
        $(LIBOSMOABIS_LIBS) \
diff --git a/tests/abis/Makefile.am b/tests/abis/Makefile.am
index 1e982af..8dc829f 100644
--- a/tests/abis/Makefile.am
+++ b/tests/abis/Makefile.am
@@ -26,7 +26,6 @@
 
 abis_test_LDADD = \
        $(top_builddir)/src/libbsc/libbsc.a \
-       $(top_builddir)/src/libcommon-cs/libcommon-cs.a \
        $(LIBOSMOCORE_LIBS) \
        $(LIBOSMOABIS_LIBS) \
        $(LIBOSMOGSM_LIBS) \
diff --git a/tests/bsc-nat/Makefile.am b/tests/bsc-nat/Makefile.am
index 4231cb4..c2ed6e4 100644
--- a/tests/bsc-nat/Makefile.am
+++ b/tests/bsc-nat/Makefile.am
@@ -45,7 +45,6 @@
 bsc_nat_test_LDADD = \
        $(top_builddir)/src/libfilter/libfilter.a \
        $(top_builddir)/src/libbsc/libbsc.a \
-       $(top_builddir)/src/libcommon-cs/libcommon-cs.a \
        $(LIBOSMOCORE_LIBS) \
        $(LIBOSMOGSM_LIBS) \
        $(LIBOSMOSCCP_LIBS) \
diff --git a/tests/bsc/Makefile.am b/tests/bsc/Makefile.am
index 70a788e..a436c27 100644
--- a/tests/bsc/Makefile.am
+++ b/tests/bsc/Makefile.am
@@ -33,7 +33,6 @@
 
 bsc_test_LDADD = \
        $(top_builddir)/src/libbsc/libbsc.a \
-       $(top_builddir)/src/libcommon-cs/libcommon-cs.a \
        $(LIBOSMOCORE_LIBS) \
        $(LIBOSMOGSM_LIBS) \
        $(LIBOSMOVTY_LIBS) \
diff --git a/tests/bssap/Makefile.am b/tests/bssap/Makefile.am
index 697a215..e4fe38b 100644
--- a/tests/bssap/Makefile.am
+++ b/tests/bssap/Makefile.am
@@ -34,7 +34,6 @@
 
 bssap_test_LDADD = \
        $(top_builddir)/src/libbsc/libbsc.a \
-       $(top_builddir)/src/libcommon-cs/libcommon-cs.a \
        $(LIBOSMOCORE_LIBS) \
        $(LIBOSMOGSM_LIBS) \
        $(LIBOSMOABIS_LIBS) \
diff --git a/tests/channel/Makefile.am b/tests/channel/Makefile.am
index a3c3159..f641f60 100644
--- a/tests/channel/Makefile.am
+++ b/tests/channel/Makefile.am
@@ -25,7 +25,6 @@
 
 channel_test_LDADD = \
        $(top_builddir)/src/libbsc/libbsc.a \
-       $(top_builddir)/src/libcommon-cs/libcommon-cs.a \
        $(LIBOSMOCORE_LIBS) \
        $(LIBOSMOGSM_LIBS) \
        $(LIBOSMOABIS_LIBS) \
diff --git a/tests/gsm0408/Makefile.am b/tests/gsm0408/Makefile.am
index eeb0d3c..9a74d44 100644
--- a/tests/gsm0408/Makefile.am
+++ b/tests/gsm0408/Makefile.am
@@ -24,7 +24,6 @@
 
 gsm0408_test_LDADD = \
        $(top_builddir)/src/libbsc/libbsc.a \
-       $(top_builddir)/src/libcommon-cs/libcommon-cs.a \
        $(LIBOSMOCORE_LIBS) \
        $(LIBOSMOGSM_LIBS) \
        $(LIBOSMOABIS_LIBS) \
diff --git a/tests/nanobts_omlattr/Makefile.am 
b/tests/nanobts_omlattr/Makefile.am
index 2d77542..c2b2c3b 100644
--- a/tests/nanobts_omlattr/Makefile.am
+++ b/tests/nanobts_omlattr/Makefile.am
@@ -24,7 +24,6 @@
 
 nanobts_omlattr_test_LDADD = \
        $(top_builddir)/src/libbsc/libbsc.a \
-       $(top_builddir)/src/libcommon-cs/libcommon-cs.a \
        $(LIBOSMOCORE_LIBS) \
        $(LIBOSMOGSM_LIBS) \
        $(LIBOSMOABIS_LIBS) \
diff --git a/tests/subscr/Makefile.am b/tests/subscr/Makefile.am
index 3c00043..8d14ebf 100644
--- a/tests/subscr/Makefile.am
+++ b/tests/subscr/Makefile.am
@@ -32,7 +32,6 @@
 
 bsc_subscr_test_LDADD = \
        $(top_builddir)/src/libbsc/libbsc.a \
-       $(top_builddir)/src/libcommon-cs/libcommon-cs.a \
        $(LIBOSMOCORE_LIBS) \
        $(LIBOSMOABIS_LIBS) \
        $(LIBOSMOGSM_LIBS) \

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I07d4a48af3154ee4d904686f230a51b8b8a94ff9
Gerrit-PatchSet: 4
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofm...@sysmocom.de>
Gerrit-Reviewer: Harald Welte <lafo...@gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr <nhofm...@sysmocom.de>

Reply via email to