[MERGED] osmo-bts[master]: Revert "measurement: exclude idle channels from uplink measu...

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: Revert "measurement: exclude idle channels from uplink measurement"
......................................................................


Revert "measurement: exclude idle channels from uplink measurement"

The offsets used in the lookup tables may be phy dependand. So we
will have to do the alignment in the layer 1 interface of the
phy dependand code before we report the frame number up to the
higher layers.

This reverts commit e0fb3ae52d747b26b6487ec67c79eceaf37a125c.

Change-Id: I8acab50cc1bb1cb133831c6a145f4d790e99176c
---
M src/common/measurement.c
1 file changed, 24 insertions(+), 29 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 a84cf7a..0c86faf 100644
--- a/src/common/measurement.c
+++ b/src/common/measurement.c
@@ -24,40 +24,35 @@
  * 7                         6 and 7        91 to 90     103, 25,  51,  77 */
 
 /* measurement period ends at fn % 104 == ? */
-/* Added (-1) offset in DATA-IND frame number to align with Meas period ends */
 static const uint8_t tchf_meas_rep_fn104[] = {
-	[0] =	103 - 1,
-	[1] =	12 - 1,
-	[2] =	25 - 1,
-	[3] =	38 - 1,
-	[4] =	51 - 1,
-	[5] =	64 - 1,
-	[6] =	77 - 1,
-	[7] =	90 - 1,
+	[0] =	103,
+	[1] =	12,
+	[2] =	25,
+	[3] =	38,
+	[4] =	51,
+	[5] =	64,
+	[6] =	77,
+	[7] =	90,
 };
-
-/* Added (-2) offset in DATA-IND frame number to align with Meas period ends */
 static const uint8_t tchh0_meas_rep_fn104[] = {
-	[0] =	103 - 2,
-	[1] =	103 - 2,
-	[2] =	25 - 2,
-	[3] =	25 - 2,
-	[4] =	51 - 2,
-	[5] =	51 - 2,
-	[6] =	77 - 2,
-	[7] =	77 - 2,
+	[0] =	103,
+	[1] =	103,
+	[2] =	25,
+	[3] =	25,
+	[4] =	51,
+	[5] =	51,
+	[6] =	77,
+	[7] =	77,
 };
-
-/* Added (-1) offset in DATA-IND frame number to align with Meas period ends */
 static const uint8_t tchh1_meas_rep_fn104[] = {
-	[0] =	12 - 1,
-	[1] =	12 - 1,
-	[2] =	38 - 1,
-	[3] =	38 - 1,
-	[4] =	64 - 1,
-	[5] =	64 - 1,
-	[6] =	90 - 1,
-	[7] =	90 - 1,
+	[0] =	12,
+	[1] =	12,
+	[2] =	38,
+	[3] =	38,
+	[4] =	64,
+	[5] =	64,
+	[6] =	90,
+	[7] =	90,
 };
 
 /* Measurment reporting period for SDCCH8 and SDCCH4 chan

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

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