diff --git a/lib/test/asn1/srsran_asn1_rrc_nr_test.cc b/lib/test/asn1/srsran_asn1_rrc_nr_test.cc index c6270919f..31dbe80af 100644 --- a/lib/test/asn1/srsran_asn1_rrc_nr_test.cc +++ b/lib/test/asn1/srsran_asn1_rrc_nr_test.cc @@ -384,7 +384,19 @@ int test_cell_group_config() rlc.rlc_cfg.um_bi_dir().dl_um_rlc.sn_field_len_present = true; rlc.rlc_cfg.um_bi_dir().dl_um_rlc.sn_field_len = sn_field_len_um_opts::size12; rlc.rlc_cfg.um_bi_dir().dl_um_rlc.t_reassembly = t_reassembly_opts::ms50; - // Skip MAC logical channel config + + // MAC logical channel config + rlc.mac_lc_ch_cfg_present = true; + rlc.mac_lc_ch_cfg.ul_specific_params_present = true; + rlc.mac_lc_ch_cfg.ul_specific_params.prio = 11; + rlc.mac_lc_ch_cfg.ul_specific_params.prioritised_bit_rate = + asn1::rrc_nr::lc_ch_cfg_s::ul_specific_params_s_::prioritised_bit_rate_opts::kbps0; + rlc.mac_lc_ch_cfg.ul_specific_params.bucket_size_dur = + asn1::rrc_nr::lc_ch_cfg_s::ul_specific_params_s_::bucket_size_dur_opts::ms100; + rlc.mac_lc_ch_cfg.ul_specific_params.lc_ch_group_present = true; + rlc.mac_lc_ch_cfg.ul_specific_params.lc_ch_group = 6; + rlc.mac_lc_ch_cfg.ul_specific_params.sched_request_id_present = true; + rlc.mac_lc_ch_cfg.ul_specific_params.sched_request_id = 0; // mac-CellGroup-Config cell_group_cfg_pack.mac_cell_group_cfg_present = true; diff --git a/srsenb/src/stack/rrc/rrc_endc.cc b/srsenb/src/stack/rrc/rrc_endc.cc index 6b80b1838..da4f2d883 100644 --- a/srsenb/src/stack/rrc/rrc_endc.cc +++ b/srsenb/src/stack/rrc/rrc_endc.cc @@ -125,6 +125,11 @@ bool rrc::ue::rrc_endc::fill_conn_recfg(asn1::rrc::rrc_conn_recfg_r8_ies_s* conn meas_cfg.meas_gap_cfg.set_setup(); meas_cfg.meas_gap_cfg.setup().gap_offset.set_gp0() = 16; } else if (is_in_state()) { + // FIXME: use bearer manager to remove EUTRA DRB + conn_recfg->rr_cfg_ded.drb_to_release_list_present = true; + conn_recfg->rr_cfg_ded.drb_to_release_list.resize(1); + conn_recfg->rr_cfg_ded.drb_to_release_list[0] = 1; + // only add reconfigure EN-DC extension/release 15.10 field if ENDC activation is active conn_recfg->non_crit_ext_present = true; conn_recfg->non_crit_ext.non_crit_ext_present = true; diff --git a/srsenb/src/stack/rrc/rrc_nr.cc b/srsenb/src/stack/rrc/rrc_nr.cc index bb2c2410c..920532761 100644 --- a/srsenb/src/stack/rrc/rrc_nr.cc +++ b/srsenb/src/stack/rrc/rrc_nr.cc @@ -506,7 +506,19 @@ int rrc_nr::ue::pack_secondary_cell_group_config(asn1::dyn_octstring& packed_sec rlc.rlc_cfg.um_bi_dir().dl_um_rlc.sn_field_len_present = true; rlc.rlc_cfg.um_bi_dir().dl_um_rlc.sn_field_len = sn_field_len_um_opts::size12; rlc.rlc_cfg.um_bi_dir().dl_um_rlc.t_reassembly = t_reassembly_opts::ms50; - // Skip MAC logical channel config + + // MAC logical channel config + rlc.mac_lc_ch_cfg_present = true; + rlc.mac_lc_ch_cfg.ul_specific_params_present = true; + rlc.mac_lc_ch_cfg.ul_specific_params.prio = 11; + rlc.mac_lc_ch_cfg.ul_specific_params.prioritised_bit_rate = + asn1::rrc_nr::lc_ch_cfg_s::ul_specific_params_s_::prioritised_bit_rate_opts::kbps0; + rlc.mac_lc_ch_cfg.ul_specific_params.bucket_size_dur = + asn1::rrc_nr::lc_ch_cfg_s::ul_specific_params_s_::bucket_size_dur_opts::ms100; + rlc.mac_lc_ch_cfg.ul_specific_params.lc_ch_group_present = true; + rlc.mac_lc_ch_cfg.ul_specific_params.lc_ch_group = 6; + rlc.mac_lc_ch_cfg.ul_specific_params.sched_request_id_present = true; + rlc.mac_lc_ch_cfg.ul_specific_params.sched_request_id = 0; // mac-CellGroup-Config for BSR and SR cell_group_cfg_pack.mac_cell_group_cfg_present = true;