From 34f3422b44b01c05ada81efc58a057f3374864be Mon Sep 17 00:00:00 2001 From: magounak Date: Tue, 16 Oct 2018 14:17:16 +0200 Subject: [PATCH] fixing generate_ul_ref_sigs() --- openair1/PHY/LTE_ESTIMATION/lte_sync_time.c | 2 +- openair1/SCHED/ru_procedures.c | 4 ++-- targets/RT/USER/lte-ru.c | 9 +++++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/openair1/PHY/LTE_ESTIMATION/lte_sync_time.c b/openair1/PHY/LTE_ESTIMATION/lte_sync_time.c index 1735ff23fb..6aaa9114e1 100644 --- a/openair1/PHY/LTE_ESTIMATION/lte_sync_time.c +++ b/openair1/PHY/LTE_ESTIMATION/lte_sync_time.c @@ -487,7 +487,7 @@ int ru_sync_time_init(RU_t *ru) // LTE_UE_COMMON *common_vars generate_ul_ref_sigs(); - ru->dmrssync = (int16_t*)malloc16_clear(ru->frame_parms.N_RB_DL*2*sizeof(int16_t)); + ru->dmrssync = (int16_t*)malloc16_clear(ru->frame_parms.ofdm_symbol_size*2*sizeof(int16_t)); generate_drs_pusch(NULL,NULL, &ru->frame_parms, dmrsp,/*(int32_t**)dmrsp,*/ diff --git a/openair1/SCHED/ru_procedures.c b/openair1/SCHED/ru_procedures.c index c1ccd3cddd..c80b103eec 100644 --- a/openair1/SCHED/ru_procedures.c +++ b/openair1/SCHED/ru_procedures.c @@ -105,9 +105,9 @@ void feptx0(RU_t *ru,int slot) { int32_t dmrs[ru->frame_parms.ofdm_symbol_size*14] __attribute__((aligned(32))); int32_t *dmrsp[2] = {&dmrs[(3-ru->frame_parms.Ncp)*ru->frame_parms.ofdm_symbol_size],NULL}; - generate_ul_ref_sigs(); + //generate_ul_ref_sigs(); - ru->dmrssync = (int16_t*)malloc16_clear(ru->frame_parms.ofdm_symbol_size*2*sizeof(int16_t)); + //ru->dmrssync = (int16_t*)malloc16_clear(ru->frame_parms.ofdm_symbol_size*2*sizeof(int16_t)); generate_drs_pusch((PHY_VARS_UE *)NULL, (UE_rxtx_proc_t*)NULL, fp, diff --git a/targets/RT/USER/lte-ru.c b/targets/RT/USER/lte-ru.c index c8d17fb450..c61d53c7f3 100644 --- a/targets/RT/USER/lte-ru.c +++ b/targets/RT/USER/lte-ru.c @@ -2246,7 +2246,9 @@ void init_RU_proc(RU_t *ru) { (ru->function == NGFI_RRU_IF4p5)) { LOG_I(PHY,"Starting ru_thread_asynch_rxtx, ru->is_slave %d, ru->generate_dmrs_sync %d\n", ru->is_slave,ru->generate_dmrs_sync); - pthread_create( &proc->pthread_asynch_rxtx, attr_asynch, ru_thread_asynch_rxtx, (void*)ru ); + //generate_ul_ref_sigs(); + //ru->dmrssync = (int16_t*)malloc16_clear(ru->frame_parms.ofdm_symbol_size*2*sizeof(int16_t)); + pthread_create( &proc->pthread_asynch_rxtx, attr_asynch, ru_thread_asynch_rxtx, (void*)ru ); } @@ -2619,7 +2621,10 @@ void init_RU(char *rf_config_file, clock_source_t clock_source,clock_source_t ti ru->openair0_cfg.clock_source = clock_source; ru->openair0_cfg.time_source = time_source; ru->generate_dmrs_sync = (ru->is_slave == 0) ? 1 : 0; - + if (ru->generate_dmrs_sync == 1) { + generate_ul_ref_sigs(); + ru->dmrssync = (int16_t*)malloc16_clear(ru->frame_parms.ofdm_symbol_size*2*sizeof(int16_t)); + } eNB0 = ru->eNB_list[0]; LOG_D(PHY, "RU FUnction:%d ru->if_south:%d\n", ru->function, ru->if_south); LOG_D(PHY, "eNB0:%p\n", eNB0);