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

Merge remote-tracking branch 'origin/fix_rballoc_mask_type' into integration_2022_wk12_a

Browse Source
This commit is contained in:
Robert Schmidt
2022-03-25 08:29:52 +01:00
parent 3d564fb94a 9a884af00a
commit bf58c6b475
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
+3 -3
View File
@@ -958,7 +958,7 @@ int next_list_entry_looped(NR_list_t *list, int UE_id)
bool allocate_ul_retransmission(module_id_t module_id, bool allocate_ul_retransmission(module_id_t module_id,
frame_t frame, frame_t frame,
sub_frame_t slot, sub_frame_t slot,
uint8_t *rballoc_mask, uint16_t *rballoc_mask,
int *n_rb_sched, int *n_rb_sched,
int UE_id, int UE_id,
int harq_pid) int harq_pid)
@@ -1121,7 +1121,7 @@ void pf_ul(module_id_t module_id,
NR_list_t *UE_list, NR_list_t *UE_list,
int max_num_ue, int max_num_ue,
int n_rb_sched, int n_rb_sched,
uint8_t *rballoc_mask) { uint16_t *rballoc_mask) {
const int CC_id = 0; const int CC_id = 0;
gNB_MAC_INST *nrmac = RC.nrmac[module_id]; gNB_MAC_INST *nrmac = RC.nrmac[module_id];
@@ -1505,7 +1505,7 @@ bool nr_fr1_ulsch_preprocessor(module_id_t module_id, frame_t frame, sub_frame_t
LOG_D(NR_MAC,"UL %d.%d : start_prb %d, end PRB %d\n",frame,slot,st,e); LOG_D(NR_MAC,"UL %d.%d : start_prb %d, end PRB %d\n",frame,slot,st,e);
uint8_t rballoc_mask[bwpSize]; uint16_t rballoc_mask[bwpSize];
/* Calculate mask: if any RB in vrb_map_UL is blocked (1), the current RB will be 0 */ /* Calculate mask: if any RB in vrb_map_UL is blocked (1), the current RB will be 0 */
for (int i = 0; i < bwpSize; i++) for (int i = 0; i < bwpSize; i++)