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

Fix scheduling SRS transmission at UE when there is Dedicated BWPs

Browse Source
This commit is contained in:
Roberto Louro Magueta
2022-05-25 11:06:55 +01:00
parent af95f834f1
commit 8d02c2c0fc
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
+14 -7
View File
@@ -929,15 +929,23 @@ bool nr_ue_periodic_srs_scheduling(module_id_t mod_id, frame_t frame, slot_t slo
bool srs_scheduled = false; bool srs_scheduled = false;
NR_UE_MAC_INST_t *mac = get_mac_inst(mod_id); NR_UE_MAC_INST_t *mac = get_mac_inst(mod_id);
NR_BWP_Id_t ul_bwp_id = mac->UL_BWP_Id;
NR_SRS_Config_t *srs_config = NULL; NR_SRS_Config_t *srs_config = NULL;
if (mac->cg && if (ul_bwp_id > 0 && mac->ULbwp[ul_bwp_id-1]) {
mac->cg->spCellConfig && if (mac->ULbwp[ul_bwp_id-1]->bwp_Dedicated &&
mac->cg->spCellConfig->spCellConfigDedicated && mac->ULbwp[ul_bwp_id-1]->bwp_Dedicated->srs_Config) {
mac->cg->spCellConfig->spCellConfigDedicated->uplinkConfig && srs_config = mac->ULbwp[ul_bwp_id-1]->bwp_Dedicated->srs_Config->choice.setup;
mac->cg->spCellConfig->spCellConfigDedicated->uplinkConfig->initialUplinkBWP) { }
} else if (mac->cg &&
mac->cg->spCellConfig &&
mac->cg->spCellConfig->spCellConfigDedicated &&
mac->cg->spCellConfig->spCellConfigDedicated->uplinkConfig &&
mac->cg->spCellConfig->spCellConfigDedicated->uplinkConfig->initialUplinkBWP) {
srs_config = mac->cg->spCellConfig->spCellConfigDedicated->uplinkConfig->initialUplinkBWP->srs_Config->choice.setup; srs_config = mac->cg->spCellConfig->spCellConfigDedicated->uplinkConfig->initialUplinkBWP->srs_Config->choice.setup;
} else { }
if (!srs_config) {
return false; return false;
} }
@@ -965,7 +973,6 @@ bool nr_ue_periodic_srs_scheduling(module_id_t mod_id, frame_t frame, slot_t slo
continue; continue;
} }
NR_BWP_Id_t ul_bwp_id = mac->UL_BWP_Id;
NR_BWP_t ubwp = ul_bwp_id > 0 && mac->ULbwp[ul_bwp_id-1] ? NR_BWP_t ubwp = ul_bwp_id > 0 && mac->ULbwp[ul_bwp_id-1] ?
mac->ULbwp[ul_bwp_id-1]->bwp_Common->genericParameters : mac->ULbwp[ul_bwp_id-1]->bwp_Common->genericParameters :
mac->scc_SIB->uplinkConfigCommon->initialUplinkBWP.genericParameters; mac->scc_SIB->uplinkConfigCommon->initialUplinkBWP.genericParameters;