combine several small .h in msc_common.h

For hysterical raisins, there are some header files that contain few
declarations, and where the name doesn't reflect the content. Combine them to
new msc_common.h:

- common.h
- common_cs.h
- osmo_msc.h

Change-Id: I9e3a587342f8d398fb27354a2f2475f8797cdb28

6 files changed, 13 insertions, 25 deletions

diff --git a/include/osmocom/msc/Makefile.am b/include/osmocom/msc/Makefile.am
index 9fa58c7a6..d98bc9cb5 100644
--- a/include/osmocom/msc/Makefile.am
+++ b/include/osmocom/msc/Makefile.am
@@ -1,8 +1,6 @@
 noinst_HEADERS = \
 	a_iface.h \
 	a_iface_bssap.h \
-	common.h \
-	common_cs.h \
 	db.h \
 	debug.h \
 	gsm_04_08.h \
@@ -18,10 +16,10 @@ noinst_HEADERS = \
 	iu_dummy.h \
 	mncc.h \
 	mncc_int.h \
+	msc_common.h \
 	msc_ifaces.h \
 	msc_mgcp.h \
 	a_reset.h \
-	osmo_msc.h \
 	ran_conn.h \
 	rrlp.h \
 	signal.h \
diff --git a/include/osmocom/msc/common.h b/include/osmocom/msc/common.h
deleted file mode 100644
index d91b3d39e..000000000
--- a/include/osmocom/msc/common.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-enum nsap_addr_enc {
-	NSAP_ADDR_ENC_X213,
-	NSAP_ADDR_ENC_V4RAW,
-};
diff --git a/include/osmocom/msc/common_cs.h b/include/osmocom/msc/common_cs.h
deleted file mode 100644
index 097d3b157..000000000
--- a/include/osmocom/msc/common_cs.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-
-struct msgb;
-struct gsm_network;
-
-typedef int (*mncc_recv_cb_t)(struct gsm_network *, struct msgb *);
-
-struct gsm_network *gsm_network_init(void *ctx, mncc_recv_cb_t mncc_recv);
diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h
index 35ec752cd..3ffa100a2 100644
--- a/include/osmocom/msc/gsm_data.h
+++ b/include/osmocom/msc/gsm_data.h
@@ -13,10 +13,10 @@
 #include <osmocom/gsm/gsm48.h>
 #include <osmocom/crypt/auth.h>
 
-#include <osmocom/msc/common.h>
-#include <osmocom/msc/common_cs.h>
 #include <osmocom/mgcp_client/mgcp_client.h>
 
+#include <osmocom/msc/msc_common.h>
+
 #include "gsm_data_shared.h"
 
 /* TS 48.008 DLCI containing DCCH/ACCH + SAPI */
diff --git a/include/osmocom/msc/gsm_data_shared.h b/include/osmocom/msc/gsm_data_shared.h
index f71e92b63..732607bc1 100644
--- a/include/osmocom/msc/gsm_data_shared.h
+++ b/include/osmocom/msc/gsm_data_shared.h
@@ -12,8 +12,6 @@
 #include <osmocom/gsm/tlv.h>
 #include <osmocom/gsm/protocol/gsm_04_08.h>
 
-#include <osmocom/msc/common_cs.h>
-
 struct osmo_bsc_data;
 
 struct osmo_bsc_sccp_con;
diff --git a/include/osmocom/msc/osmo_msc.h b/include/osmocom/msc/msc_common.h
index 151201780..ffe8902e2 100644
--- a/include/osmocom/msc/osmo_msc.h
+++ b/include/osmocom/msc/msc_common.h
@@ -1,13 +1,21 @@
 #pragma once
 
-/* Routines for the MSC handling */
-
+struct msgb;
 struct gsm_network;
 struct vlr_subscr;
 
 #define MSC_HLR_REMOTE_IP_DEFAULT "127.0.0.1"
 #define MSC_HLR_REMOTE_PORT_DEFAULT OSMO_GSUP_PORT
 
+enum nsap_addr_enc {
+	NSAP_ADDR_ENC_X213,
+	NSAP_ADDR_ENC_V4RAW,
+};
+
+typedef int (*mncc_recv_cb_t)(struct gsm_network *, struct msgb *);
+
+struct gsm_network *gsm_network_init(void *ctx, mncc_recv_cb_t mncc_recv);
+
 int msc_vlr_alloc(struct gsm_network *net);
 int msc_vlr_start(struct gsm_network *net);