diff options
| author | Harald Welte <laforge@gnumonks.org> | 2016-11-15 21:18:35 +0100 |
|---|---|---|
| committer | Philipp Maier <pmaier@sysmocom.de> | 2017-02-07 14:09:20 +0100 |
| commit | 023c8d8d78795625ed0ea00ef72bda5c6b0ca262 (patch) | |
| tree | 9878cd431d5bcbb7a4b7c67727401808cf761972 /openbsc/src/libbsc/abis_om2000.c | |
| parent | 5890708799efa49c803a6568d8deedde4ee08ecf (diff) | |
HACK: Don't require TRX numbers to start at 0
Change-Id: I6c5fcb06bdbe0377e2ebc46ecd73d11e834a6d99
Diffstat (limited to 'openbsc/src/libbsc/abis_om2000.c')
| -rw-r--r-- | openbsc/src/libbsc/abis_om2000.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/openbsc/src/libbsc/abis_om2000.c b/openbsc/src/libbsc/abis_om2000.c index 6c987d8d2..cc42411a0 100644 --- a/openbsc/src/libbsc/abis_om2000.c +++ b/openbsc/src/libbsc/abis_om2000.c @@ -2179,22 +2179,23 @@ static void om2k_bts_s_wait_con(struct osmo_fsm_inst *fi, uint32_t event, void * struct gsm_bts *bts = obfp->bts; OSMO_ASSERT(event == OM2K_BTS_EVT_CON_DONE); - /* TF can take a long time to initialize, wait for 10min */ - osmo_fsm_inst_state_chg(fi, OM2K_BTS_S_WAIT_TF, 600, 0); - om2k_mo_fsm_start(fi, OM2K_BTS_EVT_TF_DONE, bts->c0, - &bts->rbs2000.tf.om2k_mo); + + osmo_fsm_inst_state_chg(fi, OM2K_BTS_S_WAIT_IS, + BTS_FSM_TIMEOUT, 0); + om2k_mo_fsm_start(fi, OM2K_BTS_EVT_IS_DONE, bts->c0, + &bts->rbs2000.is.om2k_mo); } -static void om2k_bts_s_wait_tf(struct osmo_fsm_inst *fi, uint32_t event, void *data) +static void om2k_bts_s_wait_is(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct om2k_bts_fsm_priv *obfp = fi->priv; struct gsm_bts_trx *trx; - OSMO_ASSERT(event == OM2K_BTS_EVT_TF_DONE); + OSMO_ASSERT(event == OM2K_BTS_EVT_IS_DONE); osmo_fsm_inst_state_chg(fi, OM2K_BTS_S_WAIT_TRX, BTS_FSM_TIMEOUT, 0); - obfp->next_trx_nr = 0; + obfp->next_trx_nr = 1; trx = gsm_bts_trx_num(obfp->bts, obfp->next_trx_nr++); om2k_trx_fsm_start(fi, trx, OM2K_BTS_EVT_TRX_DONE); } |