merge develop

2021-11-15 10:25:52 +01:00
parent a8bfb20121 300af2c5ab
commit 66073d50fc
132 changed files with 1794 additions and 3897 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"