fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34910?usp=email )

Change subject: mobile: move 'struct gsm_call' from <mncc.h> to <mncc_ms.h> ......................................................................

mobile: move 'struct gsm_call' from <mncc.h> to <mncc_ms.h>

The only file using this structure is mnccms.c.

Change-Id: Iaa43609849ac3c755d47258d3aca4bfe7a6b3a49 Related: OS#4396 --- M src/host/layer23/include/osmocom/bb/mobile/mncc.h M src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h 2 files changed, 38 insertions(+), 19 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/10/34910/1

diff --git a/src/host/layer23/include/osmocom/bb/mobile/mncc.h b/src/host/layer23/include/osmocom/bb/mobile/mncc.h index f587e1f..d6facbb 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/mncc.h +++ b/src/host/layer23/include/osmocom/bb/mobile/mncc.h @@ -21,27 +21,8 @@

#pragma once

-#include <osmocom/core/linuxlist.h> -#include <osmocom/core/timer.h> #include <osmocom/gsm/mncc.h>

-struct gsm_call { - struct llist_head entry; - - struct osmocom_ms *ms; - - uint32_t callref; - - bool init; /* call initiated, no response yet */ - bool hold; /* call on hold */ - bool ring; /* call ringing/knocking */ - - struct osmo_timer_list dtmf_timer; - uint8_t dtmf_state; - uint8_t dtmf_index; - char dtmf[32]; /* dtmf sequence */ -}; - #define DTMF_ST_IDLE 0 /* no DTMF active */ #define DTMF_ST_START 1 /* DTMF started, waiting for resp. */ #define DTMF_ST_MARK 2 /* wait tone duration */ @@ -127,6 +108,8 @@ #define MNCC_F_KEYPAD 0x1000 #define MNCC_F_SIGNAL 0x2000

+struct osmocom_ms; + struct gsm_mncc { /* context based information */ uint32_t msg_type; diff --git a/src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h b/src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h index 705c681..4006688 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h +++ b/src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h @@ -1,5 +1,29 @@ #pragma once

+#include <stdint.h> + +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/timer.h> + +struct osmocom_ms; + +struct gsm_call { + struct llist_head entry; + + struct osmocom_ms *ms; + + uint32_t callref; + + bool init; /* call initiated, no response yet */ + bool hold; /* call on hold */ + bool ring; /* call ringing/knocking */ + + struct osmo_timer_list dtmf_timer; + uint8_t dtmf_state; + uint8_t dtmf_index; + char dtmf[32]; /* dtmf sequence */ +}; + int mncc_call(struct osmocom_ms *ms, const char *number); int mncc_hangup(struct osmocom_ms *ms); int mncc_answer(struct osmocom_ms *ms);