--- a/gsm-fw/L1/cfile/l1_trace.c	Sun Aug 10 19:51:26 2014 +0000
+++ b/gsm-fw/L1/cfile/l1_trace.c	Sun Aug 10 21:29:10 2014 +0000
@@ -10,10 +10,8 @@
 #define  L1_TRACE_C
 
 //#pragma DUPLICATE_FOR_INTERNAL_RAM_START
-#include "l1sw.cfg"
-#if (OP_L1_STANDALONE == 0)
-  #include "debug.cfg"
-#endif
+
+#include "config.h"
 
 //omaps00090550 #include "l1_macro.h"
 #include "l1_confg.h"
@@ -66,14 +64,14 @@
 #endif
 
 #include "l1_defty.h"
-#include "cust_os.h"
+#include "../../gpf/inc/cust_os.h"
 #include "l1_msgty.h"
 #include "l1_varex.h"
 #include "l1_proto.h"
 #include "l1_mftab.h"
 #include "l1_tabs.h"
 #include "l1_ver.h"
-#include "ulpd.h"
+#include "../../bsp/ulpd.h"
 
 #if TESTMODE
   #include "l1tm_msgty.h"
@@ -81,12 +79,12 @@
   #include "l1tm_varex.h"
 #endif
 
-#include "mem.h"
+#include "../../bsp/mem.h"
 #if ( CHIPSET == 12 ) || (CHIPSET == 15)
    #include "sys_inth.h"
 #else
-   #include "iq.h"
-   #include "inth.h"
+   #include "../../bsp/iq.h"
+   #include "../../bsp/inth.h"
 #endif
 
 #if L1_GPRS
@@ -106,15 +104,11 @@
 #include <string.h>
 #include <stdio.h>
 
-#if (OP_L1_STANDALONE == 1)
-  #include "serialswitch_core.h"
-#else
-  #include "uart/serialswitch.h"
-#endif
+#include "../../serial/serialswitch.h"
 
 //void dt_trace_event(UWORD16 id, char *fmt_string, ...);
 #if (TRACE_TYPE==7)
-  #include "timer2.h"
+  #include "../../bsp/timer2.h"
 #endif
 
 unsigned int x,y,fer_sacch ,dl_good_norep;
@@ -125,7 +119,7 @@
 #endif
 #if FF_TBF
   #if ((TRACE_TYPE==1) || (TRACE_TYPE == 4))
-    #include "armio.h" // for GPIO toggle
+    #include "../../bsp/armio.h" // for GPIO toggle
   #endif
 #endif
 
@@ -169,10 +163,10 @@
   #include "l1_trace.h"
 
     extern T_TRACE_INFO_STRUCT trace_info;
-  #endif //(TRACE_TYPE == 5)
+#endif //(TRACE_TYPE == 5)
 
 #if (TRACE_TYPE == 1)
-  #include "timer2.h"
+  #include "../../bsp/timer2.h"
 
   // Variables for L1S CPU load measurement
   extern unsigned long        max_cpu, fn_max_cpu;
@@ -190,7 +184,8 @@
 // External variables for internal RAM download trace
 //---------------------------------------------------
 
-#if (( ((CHIPSET !=2 ) ) && ((LONG_JUMP != 0))) || (CHIPSET == 12) || (CHIPSET == 15))
+/* not applicable to FreeCalypso */
+#if 0 //(( ((CHIPSET !=2 ) ) && ((LONG_JUMP != 0))) || (CHIPSET == 12) || (CHIPSET == 15))
   extern UWORD16 d_checksum1;
   extern UWORD16 d_checksum2;
 #endif //(( ((CHIPSET !=2 ) ) && ((LONG_JUMP != 0))) || (CHIPSET == 12))
@@ -411,7 +406,7 @@
   trace_info.facch_dl_count            = 0;
   trace_info.facch_dl_fail_count       = 0;
   trace_info.facch_dl_fail_count_trace = 0;
-  #if ( FF_REPEATED_DL_FACCH == 1)
+#if ( FF_REPEATED_DL_FACCH == 1)
   trace_info.facch_dl_combined_good_count = 0;
   trace_info.facch_dl_repetition_block_count = 0;
   trace_info.facch_dl_count_all = 0;