diff options
author | Harald Welte <laforge@gnumonks.org> | 2009-08-06 19:20:38 +0200 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2009-08-06 19:20:38 +0200 |
commit | b90288c8caba5cc77c26332650a5739ac9cf2e86 (patch) | |
tree | dd78038f9437c1875cf0fe38f074c975fc173c67 /openbsc/include/openbsc/gsm_data.h | |
parent | e211da49b98162cbf9653da7b80e30634f2b1637 (diff) | |
parent | 67ce073110b390997fd08c69b44c6b5d9f6a3cef (diff) |
Merge branch 'master' into proxyproxy
Diffstat (limited to 'openbsc/include/openbsc/gsm_data.h')
-rw-r--r-- | openbsc/include/openbsc/gsm_data.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/openbsc/include/openbsc/gsm_data.h b/openbsc/include/openbsc/gsm_data.h index 5eac8a7d1..700eb73fa 100644 --- a/openbsc/include/openbsc/gsm_data.h +++ b/openbsc/include/openbsc/gsm_data.h @@ -41,6 +41,7 @@ enum gsm_chreq_reason_t { #include <openbsc/timer.h> #include <openbsc/gsm_04_08.h> +#include <openbsc/abis_rsl.h> #include <openbsc/mncc.h> #include <openbsc/tlv.h> @@ -53,6 +54,11 @@ enum gsm_chreq_reason_t { #define HARDCODED_TSC 7 #define HARDCODED_BSIC 0x3f /* NCC = 7 / BCC = 7 */ +/* for multi-drop config */ +#define HARDCODED_BTS0_TS 1 +#define HARDCODED_BTS1_TS 6 +#define HARDCODED_BTS2_TS 11 + enum gsm_hooks { GSM_HOOK_NM_SWLOAD, GSM_HOOK_RR_PAGING, @@ -98,6 +104,7 @@ struct gsm_bts_link { struct gsm_lchan; struct gsm_subscriber; struct gsm_mncc; +struct rtp_socket; /* One transaction */ struct gsm_trans { @@ -164,8 +171,10 @@ struct gsm_lchan { u_int8_t nr; /* The logical channel type */ enum gsm_chan_t type; + /* RSL channel mode */ + enum rsl_cmod_spd rsl_cmode; /* If TCH, traffic channel mode */ - enum gsm_chan_t tch_mode; + enum gsm48_chan_mode tch_mode; /* Power levels for MS and BTS */ u_int8_t bs_power; u_int8_t ms_power; @@ -214,6 +223,7 @@ struct gsm_bts_trx_ts { u_int16_t bound_port; u_int8_t rtp_payload2; u_int16_t conn_id; + struct rtp_socket *rtp_socket; } abis_ip; struct gsm_lchan lchan[TS_MAX_LCHAN]; |