Merge nr_initialsync

2018-05-29 03:13:08 -07:00
parent 45519c9249 054ac83d2b
commit 5b94aeac77
426 changed files with 25860 additions and 26636 deletions
@@ -35,11 +35,10 @@

 #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 "RRC/LTE/rrc_defs.h"
 #include "flexran_agent_defs.h"

 #include "gtpv1u.h"
@@ -49,8 +48,10 @@
 #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"
 #include "RRC/NR/defs_NR.h"
+
 typedef struct {
  /// RAN context config file name
  char *config_file_name;