Fix code review remarks, merge develop, revert some merge errors

2021-04-13 22:28:02 +02:00
parent 04f2ec2352
commit 86f1c69f26
49 changed files with 359 additions and 219 deletions
@@ -33,13 +33,7 @@
 //#include "PHY/impl_defs_top.h"
 #include "PHY/defs_nr_UE.h"

-typedef struct {
-  int *argc;
-  char **argv;
-  RU_t *ru;
-  PHY_VARS_gNB *gNB;
-} scopeParms_t;
-
+#include <openair1/PHY/TOOLS/phy_scope_interface.h>

 extern RAN_CONTEXT_t RC;
 #endif