From 593ebc4732f361aa798d38f0fdd55bd3a49a3b80 Mon Sep 17 00:00:00 2001 From: jftt_wangshanshan Date: Thu, 8 Feb 2018 18:08:38 +0800 Subject: [PATCH] Fix bug in subframe2harq_pid. Remove if tdd condition while calling this method since there is already if-else in the method. --- openair1/PHY/LTE_TRANSPORT/dci_tools.c | 5 ----- openair1/SCHED/phy_procedures_lte_eNb.c | 3 +-- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/openair1/PHY/LTE_TRANSPORT/dci_tools.c b/openair1/PHY/LTE_TRANSPORT/dci_tools.c index 722341ea65..855571fe54 100644 --- a/openair1/PHY/LTE_TRANSPORT/dci_tools.c +++ b/openair1/PHY/LTE_TRANSPORT/dci_tools.c @@ -6587,12 +6587,7 @@ uint8_t subframe2harq_pid(LTE_DL_FRAME_PARMS *frame_parms,uint32_t frame,uint8_t } else { switch (frame_parms->tdd_config) { - case 1: - if ((subframe==2) || - (subframe==3) || - (subframe==7) || - (subframe==8)) switch (subframe) { case 2: case 3: diff --git a/openair1/SCHED/phy_procedures_lte_eNb.c b/openair1/SCHED/phy_procedures_lte_eNb.c index c0662b5b8e..bc9b0e4f4e 100644 --- a/openair1/SCHED/phy_procedures_lte_eNb.c +++ b/openair1/SCHED/phy_procedures_lte_eNb.c @@ -1351,8 +1351,7 @@ void pusch_procedures(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc) const int subframe = proc->subframe_rx; const int frame = proc->frame_rx; - if (fp->frame_type == FDD) harq_pid = ((10*frame) + subframe)&7; - else harq_pid = subframe2harq_pid(&eNB->frame_parms,frame,subframe); + harq_pid = subframe2harq_pid(&eNB->frame_parms,frame,subframe); for (i=0; iulsch[i];