From 850e8e9204f8d8143f67c95252023a662d4d534d Mon Sep 17 00:00:00 2001 From: Raymond Knopp Date: Fri, 25 Jul 2014 07:59:40 +0000 Subject: [PATCH] git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5603 818b1a75-f10b-46b9-bf7c-635c3b92a50f --- openair1/PHY/INIT/lte_init.c | 2 ++ openair1/PHY/LTE_TRANSPORT/pmch.c | 1 + openair1/PHY/TOOLS/lte_dfts.c | 1 + openair1/PHY/TOOLS/time_meas.c | 12 ++++++++++++ openair1/PHY/TOOLS/time_meas.h | 6 +++--- openair1/SCHED/phy_procedures_lte_eNb.c | 9 ++++++--- 6 files changed, 25 insertions(+), 6 deletions(-) diff --git a/openair1/PHY/INIT/lte_init.c b/openair1/PHY/INIT/lte_init.c index 58f6e03447..7cb9b2af31 100644 --- a/openair1/PHY/INIT/lte_init.c +++ b/openair1/PHY/INIT/lte_init.c @@ -193,6 +193,8 @@ void phy_config_sib2_eNB(uint8_t Mod_id, } } + else + lte_frame_parms->num_MBSFN_config = 0; } diff --git a/openair1/PHY/LTE_TRANSPORT/pmch.c b/openair1/PHY/LTE_TRANSPORT/pmch.c index 45df61023d..ccea403c6b 100644 --- a/openair1/PHY/LTE_TRANSPORT/pmch.c +++ b/openair1/PHY/LTE_TRANSPORT/pmch.c @@ -76,6 +76,7 @@ int is_pmch_subframe(uint32_t frame, int subframe, LTE_DL_FRAME_PARMS *frame_par uint32_t period; uint8_t i; + for (i=0; inum_MBSFN_config; i++) { // we have at least one MBSFN configuration period = 1<MBSFN_config[i].radioframeAllocationPeriod; if ((frame % period) == frame_parms->MBSFN_config[i].radioframeAllocationOffset) { diff --git a/openair1/PHY/TOOLS/lte_dfts.c b/openair1/PHY/TOOLS/lte_dfts.c index 8f0d6e2981..d8a397bc23 100644 --- a/openair1/PHY/TOOLS/lte_dfts.c +++ b/openair1/PHY/TOOLS/lte_dfts.c @@ -14862,6 +14862,7 @@ void dft1200(int16_t *x,int16_t *y,unsigned char scale_flag){ #ifdef MR_MAIN +int opp_enabled=1; int opp_enabled=1; int main(int argc, char**argv) { diff --git a/openair1/PHY/TOOLS/time_meas.c b/openair1/PHY/TOOLS/time_meas.c index 66cbcf68f6..198039efb6 100644 --- a/openair1/PHY/TOOLS/time_meas.c +++ b/openair1/PHY/TOOLS/time_meas.c @@ -1,8 +1,20 @@ #include #include "time_meas.h" +#include +#include // global var for openair performance profiler int opp_enabled = 0; +/* +double get_cpu_freq_GHz(void) { + + time_stats_t ts; + reset_meas(&ts); + start_meas(&ts); + sleep(1); + stop_meas(&ts); + return (double)ts.diff/1000000000; +}*/ void print_meas(time_stats_t *ts, const char* name, time_stats_t * total_exec_time, time_stats_t * sf_exec_time){ diff --git a/openair1/PHY/TOOLS/time_meas.h b/openair1/PHY/TOOLS/time_meas.h index 92e30fde4f..934c2d8f27 100644 --- a/openair1/PHY/TOOLS/time_meas.h +++ b/openair1/PHY/TOOLS/time_meas.h @@ -92,8 +92,8 @@ static inline void copy_meas(time_stats_t *dst_ts,time_stats_t *src_ts) { return (double) ts->diff/ts->trials/cpu_freq_GHz/1000.0; - }*/ - + } +*/ static inline double get_cpu_freq_GHz(void) { time_stats_t ts; @@ -102,5 +102,5 @@ static inline double get_cpu_freq_GHz(void) { sleep(1); stop_meas(&ts); return (double)ts.diff/1000000000; -} +} diff --git a/openair1/SCHED/phy_procedures_lte_eNb.c b/openair1/SCHED/phy_procedures_lte_eNb.c index 8df72961c7..3837c723f8 100755 --- a/openair1/SCHED/phy_procedures_lte_eNb.c +++ b/openair1/SCHED/phy_procedures_lte_eNb.c @@ -1056,6 +1056,7 @@ void phy_procedures_eNB_TX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uin // for (sect_id = 0 ; sect_id < number_of_cards; sect_id++) { + if (abstraction_flag==0) { for (aa=0; aalte_frame_parms.nb_antennas_tx_eNB;aa++) { @@ -1063,8 +1064,10 @@ void phy_procedures_eNB_TX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uin 0,phy_vars_eNB->lte_frame_parms.ofdm_symbol_size*(phy_vars_eNB->lte_frame_parms.symbols_per_tti)*sizeof(mod_sym_t)); } } + + if (is_pmch_subframe(phy_vars_eNB->proc[sched_subframe].frame_tx,subframe,&phy_vars_eNB->lte_frame_parms)) { - + if (abstraction_flag==0){ // This is DL-Cell spec pilots in Control region generate_pilots_slot(phy_vars_eNB, @@ -1072,6 +1075,7 @@ void phy_procedures_eNB_TX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uin AMP, subframe<<1,1); } + #ifdef Rel10 // if mcch is active, send regardless of the node type: eNB or RN // when mcch is active, MAC sched does not allow MCCH and MTCH multiplexing @@ -1138,7 +1142,7 @@ void phy_procedures_eNB_TX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uin else { - + if (abstraction_flag==0){ vcd_signal_dumper_dump_function_by_name(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_ENB_RS_TX,1); generate_pilots_slot(phy_vars_eNB, @@ -1149,7 +1153,6 @@ void phy_procedures_eNB_TX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uin phy_vars_eNB->lte_eNB_common_vars.txdataF[0], AMP, (subframe<<1)+1,0); - vcd_signal_dumper_dump_function_by_name(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_ENB_RS_TX,0); // First half of PSS/SSS (FDD)