Max has submitted this change and it was merged. ( https://gerrit.osmocom.org/11816 )
Change subject: mobile: add header for MS' MNCC functions ...................................................................... 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 --- M src/host/layer23/include/osmocom/bb/mobile/Makefile.am A src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h M src/host/layer23/src/mobile/mnccms.c M src/host/layer23/src/mobile/vty_interface.c 4 files changed, 12 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified Vadim Yanitskiy: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/src/host/layer23/include/osmocom/bb/mobile/Makefile.am b/src/host/layer23/include/osmocom/bb/mobile/Makefile.am index 12cf24b..8e4be1a 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 0000000..49ce1a4 --- /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 9be9c8f..9f58112 100644 --- a/src/host/layer23/src/mobile/mnccms.c +++ b/src/host/layer23/src/mobile/mnccms.c @@ -30,15 +30,14 @@ #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/osmocom_data.h> #include <osmocom/bb/mobile/mncc.h> +#include <osmocom/bb/mobile/mncc_ms.h> #include <osmocom/bb/mobile/vty.h> 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 12c32a5..a0ad993 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -35,6 +35,7 @@ #include <osmocom/bb/common/networks.h> #include <osmocom/bb/common/gps.h> #include <osmocom/bb/mobile/mncc.h> +#include <osmocom/bb/mobile/mncc_ms.h> #include <osmocom/bb/mobile/transaction.h> #include <osmocom/bb/mobile/vty.h> #include <osmocom/bb/mobile/app_mobile.h> @@ -43,13 +44,6 @@ #include <osmocom/vty/telnet_interface.h> #include <osmocom/vty/misc.h> -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; -- To view, visit https://gerrit.osmocom.org/11816 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibad400a99afe052f011f54fc706836b6bf89f4b9 Gerrit-Change-Number: 11816 Gerrit-PatchSet: 1 Gerrit-Owner: Max <msur...@sysmocom.de> Gerrit-Reviewer: Harald Welte <lafo...@gnumonks.org> Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Max <msur...@sysmocom.de> Gerrit-Reviewer: Vadim Yanitskiy <axilira...@gmail.com>