Commit 5cdda338 authored by Guy De Souza's avatar Guy De Souza

Minor config correction

parent 8dec69ea
...@@ -339,6 +339,7 @@ void nr_phy_config_request(PHY_VARS_gNB *gNB) ...@@ -339,6 +339,7 @@ void nr_phy_config_request(PHY_VARS_gNB *gNB)
//overwrite for new NR parameters //overwrite for new NR parameters
gNB_config->subframe_config.numerology_index_mu.value = 1; 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.dl_channel_bandwidth.value = 106;
gNB_config->rf_config.ul_channel_bandwidth.value = 106; gNB_config->rf_config.ul_channel_bandwidth.value = 106;
gNB_config->sch_config.half_frame_index = 0; gNB_config->sch_config.half_frame_index = 0;
......
...@@ -85,6 +85,6 @@ void phy_procedures_gNB_TX(PHY_VARS_gNB *gNB, ...@@ -85,6 +85,6 @@ void phy_procedures_gNB_TX(PHY_VARS_gNB *gNB,
} }
if (nfapi_mode == 0 || nfapi_mode == 1) { if (nfapi_mode == 0 || nfapi_mode == 1) {
common_signal_procedures(gNB,frame, subframe); nr_common_signal_procedures(gNB,frame, subframe);
} }
} }
...@@ -124,6 +124,7 @@ extern volatile int oai_exit; ...@@ -124,6 +124,7 @@ extern volatile int oai_exit;
extern void nr_phy_init_RU(RU_t*); extern void nr_phy_init_RU(RU_t*);
extern void nr_phy_free_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 init_RU(char*);
void stop_RU(int nb_ru); void stop_RU(int nb_ru);
...@@ -1374,6 +1375,7 @@ static void* ru_thread( void* param ) { ...@@ -1374,6 +1375,7 @@ static void* ru_thread( void* param ) {
} }
if (ru->if_south == LOCAL_RF) { // configure RF parameters only if (ru->if_south == LOCAL_RF) { // configure RF parameters only
fill_rf_config(ru,ru->rf_config_file); 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_init_frame_parms(ru->gNB_list[0]->gNB_config, fp);
nr_dump_frame_parms(fp); nr_dump_frame_parms(fp);
nr_phy_init_RU(ru); nr_phy_init_RU(ru);
...@@ -1900,10 +1902,9 @@ void configure_rru(int idx, ...@@ -1900,10 +1902,9 @@ void configure_rru(int idx,
} }
nr_init_frame_parms(ru->gNB_list[0]->gNB_config, &ru->nr_frame_parms);
fill_rf_config(ru,ru->rf_config_file); 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); nr_phy_init_RU(ru);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment