From ff7c5f5e9ddd4efbb4ca5e6da725cc067d52a8b9 Mon Sep 17 00:00:00 2001 From: Guy De Souza <desouza@eurecom.fr> Date: Tue, 17 Apr 2018 12:17:44 +0200 Subject: [PATCH] DL freq fix --- openair1/SCHED_NR/nr_ru_procedures.c | 6 +++--- targets/RT/USER/nr-ru.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openair1/SCHED_NR/nr_ru_procedures.c b/openair1/SCHED_NR/nr_ru_procedures.c index 103d612b30..7fee26c79c 100644 --- a/openair1/SCHED_NR/nr_ru_procedures.c +++ b/openair1/SCHED_NR/nr_ru_procedures.c @@ -83,7 +83,7 @@ void nr_feptx0(RU_t *ru,int slot) { 12, fp->nb_prefix_samples, CYCLIC_PREFIX); - else normal_prefix_mod(&ru->common.txdataF_BF[aa][slot*slot_sizeF], + else nr_normal_prefix_mod(&ru->common.txdataF_BF[aa][slot*slot_sizeF], (int*)&ru->common.txdata[aa][slot_offset], 14, fp); @@ -230,12 +230,12 @@ void nr_feptx_ofdm(RU_t *ru) { fp->nb_prefix_samples, CYCLIC_PREFIX); } else { - normal_prefix_mod(&ru->common.txdataF_BF[aa][slot_offset_F], + nr_normal_prefix_mod(&ru->common.txdataF_BF[aa][slot_offset_F], dummy_tx_b, 14, fp); // if S-subframe generate first slot only - if (subframe_select(fp,subframe) == SF_DL) + if (nr_subframe_select(fp,subframe) == SF_DL) nr_normal_prefix_mod(&ru->common.txdataF_BF[aa][slot_offset_F+slot_sizeF], dummy_tx_b+(fp->samples_per_subframe / fp->slots_per_subframe), 14, diff --git a/targets/RT/USER/nr-ru.c b/targets/RT/USER/nr-ru.c index 0686cc72e8..70d0b7e031 100644 --- a/targets/RT/USER/nr-ru.c +++ b/targets/RT/USER/nr-ru.c @@ -1241,7 +1241,7 @@ void fill_rf_config(RU_t *ru, char *rf_config_file) { for (i=0; i<ru->nb_tx; i++) { - cfg->tx_freq[i] = (double)fp->dl_CarrierFreq; + cfg->tx_freq[i] = (double)gNB_config->nfapi_config.earfcn.value; //fp->dl_CarrierFreq; cfg->rx_freq[i] = (double)fp->ul_CarrierFreq; cfg->tx_gain[i] = ru->att_tx; -- GitLab