fixeria has submitted this change. (
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
Related: SYS#5853
---
M src/osmo-bts-trx/sched_lchan_tchh.c
1 file changed, 7 insertions(+), 5 deletions(-)
Approvals:
Jenkins Builder: Verified
daniel: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c
b/src/osmo-bts-trx/sched_lchan_tchh.c
index a8bdd08..21fb62c 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.
@@ -259,13 +261,13 @@
/* FACCH */
if (rc == GSM_MACBLOCK_LEN) {
chan_state->ul_ongoing_facch = 1;
- /* In order to provide an even stream of measurement reports,
here we
- * intentionally invalidate RSSI, so that this report gets
dropped in
- * process_l1sap_meas_data(). The averaged results will still
be sent
- * with the first BFI (see below). */
+ /* In order to provide an even stream of measurement reports in
*speech*
+ * mode, here we intentionally invalidate RSSI for FACCH, so
that this
+ * report gets dropped in process_l1sap_meas_data(). The
averaged results
+ * will be sent with the first (see below) and second (see
above) BFIs. */
_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;
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27684
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: If98aa1f0f7255f20344460bdd07e2c896dd6e56f
Gerrit-Change-Number: 27684
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria <vyanits...@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillm...@sysmocom.de>
Gerrit-Reviewer: fixeria <vyanits...@sysmocom.de>
Gerrit-Reviewer: laforge <lafo...@osmocom.org>
Gerrit-Reviewer: neels <nhofm...@sysmocom.de>
Gerrit-Reviewer: pespin <pes...@sysmocom.de>
Gerrit-MessageType: merged
