diff options
Diffstat (limited to 'openbsc/include/openbsc/gsm_data_shared.h')
| -rw-r--r-- | openbsc/include/openbsc/gsm_data_shared.h | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/openbsc/include/openbsc/gsm_data_shared.h b/openbsc/include/openbsc/gsm_data_shared.h index 8658fe717..5643d48e6 100644 --- a/openbsc/include/openbsc/gsm_data_shared.h +++ b/openbsc/include/openbsc/gsm_data_shared.h @@ -24,6 +24,8 @@ #include <osmocom/gsm/lapdm.h> #endif +#include <openbsc/xsc.h> + struct osmo_bsc_data; struct osmo_bsc_sccp_con; @@ -100,7 +102,6 @@ struct gsm_abis_mo { struct gsm_bts *bts; }; -#define MAX_A5_KEY_LEN (128/8) #define A38_XOR_MIN_KEY_LEN 12 #define A38_XOR_MAX_KEY_LEN 16 #define A38_COMP128_KEY_LEN 16 @@ -202,11 +203,7 @@ struct gsm_lchan { uint8_t bs_power; uint8_t ms_power; /* Encryption information */ - struct { - uint8_t alg_id; - uint8_t key_len; - uint8_t key[MAX_A5_KEY_LEN]; - } encr; + struct gsm_encr encr; /* AMR bits */ uint8_t mr_ms_lv[7]; @@ -351,7 +348,7 @@ struct gsm_bts_trx_ts { struct gsm_lchan lchan[TS_MAX_LCHAN]; }; -/* One TRX in a BTS */ +/* One TRX (transceiver) in a BTS */ struct gsm_bts_trx { /* list header in bts->trx_list */ struct llist_head list; @@ -609,14 +606,6 @@ struct gsm_bts { /* buffers where we put the pre-computed SI */ sysinfo_buf_t si_buf[_MAX_SYSINFO_TYPE]; - /* TimeZone hours, mins, and bts specific */ - struct { - int hr; - int mn; - int override; - int dst; - } tz; - /* ip.accesss Unit ID's have Site/BTS/TRX layout */ union { struct { |