From 28c4c6a47801ea356b44a837c451c5aa4a1b4f27 Mon Sep 17 00:00:00 2001
From: oai <francois.taburet@nokia-bell-labs.com>
Date: Wed, 22 Nov 2017 18:09:42 +0100
Subject: [PATCH] fix config problems preventing UE to start
---
common/config/config_load_configmodule.c | 9 +++++----
common/config/config_load_configmodule.h | 1 +
common/config/config_userapi.h | 3 +++
targets/RT/USER/lte-softmodem.c | 15 ++++++++-------
4 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/common/config/config_load_configmodule.c b/common/config/config_load_configmodule.c
index 8351d4d82c..ff66d22a1c 100644
--- a/common/config/config_load_configmodule.c
+++ b/common/config/config_load_configmodule.c
@@ -129,20 +129,21 @@ int i;
/* default */
if (cfgparam == NULL) {
- cfgparam = "libconfig:oaisoftmodem.conf";
+ tmpflags = tmpflags | CONFIG_NOOOPT;
+ cfgparam = DEFAULT_CFGMODE ":" DEFAULT_CFGFILENAME;
}
/* parse the config parameters to set the config source */
i = sscanf(cfgparam,"%m[^':']:%ms",&cfgmode,&modeparams);
if (i< 0) {
fprintf(stderr,"[CONFIG] %s, %d, sscanf error parsing config source %s: %s\n", __FILE__, __LINE__,cfgparam, strerror(errno));
- cfgmode=strdup("libconfig");
- modeparams = strdup("oaisoftmodem.conf");
+ cfgmode=strdup(DEFAULT_CFGMODE);
+ modeparams = strdup(DEFAULT_CFGFILENAME);
}
else if ( i == 1 ) {
/* -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");
+ cfgmode=strdup(DEFAULT_CFGMODE);
}
cfgptr = malloc(sizeof(configmodule_interface_t));
diff --git a/common/config/config_load_configmodule.h b/common/config/config_load_configmodule.h
index 71c642f680..76f074cd6c 100644
--- a/common/config/config_load_configmodule.h
+++ b/common/config/config_load_configmodule.h
@@ -46,6 +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
+#define CONFIG_NOOOPT 32 // no -O option found when parsing command line
typedef int(*configmodule_initfunc_t)(char *cfgP[],int numP);
diff --git a/common/config/config_userapi.h b/common/config/config_userapi.h
index 8c8fc9d2bf..5bbc20a950 100644
--- a/common/config/config_userapi.h
+++ b/common/config/config_userapi.h
@@ -38,6 +38,9 @@
extern "C"
{
#endif
+#define DEFAULT_CFGFILENAME "oaisoftmodem.conf"
+#define DEFAULT_CFGMODE "libconfig"
+
#define CONFIG_GETSOURCE ( (config_get_if()==NULL) ? NULL : config_get_if()->cfgmode )
#define CONFIG_GETNUMP ( (config_get_if()==NULL) ? 0 : config_get_if()->num_cfgP )
#define CONFIG_GETP(P) ( (config_get_if()==NULL) ? NULL : config_get_if()->cfgP[P] )
diff --git a/targets/RT/USER/lte-softmodem.c b/targets/RT/USER/lte-softmodem.c
index 993a004fc6..28f3d2f25a 100644
--- a/targets/RT/USER/lte-softmodem.c
+++ b/targets/RT/USER/lte-softmodem.c
@@ -678,7 +678,7 @@ static void get_options(void) {
NB_RU = RC.nb_RU;
printf("Configuration: nb_rrc_inst %d, nb_L1_inst %d, nb_ru %d\n",NB_eNB_INST,RC.nb_L1_inst,NB_RU);
}
- } else if (UE_flag == 1 && (CONFIG_GETCONFFILE != NULL)) {
+ } else if (UE_flag == 1 && (!(CONFIG_ISFLAGSET(CONFIG_NOOOPT))) ) {
// Here the configuration file is the XER encoded UE capabilities
// Read it in and store in asn1c data structures
strcpy(uecap_xer,CONFIG_GETCONFFILE);
@@ -731,12 +731,12 @@ void set_default_frame_parms(LTE_DL_FRAME_PARMS *frame_parms[MAX_NUM_CCs]) {
frame_parms[CC_id]->prach_config_common.prach_ConfigInfo.highSpeedFlag=0;
frame_parms[CC_id]->prach_config_common.prach_ConfigInfo.prach_FreqOffset=0;
- downlink_frequency[CC_id][0] = 2680000000; // Use float to avoid issue with frequency over 2^31.
- downlink_frequency[CC_id][1] = downlink_frequency[CC_id][0];
- downlink_frequency[CC_id][2] = downlink_frequency[CC_id][0];
- downlink_frequency[CC_id][3] = downlink_frequency[CC_id][0];
+// downlink_frequency[CC_id][0] = 2680000000; // Use float to avoid issue with frequency over 2^31.
+// downlink_frequency[CC_id][1] = downlink_frequency[CC_id][0];
+// downlink_frequency[CC_id][2] = downlink_frequency[CC_id][0];
+// downlink_frequency[CC_id][3] = downlink_frequency[CC_id][0];
//printf("Downlink for CC_id %d frequency set to %u\n", CC_id, downlink_frequency[CC_id][0]);
-
+ frame_parms[CC_id]->dl_CarrierFreq=downlink_frequency[CC_id][0];
}
}
@@ -1083,8 +1083,9 @@ int main( int argc, char **argv )
else if (frame_parms[CC_id]->N_RB_DL == 25)
UE[CC_id]->N_TA_offset = 624/4;
}
-
+ init_openair0();
}
+
}
fill_modeled_runtime_table(runtime_phy_rx,runtime_phy_tx);
--
GitLab