diff --git a/openair1/PHY/LTE_TRANSPORT/dlsch_coding.c b/openair1/PHY/LTE_TRANSPORT/dlsch_coding.c index 30c106b16bdabfff7d1671588a94c24eb6519e38..6ca2fdc42973b3c21c6aa45a34b1df026cd4972d 100644 --- a/openair1/PHY/LTE_TRANSPORT/dlsch_coding.c +++ b/openair1/PHY/LTE_TRANSPORT/dlsch_coding.c @@ -393,7 +393,7 @@ int dlsch_encoding_2threads(PHY_VARS_eNB *eNB, //start_meas(&eNB->dlsch_turbo_encoding_preperation_stats); LTE_DL_FRAME_PARMS *frame_parms = &eNB->frame_parms; - eNB_proc_t *proc = &eNB->proc; + L1_proc_t *proc = &eNB->proc; unsigned int G; unsigned int crc=1; diff --git a/openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c b/openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c index 046e456916a104bf5afc892142a9317807ac4e80..cf3f412fda9a25bc1952f4ea4cd8a6a945df9486 100644 --- a/openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c +++ b/openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c @@ -382,7 +382,7 @@ int ulsch_decoding_data_2thread0(td_params* tdp) { extern int oai_exit; void *td_thread(void *param) { PHY_VARS_eNB *eNB = ((td_params*)param)->eNB; - eNB_proc_t *proc = &eNB->proc; + L1_proc_t *proc = &eNB->proc; cpu_set_t cpuset; CPU_ZERO(&cpuset); @@ -412,7 +412,7 @@ void *td_thread(void *param) { int ulsch_decoding_data_2thread(PHY_VARS_eNB *eNB,int UE_id,int harq_pid,int llr8_flag) { - eNB_proc_t *proc = &eNB->proc; + L1_proc_t *proc = &eNB->proc; unsigned int r,r_offset=0,Kr,Kr_bytes; uint8_t crc_type; int offset = 0; diff --git a/openair1/PHY/defs_eNB.h b/openair1/PHY/defs_eNB.h index a8c0ab8506185edb88774a02bd9f2470463476ab..39f61c7fcff0075bf80d99804df1498a3fb25e7a 100644 --- a/openair1/PHY/defs_eNB.h +++ b/openair1/PHY/defs_eNB.h @@ -698,7 +698,7 @@ typedef struct { } te_params; /// Context data structure for eNB subframe processing -typedef struct eNB_proc_t_s { +typedef struct L1_proc_t_s { /// Component Carrier index uint8_t CC_id; /// thread index @@ -833,7 +833,7 @@ typedef struct eNB_proc_t_s { eNB_rxtx_proc_t L1_proc,L1_proc_tx; /// stats thread pthread descriptor pthread_t process_stats_thread; -} eNB_proc_t; +} L1_proc_t; @@ -901,7 +901,7 @@ typedef struct PHY_VARS_eNB_s { module_id_t Mod_id; uint8_t CC_id; uint8_t configured; - eNB_proc_t proc; + L1_proc_t proc; int single_thread_flag; int abstraction_flag; int num_RU; diff --git a/openair1/SCHED/phy_procedures_lte_eNb.c b/openair1/SCHED/phy_procedures_lte_eNb.c index 276006ec3be58e40a413856efc288d7d9d2f3a43..d0ec95f80c2c47604b432747b93be06af5857de8 100644 --- a/openair1/SCHED/phy_procedures_lte_eNb.c +++ b/openair1/SCHED/phy_procedures_lte_eNb.c @@ -1468,7 +1468,7 @@ extern void *td_thread(void*); void init_td_thread(PHY_VARS_eNB *eNB) { - eNB_proc_t *proc = &eNB->proc; + L1_proc_t *proc = &eNB->proc; proc->tdp.eNB = eNB; proc->instance_cnt_td = -1; @@ -1482,7 +1482,7 @@ void init_td_thread(PHY_VARS_eNB *eNB) { } void kill_td_thread(PHY_VARS_eNB *eNB) { - eNB_proc_t *proc = &eNB->proc; + L1_proc_t *proc = &eNB->proc; proc->instance_cnt_td = 0; pthread_cond_signal(&proc->cond_td); @@ -1495,7 +1495,7 @@ extern void *te_thread(void*); void init_te_thread(PHY_VARS_eNB *eNB) { - eNB_proc_t *proc = &eNB->proc; + L1_proc_t *proc = &eNB->proc; for(int i=0; i<3 ;i++){ proc->tep[i].eNB = eNB; @@ -1511,7 +1511,7 @@ void init_te_thread(PHY_VARS_eNB *eNB) { } void kill_te_thread(PHY_VARS_eNB *eNB) { - eNB_proc_t *proc = &eNB->proc; + L1_proc_t *proc = &eNB->proc; for(int i=0; i<3 ;i++){ proc->tep[i].instance_cnt_te = 0;