Add full tdd 6 - cleanup not used function

openair1/PHY/INIT/lte_init.c

@@ -414,8 +414,8 @@ int phy_init_lte_eNB(PHY_VARS_eNB *eNB,
          eNB->Mod_id, fp->N_RB_DL, fp->phich_config_common.phich_resource, fp->phich_config_common.phich_duration);
   crcTableInit();
   lte_gold (fp, eNB->lte_gold_table, fp->Nid_cell);
-  generate_pcfich_reg_mapping (fp);
-  generate_phich_reg_mapping (fp);
+  generate_pcfich_reg_mapping(fp);
+  generate_phich_reg_mapping(fp);
   init_sss();
 
   init_fde();

openair1/PHY/LTE_TRANSPORT/dci_tools_common.c

@@ -864,70 +864,90 @@ uint32_t get_rballoc(vrb_t vrb_type,uint16_t rb_alloc_dci)
 
 }
 
+// In TDD modes 1-5, each HarqPID is associated with a unique subframe and the number of harq processes equals the
+// number of UL subframes. Modes 0 and 6 have more processes than UL subframes so HarqPID depends on sfn
 uint8_t subframe2harq_pid(LTE_DL_FRAME_PARMS *frame_parms,uint32_t frame,uint8_t subframe)
 {
   uint8_t ret = 255;
 
   if (frame_parms->frame_type == FDD) {
-    ret = (((frame*10)+subframe)&7);
+    ret = (((frame * 10) + subframe) & 7);
   } else {
-
     switch (frame_parms->tdd_config) {
-    case 1:
-      switch (subframe) {
+      uint32_t cycle_idx;
+      case 0:
+        cycle_idx = 7 - frame % 7;
+        if (subframe < 5) {
+          ret = (cycle_idx + subframe - 2) % 7;
+          break;
+        } else {
+          ret = (cycle_idx + subframe - 4) % 7;
+          break;
+        }
+
+      case 1:
+        switch (subframe) {
+          case 2:
+          case 3:
+            ret = (subframe - 2);
+            break;
+
+          case 7:
+          case 8:
+            ret = (subframe - 5);
+            break;
+
+          default:
+            LOG_E(PHY, "subframe2harq_pid, Illegal subframe %d for TDD mode %d\n", subframe, frame_parms->tdd_config);
+            break;
+        }
+
+        break;
+
       case 2:
+        if ((subframe != 2) && (subframe != 7)) {
+          LOG_E(PHY, "subframe2harq_pid, Illegal subframe %d for TDD mode %d\n", subframe, frame_parms->tdd_config);
+          break;
+        } else
+          ret = (subframe / 7);
+        break;
+
       case 3:
-        ret = (subframe-2);
+        if ((subframe < 2) || (subframe > 4)) {
+          LOG_E(PHY, "subframe2harq_pid, Illegal subframe %d for TDD mode %d\n", subframe, frame_parms->tdd_config);
+          break;
+        } else
+          ret = (subframe - 2);
         break;
 
-      case 7:
-      case 8:
-        ret = (subframe-5);
+      case 4:
+        if ((subframe < 2) || (subframe > 3)) {
+          LOG_E(PHY, "subframe2harq_pid, Illegal subframe %d for TDD mode %d\n", subframe, frame_parms->tdd_config);
+          break;
+        } else
+          ret = (subframe - 2);
         break;
 
+      case 5:
+        if (subframe != 2) {
+          LOG_E(PHY, "subframe2harq_pid, Illegal subframe %d for TDD mode %d\n", subframe, frame_parms->tdd_config);
+          break;
+        } else
+          ret = (subframe - 2);
+        break;
+
+      case 6:
+        cycle_idx = 6 - frame % 6;
+        if (subframe < 5) {
+          ret = (cycle_idx + subframe - 2) % 6;
+          break;
+        } else {
+          ret = (cycle_idx + subframe - 4) % 6;
+          break;
+        }
       default:
-        LOG_E(PHY,"subframe2_harq_pid, Illegal subframe %d for TDD mode %d\n",subframe,frame_parms->tdd_config);
-        ret = (255);
+        LOG_E(PHY, "subframe2harq_pid, Unsupported TDD mode %d\n", frame_parms->tdd_config);
         break;
-      }
-
-      break;
-
-    case 2:
-      if ((subframe!=2) && (subframe!=7)) {
-        LOG_E(PHY, "subframe2_harq_pid, Illegal subframe %d for TDD mode %d\n", subframe, frame_parms->tdd_config);
-        ret = 255;
-      }
-      else ret = (subframe/7);
-      break;
-
-    case 3:
-      if ((subframe<2) || (subframe>4)) {
-        LOG_E(PHY,"subframe2_harq_pid, Illegal subframe %d for TDD mode %d\n",subframe,frame_parms->tdd_config);
-        ret = (255);
-      }
-      else ret = (subframe-2);
-      break;
-
-    case 4:
-      if ((subframe<2) || (subframe>3)) {
-        LOG_E(PHY,"subframe2_harq_pid, Illegal subframe %d for TDD mode %d\n",subframe,frame_parms->tdd_config);
-        ret = (255);
-      }
-      else ret = (subframe-2);
-      break;
-
-    case 5:
-      if (subframe!=2) {
-        LOG_E(PHY,"subframe2_harq_pid, Illegal subframe %d for TDD mode %d\n",subframe,frame_parms->tdd_config);
-        ret = (255);
-      }
-      else ret = (subframe-2);
-      break;
-
-    default:
-      LOG_E(PHY,"subframe2_harq_pid, Unsupported TDD mode %d\n",frame_parms->tdd_config);
-      ret = (255);
     }
   }
 
@@ -935,78 +955,102 @@ uint8_t subframe2harq_pid(LTE_DL_FRAME_PARMS *frame_parms,uint32_t frame,uint8_t
   return ret;
 }
 
-uint8_t pdcch_alloc2ul_subframe(LTE_DL_FRAME_PARMS *frame_parms,uint8_t n)
+// Application of K factor from 3GPP TS 36213, Table 8-2 for TDD. For FDD K = 4
+uint8_t pdcch_alloc2ul_subframe(LTE_DL_FRAME_PARMS *frame_parms, uint8_t subframe)
 {
   uint8_t ul_subframe = 255;
 
-  if ((frame_parms->frame_type == TDD) &&
-      (frame_parms->tdd_config == 1)) {
-    if ((n==1)||(n==6)) { // tdd_config 0,1 SF 1,5
-      ul_subframe = ((n+6)%10);
-    } else if ((n==4)||(n==9)) {
-      ul_subframe = ((n+4)%10);
+  if (frame_parms->frame_type == TDD) {
+    switch (frame_parms->tdd_config) {
+      case 1: // TDD config 1 - DL subframes to grant PUSCH 1,6,4 and 9
+        if ((subframe == 1) || (subframe == 6)) {
+          ul_subframe = ((subframe + 6) % 10);
+        } else if ((subframe == 4) || (subframe == 9)) {
+          ul_subframe = ((subframe + 4) % 10);
+        }
+        break;
+
+      case 6: // TDD config 6 - DL subframes to grant PUSCH 0,1,5,6 and 9
+        if ((subframe == 0) || (subframe == 1) || (subframe == 5) || (subframe == 6)) {
+          ul_subframe = ((subframe + 7) % 10);
+        } else if (subframe == 9) {
+          ul_subframe = ((subframe + 5) % 10);
+        }
+      default:
+        break;
     }
-  } else if ((frame_parms->frame_type == TDD) &&
-           (frame_parms->tdd_config == 6) &&
-           ((n==0)||(n==1)||(n==5)||(n==6)))
-    ul_subframe = ((n+7)%10);
-  else if ((frame_parms->frame_type == TDD) &&
-           (frame_parms->tdd_config == 6) &&
-           (n==9)) // tdd_config 6 SF 9
-    ul_subframe = ((n+5)%10);
-  else
-    ul_subframe = ((n+4)%10);
+  } else // FDD
+    ul_subframe = ((subframe + 4) % 10);
 
-  if ( (subframe_select(frame_parms,ul_subframe) != SF_UL) && (frame_parms->frame_type == TDD)) 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", subframe, ul_subframe);
   return ul_subframe;
 }
 
-uint8_t ul_subframe2pdcch_alloc_subframe(LTE_DL_FRAME_PARMS *frame_parms,uint8_t n)
+uint8_t ul_subframe2pdcch_alloc_subframe(LTE_DL_FRAME_PARMS *frame_parms, uint8_t subframe)
 {
-  if ((frame_parms->frame_type == TDD) &&
-      (frame_parms->tdd_config == 1)) {
-    if ((n==7)||(n==2)) { // tdd_config 0,1 SF 1,5
-      return((n==7)? 1 : 6);
-    } else if ((n==3)||(n==8)) {
-      return((n==3)? 9 : 4);
-    }
-  } else if ((frame_parms->frame_type == TDD) &&
-           (frame_parms->tdd_config == 6) &&
-           ((n==7)||(n==8)||(n==2)||(n==3)))
-    return((n+3)%10);
-  else if ((frame_parms->frame_type == TDD) &&
-           (frame_parms->tdd_config == 6) &&
-           (n==4)) // tdd_config 6 SF 9
-    return(9);
-  else
-    return((n+6)%10);
+  if (frame_parms->frame_type == TDD) {
+    switch (frame_parms->tdd_config) {
+      case 0: // TDD config 0 - UL subframes where PUSCH has been allocated are 2,3,4,7,8 and 9
+        if ((subframe == 7) || (subframe == 8) || (subframe == 2) || (subframe == 3))
+          return ((subframe + 3) % 10);
+        else if ((subframe == 4) || (subframe == 9))
+          return ((subframe == 4) ? 9 : 5);
+        break;
 
-  LOG_E(PHY, "%s %s:%i pdcch allocation error\n",__FUNCTION__,__FILE__,__LINE__);
+      case 1: // TDD config 1 - UL subframes where PUSCH has been allocated are 2,3,7 and 8
+        if ((subframe == 7) || (subframe == 2))
+          return ((subframe == 7) ? 1 : 6);
+        else if ((subframe == 3) || (subframe == 8))
+          return ((subframe == 3) ? 9 : 4);
+        break;
+
+      case 6: // TDD config 6 - UL subframes where PUSCH has been allocated are 2,3,4, 7 and 8
+        if ((subframe == 7) || (subframe == 8) || (subframe == 2) || (subframe == 3))
+          return ((subframe + 3) % 10);
+        else if (subframe == 4)
+          return (9);
+        break;
+
+      default:
+        break;
+    }
+  } else // FDD
+    return ((subframe + 6) % 10);
+
+  AssertFatal(false, "pdcch allocation error\n");
   return 0;
 }
 
-uint32_t pdcch_alloc2ul_frame(LTE_DL_FRAME_PARMS *frame_parms,uint32_t frame, uint8_t n)
+// Find frame (current or next one) for PUSCH allocation from DL subframe
+uint32_t pdcch_alloc2ul_frame(LTE_DL_FRAME_PARMS *frame_parms, uint32_t frame, uint8_t subframe)
 {
-  uint32_t ul_frame;
+  uint32_t ul_frame = 0;
+  if (frame_parms->frame_type == TDD) {
+    switch (frame_parms->tdd_config) {
+      case 1: // TDD config 1 - For DL subframes 6 and 9 we do to next Frame to allocate PUSCH
+        if ((subframe == 1) || (subframe == 6) || (subframe == 4) || (subframe == 9)) {
+          ul_frame = (frame + (subframe < 5 ? 0 : 1));
+        }
+        break;
 
-  if ((frame_parms->frame_type == TDD) &&
-      (frame_parms->tdd_config == 1) &&
-      ((n==1)||(n==6)||(n==4)||(n==9))) { // tdd_config 0,1 SF 1,5
-      ul_frame = (frame + (n < 5 ? 0 : 1));
-  } else if ((frame_parms->frame_type == TDD) &&
-           (frame_parms->tdd_config == 6) &&
-           ((n==0)||(n==1)||(n==5)||(n==6)))
-    ul_frame = (frame + (n>=5 ? 1 : 0));
-  else if ((frame_parms->frame_type == TDD) &&
-           (frame_parms->tdd_config == 6) &&
-           (n==9)) // tdd_config 6 SF 9
-    ul_frame = (frame+1);
-  else
-    ul_frame = (frame+(n>=6 ? 1 : 0));
+      case 6: // TDD config 6 - For DL subframes 5, 6 and 9 we do to next Frame to allocate PUSCH
+        if ((subframe == 0) || (subframe == 1) || (subframe == 5) || (subframe == 6) || (subframe == 9)) {
+          ul_frame = (frame + (subframe >= 5 ? 1 : 0));
+        }
+        break;
+
+      default:
+        AssertFatal(1 == 0, "TDD mode not supported %d", frame_parms->tdd_config);
+        break;
+    }
+  } else // FDD
+    ul_frame = (frame + (subframe >= 6 ? 1 : 0));
+
+  LOG_D(PHY, "frame %d subframe %d: PUSCH frame = %d\n", frame, subframe, ul_frame);
 
-  LOG_D(PHY, "frame %d subframe %d: PUSCH frame = %d\n", frame, n, ul_frame);
   return ul_frame % 1024;
 }
 

openair1/PHY/LTE_TRANSPORT/phich.c

@@ -723,6 +723,9 @@ void generate_phich_top(PHY_VARS_eNB *eNB,
   if (((frame_parms->phich_config_common.phich_resource*frame_parms->N_RB_DL)%48) > 0)
     Ngroup_PHICH++;
 
+  uint8_t mi = get_mi(frame_parms, subframe);
+  Ngroup_PHICH *= mi;
+
   if (frame_parms->Ncp == 1)
     NSF_PHICH = 2;
 
@@ -750,28 +753,42 @@ void generate_phich_top(PHY_VARS_eNB *eNB,
       LOG_E(PHY,"FATAL ERROR: illegal harq_pid, returning\n");
 	  return;
 	}
-    LOG_D(PHY,"[eNB %d][PUSCH %d] Frame %d subframe %d Generating PHICH, AMP %d  ngroup_PHICH %d/%d, nseq_PHICH %d : HI %d, first_rb %d)\n",
-	  eNB->Mod_id,harq_pid,proc->frame_tx,
-	  subframe,amp,ngroup_PHICH,Ngroup_PHICH,nseq_PHICH,
-	  phich->hi,
-	  phich->first_rb);
-    
-    T(T_ENB_PHY_PHICH, T_INT(eNB->Mod_id), T_INT(proc->frame_tx), T_INT(subframe),
-      T_INT(-1 /* TODO: rnti */), 
-      T_INT(harq_pid),
-      T_INT(Ngroup_PHICH), T_INT(NSF_PHICH),
-      T_INT(ngroup_PHICH), T_INT(nseq_PHICH),
-      T_INT(phich->hi),
-      T_INT(phich->first_rb),
-      T_INT(phich->n_DMRS));
-    
-    generate_phich(frame_parms,
-		   amp,//amp*2,
-		   nseq_PHICH,
-		   ngroup_PHICH,
-		   phich->hi,
-		   subframe,
-		   txdataF);
+  LOG_D(PHY,
+        "[eNB %d][PUSCH %d] Frame %d subframe %d Generating PHICH for PUSCH slot %d, AMP %d ngroup_PHICH %d/%d, nseq_PHICH %d : HI "
+        "%d, first_rb %d)\n",
+        eNB->Mod_id,
+        harq_pid,
+        proc->frame_tx,
+        subframe,
+        pusch_subframe,
+        amp,
+        ngroup_PHICH,
+        Ngroup_PHICH,
+        nseq_PHICH,
+        phich->hi,
+        phich->first_rb);
+
+  T(T_ENB_PHY_PHICH,
+    T_INT(eNB->Mod_id),
+    T_INT(proc->frame_tx),
+    T_INT(subframe),
+    T_INT(-1 /* TODO: rnti */),
+    T_INT(harq_pid),
+    T_INT(Ngroup_PHICH),
+    T_INT(NSF_PHICH),
+    T_INT(ngroup_PHICH),
+    T_INT(nseq_PHICH),
+    T_INT(phich->hi),
+    T_INT(phich->first_rb),
+    T_INT(phich->n_DMRS));
+
+  generate_phich(frame_parms,
+                 amp, // amp*2,
+                 nseq_PHICH,
+                 ngroup_PHICH,
+                 phich->hi,
+                 subframe,
+                 txdataF);
   }//  for (i=0; i<eNB->phich_vars[subframe&1].num_hi; i++) { 
   eNB->phich_vars[subframe&1].num_hi=0;
 }

openair1/PHY/LTE_TRANSPORT/phich_common.c

@@ -32,13 +32,12 @@
 
 #include "PHY/defs_eNB.h"
 
-
+// Refer to Table PHICH factor for TDD transmissions - 3GPP 36211, Table 6.9-1
 uint8_t get_mi(LTE_DL_FRAME_PARMS *frame_parms,uint8_t subframe)
 {
   // for FeMBMS
-  if(frame_parms->FeMBMS_active!=0){
-	return(0);
-  }
+  if (frame_parms->FeMBMS_active != 0)
+    return (0);
 
   // for FDD
   if (frame_parms->frame_type == FDD)
@@ -47,9 +46,12 @@ uint8_t get_mi(LTE_DL_FRAME_PARMS *frame_parms,uint8_t subframe)
   // for TDD
   switch (frame_parms->tdd_config) {
     case 0:
-      if ((subframe==0) || (subframe==5))
-        return(2);
-      else return(1);
+      if ((subframe == 0) || (subframe == 5)) {
+        return 2;
+      } else if ((subframe == 1) || (subframe == 6)) {
+        return 1;
+      } else
+        return 0;
 
       break;
 
@@ -89,7 +91,10 @@ uint8_t get_mi(LTE_DL_FRAME_PARMS *frame_parms,uint8_t subframe)
       break;
 
     case 6:
-      return(1);
+      if ((subframe == 0) || (subframe == 1) || (subframe == 5) || (subframe == 6) || (subframe == 9))
+        return 1;
+      else
+        return 0;
       break;
 
     default:
@@ -97,82 +102,51 @@ uint8_t get_mi(LTE_DL_FRAME_PARMS *frame_parms,uint8_t subframe)
   }
 }
 
-unsigned char subframe2_ul_harq(LTE_DL_FRAME_PARMS *frame_parms,unsigned char subframe) {
-  if (frame_parms->frame_type == FDD)
-    return(subframe&7);
-
-  switch (frame_parms->tdd_config) {
-  case 1:
-    if (subframe == 6) {
-      return(0);
-    } else if (subframe==9){
-      return(1);
-    } else if (subframe==1){
-      return(2);
-    } else if (subframe==4){
-      return(3);
-    } else {
-      LOG_E(PHY,"phich.c: subframe2_ul_harq, illegal subframe %d for tdd_config %d\n",
-            subframe,frame_parms->tdd_config);
-      return(0);
-    }
-
-    break;
-  case 2:
-    if (subframe == 3) {
-      return(1);
-    } else if (subframe==8){
-      return(0);
-    } else {
-      LOG_E(PHY,"phich.c: subframe2_ul_harq, illegal subframe %d for tdd_config %d\n",
-            subframe,frame_parms->tdd_config);
-      return(0);
-    }
-
-    break;
-    case 3:
-      if ( (subframe == 8) || (subframe == 9) ) {
-        return(subframe-8);
-      } else if (subframe==0)
-        return(2);
-      else {
-        LOG_E(PHY,"phich.c: subframe2_ul_harq, illegal subframe %d for tdd_config %d\n",
-              subframe,frame_parms->tdd_config);
-        return(0);
-      }
-
-      break;
-
-    case 4:
-      if ( (subframe == 8) || (subframe == 9) ) {
-        return(subframe-8);
-      } else {
-        LOG_E(PHY,"phich.c: subframe2_ul_harq, illegal subframe %d for tdd_config %d\n",
-              subframe,frame_parms->tdd_config);
-        return(0);
-      }
-
-      break;
-  }
-
-  return(0);
-}
-
-int phich_frame2_pusch_frame(LTE_DL_FRAME_PARMS *frame_parms, int frame, int subframe) {
-  int pusch_frame;
+// Refer to 3GPP TS 36213, Table 8.3-1
+// In therory, Frame is not needed for other TDD modes than 0 and 6
+int phich_frame2_pusch_frame(LTE_DL_FRAME_PARMS *frame_parms, int frame, int subframe)
+{
+  int pusch_frame = frame;
 
   if (frame_parms->frame_type == FDD) {
-    pusch_frame = subframe<4 ? frame + 1024 - 1 : frame;
+    pusch_frame = subframe < 4 ? frame + 1023 : frame;
   } else {
-    // Note this is not true, but it doesn't matter, the frame number is irrelevant for TDD!
-    pusch_frame = (frame);
+    switch (frame_parms->tdd_config) {
+      case 0:
+        if ((subframe == 0) || (subframe == 5) || (subframe == 7))
+          pusch_frame = frame + 1023;
+        break;
+      case 1:
+        if ((subframe == 1) || (subframe == 4))
+          pusch_frame = frame + 1023;
+        break;
+      case 2:
+        if (subframe == 3)
+          pusch_frame = frame + 1023;
+        break;
+      case 3:
+        if (subframe == 0)
+          pusch_frame = frame + 1023;
+        break;
+      case 4:
+        break;
+      case 5:
+        break;
+      case 6:
+        if ((subframe == 0) || (subframe == 1) || (subframe == 5))
+          pusch_frame = frame + 1023;
+        break;
+    }
   }
 
-  //LOG_D(PHY, "frame %d subframe %d: PUSCH frame = %d\n", frame, subframe, pusch_frame);
+  LOG_D(PHY, "phich_frame2_pusch_frame frame %d subframe %d: PUSCH frame = %d\n", frame, subframe, pusch_frame);
   return pusch_frame % 1024;
 }
 
-uint8_t phich_subframe2_pusch_subframe(LTE_DL_FRAME_PARMS *frame_parms,uint8_t subframe) {
+// Refer to 3GPP TS 36213, Table 8.3-1 - K factor application to find which PUSCH
+// the PHICH will ACK/NACK
+uint8_t phich_subframe2_pusch_subframe(LTE_DL_FRAME_PARMS *frame_parms, uint8_t subframe)
+{
   uint8_t pusch_subframe = 255;
 
   if (frame_parms->frame_type == FDD)
@@ -181,13 +155,13 @@ uint8_t phich_subframe2_pusch_subframe(LTE_DL_FRAME_PARMS *frame_parms,uint8_t s
   switch (frame_parms->tdd_config) {
     case 0:
       if (subframe == 0)
-        pusch_subframe = (3);
+        pusch_subframe = 4;
       else if (subframe == 5) {
-        pusch_subframe = (8);
+        pusch_subframe = 9;
       } else if (subframe == 6)
-        pusch_subframe = (2);
+        pusch_subframe = 2;
       else if (subframe == 1)
-        pusch_subframe = (7);
+        pusch_subframe = 7;
       else {
         AssertFatal(1==0,"phich.c: phich_subframe2_pusch_subframe, illegal subframe %d for tdd_config %d\n",
                     subframe,frame_parms->tdd_config);

openair1/SCHED_UE/phy_procedures_lte_ue.c

@@ -1124,6 +1124,64 @@ uint16_t get_n1_pucch(PHY_VARS_UE *ue,
         }
 
         break;
+
+      case 6: // DL:S:UL:UL:UL:DL:S:UL:UL:DL
+        harq_ack0 = 2; // DTX
+        M = 1;
+        if (subframe == 2) {
+          candidate_dl[0] = 5;
+        } else if (subframe == 3) {
+          candidate_dl[0] = 6;
+        } else if (subframe == 4) {
+          candidate_dl[0] = 9;
+        } else if (subframe == 7) {
+          candidate_dl[0] = 0;
+        } else if (subframe == 8) {
+          candidate_dl[0] = 1;
+        } else {
+          LOG_E(PHY,
+                "[UE%d] : Frame %d phy_procedures_lte.c: get_n1pucch, illegal tx-subframe %d for tdd_config %d\n",
+                ue->Mod_id,
+                proc->frame_tx,
+                subframe,
+                frame_parms->tdd_config);
+          return (0);
+        }
+
+        if (harq_ack[candidate_dl[0]].send_harq_status > 0) {
+          last_dl = candidate_dl[0];
+        }
+
+        if (last_dl >= 10) {
+          LOG_E(PHY,
+                "[UE%d] : Frame %d phy_procedures_lte.c: get_n1pucch, illegal rx-subframe %d (tx-subframe %d) for tdd_config %d\n",
+                ue->Mod_id,
+                proc->frame_tx,
+                last_dl,
+                subframe,
+                frame_parms->tdd_config);
+          return (0);
+        }
+
+        LOG_D(PHY, "SFN/SF %d/%d calculating n1_pucch0 from last_dl=%d\n", proc->frame_tx % 1024, proc->subframe_tx, last_dl);
+        // i=0
+        nCCE0 = ue->pdcch_vars[ue->current_thread_id[proc->subframe_rx]][eNB_id]->nCCE[last_dl];
+        n1_pucch0 = get_Np(frame_parms->N_RB_DL, nCCE0, 0) + nCCE0 + frame_parms->pucch_config_common.n1PUCCH_AN;
+        harq_ack0 = b[0];
+
+        if (harq_ack0 != 2) { // DTX
+          if (SR == 0) {
+            b[0] = harq_ack0;
+            b[1] = harq_ack0;
+            ue->pucch_sel[subframe] = 0;
+            return (n1_pucch0);
+          } else {
+            b[0] = harq_ack0;
+            b[1] = harq_ack0;
+            return (ue->scheduling_request_config[eNB_id].sr_PUCCH_ResourceIndex);
+          }
+        }
+        break;
     }  // switch tdd_config
   }
 

openair2/LAYER2/MAC/eNB_scheduler_RA.c

@@ -1329,9 +1329,10 @@ initiate_ra_proc(module_id_t module_idP,
             abort();
 
           case 1 :
-	  case 3 :
-	  case 4 :
+          case 3:
+          case 4:
           case 5 :
+          case 6:
             offset = 6;
             break;
         }

openair2/LAYER2/MAC/eNB_scheduler_dlsch.c

@@ -264,6 +264,7 @@ generate_dlsch_header(unsigned char *mac_header,
 }
 
 //------------------------------------------------------------------------------
+// For Dl subframe, we allocate the DAI of UL subframe accorting table (3GPP TS 36213, Table 10.1.3.1-1 K PDSCH)
 void
 set_ul_DAI(int module_idP,
            int UE_idP,
@@ -318,7 +319,23 @@ set_ul_DAI(int module_idP,
 
       case 2:
         //      if ((subframeP==3)||(subframeP==8))
-        //  UE_info->UE_template[CC_idP][UE_idP].DAI_ul = DAI;
+        //  UE_list->UE_template[CC_idP][UE_idP].DAI_ul = DAI;
+        switch (subframeP) {
+          case 0:
+          case 1:
+            UE_info->UE_template[CC_idP][UE_idP].DAI_ul[7] = DAI;
+            break;
+
+          case 4:
+          case 5:
+          case 8:
+            UE_info->UE_template[CC_idP][UE_idP].DAI_ul[2] = DAI;
+            break;
+
+          case 9:
+            UE_info->UE_template[CC_idP][UE_idP].DAI_ul[7] = DAI;
+            break;
+        }
         break;
 
       case 3:
@@ -361,8 +378,27 @@ set_ul_DAI(int module_idP,
         break;
 
       case 6:
-        //      if ((subframeP==1)||(subframeP==4)||(subframeP==6)||(subframeP==9))
-        //  UE_info->UE_template[CC_idP][UE_idP].DAI_ul = DAI;
+        switch (subframeP) {
+          case 0:
+            UE_info->UE_template[CC_idP][UE_idP].DAI_ul[7] = DAI;
+            break;
+
+          case 1:
+            UE_info->UE_template[CC_idP][UE_idP].DAI_ul[8] = DAI;
+            break;
+
+          case 5:
+            UE_info->UE_template[CC_idP][UE_idP].DAI_ul[2] = DAI;
+            break;
+
+          case 6:
+            UE_info->UE_template[CC_idP][UE_idP].DAI_ul[3] = DAI;
+            break;
+
+          case 9:
+            UE_info->UE_template[CC_idP][UE_idP].DAI_ul[4] = DAI;
+            break;
+        }
         break;
 
       default:

openair2/LAYER2/MAC/eNB_scheduler_fairRR.c

@@ -3097,11 +3097,16 @@ void schedule_ulsch_rnti_fairRR(module_id_t   module_idP,
         if (cc->tdd_Config) {
           switch (cc->tdd_Config->subframeAssignment) {
             case 1:
+            case 0:
+            case 2:
+            case 6:
               if( subframeP == 1 || subframeP == 6 ) cqi_req=0;
 
               break;
 
             case 3:
+            case 4:
+            case 5:
               if( subframeP == 1 ) cqi_req=0;
 
               break;

openair2/LAYER2/MAC/eNB_scheduler_primitives.c

@@ -212,7 +212,6 @@ get_Msg3alloc(COMMON_channels_t *cc,
               sub_frame_t       *subframe)
 //------------------------------------------------------------------------------
 {
-  // Fill in other TDD Configuration!!!!
   int subframeAssignment;
 
   if (cc->tdd_Config == NULL) { // FDD
@@ -227,7 +226,18 @@ get_Msg3alloc(COMMON_channels_t *cc,
   } else {      // TDD
     subframeAssignment = (int) cc->tdd_Config->subframeAssignment;
 
-    if (subframeAssignment == 1) {
+    if (subframeAssignment == 0) {
+      switch (current_subframe) {
+        case 0:
+          *subframe = 7;
+          *frame = current_frame;
+          break;
+        case 5:
+          *subframe = 2;
+          *frame = (current_frame + 1) & 1023;
+          break;
+      }
+    } else if (subframeAssignment == 1) {
       switch (current_subframe) {
         case 0:
           *subframe = 7;
@@ -249,6 +259,26 @@ get_Msg3alloc(COMMON_channels_t *cc,
           *frame = (current_frame + 1) & 1023;
           break;
       }
+    } else if (subframeAssignment == 2) {
+      switch (current_subframe) {
+        case 0:
+        case 3:
+          *subframe = 2;
+          *frame = (current_frame + 1) & 1023;
+          break;
+
+        case 4:
+        case 5:
+        case 8:
+          *subframe = 7;
+          *frame = (current_frame + 1) & 1023;
+          break;
+
+        case 9:
+          *subframe = 2;
+          *frame = (current_frame + 2) & 1023;
+          break;
+      }
     } else if (subframeAssignment == 3) {
       switch (current_subframe) {
         case 0:
@@ -311,6 +341,23 @@ get_Msg3alloc(COMMON_channels_t *cc,
           *frame = (current_frame + 2) & 1023;
           break;
       }
+    } else if (subframeAssignment == 6) {
+      switch (current_subframe) {
+        case 0:
+          *subframe = 7;
+          *frame = current_frame;
+          break;
+
+        case 5:
+          *subframe = 2;
+          *frame = (current_frame + 1) & 1023;
+          break;
+
+        case 9:
+          *subframe = 7;
+          *frame = (current_frame + 1) & 1023;
+          break;
+      }
     }
   }
 
@@ -341,12 +388,28 @@ get_Msg3allocret(COMMON_channels_t *cc,
   } else {
     subframeAssignment = (int) cc->tdd_Config->subframeAssignment;
 
-    if (subframeAssignment == 1) {
+    if (subframeAssignment == 0) {
+      // original PUSCH in 2, PHICH in 6 (S), ret in 2
+      // original PUSCH in 3, PHICH in 0, ret in 4
+      // original PUSCH in 4, PHICH in 0, ret in 4
+      // original PUSCH in 7, PHICH in 1 (S), ret in 7
+      // original PUSCH in 8, PHICH in 5, ret in 9
+      // original PUSCH in 9, PHICH in 5, ret in 9
+      *frame = (current_frame + 1) & 1023;
+      if ((*subframe == 3) || (*subframe == 8)) {
+        *subframe = ((*subframe == 3) ? 4 : 9);
+      }
+    } else if (subframeAssignment == 1) {
       // original PUSCH in 2, PHICH in 6 (S), ret in 2
       // original PUSCH in 3, PHICH in 9, ret in 3
       // original PUSCH in 7, PHICH in 1 (S), ret in 7
       // original PUSCH in 8, PHICH in 4, ret in 8
       *frame = (current_frame + 1) & 1023;
+    } else if (subframeAssignment == 2) {
+      // original PUSCH in 2, PHICH in 8, ret in 2 next frame
+      // original PUSCH in 3, PHICH in 9, ret in 3 next frame
+      // original PUSCH in 4, PHICH in 0, ret in 4 next frame
+      *frame = (current_frame + 1) & 1023;
     } else if (subframeAssignment == 3) {
       // original PUSCH in 2, PHICH in 8, ret in 2 next frame
       // original PUSCH in 3, PHICH in 9, ret in 3 next frame
@@ -359,6 +422,34 @@ get_Msg3allocret(COMMON_channels_t *cc,
     } else if (subframeAssignment == 5) {
       // original PUSCH in 2, PHICH in 8, ret in 2 next frame
       *frame = (current_frame + 1) & 1023;
+    } else if (cc->tdd_Config->subframeAssignment == 6) {
+      // original PUSCH in 2, PHICH in 6 (S), ret in 3
+      // original PUSCH in 3, PHICH in 9, ret in 4
+      // original PUSCH in 4, PHICH in 0, ret in 7
+      // original PUSCH in 7, PHICH in 1 (S), ret in 8
+      // original PUSCH in 8, PHICH in 5, ret in 2+
+      *frame = (current_frame + 1) & 1023;
+      switch (*subframe) {
+        case 2:
+          *subframe = 3;
+          break;
+        case 3:
+          *subframe = 4;
+          break;
+        case 4:
+          *subframe = 7;
+          break;
+        case 7:
+          *subframe = 8;
+          break;
+        case 8:
+          *subframe = 2;
+          *frame = (current_frame + 1) & 1023;
+          break;
+
+        default:
+          break;
+      }
     }
   }
 
@@ -366,6 +457,8 @@ get_Msg3allocret(COMMON_channels_t *cc,
 }
 
 //------------------------------------------------------------------------------
+// In TDD modes 1-5, each HarqPID is associated with a unique subframe and the number of harq processes equals the
+// number of UL subframes. Modes 0 and 6 have more processes than UL subframes so HarqPID depends on sfn
 uint8_t
 subframe2harqpid(COMMON_channels_t *cc,
                  frame_t frame,
@@ -379,6 +472,14 @@ subframe2harqpid(COMMON_channels_t *cc,
     ret = (((frame << 1) + subframe) & 7);
   } else {
     switch (cc->tdd_Config->subframeAssignment) {
+      uint32_t cycle_idx;
+      case 0:
+        cycle_idx = 7 - frame % 7;
+        if (subframe < 5) {
+          return (cycle_idx + subframe - 2) % 7;
+        } else {
+          return (cycle_idx + subframe - 4) % 7;
+        }
       case 1:
         if (subframe == 2 || subframe == 3 || subframe == 7 || subframe == 8) {
           switch (subframe) {
@@ -393,9 +494,10 @@ subframe2harqpid(COMMON_channels_t *cc,
               break;
 
             default:
-              AssertFatal(1 == 0, "subframe2_harq_pid, Illegal subframe %d for TDD mode %d\n",
+              AssertFatal(1 == 0,
+                          "subframe2_harq_pid, Illegal subframe %d for TDD mode %d\n",
                           subframe,
-                          (int) cc->tdd_Config->subframeAssignment);
+                          (int)cc->tdd_Config->subframeAssignment);
               break;
           }
         }
@@ -429,6 +531,13 @@ subframe2harqpid(COMMON_channels_t *cc,
                     (int) cc->tdd_Config->subframeAssignment);
         ret = (subframe - 2);
         break;
+      case 6:
+        cycle_idx = 6 - frame % 6;
+        if (subframe < 5) {
+          return (cycle_idx + subframe - 2) % 6;
+        } else {
+          return (cycle_idx + subframe - 4) % 6;
+        }
 
       default:
         AssertFatal(1 == 0, "subframe2_harq_pid, Unsupported TDD mode %d\n",
@@ -441,149 +550,7 @@ subframe2harqpid(COMMON_channels_t *cc,
 }
 
 //------------------------------------------------------------------------------
-uint8_t
-get_Msg3harqpid(COMMON_channels_t *cc,
-                frame_t frame,
-                sub_frame_t current_subframe)
-//------------------------------------------------------------------------------
-{
-  uint8_t ul_subframe = 0;
-  uint32_t ul_frame = 0;
-
-  if (cc->tdd_Config == NULL) { // FDD
-    ul_subframe = (current_subframe > 3) ? (current_subframe - 4) : (current_subframe + 6);
-    ul_frame = (current_subframe > 3) ? ((frame + 1) & 1023) : frame;
-  } else {
-    switch (cc->tdd_Config->subframeAssignment) {
-      case 1:
-        switch (current_subframe) {
-          case 9:
-          case 0:
-            ul_subframe = 7;
-            break;
-
-          case 5:
-          case 7:
-            ul_subframe = 2;
-            break;
-        }
-
-        break;
-
-      case 3:
-        switch (current_subframe) {
-          case 0:
-          case 5:
-          case 6:
-            ul_subframe = 2;
-            break;
-
-          case 7:
-            ul_subframe = 3;
-            break;
-
-          case 8:
-            ul_subframe = 4;
-            break;
-
-          case 9:
-            ul_subframe = 2;
-            break;
-        }
-
-        break;
-
-      case 4:
-        switch (current_subframe) {
-          case 0:
-          case 5:
-          case 6:
-          case 8:
-          case 9:
-            ul_subframe = 2;
-            break;
-
-          case 7:
-            ul_subframe = 3;
-            break;
-        }
-
-        break;
-
-      case 5:
-        ul_subframe = 2;
-        break;
-
-      default:
-        LOG_E(PHY, "get_Msg3_harq_pid: Unsupported TDD configuration %d\n",
-              (int) cc->tdd_Config->subframeAssignment);
-        AssertFatal(1 == 0, "get_Msg3_harq_pid: Unsupported TDD configuration");
-        break;
-    }
-  }
-
-  return (subframe2harqpid(cc,
-                           ul_frame,
-                           ul_subframe));
-}
-
-//------------------------------------------------------------------------------
-uint32_t
-pdcchalloc2ulframe(COMMON_channels_t *ccP,
-                   uint32_t frame,
-                   uint8_t n)
-//------------------------------------------------------------------------------
-{
-  uint32_t ul_frame = (frame + (n >= 6 ? 1 : 0));
-
-  if (ccP->tdd_Config) {
-    if (ccP->tdd_Config->subframeAssignment == 1) {
-      if (n == 1 || n == 6) {
-        ul_frame = (frame + (n == 1 ? 0 : 1));
-      }
-    } else if (ccP->tdd_Config->subframeAssignment == 6) {
-      if (n == 0 || n == 1 || n == 5 || n == 6) {
-        ul_frame = (frame + (n >= 5 ? 1 : 0));
-      } else if (n == 9) {
-        ul_frame = (frame + 1);
-      }
-    }
-  }
-
-  LOG_D(PHY, "frame %d subframe %d: PUSCH frame = %d\n",
-        frame,
-        n,
-        ul_frame);
-  return ul_frame;
-}
-
-//------------------------------------------------------------------------------
-uint8_t
-pdcchalloc2ulsubframe(COMMON_channels_t *ccP,
-                      uint8_t n)
-//------------------------------------------------------------------------------
-{
-  uint8_t ul_subframe;
-
-  if (ccP->tdd_Config && ccP->tdd_Config->subframeAssignment == 1 && (n == 1 || n == 6))  // tdd_config 0,1 SF 1,5
-    ul_subframe = ((n + 6) % 10);
-  else if (ccP->tdd_Config && ccP->tdd_Config->subframeAssignment == 6 && (n == 0 || n == 1 || n == 5 || n == 6))
-    ul_subframe = ((n + 7) % 10);
-  else if (ccP->tdd_Config && ccP->tdd_Config->subframeAssignment == 6 && n == 9) // tdd_config 6 SF 9
-    ul_subframe = ((n + 5) % 10);
-  else
-    ul_subframe = ((n + 4) % 10);
-
-  LOG_D(PHY, "subframe %d: PUSCH subframe = %d\n",
-        n,
-        ul_subframe);
-  return ul_subframe;
-}
-
-//------------------------------------------------------------------------------
-int
-is_UL_sf(COMMON_channels_t *ccP,
-         sub_frame_t subframeP)
+int is_UL_sf(COMMON_channels_t *ccP, sub_frame_t subframeP)
 //------------------------------------------------------------------------------
 {
   // if FDD return dummy value
@@ -591,6 +558,24 @@ is_UL_sf(COMMON_channels_t *ccP,
     return 0;
 
   switch (ccP->tdd_Config->subframeAssignment) {
+    case 0:
+      switch (subframeP) {
+        case 0:
+        case 5:
+          return 0;
+
+        case 2:
+        case 3:
+        case 4:
+        case 7:
+        case 8:
+        case 9:
+          return 1;
+
+        default:
+          return 0;
+      }
+      break;
     case 1:
       switch (subframeP) {
         case 0:
@@ -611,6 +596,26 @@ is_UL_sf(COMMON_channels_t *ccP,
 
       break;
 
+    case 2:
+      switch (subframeP) {
+        case 0:
+        case 3:
+        case 4:
+        case 5:
+        case 8:
+        case 9:
+          return (0);
+          break;
+        case 2:
+        case 7:
+          return (1);
+          break;
+        default:
+          return (0);
+          break;
+      }
+      break;
+
     case 3:
       if (subframeP <= 1 || subframeP >= 5)
         return 0;
@@ -629,11 +634,27 @@ is_UL_sf(COMMON_channels_t *ccP,
 
       return 1;
 
-    default:
-      AssertFatal(1 == 0,  "subframe %d Unsupported TDD configuration %d\n",
-                  subframeP,
-                  (int) ccP->tdd_Config->subframeAssignment);
+    case 6:
+      switch (subframeP) {
+        case 0:
+        case 5:
+        case 9:
+          return 0;
+
+        case 2:
+        case 3:
+        case 4:
+        case 7:
+        case 8:
+          return 1;
+
+        default:
+          return 0;
+      }
       break;
+
+    default:
+      AssertFatal(1 == 0, "subframe %d Unsupported TDD configuration %d\n", subframeP, (int)ccP->tdd_Config->subframeAssignment);
   }
 
   return 0;
@@ -673,23 +694,54 @@ ul_subframe2_k_phich(COMMON_channels_t *cc,
                      sub_frame_t ul_subframe)
 //------------------------------------------------------------------------------
 {
-  if(cc->tdd_Config) { //TODO fill other tdd config
-    switch(cc->tdd_Config->subframeAssignment) {
+  if (cc->tdd_Config) {
+    switch (cc->tdd_Config->subframeAssignment) {
       case 0:
+        if (ul_subframe == 2 || ul_subframe == 7)
+          return 4;
+        else if (ul_subframe == 3 || ul_subframe == 8)
+          return 7;
+        else if (ul_subframe == 4 || ul_subframe == 9)
+          return 6;
+        else
+          return 255;
         break;
 
       case 1:
-        if(ul_subframe == 2 || ul_subframe == 7)
+        if (ul_subframe == 2 || ul_subframe == 7)
           return 4;
-        else if(ul_subframe == 3 || ul_subframe == 8)
+        else if (ul_subframe == 3 || ul_subframe == 8)
           return 6;
 
         return 255;
 
       case 2:
+        if (ul_subframe == 2 || ul_subframe == 7)
+          return 6;
+        else
+          return 255;
+
       case 3:
+        if (ul_subframe == 2 || ul_subframe == 3 || ul_subframe == 4)
+          return 6;
+
       case 4:
+        if (ul_subframe == 2 || ul_subframe == 3)
+          return 6;
+
       case 5:
+        if (ul_subframe == 2)
+          return 6;
+
+      case 6:
+        if (ul_subframe == 2 || ul_subframe == 7)
+          return 4;
+        else if (ul_subframe == 3 || ul_subframe == 4)
+          return 6;
+        else if (ul_subframe == 8)
+          return 7;
+        else
+          return 255;
         break;
     }
   }
@@ -2436,84 +2488,6 @@ get_tmode(module_id_t module_idP,
   return 0;
 }
 
-//------------------------------------------------------------------------------
-int8_t
-get_ULharq(module_id_t module_idP,
-           int CC_idP,
-           uint16_t frameP,
-           uint8_t subframeP)
-//------------------------------------------------------------------------------
-{
-  int8_t ret = -1;
-  eNB_MAC_INST *eNB = RC.mac[module_idP];
-  COMMON_channels_t *cc = &eNB->common_channels[CC_idP];
-
-  if (cc->tdd_Config == NULL) { // FDD
-    ret = (((frameP << 1) + subframeP) & 7);
-  } else {
-    switch (cc->tdd_Config->subframeAssignment) {
-      case 1:
-        switch (subframeP) {
-          case 2:
-          case 3:
-            ret = (subframeP - 2);
-            break;
-
-          case 7:
-          case 8:
-            ret = (subframeP - 5);
-            break;
-
-          default:
-            AssertFatal(1 == 0, "subframe2_harq_pid, Illegal subframe %d for TDD mode %d\n",
-                        subframeP,
-                        (int) cc->tdd_Config->subframeAssignment);
-            break;
-        }
-
-        break;
-
-      case 2:
-        AssertFatal((subframeP == 2) || (subframeP == 7), "subframe2_harq_pid, Illegal subframe %d for TDD mode %d\n",
-                    subframeP,
-                    (int) cc->tdd_Config->subframeAssignment);
-        ret = (subframeP / 7);
-        break;
-
-      case 3:
-        AssertFatal((subframeP > 1) && (subframeP < 5), "subframe2_harq_pid, Illegal subframe %d for TDD mode %d\n",
-                    subframeP,
-                    (int) cc->tdd_Config->subframeAssignment);
-        ret = (subframeP - 2);
-        break;
-
-      case 4:
-        AssertFatal((subframeP > 1) && (subframeP < 4), "subframe2_harq_pid, Illegal subframe %d for TDD mode %d\n",
-                    subframeP,
-                    (int) cc->tdd_Config->subframeAssignment);
-        ret = (subframeP - 2);
-        break;
-
-      case 5:
-        AssertFatal(subframeP == 2, "subframe2_harq_pid, Illegal subframe %d for TDD mode %d\n",
-                    subframeP,
-                    (int) cc->tdd_Config->subframeAssignment);
-        ret = (subframeP - 2);
-        break;
-
-      default:
-        AssertFatal(1 == 0, "subframe2_harq_pid, Unsupported TDD mode %d\n",
-                    (int) cc->tdd_Config->subframeAssignment);
-        break;
-    }
-  }
-
-  AssertFatal(ret != -1, "invalid harq_pid(%d) at SFN/SF = %d/%d\n", (int8_t) ret,
-              frameP,
-              subframeP);
-  return ret;
-}
-
 //------------------------------------------------------------------------------
 uint16_t
 getRIV(uint16_t N_RB_DL,
@@ -3626,10 +3600,8 @@ int CCE_try_allocate_ulsch(int module_id,
 }
 
 //------------------------------------------------------------------------------
-void
-get_retransmission_timing(LTE_TDD_Config_t *tdd_Config,
-                          frame_t *frameP,
-                          sub_frame_t *subframeP)
+// Used for MSG 4
+void get_retransmission_timing(LTE_TDD_Config_t *tdd_Config, frame_t *frameP, sub_frame_t *subframeP)
 //------------------------------------------------------------------------------
 {
   if (tdd_Config == NULL) {
@@ -3639,30 +3611,72 @@ get_retransmission_timing(LTE_TDD_Config_t *tdd_Config,
 
     *subframeP = (*subframeP + 8) % 10;
   } else {
-    switch (tdd_Config->subframeAssignment) { //TODO fill in other TDD configs
-      default:
-        printf("%s:%d: TODO\n",
-               __FILE__,
-               __LINE__);
-        abort();
+    switch (tdd_Config->subframeAssignment) { // TODO fill in other TDD configs
+      case 0:
+        if (*subframeP == 0 || *subframeP == 5) {
+          *subframeP += 0;
+          *frameP = (*frameP + 1) % 1024;
+        } else {
+          LOG_E(MAC, "Illegal dl subframe %d for tdd config %ld\n", *subframeP, tdd_Config->subframeAssignment);
+        }
         break;
 
       case 1:
         if (*subframeP == 0 || *subframeP == 5) {
-          *subframeP  += 19;
+          *subframeP += 19;
           *frameP = (*frameP + (*subframeP / 10)) % 1024;
           *subframeP %= 10;
         } else if (*subframeP == 4 || *subframeP == 9) {
-          *subframeP  += 16;
+          *subframeP += 16;
           *frameP = (*frameP + (*subframeP / 10)) % 1024;
           *subframeP %= 10;
         } else {
-          AssertFatal(2 == 1, "Illegal dl subframe %d for tdd config %ld\n",
-                      *subframeP,
-                      tdd_Config->subframeAssignment);
+          AssertFatal(2 == 1, "Illegal dl subframe %d for tdd config %ld\n", *subframeP, tdd_Config->subframeAssignment);
         }
 
         break;
+      case 2:
+        if (*subframeP == 0) {
+          *subframeP = 4;
+          *frameP = (*frameP + 1) % 1024;
+        } else if (*subframeP == 3) {
+          *subframeP = 5;
+          *frameP = (*frameP + 1) % 1024;
+        } else if (*subframeP == 4) {
+          *subframeP = 8;
+          *frameP = (*frameP + 1) % 1024;
+        } else if (*subframeP == 5) {
+          *subframeP = 9;
+          *frameP = (*frameP + 1) % 1024;
+        } else if (*subframeP == 8) {
+          *subframeP = 0;
+          *frameP = (*frameP + 2) % 1024;
+        } else if (*subframeP == 9) {
+          *subframeP = 3;
+          *frameP = (*frameP + 2) % 1024;
+        } else {
+          LOG_E(MAC, "Illegal dl subframe %d for tdd config %ld\n", *subframeP, tdd_Config->subframeAssignment);
+          return;
+        }
+        break;
+      case 6:
+        if (*subframeP == 0) {
+          *subframeP = 5;
+          *frameP = (*frameP + 1) % 1024;
+        } else if (*subframeP == 9) {
+          *subframeP = 0;
+          *frameP = (*frameP + 2) % 1024;
+        } else if (*subframeP == 5) {
+          *subframeP = 9;
+          *frameP = (*frameP + 1) % 1024;
+        } else {
+          AssertFatal(2 == 1, "Illegal dl subframe %d for tdd config %ld\n", *subframeP, tdd_Config->subframeAssignment);
+        }
+        break;
+
+      default:
+        printf("%s:%d: TODO\n", __FILE__, __LINE__);
+        abort();
     }
   }
 
@@ -3676,10 +3690,17 @@ get_dl_subframe_count(int tdd_config_sfa,
 //------------------------------------------------------------------------------
 {
   uint8_t tdd1[10] = {1, -1, -1, -1, 2, 3, -1, -1, -1, 4}; // special subframes 1,6 are excluded
+  uint8_t tdd6[10] = {1, -1, -1, -1, -1, 2, -1, -1, -1, 3}; // special subframes 1,6 are excluded
 
   switch (tdd_config_sfa) {// TODO fill in other tdd configs
     case 1:
       return tdd1[subframeP];
+      break;
+    case 6:
+      return tdd6[subframeP];
+      break;
+    default:
+      AssertFatal(1 == 0, "TDD config not supported");
   }
 
   return -1;
@@ -3714,6 +3735,23 @@ frame_subframe2_dl_harq_pid(LTE_TDD_Config_t *tdd_Config,
               count,
               harq_pid);
         return harq_pid;
+
+      case 6:
+        count = get_dl_subframe_count(tdd_Config->subframeAssignment, subframeP);
+        harq_pid = (((frame_cnt * 1024 + abs_frameP) * 3) - 1 + count) % 6; // 3 dl subframes in a frame
+        if (harq_pid < 0) {
+          harq_pid += 6;
+        }
+
+        LOG_D(MAC,
+              "[frame_subframe2_dl_harq_pid] (%d,%d) calculate harq_pid ((( %d * 1024 + %d) *3) - 1 + %d) = %d \n",
+              (abs_frameP + 1024) % 1024,
+              subframeP,
+              frame_cnt,
+              abs_frameP,
+              count,
+              harq_pid);
+        return harq_pid;
     }
   } else {
     return ((abs_frameP * 10) + subframeP) & 7;
@@ -3792,6 +3830,18 @@ ul_ACK_subframe2M(LTE_TDD_Config_t *tdd_Config,
                   subframe,
                   tdd_Config->subframeAssignment);
       break;
+
+    case 6:
+      if (subframe == 2 || subframe == 3 || subframe == 4 || subframe == 7 || subframe == 8) {
+        return 1;
+      } else {
+        LOG_E(PHY,
+              "eNB_scheduler_primitives.c/ul_ACK_subframe2M: illegal subframe %d for tdd_config %ld\n",
+              subframe,
+              tdd_Config->subframeAssignment);
+        return (0);
+      }
+      break;
   }
 
   return 0;
@@ -3807,17 +3857,32 @@ ul_ACK_subframe2dl_subframe(LTE_TDD_Config_t *tdd_Config,
   if (tdd_Config == NULL) {
     return ((subframe < 4) ? subframe + 6 : subframe - 4);
   }
-
   switch (tdd_Config->subframeAssignment) {
+    case 0:
+      if (subframe == 2) { // ACK subframe 6
+        return (6);
+      } else if (subframe == 4) { // ACK subframe 0
+        return (0);
+      } else if (subframe == 7) { // ACK subframe 1
+        return (1);
+      } else if (subframe == 9) { // ACK subframe 5
+        return (5);
+      } else {
+        LOG_E(MAC, "illegal subframe %d for tdd_config %ld\n", subframe, tdd_Config->subframeAssignment);
+        return (0);
+      }
+      break;
+
     case 3:
-      if (subframe == 2) {  // ACK subframes 5 and 6
-        if (ACK_index == 2) return 1;
+      if (subframe == 2) { // ACK subframes 5 and 6
+        if (ACK_index == 2)
+          return 1;
 
         return (5 + ACK_index);
       }
 
       if (subframe == 3) { // ACK subframes 7 and 8
-        return (7 + ACK_index);  // To be updated
+        return (7 + ACK_index); // To be updated
       }
 
       if (subframe == 4) { // ACK subframes 9 and 0
@@ -3830,16 +3895,17 @@ ul_ACK_subframe2dl_subframe(LTE_TDD_Config_t *tdd_Config,
       break;
 
     case 4:
-      if (subframe == 2) {  // ACK subframes 0, 4 and 5
-        //if (ACK_index==2)
+      if (subframe == 2) { // ACK subframes 0, 4 and 5
+        // if (ACK_index==2)
         //  return(1); TBC
-        if (ACK_index == 2) return 0;
+        if (ACK_index == 2)
+          return 0;
 
         return (4 + ACK_index);
       }
 
       if (subframe == 3) { // ACK subframes 6, 7 8 and 9
-        return (6 + ACK_index);  // To be updated
+        return (6 + ACK_index); // To be updated
       }
 
       AssertFatal(1 == 0, "illegal subframe %d for tdd_config %ld\n",
@@ -3848,26 +3914,61 @@ ul_ACK_subframe2dl_subframe(LTE_TDD_Config_t *tdd_Config,
       break;
 
     case 1:
-      if (subframe == 2) {  // ACK subframes 5 and 6
+      if (subframe == 2) { // ACK subframes 5 and 6
         return (5 + ACK_index);
       }
 
       if (subframe == 3) { // ACK subframe 9
-        return 9;  // To be updated
+        return 9; // To be updated
       }
 
       if (subframe == 7) { // ACK subframes 0 and 1
-        return ACK_index;  // To be updated
+        return ACK_index; // To be updated
       }
 
       if (subframe == 8) { // ACK subframe 4
-        return 4;  // To be updated
+        return 4; // To be updated
       }
 
       AssertFatal(1 == 0, "illegal subframe %d for tdd_config %ld\n",
                   subframe,
                   tdd_Config->subframeAssignment);
       break;
+
+    case 2:
+      if (subframe == 2) { // ACK subframes 4 and 5 and 8
+        if (ACK_index == 2) {
+          return (8);
+        }
+        return (4 + ACK_index);
+      } else if (subframe == 7) { // ACK subframes 9 and 0 and 3
+        if (ACK_index == 2) {
+          return (3);
+        }
+        return ((9 + ACK_index) % 10); // To be updated
+      } else {
+        LOG_E(MAC, "illegal subframe %d for tdd_config %ld\n", subframe, tdd_Config->subframeAssignment);
+        return 255;
+      }
+
+      break;
+
+    case 6:
+      if (subframe == 2) { // ACK subframe 5
+        return (5);
+      } else if (subframe == 3) { // ACK subframe 6
+        return (6);
+      } else if (subframe == 4) { // ACK subframe 9
+        return (9);
+      } else if (subframe == 7) { // ACK subframe 0
+        return (0);
+      } else if (subframe == 8) { // ACK subframe 1
+        return (1);
+      } else {
+        LOG_E(MAC, "illegal subframe %d for tdd_config %ld\n", subframe, tdd_Config->subframeAssignment);
+        return (0);
+      }
+      break;
   }
 
   return 0;
@@ -3933,8 +4034,22 @@ extract_harq(module_id_t mod_idP,
                         subframeP,
                         m);
 
-          if (frameP==1023&&subframeP>5) frame_tx=-1;
-          else frame_tx = subframeP < 4 ? frameP -1 : frameP;
+          if (subframe_tx == 255) {
+            AssertFatal(subframe_tx != 0xff, "illegal subframe number 0xff\n");
+          }
+
+          if (cc->tdd_Config->subframeAssignment == 2 || cc->tdd_Config->subframeAssignment == 6) {
+            if (subframe_tx > subframeP) {
+              frame_tx = (frameP + 1023) % 1024; // will reduce by one
+            } else {
+              frame_tx = frameP;
+            }
+          } else {
+            if (frameP == 1023 && subframeP > 5)
+              frame_tx = -1;
+            else
+              frame_tx = subframeP < 4 ? frameP - 1 : frameP;
+          }
 
           harq_pid = frame_subframe2_dl_harq_pid(cc->tdd_Config,
                                                  frame_tx,

openair2/LAYER2/MAC/eNB_scheduler_ulsch.c

@@ -792,15 +792,36 @@ rx_sdu(const module_id_t enb_mod_idP,
 
           if(mac->common_channels[CC_idP].tdd_Config != NULL) {
             switch(mac->common_channels[CC_idP].tdd_Config->subframeAssignment) {
+              case 0:
+                ra->Msg4_frame = frameP + 1;
+                ra->Msg4_subframe = ((subframeP < 5) ? 0 : 5);
+                break;
+
               case 1:
                 ra->Msg4_frame = frameP + ((subframeP > 2) ? 1 : 0);
                 ra->Msg4_subframe = (subframeP + 7) % 10;
                 break;
 
+              case 2:
+                ra->Msg4_frame = (frameP + ((subframeP > 2) ? 1 : 0)) % 1024;
+                ra->Msg4_subframe = (subframeP + 6) % 10;
+                break;
+
+              case 3:
+              case 4:
+              case 5:
+                ra->Msg4_frame = frameP;
+                ra->Msg4_subframe = subframeP + 4;
+                break;
+
+              case 6:
+                ra->Msg4_frame = frameP + ((subframeP < 5) ? 0 : 1);
+                ra->Msg4_subframe = ((subframeP < 5) ? 9 : 5);
+                break;
+
               default:
                 printf("%s:%d: TODO\n", __FILE__, __LINE__);
                 abort();
-                // TODO need to be complete for other tdd configs.
             }
           } else {
             /* Program Msg4 PDCCH+DLSCH/MPDCCH transmission 4 subframes from now,
@@ -1562,12 +1583,17 @@ schedule_ulsch_rnti(module_id_t   module_idP,
            * Subframes:36.213/7.2.3 CQI definition */
           if (cc[CC_id].tdd_Config) {
             switch (cc[CC_id].tdd_Config->subframeAssignment) {
+              case 0:
               case 1:
+              case 2:
+              case 6:
                 if (subframeP == 1 || subframeP == 6)
                   cqi_req = 0;
                 break;
 
               case 3:
+              case 4:
+              case 5:
                 if (subframeP == 1)
                   cqi_req = 0;
                 break;

openair2/LAYER2/MAC/mac_proto.h

@@ -1051,14 +1051,6 @@ uint8_t ul_subframe2_k_phich(COMMON_channels_t *cc, sub_frame_t ul_subframe);
 
 unsigned char ul_ACK_subframe2M(LTE_TDD_Config_t *tdd_Config,unsigned char subframe);
 
-uint8_t get_Msg3harqpid(COMMON_channels_t *cc,
-                        frame_t frame, sub_frame_t current_subframe);
-
-uint32_t pdcchalloc2ulframe(COMMON_channels_t *ccP, uint32_t frame,
-                            uint8_t n);
-
-uint8_t pdcchalloc2ulsubframe(COMMON_channels_t *ccP, uint8_t n);
-
 int is_UL_sf(COMMON_channels_t *ccP, sub_frame_t subframeP);
 
 uint8_t getQm(uint8_t mcs);

openair2/RRC/LTE/MESSAGES/asn1_msg.c

@@ -2738,6 +2738,8 @@ do_RRCConnectionSetup(
     physicalConfigDedicated2->schedulingRequestConfig->choice.setup.sr_PUCCH_ResourceIndex = 71 - ue_context_pP->local_uid/10;//ue_context_pP->local_uid;
   } else {
     switch (carrier->sib1->tdd_Config->subframeAssignment) {
+      case 0:
+      case 6:
       case 1:
         switch(frame_parms->N_RB_UL) {
           case 25:
@@ -2779,6 +2781,12 @@ do_RRCConnectionSetup(
         physicalConfigDedicated2->schedulingRequestConfig->choice.setup.sr_ConfigIndex = 7+
             (ue_context_pP->local_uid&1);  // Isr = 5 (every 10 subframes, offset=2 for UE0, 3 for UE1, 3 for UE2, 2 for UE3 , etc..)
         break;
+      case 6: // To be checked : Multi UE
+        physicalConfigDedicated2->schedulingRequestConfig->choice.setup.sr_ConfigIndex =
+            18
+            + (ue_context_pP->local_uid & 3)
+                  * 5; // Isr = 18 (every 20 subframes, offset=3 for UE0, 7 for UE1, 2 for UE2, 7 for UE3 , 2 for UE4 etc..)
+        break;
 
       default:
         physicalConfigDedicated2->schedulingRequestConfig->choice.setup.sr_ConfigIndex = 7;  // Isr = 5 (every 10 subframes, offset=2 for all UE0 etc..)

openair2/RRC/LTE/rrc_eNB.c

@@ -4477,6 +4477,12 @@ rrc_eNB_generate_HO_RRCConnectionReconfiguration(const protocol_ctxt_t *const ct
         physicalConfigDedicated2->schedulingRequestConfig->choice.setup.sr_ConfigIndex = 7 + (ue_context_pP->local_uid &
             1);    // Isr = 5 (every 10 subframes, offset=2 for UE0, 3 for UE1, 3 for UE2, 2 for UE3 , etc..)
         break;
+      case 6:
+        physicalConfigDedicated2->schedulingRequestConfig->choice.setup.sr_ConfigIndex =
+            18
+            + (ue_context_pP->local_uid & 3)
+                  * 5; // Isr = 18 (every 20 subframes, offset=3 for UE0, 7 for UE1, 2 for UE2, 7 for UE3 , 2 for UE4 etc..)
+        break;
 
       default:
         physicalConfigDedicated2->schedulingRequestConfig->choice.setup.sr_ConfigIndex = 7; // Isr = 5 (every 10 subframes, offset=2 for all UE0 etc..)