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

Fix bug in subframe2harq_pid. Remove if tdd condition while calling this method since there is already if-else in the method.

Browse Source
This commit is contained in:
jftt_wangshanshan
2018-02-08 18:08:38 +08:00
parent 9ba0355000
commit 593ebc4732
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/PHY/LTE_TRANSPORT/dci_tools.c
-5
View File
@@ -6587,12 +6587,7 @@ uint8_t subframe2harq_pid(LTE_DL_FRAME_PARMS *frame_parms,uint32_t frame,uint8_t
} else { } else {
switch (frame_parms->tdd_config) { switch (frame_parms->tdd_config) {
case 1: case 1:
if ((subframe==2) ||
(subframe==3) ||
(subframe==7) ||
(subframe==8))
switch (subframe) { switch (subframe) {
case 2: case 2:
case 3: case 3:
openair1/SCHED/phy_procedures_lte_eNb.c
+1 -2
View File
@@ -1351,8 +1351,7 @@ void pusch_procedures(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc)
const int subframe = proc->subframe_rx; const int subframe = proc->subframe_rx;
const int frame = proc->frame_rx; const int frame = proc->frame_rx;
if (fp->frame_type == FDD) harq_pid = ((10*frame) + subframe)&7; harq_pid = subframe2harq_pid(&eNB->frame_parms,frame,subframe);
else harq_pid = subframe2harq_pid(&eNB->frame_parms,frame,subframe);
for (i=0; i<NUMBER_OF_UE_MAX; i++) { for (i=0; i<NUMBER_OF_UE_MAX; i++) {
ulsch = eNB->ulsch[i]; ulsch = eNB->ulsch[i];