scope for 5G

executables/nr-softmodem.c

@@ -954,7 +954,9 @@ if(!IS_SOFTMODEM_NOS1)
     scopeParms_t p;
     p.argc=&argc;
     p.argv=argv;
-    startScope(&p);
+    p.gNB=RC.gNB[0];
+    p.ru=RC.ru[0];
+    gNBinitScope(&p);
   }
 
   if (nfapi_mode != 1 && nfapi_mode != 2) {

executables/nr-uesoftmodem.c

@@ -249,7 +249,7 @@ void exit_function(const char *file, const char *function, const int line, const
 }
 
 
-void reset_stats(FL_OBJECT *button, long arg) {
+void reset_stats(long arg) {
   //int i,j,k;
   /*PHY_VARS_eNB *phy_vars_eNB = PHY_vars_eNB_g[0][0];
 
@@ -729,7 +729,7 @@ int main( int argc, char **argv ) {
   configure_linux();
   mlockall(MCL_CURRENT | MCL_FUTURE);
   if (do_forms)
-     init_scope(PHY_vars_UE_g[0][0]);
+     nrUEinitScope(PHY_vars_UE_g[0][0]);
   number_of_cards = 1;
 
   for(int CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {

executables/ocp-gnb.c

@@ -880,7 +880,7 @@ int main( int argc, char **argv ) {
 
   if (do_forms==1) {
     scopeParms_t tmp= {&argc, argv, &ru, RC.gNB[0]};
-    startScope(&tmp);
+    gNBinitScope(&tmp);
   }
 
   while(!oai_exit)