Commit 45013902 authored by Chang-Sheng,Liu's avatar Chang-Sheng,Liu

fix eNBs struct warning

parent 9b1bc43c
...@@ -859,7 +859,7 @@ void init_eNB_proc(int inst) { ...@@ -859,7 +859,7 @@ void init_eNB_proc(int inst) {
int CC_id; int CC_id;
//PHY_VARS_eNB *eNB; //PHY_VARS_eNB *eNB;
// PHY_VARS_eNB_NB_IoT *eNB_NB_IoT;//Ann // PHY_VARS_eNB_NB_IoT *eNB_NB_IoT;//Ann
eNBs_t *eNBs;//Ann eNBs_t eNBs;//Ann
L1_proc_t *proc; L1_proc_t *proc;
L1_rxtx_proc_t *L1_proc, *L1_proc_tx; L1_rxtx_proc_t *L1_proc, *L1_proc_tx;
pthread_attr_t *attr0=NULL,*attr1=NULL,*attr_prach=NULL; pthread_attr_t *attr0=NULL,*attr1=NULL,*attr_prach=NULL;
...@@ -867,14 +867,14 @@ void init_eNB_proc(int inst) { ...@@ -867,14 +867,14 @@ void init_eNB_proc(int inst) {
pthread_attr_t *attr_prach_br=NULL; pthread_attr_t *attr_prach_br=NULL;
#endif #endif
LOG_I(PHY,"%s(inst:%d) RC.nb_CC[inst]:%d \n",__FUNCTION__,inst,RC.nb_CC[inst]); LOG_I(PHY,"%s(inst:%d) RC.nb_CC[inst]:%d \n",__FUNCTION__,inst,RC.nb_CC[inst]);
eNBs->eNB_NB_IoT = RC.L1_NB_IoT[inst];//Ann eNBs.eNB_NB_IoT = RC.L1_NB_IoT[inst];//Ann
for (CC_id=0; CC_id<RC.nb_CC[inst]; CC_id++) { for (CC_id=0; CC_id<RC.nb_CC[inst]; CC_id++) {
eNBs->eNB = RC.eNB[inst][CC_id]; eNBs.eNB = RC.eNB[inst][CC_id];
#ifndef OCP_FRAMEWORK #ifndef OCP_FRAMEWORK
LOG_I(PHY,"Initializing eNB processes instance:%d CC_id %d \n",inst,CC_id); LOG_I(PHY,"Initializing eNB processes instance:%d CC_id %d \n",inst,CC_id);
#endif #endif
proc = &eNBs->eNB->proc; proc = &eNBs.eNB->proc;
L1_proc = &proc->L1_proc; L1_proc = &proc->L1_proc;
L1_proc_tx = &proc->L1_proc_tx; L1_proc_tx = &proc->L1_proc_tx;
L1_proc->instance_cnt = -1; L1_proc->instance_cnt = -1;
...@@ -887,10 +887,10 @@ void init_eNB_proc(int inst) { ...@@ -887,10 +887,10 @@ void init_eNB_proc(int inst) {
proc->CC_id = CC_id; proc->CC_id = CC_id;
proc->first_rx =1; proc->first_rx =1;
proc->first_tx =1; proc->first_tx =1;
proc->RU_mask_tx = (1<<eNBs->eNB->num_RU)-1; proc->RU_mask_tx = (1<<eNBs.eNB->num_RU)-1;
memset((void*)proc->RU_mask,0,10*sizeof(proc->RU_mask[0])); memset((void*)proc->RU_mask,0,10*sizeof(proc->RU_mask[0]));
proc->RU_mask_prach =0; proc->RU_mask_prach =0;
pthread_mutex_init( &eNBs->eNB->UL_INFO_mutex, NULL); pthread_mutex_init( &eNBs.eNB->UL_INFO_mutex, NULL);
pthread_mutex_init( &L1_proc->mutex, NULL); pthread_mutex_init( &L1_proc->mutex, NULL);
pthread_mutex_init( &L1_proc_tx->mutex, NULL); pthread_mutex_init( &L1_proc_tx->mutex, NULL);
pthread_cond_init( &L1_proc->cond, NULL); pthread_cond_init( &L1_proc->cond, NULL);
...@@ -930,11 +930,11 @@ void init_eNB_proc(int inst) { ...@@ -930,11 +930,11 @@ void init_eNB_proc(int inst) {
#endif #endif
if(get_thread_worker_conf() == WORKER_ENABLE) { if(get_thread_worker_conf() == WORKER_ENABLE) {
init_te_thread(eNBs->eNB); init_te_thread(eNBs.eNB);
init_td_thread(eNBs->eNB); init_td_thread(eNBs.eNB);
} }
LOG_I(PHY,"eNBs->eNB->single_thread_flag:%d\n", eNBs->eNB->single_thread_flag); LOG_I(PHY,"eNBs.eNB->single_thread_flag:%d\n", eNBs.eNB->single_thread_flag);
if ((get_thread_parallel_conf() == PARALLEL_RU_L1_SPLIT) && NFAPI_MODE!=NFAPI_MODE_VNF) { if ((get_thread_parallel_conf() == PARALLEL_RU_L1_SPLIT) && NFAPI_MODE!=NFAPI_MODE_VNF) {
pthread_create( &L1_proc->pthread, attr0, L1_thread, proc ); pthread_create( &L1_proc->pthread, attr0, L1_thread, proc );
...@@ -950,14 +950,14 @@ void init_eNB_proc(int inst) { ...@@ -950,14 +950,14 @@ void init_eNB_proc(int inst) {
} }
if (NFAPI_MODE!=NFAPI_MODE_VNF) { if (NFAPI_MODE!=NFAPI_MODE_VNF) {
pthread_create( &proc->pthread_prach, attr_prach, eNB_thread_prach, eNBs ); pthread_create( &proc->pthread_prach, attr_prach, eNB_thread_prach, &eNBs );
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0)) #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
pthread_create( &proc->pthread_prach_br, attr_prach_br, eNB_thread_prach_br, eNBs->eNB ); pthread_create( &proc->pthread_prach_br, attr_prach_br, eNB_thread_prach_br, &eNBs.eNB );
#endif #endif
} }
AssertFatal(proc->instance_cnt_prach == -1,"instance_cnt_prach = %d\n",proc->instance_cnt_prach); AssertFatal(proc->instance_cnt_prach == -1,"instance_cnt_prach = %d\n",proc->instance_cnt_prach);
if (opp_enabled == 1) pthread_create(&proc->process_stats_thread,NULL,process_stats_thread,(void *)eNBs->eNB); if (opp_enabled == 1) pthread_create(&proc->process_stats_thread,NULL,process_stats_thread,(void *)eNBs.eNB);
} }
//for multiple CCs: setup master and slaves //for multiple CCs: setup master and slaves
......
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