[PATCH] osmo-bts[master]: measurement.c: Hand Frame Number into measurement computation

[Harald Welte]

Review at  https://gerrit.osmocom.org/6853

measurement.c: Hand Frame Number into measurement computation

This is currently only used for logging, but will be needed for proper
RX{LEV,QUAL}-SUB reporting in upcoming patches.

Related: OS#2978
Change-Id: I07fd06e8a379cab7c0c2eb111c3f5600037d3c9e
---
M include/osmo-bts/measurement.h
M src/common/l1sap.c
M src/common/measurement.c
3 files changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/53/6853/1

diff --git a/include/osmo-bts/measurement.h b/include/osmo-bts/measurement.h
index 47b31a2..e32c8e8 100644
--- a/include/osmo-bts/measurement.h
+++ b/include/osmo-bts/measurement.h
@@ -4,7 +4,7 @@
 #define MEAS_MAX_TIMING_ADVANCE 63
 #define MEAS_MIN_TIMING_ADVANCE 0
 
-int lchan_new_ul_meas(struct gsm_lchan *lchan, struct bts_ul_meas *ulm);
+int lchan_new_ul_meas(struct gsm_lchan *lchan, struct bts_ul_meas *ulm, uint32_t fn);
 
 int lchan_meas_check_compute(struct gsm_lchan *lchan, uint32_t fn);
 
diff --git a/src/common/l1sap.c b/src/common/l1sap.c
index 01b454c..f6a04ea 100644
--- a/src/common/l1sap.c
+++ b/src/common/l1sap.c
@@ -529,7 +529,7 @@
 	/* we assume that symbol period is 1 bit: */
 	set_ms_to_data(lchan, info_meas_ind->ta_offs_qbits / 4, true);
 
-	lchan_new_ul_meas(lchan, &ulm);
+	lchan_new_ul_meas(lchan, &ulm, info_meas_ind->fn);
 
 	/* Check measurement period end and prepare the UL measurment
 	 * report at Meas period End*/
diff --git a/src/common/measurement.c b/src/common/measurement.c
index e4b8720..4e9a534 100644
--- a/src/common/measurement.c
+++ b/src/common/measurement.c
@@ -181,20 +181,20 @@
 }
 
 /* receive a L1 uplink measurement from L1 */
-int lchan_new_ul_meas(struct gsm_lchan *lchan, struct bts_ul_meas *ulm)
+int lchan_new_ul_meas(struct gsm_lchan *lchan, struct bts_ul_meas *ulm, uint32_t fn)
 {
-	DEBUGP(DMEAS, "%s adding measurement, num_ul_meas=%d\n",
+	DEBUGPFN(DMEAS, fn, "%s adding measurement, num_ul_meas=%d\n",
 		gsm_lchan_name(lchan), lchan->meas.num_ul_meas);
 
 	if (lchan->state != LCHAN_S_ACTIVE) {
-		LOGP(DMEAS, LOGL_NOTICE,
+		LOGPFN(DMEAS, LOGL_NOTICE, fn,
 		     "%s measurement during state: %s, num_ul_meas=%d\n",
 		     gsm_lchan_name(lchan), gsm_lchans_name(lchan->state),
 		     lchan->meas.num_ul_meas);
 	}
 
 	if (lchan->meas.num_ul_meas >= ARRAY_SIZE(lchan->meas.uplink)) {
-		LOGP(DMEAS, LOGL_NOTICE,
+		LOGPFN(DMEAS, LOGL_NOTICE, fn,
 		     "%s no space for uplink measurement, num_ul_meas=%d\n",
 		     gsm_lchan_name(lchan), lchan->meas.num_ul_meas);
 		return -ENOSPC;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I07fd06e8a379cab7c0c2eb111c3f5600037d3c9e
Gerrit-PatchSet: 1
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>