From a3d0438ff7b7b8b927e8a2d579c557c1fb3a844c Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sat, 27 Dec 2008 17:02:56 +0000 Subject: [PATCH] missing header file changes --- include/openbsc/debug.h | 1 + include/openbsc/gsm_data.h | 46 ++++++++++++++++++++++---------------- 2 files changed, 28 insertions(+), 19 deletions(-) diff --git a/include/openbsc/debug.h b/include/openbsc/debug.h index 018a11657..6fea58794 100644 --- a/include/openbsc/debug.h +++ b/include/openbsc/debug.h @@ -10,6 +10,7 @@ #define DRSL 0x0010 #define DNM 0x0020 #define DMI 0x1000 +#define DMIB 0x2000 #ifdef DEBUG #define DEBUGP(ss, fmt, args...) debugp(ss, __FILE__, __LINE__, fmt, ## args) diff --git a/include/openbsc/gsm_data.h b/include/openbsc/gsm_data.h index 75de2e72f..8a04b7b9e 100644 --- a/include/openbsc/gsm_data.h +++ b/include/openbsc/gsm_data.h @@ -16,6 +16,30 @@ struct gsm_bts_link { struct gsm_bts *bts; }; +enum gsm_call_type { + GSM_CT_NONE, + GSM_CT_MO, + GSM_CT_MT, +}; + +enum gsm_call_state { + GSM_CSTATE_NULL, + GSM_CSTATE_INITIATED, + GSM_CSTATE_ACTIVE, + GSM_CSTATE_RELEASE_REQ, +}; + +/* One end of a call */ +struct gsm_call { + enum gsm_call_type type; + enum gsm_call_state state; + u_int8_t transaction_id; /* 10.3.2 */ + + /* the 'local' subscriber */ + struct gsm_subscriber *subscr; +}; + + enum gsm_phys_chan_config { GSM_PCHAN_NONE, GSM_PCHAN_CCCH, @@ -43,6 +67,9 @@ struct gsm_lchan { enum gsm_chan_t type; /* To whom we are allocated at the moment */ struct gsm_subscriber *subscr; + + /* local end of a call, if any */ + struct gsm_call call; }; #define BTS_TRX_F_ACTIVATED 0x0001 @@ -108,25 +135,6 @@ struct gsm_network { struct gsm_network *gsm_network_init(unsigned int num_bts, u_int8_t country_code, u_int8_t network_code); -enum gsm_call_type { - GSM_CT_NONE, - GSM_CT_MO, - GSM_CT_MT, -}; - -enum gsm_call_state { - GSM_CSTATE_NONE, -}; - -/* One end of a call */ -struct gsm_call { - enum gsm_call_type type; - enum gsm_call_state state; - - /* the 'local' subscriber */ - struct gsm_subscriber *subscr; -}; - enum gsm_e1_event { EVT_E1_NONE, EVT_E1_OML_UP,