Massive removal of unused code/structs/headers

osmo-msc still had large amounts of dead code that came along from
openbsc.git.  This commit removes a lot of it, mostly stuff relevant
only to the BSC side of things (or even GPRS).

Change-Id: I247def85da2dc3ec461389fb74414a0d964e7e3c
Related: OS#2528

11 files changed, 3 insertions, 23 deletions

diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c
index 956bc4416..7afd0c78f 100644
--- a/src/libmsc/gsm_04_08.c
+++ b/src/libmsc/gsm_04_08.c
@@ -43,18 +43,12 @@
 #include <osmocom/msc/gsm_04_08.h>
 #include <osmocom/msc/gsm_04_80.h>
 #include <osmocom/msc/gsm_04_14.h>
-#include <osmocom/msc/abis_rsl.h>
-#include <osmocom/msc/chan_alloc.h>
 #include <osmocom/msc/signal.h>
-#include <osmocom/abis/trau_frame.h>
-#include <osmocom/msc/trau_mux.h>
-#include <osmocom/msc/rtp_proxy.h>
 #include <osmocom/msc/transaction.h>
 #include <osmocom/msc/ussd.h>
 #include <osmocom/msc/silent_call.h>
 #include <osmocom/msc/bsc_api.h>
 #include <osmocom/msc/osmo_msc.h>
-#include <osmocom/msc/handover.h>
 #include <osmocom/msc/mncc_int.h>
 #include <osmocom/abis/e1_input.h>
 #include <osmocom/core/bitvec.h>
diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c
index d8d77e9bc..e67531ec3 100644
--- a/src/libmsc/gsm_04_11.c
+++ b/src/libmsc/gsm_04_11.c
@@ -48,12 +48,10 @@
 #include <osmocom/msc/db.h>
 #include <osmocom/msc/gsm_subscriber.h>
 #include <osmocom/msc/gsm_04_08.h>
-#include <osmocom/msc/abis_rsl.h>
 #include <osmocom/msc/signal.h>
 #include <osmocom/msc/db.h>
 #include <osmocom/msc/transaction.h>
 #include <osmocom/msc/bsc_rll.h>
-#include <osmocom/msc/chan_alloc.h>
 #include <osmocom/msc/msc_ifaces.h>
 #include <osmocom/msc/osmo_msc.h>
 #include <osmocom/msc/vlr.h>
@@ -352,7 +350,7 @@ static int sms_route_mt_sms(struct gsm_subscriber_connection *conn,
 			     vlr_subscr_name(conn->vsub), rc);
 	 		rc = GSM411_RP_CAUSE_MO_TEMP_FAIL;
 			/* rc will be logged by gsm411_send_rp_error() */
-	 		rate_ctr_inc(&conn->bts->network->msc_ctrs->ctr[
+			rate_ctr_inc(&conn->network->msc_ctrs->ctr[
 					MSC_CTR_SMS_DELIVER_UNKNOWN_ERROR]);
 		}
 		return rc;
@@ -380,7 +378,7 @@ try_local:
 			     vlr_subscr_name(conn->vsub), rc);
 	 		rc = GSM411_RP_CAUSE_MO_TEMP_FAIL;
 			/* rc will be logged by gsm411_send_rp_error() */
-	 		rate_ctr_inc(&conn->bts->network->msc_ctrs->ctr[
+			rate_ctr_inc(&conn->network->msc_ctrs->ctr[
 					MSC_CTR_SMS_DELIVER_UNKNOWN_ERROR]);
 		}
 #else
diff --git a/src/libmsc/gsm_04_14.c b/src/libmsc/gsm_04_14.c
index 5f495740e..6d75bba7f 100644
--- a/src/libmsc/gsm_04_14.c
+++ b/src/libmsc/gsm_04_14.c
@@ -75,7 +75,6 @@ int gsm0414_tx_close_tch_loop_cmd(struct gsm_subscriber_connection *conn,
 	subch = (loop_mode << 1);
 	msgb_put_u8(msg, subch);
 
-	msg->lchan = conn->lchan;
 	return gsm0414_conn_sendmsg(conn, msg);
 }
 
diff --git a/src/libmsc/gsm_subscriber.c b/src/libmsc/gsm_subscriber.c
index 4838027c3..fb612090b 100644
--- a/src/libmsc/gsm_subscriber.c
+++ b/src/libmsc/gsm_subscriber.c
@@ -45,7 +45,6 @@
 #include <osmocom/msc/debug.h>
 #include <osmocom/msc/signal.h>
 #include <osmocom/msc/db.h>
-#include <osmocom/msc/chan_alloc.h>
 #include <osmocom/msc/vlr.h>
 #include <osmocom/msc/osmo_msc.h>
 #include <osmocom/msc/msc_ifaces.h>
diff --git a/src/libmsc/mncc.c b/src/libmsc/mncc.c
index 3b4c41d95..d2cd170a8 100644
--- a/src/libmsc/mncc.c
+++ b/src/libmsc/mncc.c
@@ -34,7 +34,6 @@
 #include <osmocom/msc/mncc.h>
 #include <osmocom/msc/gsm_data.h>
 #include <osmocom/msc/transaction.h>
-#include <osmocom/msc/rtp_proxy.h>
 
 
 static const struct value_string mncc_names[] = {
diff --git a/src/libmsc/mncc_builtin.c b/src/libmsc/mncc_builtin.c
index 84623dffb..d6f3e3d65 100644
--- a/src/libmsc/mncc_builtin.c
+++ b/src/libmsc/mncc_builtin.c
@@ -34,7 +34,6 @@
 #include <osmocom/core/talloc.h>
 #include <osmocom/msc/gsm_data.h>
 #include <osmocom/msc/transaction.h>
-#include <osmocom/msc/rtp_proxy.h>
 
 void *tall_call_ctx;
 
diff --git a/src/libmsc/rrlp.c b/src/libmsc/rrlp.c
index 742889341..9cc6b04bc 100644
--- a/src/libmsc/rrlp.c
+++ b/src/libmsc/rrlp.c
@@ -24,7 +24,6 @@
 #include <osmocom/msc/gsm_04_08.h>
 #include <osmocom/msc/signal.h>
 #include <osmocom/msc/gsm_subscriber.h>
-#include <osmocom/msc/chan_alloc.h>
 
 /* RRLP msPositionReq, nsBased,
  *	Accuracy=60, Method=gps, ResponseTime=2, oneSet */
diff --git a/src/libmsc/silent_call.c b/src/libmsc/silent_call.c
index d715d5c32..f3291d77f 100644
--- a/src/libmsc/silent_call.c
+++ b/src/libmsc/silent_call.c
@@ -29,8 +29,6 @@
 #include <osmocom/msc/debug.h>
 #include <osmocom/msc/gsm_data.h>
 #include <osmocom/msc/gsm_subscriber.h>
-#include <osmocom/msc/abis_rsl.h>
-#include <osmocom/msc/chan_alloc.h>
 #include <osmocom/msc/osmo_msc.h>
 
 /* paging of the requested subscriber has completed */
diff --git a/src/libmsc/smpp_openbsc.c b/src/libmsc/smpp_openbsc.c
index 3ea5ddd88..4e2fb556a 100644
--- a/src/libmsc/smpp_openbsc.c
+++ b/src/libmsc/smpp_openbsc.c
@@ -44,7 +44,6 @@
 #include <osmocom/msc/signal.h>
 #include <osmocom/msc/transaction.h>
 #include <osmocom/msc/gsm_subscriber.h>
-#include <osmocom/msc/chan_alloc.h>
 #include <osmocom/msc/vlr.h>
 
 #include "smpp_smsc.h"
diff --git a/src/libmsc/sms_queue.c b/src/libmsc/sms_queue.c
index 1372a2cef..3d39a0edc 100644
--- a/src/libmsc/sms_queue.c
+++ b/src/libmsc/sms_queue.c
@@ -31,7 +31,6 @@
 #include <limits.h>
 
 #include <osmocom/msc/sms_queue.h>
-#include <osmocom/msc/chan_alloc.h>
 #include <osmocom/msc/db.h>
 #include <osmocom/msc/debug.h>
 #include <osmocom/msc/gsm_data.h>
diff --git a/src/libmsc/vty_interface_layer3.c b/src/libmsc/vty_interface_layer3.c
index dbd826db2..f8fc09882 100644
--- a/src/libmsc/vty_interface_layer3.c
+++ b/src/libmsc/vty_interface_layer3.c
@@ -35,8 +35,6 @@
 #include <osmocom/msc/gsm_subscriber.h>
 #include <osmocom/msc/silent_call.h>
 #include <osmocom/msc/gsm_04_11.h>
-#include <osmocom/abis/e1_input.h>
-#include <osmocom/msc/abis_nm.h>
 #include <osmocom/gsm/gsm_utils.h>
 #include <osmocom/core/utils.h>
 #include <osmocom/msc/db.h>
@@ -46,10 +44,9 @@
 #include <osmocom/msc/vty.h>
 #include <osmocom/msc/gsm_04_80.h>
 #include <osmocom/msc/gsm_04_14.h>
-#include <osmocom/msc/chan_alloc.h>
+#include <osmocom/gsm/protocol/gsm_08_58.h>
 #include <osmocom/msc/sms_queue.h>
 #include <osmocom/msc/mncc_int.h>
-#include <osmocom/msc/handover.h>
 #include <osmocom/msc/vlr.h>
 
 #include <osmocom/vty/logging.h>