diff options
| author | Philipp Maier <pmaier@sysmocom.de> | 2017-06-26 12:10:36 +0200 |
|---|---|---|
| committer | dexter <pmaier@sysmocom.de> | 2017-06-29 13:18:11 +0000 |
| commit | 8d645dd0e5bcaf75a89e82cc3f4a5aa14b31a6e3 (patch) | |
| tree | c2a63aa03aad2633fca8c2641a91d22dd53039f7 /src/osmo-bts-sysmo/l1_if.c | |
| parent | 250d77f8dfe4e9ce3ccbcdb2e5695bd819178318 (diff) | |
Revert "sysmobts: normalize frame number in measurement indication"
This reverts commit 88b2cc30a6a7253c2c4c76178e5727fad48556ca.
Change-Id: I30f37a9feef24a45e254377502615d717dba9765
Diffstat (limited to 'src/osmo-bts-sysmo/l1_if.c')
| -rw-r--r-- | src/osmo-bts-sysmo/l1_if.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c index f564836b..837fc5c3 100644 --- a/src/osmo-bts-sysmo/l1_if.c +++ b/src/osmo-bts-sysmo/l1_if.c @@ -897,14 +897,12 @@ static void dump_meas_res(int ll, GsmL1_MeasParam_t *m) } 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; @@ -916,12 +914,6 @@ static int process_meas_res(struct gsm_bts_trx *trx, uint8_t chan_nr, * 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) */ return l1sap_up(trx, &l1sap); @@ -949,7 +941,7 @@ static int handle_ph_data_ind(struct femtol1_hdl *fl1, GsmL1_PhDataInd_t *data_i 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) { |