Merge branch 'develop' into NR_RRC_PRACH_procedures

Conflicts:
	cmake_targets/CMakeLists.txt
	openair2/GNB_APP/gnb_app.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
	openair2/RRC/NR/rrc_gNB_nsa.c

openair1/PHY/TOOLS/nr_phy_scope.h

@@ -68,19 +68,13 @@ typedef struct {
 typedef struct {
   int *argc;
   char **argv;
+  RU_t* ru;
+  PHY_VARS_gNB *gNB;
 } scopeParms_t;
 
 extern unsigned char scope_enb_num_ue;
-FD_phy_scope_gnb * create_phy_scope_gnb( void );
 FD_phy_scope_nrue * create_phy_scope_nrue( void );
 
-
-void phy_scope_gNB(FD_phy_scope_gnb *form,
-                   PHY_VARS_gNB *phy_vars_gnb,
-		   RU_t *phy_vars_ru,
-                   int UE_id);
-
-
 void phy_scope_nrUE(FD_phy_scope_nrue *form,
                   PHY_VARS_NR_UE *phy_vars_ue,
                   int eNB_id,
@@ -90,6 +84,5 @@ void phy_scope_nrUE(FD_phy_scope_nrue *form,
 
 void startScope(scopeParms_t * p);
 
-
 extern RAN_CONTEXT_t RC;
 #endif