aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am1
-rw-r--r--src/ipaccess/Makefile.am1
-rw-r--r--src/libbsc/Makefile.am2
-rw-r--r--src/libbsc/bsc_vty.c1
-rw-r--r--src/libbsc/net_init.c1
-rw-r--r--src/libcommon-cs/Makefile.am21
-rw-r--r--src/libcommon-cs/common_cs.c32
-rw-r--r--src/libcommon-cs/common_cs_vty.c31
-rw-r--r--src/osmo-bsc/Makefile.am1
-rw-r--r--src/osmo-bsc/osmo_bsc_filter.c1
-rw-r--r--src/osmo-bsc_nat/Makefile.am1
-rw-r--r--src/osmo-bsc_nat/bsc_nat.c1
-rw-r--r--src/utils/Makefile.am1
13 files changed, 2 insertions, 93 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 28b070ea4..fc9bf8e1a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,7 +21,6 @@ AM_LDFLAGS = \
# Libraries
SUBDIRS = \
- libcommon-cs \
libbsc \
libfilter \
$(NULL)
diff --git a/src/ipaccess/Makefile.am b/src/ipaccess/Makefile.am
index 0301d3ab1..a6195b9c7 100644
--- a/src/ipaccess/Makefile.am
+++ b/src/ipaccess/Makefile.am
@@ -46,7 +46,6 @@ ipaccess_config_SOURCES = \
# 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 e68ada8c4..e8e69c7a4 100644
--- a/src/libbsc/Makefile.am
+++ b/src/libbsc/Makefile.am
@@ -19,8 +19,6 @@ noinst_LIBRARIES = \
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 1407061ac..f1cbb5402 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 c5c7c5e97..90f668f2c 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 e54950937..000000000
--- 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 9307f6359..000000000
--- 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. <info@sysmocom.de>
- * (C) 2008-2010 by Harald Welte <laforge@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 684c55f88..000000000
--- 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. <info@sysmocom.de>
- * (C) 2008-2010 by Harald Welte <laforge@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 50f9c7847..3019470d3 100644
--- a/src/osmo-bsc/Makefile.am
+++ b/src/osmo-bsc/Makefile.am
@@ -42,7 +42,6 @@ osmo_bsc_SOURCES = \
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 78b2c0516..5399b7aee 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 83ef85064..267565147 100644
--- a/src/osmo-bsc_nat/Makefile.am
+++ b/src/osmo-bsc_nat/Makefile.am
@@ -40,7 +40,6 @@ osmo_bsc_nat_SOURCES = \
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 cf67d9bc9..a5dbf9716 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 354f2b28c..983a3bb04 100644
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am
@@ -48,7 +48,6 @@ bs11_config_SOURCES = \
bs11_config_LDADD = \
$(top_builddir)/src/libbsc/libbsc.a \
- $(top_builddir)/src/libcommon-cs/libcommon-cs.a \
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOGSM_LIBS) \
$(LIBOSMOABIS_LIBS) \
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 03:32:50 +0000