From 5cdda338592c87dec92e220db80e623fdab15b52 Mon Sep 17 00:00:00 2001
From: Guy De Souza <desouza@eurecom.fr>
Date: Thu, 12 Apr 2018 10:23:32 +0200
Subject: [PATCH] Minor config correction
---
openair1/PHY/INIT/nr_init.c | 1 +
openair1/SCHED_NR/phy_procedures_nr_gNB.c | 2 +-
targets/RT/USER/nr-ru.c | 7 ++++---
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/openair1/PHY/INIT/nr_init.c b/openair1/PHY/INIT/nr_init.c
index dfd06e2329..1e3ea47610 100644
--- a/openair1/PHY/INIT/nr_init.c
+++ b/openair1/PHY/INIT/nr_init.c
@@ -339,6 +339,7 @@ void nr_phy_config_request(PHY_VARS_gNB *gNB)
//overwrite for new NR parameters
gNB_config->subframe_config.numerology_index_mu.value = 1;
+ gNB_config->subframe_config.duplex_mode.value = FDD;
gNB_config->rf_config.dl_channel_bandwidth.value = 106;
gNB_config->rf_config.ul_channel_bandwidth.value = 106;
gNB_config->sch_config.half_frame_index = 0;
diff --git a/openair1/SCHED_NR/phy_procedures_nr_gNB.c b/openair1/SCHED_NR/phy_procedures_nr_gNB.c
index f0f50c5b74..99625582d4 100644
--- a/openair1/SCHED_NR/phy_procedures_nr_gNB.c
+++ b/openair1/SCHED_NR/phy_procedures_nr_gNB.c
@@ -85,6 +85,6 @@ void phy_procedures_gNB_TX(PHY_VARS_gNB *gNB,
}
if (nfapi_mode == 0 || nfapi_mode == 1) {
- common_signal_procedures(gNB,frame, subframe);
+ nr_common_signal_procedures(gNB,frame, subframe);
}
}
diff --git a/targets/RT/USER/nr-ru.c b/targets/RT/USER/nr-ru.c
index 970443f6b7..1b8eeb7b90 100644
--- a/targets/RT/USER/nr-ru.c
+++ b/targets/RT/USER/nr-ru.c
@@ -124,6 +124,7 @@ extern volatile int oai_exit;
extern void nr_phy_init_RU(RU_t*);
extern void nr_phy_free_RU(RU_t*);
+extern void nr_phy_config_request(PHY_VARS_gNB *gNB);
void init_RU(char*);
void stop_RU(int nb_ru);
@@ -1374,6 +1375,7 @@ static void* ru_thread( void* param ) {
}
if (ru->if_south == LOCAL_RF) { // configure RF parameters only
fill_rf_config(ru,ru->rf_config_file);
+ nr_phy_config_request(ru->gNB_list[0]);
nr_init_frame_parms(ru->gNB_list[0]->gNB_config, fp);
nr_dump_frame_parms(fp);
nr_phy_init_RU(ru);
@@ -1899,11 +1901,10 @@ void configure_rru(int idx,
ru->nr_frame_parms.prach_config_common.prach_ConfigInfo.prach_ConfigIndex = config->prach_ConfigIndex[0]; */
}
-
- nr_init_frame_parms(ru->gNB_list[0]->gNB_config, &ru->nr_frame_parms);
fill_rf_config(ru,ru->rf_config_file);
-
+ nr_phy_config_request(ru->gNB_list[0]);
+ nr_init_frame_parms(ru->gNB_list[0]->gNB_config, &ru->nr_frame_parms);
nr_phy_init_RU(ru);
--
GitLab