Merge remote-tracking branch 'origin/develop' into if5_ECPRI_rework

executables/nr-ru.c

@@ -283,7 +283,7 @@ void fh_if5_south_out(RU_t *ru, int frame, int slot, uint64_t timestamp) {
   struct timespec txmeas;
   clock_gettime(CLOCK_MONOTONIC, &txmeas);
   LOG_D(PHY,"IF5 TX %d.%d, TS %llu, buffs[0] %p, buffs[1] %p ener0 %f dB, tx start %d\n",frame,slot,(unsigned long long)timestamp,buffs[0],buffs[1],
-  10*log10((double)signal_energy(buffs[0],offset)),txmeas.tv_nsec);
+  10*log10((double)signal_energy(buffs[0],ru->nr_frame_parms->get_samples_per_slot(slot,ru->nr_frame_parms))),txmeas.tv_nsec);
   ru->ifdevice.trx_write_func2(&ru->ifdevice,
   		               timestamp,
                                buffs,

executables/nr-softmodem.h

@@ -59,9 +59,6 @@ extern void set_function_spec_param(RU_t *ru);
 
 extern void reset_opp_meas(void);
 extern void print_opp_meas(void);
-
-extern void init_fep_thread(PHY_VARS_gNB *);
-
 void init_gNB_afterRU(void);
 
 extern int stop_L1L2(module_id_t gnb_id);