Merge branch 'RU-RAU-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into RU-RAU-split

common/config/config_load_configmodule.c

@@ -139,11 +139,10 @@ int i;
        modeparams = strdup("oaisoftmodem.conf");
    }
    else if ( i == 1 ) {
-  /* -O argument doesn't contain ":" separator, legacy -O <conf file> option, default cfgmode to libconfig
+  /* -O argument doesn't contain ":" separator, assume -O <conf file> option, default cfgmode to libconfig
      with one parameter, the path to the configuration file */
        modeparams=cfgmode;
        cfgmode=strdup("libconfig");
-       tmpflags = tmpflags | CONFIG_LEGACY;/* temporary, legacy mode */
    }
 
    cfgptr = malloc(sizeof(configmodule_interface_t));

common/config/config_load_configmodule.h

@@ -46,8 +46,7 @@
 #define CONFIG_DEBUGCMDLINE   4        // print command line processing messages
 #define CONFIG_HELP           8        // print help message
 #define CONFIG_ABORT          16       // config failed,abort execution 
-/* temporary flag to be able to use legacy config mechanism */
-#define CONFIG_LEGACY             (1 << 10)     
+
 
 typedef int(*configmodule_initfunc_t)(char *cfgP[],int numP);
 typedef int(*configmodule_getfunc_t)(paramdef_t *,int numparams, char *prefix);

common/config/config_userapi.h

@@ -52,7 +52,7 @@ extern int config_isparamset(paramdef_t *params,int paramidx);
 extern void config_assign_int(paramdef_t *cfgoptions, char *fullname, int val);
 extern int config_process_cmdline(paramdef_t *cfgoptions,int numoptions, char *prefix);
 #define config_getlist config_get_if()->getlist
-
+#define CONFIG_GETCONFFILE (config_get_if()->cfgP[0])
 
 #ifdef __cplusplus
 }

openair2/ENB_APP/enb_config.h

@@ -91,7 +91,11 @@ typedef struct ru_config_s {
   uint8_t   if_compress;
 } ru_config_t;
 
-
+extern void RCconfig_RU(void);
+extern void RCconfig_L1(void);
+extern void RCconfig_macrlc(void);
+extern int  RCconfig_gtpu(void );
+extern void RCConfig(void);
 
 void                          enb_config_display(void);
 void                          ru_config_display(void);