maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4950 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
Lionel Gauthier
2014-01-27 11:40:06 +00:00
parent 0ee55ead4d
commit 6be97a95bf
2 changed files with 59 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
targets/SIMU/USER/Makefile
+5 -1
View File
@@ -298,6 +298,10 @@ printvars:
@echo CFLAGS: $(CFLAGS) @echo CFLAGS: $(CFLAGS)
@echo Enable PGM: $(ENABLE_PGM) @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)) OAISIM_COMPILED_OBJECTS = $(subst $(OPENAIR_HOME), $(OBJS_DIR), $(OBJ) $(OAISIM_OBJS) $(ASN1_MSG_OBJS1))
-include $(ITTI_MESSAGES_XML:.xml=.d) -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) oaisim: $(OAISIM_COMPILED_OBJECTS) $(SHARED_DEPENDENCIES)
@echo "Linking oaisim ..." @echo "Linking oaisim ..."
@$(CC) $(INCLUDES) $(S1AP_Incl) -o oaisim $(CFLAGS) $(EXTRA_CFLAGS) $(OAISIM_COMPILED_OBJECTS) \ @$(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) ifeq ($(rrc_cellular_eNB),1)
mv oaisim oaisim_eNB mv oaisim oaisim_eNB
targets/SIMU/USER/oaisim_functions.c
+8 -1
View File
@@ -53,6 +53,7 @@ int otg_times = 0;
int if_times = 0; int if_times = 0;
int for_times = 0; int for_times = 0;
char *g_conf_config_file_name = NULL;
u16 Nid_cell = 0; //needed by init_lte_vars u16 Nid_cell = 0; //needed by init_lte_vars
int nb_antennas_rx=2; // // int nb_antennas_rx=2; // //
u8 target_dl_mcs = 0; u8 target_dl_mcs = 0;
@@ -117,6 +118,7 @@ void get_simulation_options(int argc, char *argv[]) {
char c; char c;
int option_index; int option_index;
static struct option long_options[] = { static struct option long_options[] = {
{"config-file", required_argument, 0, 0},
{"pdcp_period", 1, 0, 0}, {"pdcp_period", 1, 0, 0},
{"omg_period", 1, 0, 0}, {"omg_period", 1, 0, 0},
{"enb-ral-listening-port", required_argument, 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) { 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) { switch (c) {
case 0: 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) { if (optarg) {
pdcp_period = atoi(optarg); pdcp_period = atoi(optarg);
printf("PDCP period is %d\n", pdcp_period); printf("PDCP period is %d\n", pdcp_period);