merge, compile ok, regular exe ok, ocp-gnb not

openair1/SCHED/fapi_l1.c

@@ -381,7 +381,6 @@ void handle_nfapi_dlsch_pdu(PHY_VARS_eNB *eNB,int frame,int subframe,L1_rxtx_pro
           dlsch0_harq->TBS, dlsch0_harq->Qm, dlsch0_harq->codeword, dlsch0_harq->rb_alloc[0],
           rel8->length
          );
-
     dlsch0->active = 1;
     harq_pid        = dlsch0->harq_ids[frame%2][proc->subframe_tx];
     dlsch0->harq_mask |= (1<<harq_pid);

openair1/SCHED/phy_procedures_lte_eNb.c

@@ -441,7 +441,6 @@ void phy_procedures_eNB_TX(PHY_VARS_eNB *eNB,
   if (ul_subframe < 10) { // This means that there is a potential UL subframe that will be scheduled here
     for (i=0; i<NUMBER_OF_UE_MAX; i++) {
       if (eNB->ulsch[i] && eNB->ulsch[i]->ue_type >0) harq_pid = 0;
-
       else
         harq_pid = subframe2harq_pid(fp,ul_frame,ul_subframe);
 

openair1/SCHED/prach_procedures.c

@@ -106,15 +106,6 @@ void prach_procedures(PHY_VARS_eNB *eNB,
         eNB->prach_energy_counter,
         eNB->measurements.prach_I0+eNB->prach_DTX_threshold,
         eNB->measurements.prach_I0);
-	if (max_preamble_energy[0] > 100 && br_flag==0)
-	  LOG_W(PHY,"[RAPROC] Frame %d, subframe %d : BR %d  Most likely preamble %d, energy %d dB delay %d (prach_energy counter %d), threshold %d, I0 %d\n",
-        frame,subframe,br_flag,
-        max_preamble[0],
-        max_preamble_energy[0]/10,
-        max_preamble_delay[0],
-        eNB->prach_energy_counter,
-        eNB->measurements.prach_I0+eNB->prach_DTX_threshold,
-        eNB->measurements.prach_I0);
 
   if (br_flag==1) {
     int             prach_mask;