Fix pucch resource in TDD config2.

(cherry picked from commit 412f15df9171af5b1f4766854e292b09370a1b3e)
(cherry picked from commit 55b6d866d3c1ebd3095a44661e4e435f15d3cd7f)

openair2/LAYER2/MAC/eNB_scheduler_fairRR.c

@@ -3970,6 +3970,9 @@ void ulsch_scheduler_pre_processor_fairRR(module_id_t module_idP,
       } else {
         num_pucch_rb = 3;
       }
+      if(cc->tdd_Config->subframeAssignment==2){
+        num_pucch_rb+=1;
+      }
     } else {//FDD
       if (frame_parms->N_RB_UL == 25) {
         num_pucch_rb = 1;
@@ -4301,6 +4304,9 @@ schedule_ulsch_fairRR(module_id_t module_idP, frame_t frameP,
               ulsch_ue_select[CC_id].list[ulsch_ue_select[CC_id].ue_num].start_rb = 3;
               break;
           }
+          if(cc->tdd_Config->subframeAssignment==2){
+            ulsch_ue_select[CC_id].list[ulsch_ue_select[CC_id].ue_num].start_rb+=1;
+          }
         }
 
         ulsch_ue_select[CC_id].list[ulsch_ue_select[CC_id].ue_num].nb_rb = 3;
@@ -4410,6 +4416,9 @@ void schedule_ulsch_rnti_fairRR(module_id_t   module_idP,
           first_rb[CC_id] = 3;
           break;
       }
+      if(cc->tdd_Config->subframeAssignment==2){
+          first_rb[CC_id] += 1;
+      }
     }
 
     for ( ulsch_ue_num = 0; ulsch_ue_num < ulsch_ue_select[CC_id].ue_num; ulsch_ue_num++ ) {

openair2/LAYER2/MAC/rar_tools.c

@@ -85,6 +85,11 @@ fill_rar(const module_id_t module_idP,
         ra->msg3_first_rb = 2;
       }
     }
+    if(cc->tdd_Config){
+      if(cc->tdd_Config->subframeAssignment==2){
+        ra->msg3_first_rb+=1;
+      }
+    }
     ra->msg3_nb_rb = 3;
     uint16_t rballoc = mac_computeRIV(N_RB_UL, ra->msg3_first_rb, ra->msg3_nb_rb);	// first PRB only for UL Grant
     rar[1] |= (rballoc >> 7) & 7;	// Hopping = 0 (bit 3), 3 MSBs of rballoc