diff options
author | Harald Welte <laforge@gnumonks.org> | 2011-08-19 16:44:00 +0200 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2011-08-19 16:44:00 +0200 |
commit | 7fad70c19806701decd1c958ab8001bf07c5f16d (patch) | |
tree | 01da8827caa0ba518009149070e705ab91e9637f /openbsc/include | |
parent | 901d57db07d21f8e7d7f4b11421f63c44c2b2600 (diff) | |
parent | 013ae46ef67ee560aeaa38e39936a1ae7e35232f (diff) |
Merge branch 'master' of git.osmocom.org:openbsc
Diffstat (limited to 'openbsc/include')
-rw-r--r-- | openbsc/include/openbsc/abis_rsl.h | 7 | ||||
-rw-r--r-- | openbsc/include/openbsc/bss.h | 1 | ||||
-rw-r--r-- | openbsc/include/openbsc/e1_input.h | 10 | ||||
-rw-r--r-- | openbsc/include/openbsc/gsm_data_shared.h | 9 | ||||
-rw-r--r-- | openbsc/include/openbsc/signal.h | 1 |
5 files changed, 28 insertions, 0 deletions
diff --git a/openbsc/include/openbsc/abis_rsl.h b/openbsc/include/openbsc/abis_rsl.h index 3b4df90c0..bf1df5e0e 100644 --- a/openbsc/include/openbsc/abis_rsl.h +++ b/openbsc/include/openbsc/abis_rsl.h @@ -90,5 +90,12 @@ int rsl_chan_ms_power_ctrl(struct gsm_lchan *lchan, unsigned int fpc, int dbm); int rsl_sms_cb_command(struct gsm_bts *bts, uint8_t chan_number, uint8_t cb_command, const uint8_t *data, int len); +/* some Nokia specific stuff */ +int rsl_nokia_si_begin(struct gsm_bts_trx *trx); +int rsl_nokia_si_end(struct gsm_bts_trx *trx); + +/* required for Nokia BTS power control */ +int rsl_bs_power_control(struct gsm_bts_trx *trx, uint8_t channel, uint8_t reduction); + #endif /* RSL_MT_H */ diff --git a/openbsc/include/openbsc/bss.h b/openbsc/include/openbsc/bss.h index 05495ddcb..2317bd217 100644 --- a/openbsc/include/openbsc/bss.h +++ b/openbsc/include/openbsc/bss.h @@ -14,4 +14,5 @@ extern int bts_model_bs11_init(void); extern int bts_model_rbs2k_init(void); extern int bts_model_nanobts_init(void); extern int bts_model_hslfemto_init(void); +extern int bts_model_nokia_site_init(void); #endif diff --git a/openbsc/include/openbsc/e1_input.h b/openbsc/include/openbsc/e1_input.h index 0d79c7d1e..f201c4fb1 100644 --- a/openbsc/include/openbsc/e1_input.h +++ b/openbsc/include/openbsc/e1_input.h @@ -8,6 +8,7 @@ #include <openbsc/gsm_data.h> #include <osmocom/core/msgb.h> #include <osmocom/core/select.h> +#include <osmocom/core/rate_ctr.h> #include <openbsc/subchan_demux.h> #define NUM_E1_TS 32 @@ -19,6 +20,14 @@ enum e1inp_sign_type { }; const char *e1inp_signtype_name(enum e1inp_sign_type tp); +enum e1inp_ctr { + E1I_CTR_HDLC_ABORT, + E1I_CTR_HDLC_BADFCS, + E1I_CTR_HDLC_OVERR, + E1I_CTR_ALARM, + E1I_CTR_REMOVED, +}; + struct e1inp_ts; struct e1inp_sign_link { @@ -107,6 +116,7 @@ struct e1inp_line { struct llist_head list; unsigned int num; const char *name; + struct rate_ctr_group *rate_ctr; /* array of timestlots */ struct e1inp_ts ts[NUM_E1_TS]; diff --git a/openbsc/include/openbsc/gsm_data_shared.h b/openbsc/include/openbsc/gsm_data_shared.h index 011e0aa96..89375cf42 100644 --- a/openbsc/include/openbsc/gsm_data_shared.h +++ b/openbsc/include/openbsc/gsm_data_shared.h @@ -182,6 +182,7 @@ struct gsm_lchan { struct osmo_timer_list T3101; struct osmo_timer_list T3111; struct osmo_timer_list error_timer; + struct osmo_timer_list act_timer; /* table of neighbor cell measurements */ struct neigh_meas_proc neigh_meas[MAX_NEIGH_MEAS]; @@ -325,6 +326,7 @@ enum gsm_bts_type { GSM_BTS_TYPE_NANOBTS, GSM_BTS_TYPE_RBS2000, GSM_BTS_TYPE_HSL_FEMTO, + GSM_BTS_TYPE_NOKIA_SITE, }; struct vty; @@ -487,6 +489,13 @@ struct gsm_bts { struct { unsigned long serno; } hsl; + struct { + uint8_t bts_type; + int configured:1, + do_reset:1, + wait_reset:1; + struct osmo_timer_list reset_timer; + } nokia; }; /* Not entirely sure how ip.access specific this is */ diff --git a/openbsc/include/openbsc/signal.h b/openbsc/include/openbsc/signal.h index 2991cfac1..71e1deef9 100644 --- a/openbsc/include/openbsc/signal.h +++ b/openbsc/include/openbsc/signal.h @@ -145,6 +145,7 @@ enum signal_input { S_INP_NONE, S_INP_TEI_UP, S_INP_TEI_DN, + S_INP_TEI_UNKNOWN, S_INP_LINE_INIT, S_INP_LINE_ALARM, S_INP_LINE_NOALARM, |