maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NR RU init

Browse Source
This commit is contained in:
Guy De Souza
2018-04-11 14:31:08 +02:00
parent 312cf0bf56
commit 7e7c15c3b9
4 changed files with 199 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
targets/RT/USER/nr-ru.c
+6 -6
View File
@@ -122,8 +122,8 @@ static int DEFENBS[] = {0};
extern volatile int oai_exit;
extern void phy_init_RU(RU_t*);
extern void phy_free_RU(RU_t*);
extern void nr_phy_init_RU(RU_t*);
extern void nr_phy_free_RU(RU_t*);
void init_RU(char*);
void stop_RU(int nb_ru);
@@ -1376,7 +1376,7 @@ static void* ru_thread( void* param ) {
fill_rf_config(ru,ru->rf_config_file);
nr_init_frame_parms(ru->gNB_list[0]->gNB_config, fp);
nr_dump_frame_parms(fp);
phy_init_RU(ru);
nr_phy_init_RU(ru);
ret = openair0_device_load(&ru->rfdevice,&ru->openair0_cfg);
}
@@ -1863,7 +1863,7 @@ void configure_ru(int idx,
config->prach_FreqOffset[0],config->prach_ConfigIndex[0]);*/
nr_init_frame_parms(&ru->gNB_list[0]->gNB_config, &ru->nr_frame_parms);
phy_init_RU(ru);
nr_phy_init_RU(ru);
}
void configure_rru(int idx,
@@ -1905,7 +1905,7 @@ void configure_rru(int idx,
fill_rf_config(ru,ru->rf_config_file);
phy_init_RU(ru);
nr_phy_init_RU(ru);
}
@@ -2016,7 +2016,7 @@ void set_function_spec_param(RU_t *ru)
if (ru->function == gNodeB_3GPP) { // configure RF parameters only for 3GPP eNodeB, we need to get them from RAU otherwise
fill_rf_config(ru,rf_config_file);
init_frame_parms(&ru->frame_parms,1);
phy_init_RU(ru);
nr_phy_init_RU(ru);
}
ret = openair0_device_load(&ru->rfdevice,&ru->openair0_cfg);
targets/RT/USER/nr-softmodem.c
+3 -3
View File
@@ -782,7 +782,7 @@ void terminate_task(task_id_t task_id, module_id_t mod_id)
}
//extern void free_transport(PHY_VARS_gNB *);
extern void phy_free_RU(RU_t*);
extern void nr_phy_free_RU(RU_t*);
int stop_L1L2(module_id_t gnb_id)
{
@@ -825,7 +825,7 @@ int stop_L1L2(module_id_t gnb_id)
//free_transport(RC.gNB[gnb_id][cc_id]);
phy_free_nr_gNB(RC.gNB[gnb_id][cc_id]);
}
phy_free_RU(RC.ru[gnb_id]);
nr_phy_free_RU(RC.ru[gnb_id]);
free_lte_top();
return 0;
}
@@ -1283,7 +1283,7 @@ int main( int argc, char **argv )
}
}
for (int inst = 0; inst < NB_RU; inst++) {
phy_free_RU(RC.ru[inst]);
nr_phy_free_RU(RC.ru[inst]);
}
free_lte_top();