Merge branch 'NR_RRC_processing_timer' into Dedicated-BWPs

# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
#	openair2/RRC/NR/L2_nr_interface.c
#	openair2/RRC/NR/rrc_gNB.c
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf
This commit is contained in:
luis_pereira87
2022-04-19 12:39:28 +01:00
23 changed files with 143 additions and 109 deletions
-17
View File
@@ -408,20 +408,3 @@ void nr_mac_gNB_rrc_ul_failure_reset(const module_id_t Mod_instP,
LOG_W(RRC,"Frame %d, Subframe %d: UL failure reset: UE %x unknown \n",frameP,subframeP,rntiP);
}
}
void nr_mac_gNB_enable_rrc_processing_timer_req(const module_id_t Mod_instP, const rnti_t rntiP) {
struct rrc_gNB_ue_context_s *ue_context_p = NULL;
ue_context_p = rrc_gNB_get_ue_context(RC.nrrrc[Mod_instP], rntiP);
if (ue_context_p != NULL) {
ue_context_p->ue_context.nr_rrc_processing_timer = 1;
uint32_t delay_ms = NR_RRC_PROCESSING_DELAY_MS;
if (ue_context_p->ue_context.masterCellGroup &&
ue_context_p->ue_context.masterCellGroup->spCellConfig->spCellConfigDedicated &&
ue_context_p->ue_context.masterCellGroup->spCellConfig->spCellConfigDedicated->downlinkBWP_ToAddModList) {
delay_ms += NR_RRC_BWP_SWITCH_DELAY_MS;
}
ue_context_p->ue_context.nr_rrc_processing_delay = delay_ms;
} else {
LOG_E(NR_RRC,"%s: Unknown RNTI 0x%04x\n", __FUNCTION__, rntiP);
}
}