Merge remote-tracking branch 'origin/develop' into feature-127-protocol-split

common/ran_context.h

@@ -35,12 +35,13 @@
 
 #include <pthread.h>
 #include "COMMON/platform_constants.h"
-#include "PHY/defs.h"
+#include "PHY/defs_eNB.h"
 #include "PHY/types.h"
 #include "PHY/impl_defs_top.h"
 #include "PHY/impl_defs_lte.h"
-#include "RRC/LITE/defs.h"
+
 #include "ENB_APP/enb_config.h"
+#include "RRC/LTE/rrc_defs.h"
 #include "flexran_agent_defs.h"
 
 #include "gtpv1u.h"
@@ -50,8 +51,8 @@
 #include "gtpv1u_eNB_defs.h"
 
 #include "PHY/defs_L1_NB_IoT.h"
-#include "RRC/LITE/defs_NB_IoT.h"
 
+#include "RRC/LTE/defs_NB_IoT.h"
 typedef struct {
   /// RAN context config file name
   char *config_file_name;