Added configuration File, example in targets/PROJECTS/GENERIC-LTE-EPC

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4950 818b1a75-f10b-46b9-bf7c-635c3b92a50f

targets/SIMU/USER/Makefile

@@ -298,6 +298,10 @@ printvars:
 	@echo CFLAGS: $(CFLAGS)
 	@echo Enable PGM: $(ENABLE_PGM)
 
+##UTIL_YAC_C = $(OPENAIR2_TOP)/UTIL/enb_parser.o
+##$(UTIL_LEX_C) = $(subst $(OPENAIR_HOME), $(OBJS_DIR), $(OBJ) $(OAISIM_OBJS) $(ASN1_MSG_OBJS1))
+
+
 OAISIM_COMPILED_OBJECTS = $(subst $(OPENAIR_HOME), $(OBJS_DIR), $(OBJ) $(OAISIM_OBJS) $(ASN1_MSG_OBJS1))
 
 -include $(ITTI_MESSAGES_XML:.xml=.d)
@@ -337,7 +341,7 @@ oaisim_pad: $(OBJ) $(OAISIM_PAD_OBJS) $(ASN1_MSG_OBJS1)
 oaisim: $(OAISIM_COMPILED_OBJECTS) $(SHARED_DEPENDENCIES)
 	@echo "Linking oaisim ..."
 	@$(CC) $(INCLUDES) $(S1AP_Incl) -o oaisim $(CFLAGS) $(EXTRA_CFLAGS) $(OAISIM_COMPILED_OBJECTS) \
-	-lpthread -llapack_atlas -lforms -lrt $(LIBS) $(DB_LDFLAGS)
+	-lpthread -llapack_atlas -lforms -lrt -lconfig $(LIBS) $(DB_LDFLAGS)
 
 ifeq ($(rrc_cellular_eNB),1)
 	mv oaisim oaisim_eNB

targets/SIMU/USER/oaisim_functions.c

@@ -53,6 +53,7 @@ int otg_times = 0;
 int if_times = 0;
 int for_times = 0;
 
+char *g_conf_config_file_name = NULL;
 u16 Nid_cell = 0; //needed by init_lte_vars
 int nb_antennas_rx=2; // //
 u8 target_dl_mcs = 0;
@@ -117,6 +118,7 @@ void get_simulation_options(int argc, char *argv[]) {
   char c;
   int option_index;
   static struct option long_options[] = {
+    {"config-file",            required_argument, 0, 0},
     {"pdcp_period",            1,                 0, 0},
     {"omg_period",             1,                 0, 0},
     {"enb-ral-listening-port", required_argument, 0, 0},
@@ -139,7 +141,12 @@ void get_simulation_options(int argc, char *argv[]) {
   while ((c = getopt_long (argc, argv, "aA:b:B:c:C:D:d:eE:f:FGg:hHi:IJ:j:k:K:l:L:m:M:n:N:oO:p:P:Q:rR:s:S:t:T:u:U:vV:w:W:x:X:y:Y:z:Z:", long_options, &option_index)) != -1) {
     switch (c) {
     case 0:
-      if (! strcmp(long_options[option_index].name, "pdcp_period")) {
+      if (! strcmp(long_options[option_index].name, "config-file")) {
+          if (optarg) {
+              g_conf_config_file_name = strdup(optarg);
+              printf("config file is %s\n", g_conf_config_file_name);
+          }
+      } else if (! strcmp(long_options[option_index].name, "pdcp_period")) {
         if (optarg) {
           pdcp_period = atoi(optarg);
           printf("PDCP period is %d\n", pdcp_period);