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

Conflicts:
	openair1/PHY/defs_eNB.h
This commit is contained in:
Cedric Roux
2018-05-14 16:34:50 +02:00
3 changed files with 0 additions and 1751 deletions
-2
View File
@@ -341,8 +341,6 @@ typedef struct eNB_proc_NB_IoT_t_s {
int instance_cnt_asynch_rxtx;
/// pthread structure for FH processing thread
pthread_t pthread_FH;
/// pthread structure for eNB single processing thread
pthread_t pthread_single;
/// pthread structure for asychronous RX/TX processing thread
pthread_t pthread_asynch_rxtx;
/// flag to indicate first RX acquisition
-2
View File
@@ -706,8 +706,6 @@ typedef struct eNB_proc_t_s {
int instance_cnt_synch;
/// \internal This variable is protected by \ref mutex_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_t pthread_asynch_rxtx;
/// flag to indicate first RX acquisition
File diff suppressed because it is too large Load Diff