aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Maier <pmaier@sysmocom.de>2020-01-20 12:29:57 +0100
committerlaforge <laforge@osmocom.org>2020-01-20 14:33:51 +0000
commit8969adc5d940e32031ade68e4eb2fdf7ac4e17d0 (patch)
tree56e0684735d4b91ed6d151c8f051461676d77f6b
parenta0403d3769d3027639e35874c09808ce5c0ba860 (diff)
measurment: write irssi_full_sum variable correctly
The variable irssi_full_sum is not populated with a dummy value when we are not able to compute irssi_full_sum. Instead we mistakenly write MEASUREMENT_DUMMY_IRSSI to ber_full_sum, which is wrong Change-Id: I44d7cb48e3c68ab1b48c78cceb9381ce3e39d7e8 Related: OS#2987
-rw-r--r--src/common/measurement.c2
-rw-r--r--tests/meas/meas_test.ok4
-rw-r--r--tests/meas/meas_testcases.h4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/common/measurement.c b/src/common/measurement.c
index ddc17474..b883d51f 100644
--- a/src/common/measurement.c
+++ b/src/common/measurement.c
@@ -656,7 +656,7 @@ int lchan_meas_check_compute(struct gsm_lchan *lchan, uint32_t fn)
ber_full_sum = ber_full_sum / num_ul_meas;
if (!irssi_full_sum)
- ber_full_sum = MEASUREMENT_DUMMY_IRSSI;
+ irssi_full_sum = MEASUREMENT_DUMMY_IRSSI;
else
irssi_full_sum = irssi_full_sum / num_ul_meas_actual;
diff --git a/tests/meas/meas_test.ok b/tests/meas/meas_test.ok
index e62bb42f..559a8e6c 100644
--- a/tests/meas/meas_test.ok
+++ b/tests/meas/meas_test.ok
@@ -585,8 +585,8 @@ meas.ext.toa256_min | 0 | 0
meas.ext.toa256_max | 0 | 0
meas.ms_toa256 | 0 | 0
meas.ext.toa256_std_dev | 0 | 0
-meas.ul_res.full.rx_lev | 63 | 63
-meas.ul_res.full.rx_qual | 3 | 3
+meas.ul_res.full.rx_lev | 1 | 1
+meas.ul_res.full.rx_qual | 7 | 7
===========================================================
diff --git a/tests/meas/meas_testcases.h b/tests/meas/meas_testcases.h
index fefa34f7..d7eee5c3 100644
--- a/tests/meas/meas_testcases.h
+++ b/tests/meas/meas_testcases.h
@@ -131,8 +131,8 @@ static const struct meas_testcase mtc4 = {
.pchan = GSM_PCHAN_TCH_F,
.res = {
.success = 1,
- .rx_lev_full = 63,
- .rx_qual_full = 3,
+ .rx_lev_full = 1,
+ .rx_qual_full = 7,
.toa256_mean = 0,
.toa256_max = 0,
.toa256_min = 0,