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

fix ULSCH harq_pid calculate issue

Browse Source
This commit is contained in:
Xu Bo
2017-11-23 16:23:08 +09:00
parent ad859ddf5e
commit ac0d39af37
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/PHY/LTE_TRANSPORT/dci_tools.c
+1 -1
View File
@@ -6492,7 +6492,7 @@ uint8_t pdcch_alloc2ul_subframe(LTE_DL_FRAME_PARMS *frame_parms,uint8_t n)
else else
ul_subframe = ((n+4)%10); ul_subframe = ((n+4)%10);
if (subframe_select(frame_parms,ul_subframe) != SF_UL) return(255); if ( (subframe_select(frame_parms,ul_subframe) != SF_UL) && (frame_parms->frame_type == TDD)) return(255);
LOG_D(PHY, "subframe %d: PUSCH subframe = %d\n", n, ul_subframe); LOG_D(PHY, "subframe %d: PUSCH subframe = %d\n", n, ul_subframe);
return ul_subframe; return ul_subframe;
openair2/LAYER2/MAC/pre_processor.c
+1 -1
View File
@@ -2075,7 +2075,7 @@ void ulsch_scheduler_pre_ue_select(
cc = &eNB->common_channels[CC_id]; cc = &eNB->common_channels[CC_id];
//harq_pid //harq_pid
harq_pid = subframe2harqpid(cc,frameP,subframeP); harq_pid = subframe2harqpid(cc,(frameP+(subframeP>=6 ? 1 : 0)),((subframeP+4)%10));
//round //round
round = UE_list->UE_sched_ctrl[UE_id].round_UL[CC_id][harq_pid]; round = UE_list->UE_sched_ctrl[UE_id].round_UL[CC_id][harq_pid];