[MERGED] osmo-bts[master]: measurement.c: Fix sdcch4_meas_rep_fn102 / sdcch8_meas_rep_f...

Harald Welte gerrit-no-reply at lists.osmocom.org
Mon Feb 26 12:33:19 UTC 2018


Harald Welte has submitted this change and it was merged.

Change subject: measurement.c: Fix sdcch4_meas_rep_fn102 / sdcch8_meas_rep_fn102
......................................................................


measurement.c: Fix sdcch4_meas_rep_fn102 / sdcch8_meas_rep_fn102

Since Change-Id: I23fba50f48415314da40cf5bf86fce2ed3e66af6 we were not
reporting measurements for SDCCH channel types due to the wrong
encoding of the sdcch{4,8}_meas_rep_fn102 table.

Let's fix the table by encoding the needed information:

 "What is the modulo-102 remainder of the first burst of the last block
  before fn%102 reaches 37?" (SDCCH/4)

 "What is the modulo-102 remainder of the first burst of the last block
  before fn%102 reaches 12?" (SDCCH/8)

The TS 45.002 Clause 7 tables have to be consulted carefully to
determine this information.

Change-Id: Icf02354872670126ab3297b787b216981ca6c309
Related: OS#2965
---
M src/common/measurement.c
1 file changed, 14 insertions(+), 15 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/common/measurement.c b/src/common/measurement.c
index 69fbd94..6e9971b 100644
--- a/src/common/measurement.c
+++ b/src/common/measurement.c
@@ -64,25 +64,24 @@
  * SDCCH/4		37 to 36
  */
 
-/* Added interleave offset to Meas period end Fn which
- * would reduce the Meas Res msg load at Abis */
-
+/* FN of the first burst whose block completes before reaching fn%102=11 */
 static const uint8_t sdcch8_meas_rep_fn102[] = {
-	[0] = 11 + 7,
-	[1] = 11 + 11,
-	[2] = 11 + 15,
-	[3] = 11 + 19,
-	[4] = 11 + 23,
-	[5] = 11 + 27,
-	[6] = 11 + 31,
-	[7] = 11 + 35
+	[0] = 66,	/* 15(SDCCH), 47(SACCH), 66(SDCCH) */
+	[1] = 70,	/* 19(SDCCH), 51(SACCH), 70(SDCCH) */
+	[2] = 74,	/* 23(SDCCH), 55(SACCH), 74(SDCCH) */
+	[3] = 78,	/* 27(SDCCH), 59(SACCH), 78(SDCCH) */
+	[4] = 98,	/* 31(SDCCH), 98(SACCH), 82(SDCCH) */
+	[5] = 0,	/* 35(SDCCH),  0(SACCH), 86(SDCCH) */
+	[6] = 4,	/* 39(SDCCH),  4(SACCH), 90(SDCCH) */
+	[7] = 8,	/* 43(SDCCH),  8(SACCH), 94(SDCCH) */
 };
 
+/* FN of the first burst whose block completes before reaching fn%102=37 */
 static const uint8_t sdcch4_meas_rep_fn102[] = {
-	[0] = 36 + 4,
-	[1] = 36 + 8,
-	[2] = 36 + 14,
-	[3] = 36 + 18
+	[0] = 88,	/* 37(SDCCH), 57(SACCH), 88(SDCCH) */
+	[1] = 92,	/* 41(SDCCH), 61(SACCH), 92(SDCCH) */
+	[2] = 6,	/*  6(SACCH), 47(SDCCH), 98(SDCCH) */
+	[3] = 10	/* 10(SACCH),  0(SDCCH), 51(SDCCH) */
 };
 
 /* Note: The reporting of the measurement results is done via the SACCH channel.

-- 
To view, visit https://gerrit.osmocom.org/6871
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Icf02354872670126ab3297b787b216981ca6c309
Gerrit-PatchSet: 6
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier at sysmocom.de>


More information about the gerrit-log mailing list