diff options
| author | Harald Welte <laforge@gnumonks.org> | 2015-11-05 23:02:55 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2015-11-05 23:02:55 +0100 |
| commit | bbcf703be844e971d9e1e58f5efedfe5c449309c (patch) | |
| tree | 0d3dd1745a3f79895e6c98a85b7d5fe90ee9ddf5 | |
| parent | 94da045be57ed0023c5718a871a50c71474ee345 (diff) | |
TRX: catch up with trhe amr_mode naming changes
OpenBSC introduced a naming change in
615ed46a6ab25f71a7ab0d8201d33b4dbf8fc5b0 but osmo-bts fixes were only
about osmo-bts-sysmo, not osmo-bts-trx. This updates osmo-bts-trx
accordingly.
| -rw-r--r-- | src/osmo-bts-trx/l1_if.c | 16 | ||||
| -rw-r--r-- | src/osmo-bts-trx/loops.c | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index 42cb17b8..f3cb5bf1 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -549,10 +549,10 @@ int bts_model_l1sap_down(struct gsm_bts_trx *trx, struct osmo_phsap_prim *l1sap) trx_sched_set_mode(l1h, chan_nr, lchan->rsl_cmode, lchan->tch_mode, lchan->tch.amr_mr.num_modes, - lchan->tch.amr_mr.mode[0].mode, - lchan->tch.amr_mr.mode[1].mode, - lchan->tch.amr_mr.mode[2].mode, - lchan->tch.amr_mr.mode[3].mode, + lchan->tch.amr_mr.bts_mode[0].mode, + lchan->tch.amr_mr.bts_mode[1].mode, + lchan->tch.amr_mr.bts_mode[2].mode, + lchan->tch.amr_mr.bts_mode[3].mode, amr_get_initial_mode(lchan), (lchan->ho.active == 1)); /* init lapdm */ @@ -577,10 +577,10 @@ int bts_model_l1sap_down(struct gsm_bts_trx *trx, struct osmo_phsap_prim *l1sap) trx_sched_set_mode(l1h, chan_nr, lchan->rsl_cmode, lchan->tch_mode, lchan->tch.amr_mr.num_modes, - lchan->tch.amr_mr.mode[0].mode, - lchan->tch.amr_mr.mode[1].mode, - lchan->tch.amr_mr.mode[2].mode, - lchan->tch.amr_mr.mode[3].mode, + lchan->tch.amr_mr.bts_mode[0].mode, + lchan->tch.amr_mr.bts_mode[1].mode, + lchan->tch.amr_mr.bts_mode[2].mode, + lchan->tch.amr_mr.bts_mode[3].mode, amr_get_initial_mode(lchan), 0); break; diff --git a/src/osmo-bts-trx/loops.c b/src/osmo-bts-trx/loops.c index fa380555..52ac170a 100644 --- a/src/osmo-bts-trx/loops.c +++ b/src/osmo-bts-trx/loops.c @@ -286,7 +286,7 @@ int trx_loop_amr_input(struct trx_l1h *l1h, uint8_t chan_nr, if (chan_state->dl_cmr > 0) { /* degrade, if ber is above threshold FIXME: C/I */ if (ber > - lchan->tch.amr_mr.mode[chan_state->dl_cmr-1].threshold_bts) { + lchan->tch.amr_mr.bts_mode[chan_state->dl_cmr-1].threshold) { LOGP(DLOOP, LOGL_DEBUG, "Degrading due to BER %.6f " "from codec id %d to %d of trx=%u " "chan_nr=0x%02x\n", ber, chan_state->dl_cmr, @@ -301,8 +301,8 @@ int trx_loop_amr_input(struct trx_l1h *l1h, uint8_t chan_nr, if (chan_state->dl_cmr < chan_state->codecs - 1) { /* degrade, if ber is above threshold FIXME: C/I*/ if (ber < - lchan->tch.amr_mr.mode[chan_state->dl_cmr].threshold_bts - - lchan->tch.amr_mr.mode[chan_state->dl_cmr].hysteresis_bts) { + lchan->tch.amr_mr.bts_mode[chan_state->dl_cmr].threshold + - lchan->tch.amr_mr.bts_mode[chan_state->dl_cmr].hysteresis) { LOGP(DLOOP, LOGL_DEBUG, "Upgrading due to BER %.6f " "from codec id %d to %d of trx=%u " "chan_nr=0x%02x\n", ber, chan_state->dl_cmr, |