log.c simplification, fix usefull functionality which never worked, move all...

log.c simplification, fix usefull functionality which never worked, move all log code from openair2 to common

cmake_targets/CMakeLists.txt

@@ -897,7 +897,7 @@ set(UTIL_SRC
   ${OPENAIR2_DIR}/UTIL/FIFO/pad_list.c
   ${OPENAIR2_DIR}/UTIL/LISTS/list.c
   ${OPENAIR2_DIR}/UTIL/LISTS/list2.c
-  ${OPENAIR2_DIR}/UTIL/LOG/log.c
+  ${OPENAIR_DIR}/common/utils/LOG/log.c
 #  ${OPENAIR2_DIR}/UTIL/LOG/vcd_signal_dumper.c
   ${OPENAIR2_DIR}/UTIL/MATH/oml.c
   ${OPENAIR2_DIR}/UTIL/MEM/mem_block.c
@@ -2175,7 +2175,7 @@ if (${T_TRACER})
         #all "add_executable" definitions (except tests, rb_tool, updatefw)
         lte-softmodem lte-softmodem-nos1 lte-uesoftmodem lte-uesoftmodem-nos1
         dlsim_tm4 dlsim dlsim_tm7 ulsim pbchsim scansim mbmssim
-        pdcchsim pucchsim prachsim syncsim
+        pdcchsim pucchsim prachsim syncsim ulsim
         #all "add_library" definitions
         ITTI RRC_LIB S1AP_LIB S1AP_ENB X2AP_LIB
         oai_exmimodevif oai_usrpdevif oai_bladerfdevif oai_lmssdrdevif

common/config/config_cmdline.c

@@ -37,6 +37,35 @@
 #include <errno.h>
 #include "config_userapi.h"
 
+
+void parse_stringlist(paramdef_t *cfgoptions, char *val)
+{
+char *atoken;
+char *tokctx;
+char *tmpval=strdup(val);
+int   numelt=0;
+
+   cfgoptions->numelt=0;
+
+   atoken=strtok_r(tmpval, ",",&tokctx);
+   while(atoken != NULL) {
+     numelt++ ;
+     atoken=strtok_r(NULL, ",",&tokctx);
+   }
+   free(tmpval);
+   config_check_valptr(cfgoptions,(char **)&(cfgoptions->strlistptr), sizeof(char *) * numelt);
+   cfgoptions->numelt=numelt;
+
+   atoken=strtok_r(val, ",",&tokctx);
+   for( int i=0; i<cfgoptions->numelt && atoken != NULL ; i++) {
+      config_check_valptr(cfgoptions,&(cfgoptions->strlistptr[i]),strlen(atoken)+1);
+      sprintf(cfgoptions->strlistptr[i],"%s",atoken);
+      printf_params("[LIBCONFIG] %s[%i]: %s\n", cfgoptions->optname,i,cfgoptions->strlistptr[i]);
+      atoken=strtok_r(NULL, ",",&tokctx);
+   }
+   cfgoptions->numelt=numelt; 
+}
+ 
 int processoption(paramdef_t *cfgoptions, char *value)
 {
 char *tmpval = value;
@@ -66,6 +95,7 @@ char defbool[2]="1";
         break;
 	
         case TYPE_STRINGLIST:
+           parse_stringlist(cfgoptions,tmpval); 
         break;
         case TYPE_UINT32:
        	case TYPE_INT32:
@@ -140,7 +170,7 @@ char *cfgpath;
                      exit_fun("[CONFIG] Exiting after displaying help\n");
                 }
             } else {
-                pp=strtok_r(NULL, "_",&tokctx);
+                pp=strtok_r(NULL, " ",&tokctx);
                 if ( prefix != NULL && pp != NULL && strncasecmp(prefix,pp,strlen(pp)) == 0 ) { 
                    printf ("Help for %s section:\n",prefix);               
                    config_printhelp(cfgoptions,numoptions);
@@ -167,17 +197,19 @@ char *cfgpath;
     		     ((strlen(oneargv) > 2) && (strcmp(oneargv + 2,cfgpath ) == 0 )) ) {
                    char *valptr=NULL;
                    int ret;
-    		   pp = config_get_if()->argv[i+1];
-                   if (pp != NULL && c > 1) {                      
-                       ret = strlen(pp);
-                       if (ret > 0 ) {
-                           if (pp[0] != '-')
-                              valptr=pp;
-                           else if ( ret > 1 && pp[0] == '-' && isdigit(pp[1]) )
-                              valptr=pp;
-                       }
+                   if (c > 0) {
+    		      pp = config_get_if()->argv[i+1];
+                      if (pp != NULL ) {                      
+                         ret = strlen(pp);
+                         if (ret > 0 ) {
+                             if (pp[0] != '-')
+                                valptr=pp;
+                             else if ( ret > 1 && pp[0] == '-' && isdigit(pp[1]) )
+                                valptr=pp;
+                         }
+                     }
                    }
-                   j += processoption(&(cfgoptions[n]), pp);
+                   j += processoption(&(cfgoptions[n]), valptr);
     		   if (  valptr != NULL ) {
                       i++;
                       c--;

openair2/UTIL/LOG/log_extern.h → common/utils/LOG/log_extern.h

@@ -23,15 +23,8 @@
 
 extern log_t *g_log;
 
-#if !defined(LOG_NO_THREAD)
-extern LOG_params log_list[2000];
-extern pthread_mutex_t log_lock;
-extern pthread_cond_t log_notify;
-extern int log_shutdown;
-#endif
 
 extern mapping log_level_names[];
-extern mapping log_verbosity_names[];
+extern mapping log_options[];
+extern mapping log_maskmap[];
 
-extern int log_mem_flag;
-extern char * log_mem_filename;

common/utils/T/T_messages.txt

@@ -749,7 +749,6 @@ ID = LEGACY_OSA_TRACE
     DESC = OSA legacy logs - trace level
     GROUP = ALL:LEGACY_OSA:LEGACY_GROUP_TRACE:LEGACY
     FORMAT = string,log
-
 ID = LEGACY_SIM_INFO
     DESC = SIM legacy logs - info level
     GROUP = ALL:LEGACY_SIM:LEGACY_GROUP_INFO:LEGACY
@@ -770,7 +769,6 @@ ID = LEGACY_SIM_TRACE
     DESC = SIM legacy logs - trace level
     GROUP = ALL:LEGACY_SIM:LEGACY_GROUP_TRACE:LEGACY
     FORMAT = string,log
-
 # this is a bad hack but I won't fix (function util_print_hex_octets
 # in openairinterface5g/openair2/LAYER2/PDCP_v10.1.0/pdcp_util.c
 # does funky things with the LOG_x macros but we work on the C pre-processor

common/utils/itti/assertions.h

@@ -39,7 +39,6 @@ void output_log_mem(void);
 #define _Assert_Exit_                           \
 {                                               \
     fprintf(stderr, "\nExiting execution\n");   \
-    output_log_mem();                           \
     display_backtrace();                        \
     fflush(stdout);                             \
     fflush(stderr);                             \

common/utils/itti/signals.c

@@ -117,19 +117,16 @@ int signal_handle(int *end)
     case SIGUSR1:
       SIG_DEBUG("Received SIGUSR1\n");
       *end = 1;
-      output_log_mem();
       break;
 
     case SIGSEGV:   /* Fall through */
     case SIGABRT:
       SIG_DEBUG("Received SIGABORT\n");
-      output_log_mem();
       backtrace_handle_signal(&info);
       break;
 
     case SIGINT:
       printf("Received SIGINT\n");
-      output_log_mem();
       itti_send_terminate_message(TASK_UNKNOWN);
       *end = 1;
       break;

common/utils/telnetsrv/telnetsrv_loader.h

@@ -32,7 +32,7 @@
 
 #ifdef TELNETSRV_LOADER_MAIN
 
-#include "UTIL/LOG/log.h"
+#include "common/utils/LOG/log.h"
 
 
 #include "common/utils/load_module_shlib.h"

common/utils/telnetsrv/telnetsrv_phycmd.h

@@ -32,7 +32,7 @@
 
 #ifdef TELNETSRV_PHYCMD_MAIN
 
-#include "UTIL/LOG/log.h"
+#include "common/utils/LOG/log.h"
 
 
 #include "openair1/PHY/phy_extern.h"

common/utils/telnetsrv/telnetsrv_proccmd.c

@@ -52,8 +52,7 @@
 #define TELNETSERVERCODE
 #include "telnetsrv.h"
 #define TELNETSRV_PROCCMD_MAIN
-#include "log.h"
-#include "log_extern.h"
+#include "common/utils/LOG/log.h"
 #include "common/config/config_userapi.h"
 #include "openair1/PHY/phy_extern.h"
 #include "telnetsrv_proccmd.h"
@@ -200,16 +199,30 @@ int proccmd_show(char *buf, int debug, telnet_printfunc_t prnt)
        print_threads(buf,debug,prnt);
    }
    if (strcasestr(buf,"loglvl") != NULL) {
-       prnt("component                 verbosity  level  enabled\n");
+       prnt("               component level  enabled\n");
        for (int i=MIN_LOG_COMPONENTS; i < MAX_LOG_COMPONENTS; i++) {
             if (g_log->log_component[i].name != NULL) {
-               prnt("%02i %17.17s:%10.10s%10.10s  %s\n",i ,g_log->log_component[i].name, 
-                     map_int_to_str(log_verbosity_names,g_log->log_component[i].flag),
+               prnt("%02i %17.17s:%10.10s  %s\n",i ,g_log->log_component[i].name, 
 	             map_int_to_str(log_level_names,g_log->log_component[i].level),
                      ((g_log->log_component[i].interval>0)?"Y":"N") );
            }
        }
    }
+   if (strcasestr(buf,"logopt") != NULL) {
+       prnt("               option      enabled\n");
+       for (int i=0; log_options[i].name != NULL; i++) {
+               prnt("%02i %17.17s %10.10s \n",i ,log_options[i].name, 
+                     ((g_log->flag & log_options[i].value)?"Y":"N") );
+       }
+   }
+   if (strcasestr(buf,"dbgopt") != NULL) {
+       prnt("               option  debug matlab\n");
+       for (int i=0; log_maskmap[i].name != NULL ; i++) {
+               prnt("%02i %17.17s %5.5s %5.5s\n",i ,log_maskmap[i].name, 
+	             ((g_log->debug_mask &  log_maskmap[i].value)?"Y":"N"),
+                     ((g_log->matlab_mask & log_maskmap[i].value)?"Y":"N") );
+       }
+   }
    if (strcasestr(buf,"config") != NULL) {
        prnt("Command line arguments:\n");
        for (int i=0; i < config_get_if()->argc; i++) {
@@ -324,24 +337,76 @@ int s = sscanf(buf,"%ms %i-%i\n",&logsubcmd, &idx1,&idx2);
           prnt("Available log levels: \n   ");
           for (int i=0; log_level_names[i].name != NULL; i++)
              prnt("%s ",log_level_names[i].name);
-          prnt("\nAvailable verbosity: \n   ");
-          for (int i=0; log_verbosity_names[i].name != NULL; i++)
-             prnt("%s ",log_verbosity_names[i].name);
+          prnt("\n");
+          prnt("Available display options: \n   ");
+          for (int i=0; log_options[i].name != NULL; i++)
+             prnt("%s ",log_options[i].name);
+          prnt("\n");
+          prnt("Available debug or matlab options: \n   ");
+          for (int i=0; log_maskmap[i].name != NULL; i++)
+             prnt("%s ",log_maskmap[i].name);
           prnt("\n");
    	  proccmd_show("loglvl",debug,prnt);
+   	  proccmd_show("logopt",debug,prnt);
+   	  proccmd_show("dbgopt",debug,prnt);
       }
       else if (strcasestr(logsubcmd,"help") != NULL) {
           prnt(PROCCMD_LOG_HELP_STRING);
       } else {
           prnt("%s: wrong log command...\n",logsubcmd);
       }
+   } else if ( s == 2 && logsubcmd != NULL) {
+      char *opt=NULL;
+      char *logparam=NULL;
+      int  l;
+      int optbit;
+
+      l=sscanf(logsubcmd,"%m[^'_']_%m[^'_']",&logparam,&opt);
+      if (l == 2 && strcmp(logparam,"print") == 0){
+         optbit=map_str_to_int(log_options,opt);
+         if (optbit < 0) {
+            prnt("option %s unknown\n",opt);
+         } else {
+            if (idx1 > 0)    
+                SET_LOG_OPTION(optbit);
+            else
+                CLEAR_LOG_OPTION(optbit);
+            proccmd_show("logopt",debug,prnt);
+         }
+      }
+      else if (l == 2 && strcmp(logparam,"debug") == 0){
+         optbit=map_str_to_int(log_maskmap,opt);
+         if (optbit < 0) {
+            prnt("debug flag %s unknown\n",opt);
+         } else {
+            if (idx1 > 0)    
+                SET_LOG_DEBUG(optbit);
+            else
+                CLEAR_LOG_DEBUG(optbit);
+            proccmd_show("dbgopt",debug,prnt);
+         }
+      }  
+       else if (l == 2 && strcmp(logparam,"matlab") == 0){
+         optbit=map_str_to_int(log_maskmap,opt);
+         if (optbit < 0) {
+            prnt("matlab flag %s unknown\n",opt);
+         } else {
+            if (idx1 > 0)    
+                SET_LOG_MATLAB(optbit);
+            else
+                CLEAR_LOG_MATLAB(optbit);
+            proccmd_show("dbgopt",debug,prnt);
+         }
+      }       
+      if (logparam != NULL) free(logparam);
+      if (opt != NULL)      free(opt); 
    } else if ( s == 3 && logsubcmd != NULL) {
-      int level, verbosity, interval;
+      int level, interval;
       char *tmpstr=NULL;
       char *logparam=NULL;
       int l;
 
-      level = verbosity = interval = -1;
+      level = interval = -1;
       l=sscanf(logsubcmd,"%m[^'_']_%m[^'_']",&logparam,&tmpstr);
       if (debug > 0)
           prnt("l=%i, %s %s\n",l,((logparam==NULL)?"\"\"":logparam), ((tmpstr==NULL)?"\"\"":tmpstr));
@@ -349,9 +414,6 @@ int s = sscanf(buf,"%ms %i-%i\n",&logsubcmd, &idx1,&idx2);
          if (strcmp(logparam,"level") == 0) {
              level=map_str_to_int(log_level_names,tmpstr);
              if (level < 0)  prnt("level %s unknown\n",tmpstr);
-         } else if (strcmp(logparam,"verbos") == 0) {
-             verbosity=map_str_to_int(log_verbosity_names,tmpstr);
-             if (verbosity < 0)  prnt("verbosity %s unknown\n",tmpstr);
          } else {
              prnt("%s%s unknown log sub command \n",logparam, tmpstr);
          }
@@ -372,17 +434,13 @@ int s = sscanf(buf,"%ms %i-%i\n",&logsubcmd, &idx1,&idx2);
           if (level < 0) {
               level=g_log->log_component[i].level;
            }
-          if (verbosity < 0) {
-              verbosity=g_log->log_component[i].flag;
-           }
           if (interval < 0) {
               interval=g_log->log_component[i].interval;
            }
-          set_comp_log(i, level, verbosity, interval);
-          prnt("log level/verbosity  comp %i %s set to %s / %s (%s)\n",
+          set_log(i, level, interval);
+          prnt("log level  comp %i %s set to %s (%s)\n",
                 i,((g_log->log_component[i].name==NULL)?"":g_log->log_component[i].name),
                 map_int_to_str(log_level_names,g_log->log_component[i].level),
-                map_int_to_str(log_verbosity_names,g_log->log_component[i].flag),
                 ((g_log->log_component[i].interval>0)?"enabled":"disabled"));
 
         

common/utils/telnetsrv/telnetsrv_proccmd.h

@@ -49,9 +49,12 @@ telnetshell_vardef_t proc_vardef[] = {
  online, noonline:	     enable or disable console logs \n\
  enable, disable id1-id2:    enable or disable logs for components index id1 to id2 \n\
  level_<level> id1-id2:      set log level to <level> for components index id1 to id2 \n\
- level_<verbosity> id1-id2:  set log verbosity to <verbosity> for components index id1 to id2 \n\
-use the show command to get the values for <level>, <verbosity> and the list of component indexes \
-that can be used for id1 and id2 \n"    
+use the show command to get the authorized values for <level> and the list of component \
+indexes that can be used for id1 and id2 \n\
+ print_<opt> <0|1>           disable or enable the \"opt\" log option, use the show command to get \
+the available options\n\
+ matlab_<opt> debug_<func>   disable or enable the debug code or matlab file generation \
+for \"func\" function. use the show command to get the available options\n"  
 
 #define PROCCMD_THREAD_HELP_STRING " thread sub commands: \n\
  <thread id> aff <core>  :    set affinity of thread <thread id> to core <core> \n\

nfapi/oai_integration/nfapi_pnf.c

@@ -47,7 +47,7 @@ extern RAN_CONTEXT_t RC;
 #include <vendor_ext.h>
 #include "fapi_stub.h"
 //#include "fapi_l1.h"
-#include "UTIL/LOG/log.h"
+#include "common/utils/LOG/log.h"
 #include "openair2/LAYER2/MAC/mac_proto.h"
 
 #include "PHY/INIT/phy_init.h"
@@ -193,8 +193,6 @@ typedef struct {
 static pnf_info pnf;
 static pthread_t pnf_start_pthread;
 
-extern void nfapi_log(char *file, char *func, int line, int comp, int level, const char* format, va_list args);
-
 void pnf_nfapi_trace(nfapi_trace_level_t nfapi_level, const char* message, ...) {
   va_list args;
   int oai_level;

nfapi/oai_integration/nfapi_vnf.c

@@ -680,7 +680,6 @@ void vnf_deallocate(void* ptr) {
   free(ptr);
 }
 
-extern void nfapi_log(char *file, char *func, int line, int comp, int level, const char* format, va_list args);
 
 void vnf_trace(nfapi_trace_level_t nfapi_level, const char* message, ...) {
 

openair1/PHY/INIT/lte_init.c

@@ -31,7 +31,7 @@
 #include "RadioResourceConfigDedicated.h"
 #include "TDD-Config.h"
 #include "MBSFN-SubframeConfigList.h"
-#include "UTIL/LOG/vcd_signal_dumper.h"
+#include "common/utils/LOG/vcd_signal_dumper.h"
 #include "assertions.h"
 #include <math.h>
 
@@ -477,7 +477,7 @@ void phy_config_sib13_eNB(module_id_t Mod_id,int CC_id,int mbsfn_Area_idx,
 
   if (mbsfn_Area_idx == 0) {
     fp->Nid_cell_mbsfn = (uint16_t)mbsfn_AreaId_r9;
-    LOG_N(PHY,"Fix me: only called when mbsfn_Area_idx == 0)\n");
+    LOG_I(PHY,"Fix me: only called when mbsfn_Area_idx == 0)\n");
   }
 
   lte_gold_mbsfn(fp,RC.eNB[Mod_id][CC_id]->lte_gold_mbsfn_table,fp->Nid_cell_mbsfn);

openair1/PHY/INIT/lte_init_ru.c

@@ -27,7 +27,7 @@
 #include "RadioResourceConfigDedicated.h"
 #include "TDD-Config.h"
 #include "MBSFN-SubframeConfigList.h"
-#include "UTIL/LOG/vcd_signal_dumper.h"
+#include "common/utils/LOG/vcd_signal_dumper.h"
 #include "assertions.h"
 #include <math.h>
 

openair1/PHY/INIT/lte_init_ue.c

@@ -27,7 +27,7 @@
 #include "RadioResourceConfigDedicated.h"
 #include "TDD-Config.h"
 #include "MBSFN-SubframeConfigList.h"
-#include "UTIL/LOG/vcd_signal_dumper.h"
+#include "common/utils/LOG/vcd_signal_dumper.h"
 #include "assertions.h"
 #include <math.h>
 #include "PHY/LTE_TRANSPORT/transport_common_proto.h"
@@ -190,7 +190,7 @@ void phy_config_sib13_ue(module_id_t Mod_id,int CC_id,uint8_t eNB_id,int mbsfn_A
 
   if (mbsfn_Area_idx == 0) {
     fp->Nid_cell_mbsfn = (uint16_t)mbsfn_AreaId_r9;
-    LOG_N(PHY,"Fix me: only called when mbsfn_Area_idx == 0)\n");
+    LOG_I(PHY,"Fix me: only called when mbsfn_Area_idx == 0)\n");
   }
 
   lte_gold_mbsfn(fp,PHY_vars_UE_g[Mod_id][CC_id]->lte_gold_mbsfn_table,fp->Nid_cell_mbsfn);

openair1/PHY/LTE_ESTIMATION/lte_adjust_sync_eNB.c

@@ -23,7 +23,7 @@
 #include "PHY/defs_eNB.h"
 #include "PHY/phy_extern.h"
 
-#include "UTIL/LOG/vcd_signal_dumper.h"
+#include "common/utils/LOG/vcd_signal_dumper.h"
 
 #define DEBUG_PHY
 

openair1/PHY/LTE_ESTIMATION/lte_adjust_sync_ue.c

@@ -25,7 +25,7 @@
 #include "PHY/impl_defs_top.h"
 #include "openair2/LAYER2/MAC/mac_proto.h"
 
-#include "UTIL/LOG/vcd_signal_dumper.h"
+#include "common/utils/LOG/vcd_signal_dumper.h"
 
 #define DEBUG_PHY
 

openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c

@@ -23,9 +23,8 @@
 #include "PHY/phy_extern.h"
 #include "PHY/sse_intrin.h"
 //#define DEBUG_CH
-#include "UTIL/LOG/log.h"
+#include "common/utils/LOG/log.h"
 #include "PHY/LTE_TRANSPORT/transport_common_proto.h"
-#include "T.h"
 #include "lte_estimation.h"
 
 // round(exp(sqrt(-1)*(pi/2)*[0:1:N-1]/N)*pow2(15))

openair1/PHY/LTE_TRANSPORT/dci.c

@@ -41,8 +41,8 @@
 #include "transport_common_proto.h"
 #include "assertions.h"
 #include "T.h"
-#include "UTIL/LOG/log.h"
-#include "UTIL/LOG/vcd_signal_dumper.h"
+#include "common/utils/LOG/log.h"
+#include "common/utils/LOG/vcd_signal_dumper.h"
 #include "PHY/LTE_TRANSPORT/transport_extern.h"
 #include "PHY/LTE_REFSIG/lte_refsig.h"
 

openair1/PHY/LTE_TRANSPORT/dlsch_coding.c

@@ -38,8 +38,8 @@
 #include "PHY/LTE_TRANSPORT/transport_eNB.h"
 #include "PHY/LTE_TRANSPORT/transport_proto.h"
 #include "SCHED/sched_eNB.h"
-#include "UTIL/LOG/vcd_signal_dumper.h"
-#include "UTIL/LOG/log.h"
+#include "common/utils/LOG/vcd_signal_dumper.h"
+#include "common/utils/LOG/log.h"
 #include <syscall.h>
 #include "targets/RT/USER/rt_wrapper.h"
 

openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c

@@ -35,7 +35,7 @@
 #include "PHY/CODING/coding_extern.h"
 #include "PHY/CODING/lte_interleaver_inline.h"
 #include "PHY/LTE_TRANSPORT/transport_eNB.h"
-#include "UTIL/LOG/vcd_signal_dumper.h"
+#include "common/utils/LOG/vcd_signal_dumper.h"
 #include "PHY/LTE_TRANSPORT/transport_proto.h"
 #include "PHY/LTE_TRANSPORT/transport_common_proto.h"
 //#define DEBUG_DLSCH_MODULATION

openair1/PHY/LTE_TRANSPORT/dlsch_scrambling.c

@@ -39,7 +39,7 @@
 #include "PHY/CODING/lte_interleaver_inline.h"
 #include "transport_eNB.h"
 #include "PHY/phy_extern.h"
-#include "UTIL/LOG/vcd_signal_dumper.h"
+#include "common/utils/LOG/vcd_signal_dumper.h"
 
 void dlsch_scrambling(LTE_DL_FRAME_PARMS *frame_parms,
                       int mbsfn_flag,

openair1/PHY/LTE_TRANSPORT/edci.c

@@ -40,8 +40,7 @@
 #include "transport_proto.h"
 #include "transport_common_proto.h"
 #include "assertions.h" 
-#include "T.h"
-#include "UTIL/LOG/log.h"
+#include "common/utils/LOG/log.h"
 #include "PHY/LTE_REFSIG/lte_refsig.h"
 
 //#define DEBUG_DCI_ENCODING 1

openair1/PHY/LTE_TRANSPORT/if5_tools.c

@@ -37,7 +37,7 @@
 
 //#include "targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h"
 #include "targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.h"
-#include "UTIL/LOG/vcd_signal_dumper.h"
+#include "common/utils/LOG/vcd_signal_dumper.h"
 //#define DEBUG_DL_MOBIPASS
 //#define DEBUG_UL_MOBIPASS
 #define SUBFRAME_SKIP_NUM_MOBIPASS 8

openair1/PHY/LTE_TRANSPORT/prach_common.c

@@ -33,7 +33,7 @@
 #include "PHY/defs_common.h"
 #include "PHY/phy_extern.h"
 #include "PHY/phy_extern_ue.h"
-#include "UTIL/LOG/vcd_signal_dumper.h"
+#include "common/utils/LOG/vcd_signal_dumper.h"
 
 
 uint16_t NCS_unrestricted[16] = {0,13,15,18,22,26,32,38,46,59,76,93,119,167,279,419};

openair1/PHY/LTE_TRANSPORT/pucch.c

@@ -34,10 +34,9 @@
 #include "LAYER2/MAC/mac.h"
 #include "PHY/LTE_REFSIG/lte_refsig.h"
 
-#include "UTIL/LOG/log.h"
-#include "UTIL/LOG/vcd_signal_dumper.h"
+#include "common/utils/LOG/log.h"
+#include "common/utils/LOG/vcd_signal_dumper.h"
 
-#include "T.h"
 
 //uint8_t ncs_cell[20][7];
 //#define DEBUG_PUCCH_TXS

openair1/PHY/LTE_TRANSPORT/pucch_common.c

@@ -33,11 +33,10 @@
 #include "PHY/phy_extern.h" 
 #include "LAYER2/MAC/mac.h"
 
-#include "UTIL/LOG/log.h"
-#include "UTIL/LOG/vcd_signal_dumper.h"
+#include "common/utils/LOG/vcd_signal_dumper.h"
+#include "common/utils/LOG/log.h"
 #include "PHY/LTE_REFSIG/lte_refsig.h"
 
-#include "T.h"
 
 void init_ncs_cell(LTE_DL_FRAME_PARMS *frame_parms,uint8_t ncs_cell[20][7])
 {

openair1/PHY/LTE_TRANSPORT/rar_tools.c

@@ -33,7 +33,7 @@
 #include "PHY/phy_extern.h"
 #include "SCHED/sched_eNB.h"
 #include "LAYER2/MAC/mac.h"
-#include "UTIL/LOG/vcd_signal_dumper.h"
+#include "common/utils/LOG/vcd_signal_dumper.h"