From aa4dbe2b8e2d9ddddd47798b614e058f99d06582 Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 16 Nov 2018 21:28:23 +0100 Subject: mobile: add header for MS' MNCC functions This simplifies adding new functions and re-using them from other parts of the code. Change-Id: Ibad400a99afe052f011f54fc706836b6bf89f4b9 --- src/host/layer23/include/osmocom/bb/mobile/Makefile.am | 2 +- src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h | 9 +++++++++ src/host/layer23/src/mobile/mnccms.c | 3 +-- src/host/layer23/src/mobile/vty_interface.c | 8 +------- 4 files changed, 12 insertions(+), 10 deletions(-) create mode 100644 src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h (limited to 'src') diff --git a/src/host/layer23/include/osmocom/bb/mobile/Makefile.am b/src/host/layer23/include/osmocom/bb/mobile/Makefile.am index 12cf24b0..8e4be1ac 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/Makefile.am +++ b/src/host/layer23/include/osmocom/bb/mobile/Makefile.am @@ -1,3 +1,3 @@ noinst_HEADERS = gsm322.h gsm480_ss.h gsm411_sms.h gsm48_cc.h gsm48_mm.h \ gsm48_rr.h mncc.h settings.h subscriber.h support.h \ - transaction.h vty.h mncc_sock.h primitives.h + transaction.h vty.h mncc_sock.h mncc_ms.h primitives.h diff --git a/src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h b/src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h new file mode 100644 index 00000000..49ce1a42 --- /dev/null +++ b/src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h @@ -0,0 +1,9 @@ +#pragma once + +int mncc_call(struct osmocom_ms *ms, char *number); +int mncc_hangup(struct osmocom_ms *ms); +int mncc_answer(struct osmocom_ms *ms); +int mncc_hold(struct osmocom_ms *ms); +int mncc_retrieve(struct osmocom_ms *ms, int number); +int mncc_dtmf(struct osmocom_ms *ms, char *dtmf); + diff --git a/src/host/layer23/src/mobile/mnccms.c b/src/host/layer23/src/mobile/mnccms.c index 9be9c8fe..9f581123 100644 --- a/src/host/layer23/src/mobile/mnccms.c +++ b/src/host/layer23/src/mobile/mnccms.c @@ -30,15 +30,14 @@ #include #include #include +#include #include static uint32_t new_callref = 1; static LLIST_HEAD(call_list); -void mncc_set_cause(struct gsm_mncc *data, int loc, int val); static int dtmf_statemachine(struct gsm_call *call, struct gsm_mncc *mncc); static void timeout_dtmf(void *arg); -int mncc_answer(struct osmocom_ms *ms); /* * support functions diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index 12c32a53..a0ad9937 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -43,13 +44,6 @@ #include #include -int mncc_call(struct osmocom_ms *ms, char *number); -int mncc_hangup(struct osmocom_ms *ms); -int mncc_answer(struct osmocom_ms *ms); -int mncc_hold(struct osmocom_ms *ms); -int mncc_retrieve(struct osmocom_ms *ms, int number); -int mncc_dtmf(struct osmocom_ms *ms, char *dtmf); - extern struct llist_head ms_list; extern struct llist_head active_connections; -- cgit v1.2.3