Merge branch 'NR_RRC_PRACH_procedures' into NR_RRC_harq_hacks

This commit is contained in:
Francesco Mani
2020-06-12 19:14:25 +02:00
77 changed files with 1535 additions and 2958 deletions
+1 -1
View File
@@ -47,7 +47,7 @@
#include "SCHED/sched_eNB.h"
#include "SCHED_NR/sched_nr.h"
#include "SCHED_NR/fapi_nr_l1.h"
#include "PHY/NR_TRANSPORT/nr_transport.h"
#include "PHY/NR_TRANSPORT/nr_transport_proto.h"
#undef MALLOC //there are two conflicting definitions, so we better make sure we don't use it at all
//#undef FRAME_LENGTH_COMPLEX_SAMPLES //there are two conflicting definitions, so we better make sure we don't use it at all