maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Fix_BWP_switching_when_Msg3_DCCH' into integration_2022_wk44

Browse Source
This commit is contained in:
Robert Schmidt
2022-11-04 10:59:50 +01:00
parent bacce39af7 dbb6182124
commit b89daf68b7
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+11 -1
View File
@@ -2246,6 +2246,8 @@ void configure_UE_BWP(gNB_MAC_INST *nr_mac,
else { else {
DL_BWP = &UE->current_DL_BWP; DL_BWP = &UE->current_DL_BWP;
UL_BWP = &UE->current_UL_BWP; UL_BWP = &UE->current_UL_BWP;
sched_ctrl->next_dl_bwp_id = -1;
sched_ctrl->next_ul_bwp_id = -1;
CellGroup = UE->CellGroup; CellGroup = UE->CellGroup;
} }
NR_BWP_Downlink_t *dl_bwp = NULL; NR_BWP_Downlink_t *dl_bwp = NULL;
@@ -2274,6 +2276,14 @@ void configure_UE_BWP(gNB_MAC_INST *nr_mac,
DL_BWP->bwp_id = 0; DL_BWP->bwp_id = 0;
UL_BWP->bwp_id = 0; UL_BWP->bwp_id = 0;
UE->Msg3_dcch_dtch = false; UE->Msg3_dcch_dtch = false;
// Schedule BWP switching to the first active BWP (previous active BWP before RA with Msg3 carrying DCCH or DTCH message)
if (servingCellConfig->firstActiveDownlinkBWP_Id) {
sched_ctrl->next_dl_bwp_id = *servingCellConfig->firstActiveDownlinkBWP_Id;
}
if (servingCellConfig->uplinkConfig->firstActiveUplinkBWP_Id) {
sched_ctrl->next_ul_bwp_id = *servingCellConfig->uplinkConfig->firstActiveUplinkBWP_Id;
}
} }
else { else {
// (re)configuring BWP // (re)configuring BWP
@@ -2327,7 +2337,7 @@ void configure_UE_BWP(gNB_MAC_INST *nr_mac,
} }
else { else {
DL_BWP->bwp_id = 0; DL_BWP->bwp_id = 0;
DL_BWP->bwp_id = 0; UL_BWP->bwp_id = 0;
target_ss = NR_SearchSpace__searchSpaceType_PR_common; target_ss = NR_SearchSpace__searchSpaceType_PR_common;
DL_BWP->pdsch_Config = NULL; DL_BWP->pdsch_Config = NULL;
UL_BWP->pusch_Config = NULL; UL_BWP->pusch_Config = NULL;