Fix bug in subframe2harq_pid. Remove if tdd condition while calling this...

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

@@ -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:

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; i<NUMBER_OF_UE_MAX; i++) {
     ulsch = eNB->ulsch[i];