fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/27684 )
Change subject: osmo-bts-trx: rx_tchh_fn(): fix meas reporting in signalling mode ......................................................................
osmo-bts-trx: rx_tchh_fn(): fix meas reporting in signalling mode
In change [1] I broke measurement reporting for TCH/H in signalling mode. The problem is that in rx_tchh_fn() we started to invalidate the Uplink RSSI for FACCH regardless of the channel mode: speech or signalling. In speech mode, the averaged measurements are carried over by the two BFIs. In signalling mode we send no BFIs, so:
* let's use the proper averaging mode S6N6 (not S6N4), and * send the averaged measurements together with the FACCH.
This change fixes BTS_Tests.TC_meas_res_sign_tchh[_toa256].
Change-Id: If98aa1f0f7255f20344460bdd07e2c896dd6e56f Fixes: [1] I7902b4709bc3f418174e8373f52e87bb31cdc826 --- M src/osmo-bts-trx/sched_lchan_tchh.c 1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/84/27684/1
diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c index a8bdd08..fa3434e 100644 --- a/src/osmo-bts-trx/sched_lchan_tchh.c +++ b/src/osmo-bts-trx/sched_lchan_tchh.c @@ -135,6 +135,8 @@ * also shift buffer by 4 bursts for interleaving */ switch (tch_mode) { case GSM48_CMODE_SIGN: + meas_avg_mode = SCHED_MEAS_AVG_M_S6N6; + /* fall-through */ case GSM48_CMODE_SPEECH_V1: /* HR or signalling */ /* Note on FN-10: If we are at FN 10, we decoded an even aligned * TCH/FACCH frame, because our burst buffer carries 6 bursts. @@ -265,7 +267,7 @@ * with the first BFI (see below). */ _sched_compose_ph_data_ind(l1ts, fn_begin, bi->chan, tch_data + amr, GSM_MACBLOCK_LEN, - 0, /* intentionally invalidate RSSI */ + tch_mode == GSM48_CMODE_SIGN ? meas_avg.rssi : 0, meas_avg.toa256, meas_avg.ci_cb, ber10k, PRES_INFO_UNKNOWN); ber10k = 0;