From 34aa7fb75066190076bfdd3cf1694e029ffe31eb Mon Sep 17 00:00:00 2001 From: Guy De Souza Date: Tue, 17 Apr 2018 15:19:57 +0200 Subject: [PATCH] Carrier Freq update --- openair1/PHY/INIT/nr_init.c | 4 ++++ targets/RT/USER/nr-ru.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/openair1/PHY/INIT/nr_init.c b/openair1/PHY/INIT/nr_init.c index 571f59ad04..811025d65e 100644 --- a/openair1/PHY/INIT/nr_init.c +++ b/openair1/PHY/INIT/nr_init.c @@ -338,6 +338,8 @@ void nr_phy_config_request(PHY_VARS_gNB *gNB) nfapi_config_request_t *gNB_config = &gNB->gNB_config; //overwrite for new NR parameters + gNB_config->nfapi_config.rf_bands.rf_band[0] = 22; + gNB_config->nfapi_config.earfcn.value = 6600; gNB_config->subframe_config.numerology_index_mu.value = 1; gNB_config->subframe_config.duplex_mode.value = FDD; gNB_config->rf_config.tx_antenna_ports.value = 1; @@ -349,6 +351,8 @@ void nr_phy_config_request(PHY_VARS_gNB *gNB) gNB->mac_enabled = 1; + fp->dl_CarrierFreq = from_earfcn(gNB_config->nfapi_config.rf_bands.rf_band[0],gNB_config->nfapi_config.earfcn.value); + fp->ul_CarrierFreq = fp->dl_CarrierFreq - (get_uldl_offset(gNB_config->nfapi_config.rf_bands.rf_band[0])*100000); fp->threequarter_fs = 0; nr_init_frame_parms(gNB_config, fp); diff --git a/targets/RT/USER/nr-ru.c b/targets/RT/USER/nr-ru.c index 70d0b7e031..0686cc72e8 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; inb_tx; i++) { - cfg->tx_freq[i] = (double)gNB_config->nfapi_config.earfcn.value; //fp->dl_CarrierFreq; + cfg->tx_freq[i] = (double)fp->dl_CarrierFreq; cfg->rx_freq[i] = (double)fp->ul_CarrierFreq; cfg->tx_gain[i] = ru->att_tx;