diff options
| author | Harald Welte <laforge@gnumonks.org> | 2013-03-07 18:38:39 +0000 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2013-03-17 17:10:35 +0100 |
| commit | a5608d092db095f1043f7e471a938feb8b45f09d (patch) | |
| tree | 26fc9354b849060c64df2ba3ba284bf59b716212 | |
| parent | 4ad8d4d3c0e46fa50fe421c6957db1ea4b048b62 (diff) | |
measurement: use new 'struct gsm_meas_rep_unidir' of libosmocore
| -rw-r--r-- | src/common/measurement.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/common/measurement.c b/src/common/measurement.c index e2b9ff9e..d154de2c 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -178,10 +178,10 @@ int lchan_meas_check_compute(struct gsm_lchan *lchan, uint32_t fn) irssi_sub_sum); /* store results */ - lchan->meas.res.rxlev_full = dbm2rxlev((int)irssi_full_sum * -1); - lchan->meas.res.rxlev_sub = dbm2rxlev((int)irssi_sub_sum * -1); - lchan->meas.res.rxqual_full = ber10k_to_rxqual(ber_full_sum); - lchan->meas.res.rxqual_sub = ber10k_to_rxqual(ber_sub_sum); + lchan->meas.ul_res.full.rx_lev = dbm2rxlev((int)irssi_full_sum * -1); + lchan->meas.ul_res.sub.rx_lev = dbm2rxlev((int)irssi_sub_sum * -1); + lchan->meas.ul_res.full.rx_qual = ber10k_to_rxqual(ber_full_sum); + lchan->meas.ul_res.sub.rx_qual = ber10k_to_rxqual(ber_sub_sum); lchan->meas.flags |= LC_UL_M_F_RES_VALID; lchan->meas.num_ul_meas = 0; @@ -194,10 +194,10 @@ int lchan_meas_check_compute(struct gsm_lchan *lchan, uint32_t fn) /* build the 3 byte RSL uplinke measurement IE content */ int lchan_build_rsl_ul_meas(struct gsm_lchan *lchan, uint8_t *buf) { - buf[0] = (lchan->meas.res.rxlev_full & 0x3f); /* FIXME: DTXu support */ - buf[1] = (lchan->meas.res.rxlev_sub & 0x3f); - buf[2] = ((lchan->meas.res.rxqual_full & 7) << 3) | - (lchan->meas.res.rxqual_sub & 7); + buf[0] = (lchan->meas.ul_res.full.rx_lev & 0x3f); /* FIXME: DTXu support */ + buf[1] = (lchan->meas.ul_res.sub.rx_lev & 0x3f); + buf[2] = ((lchan->meas.ul_res.full.rx_qual & 7) << 3) | + (lchan->meas.ul_res.sub.rx_qual & 7); return 3; } |