Commit 7da4367c authored by Cedric Roux's avatar Cedric Roux
Browse files

Merge remote-tracking branch 'origin/fix-remove-lte-ran-file' into develop_integration_2018_w19

Conflicts:
	openair1/PHY/defs_eNB.h
parents 68479fa4 72529e6c
...@@ -341,8 +341,6 @@ typedef struct eNB_proc_NB_IoT_t_s { ...@@ -341,8 +341,6 @@ typedef struct eNB_proc_NB_IoT_t_s {
int instance_cnt_asynch_rxtx; int instance_cnt_asynch_rxtx;
/// pthread structure for FH processing thread /// pthread structure for FH processing thread
pthread_t pthread_FH; pthread_t pthread_FH;
/// pthread structure for eNB single processing thread
pthread_t pthread_single;
/// pthread structure for asychronous RX/TX processing thread /// pthread structure for asychronous RX/TX processing thread
pthread_t pthread_asynch_rxtx; pthread_t pthread_asynch_rxtx;
/// flag to indicate first RX acquisition /// flag to indicate first RX acquisition
......
...@@ -706,8 +706,6 @@ typedef struct eNB_proc_t_s { ...@@ -706,8 +706,6 @@ typedef struct eNB_proc_t_s {
int instance_cnt_synch; int instance_cnt_synch;
/// \internal This variable is protected by \ref mutex_asynch_rxtx. /// \internal This variable is protected by \ref mutex_asynch_rxtx.
int instance_cnt_asynch_rxtx; int instance_cnt_asynch_rxtx;
/// pthread structure for eNB single processing thread
pthread_t pthread_single;
/// pthread structure for asychronous RX/TX processing thread /// pthread structure for asychronous RX/TX processing thread
pthread_t pthread_asynch_rxtx; pthread_t pthread_asynch_rxtx;
/// flag to indicate first RX acquisition /// flag to indicate first RX acquisition
......
This diff is collapsed.
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