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

Conflicts: openair1/PHY/defs_eNB.h

Merge remote-tracking branch 'origin/fix-remove-lte-ran-file' into develop_integration_2018_w19
Conflicts: openair1/PHY/defs_eNB.h
7da4367c · Cedric Roux · 68479fa4 · 72529e6c · 7da4367c · 7da4367c
Commit 7da4367c authored May 14, 2018 by Cedric Roux
--- a/openair1/PHY/defs_L1_NB_IoT.h
+++ b/openair1/PHY/defs_L1_NB_IoT.h
@@ -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

--- a/openair1/PHY/defs_eNB.h
+++ b/openair1/PHY/defs_eNB.h
@@ -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

--- a/targets/RT/USER/lte-ran.c
+++ b/targets/RT/USER/lte-ran.c