diff --git a/targets/SIMU/USER/Makefile b/targets/SIMU/USER/Makefile index e075c0af396340e399c8cf27047665e3b21e89a5..10285dc039fbe51408db6df3d942a7cda6b2d6d9 100644 --- a/targets/SIMU/USER/Makefile +++ b/targets/SIMU/USER/Makefile @@ -306,7 +306,7 @@ printvars: @echo UE_flag is $(UE_flag) @echo S1AP objs: $(S1AP_BUILT_OBJS) @echo CFLAGS: $(CFLAGS) - @echo Enable PGM: $(ENABLE_PGM) + @echo Enable PGM: $(PGM_FOUND) ##UTIL_YAC_C = $(OPENAIR2_TOP)/UTIL/enb_parser.o ##$(UTIL_LEX_C) = $(subst $(OPENAIR_HOME), $(OBJS_DIR), $(OBJ) $(OAISIM_OBJS) $(ASN1_MSG_OBJS1)) diff --git a/targets/SIMU/USER/oaisim.c b/targets/SIMU/USER/oaisim.c index aa51ef63806d8df140cdd3e3624a0a2bacceda4a..70a160397f5f6996d550fa62ac33ebfd9a65341b 100644 --- a/targets/SIMU/USER/oaisim.c +++ b/targets/SIMU/USER/oaisim.c @@ -1376,7 +1376,7 @@ void print_opp_meas(void){ for (eNB_id=0; eNB_id<NB_eNB_INST; eNB_id++) { print_meas(&PHY_vars_eNB_g[eNB_id]->phy_proc,"[eNB][total_phy_proc]",&oaisim_stats,&oaisim_stats_f); - print_meas(&PHY_vars_eNB_g[eNB_id]->phy_proc_rx,"[eNB][total_phy_proc_rx]",&oaisim_stats,&oaisim_stats_f); + print_meas(&PHY_vars_eNB_g[eNB_id]->phy_proc_tx,"[eNB][total_phy_proc_tx]",&oaisim_stats,&oaisim_stats_f); print_meas(&PHY_vars_eNB_g[eNB_id]->ofdm_mod_stats,"[eNB][ofdm_mod]",&oaisim_stats,&oaisim_stats_f); print_meas(&PHY_vars_eNB_g[eNB_id]->dlsch_modulation_stats,"[eNB][modulation]",&oaisim_stats,&oaisim_stats_f); print_meas(&PHY_vars_eNB_g[eNB_id]->dlsch_scrambling_stats,"[eNB][scrambling]",&oaisim_stats,&oaisim_stats_f); @@ -1386,7 +1386,7 @@ void print_opp_meas(void){ print_meas(&PHY_vars_eNB_g[eNB_id]->dlsch_turbo_encoding_stats,"[eNB][|_turbo_encoding]",&oaisim_stats,&oaisim_stats_f); - print_meas(&PHY_vars_eNB_g[eNB_id]->phy_proc_tx,"[eNB][total_phy_proc_tx]",&oaisim_stats,&oaisim_stats_f); + print_meas(&PHY_vars_eNB_g[eNB_id]->phy_proc_rx,"[eNB][total_phy_proc_rx]",&oaisim_stats,&oaisim_stats_f); print_meas(&PHY_vars_eNB_g[eNB_id]->ofdm_demod_stats,"[eNB][ofdm_demod]",&oaisim_stats,&oaisim_stats_f); //print_meas(&PHY_vars_eNB_g[eNB_id]->ulsch_channel_estimation_stats,"[eNB][channel_est]"); //print_meas(&PHY_vars_eNB_g[eNB_id]->ulsch_freq_offset_estimation_stats,"[eNB][freq_offset]");