From 67d3b8b136a720a0487074c23bc1656f681c94f1 Mon Sep 17 00:00:00 2001 From: Philipp Maier Date: Fri, 9 Jun 2017 12:21:47 +0200 Subject: 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 --- src/common/measurement.c | 53 ++++++++++++++++++++++-------------------------- 1 file changed, 24 insertions(+), 29 deletions(-) (limited to 'src/common/measurement.c') diff --git a/src/common/measurement.c b/src/common/measurement.c index a84cf7ac..0c86fafd 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 -- cgit v1.2.3