Merge remote-tracking branch 'origin/develop' into NR_SA_F1AP_5GRECORDS

targets/RT/USER/lte-softmodem.c

@@ -35,6 +35,7 @@
 #include <sched.h>
 
 #include "rt_wrapper.h"
+#include <common/utils/msc/msc.h>
 
 
 #undef MALLOC //there are two conflicting definitions, so we better make sure we don't use it at all
@@ -56,6 +57,8 @@
 
 //#undef FRAME_LENGTH_COMPLEX_SAMPLES //there are two conflicting definitions, so we better make sure we don't use it at all
 
+#include <openair1/PHY/phy_extern_ue.h>
+
 #include "PHY/phy_vars.h"
 #include "SCHED/sched_common_vars.h"
 #include "LAYER2/MAC/mac_vars.h"
@@ -100,6 +103,8 @@ pthread_cond_t nfapi_sync_cond;
 pthread_mutex_t nfapi_sync_mutex;
 int nfapi_sync_var=-1; //!< protected by mutex \ref nfapi_sync_mutex
 
+msc_interface_t msc_interface;
+
 
 uint16_t sf_ahead=4;
 
@@ -170,7 +175,6 @@ extern void init_eNB_afterRU(void);
 int transmission_mode=1;
 int emulate_rf = 0;
 int numerology = 0;
-int usrp_tx_thread = 0;
 
 THREAD_STRUCT thread_struct;
 /* struct for ethernet specific parameters given in eNB conf file */