enb,rrc: fix SSB absolute freq value in EUTRA measConfig

we've been using the ARFCN of the NR carrier instead of
the absolute freq SSB.

The patch fixes this and renames the variable to make it clearer.
master
Andre Puschmann 3 years ago committed by Ismael Gomez
parent 3b79393974
commit 8d2c394326

@ -46,7 +46,7 @@ struct srb_cfg_t {
// Parameter required for NR cell measurement handling
struct rrc_endc_cfg_t {
bool act_from_b1_event;
uint32_t nr_dl_arfcn;
uint32_t abs_frequency_ssb;
uint32_t nr_band;
using ssb_nr_cfg = asn1::rrc::mtc_ssb_nr_r15_s;
using ssb_rs_cfg = asn1::rrc::rs_cfg_ssb_nr_r15_s;

@ -1167,7 +1167,7 @@ int parse_cfg_files(all_args_t* args_, rrc_cfg_t* rrc_cfg_, rrc_nr_cfg_t* rrc_nr
// update EUTRA RRC params for ENDC
if (rrc_nr_cfg_->cell_list.size() == 1) {
rrc_cfg_->endc_cfg.nr_dl_arfcn = rrc_nr_cfg_->cell_list.at(0).dl_arfcn;
rrc_cfg_->endc_cfg.abs_frequency_ssb = rrc_nr_cfg_->cell_list.at(0).ssb_absolute_freq_point;
rrc_cfg_->endc_cfg.nr_band = rrc_nr_cfg_->cell_list.at(0).band;
rrc_cfg_->endc_cfg.ssb_period_offset.set_sf10_r15();
rrc_cfg_->endc_cfg.ssb_duration = asn1::rrc::mtc_ssb_nr_r15_s::ssb_dur_r15_opts::sf1;

@ -61,7 +61,7 @@ bool rrc::ue::rrc_endc::fill_conn_recfg(asn1::rrc::rrc_conn_recfg_r8_ies_s* conn
meas_obj.meas_obj_id = meas_cfg.meas_obj_to_add_mod_list.size() + 1;
meas_obj.meas_obj.set_meas_obj_nr_r15();
auto& meas_obj_nr = meas_obj.meas_obj.meas_obj_nr_r15();
meas_obj_nr.carrier_freq_r15 = endc_cfg.nr_dl_arfcn;
meas_obj_nr.carrier_freq_r15 = endc_cfg.abs_frequency_ssb;
meas_obj_nr.rs_cfg_ssb_r15.meas_timing_cfg_r15.periodicity_and_offset_r15 = endc_cfg.ssb_period_offset;
meas_obj_nr.rs_cfg_ssb_r15.meas_timing_cfg_r15.ssb_dur_r15 = endc_cfg.ssb_duration;
meas_obj_nr.rs_cfg_ssb_r15.subcarrier_spacing_ssb_r15 = endc_cfg.ssb_ssc;

Loading…
Cancel
Save