diff options
| -rw-r--r-- | src/common/measurement.c | 47 | ||||
| -rw-r--r-- | src/common/rsl.c | 3 |
2 files changed, 1 insertions, 49 deletions
diff --git a/src/common/measurement.c b/src/common/measurement.c index e4b87207..4b486d3a 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -240,50 +240,6 @@ static uint8_t ber10k_to_rxqual(uint32_t ber10k) return 7; } -/* Update order TA at end of meas period */ -static void lchan_meas_update_ordered_TA(struct gsm_lchan *lchan, - int32_t taqb_sum) -{ - int32_t ms_timing_offset = 0; - uint8_t l1_info_valid; - - l1_info_valid = lchan->meas.flags & LC_UL_M_F_L1_VALID; - - if (l1_info_valid) { - DEBUGP(DMEAS, - "%s Update TA TimingOffset_Mean:%d, UL RX TA:%d, DL ordered TA:%d, flags:%d \n", - gsm_lchan_name(lchan), taqb_sum, lchan->meas.l1_info[1], - lchan->rqd_ta, lchan->meas.flags); - - ms_timing_offset = - taqb_sum + (lchan->meas.l1_info[1] - lchan->rqd_ta); - - if (ms_timing_offset > 0) { - if (lchan->rqd_ta < MEAS_MAX_TIMING_ADVANCE) { - /* MS is moving away from BTS. - * So increment Ordered TA by 1 */ - lchan->rqd_ta++; - } - } else if (ms_timing_offset < 0) { - if (lchan->rqd_ta > MEAS_MIN_TIMING_ADVANCE) { - /* MS is moving toward BTS. So decrement - * Ordered TA by 1 */ - lchan->rqd_ta--; - } - } - - DEBUGP(DMEAS, - "%s New Update TA--> TimingOff_diff:%d, UL RX TA:%d, DL ordered TA:%d \n", - gsm_lchan_name(lchan), ms_timing_offset, - lchan->meas.l1_info[1], lchan->rqd_ta); - } - - /* Clear L1 INFO valid flag at Meas period end */ - lchan->meas.flags &= ~LC_UL_M_F_L1_VALID; - - return; -} - int lchan_meas_check_compute(struct gsm_lchan *lchan, uint32_t fn) { struct gsm_meas_rep_unidir *mru; @@ -339,9 +295,6 @@ int lchan_meas_check_compute(struct gsm_lchan *lchan, uint32_t fn) ber_full_sum%100, irssi_full_sum, ber_sub_sum/100, ber_sub_sum%100, irssi_sub_sum); - /* Update ordered TA for DL SACCH L1 Header */ - lchan_meas_update_ordered_TA(lchan, taqb_sum); - /* store results */ mru = &lchan->meas.ul_res; mru->full.rx_lev = dbm2rxlev((int)irssi_full_sum * -1); diff --git a/src/common/rsl.c b/src/common/rsl.c index 5bbd61a1..8448925e 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -2376,8 +2376,7 @@ static int rsl_tx_meas_res(struct gsm_lchan *lchan, uint8_t *l3, int l3_len, con msgb_tv_put(msg, RSL_IE_BS_POWER, lchan->meas.bts_tx_pwr); if (lchan->meas.flags & LC_UL_M_F_L1_VALID) { msgb_tv_fixed_put(msg, RSL_IE_L1_INFO, 2, lchan->meas.l1_info); - /* Note: L1 info valid flag is cleared by function - * lchan_meas_update_ordered_TA() in measurement.c */ + lchan->meas.flags &= ~LC_UL_M_F_L1_VALID; } msgb_tl16v_put(msg, RSL_IE_L3_INFO, l3_len, l3); if (ms_to_valid(lchan)) { |