Change in osmo-bts[master]: sched_lchan_tchf: count measurements for FACCH/F only once

[dexter]

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/20841 )


Change subject: sched_lchan_tchf: count measurements for FACCH/F only once
......................................................................

sched_lchan_tchf: count measurements for FACCH/F only once

When the FACCH is generated (while in SPEECH mode), there is also a
fake speech indication handed up to l1sap.c. We must make sure that only
one of the two indications carry a measurement value, so lets invalidate
the measurement values (RSSI in particular) for the generated TCH
indication.

Change-Id: Ie3f2e620ba2a2ab2fecdbae627ef01c6128fce0b
Related: OS#4799
---
M src/osmo-bts-trx/sched_lchan_tchf.c
1 file changed, 11 insertions(+), 0 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/41/20841/1

diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c
index 9c5bfc2..14625c1 100644
--- a/src/osmo-bts-trx/sched_lchan_tchf.c
+++ b/src/osmo-bts-trx/sched_lchan_tchf.c
@@ -241,6 +241,17 @@
 			meas_avg.rssi, meas_avg.toa256,
 			meas_avg.ci_cb, ber10k,
 			PRES_INFO_UNKNOWN);
+
+		/* If we are in SPEECH mode we will generate a fake TCH
+		 * indication as well. This indication is needed by the higher
+		 * layers, however we already have reported the measurement
+		 * result for the current block together with the FACCH.
+		 * To avoid reporting the same measurement result with the fake
+		 * TCH indication again we zero out the current data we just
+		 * sent. This will invalidate the measurement, in particular
+		 * meas_avg.rssi. */
+		memset(&meas_avg, 0, sizeof(meas_avg));
+
 bfi:
 		if (rsl_cmode == RSL_CMOD_SPD_SPEECH) {
 			/* indicate bad frame */

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20841
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ie3f2e620ba2a2ab2fecdbae627ef01c6128fce0b
Gerrit-Change-Number: 20841
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201022/ea16a27e/attachment.htm>