diff options
| author | Harald Welte <laforge@gnumonks.org> | 2011-09-09 23:55:39 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2011-09-09 23:55:39 +0200 |
| commit | 7899dc5fcfa49febd50cb113cc8ef45f32dacc9d (patch) | |
| tree | f14b28b21a759936f29b5a2ae7a38fde25282544 | |
| parent | 215d9eecddba2ef3a5fa850180fe866d82bdcb6a (diff) | |
sysmobts: fix initial codec mode computation
There is no off-by-one between osmocom and L1 definitions...
| -rw-r--r-- | src/osmo-bts-sysmo/oml.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/osmo-bts-sysmo/oml.c b/src/osmo-bts-sysmo/oml.c index 26c627e3..69d0147e 100644 --- a/src/osmo-bts-sysmo/oml.c +++ b/src/osmo-bts-sysmo/oml.c @@ -467,9 +467,6 @@ static void alive_timer_cb(void *data) osmo_timer_schedule(&fl1h->alive_timer, 5, 0); } -/* osmocom AMR mode: 0..7, L1: 1..8 */ -#define AMR_MODE_OSMO2L1(x) (x+1) - static void clear_amr_params(GsmL1_LogChParam_t *lch_par) { int j; @@ -510,8 +507,7 @@ static void lchan2lch_par(GsmL1_LogChParam_t *lch_par, struct gsm_lchan *lchan) lch_par->tch.tchPlType = GsmL1_TchPlType_Amr; lch_par->tch.amrCmiPhase = GsmL1_AmrCmiPhase_Odd; /* FIXME? */ - osmo_amr_mode = amr_get_initial_mode(lchan); - lch_par->tch.amrInitCodecMode = AMR_MODE_OSMO2L1(osmo_amr_mode); + lch_par->tch.amrInitCodecMode = amr_get_initial_mode(lchan); /* initialize to clean state */ for (j = 0; j < ARRAY_SIZE(lch_par->tch.amrActiveCodecSet); j++) |