Merge remote-tracking branch 'origin/develop-nr' into develop-nr-less-logging

Conflicts: openair1/SCHED_NR/sched_nr.h
2019-05-18 15:49:13 +02:00
parent 01879c3e2b 19558fda43
commit da9b879112
80 changed files with 7518 additions and 1033 deletions
@@ -89,6 +89,8 @@
 #    define MAX_gNB                      2
 #endif

+#define NUMBER_OF_NR_DLSCH_MAX 16
+#define NUMBER_OF_NR_ULSCH_MAX 16

 #define MAX_MANAGED_ENB_PER_MOBILE  2
 #define MAX_MANAGED_GNB_PER_MOBILE  2