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

Merge remote-tracking branch 'origin/NR_SR_bugfix' into integration_2022_wk10

Browse Source
This commit is contained in:
Robert Schmidt
2022-03-14 19:11:17 +01:00
parent b63c7b0e54 0c5242ea85
commit b0dd17f938
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
+10 -7
View File
@@ -79,7 +79,9 @@ void nr_fill_nfapi_pucch(module_id_t mod_id,
NR_BWP_UplinkDedicated_t *ubwpd; NR_BWP_UplinkDedicated_t *ubwpd;
ubwpd = cg ? cg->spCellConfig->spCellConfigDedicated->uplinkConfig->initialUplinkBWP:NULL; ubwpd = cg ? cg->spCellConfig->spCellConfigDedicated->uplinkConfig->initialUplinkBWP:NULL;
LOG_D(NR_MAC,"pucch_acknak: %d.%d Calling nr_configure_pucch (ubwpd %p,r_pucch %d) pucch in %d.%d\n",frame,slot,ubwpd,pucch->r_pucch,pucch->frame,pucch->ul_slot); LOG_D(NR_MAC,"%d.%d Calling nr_configure_pucch (ubwpd %p,r_pucch %d) pucch to be scheduled in %d.%d\n",
frame,slot,ubwpd,pucch->r_pucch,pucch->frame,pucch->ul_slot);
nr_configure_pucch(pucch_pdu, nr_configure_pucch(pucch_pdu,
scc, scc,
UE_info->CellGroup[UE_id], UE_info->CellGroup[UE_id],
@@ -1880,12 +1882,13 @@ void nr_sr_reporting(int Mod_idP, frame_t SFN, sub_frame_t slot)
} }
curr_pucch->sr_flag = true; curr_pucch->sr_flag = true;
} else { } else {
NR_sched_pucch_t sched_sr; NR_sched_pucch_t sched_sr = {
memset(&sched_sr, 0, sizeof(sched_sr)); .frame = SFN,
sched_sr.frame = SFN; .ul_slot = slot,
sched_sr.ul_slot = slot; .sr_flag = true,
sched_sr.resource_indicator = found; .resource_indicator = found,
sched_sr.sr_flag = true; .r_pucch = -1
};
nr_fill_nfapi_pucch(Mod_idP, SFN, slot, &sched_sr, UE_id); nr_fill_nfapi_pucch(Mod_idP, SFN, slot, &sched_sr, UE_id);
} }
} }