From f338a03b0cc85ca20bfe8e1ebe3b98e86bcef3c1 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Fri, 14 Jan 2011 15:55:42 +0100
Subject: [BSC] Move the BTS-type specific code from bcs_init.c to bts_*.c

bsc_init.c was a big mess even only for two supported BTS models,
so before adding more BTS types, this needs a cleanup.

All the BTS specific code from bsc_init.c has now moved into
bts_{siemens_bs11,ipaccess_nanobts}.c

This has required that input_event() and nm_state_event() get both
converted to proper libosmocore signals instead of referencing external
symbols.
---
 openbsc/tests/bsc-nat/bsc_nat_test.c | 8 --------
 openbsc/tests/channel/Makefile.am    | 1 +
 openbsc/tests/channel/channel_test.c | 3 +--
 openbsc/tests/db/db_test.c           | 2 --
 openbsc/tests/gsm0408/gsm0408_test.c | 8 --------
 5 files changed, 2 insertions(+), 20 deletions(-)

(limited to 'openbsc/tests')

diff --git a/openbsc/tests/bsc-nat/bsc_nat_test.c b/openbsc/tests/bsc-nat/bsc_nat_test.c
index a30c79641..05b06e40f 100644
--- a/openbsc/tests/bsc-nat/bsc_nat_test.c
+++ b/openbsc/tests/bsc-nat/bsc_nat_test.c
@@ -963,11 +963,3 @@ int main(int argc, char **argv)
 	test_setup_rewrite();
 	return 0;
 }
-
-void input_event()
-{}
-int nm_state_event()
-{
-	return -1;
-}
-
diff --git a/openbsc/tests/channel/Makefile.am b/openbsc/tests/channel/Makefile.am
index 772965953..8593b5a13 100644
--- a/openbsc/tests/channel/Makefile.am
+++ b/openbsc/tests/channel/Makefile.am
@@ -9,6 +9,7 @@ channel_test_SOURCES = channel_test.c \
 	$(top_srcdir)/src/gsm_subscriber.c \
 	$(top_srcdir)/src/debug.c \
 	$(top_srcdir)/src/gsm_data.c \
+	$(top_srcdir)/src/abis_nm.c \
 	$(top_srcdir)/src/bts_ipaccess_nanobts.c \
 	$(top_srcdir)/src/bts_siemens_bs11.c
 channel_test_LDADD = -ldl -ldbi $(LIBOSMOCORE_LIBS)
diff --git a/openbsc/tests/channel/channel_test.c b/openbsc/tests/channel/channel_test.c
index 84039970d..4f3c59335 100644
--- a/openbsc/tests/channel/channel_test.c
+++ b/openbsc/tests/channel/channel_test.c
@@ -72,8 +72,7 @@ int main(int argc, char **argv)
 	}
 }
 
-void nm_state_event() {}
-void input_event() {}
+void _abis_nm_sendmsg() {}
 void sms_alloc() {}
 void gsm_net_update_ctype(struct gsm_network *network) {}
 void gsm48_secure_channel() {}
diff --git a/openbsc/tests/db/db_test.c b/openbsc/tests/db/db_test.c
index eba72dfdc..236dc3747 100644
--- a/openbsc/tests/db/db_test.c
+++ b/openbsc/tests/db/db_test.c
@@ -102,6 +102,4 @@ int main() {
 }
 
 /* stubs */
-void input_event(void) {}
-void nm_state_event(void) {}
 void vty_out() {}
diff --git a/openbsc/tests/gsm0408/gsm0408_test.c b/openbsc/tests/gsm0408/gsm0408_test.c
index 6c99290bd..e8998c375 100644
--- a/openbsc/tests/gsm0408/gsm0408_test.c
+++ b/openbsc/tests/gsm0408/gsm0408_test.c
@@ -101,11 +101,3 @@ int main(int argc, char **argv)
 
 	exit(0);
 }
-
-
-
-/*
- * Stubs to compile and link
- */
-void input_event(void) {}
-void nm_state_event(void) {}
-- 
cgit v1.2.3