missing header file changes
diff --git a/include/openbsc/debug.h b/include/openbsc/debug.h
index 018a116..6fea587 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 75de2e7..8a04b7b 100644
--- a/include/openbsc/gsm_data.h
+++ b/include/openbsc/gsm_data.h
@@ -16,6 +16,30 @@
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 @@
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 *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,