cellular-infrastructure
/
osmo-bts
mirror of https://gerrit.osmocom.org/osmo-bts
9
0
Fork 0
Code Issues Releases Wiki Activity

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 e0fb3ae52d.

Change-Id: I8acab50cc1bb1cb133831c6a145f4d790e99176c
This commit is contained in:
Philipp Maier 2017-06-09 12:21:47 +02:00
parent 95d2505e57
commit 67d3b8b136
1 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/common/measurement.c
View File

@ -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