diff --git a/cmake_targets/build_oai b/cmake_targets/build_oai index 51d6ac6d016c3de2e9f6986645d5d4013b4c6382..c6f8199af25fdee240bbdeb692f4b9f96bfe71fa 100755 --- a/cmake_targets/build_oai +++ b/cmake_targets/build_oai @@ -651,9 +651,9 @@ function main() { compilations \ lte-simulators coding \ libcoding.so $dbin/libcoding.so - compilations \ - lte-simulators $config_libconfig_shlib \ - lib$config_libconfig_shlib.so $dbin/lib$config_libconfig_shlib.so +# compilations \ +# lte-simulators $config_libconfig_shlib \ +# lib$config_libconfig_shlib.so $dbin/lib$config_libconfig_shlib.so fi # Core simulators diff --git a/common/config/config_load_configmodule.c b/common/config/config_load_configmodule.c index cfb6e38440f85268402a3366bbf4d43991a1e7d1..15211aec8a0b99d6ab688658f299bd90fe145f7b 100644 --- a/common/config/config_load_configmodule.c +++ b/common/config/config_load_configmodule.c @@ -169,7 +169,7 @@ int config_cmdlineonly_get(paramdef_t *cfgoptions,int numoptions, char *prefix ) return numdefvals; } -configmodule_interface_t *load_configmodule(int argc, char **argv) +configmodule_interface_t *load_configmodule(int argc, char **argv, uint32_t initflags) { char *cfgparam=NULL; char *modeparams=NULL; @@ -208,10 +208,10 @@ int OoptIdx=-1; /* oad_configmodule function */ if (cfgparam == NULL) { tmpflags = tmpflags | CONFIG_NOOOPT; - if (strstr(argv[0],"uesoftmodem") == NULL || strstr(argv[0],"lsim") == NULL) { - cfgparam = CONFIG_LIBCONFIGFILE ":" DEFAULT_CFGFILENAME; + if ( initflags & CONFIG_ENABLECMDLINEONLY) { + cfgparam = CONFIG_CMDLINEONLY ":dbgl0" ; } else { - cfgparam = CONFIG_CMDLINEONLY ":dbgl0" ; + cfgparam = CONFIG_CMDLINEONLY ":dbgl0" ;cfgparam = CONFIG_LIBCONFIGFILE ":" DEFAULT_CFGFILENAME; } } diff --git a/common/config/config_load_configmodule.h b/common/config/config_load_configmodule.h index 1f4ebde92d2d61460408356d27d0d06e37c21ed2..d98e8250956a261cf4626870500b7fcb5759c66d 100644 --- a/common/config/config_load_configmodule.h +++ b/common/config/config_load_configmodule.h @@ -106,8 +106,9 @@ extern configmodule_interface_t *cfgptr; #define printf_params(...) if ( (cfgptr->rtflags & (CONFIG_PRINTPARAMS)) != 0 ) { printf ( __VA_ARGS__ ); } #define printf_ptrs(...) if ( (cfgptr->rtflags & (CONFIG_DEBUGPTR)) != 0 ) { printf ( __VA_ARGS__ ); } #define printf_cmdl(...) if ( (cfgptr->rtflags & (CONFIG_DEBUGCMDLINE)) != 0 ) { printf ( __VA_ARGS__ ); } - -extern configmodule_interface_t *load_configmodule(int argc, char **argv); + +#define CONFIG_ENABLECMDLINEONLY (1<<1) +extern configmodule_interface_t *load_configmodule(int argc, char **argv, uint32_t initflags); extern void end_configmodule(void); #endif /* INCLUDE_CONFIG_LOADCONFIGMODULE_H */ diff --git a/openair1/SIMULATION/LTE_PHY/dlsim.c b/openair1/SIMULATION/LTE_PHY/dlsim.c index 0f4655eb2c73845ba9647d9b2aea646e9e095f66..246bdd70078dd2d761199c640e17ed5dbdf8c39f 100644 --- a/openair1/SIMULATION/LTE_PHY/dlsim.c +++ b/openair1/SIMULATION/LTE_PHY/dlsim.c @@ -988,7 +988,7 @@ int main(int argc, char **argv) if (transmission_mode>1) pa=dBm3; printf("dlsim: tmode %d, pa %d\n",transmission_mode,pa); - AssertFatal(load_configmodule(argc,argv) != NULL, + AssertFatal(load_configmodule(argc,argv, CONFIG_ENABLECMDLINEONLY) != NULL, "cannot load configuration module, exiting\n"); logInit(); set_glog_onlinelog(true); diff --git a/openair1/SIMULATION/LTE_PHY/ulsim.c b/openair1/SIMULATION/LTE_PHY/ulsim.c index c015063b6051d0ead3be5895d24cc3e8d6f58f0f..53a2c22f15d0378200d696abcdfabd28d539e506 100644 --- a/openair1/SIMULATION/LTE_PHY/ulsim.c +++ b/openair1/SIMULATION/LTE_PHY/ulsim.c @@ -429,7 +429,7 @@ int main(int argc, char **argv) { cpu_freq_GHz = (double)get_cpu_freq_GHz(); cpuf = cpu_freq_GHz; printf("Detected cpu_freq %f GHz\n",cpu_freq_GHz); - AssertFatal(load_configmodule(argc,argv) != NULL, + AssertFatal(load_configmodule(argc,argv,CONFIG_ENABLECMDLINEONLY) != NULL, "cannot load configuration module, exiting\n"); logInit(); // enable these lines if you need debug info diff --git a/targets/RT/USER/lte-softmodem.c b/targets/RT/USER/lte-softmodem.c index 00ae350ea2771452e0d4f5e409674d2096bf99b3..4cf257f3535cc65908efa872f35e172fbe7c1c0e 100644 --- a/targets/RT/USER/lte-softmodem.c +++ b/targets/RT/USER/lte-softmodem.c @@ -695,7 +695,7 @@ int main( int argc, char **argv ) #if defined (XFORMS) int ret; #endif - if ( load_configmodule(argc,argv) == NULL) { + if ( load_configmodule(argc,argv,0) == NULL) { exit_fun("[SOFTMODEM] Error, configuration module init failed\n"); } diff --git a/targets/RT/USER/lte-uesoftmodem.c b/targets/RT/USER/lte-uesoftmodem.c index 2306dbc725249387f9bce51b6b2c5431938cf829..593b64ea40001af5e7b3936ab65d6c4bdc93597d 100644 --- a/targets/RT/USER/lte-uesoftmodem.c +++ b/targets/RT/USER/lte-uesoftmodem.c @@ -761,7 +761,7 @@ int main( int argc, char **argv ) #endif start_background_system(); - if ( load_configmodule(argc,argv) == NULL) { + if ( load_configmodule(argc,argv,CONFIG_ENABLECMDLINEONLY) == NULL) { exit_fun("[SOFTMODEM] Error, configuration module init failed\n"); } @@ -887,7 +887,7 @@ int main( int argc, char **argv ) if (simL1flag==1) { - AssertFatal(NULL!=load_configmodule(argc,argv), + AssertFatal(NULL!=load_configmodule(argc,argv,CONFIG_ENABLECMDLINEONLY), "[SOFTMODEM] Error, configuration module init failed\n"); RCConfig_sim();