diff options
author | Neels Hofmeyr <neels@hofmeyr.de> | 2018-11-30 01:46:51 +0100 |
---|---|---|
committer | Neels Hofmeyr <neels@hofmeyr.de> | 2018-11-30 22:46:15 +0100 |
commit | 7992122bac66f28ce2d77ddcd7aef8416796deea (patch) | |
tree | 490bb3d8edba3f2801cf840c8d78fe810919d3e0 /src | |
parent | a8945ce37c23ba557b8b369943a5730b73c46604 (diff) |
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
Diffstat (limited to 'src')
-rw-r--r-- | src/libmsc/a_iface.c | 1 | ||||
-rw-r--r-- | src/libmsc/a_iface_bssap.c | 1 | ||||
-rw-r--r-- | src/libmsc/a_reset.c | 1 | ||||
-rw-r--r-- | src/libmsc/gsm_04_08.c | 1 | ||||
-rw-r--r-- | src/libmsc/gsm_04_08_cc.c | 1 | ||||
-rw-r--r-- | src/libmsc/gsm_04_11.c | 1 | ||||
-rw-r--r-- | src/libmsc/gsm_09_11.c | 1 | ||||
-rw-r--r-- | src/libmsc/gsm_subscriber.c | 1 | ||||
-rw-r--r-- | src/libmsc/iucs.c | 1 | ||||
-rw-r--r-- | src/libmsc/iucs_ranap.c | 1 | ||||
-rw-r--r-- | src/libmsc/msc_vty.c | 1 | ||||
-rw-r--r-- | src/libmsc/osmo_msc.c | 2 | ||||
-rw-r--r-- | src/libmsc/silent_call.c | 1 | ||||
-rw-r--r-- | src/libmsc/transaction.c | 1 | ||||
-rw-r--r-- | src/osmo-msc/msc_main.c | 1 |
15 files changed, 1 insertions, 15 deletions
diff --git a/src/libmsc/a_iface.c b/src/libmsc/a_iface.c index 82519d62d..66644eef2 100644 --- a/src/libmsc/a_iface.c +++ b/src/libmsc/a_iface.c @@ -39,7 +39,6 @@ #include <osmocom/core/byteswap.h> #include <osmocom/sccp/sccp_types.h> #include <osmocom/msc/a_reset.h> -#include <osmocom/msc/osmo_msc.h> #include <osmocom/msc/vlr.h> #include <errno.h> diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c index 4d03d2303..a10bd4296 100644 --- a/src/libmsc/a_iface_bssap.c +++ b/src/libmsc/a_iface_bssap.c @@ -31,7 +31,6 @@ #include <osmocom/msc/gsm_data.h> #include <osmocom/msc/a_iface_bssap.h> #include <osmocom/msc/a_iface.h> -#include <osmocom/msc/osmo_msc.h> #include <osmocom/core/byteswap.h> #include <osmocom/msc/a_reset.h> #include <osmocom/msc/transaction.h> diff --git a/src/libmsc/a_reset.c b/src/libmsc/a_reset.c index 1e35a108c..d6d4a1c5e 100644 --- a/src/libmsc/a_reset.c +++ b/src/libmsc/a_reset.c @@ -27,6 +27,7 @@ #include <string.h> #include <osmocom/msc/debug.h> #include <osmocom/msc/a_reset.h> +#include <osmocom/msc/msc_common.h> #define RESET_RESEND_INTERVAL 2 /* sec */ #define RESET_RESEND_TIMER_NO 16 /* See also 3GPP TS 48.008 Chapter 3.1.4.1.3.2 */ diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 97a632b64..38376d01b 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -46,7 +46,6 @@ #include <osmocom/msc/signal.h> #include <osmocom/msc/transaction.h> #include <osmocom/msc/silent_call.h> -#include <osmocom/msc/osmo_msc.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_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 8ac87c115..a172b4745 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -44,7 +44,6 @@ #include <osmocom/msc/signal.h> #include <osmocom/msc/transaction.h> #include <osmocom/msc/silent_call.h> -#include <osmocom/msc/osmo_msc.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 d01244392..62f3bbafd 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -52,7 +52,6 @@ #include <osmocom/msc/db.h> #include <osmocom/msc/transaction.h> #include <osmocom/msc/msc_ifaces.h> -#include <osmocom/msc/osmo_msc.h> #include <osmocom/msc/vlr.h> #ifdef BUILD_SMPP diff --git a/src/libmsc/gsm_09_11.c b/src/libmsc/gsm_09_11.c index c0a0bddf0..43bf48c56 100644 --- a/src/libmsc/gsm_09_11.c +++ b/src/libmsc/gsm_09_11.c @@ -42,7 +42,6 @@ #include <osmocom/msc/gsm_04_80.h> #include <osmocom/msc/gsm_subscriber.h> #include <osmocom/msc/debug.h> -#include <osmocom/msc/osmo_msc.h> #include <osmocom/msc/vlr.h> #include <osmocom/msc/gsm_04_08.h> #include <osmocom/msc/transaction.h> diff --git a/src/libmsc/gsm_subscriber.c b/src/libmsc/gsm_subscriber.c index a5bf74523..c3b8a95cb 100644 --- a/src/libmsc/gsm_subscriber.c +++ b/src/libmsc/gsm_subscriber.c @@ -46,7 +46,6 @@ #include <osmocom/msc/signal.h> #include <osmocom/msc/db.h> #include <osmocom/msc/vlr.h> -#include <osmocom/msc/osmo_msc.h> #include <osmocom/msc/msc_ifaces.h> #include <osmocom/msc/a_iface.h> diff --git a/src/libmsc/iucs.c b/src/libmsc/iucs.c index 1e4ab1958..a96b4c2fc 100644 --- a/src/libmsc/iucs.c +++ b/src/libmsc/iucs.c @@ -31,7 +31,6 @@ #include <osmocom/msc/gsm_data.h> #include <osmocom/msc/gsm_subscriber.h> #include <osmocom/msc/transaction.h> -#include <osmocom/msc/osmo_msc.h> #include <osmocom/msc/vlr.h> #include <osmocom/core/byteswap.h> diff --git a/src/libmsc/iucs_ranap.c b/src/libmsc/iucs_ranap.c index a6578575b..f1221c0dd 100644 --- a/src/libmsc/iucs_ranap.c +++ b/src/libmsc/iucs_ranap.c @@ -37,7 +37,6 @@ #include <osmocom/msc/iucs.h> #include <osmocom/msc/vlr.h> #include <osmocom/msc/iucs_ranap.h> -#include <osmocom/msc/osmo_msc.h> #include <osmocom/msc/msc_mgcp.h> #include <asn1c/asn1helpers.h> diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 589eca077..b63211734 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -43,7 +43,6 @@ #endif #include <osmocom/msc/vty.h> -#include <osmocom/msc/osmo_msc.h> #include <osmocom/msc/gsm_data.h> #include <osmocom/msc/gsm_subscriber.h> #include <osmocom/msc/vlr.h> diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c index 45dfd73f1..52277b75d 100644 --- a/src/libmsc/osmo_msc.c +++ b/src/libmsc/osmo_msc.c @@ -21,12 +21,10 @@ * */ -#include <osmocom/msc/osmo_msc.h> #include <osmocom/msc/debug.h> #include <osmocom/msc/transaction.h> #include <osmocom/msc/db.h> #include <osmocom/msc/vlr.h> -#include <osmocom/msc/osmo_msc.h> #include <osmocom/msc/a_iface.h> #include <osmocom/msc/gsm_04_08.h> #include <osmocom/msc/gsm_04_11.h> diff --git a/src/libmsc/silent_call.c b/src/libmsc/silent_call.c index c6c31a09e..b4fc15464 100644 --- a/src/libmsc/silent_call.c +++ b/src/libmsc/silent_call.c @@ -29,7 +29,6 @@ #include <osmocom/msc/debug.h> #include <osmocom/msc/gsm_data.h> #include <osmocom/msc/gsm_subscriber.h> -#include <osmocom/msc/osmo_msc.h> #include <osmocom/msc/vlr.h> /* paging of the requested subscriber has completed */ diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c index cf1206637..47124a03b 100644 --- a/src/libmsc/transaction.c +++ b/src/libmsc/transaction.c @@ -25,7 +25,6 @@ #include <osmocom/core/talloc.h> #include <osmocom/msc/gsm_04_08.h> #include <osmocom/msc/mncc.h> -#include <osmocom/msc/osmo_msc.h> #include <osmocom/msc/vlr.h> void *tall_trans_ctx; diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index a13904690..afab417d3 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -46,7 +46,6 @@ #include <osmocom/abis/e1_input.h> #include <osmocom/core/talloc.h> #include <osmocom/msc/signal.h> -#include <osmocom/msc/osmo_msc.h> #include <osmocom/msc/sms_queue.h> #include <osmocom/vty/telnet_interface.h> #include <osmocom/vty/ports.h> |