diff --git a/lib/include/srsran/interfaces/mac_interface_types.h b/lib/include/srsran/interfaces/mac_interface_types.h index 9aa6eee32..e5ec84609 100644 --- a/lib/include/srsran/interfaces/mac_interface_types.h +++ b/lib/include/srsran/interfaces/mac_interface_types.h @@ -131,7 +131,6 @@ struct rach_nr_cfg_t { uint32_t powerRampingStep; uint32_t ra_responseWindow; uint32_t ra_ContentionResolutionTimer; - bool skip_rar; rach_nr_cfg_t() { reset(); } void reset() @@ -141,7 +140,6 @@ struct rach_nr_cfg_t { powerRampingStep = 0; preambleTransMax = 0; ra_responseWindow = 0; - skip_rar = false; } }; diff --git a/srsue/hdr/stack/rrc/rrc_nr.h b/srsue/hdr/stack/rrc/rrc_nr.h index 6deec7583..642bdbf4f 100644 --- a/srsue/hdr/stack/rrc/rrc_nr.h +++ b/srsue/hdr/stack/rrc/rrc_nr.h @@ -42,7 +42,6 @@ struct rrc_nr_args_t { core_less_args_t coreless; uint32_t sim_nr_meas_pci; bool pdcp_short_sn_support; - bool skip_rar; std::string supported_bands_nr_str; std::vector supported_bands_nr; std::vector supported_bands_eutra; diff --git a/srsue/src/main.cc b/srsue/src/main.cc index e14ea853f..666ba2c6c 100644 --- a/srsue/src/main.cc +++ b/srsue/src/main.cc @@ -132,7 +132,6 @@ static int parse_args(all_args_t* args, int argc, char* argv[]) ("rrc.mbms_service_port", bpo::value(&args->stack.rrc.mbms_service_port)->default_value(4321), "Port of the MBMS service") ("rrc.nr_measurement_pci", bpo::value(&args->stack.rrc_nr.sim_nr_meas_pci)->default_value(500), "NR PCI for the simulated NR measurement") ("rrc.nr_short_sn_support", bpo::value(&args->stack.rrc_nr.pdcp_short_sn_support)->default_value(true), "Announce PDCP short SN support") - ("rrc.skip_nr_rar", bpo::value(&args->stack.rrc_nr.skip_rar)->default_value(false), "Whether to skip RAR reception (temporary feature)") ("nas.apn", bpo::value(&args->stack.nas.apn_name)->default_value(""), "Set Access Point Name (APN) for data services") ("nas.apn_protocol", bpo::value(&args->stack.nas.apn_protocol)->default_value(""), "Set Access Point Name (APN) protocol for data services") diff --git a/srsue/src/stack/mac_nr/proc_ra_nr.cc b/srsue/src/stack/mac_nr/proc_ra_nr.cc index abdb1eb60..4177df8b0 100644 --- a/srsue/src/stack/mac_nr/proc_ra_nr.cc +++ b/srsue/src/stack/mac_nr/proc_ra_nr.cc @@ -347,12 +347,6 @@ void proc_ra_nr::prach_sent(uint32_t tti, uint32_t s_id, uint32_t t_id, uint32_t ra_window_start = TTI_ADD(tti, 3); logger.debug("Calculated ra_window_start=%d, ra_window_length=%d", ra_window_start, ra_window_length); state = WAITING_FOR_RESPONSE_RECEPTION; - - if (rach_cfg.skip_rar) { - // temp hack for NSA eNB development - state = WAITING_FOR_COMPLETION; - ra_completion(); - } }); } diff --git a/srsue/src/stack/rrc/rrc_nr.cc b/srsue/src/stack/rrc/rrc_nr.cc index ab2f95577..d2e5ac402 100644 --- a/srsue/src/stack/rrc/rrc_nr.cc +++ b/srsue/src/stack/rrc/rrc_nr.cc @@ -918,7 +918,6 @@ bool rrc_nr::apply_ul_common_cfg(const asn1::rrc_nr::ul_cfg_common_s& ul_cfg_com if (ul_cfg_common.init_ul_bwp.rach_cfg_common_present) { if (ul_cfg_common.init_ul_bwp.rach_cfg_common.type() == setup_release_c::types_opts::setup) { rach_nr_cfg_t rach_nr_cfg = make_mac_rach_cfg(ul_cfg_common.init_ul_bwp.rach_cfg_common.setup()); - rach_nr_cfg.skip_rar = args.skip_rar; mac->set_config(rach_nr_cfg); // Make the RACH configuration for PHY