Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa

2021-11-09 15:17:58 -08:00
parent 9fb044588d 6e5527e0c6
commit 046258f1ba
118 changed files with 475 additions and 3503 deletions
@@ -63,10 +63,6 @@ unsigned short config_frames[4] = {2,9,11,13};
 #include "enb_config.h"
 //#include "PHY/TOOLS/time_meas.h"

-#ifndef OPENAIR2
-  #include "UTIL/OTG/otg_vars.h"
-#endif
-
 #include "intertask_interface.h"

 #include "PHY/INIT/phy_init.h"