aboutsummaryrefslogtreecommitdiffstats
path: root/src/osmo-bts-trx/sched_lchan_tchf.c
diff options
context:
space:
mode:
authorPhilipp Maier <pmaier@sysmocom.de>2020-06-23 06:11:20 +0700
committerlaforge <laforge@osmocom.org>2020-10-03 07:05:25 +0000
commitc41b94e93b24933137880b1a72ebd186d55e0340 (patch)
tree18a329c99f694949b72ef9133d325abcc7240dd5 /src/osmo-bts-trx/sched_lchan_tchf.c
parentb62612fbdef91fdc22a9d1efbabea13dff1d9c50 (diff)
osmo-bts-trx/scheduler: fix measurement handling for SUB frames
Make sure that we pick the correct UL measurements from the history when we deal with AMR SID frames (SUB frames). Change-Id: I902bb47d68742d2589156f61099b67a0edbaf40b Related: OS#2978
Diffstat (limited to 'src/osmo-bts-trx/sched_lchan_tchf.c')
-rw-r--r--src/osmo-bts-trx/sched_lchan_tchf.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c
index e29a47e2..9c5bfc22 100644
--- a/src/osmo-bts-trx/sched_lchan_tchf.c
+++ b/src/osmo-bts-trx/sched_lchan_tchf.c
@@ -173,6 +173,17 @@ int rx_tchf_fn(struct l1sched_trx *l1t, enum trx_chan_type chan,
break;
}
+ switch (chan_state->amr_last_dtx) {
+ case AFS_SID_FIRST:
+ case AFS_SID_UPDATE_CN:
+ meas_avg_mode = SCHED_MEAS_AVG_M8_FIRST_QUAD;
+ break;
+ case AFS_SID_UPDATE:
+ case AFS_ONSET:
+ meas_avg_mode = SCHED_MEAS_AVG_M_QUAD;
+ break;
+ }
+
if (rc)
trx_loop_amr_input(l1t,
trx_chan_desc[chan].chan_nr | bi->tn, chan_state,