Fixed log init issue.

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

targets/RTAI/USER/lte-softmodem.c

@@ -1079,7 +1079,14 @@ static void *UE_thread(void *arg)
   return 0;
 }
 
-enum {
+static void get_options (int argc, char **argv)
+{
+  int                           c;
+  char                          line[1000];
+  int                           l;
+  const Enb_properties_array_t *enb_properties;
+
+  enum long_option_e {
     LONG_OPTION_START = 0x100, /* Start after regular single char options */
 
     LONG_OPTION_CALIB_UE_RX,
@@ -1089,14 +1096,7 @@ enum {
     LONG_OPTION_DEBUG_UE_PRACH,
 
     LONG_OPTION_NO_L2_CONNECT,
-} long_option_e;
-
-static void get_options (int argc, char **argv)
-{
-  int                           c;
-  char                          line[1000];
-  int                           l;
-  const Enb_properties_array_t *enb_properties;
+  };
 
   static const struct option long_options[] = {
     {"calib-ue-rx",     required_argument,  NULL, LONG_OPTION_CALIB_UE_RX},
@@ -1313,6 +1313,12 @@ int main(int argc, char **argv) {
 
   get_options (argc, argv); //Command-line options
 
+  //randominit (0);
+  set_taus_seed (0);
+
+  // initialize the log (see log.h for details)
+  logInit();
+
   set_glog(LOG_WARNING, LOG_MED);
   if (UE_flag==1)
   {
@@ -1361,12 +1367,6 @@ int main(int argc, char **argv) {
     set_comp_log(ENB_APP, LOG_INFO, LOG_HIGH, 1);;
   }
 
-  //randominit (0);
-  set_taus_seed (0);
-
-  // initialize the log (see log.h for details)
-  logInit();
-
   if (ouput_vcd) {
     if (UE_flag==1)
       vcd_signal_dumper_init("/tmp/openair_dump_UE.vcd");

targets/SIMU/USER/oaisim_functions.c

@@ -116,7 +116,11 @@ extern pdcp_mbms_t pdcp_mbms_array[MAX_MODULES][16*29];
 
 extern void help (void);
 
-enum {
+void get_simulation_options(int argc, char *argv[]) {
+  int                           option;
+  const Enb_properties_array_t *enb_properties;
+
+  enum long_option_e {
       LONG_OPTION_START = 0x100, /* Start after regular single char options */
 
       LONG_OPTION_ENB_CONF,
@@ -141,9 +145,9 @@ enum {
       LONG_OPTION_UE_MIHF_REMOTE_PORT,
       LONG_OPTION_UE_MIHF_IP_ADDRESS,
       LONG_OPTION_UE_MIHF_ID,
-} long_option_e;
+  };
 
-static struct option long_options[] = {
+  static struct option long_options[] = {
     {"enb-conf",               required_argument, 0, LONG_OPTION_ENB_CONF},
 
     {"pdcp_period",            required_argument, 0, LONG_OPTION_PDNC_PERIOD},
@@ -167,11 +171,7 @@ static struct option long_options[] = {
     {"ue-mihf-ip-address",     required_argument, 0, LONG_OPTION_UE_MIHF_IP_ADDRESS},
     {"ue-mihf-id",             required_argument, 0, LONG_OPTION_UE_MIHF_ID},
     {NULL, 0, NULL, 0}
-};
-
-void get_simulation_options(int argc, char *argv[]) {
-  int                           option;
-  const Enb_properties_array_t *enb_properties;
+  };
 
   while ((option = 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, NULL)) != -1) {
     switch (option) {