Commit 359e1528 authored by Robert Schmidt's avatar Robert Schmidt

refactor: FlexRAN reads eNB configuration automatically

parent f39dd5df
...@@ -187,9 +187,10 @@ pthread_t new_thread(void *(*f)(void *), void *b) { ...@@ -187,9 +187,10 @@ pthread_t new_thread(void *(*f)(void *), void *b) {
} }
int channel_container_init = 0; int channel_container_init = 0;
int flexran_agent_start(mid_t mod_id, const Enb_properties_array_t* enb_properties){ int flexran_agent_start(mid_t mod_id)
{
int channel_id; int channel_id;
Enb_properties_array_t *enb_properties = enb_config_get();
flexran_set_enb_vars(mod_id, RAN_LTE_OAI); flexran_set_enb_vars(mod_id, RAN_LTE_OAI);
flexran_agent[mod_id].enb_id = mod_id; flexran_agent[mod_id].enb_id = mod_id;
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
/* Initiation and termination of the eNodeB agent */ /* Initiation and termination of the eNodeB agent */
int flexran_agent_start(mid_t mod_id, const Enb_properties_array_t* enb_properties); int flexran_agent_start(mid_t mod_id);
int flexran_agent_stop(mid_t mod_id); int flexran_agent_stop(mid_t mod_id);
/* /*
......
...@@ -44,16 +44,15 @@ void flexran_set_enb_vars(mid_t mod_id, ran_name_t ran){ ...@@ -44,16 +44,15 @@ void flexran_set_enb_vars(mid_t mod_id, ran_name_t ran){
switch (ran){ switch (ran){
case RAN_LTE_OAI : case RAN_LTE_OAI :
enb_properties = enb_config_get();
if(eNB_mac_inst == NULL){ if(eNB_mac_inst == NULL){
enb[mod_id] = NULL; enb[mod_id] = NULL;
enb_ue[mod_id] = NULL; enb_ue[mod_id] = NULL;
enb_rrc[mod_id] = NULL; enb_rrc[mod_id] = NULL;
enb_properties = NULL;
}else{ }else{
enb[mod_id] = (void *)&eNB_mac_inst[mod_id]; enb[mod_id] = (void *)&eNB_mac_inst[mod_id];
enb_ue[mod_id] = (void *)&eNB_mac_inst[mod_id].UE_list; enb_ue[mod_id] = (void *)&eNB_mac_inst[mod_id].UE_list;
enb_rrc[mod_id] = (void *)&eNB_rrc_inst[mod_id]; enb_rrc[mod_id] = (void *)&eNB_rrc_inst[mod_id];
enb_properties = (Enb_properties_array_t *) enb_config_get();
} }
break; break;
default : default :
......
...@@ -1800,7 +1800,7 @@ int main( int argc, char **argv ) { ...@@ -1800,7 +1800,7 @@ int main( int argc, char **argv ) {
pthread_cond_init(&cond_node_ctrl, NULL); pthread_cond_init(&cond_node_ctrl, NULL);
for (i = 0; i < NB_eNB_INST; i++) { for (i = 0; i < NB_eNB_INST; i++) {
flexran_agent_start(i, enb_config_get()); flexran_agent_start(i);
} }
LOG_I(ENB_APP, " * Waiting for FlexRAN RTController command *\n"); LOG_I(ENB_APP, " * Waiting for FlexRAN RTController command *\n");
......
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