Review at https://gerrit.osmocom.org/3050
Revert "sysmobts: normalize frame number in measurement indication"
This reverts commit 88b2cc30a6a7253c2c4c76178e5727fad48556ca.
Change-Id: I30f37a9feef24a45e254377502615d717dba9765
---
M src/osmo-bts-sysmo/l1_if.c
1 file changed, 2 insertions(+), 10 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/50/3050/1
diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c
index f564836..837fc5c 100644
--- a/src/osmo-bts-sysmo/l1_if.c
+++ b/src/osmo-bts-sysmo/l1_if.c
@@ -897,14 +897,12 @@
}
static int process_meas_res(struct gsm_bts_trx *trx, uint8_t chan_nr,
- uint32_t fn, GsmL1_PhDataInd_t *data_ind)
+ uint32_t fn, GsmL1_MeasParam_t *m)
{
struct osmo_phsap_prim l1sap;
memset(&l1sap, 0, sizeof(l1sap));
osmo_prim_init(&l1sap.oph, SAP_GSM_PH, PRIM_MPH_INFO,
PRIM_OP_INDICATION, NULL);
- GsmL1_MeasParam_t *m = &data_ind->measParam;
-
l1sap.u.info.type = PRIM_INFO_MEAS;
l1sap.u.info.u.meas_ind.chan_nr = chan_nr;
l1sap.u.info.u.meas_ind.ta_offs_qbits = m->i16BurstTiming;
@@ -915,12 +913,6 @@
* physical radio link, the uplink is delayed by 3 timeslots, we need
* to compensate for that delay. */
l1sap.u.info.u.meas_ind.fn = fn + 3;
-
- /* Align frame number with measurement period ends */
- if (data_ind->sapi == GsmL1_Sapi_TchF)
- l1sap.u.info.u.meas_ind.fn += 1;
- else if (data_ind->sapi == GsmL1_Sapi_TchH && data_ind->subCh ==
GsmL1_SubCh_0)
- l1sap.u.info.u.meas_ind.fn += 1;
/* l1sap wants to take msgb ownership. However, as there is no
* msg, it will msgb_free(l1sap.oph.msg == NULL) */
@@ -949,7 +941,7 @@
fn = data_ind->u32Fn;
link_id = (data_ind->sapi == GsmL1_Sapi_Sacch) ? LID_SACCH : LID_DEDIC;
- process_meas_res(trx, chan_nr, fn, data_ind);
+ process_meas_res(trx, chan_nr, fn, &data_ind->measParam);
if (data_ind->measParam.fLinkQuality < btsb->min_qual_norm
&& data_ind->msgUnitParam.u8Size != 0) {
--
To view, visit https://gerrit.osmocom.org/3050
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I30f37a9feef24a45e254377502615d717dba9765
Gerrit-PatchSet: 1
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: dexter <[email protected]>
