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

another fix in acknack scheduling

Browse Source
This commit is contained in:
francescomani
2021-09-27 19:35:34 +02:00
parent e946804bbf
commit 1022311a8e
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
+1 -1
View File
@@ -445,7 +445,7 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
schedule_nr_prach(module_idP, f, s); schedule_nr_prach(module_idP, f, s);
} }
// This schedule SR // This schedule SR
nr_sr_reporting(module_idP, frame, slot); nr_sr_reporting(module_idP, frame, slot);
// Schedule CSI-RS transmission // Schedule CSI-RS transmission
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
+4 -3
View File
@@ -1289,8 +1289,10 @@ int nr_acknack_scheduling(int mod_id,
LOG_D(NR_MAC,"pucch_acknak : %d.%d DAI = 0, looking for new pucch occasion\n",frame,slot); LOG_D(NR_MAC,"pucch_acknak : %d.%d DAI = 0, looking for new pucch occasion\n",frame,slot);
/* we need to find a new PUCCH occasion */ /* we need to find a new PUCCH occasion */
/*Inizialization of timing information*/ /*(Re)Inizialization of timing information*/
if (pucch->frame == 0 && pucch->ul_slot == 0) { if ((pucch->frame == 0 && pucch->ul_slot == 0) ||
((pucch->frame*n_slots_frame + pucch->ul_slot) <
(frame*n_slots_frame + slot))) {
AssertFatal(pucch->sr_flag + pucch->dai_c == 0, AssertFatal(pucch->sr_flag + pucch->dai_c == 0,
"expected no SR/AckNack for UE %d in %4d.%2d, but has %d/%d for %4d.%2d\n", "expected no SR/AckNack for UE %d in %4d.%2d, but has %d/%d for %4d.%2d\n",
UE_id, frame, slot, pucch->sr_flag, pucch->dai_c, pucch->frame, pucch->ul_slot); UE_id, frame, slot, pucch->sr_flag, pucch->dai_c, pucch->frame, pucch->ul_slot);
@@ -1364,7 +1366,6 @@ int nr_acknack_scheduling(int mod_id,
} }
// multiplexing harq and csi in a pucch // multiplexing harq and csi in a pucch
else { else {
memset(pucch, 0, sizeof(*pucch));
csi_pucch->timing_indicator = ind_found; csi_pucch->timing_indicator = ind_found;
csi_pucch->dai_c++; csi_pucch->dai_c++;
return 1; return 1;