Merge branch 'oai_ue_mwc18_integration' of...

Merge branch 'oai_ue_mwc18_integration' of https://gitlab.eurecom.fr/oai-nr/openairinterface5g into oai_ue_mwc18_integration

Conflicts:
	openair1/PHY/LTE_TRANSPORT/dlsch_decoding.c

openair1/PHY/LTE_TRANSPORT/dlsch_decoding.c

@@ -1127,7 +1127,7 @@ uint32_t  dlsch_decoding_mthread(PHY_VARS_UE *phy_vars_ue,
  	kb = harq_process->Kplus/harq_process->Z;
   	  if ( kb==22){
   		  p_decParams->BG = 1;
-  		  p_decParams->R = 13;
+  		  p_decParams->R = 89;
   		  kc = 68;
   	  }
   	  else{
@@ -1136,7 +1136,7 @@ uint32_t  dlsch_decoding_mthread(PHY_VARS_UE *phy_vars_ue,
   		  kc = 52;
   	  	  }
 
-      p_decParams->numMaxIter = 10;
+      p_decParams->numMaxIter = 2;
       Kr = p_decParams->Z*kb;
       p_decParams->outMode= 0;
 
@@ -2070,7 +2070,7 @@ uint32_t  dlsch_decoding_2thread0(void *arg)
   	        else
   	        	r_offset = Nl*Qm * ((GpmodC==0?0:1) + (Gp/C));
 
-		printf("thread0 r_offset %d\n",r_offset);
+		//	printf("thread0 r_offset %d\n",r_offset);
   	       
   //for (r=(harq_process->C/2); r<harq_process->C; r++) {
   	     r=1; //(harq_process->C/2);

openair1/SCHED/phy_procedures_lte_ue.c

@@ -1901,6 +1901,14 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB
       LOG_I(PHY,"[UE  %d][PUSCH %d] AbsSubFrame %d.%d, generating PUSCH, Po_PUSCH: %d dBm (max %d dBm), amp %d\n",
 	    Mod_id,harq_pid,frame_tx%1024,nr_tti_tx,ue->tx_power_dBm[nr_tti_tx],ue->tx_power_max_dBm, tx_amp);
 #endif
+
+      if (tx_amp>100)
+	tx_amp =100;
+
+      //LOG_I(PHY,"[UE  %d][PUSCH %d] after AbsSubFrame %d.%d, generating PUSCH, Po_PUSCH: %d dBm (max %d dBm), amp %d\n",
+	//    Mod_id,harq_pid,frame_tx%1024,nr_tti_tx,ue->tx_power_dBm[nr_tti_tx],ue->tx_power_max_dBm, tx_amp);
+
+      
 #if UE_TIMING_TRACE
 
       start_meas(&ue->ulsch_modulation_stats);