# HG changeset patch
# User Mychaela Falconia <falcon@ivan.Harhan.ORG>
# Date 1463812179 0
# Node ID c11f6d8d8fbd13dd9a42ca10c34bf14bc35a88a0
# Parent  f9d2c65905f52e663f82ab0aabc5e07f0db688df
l1_trace.c: L1_COMPRESSED_TRACING excised

diff -r f9d2c65905f5 -r c11f6d8d8fbd chipsetsw/layer1/cfile/l1_trace.c
--- a/chipsetsw/layer1/cfile/l1_trace.c	Sat May 21 04:03:40 2016 +0000
+++ b/chipsetsw/layer1/cfile/l1_trace.c	Sat May 21 06:29:39 2016 +0000
@@ -419,16 +419,16 @@
   trace_info.facch_dl_fail_count       = 0;
   trace_info.facch_dl_fail_count_trace = 0;
   #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;
-  trace_info.facch_dl_good_block_reported = 0;
-#endif/*  (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;
+    trace_info.facch_dl_good_block_reported = 0;
+  #endif/*  (FF_REPEATED_DL_FACCH == 1)*/
   trace_info.sacch_d_nerr              = 0;
   #if (FF_REPEATED_SACCH == 1)
     trace_info.repeat_sacch.dl_count = 0;
     trace_info.repeat_sacch.dl_combined_good_count = 0;
-	trace_info.repeat_sacch.dl_error_count = 0;
+    trace_info.repeat_sacch.dl_error_count = 0;
     trace_info.repeat_sacch.srr= 0;
     trace_info.repeat_sacch.sro= 0;
     trace_info.repeat_sacch.dl_good_norep = 0;
@@ -1270,45 +1270,28 @@
 #if (L1_AUDIO_MCU_ONOFF == 1)
           case L1_AUDIO_UL_ONOFF_TRACE:
           {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-            vsi_o_event_ttrace("AUL :%ld %ld",
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[0],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[1]);
-#else
             sprintf (str,"AUL :%ld %ld\n\r",
                      ((T_TRACE_INFO *)(msg->SigP))->tab[0],
                      ((T_TRACE_INFO *)(msg->SigP))->tab[1]);
             L1_send_trace_cpy(str);
-#endif
           }
           break;
           case L1_AUDIO_DL_ONOFF_TRACE:
           {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-            vsi_o_event_ttrace("ADL :%ld %ld",
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[0],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[1]);
-#else
             sprintf (str,"ADL :%ld %ld\n\r",
                      ((T_TRACE_INFO *)(msg->SigP))->tab[0],
                      ((T_TRACE_INFO *)(msg->SigP))->tab[1]);
             L1_send_trace_cpy(str);
-#endif
           }
           break;
 #endif
+
           case TRACE_ADC:
           {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-            vsi_o_event_ttrace("      ADC :%ld %ld",
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[0],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[1]);
-#else
             sprintf (str,"      ADC :%ld %ld\n\r",
                      ((T_TRACE_INFO *)(msg->SigP))->tab[0],
                      ((T_TRACE_INFO *)(msg->SigP))->tab[1]);
             L1_send_trace_cpy(str);
-#endif
           }
           break;
 
@@ -1324,26 +1307,8 @@
           break;
 #endif /* L1_PCM_EXTRACTION */
 
-
-
           case NEW_TOA:
           {
-
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-            #if (TOA_ALGO == 2)
-              vsi_o_event_ttrace("      TOA updated:%ld %ld %ld %ld %ld",
-                       ((T_TRACE_INFO *)(msg->SigP))->tab[0],
-                       ((T_TRACE_INFO *)(msg->SigP))->tab[1],
-                       ((T_TRACE_INFO *)(msg->SigP))->tab[2],
-                       ((T_TRACE_INFO *)(msg->SigP))->tab[3],
-                       ((T_TRACE_INFO *)(msg->SigP))->tab[4]);
-            #else
-              vsi_o_event_ttrace("      TOA updated:%ld %ld",
-                       ((T_TRACE_INFO *)(msg->SigP))->tab[0],
-                       ((T_TRACE_INFO *)(msg->SigP))->tab[1]);
-            #endif
-
-#else
             #if (TOA_ALGO == 2)
               sprintf (str,"      TOA updated:%ld %ld %ld %ld %ld\n\r",
                        ((T_TRACE_INFO *)(msg->SigP))->tab[0],
@@ -1357,74 +1322,39 @@
                        ((T_TRACE_INFO *)(msg->SigP))->tab[1]);
             #endif
             L1_send_trace_cpy(str);
-#endif
           }
           break;
 
 /* the following LoCosto stanzas don't exist in TCS211 */
 #if 0
-
           case SAIC_DEBUG:
           {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-            vsi_o_event_ttrace("     SWH:%ld %ld %ld",
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[0],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[1],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[2]);
-
-#else
             sprintf (str,"	SWH : %ld %ld %ld\n\r",
                      ((T_TRACE_INFO *)(msg->SigP))->tab[0],
                      ((T_TRACE_INFO *)(msg->SigP))->tab[1],
                      ((T_TRACE_INFO *)(msg->SigP))->tab[2]);
             L1_send_trace_cpy(str);
-#endif
           }
           break;
 
 	  case NAVC_VALUE:
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-            vsi_o_event_ttrace("     NAVC:%ld %ld",
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[0],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[1]);
-
-#else
             sprintf (str,"	NAVC: %ld %ld\n\r",
                      ((T_TRACE_INFO *)(msg->SigP))->tab[0],
                      ((T_TRACE_INFO *)(msg->SigP))->tab[1]);
             L1_send_trace_cpy(str);
-#endif
 	  break;
 
           case KPD_CR:
           {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-            vsi_o_event_ttrace(" KPD CR UPADTED : %ld %ld",
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[0],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[1]);
-
-#else
             sprintf (str," KPD CR UPADTED : %ld %ld\n\r",
                      ((T_TRACE_INFO *)(msg->SigP))->tab[0],
                      ((T_TRACE_INFO *)(msg->SigP))->tab[1]);
             L1_send_trace_cpy(str);
-#endif
           }
           break;
 
           case BURST_PARAM:
           {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-            vsi_o_event_ttrace(" BP:%ld %ld %ld %ld %ld %ld %ld %ld",
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[0],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[1],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[2],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[3],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[4],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[5],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[6],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[7]);
-#else
             sprintf (str," BP:%ld %ld %ld %ld %ld %ld %ld %ld\n\r",
                      ((T_TRACE_INFO *)(msg->SigP))->tab[0],
                      ((T_TRACE_INFO *)(msg->SigP))->tab[1],
@@ -1435,24 +1365,16 @@
                      ((T_TRACE_INFO *)(msg->SigP))->tab[6],
                      ((T_TRACE_INFO *)(msg->SigP))->tab[7]);
             L1_send_trace_cpy(str);
-#endif
           }
           break;
-
 #endif
 
           case TOA_NOT_UPDATED:  // should not occur
           {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-            vsi_o_event_ttrace(">  ERROR: TOA not updated:%ld %ld",
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[0],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[1]);
-#else
             sprintf (str,">  ERROR: TOA not updated:%ld %ld\n\r",
                      ((T_TRACE_INFO *)(msg->SigP))->tab[0],
                      ((T_TRACE_INFO *)(msg->SigP))->tab[1]);
             L1_send_trace_cpy(str);
-#endif
           }
           break;
 
@@ -1462,13 +1384,8 @@
             WORD8 cause = ((T_TRACE_INFO *)(msg->SigP))->tab[1];
             if (cause == IT_DSP_ERROR_CPU_OVERLOAD)
             {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-            vsi_o_event_ttrace(">  MCU CPU overload %ld",
+              sprintf (str,">  MCU CPU overload %ld\n\r",
                      ((T_TRACE_INFO *)(msg->SigP))->tab[0]);
-#else
-            sprintf (str,">  MCU CPU overload %ld\n\r",
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[0]);
-#endif
             }
 #if (FF_L1_FAST_DECODING == 1)
             else if (cause == IT_DSP_ERROR_FAST_DECODING)
@@ -1494,18 +1411,6 @@
 
           case PM_EQUAL_0:
           {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-            vsi_o_event_ttrace(">  PM %ld %ld %ld %ld %ld %ld %ld %d %ld %d",
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[0],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[1],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[2],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[3],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[4],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[5],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[6],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[7] & 0xffff,
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[7] >> 16);
-#else
             sprintf (str,">  PM %ld %ld %ld %ld %ld %ld %ld %d %ld\n\r",
                      ((T_TRACE_INFO *)(msg->SigP))->tab[0],
                      ((T_TRACE_INFO *)(msg->SigP))->tab[1],
@@ -1517,7 +1422,6 @@
                      ((T_TRACE_INFO *)(msg->SigP))->tab[7] & 0xffff,
                      ((T_TRACE_INFO *)(msg->SigP))->tab[7] >> 16);
             L1_send_trace_cpy(str);
-#endif
             if (trace_info.trace_filter == FALSE)
             {
               l1_trace_L1_tasks();            // trace L1 tasks status
@@ -1529,17 +1433,6 @@
 
           case NO_PM_EQUAL_0:
           {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-            vsi_o_event_ttrace("> !PM %ld %ld %ld %ld %ld %ld %ld %ld",
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[0],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[1],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[2],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[3],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[4],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[5],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[6],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[7] & 0xffff);
-#else
             sprintf (str,"> !PM %ld %ld %ld %ld %ld %ld %ld %ld\n\r",
                      ((T_TRACE_INFO *)(msg->SigP))->tab[0],
                      ((T_TRACE_INFO *)(msg->SigP))->tab[1],
@@ -1550,23 +1443,11 @@
                      ((T_TRACE_INFO *)(msg->SigP))->tab[6],
                      ((T_TRACE_INFO *)(msg->SigP))->tab[7] & 0xffff);
             L1_send_trace_cpy(str);
-#endif
           }
           break;
 
           case MCU_DSP_MISMATCH:
           {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-            vsi_o_event_ttrace("> COM %ld %ld %ld %ld %ld %ld %ld %ld",
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[0],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[1],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[2],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[3],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[4],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[5],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[6],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[7] & 0xffff);
-#else
             sprintf (str,"> COM %ld %ld %ld %ld %ld %ld %ld %ld\n\r",
                      ((T_TRACE_INFO *)(msg->SigP))->tab[0],
                      ((T_TRACE_INFO *)(msg->SigP))->tab[1],
@@ -1577,7 +1458,6 @@
                      ((T_TRACE_INFO *)(msg->SigP))->tab[6],
                      ((T_TRACE_INFO *)(msg->SigP))->tab[7] & 0xffff);
             L1_send_trace_cpy(str);
-#endif
 
             if (trace_info.trace_filter == FALSE)
             {
@@ -1590,17 +1470,6 @@
 
           case NO_MCU_DSP_MISMATCH:
           {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-            vsi_o_event_ttrace(">!COM %ld %ld %ld %ld %ld %ld %ld %ld",
-                   ((T_TRACE_INFO *)(msg->SigP))->tab[0],
-                   ((T_TRACE_INFO *)(msg->SigP))->tab[1],
-                   ((T_TRACE_INFO *)(msg->SigP))->tab[2],
-                   ((T_TRACE_INFO *)(msg->SigP))->tab[3],
-                   ((T_TRACE_INFO *)(msg->SigP))->tab[4],
-                   ((T_TRACE_INFO *)(msg->SigP))->tab[5],
-                   ((T_TRACE_INFO *)(msg->SigP))->tab[6],
-                   ((T_TRACE_INFO *)(msg->SigP))->tab[7] & 0xffff);
-#else
             sprintf (str,">!COM %ld %ld %ld %ld %ld %ld %ld %ld\n\r",
                    ((T_TRACE_INFO *)(msg->SigP))->tab[0],
                    ((T_TRACE_INFO *)(msg->SigP))->tab[1],
@@ -1611,23 +1480,11 @@
                    ((T_TRACE_INFO *)(msg->SigP))->tab[6],
                    ((T_TRACE_INFO *)(msg->SigP))->tab[7] & 0xffff);
             L1_send_trace_cpy(str);
-#endif
           }
           break;
 
           case L1S_ABORT:
           {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-            vsi_o_event_ttrace("ABORT %ld %ld %ld %ld %ld %ld %ld %ld",
-                       ((T_TRACE_INFO *)(msg->SigP))->tab[0],
-                       ((T_TRACE_INFO *)(msg->SigP))->tab[1],
-                       ((T_TRACE_INFO *)(msg->SigP))->tab[2],
-                       ((T_TRACE_INFO *)(msg->SigP))->tab[3],
-                       ((T_TRACE_INFO *)(msg->SigP))->tab[4],
-                       ((T_TRACE_INFO *)(msg->SigP))->tab[5],
-                       ((T_TRACE_INFO *)(msg->SigP))->tab[6],
-                       ((T_TRACE_INFO *)(msg->SigP))->tab[7] & 0xffff);
-#else
             sprintf (str,"ABORT %ld %ld %ld %ld %ld %ld %ld %ld\n\r",
                        ((T_TRACE_INFO *)(msg->SigP))->tab[0],
                        ((T_TRACE_INFO *)(msg->SigP))->tab[1],
@@ -1638,7 +1495,6 @@
                        ((T_TRACE_INFO *)(msg->SigP))->tab[6],
                        ((T_TRACE_INFO *)(msg->SigP))->tab[7] & 0xffff);
             L1_send_trace_cpy(str);
-#endif
           }
           break;
 
@@ -1649,27 +1505,17 @@
 #if 0 //(MELODY_E2 || L1_MP3 || L1_AAC || L1_DYN_DSP_DWNLD)
           case DSP_TRACE_DISABLE:
           {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-            vsi_o_event_ttrace("****DSP-TRACE = Disabled %ld ****",
-                        l1s.actual_time.fn_mod42432);
-#else
             sprintf (str,"\n\r****DSP-TRACE = Disabled %ld ****\n\r",
                         l1s.actual_time.fn_mod42432);
             L1_send_trace_cpy(str);
-#endif
           }
           break;
 
           case DSP_TRACE_ENABLE:
           {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-            vsi_o_event_ttrace("****DSP-TRACE = Enabled %ld ****",
-                        l1s.actual_time.fn_mod42432);
-#else
             sprintf (str,"\n\r****DSP-TRACE = Enabled %ld ****\n\r",
                         l1s.actual_time.fn_mod42432);
             L1_send_trace_cpy(str);
-#endif
           }
           break;
 #endif
@@ -1766,30 +1612,11 @@
           {
             if (trace_info.reset_gauging_algo == TRUE)
             {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-              vsi_o_event_ttrace("      reset gauging algo");
-#else
               sprintf (str,"      reset gauging algo\n\r");
               L1_send_trace_cpy(str);
-#endif
               trace_info.reset_gauging_algo = FALSE;
             }
 
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-            vsi_o_event_ttrace("      gauging %ld",
-                       ((T_TRACE_INFO *)(msg->SigP))->tab[0]);
-            if (trace_info.current_config->l1_dyn_trace & 1<<L1_DYN_TRACE_GAUGING)
-            {
-              vsi_o_event_ttrace("      gauging %ld      GAUGE: State =%ld, LF=%ld, HF=%ld, root=%ld, frac=%ld",
-                      ((T_TRACE_INFO *)(msg->SigP))->tab[0],
-                      ((T_TRACE_INFO *)(msg->SigP))->tab[1],
-                      ((T_TRACE_INFO *)(msg->SigP))->tab[2],
-                      ((T_TRACE_INFO *)(msg->SigP))->tab[3],
-                      ((T_TRACE_INFO *)(msg->SigP))->tab[4],
-                      ((T_TRACE_INFO *)(msg->SigP))->tab[5]);
-            }
-
-#else
             sprintf (str,"      gauging %ld\n\r",
                        ((T_TRACE_INFO *)(msg->SigP))->tab[0]);
             if (trace_info.current_config->l1_dyn_trace & 1<<L1_DYN_TRACE_GAUGING)
@@ -1803,28 +1630,19 @@
                       ((T_TRACE_INFO *)(msg->SigP))->tab[5]);
             }
             L1_send_trace_cpy(str);
-#endif
           }
           break;
 
-   #if (D_ERROR_STATUS_TRACE_ENABLE)
+        #if (D_ERROR_STATUS_TRACE_ENABLE)
           case L1S_D_ERROR_STATUS:
           {
             // trace the d_error_status word with the correct mask applied
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-            vsi_o_event_ttrace("> DSP %ld %ld %xh %ld",
-                       ((T_TRACE_INFO *)(msg->SigP))->tab[0],
-                       ((T_TRACE_INFO *)(msg->SigP))->tab[1],
-                       ((T_TRACE_INFO *)(msg->SigP))->tab[2],
-                       ((T_TRACE_INFO *)(msg->SigP))->tab[3]);
-#else
             sprintf (str,"> DSP %ld %ld %xh %ld\n\r",
                        ((T_TRACE_INFO *)(msg->SigP))->tab[0],
                        ((T_TRACE_INFO *)(msg->SigP))->tab[1],
                        ((T_TRACE_INFO *)(msg->SigP))->tab[2],
                        ((T_TRACE_INFO *)(msg->SigP))->tab[3]);
             L1_send_trace_cpy(str);
-#endif
           }
           break;
         #endif //(D_ERROR_STATUS_TRACE_ENABLE)
@@ -1832,31 +1650,15 @@
   #if L1_GPRS
           case L1S_PACKET_TRANSFER:
           {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-            vsi_o_event_ttrace("PDTCH %ld %lx",
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[0],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[1]);
-#else
             sprintf (str,"PDTCH %ld %lx\n\r",
                      ((T_TRACE_INFO *)(msg->SigP))->tab[0],
                      ((T_TRACE_INFO *)(msg->SigP))->tab[1]);
             L1_send_trace_cpy(str);
-#endif
           }
           break;
 
           case RLC_UL_PARAM:
           {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-            vsi_o_event_ttrace("RLC_U %ld %ld %ld %ld %lx %lx %ld",
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[0],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[1],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[2],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[3],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[4],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[5],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[6]);
-#else
             sprintf (str,"RLC_U %ld %ld %ld %ld %lx %lx %ld\n\r",
                      ((T_TRACE_INFO *)(msg->SigP))->tab[0],
                      ((T_TRACE_INFO *)(msg->SigP))->tab[1],
@@ -1867,21 +1669,11 @@
                      ((T_TRACE_INFO *)(msg->SigP))->tab[6]);
 
             L1_send_trace_cpy(str);
-#endif
           }
           break;
 
           case RLC_DL_PARAM:
           {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-            vsi_o_event_ttrace("RLC_D %ld %ld %lx %ld %ld %ld",
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[0],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[1],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[2],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[3],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[4],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[5]);
-#else
             sprintf (str,"RLC_D %ld %ld %lx %ld %ld %ld\n\r",
                      ((T_TRACE_INFO *)(msg->SigP))->tab[0],
                      ((T_TRACE_INFO *)(msg->SigP))->tab[1],
@@ -1891,18 +1683,13 @@
                      ((T_TRACE_INFO *)(msg->SigP))->tab[5]);
 
             L1_send_trace_cpy(str);
-#endif
           }
           break;
 
           case FORBIDDEN_UPLINK:
           {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-            vsi_o_event_ttrace("> WARNING: UL allocated while no TA");
-#else
             sprintf (str,"> WARNING: UL allocated while no TA\n\r");
             L1_send_trace_cpy(str);
-#endif
           }
           break;
 
@@ -1910,40 +1697,6 @@
           {
             // PTCCH value
 
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-            if(!((T_TRACE_INFO *)(msg->SigP))->tab[0])
-            {
-              vsi_o_event_ttrace("-> PTCCH %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d",
-                       ((T_TRACE_INFO *)(msg->SigP))->tab[0],
-                       ((T_TRACE_INFO *)(msg->SigP))->tab[1],
-                       ((T_TRACE_INFO *)(msg->SigP))->tab[2],
-                       ((T_TRACE_INFO *)(msg->SigP))->tab[3],
-
-                       ((T_TRACE_INFO *)(msg->SigP))->tab[4] >> 0x10 & 0xFF,
-                       ((T_TRACE_INFO *)(msg->SigP))->tab[4] >> 0x18 & 0xFF,
-                       ((T_TRACE_INFO *)(msg->SigP))->tab[4]         & 0xFF,
-                       ((T_TRACE_INFO *)(msg->SigP))->tab[4] >> 0x08 & 0xFF,
-
-                       ((T_TRACE_INFO *)(msg->SigP))->tab[5] >> 0x10 & 0xFF,
-                       ((T_TRACE_INFO *)(msg->SigP))->tab[5] >> 0x18 & 0xFF,
-                       ((T_TRACE_INFO *)(msg->SigP))->tab[5]         & 0xFF,
-                       ((T_TRACE_INFO *)(msg->SigP))->tab[5] >> 0x08 & 0xFF,
-
-                       ((T_TRACE_INFO *)(msg->SigP))->tab[6] >> 0x10 & 0xFF,
-                       ((T_TRACE_INFO *)(msg->SigP))->tab[6] >> 0x18 & 0xFF,
-                       ((T_TRACE_INFO *)(msg->SigP))->tab[6]         & 0xFF,
-                       ((T_TRACE_INFO *)(msg->SigP))->tab[6] >> 0x08 & 0xFF,
-
-                       ((T_TRACE_INFO *)(msg->SigP))->tab[7] >> 0x10 & 0xFF,
-                       ((T_TRACE_INFO *)(msg->SigP))->tab[7] >> 0x18 & 0xFF,
-                       ((T_TRACE_INFO *)(msg->SigP))->tab[7]         & 0xFF,
-                       ((T_TRACE_INFO *)(msg->SigP))->tab[7] >> 0x08 & 0xFF);
-			}
-			else vsi_o_event_ttrace("-> PTCCH %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d",
-                         ((T_TRACE_INFO *)(msg->SigP))->tab[0],
-                         -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1);
-#else
-
             if(!((T_TRACE_INFO *)(msg->SigP))->tab[0])
             {
 
@@ -1978,59 +1731,38 @@
                          -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1);
 
             L1_send_trace_cpy(str);
-#endif
           }
           break;
 
           case PTCCH_DISABLED:
           {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-              vsi_o_event_ttrace("> WARNING: PTCCH disabled by L1S");
-#else
             sprintf (str,"> WARNING: PTCCH disabled by L1S\n\r");
 
             L1_send_trace_cpy(str);
-#endif
           }
           break;
 
-    #if (RLC_DL_BLOCK_STAT)
+        #if (RLC_DL_BLOCK_STAT)
           case L1S_RLC_STAT:
           {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-            vsi_o_event_ttrace("RLC STAT  : cs typ=%d nb frm=%ld nb bad frm=%ld nb cs1 frm=%ld",
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[0],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[1],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[2],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[3]);
-#else
             sprintf (str,"RLC STAT  : cs typ=%d nb frm=%ld nb bad frm=%ld nb cs1 frm=%ld\n\r",
                      ((T_TRACE_INFO *)(msg->SigP))->tab[0],
                      ((T_TRACE_INFO *)(msg->SigP))->tab[1],
                      ((T_TRACE_INFO *)(msg->SigP))->tab[2],
                      ((T_TRACE_INFO *)(msg->SigP))->tab[3]);
             L1_send_trace_cpy(str);
-#endif
-
           }
           break;
-          #endif //(RLC_DL_BLOCK_STAT)
+        #endif //(RLC_DL_BLOCK_STAT)
 
   #endif // L1_GPRS
 
   #if (TRACE_TYPE == 4)
           case DYN_TRACE_CHANGE:
           {
-
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-            vsi_o_event_ttrace(">> L1 TRACE CONFIG = 0x%lx <<",
-                     trace_info.current_config->l1_dyn_trace);
-#else
             sprintf (str,"\n\r>> L1 TRACE CONFIG = 0x%lx <<\n\r",
                      trace_info.current_config->l1_dyn_trace);
             L1_send_trace_cpy(str);
-#endif
-
           }
           break;
 
@@ -2042,30 +1774,6 @@
             {
               // common to all:
               //   ((T_TRACE_INFO *)(msg->SigP))->tab[7] contains the absolute fn
-#if (L1_COMPRESSED_TRACING == 1)
-
-			  case DYN_TRACE_1:
-              {
-                // trace when we override the sti present information
-                vsi_o_event_ttrace("  >> STI discarded");
-                break;
-              }
-              default:
-              {
-                vsi_o_event_ttrace ("Default: %ld, %ld, %ld, %ld, %ld, %ld, %ld, %ld",
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[0],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[1],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[2],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[3],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[4],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[5],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[6],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[7]);
-                break;
-              }
-            }
-
-#else
               case DYN_TRACE_1:
               {
                 // trace when we override the sti present information
@@ -2087,7 +1795,6 @@
               }
             }
             L1_send_trace_cpy(str);
-#endif
           }
           break;
         #endif // #if (OP_L1_STANDALONE == 0)
@@ -2096,18 +1803,11 @@
         #if (DEBUG_DEDIC_TCH_BLOCK_STAT == 1)
           case DEDIC_TCH_BLOCK_STAT:
           {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-            vsi_o_event_ttrace("DD_BL %ld %ld %ld %ld %ld %ld %ld %ld",
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[0],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[1],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[2]);
-#else
             sprintf (str,"DD_BL %ld %ld %ld %ld %ld %ld %ld %ld\n\r",
                      ((T_TRACE_INFO *)(msg->SigP))->tab[0],
                      ((T_TRACE_INFO *)(msg->SigP))->tab[1],
                      ((T_TRACE_INFO *)(msg->SigP))->tab[2]);
             L1_send_trace_cpy(str);
-#endif
           }
           break;
         #endif //(DEBUG_DEDIC_TCH_BLOCK_STAT == 1)
@@ -2119,28 +1819,6 @@
           UWORD16 amr_change_bitmap=((T_TRACE_INFO *)(msg->SigP))->tab[1];
           char modified[2]={' ','*'};
 
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("RAT_I %ld  acs%c 0x%02X,icm%c%d,cmip%c%d,thr1%c%02d,thr2%c%02d,thr3%c%02d,hyst1%c%02d,hyst2%c%02d,hyst3%c%02d",
-                      ((T_TRACE_INFO *)(msg->SigP))->tab[0],
-                      modified[(amr_change_bitmap & (1<<C_AMR_CHANGE_ACS))>>C_AMR_CHANGE_ACS],
-                      l1a_l1s_com.dedic_set.aset->amr_configuration.active_codec_set,
-                      modified[(amr_change_bitmap & (1<<C_AMR_CHANGE_ICM))>>C_AMR_CHANGE_ICM],
-                      l1a_l1s_com.dedic_set.aset->amr_configuration.initial_codec_mode,
-                      modified[(amr_change_bitmap & (1<<C_AMR_CHANGE_CMIP))>>C_AMR_CHANGE_CMIP],
-                      l1a_l1s_com.dedic_set.aset->cmip,
-                      modified[(amr_change_bitmap & (1<<C_AMR_CHANGE_THR1))>>C_AMR_CHANGE_THR1],
-                      l1a_l1s_com.dedic_set.aset->amr_configuration.threshold[0],
-                      modified[(amr_change_bitmap & (1<<C_AMR_CHANGE_THR2))>>C_AMR_CHANGE_THR2],
-                      l1a_l1s_com.dedic_set.aset->amr_configuration.threshold[1],
-                      modified[(amr_change_bitmap & (1<<C_AMR_CHANGE_THR3))>>C_AMR_CHANGE_THR3],
-                      l1a_l1s_com.dedic_set.aset->amr_configuration.threshold[2],
-                      modified[(amr_change_bitmap & (1<<C_AMR_CHANGE_HYST1))>>C_AMR_CHANGE_HYST1],
-                      l1a_l1s_com.dedic_set.aset->amr_configuration.hysteresis[0],
-                      modified[(amr_change_bitmap & (1<<C_AMR_CHANGE_HYST2))>>C_AMR_CHANGE_HYST2],
-                      l1a_l1s_com.dedic_set.aset->amr_configuration.hysteresis[1],
-                      modified[(amr_change_bitmap & (1<<C_AMR_CHANGE_HYST3))>>C_AMR_CHANGE_HYST3],
-                      l1a_l1s_com.dedic_set.aset->amr_configuration.hysteresis[2]);
-#else
           sprintf(str,"RAT_I %ld  acs%c 0x%02X,icm%c%d,cmip%c%d,thr1%c%02d,thr2%c%02d,thr3%c%02d,hyst1%c%02d,hyst2%c%02d,hyst3%c%02d\n\r",
                       ((T_TRACE_INFO *)(msg->SigP))->tab[0],
                       modified[(amr_change_bitmap & (1<<C_AMR_CHANGE_ACS))>>C_AMR_CHANGE_ACS],
@@ -2162,7 +1840,6 @@
                       modified[(amr_change_bitmap & (1<<C_AMR_CHANGE_HYST3))>>C_AMR_CHANGE_HYST3],
                       l1a_l1s_com.dedic_set.aset->amr_configuration.hysteresis[2]);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
         #endif
@@ -2171,35 +1848,16 @@
 #if 0
         case IQ_LOW:
         {
-
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("Warning : IQ LOW %ld %ld",
-                      ((T_TRACE_INFO *)(msg->SigP))->tab[0],
-                      ((T_TRACE_INFO *)(msg->SigP))->tab[1]);
-#else
           sprintf(str,"Warning : IQ LOW %ld %ld\n\r",
                       ((T_TRACE_INFO *)(msg->SigP))->tab[0],
                       ((T_TRACE_INFO *)(msg->SigP))->tab[1]);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 #endif
 
           default:
           {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("DEB_I %ld %ld %ld %ld %ld %ld %ld %ld %ld",
-                     ((T_TRACE_INFO *)(msg->SigP))->debug_code,
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[0],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[1],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[2],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[3],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[4],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[5],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[6],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[7]);
-#else
             sprintf (str,"DEB_I %ld %ld %ld %ld %ld %ld %ld %ld %ld\n\r",
                      ((T_TRACE_INFO *)(msg->SigP))->debug_code,
                      ((T_TRACE_INFO *)(msg->SigP))->tab[0],
@@ -2211,7 +1869,6 @@
                      ((T_TRACE_INFO *)(msg->SigP))->tab[6],
                      ((T_TRACE_INFO *)(msg->SigP))->tab[7]);
             L1_send_trace_cpy(str);
-#endif
           }
           break;
         } // switch(debug_code)
@@ -2229,16 +1886,10 @@
   {
     if(max_cpu_flag)
     {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-      vsi_o_event_ttrace("> CPU %ld %d",
-              fn_max_cpu % 42432,
-              max_cpu);
-#else
       sprintf(str,"> CPU %ld %d\n\r",
               fn_max_cpu % 42432,
               max_cpu);
       L1_send_trace_cpy(str);
-#endif
 
       max_cpu_flag = 0;
     }
@@ -2253,14 +1904,6 @@
   {
     if(l1_dsp_cpu_load_trace_flag)
     {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-      vsi_o_event_ttrace(str,"DSP_CPU_T0:%ld T1:%ld T2:%ld T3:%ld I:%ld \n\r",
-              dsp_max_cpu_load_trace_array[0],
-              dsp_max_cpu_load_trace_array[1],
-              dsp_max_cpu_load_trace_array[2],
-              dsp_max_cpu_load_trace_array[3],
-              dsp_max_cpu_load_idle_frame);
-#else
       sprintf(str,"DSP_CPU_T0:%ld T1:%ld T2:%ld T3:%ld I:%ld \n\r",
               dsp_max_cpu_load_trace_array[0],
               dsp_max_cpu_load_trace_array[1],
@@ -2268,7 +1911,6 @@
               dsp_max_cpu_load_trace_array[3],
               dsp_max_cpu_load_idle_frame);
       L1_send_trace_cpy(str);
-#endif
 
       dsp_max_cpu_load_trace_array[0] = 0L;
       dsp_max_cpu_load_trace_array[1] = 0L;
@@ -2303,10 +1945,6 @@
       /////////////////////////////////////////
       case MPHC_INIT_L1_REQ:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        // L1_FF_MULTIBAND TBD
-        vsi_o_event_ttrace("BAND_R %d",((T_MPHC_INIT_L1_REQ *)(msg->SigP))-> radio_band_config);
-#else
 #if (L1_FF_MULTIBAND == 0)
         sprintf (str, "BAND_R %d",((T_MPHC_INIT_L1_REQ *)(msg->SigP))-> radio_band_config);
 #else
@@ -2314,15 +1952,11 @@
 #endif /*#if (L1_FF_MULTIBAND == 1)*/
 
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case MPHC_INIT_L1_CON:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("BAND_C ");
-#else
 #if (L1_FF_MULTIBAND == 0)
         sprintf (str, "BAND_C");
 #else
@@ -2339,7 +1973,6 @@
 #endif
 
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -2349,14 +1982,6 @@
 
       case MPHC_NEW_SCELL_REQ:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("CEL_R %ld %d %ld %ld %d",
-                l1s.actual_time.fn_mod42432,
-                ((T_MPHC_NEW_SCELL_REQ *)(msg->SigP))->radio_freq,
-                ((T_MPHC_NEW_SCELL_REQ *)(msg->SigP))->fn_offset,
-                ((T_MPHC_NEW_SCELL_REQ *)(msg->SigP))->time_alignmt,
-                ((T_MPHC_NEW_SCELL_REQ *)(msg->SigP))->bsic);
-#else
         sprintf(str,"CEL_R %ld %d %ld %ld %d\n\r",
                 l1s.actual_time.fn_mod42432,
                 ((T_MPHC_NEW_SCELL_REQ *)(msg->SigP))->radio_freq,
@@ -2364,7 +1989,6 @@
                 ((T_MPHC_NEW_SCELL_REQ *)(msg->SigP))->time_alignmt,
                 ((T_MPHC_NEW_SCELL_REQ *)(msg->SigP))->bsic);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -2374,14 +1998,9 @@
 
       case MPHC_NETWORK_LOST_IND:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-      vsi_o_event_ttrace("LOS_R %ld",
+        sprintf(str,"LOS_R %ld\n\r",
                 l1s.actual_time.fn_mod42432);
-#else
-      sprintf(str,"LOS_R %ld\n\r",
-                l1s.actual_time.fn_mod42432);
-        L1_send_trace_cpy(str);
-#endif
+        L1_send_trace_cpy(str);
       }
       break;
 
@@ -2389,15 +2008,6 @@
 
       case MPHC_NETWORK_SYNC_REQ:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-      vsi_o_event_ttrace("NET_R %ld %d %ld %ld %d %d",
-                l1s.actual_time.fn_mod42432,
-                ((T_MPHC_NETWORK_SYNC_REQ *)(msg->SigP))->radio_freq,
-                ((T_MPHC_NETWORK_SYNC_REQ *)(msg->SigP))->fn_offset,
-                ((T_MPHC_NETWORK_SYNC_REQ *)(msg->SigP))->time_alignmt,
-                ((T_MPHC_NETWORK_SYNC_REQ *)(msg->SigP))->timing_validity,
-                ((T_MPHC_NETWORK_SYNC_REQ *)(msg->SigP))->search_mode);
-#else
         sprintf(str,"NET_R %ld %d %ld %ld %d %d\n\r",
                 l1s.actual_time.fn_mod42432,
                 ((T_MPHC_NETWORK_SYNC_REQ *)(msg->SigP))->radio_freq,
@@ -2406,33 +2016,19 @@
                 ((T_MPHC_NETWORK_SYNC_REQ *)(msg->SigP))->timing_validity,
                 ((T_MPHC_NETWORK_SYNC_REQ *)(msg->SigP))->search_mode);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case MPHC_STOP_NETWORK_SYNC_REQ:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("NET_S %ld",
-                l1s.actual_time.fn_mod42432);
-#else
         sprintf(str,"NET_S %ld\n\r",
                 l1s.actual_time.fn_mod42432);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case MPHC_NCELL_SYNC_REQ:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("NSY_R %ld %d %ld %ld %d",
-                l1s.actual_time.fn_mod42432,
-                ((T_MPHC_NCELL_SYNC_REQ *)(msg->SigP))->radio_freq,
-                ((T_MPHC_NCELL_SYNC_REQ *)(msg->SigP))->fn_offset,
-                ((T_MPHC_NCELL_SYNC_REQ *)(msg->SigP))->time_alignmt,
-                ((T_MPHC_NCELL_SYNC_REQ *)(msg->SigP))->timing_validity);
-#else
         sprintf(str,"NSY_R %ld %d %ld %ld %d\n\r",
                 l1s.actual_time.fn_mod42432,
                 ((T_MPHC_NCELL_SYNC_REQ *)(msg->SigP))->radio_freq,
@@ -2440,7 +2036,6 @@
                 ((T_MPHC_NCELL_SYNC_REQ *)(msg->SigP))->time_alignmt,
                 ((T_MPHC_NCELL_SYNC_REQ *)(msg->SigP))->timing_validity);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -2500,35 +2095,21 @@
 
       case MPHC_NCELL_FB_SB_READ:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("FB_R  %ld %d",
-                l1s.actual_time.fn_mod42432,
-                ((T_MPHC_NCELL_FB_SB_READ *)(msg->SigP))->radio_freq);
-#else
         sprintf(str,"FB_R  %ld %d\n\r",
                 l1s.actual_time.fn_mod42432,
                 ((T_MPHC_NCELL_FB_SB_READ *)(msg->SigP))->radio_freq);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case MPHC_NCELL_SB_READ:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("SB_R  %ld %d %ld %ld",
-                l1s.actual_time.fn_mod42432,
-                ((T_MPHC_NCELL_SB_READ *)(msg->SigP))->radio_freq,
-                ((T_MPHC_NCELL_SB_READ *)(msg->SigP))->fn_offset,
-                ((T_MPHC_NCELL_SB_READ *)(msg->SigP))->time_alignmt);
-#else
         sprintf(str,"SB_R  %ld %d %ld %ld\n\r",
                 l1s.actual_time.fn_mod42432,
                 ((T_MPHC_NCELL_SB_READ *)(msg->SigP))->radio_freq,
                 ((T_MPHC_NCELL_SB_READ *)(msg->SigP))->fn_offset,
                 ((T_MPHC_NCELL_SB_READ *)(msg->SigP))->time_alignmt);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -2539,26 +2120,6 @@
         operative_radio_freq = l1_multiband_radio_freq_convert_into_operative_radio_freq(((T_L1C_FB_INFO*)(msg->SigP))->radio_freq);
 #endif
         
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("FB_I  %ld %d %d %ld %ld %ld %ld %d %ld %d",
-                l1s.actual_time.fn_mod42432,
-                ((T_L1C_FB_INFO*)(msg->SigP))->fb_flag,
-                ((T_L1C_FB_INFO*)(msg->SigP))->radio_freq,
-                ((T_L1C_FB_INFO*)(msg->SigP))->pm,
-                ((T_L1C_FB_INFO*)(msg->SigP))->toa,
-                ((T_L1C_FB_INFO*)(msg->SigP))->angle,
-                ((T_L1C_FB_INFO*)(msg->SigP))->snr,
-#if(L1_FF_MULTIBAND == 0)
-                l1a_l1s_com.last_input_level[((T_L1C_FB_INFO*)(msg->SigP))->radio_freq -
-                                             l1_config.std.radio_freq_index_offset].input_level,
-#else // L1_FF_MULTIBAND
-                l1a_l1s_com.last_input_level[operative_radio_freq].input_level,
-                
-#endif // L1_FF_MULTIBAND
-                
-                l1s.tpu_offset,
-                l1s.afc);
-#else
         sprintf(str,"FB_I  %ld %d %d %ld %ld %ld %ld %d %ld %d\n\r",
                 l1s.actual_time.fn_mod42432,
                 ((T_L1C_FB_INFO*)(msg->SigP))->fb_flag,
@@ -2579,7 +2140,6 @@
                 l1s.tpu_offset,
                 l1s.afc);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -2590,27 +2150,6 @@
         operative_radio_freq = l1_multiband_radio_freq_convert_into_operative_radio_freq(((T_L1C_SB_INFO*)(msg->SigP))->radio_freq);
 #endif
         
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("SB_I  %ld %d %d %d %ld %ld %ld %ld %ld %ld %d %ld %d",
-                l1s.actual_time.fn_mod42432,
-                ((T_L1C_SB_INFO *)(msg->SigP))->sb_flag,
-                ((T_L1C_SB_INFO *)(msg->SigP))->radio_freq,
-                ((T_L1C_SB_INFO *)(msg->SigP))->bsic,
-                ((T_L1C_SB_INFO *)(msg->SigP))->fn_offset,
-                ((T_L1C_SB_INFO *)(msg->SigP))->time_alignmt,
-                ((T_L1C_SB_INFO *)(msg->SigP))->pm,
-                ((T_L1C_SB_INFO *)(msg->SigP))->toa,
-                ((T_L1C_SB_INFO *)(msg->SigP))->angle,
-                ((T_L1C_SB_INFO *)(msg->SigP))->snr,
-#if(L1_FF_MULTIBAND == 0)
-                l1a_l1s_com.last_input_level[((T_L1C_SB_INFO *)(msg->SigP))->radio_freq - l1_config.std.radio_freq_index_offset].input_level,
-#else
-                l1a_l1s_com.last_input_level[operative_radio_freq].input_level,
-#endif
-
-                l1s.tpu_offset,
-                l1s.afc);
-#else
         sprintf(str,"SB_I  %ld %d %d %d %ld %ld %ld %ld %ld %ld %d %ld %d\n\r",
                 l1s.actual_time.fn_mod42432,
                 ((T_L1C_SB_INFO *)(msg->SigP))->sb_flag,
@@ -2631,26 +2170,12 @@
                 l1s.tpu_offset,
                 l1s.afc);
         L1_send_trace_cpy(str);
-#endif
-      }
-      break;
+      }
+      break;
+
 #if ((REL99 == 1) && (FF_BHO == 1))
       case L1C_FBSB_INFO:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-vsi_o_event_ttrace"FBSB_I  %ld %d %d %d %ld %ld %ld %ld %ld %ld\n\r",
-               l1s.actual_time.fn_mod42432,
-               ((T_L1C_FBSB_INFO *)(msg->SigP))->fb_flag,
-               ((T_L1C_FBSB_INFO *)(msg->SigP))->sb_flag,
-               ((T_L1C_FBSB_INFO *)(msg->SigP))->bsic,
-               ((T_L1C_FBSB_INFO *)(msg->SigP))->fn_offset,
-               ((T_L1C_FBSB_INFO *)(msg->SigP))->time_alignmt,
-               ((T_L1C_FBSB_INFO *)(msg->SigP))->pm,
-               ((T_L1C_FBSB_INFO *)(msg->SigP))->toa,
-               ((T_L1C_FBSB_INFO *)(msg->SigP))->angle,
-               ((T_L1C_FBSB_INFO *)(msg->SigP))->snr
-               );
-#else
         sprintf(str,"FBSB_I  %ld %d %d %d %ld %ld %ld %ld %ld %ld\n\r",
                l1s.actual_time.fn_mod42432,
                ((T_L1C_FBSB_INFO *)(msg->SigP))->fb_flag,
@@ -2664,10 +2189,10 @@
                ((T_L1C_FBSB_INFO *)(msg->SigP))->snr
                );
         L1_send_trace_cpy(str);
-#endif
-      }
-      break;
-#endif
+      }
+      break;
+#endif
+
       case L1C_SBCONF_INFO:
       {
 #if(L1_FF_MULTIBAND == 1)
@@ -2675,27 +2200,6 @@
         operative_radio_freq = l1_multiband_radio_freq_convert_into_operative_radio_freq(((T_L1C_SB_INFO *)(msg->SigP))->radio_freq);
 #endif
         
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("SBC_I %ld %d %d %d %ld %ld %ld %ld %ld %ld %d %ld %d",
-                l1s.actual_time.fn_mod42432,
-                ((T_L1C_SB_INFO *)(msg->SigP))->sb_flag,
-                ((T_L1C_SB_INFO *)(msg->SigP))->radio_freq,
-                ((T_L1C_SB_INFO *)(msg->SigP))->bsic,
-                ((T_L1C_SB_INFO *)(msg->SigP))->fn_offset,
-                ((T_L1C_SB_INFO *)(msg->SigP))->time_alignmt,
-                ((T_L1C_SB_INFO *)(msg->SigP))->pm,
-                ((T_L1C_SB_INFO *)(msg->SigP))->toa,
-                ((T_L1C_SB_INFO *)(msg->SigP))->angle,
-                ((T_L1C_SB_INFO *)(msg->SigP))->snr,
-#if(L1_FF_MULTIBAND == 0)
-                l1a_l1s_com.last_input_level[((T_L1C_SB_INFO *)(msg->SigP))->radio_freq - l1_config.std.radio_freq_index_offset].input_level,
-#else
-                l1a_l1s_com.last_input_level[operative_radio_freq].input_level,
-#endif
-
-                l1s.tpu_offset,
-                l1s.afc);
-#else
         sprintf(str,"SBC_I %ld %d %d %d %ld %ld %ld %ld %ld %ld %d %ld %d\n\r",
                 l1s.actual_time.fn_mod42432,
                 ((T_L1C_SB_INFO *)(msg->SigP))->sb_flag,
@@ -2716,21 +2220,11 @@
                 l1s.tpu_offset,
                 l1s.afc);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case MPHC_NETWORK_SYNC_IND:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("NET_I %ld %d %d %ld %ld %d",
-                l1s.actual_time.fn_mod42432,
-                ((T_MPHC_NETWORK_SYNC_IND*)(msg->SigP))->sb_flag,
-                ((T_MPHC_NETWORK_SYNC_IND*)(msg->SigP))->radio_freq,
-                ((T_MPHC_NETWORK_SYNC_IND*)(msg->SigP))->fn_offset,
-                ((T_MPHC_NETWORK_SYNC_IND*)(msg->SigP))->time_alignmt,
-                ((T_MPHC_NETWORK_SYNC_IND*)(msg->SigP))->bsic);
-#else
         sprintf(str,"NET_I %ld %d %d %ld %ld %d\n\r",
                 l1s.actual_time.fn_mod42432,
                 ((T_MPHC_NETWORK_SYNC_IND*)(msg->SigP))->sb_flag,
@@ -2739,44 +2233,12 @@
                 ((T_MPHC_NETWORK_SYNC_IND*)(msg->SigP))->time_alignmt,
                 ((T_MPHC_NETWORK_SYNC_IND*)(msg->SigP))->bsic);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case MPHC_NCELL_SYNC_IND:
       {
 
-#if  (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1)
-  #if (L1_EOTD)
-        vsi_o_event_ttrace("NSY_I %ld %d %d %ld %ld %d %d %ld %ld %ld %ld %ld %ld %ld %ld",
-                l1s.actual_time.fn_mod42432,
-                ((T_MPHC_NCELL_SYNC_IND*)(msg->SigP))->sb_flag,
-                ((T_MPHC_NCELL_SYNC_IND*)(msg->SigP))->radio_freq,
-                ((T_MPHC_NCELL_SYNC_IND*)(msg->SigP))->fn_offset,
-                ((T_MPHC_NCELL_SYNC_IND*)(msg->SigP))->time_alignmt,
-                ((T_MPHC_NCELL_SYNC_IND*)(msg->SigP))->bsic,
-                ((T_MPHC_NCELL_SYNC_IND*)(msg->SigP))->neigh_id,
-                l1a_l1s_com.nsync.current_list_size,
-                ((T_MPHC_NCELL_SYNC_IND*)(msg->SigP))->d_eotd_first,
-                pgoset,
-                ((T_MPHC_NCELL_SYNC_IND*)(msg->SigP))->fn_sb_neigh,
-                ((T_MPHC_NCELL_SYNC_IND*)(msg->SigP))->fn_in_SB,
-                ((T_MPHC_NCELL_SYNC_IND*)(msg->SigP))->timetag,
-                ((T_MPHC_NCELL_SYNC_IND*)(msg->SigP))->delta_fn,
-                ((T_MPHC_NCELL_SYNC_IND*)(msg->SigP))->delta_qbit);
-  #else
-        vsi_o_event_ttrace("NSY_I %ld %d %d %ld %ld %d %d",
-                l1s.actual_time.fn_mod42432,
-                ((T_MPHC_NCELL_SYNC_IND*)(msg->SigP))->sb_flag,
-                ((T_MPHC_NCELL_SYNC_IND*)(msg->SigP))->radio_freq,
-                ((T_MPHC_NCELL_SYNC_IND*)(msg->SigP))->fn_offset,
-                ((T_MPHC_NCELL_SYNC_IND*)(msg->SigP))->time_alignmt,
-                ((T_MPHC_NCELL_SYNC_IND*)(msg->SigP))->bsic,
-                ((T_MPHC_NCELL_SYNC_IND*)(msg->SigP))->neigh_id);
-
-  #endif //(L1_EOTD)
-
-#else
     #if (L1_EOTD)
         sprintf(str,"NSY_I %ld %d %d %ld %ld %d %d %ld %ld %ld %ld %ld %ld %ld %ld\n\r",
     #else
@@ -2802,8 +2264,6 @@
               );
 
         L1_send_trace_cpy(str);
-#endif
-
       }
       break;
 
@@ -2811,27 +2271,6 @@
 
       case MPHC_NCELL_BCCH_REQ:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-		#if L1_GPRS
-        vsi_o_event_ttrace("BN_R  %ld %d %ld %ld %d %d %d",
-                l1s.actual_time.fn_mod42432,
-                ((T_MPHC_NCELL_BCCH_REQ *)(msg->SigP))->radio_freq,
-                ((T_MPHC_NCELL_BCCH_REQ *)(msg->SigP))->fn_offset,
-                ((T_MPHC_NCELL_BCCH_REQ *)(msg->SigP))->time_alignmt,
-                ((T_MPHC_NCELL_BCCH_REQ *)(msg->SigP))->tsc,
-                ((T_MPHC_NCELL_BCCH_REQ *)(msg->SigP))->bcch_blks_req,
-                ((T_MPHC_NCELL_BCCH_REQ *)(msg->SigP))->gprs_priority);
-        #else
-        vsi_o_event_ttrace("BN_R  %ld %d %ld %ld %d %d",
-                l1s.actual_time.fn_mod42432,
-                ((T_MPHC_NCELL_BCCH_REQ *)(msg->SigP))->radio_freq,
-                ((T_MPHC_NCELL_BCCH_REQ *)(msg->SigP))->fn_offset,
-                ((T_MPHC_NCELL_BCCH_REQ *)(msg->SigP))->time_alignmt,
-                ((T_MPHC_NCELL_BCCH_REQ *)(msg->SigP))->tsc,
-                ((T_MPHC_NCELL_BCCH_REQ *)(msg->SigP))->bcch_blks_req);
-
-        #endif //L1_GPRS
-#else
         #if L1_GPRS
         sprintf(str,"BN_R  %ld %d %ld %ld %d %d %d\n\r",
                 l1s.actual_time.fn_mod42432,
@@ -2852,7 +2291,6 @@
 
         #endif //L1_GPRS
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -2881,21 +2319,6 @@
         operative_radio_freq = l1_multiband_radio_freq_convert_into_operative_radio_freq(((T_MPHC_DATA_IND *)(msg->SigP))->radio_freq);
 #endif
         
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("BN_I  %ld %d %d %d %ld %d",
-                ((T_MPHC_DATA_IND *)(msg->SigP))->fn % 42432,
-                ((T_MPHC_DATA_IND *)(msg->SigP))->error_flag,
-                ((T_MPHC_DATA_IND *)(msg->SigP))->radio_freq,
-#if(L1_FF_MULTIBAND == 0)
-                l1a_l1s_com.last_input_level[((T_MPHC_DATA_IND *)(msg->SigP))->radio_freq -
-                                             l1_config.std.radio_freq_index_offset].input_level,
-#else
-                l1a_l1s_com.last_input_level[operative_radio_freq].input_level,
-#endif
-
-                l1s.tpu_offset,
-                l1s.afc);
-#else
         sprintf(str,"BN_I  %ld %d %d %d %ld %d\n\r",
                 ((T_MPHC_DATA_IND *)(msg->SigP))->fn % 42432,
                 ((T_MPHC_DATA_IND *)(msg->SigP))->error_flag,
@@ -2910,7 +2333,6 @@
                 l1s.tpu_offset,
                 l1s.afc);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -2924,17 +2346,6 @@
       {
         trace_info.rxlev_req_count = 0;
 
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("CCH_R %ld %d %d %d %d %d %d %d",
-                l1s.actual_time.fn_mod42432,
-                ((T_MPHC_START_CCCH_REQ *)(msg->SigP))->bs_pa_mfrms,
-                ((T_MPHC_START_CCCH_REQ *)(msg->SigP))->bs_ag_blks_res,
-                ((T_MPHC_START_CCCH_REQ *)(msg->SigP))->bcch_combined,
-                ((T_MPHC_START_CCCH_REQ *)(msg->SigP))->ccch_group,
-                ((T_MPHC_START_CCCH_REQ *)(msg->SigP))->page_group,
-                ((T_MPHC_START_CCCH_REQ *)(msg->SigP))->page_block_index,
-                ((T_MPHC_START_CCCH_REQ *)(msg->SigP))->page_mode);
-#else
         sprintf(str,"CCH_R %ld %d %d %d %d %d %d %d\n\r",
                 l1s.actual_time.fn_mod42432,
                 ((T_MPHC_START_CCCH_REQ *)(msg->SigP))->bs_pa_mfrms,
@@ -2945,45 +2356,21 @@
                 ((T_MPHC_START_CCCH_REQ *)(msg->SigP))->page_block_index,
                 ((T_MPHC_START_CCCH_REQ *)(msg->SigP))->page_mode);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case MPHC_STOP_CCCH_REQ:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("CCH_S %ld",
-                l1s.actual_time.fn_mod42432);
-#else
         sprintf(str,"CCH_S %ld\n\r",
                 l1s.actual_time.fn_mod42432);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case L1C_NP_INFO:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
 #if (FF_L1_FAST_DECODING == 1)
-        vsi_o_event_ttrace("NP_I  %ld %d %d %d %ld %d %d %d %d %d %d %c",
-#else
-        vsi_o_event_ttrace("NP_I  %ld %d %d %d %ld %d %d %d %d %d %c",
-#endif /* FF_L1_FAST_DECODING */
-                  ((T_MPHC_DATA_IND *)(msg->SigP))->fn % 42432,
-                  ((T_MPHC_DATA_IND *)(msg->SigP))->error_flag,
-                  ((T_MPHC_DATA_IND *)(msg->SigP))->radio_freq,
-                  l1a_l1s_com.Scell_IL_for_rxlev,
-                  l1s.tpu_offset,
-                  l1s.afc,
-#if (FF_L1_FAST_DECODING == 1)
-                  l1a_l1s_com.last_fast_decoding,
-#endif
-                  toa_tab[0],toa_tab[1],toa_tab[2], toa_tab[3],
-                  trace_info.l1_memorize_error);
-#else
-#if (FF_L1_FAST_DECODING == 1)
-               sprintf(str,"NP_I  %ld %d %d %d %ld %d %d %d %d %d %d %c\n\r",
+          sprintf(str,"NP_I  %ld %d %d %d %ld %d %d %d %d %d %d %c\n\r",
 #else
           sprintf(str,"NP_I  %ld %d %d %d %ld %d %d %d %d %d %c\n\r",
 #endif
@@ -2999,21 +2386,11 @@
                   toa_tab[0],toa_tab[1],toa_tab[2], toa_tab[3],
                   trace_info.l1_memorize_error);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case L1C_EP_INFO:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("EP_I  %ld %d %d %d %ld %d",
-                ((T_MPHC_DATA_IND *)(msg->SigP))->fn % 42432,
-                ((T_MPHC_DATA_IND *)(msg->SigP))->error_flag,
-                ((T_MPHC_DATA_IND *)(msg->SigP))->radio_freq,
-                l1a_l1s_com.Scell_IL_for_rxlev,
-                l1s.tpu_offset,
-                l1s.afc);
-#else
         sprintf(str,"EP_I  %ld %d %d %d %ld %d\n\r",
                 ((T_MPHC_DATA_IND *)(msg->SigP))->fn % 42432,
                 ((T_MPHC_DATA_IND *)(msg->SigP))->error_flag,
@@ -3022,21 +2399,11 @@
                 l1s.tpu_offset,
                 l1s.afc);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case L1C_ALLC_INFO:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("CC_I  %ld %d %d %d %ld %d",
-                ((T_MPHC_DATA_IND *)(msg->SigP))->fn % 42432,
-                ((T_MPHC_DATA_IND *)(msg->SigP))->error_flag,
-                ((T_MPHC_DATA_IND *)(msg->SigP))->radio_freq,
-                l1a_l1s_com.Scell_IL_for_rxlev,
-                l1s.tpu_offset,
-                l1s.afc);
-#else
         sprintf(str,"CC_I  %ld %d %d %d %ld %d\n\r",
                 ((T_MPHC_DATA_IND *)(msg->SigP))->fn % 42432,
                 ((T_MPHC_DATA_IND *)(msg->SigP))->error_flag,
@@ -3045,7 +2412,6 @@
                 l1s.tpu_offset,
                 l1s.afc);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -3093,36 +2459,14 @@
 
       case MPHC_STOP_SCELL_BCCH_REQ:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("BS_S  %ld",
-                l1s.actual_time.fn_mod42432);
-#else
         sprintf(str,"BS_S  %ld\n\r",
                 l1s.actual_time.fn_mod42432);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case L1C_BCCHS_INFO:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-#if (FF_L1_FAST_DECODING == 1)
-        vsi_o_event_ttrace("BS_I  %ld %d %d %d %ld %d %d",
-#else
-        vsi_o_event_ttrace("BS_I  %ld %d %d %d %ld %d",
-#endif
-                ((T_MPHC_DATA_IND *)(msg->SigP))->fn % 42432,
-                ((T_MPHC_DATA_IND *)(msg->SigP))->error_flag,
-                ((T_MPHC_DATA_IND *)(msg->SigP))->radio_freq,
-                l1a_l1s_com.Scell_IL_for_rxlev,
-                l1s.tpu_offset,
-                l1s.afc
-#if (FF_L1_FAST_DECODING == 1)
-                  ,l1a_l1s_com.last_fast_decoding
-#endif
-                );
-#else
 #if (FF_L1_FAST_DECODING == 1)
         sprintf(str,"BS_I  %ld %d %d %d %ld %d %d\n\r",
 #else
@@ -3139,7 +2483,6 @@
 #endif
                 );
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -3149,33 +2492,17 @@
 
       case MPHC_CONFIG_CBCH_REQ:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("CBC_R %ld %d %d %d",
-                l1s.actual_time.fn_mod42432,
-                ((T_MPHC_CONFIG_CBCH_REQ *)(msg->SigP))->cbch_desc.chan_sel.h,
-                ((T_MPHC_CONFIG_CBCH_REQ *)(msg->SigP))->cbch_desc.chan_sel.rf_channel.single_rf.radio_freq,
-                ((T_MPHC_CONFIG_CBCH_REQ *)(msg->SigP))->cbch_desc.timeslot_no);
-#else
         sprintf(str,"CBC_R %ld %d %d %d\n\r",
                 l1s.actual_time.fn_mod42432,
                 ((T_MPHC_CONFIG_CBCH_REQ *)(msg->SigP))->cbch_desc.chan_sel.h,
                 ((T_MPHC_CONFIG_CBCH_REQ *)(msg->SigP))->cbch_desc.chan_sel.rf_channel.single_rf.radio_freq,
                 ((T_MPHC_CONFIG_CBCH_REQ *)(msg->SigP))->cbch_desc.timeslot_no);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case MPHC_CBCH_SCHEDULE_REQ:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("CBS_R %ld %d %d %ld %d",
-                l1s.actual_time.fn_mod42432,
-                ((T_MPHC_CBCH_SCHEDULE_REQ *)(msg->SigP))->extended_cbch,
-                ((T_MPHC_CBCH_SCHEDULE_REQ *)(msg->SigP))->schedule_length,
-                ((T_MPHC_CBCH_SCHEDULE_REQ *)(msg->SigP))->first_block_0,
-                ((T_MPHC_CBCH_SCHEDULE_REQ *)(msg->SigP))->first_block_1);
-#else
         sprintf(str,"CBS_R %ld %d %d %ld %d\n\r",
                 l1s.actual_time.fn_mod42432,
                 ((T_MPHC_CBCH_SCHEDULE_REQ *)(msg->SigP))->extended_cbch,
@@ -3183,55 +2510,31 @@
                 ((T_MPHC_CBCH_SCHEDULE_REQ *)(msg->SigP))->first_block_0,
                 ((T_MPHC_CBCH_SCHEDULE_REQ *)(msg->SigP))->first_block_1);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case MPHC_CBCH_INFO_REQ:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("CBI_R %ld %d",
-                l1s.actual_time.fn_mod42432,
-                ((T_MPHC_CBCH_INFO_REQ *)(msg->SigP))->tb_bitmap);
-#else
         sprintf(str,"CBI_R %ld %d\n\r",
                 l1s.actual_time.fn_mod42432,
                 ((T_MPHC_CBCH_INFO_REQ *)(msg->SigP))->tb_bitmap);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case MPHC_CBCH_UPDATE_REQ:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("CBU_R %ld %d %ld %d",
-                l1s.actual_time.fn_mod42432,
-                ((T_MPHC_CBCH_UPDATE_REQ*)(msg->SigP))->extended_cbch,
-                ((T_MPHC_CBCH_UPDATE_REQ*)(msg->SigP))->first_block_0,
-                ((T_MPHC_CBCH_UPDATE_REQ*)(msg->SigP))->first_block_1);
-#else
         sprintf(str,"CBU_R %ld %d %ld %d\n\r",
                 l1s.actual_time.fn_mod42432,
                 ((T_MPHC_CBCH_UPDATE_REQ*)(msg->SigP))->extended_cbch,
                 ((T_MPHC_CBCH_UPDATE_REQ*)(msg->SigP))->first_block_0,
                 ((T_MPHC_CBCH_UPDATE_REQ*)(msg->SigP))->first_block_1);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case L1C_CB_INFO:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("CB_I  %ld %d %d %d %ld %d",
-                ((T_MPHC_DATA_IND *)(msg->SigP))->fn % 42432,
-                ((T_MPHC_DATA_IND *)(msg->SigP))->error_flag,
-                ((T_MPHC_DATA_IND *)(msg->SigP))->radio_freq,
-                l1a_l1s_com.Scell_IL_for_rxlev,
-                l1s.tpu_offset,
-                l1s.afc);
-#else
         sprintf(str,"CB_I  %ld %d %d %d %ld %d\n\r",
                 ((T_MPHC_DATA_IND *)(msg->SigP))->fn % 42432,
                 ((T_MPHC_DATA_IND *)(msg->SigP))->error_flag,
@@ -3240,7 +2543,6 @@
                 l1s.tpu_offset,
                 l1s.afc);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -3248,31 +2550,19 @@
 
       case MPHC_STOP_CBCH_REQ:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("ECB_S  %ld %d %d",
-                l1s.actual_time.fn_mod42432,
-                ((T_MPHC_STOP_CBCH_REQ*)(msg->SigP))->normal_cbch,
-                ((T_MPHC_STOP_CBCH_REQ*)(msg->SigP))->extended_cbch);
-#else
         sprintf(str,"ECB_S  %ld %d %d\n\r",
                 l1s.actual_time.fn_mod42432,
                 ((T_MPHC_STOP_CBCH_REQ*)(msg->SigP))->normal_cbch,
                 ((T_MPHC_STOP_CBCH_REQ*)(msg->SigP))->extended_cbch);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case MPHC_STOP_CBCH_CON:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("ECB_C %ld",
-                l1s.actual_time.fn_mod42432);
-#else
         sprintf(str,"ECB_C %ld\n\r",
                 l1s.actual_time.fn_mod42432);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -3282,18 +2572,6 @@
 
       case MPHC_RA_REQ:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("RA_R  %ld %d %d %d %d %d",
-                l1s.actual_time.fn_mod42432,
-                ((T_MPHC_RA_REQ *)(msg->SigP))->txpwr,
-                ((T_MPHC_RA_REQ *)(msg->SigP))->rand,
-                ((T_MPHC_RA_REQ *)(msg->SigP))->channel_request
-#if (L1_FF_MULTIBAND == 0)                
-                ,((T_MPHC_RA_REQ *)(msg->SigP))->powerclass_band1,
-                ((T_MPHC_RA_REQ *)(msg->SigP))->powerclass_band2
-#endif                
-                );
-#else
         sprintf(str,"RA_R  %ld %d %d %d %d %d\n\r",
                 l1s.actual_time.fn_mod42432,
                 ((T_MPHC_RA_REQ *)(msg->SigP))->txpwr,
@@ -3305,33 +2583,22 @@
 #endif                
                 );
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case MPHC_STOP_RA_REQ:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("RA_S  %ld",
-                l1s.actual_time.fn_mod42432);
-#else
         sprintf(str,"RA_S  %ld\n\r",
                 l1s.actual_time.fn_mod42432);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case L1C_RA_DONE:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("RA_C  %ld",
-                ((T_MPHC_RA_CON *)(msg->SigP))->fn % 42432);
-#else
         sprintf(str,"RA_C  %ld\n\r",
                 ((T_MPHC_RA_CON *)(msg->SigP))->fn % 42432);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -3343,22 +2610,6 @@
 
       case MPHC_IMMED_ASSIGN_REQ:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("IAS_R %ld %d %d %d %d %d %d %d %d %ld %d %d %d",
-                l1s.actual_time.fn_mod42432,
-                ((T_MPHC_IMMED_ASSIGN_REQ *)(msg->SigP))->channel_desc.chan_sel.h,
-                ((T_MPHC_IMMED_ASSIGN_REQ *)(msg->SigP))->channel_desc.chan_sel.rf_channel.single_rf.radio_freq,
-                ((T_MPHC_IMMED_ASSIGN_REQ *)(msg->SigP))->channel_desc.channel_type,
-                ((T_MPHC_IMMED_ASSIGN_REQ *)(msg->SigP))->channel_desc.subchannel,
-                ((T_MPHC_IMMED_ASSIGN_REQ *)(msg->SigP))->channel_desc.timeslot_no,
-                ((T_MPHC_IMMED_ASSIGN_REQ *)(msg->SigP))->channel_desc.tsc,
-                ((T_MPHC_IMMED_ASSIGN_REQ *)(msg->SigP))->timing_advance,
-                ((T_MPHC_IMMED_ASSIGN_REQ *)(msg->SigP))->frequency_list.rf_chan_cnt,
-                l1a_decode_starting_time(((T_MPHC_IMMED_ASSIGN_REQ *)(msg->SigP))->starting_time),
-                ((T_MPHC_IMMED_ASSIGN_REQ *)(msg->SigP))->frequency_list_bef_sti.rf_chan_cnt,
-                ((T_MPHC_IMMED_ASSIGN_REQ *)(msg->SigP))->dtx_allowed,
-                ((T_MPHC_IMMED_ASSIGN_REQ *)(msg->SigP))->pwrc);
-#else
         sprintf(str,"\n\rIAS_R %ld %d %d %d %d %d %d %d %d %ld %d %d %d\n\r",
                 l1s.actual_time.fn_mod42432,
                 ((T_MPHC_IMMED_ASSIGN_REQ *)(msg->SigP))->channel_desc.chan_sel.h,
@@ -3374,26 +2625,18 @@
                 ((T_MPHC_IMMED_ASSIGN_REQ *)(msg->SigP))->dtx_allowed,
                 ((T_MPHC_IMMED_ASSIGN_REQ *)(msg->SigP))->pwrc);
         L1_send_trace_cpy(str);
-#endif
-
 
         // a message was received correctly from the Network, it means the system behavior is nice
         // and so we can allow more trace on a PM/COM error.
         trace_info.trace_filter = FALSE;
-
       }
       break;
 
       case MPHC_IMMED_ASSIGN_CON:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("IAS_C %ld",
-                l1s.actual_time.fn_mod42432);
-#else
         sprintf(str,"IAS_C %ld\n\r",
                 l1s.actual_time.fn_mod42432);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -3401,54 +2644,6 @@
 
       case MPHC_CHANNEL_ASSIGN_REQ:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        #if (AMR == 1)
-          vsi_o_event_ttrace("CAS_R %ld %d %d %d %d %d %d %d %d %d %ld %d %d %d %d %1d %1d %1d %2x %2d %2d %2d %2d %2d %2d",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->channel_desc_1.chan_sel.h,
-                  ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->channel_desc_1.chan_sel.rf_channel.single_rf.radio_freq,
-                  ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->channel_desc_1.channel_type,
-                  ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->channel_desc_1.subchannel,
-                  ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->channel_desc_1.timeslot_no,
-                  ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->channel_desc_1.tsc,
-                  ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->channel_mode_1,
-                  ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->txpwr,
-                  ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->frequency_list.rf_chan_cnt,
-                  l1a_decode_starting_time(((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->starting_time),
-                  ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->frequency_list_bef_sti.rf_chan_cnt,
-                  ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->cipher_mode,
-                  ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->a5_algorithm,
-                  ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->dtx_allowed,
-                  ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->amr_configuration.noise_suppression_bit,
-                  ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->amr_configuration.initial_codec_mode_indicator,
-                  ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->amr_configuration.initial_codec_mode,
-                  ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->amr_configuration.active_codec_set,
-                  ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->amr_configuration.threshold[0],
-                  ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->amr_configuration.threshold[1],
-                  ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->amr_configuration.threshold[2],
-                  ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->amr_configuration.hysteresis[0],
-                  ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->amr_configuration.hysteresis[1],
-                  ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->amr_configuration.hysteresis[2]);
-        #else
-          vsi_o_event_ttrace("CAS_R %ld %d %d %d %d %d %d %d %d %d %ld %d %d %d %d",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->channel_desc_1.chan_sel.h,
-                  ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->channel_desc_1.chan_sel.rf_channel.single_rf.radio_freq,
-                  ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->channel_desc_1.channel_type,
-                  ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->channel_desc_1.subchannel,
-                  ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->channel_desc_1.timeslot_no,
-                  ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->channel_desc_1.tsc,
-                  ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->channel_mode_1,
-                  ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->txpwr,
-                  ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->frequency_list.rf_chan_cnt,
-                  l1a_decode_starting_time(((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->starting_time),
-                  ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->frequency_list_bef_sti.rf_chan_cnt,
-                  ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->cipher_mode,
-                  ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->a5_algorithm,
-                  ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->dtx_allowed);
-        #endif //(AMR == 1)
-
-#else
         #if (AMR == 1)
           sprintf(str,"\n\rCAS_R %ld %d %d %d %d %d %d %d %d %d %ld %d %d %d %d %1d %1d %1d %2x %2d %2d %2d %2d %2d %2d\n\r",
                   l1s.actual_time.fn_mod42432,
@@ -3495,20 +2690,14 @@
                   ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->dtx_allowed);
         #endif //(AMR == 1)
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case MPHC_CHANNEL_ASSIGN_CON:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("CAS_C %ld",
-                l1s.actual_time.fn_mod42432);
-#else
         sprintf(str,"CAS_C %ld\n\r",
                 l1s.actual_time.fn_mod42432);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -3516,17 +2705,6 @@
 
       case L1C_SACCH_INFO:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("SA_I  %ld %d %d (%d %d) %ld %d %d",
-                l1s.actual_time.fn_mod42432,
-                ((T_PH_DATA_IND *)(msg->SigP))->error_cause,
-                ((T_PH_DATA_IND *)(msg->SigP))->rf_chan_num,
-                l1a_l1s_com.Scell_info.traffic_meas_beacon.input_level,
-                l1a_l1s_com.Scell_info.traffic_meas.input_level,
-                l1s.tpu_offset,
-                l1s.afc,
-                trace_info.sacch_d_nerr);
-#else
      #if  FF_REPEATED_SACCH
         sprintf(str,"SA_I  %ld %d %d (%d %d) %ld %d %d %d %d %d %d %d\n\r",
      #else
@@ -3550,7 +2728,6 @@
 
                 );
         L1_send_trace_cpy(str);
-#endif
 #if (AUDIO_DEBUG == 1)
         {
 
@@ -3558,20 +2735,6 @@
           char str4[100];
           volatile UWORD16 *p_audio_debug_buffer;
           p_audio_debug_buffer = (UWORD16 *) (DSP_AUDIO_DEBUG_API_ADDR);
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("AU_DBG D %x %x %x %x %x %x %x %x %x %x %x %x M %x %x %x %x %x",
-                  p_audio_debug_buffer[0], p_audio_debug_buffer[1],
-                  p_audio_debug_buffer[2], p_audio_debug_buffer[3],
-                  p_audio_debug_buffer[4], p_audio_debug_buffer[5],
-                  p_audio_debug_buffer[6], p_audio_debug_buffer[7],
-                  p_audio_debug_buffer[8], p_audio_debug_buffer[9],
-                  p_audio_debug_buffer[10], p_audio_debug_buffer[11],
-                  trace_info.audio_debug_var.vocoder_enable_status,
-                  trace_info.audio_debug_var.ul_state,
-                  trace_info.audio_debug_var.dl_state,
-                  trace_info.audio_debug_var.ul_onoff_counter,
-                  trace_info.audio_debug_var.dl_onoff_counter);
-#else
           sprintf(str3,"AU_DBG D %x %x %x %x %x %x %x %x %x %x %x %x M %x %x %x %x %x\n\r",
                   p_audio_debug_buffer[0], p_audio_debug_buffer[1],
                   p_audio_debug_buffer[2], p_audio_debug_buffer[3],
@@ -3585,7 +2748,6 @@
                   trace_info.audio_debug_var.ul_onoff_counter,
                   trace_info.audio_debug_var.dl_onoff_counter);
           L1_send_trace_cpy(str3);
-#endif
           Trace_l1_audio_regs();
         }
 #endif
@@ -3596,18 +2758,6 @@
 
       case MPHC_CHANGE_FREQUENCY:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("FRQ_R %ld %d %d %d %d %d %d %d %ld",
-                l1s.actual_time.fn_mod42432,
-                ((T_MPHC_CHANGE_FREQUENCY *)(msg->SigP))->channel_desc.chan_sel.h,
-                ((T_MPHC_CHANGE_FREQUENCY *)(msg->SigP))->channel_desc.chan_sel.rf_channel.single_rf.radio_freq,
-                ((T_MPHC_CHANGE_FREQUENCY *)(msg->SigP))->channel_desc.channel_type,
-                ((T_MPHC_CHANGE_FREQUENCY *)(msg->SigP))->channel_desc.subchannel,
-                ((T_MPHC_CHANGE_FREQUENCY *)(msg->SigP))->channel_desc.timeslot_no,
-                ((T_MPHC_CHANGE_FREQUENCY *)(msg->SigP))->channel_desc.tsc,
-                ((T_MPHC_CHANGE_FREQUENCY *)(msg->SigP))->frequency_list.rf_chan_cnt,
-                l1a_decode_starting_time(((T_MPHC_CHANGE_FREQUENCY *)(msg->SigP))->starting_time));
-#else
         sprintf(str,"FRQ_R %ld %d %d %d %d %d %d %d %ld\n\r",
                 l1s.actual_time.fn_mod42432,
                 ((T_MPHC_CHANGE_FREQUENCY *)(msg->SigP))->channel_desc.chan_sel.h,
@@ -3619,48 +2769,19 @@
                 ((T_MPHC_CHANGE_FREQUENCY *)(msg->SigP))->frequency_list.rf_chan_cnt,
                 l1a_decode_starting_time(((T_MPHC_CHANGE_FREQUENCY *)(msg->SigP))->starting_time));
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case L1C_REDEF_DONE:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("FRQ_C %ld",
-                l1s.actual_time.fn_mod42432);
-#else
         sprintf(str,"FRQ_C %ld\n\r",
                 l1s.actual_time.fn_mod42432);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case MPHC_CHANNEL_MODE_MODIFY_REQ:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        #if (AMR == 1)
-        vsi_o_event_ttrace("MOD_R %ld %d %d %1d %1d %1d %2x %2d %2d %2d %2d %2d %2d",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_MPHC_CHANNEL_MODE_MODIFY_REQ *)(msg->SigP))->subchannel,
-                  ((T_MPHC_CHANNEL_MODE_MODIFY_REQ *)(msg->SigP))->channel_mode,
-                  ((T_MPHC_CHANNEL_MODE_MODIFY_REQ *)(msg->SigP))->amr_configuration.noise_suppression_bit,
-                  ((T_MPHC_CHANNEL_MODE_MODIFY_REQ *)(msg->SigP))->amr_configuration.initial_codec_mode_indicator,
-                  ((T_MPHC_CHANNEL_MODE_MODIFY_REQ *)(msg->SigP))->amr_configuration.initial_codec_mode,
-                  ((T_MPHC_CHANNEL_MODE_MODIFY_REQ *)(msg->SigP))->amr_configuration.active_codec_set,
-                  ((T_MPHC_CHANNEL_MODE_MODIFY_REQ *)(msg->SigP))->amr_configuration.threshold[0],
-                  ((T_MPHC_CHANNEL_MODE_MODIFY_REQ *)(msg->SigP))->amr_configuration.threshold[1],
-                  ((T_MPHC_CHANNEL_MODE_MODIFY_REQ *)(msg->SigP))->amr_configuration.threshold[2],
-                  ((T_MPHC_CHANNEL_MODE_MODIFY_REQ *)(msg->SigP))->amr_configuration.hysteresis[0],
-                  ((T_MPHC_CHANNEL_MODE_MODIFY_REQ *)(msg->SigP))->amr_configuration.hysteresis[1],
-                  ((T_MPHC_CHANNEL_MODE_MODIFY_REQ *)(msg->SigP))->amr_configuration.hysteresis[2]);
-        #else
-          vsi_o_event_ttrace("MOD_R %ld %d %d",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_MPHC_CHANNEL_MODE_MODIFY_REQ *)(msg->SigP))->subchannel,
-                  ((T_MPHC_CHANNEL_MODE_MODIFY_REQ *)(msg->SigP))->channel_mode);
-        #endif //(AMR == 1)
-#else
         #if (AMR == 1)
           sprintf(str,"MOD_R %ld %d %d %1d %1d %1d %2x %2d %2d %2d %2d %2d %2d\n\r",
                   l1s.actual_time.fn_mod42432,
@@ -3684,7 +2805,6 @@
         #endif //(AMR == 1)
 
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -3692,20 +2812,6 @@
 
       case MPHC_SET_CIPHERING_REQ:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("CIP_R %ld %d %d %d %d %d %d %d %d %d %d",
-                l1s.actual_time.fn_mod42432,
-                ((T_MPHC_SET_CIPHERING_REQ *)(msg->SigP))->cipher_mode,
-                ((T_MPHC_SET_CIPHERING_REQ *)(msg->SigP))->a5_algorithm,
-                ((T_MPHC_SET_CIPHERING_REQ *)(msg->SigP))->new_ciph_param.A[0],
-                ((T_MPHC_SET_CIPHERING_REQ *)(msg->SigP))->new_ciph_param.A[1],
-                ((T_MPHC_SET_CIPHERING_REQ *)(msg->SigP))->new_ciph_param.A[2],
-                ((T_MPHC_SET_CIPHERING_REQ *)(msg->SigP))->new_ciph_param.A[3],
-                ((T_MPHC_SET_CIPHERING_REQ *)(msg->SigP))->new_ciph_param.A[4],
-                ((T_MPHC_SET_CIPHERING_REQ *)(msg->SigP))->new_ciph_param.A[5],
-                ((T_MPHC_SET_CIPHERING_REQ *)(msg->SigP))->new_ciph_param.A[6],
-                ((T_MPHC_SET_CIPHERING_REQ *)(msg->SigP))->new_ciph_param.A[7]);
-#else
         sprintf(str,"CIP_R %ld %d %d %d %d %d %d %d %d %d %d\n\r",
                 l1s.actual_time.fn_mod42432,
                 ((T_MPHC_SET_CIPHERING_REQ *)(msg->SigP))->cipher_mode,
@@ -3719,7 +2825,6 @@
                 ((T_MPHC_SET_CIPHERING_REQ *)(msg->SigP))->new_ciph_param.A[6],
                 ((T_MPHC_SET_CIPHERING_REQ *)(msg->SigP))->new_ciph_param.A[7]);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -3752,10 +2857,6 @@
 #endif
 
       #endif/* FF_REPEATED_SACCH */
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("DDS_R  %ld",
-                l1s.actual_time.fn_mod42432);
-#else
 
 #if (FF_REPEATED_SACCH == 1) ||(FF_REPEATED_DL_FACCH == 1)
      //   sprintf(str,"DDS_R  %ld   (dl_good_norep : %u ) (x = frame errors :  %u ) (y = dl_count/2 =  %u) FER_S(%u) \n\r",
@@ -3773,20 +2874,14 @@
           sprintf(str,"DDS_R  %ld\n\r", l1s.actual_time.fn_mod42432);
 #endif/* FF_REPEATED_SACCH */
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case MPHC_STOP_DEDICATED_CON:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("DDS_C  %ld",
-                l1s.actual_time.fn_mod42432);
-#else
         sprintf(str,"DDS_C  %ld\n\r",
                 l1s.actual_time.fn_mod42432);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -3799,65 +2894,6 @@
       case MPHC_ASYNC_HO_REQ:
       {
         #define msg_aho ((T_MPHC_ASYNC_HO_REQ *)(msg->SigP))
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        #if (AMR == 1)
-          vsi_o_event_ttrace("AHO_R %ld %d %d %d %d %d %d %d %d %d %d %d %ld %d %d %d %d %d %d %ld %ld %1d %1d %1d %2x %2d %2d %2d %2d %2d %2d",
-                  l1s.actual_time.fn_mod42432,
-                  msg_aho->handover_command.cell_description.ncc,
-                  msg_aho->handover_command.cell_description.bcc,
-                  msg_aho->handover_command.cell_description.bcch_carrier,
-                  msg_aho->handover_command.channel_desc_1.chan_sel.h,
-                  msg_aho->handover_command.channel_desc_1.chan_sel.rf_channel.single_rf.radio_freq,
-                  msg_aho->handover_command.channel_desc_1.channel_type,
-                  msg_aho->handover_command.channel_desc_1.subchannel,
-                  msg_aho->handover_command.channel_desc_1.timeslot_no,
-                  msg_aho->handover_command.channel_desc_1.tsc,
-                  msg_aho->handover_command.channel_mode_1,
-                  msg_aho->handover_command.frequency_list.rf_chan_cnt,
-                  l1a_decode_starting_time(msg_aho->handover_command.starting_time),
-                  msg_aho->handover_command.ho_acc,
-                  msg_aho->handover_command.txpwr,
-                  msg_aho->handover_command.report_time_diff,
-                  msg_aho->handover_command.frequency_list_bef_sti.rf_chan_cnt,
-                  msg_aho->handover_command.cipher_mode,
-                  msg_aho->handover_command.a5_algorithm,
-                  msg_aho->fn_offset,
-                  msg_aho->time_alignmt,
-                  msg_aho->amr_configuration.noise_suppression_bit,
-                  msg_aho->amr_configuration.initial_codec_mode_indicator,
-                  msg_aho->amr_configuration.initial_codec_mode,
-                  msg_aho->amr_configuration.active_codec_set,
-                  msg_aho->amr_configuration.threshold[0],
-                  msg_aho->amr_configuration.threshold[1],
-                  msg_aho->amr_configuration.threshold[2],
-                  msg_aho->amr_configuration.hysteresis[0],
-                  msg_aho->amr_configuration.hysteresis[1],
-                  msg_aho->amr_configuration.hysteresis[2]);
-        #else
-          vsi_o_event_ttrace("AHO_R %ld %d %d %d %d %d %d %d %d %d %d %d %ld %d %d %d %d %d %d %ld %ld",
-                  l1s.actual_time.fn_mod42432,
-                  msg_aho->handover_command.cell_description.ncc,
-                  msg_aho->handover_command.cell_description.bcc,
-                  msg_aho->handover_command.cell_description.bcch_carrier,
-                  msg_aho->handover_command.channel_desc_1.chan_sel.h,
-                  msg_aho->handover_command.channel_desc_1.chan_sel.rf_channel.single_rf.radio_freq,
-                  msg_aho->handover_command.channel_desc_1.channel_type,
-                  msg_aho->handover_command.channel_desc_1.subchannel,
-                  msg_aho->handover_command.channel_desc_1.timeslot_no,
-                  msg_aho->handover_command.channel_desc_1.tsc,
-                  msg_aho->handover_command.channel_mode_1,
-                  msg_aho->handover_command.frequency_list.rf_chan_cnt,
-                  l1a_decode_starting_time(msg_aho->handover_command.starting_time),
-                  msg_aho->handover_command.ho_acc,
-                  msg_aho->handover_command.txpwr,
-                  msg_aho->handover_command.report_time_diff,
-                  msg_aho->handover_command.frequency_list_bef_sti.rf_chan_cnt,
-                  msg_aho->handover_command.cipher_mode,
-                  msg_aho->handover_command.a5_algorithm,
-                  msg_aho->fn_offset,
-                  msg_aho->time_alignmt);
-        #endif //(AMR == 1)
-#else
         #if (AMR == 1)
           sprintf(str,"AHO_R %ld %d %d %d %d %d %d %d %d %d %d %d %ld %d %d %d %d %d %d %ld %ld\n\r%1d %1d %1d %2x %2d %2d %2d %2d %2d %2d\n\r",
                   l1s.actual_time.fn_mod42432,
@@ -3891,11 +2927,11 @@
                   msg_aho->amr_configuration.hysteresis[0],
                   msg_aho->amr_configuration.hysteresis[1],
                   msg_aho->amr_configuration.hysteresis[2])
-        #if ((REL99 == 1) && (FF_BHO == 1))
+          #if ((REL99 == 1) && (FF_BHO == 1))
                  ,msg_aho->handover_type
-#endif
+          #endif
                  ;
-#else
+        #else
           sprintf(str,"AHO_R %ld %d %d %d %d %d %d %d %d %d %d %d %ld %d %d %d %d %d %d %ld %ld\n\r",
                   l1s.actual_time.fn_mod42432,
                   msg_aho->handover_command.cell_description.ncc,
@@ -3920,20 +2956,14 @@
                   msg_aho->time_alignmt);
         #endif //(AMR == 1)
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case MPHC_ASYNC_HO_CON:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("AHO_C %ld",
-                l1s.actual_time.fn_mod42432);
-#else
         sprintf(str,"AHO_C %ld\n\r",
                 l1s.actual_time.fn_mod42432);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -3944,66 +2974,6 @@
       case MPHC_PSEUDO_SYNC_HO_REQ:
       {
         #define msg_sho ((T_MPHC_SYNC_HO_REQ *)(msg->SigP))
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        #if (AMR == 1)
-          vsi_o_event_ttrace("SHO_R %ld %d %d %d %d %d %d %d %d %d %d %d %ld %d %d %d %d %d %d %ld %ld %1d %1d %1d %2x %2d %2d %2d %2d %2d %2d",
-                  l1s.actual_time.fn_mod42432,
-                  msg_sho->handover_command.cell_description.ncc,
-                  msg_sho->handover_command.cell_description.bcc,
-                  msg_sho->handover_command.cell_description.bcch_carrier,
-                  msg_sho->handover_command.channel_desc_1.chan_sel.h,
-                  msg_sho->handover_command.channel_desc_1.chan_sel.rf_channel.single_rf.radio_freq,
-                  msg_sho->handover_command.channel_desc_1.channel_type,
-                  msg_sho->handover_command.channel_desc_1.subchannel,
-                  msg_sho->handover_command.channel_desc_1.timeslot_no,
-                  msg_sho->handover_command.channel_desc_1.tsc,
-                  msg_sho->handover_command.channel_mode_1,
-                  msg_sho->handover_command.frequency_list.rf_chan_cnt,
-                  l1a_decode_starting_time(msg_sho->handover_command.starting_time),
-                  msg_sho->handover_command.ho_acc,
-                  msg_sho->handover_command.txpwr,
-                  msg_sho->handover_command.report_time_diff,
-                  msg_sho->handover_command.frequency_list_bef_sti.rf_chan_cnt,
-                  msg_sho->handover_command.cipher_mode,
-                  msg_sho->handover_command.a5_algorithm,
-                  msg_sho->fn_offset,
-                  msg_sho->time_alignmt,
-                  msg_sho->amr_configuration.noise_suppression_bit,
-                  msg_sho->amr_configuration.initial_codec_mode_indicator,
-                  msg_sho->amr_configuration.initial_codec_mode,
-                  msg_sho->amr_configuration.active_codec_set,
-                  msg_sho->amr_configuration.threshold[0],
-                  msg_sho->amr_configuration.threshold[1],
-                  msg_sho->amr_configuration.threshold[2],
-                  msg_sho->amr_configuration.hysteresis[0],
-                  msg_sho->amr_configuration.hysteresis[1],
-                  msg_sho->amr_configuration.hysteresis[2]);
-        #else
-          vsi_o_event_ttrace("SHO_R %ld %d %d %d %d %d %d %d %d %d %d %d %ld %d %d %d %d %d %d %ld %ld",
-                  l1s.actual_time.fn_mod42432,
-                  msg_sho->handover_command.cell_description.ncc,
-                  msg_sho->handover_command.cell_description.bcc,
-                  msg_sho->handover_command.cell_description.bcch_carrier,
-                  msg_sho->handover_command.channel_desc_1.chan_sel.h,
-                  msg_sho->handover_command.channel_desc_1.chan_sel.rf_channel.single_rf.radio_freq,
-                  msg_sho->handover_command.channel_desc_1.channel_type,
-                  msg_sho->handover_command.channel_desc_1.subchannel,
-                  msg_sho->handover_command.channel_desc_1.timeslot_no,
-                  msg_sho->handover_command.channel_desc_1.tsc,
-                  msg_sho->handover_command.channel_mode_1,
-                  msg_sho->handover_command.frequency_list.rf_chan_cnt,
-                  l1a_decode_starting_time(msg_sho->handover_command.starting_time),
-                  msg_sho->handover_command.ho_acc,
-                  msg_sho->handover_command.txpwr,
-                  msg_sho->handover_command.report_time_diff,
-                  msg_sho->handover_command.frequency_list_bef_sti.rf_chan_cnt,
-                  msg_sho->handover_command.cipher_mode,
-                  msg_sho->handover_command.a5_algorithm,
-                  msg_sho->fn_offset,
-                  msg_sho->time_alignmt);
-        #endif //(AMR == 1)
-
-#else
         #if (AMR == 1)
           sprintf(str,"SHO_R %ld %d %d %d %d %d %d %d %d %d %d %d %ld %d %d %d %d %d %d %ld %ld %1d\n\r%1d %1d %2x %2d %2d %2d %2d %2d %2d\n\r",
                   l1s.actual_time.fn_mod42432,
@@ -4037,11 +3007,11 @@
                   msg_sho->amr_configuration.hysteresis[0],
                   msg_sho->amr_configuration.hysteresis[1],
                   msg_sho->amr_configuration.hysteresis[2])
-        #if ((REL99 == 1) && (FF_BHO == 1))
+          #if ((REL99 == 1) && (FF_BHO == 1))
                  ,msg_aho->handover_type
-#endif
+          #endif
                   ;
-#else
+        #else
           sprintf(str,"SHO_R %ld %d %d %d %d %d %d %d %d %d %d %d %ld %d %d %d %d %d %d %ld %ld\n\r",
                   l1s.actual_time.fn_mod42432,
                   msg_sho->handover_command.cell_description.ncc,
@@ -4067,31 +3037,20 @@
         #endif //(AMR == 1)
 
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case MPHC_SYNC_HO_CON:
       case MPHC_PRE_SYNC_HO_CON:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("SHO_C %ld",
-                l1s.actual_time.fn_mod42432);
-#else
         sprintf(str,"SHO_C %ld\n\r",
                 l1s.actual_time.fn_mod42432);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case L1C_HANDOVER_FINISHED:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("HOF_I %ld %d",
-                l1s.actual_time.fn_mod42432,
-                ((T_MPHC_HANDOVER_FINISHED *)(msg->SigP))->cause);
-#else
 #if ((REL99 == 1) && (FF_BHO == 1))
         sprintf(str,"HOF_I %ld %d %ld %ld\n\r",
                 l1s.actual_time.fn_mod42432,
@@ -4102,22 +3061,16 @@
         sprintf(str,"HOF_I %ld %d\n\r",
                 l1s.actual_time.fn_mod42432,
                 ((T_MPHC_HANDOVER_FINISHED *)(msg->SigP))->cause);
-        L1_send_trace_cpy(str);
-#endif
-#endif
+#endif
+        L1_send_trace_cpy(str);
       }
       break;
 
       case MPHC_TA_FAIL_IND:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("TAF_I %ld",
-                l1s.actual_time.fn_mod42432);
-#else
         sprintf(str, "TAF_I %ld\n\r",
                 l1s.actual_time.fn_mod42432);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -4125,28 +3078,17 @@
 
       case MPHC_HANDOVER_FAIL_REQ:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("HOF_R %ld",
-                l1s.actual_time.fn_mod42432);
-#else
         sprintf(str,"HOF_R %ld\n\r",
                 l1s.actual_time.fn_mod42432);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case MPHC_HANDOVER_FAIL_CON:
       {
-
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("HOF_C %ld",
-                l1s.actual_time.fn_mod42432);
-#else
         sprintf(str,"HOF_C %ld\n\r",
                 l1s.actual_time.fn_mod42432);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -4160,17 +3102,10 @@
       {
         trace_info.rxlev_req_count ++;
 
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-		  vsi_o_event_ttrace("RXL_R %ld %d",
-                l1s.actual_time.fn_mod42432,
-                ((T_MPHC_RXLEV_REQ *)(msg->SigP))->power_array_size);
-
-#else
         sprintf(str,"RXL_R %ld %d\n\r",
                 l1s.actual_time.fn_mod42432,
                 ((T_MPHC_RXLEV_REQ *)(msg->SigP))->power_array_size);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -4178,15 +3113,9 @@
       {
         trace_info.rxlev_req_count = 0;
 
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-		  vsi_o_event_ttrace("RXL_S %ld",
-                l1s.actual_time.fn_mod42432);
-#else
         sprintf(str,"RXL_S %ld\n\r",
                 l1s.actual_time.fn_mod42432);
         L1_send_trace_cpy(str);
-#endif
-
       }
       break;
 
@@ -4194,20 +3123,11 @@
       {
         #define MAX_MEAS 10
 
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-		  vsi_o_event_ttrace("RXL_I %ld %d %d",
-                l1s.actual_time.fn_mod42432,
-                l1a_l1s_com.full_list_ptr->power_array_size,
-                trace_info.rxlev_req_count);
-
-#else
         sprintf(str,"RXL_I %ld %d %d\n\r",
                 l1s.actual_time.fn_mod42432,
                 l1a_l1s_com.full_list_ptr->power_array_size,
                 trace_info.rxlev_req_count);
-          L1_send_trace_cpy(str);
-#endif
-
+        L1_send_trace_cpy(str);
 
         // If it's the 5th MPHC_RXLEV_REQ message received from L3, trace accum_power_result
         if (trace_info.rxlev_req_count == 5)
@@ -4252,7 +3172,7 @@
 
           strcat(str,"\n\r");
 
-      } // End if "rxlev_req_count = 5"
+        } // End if "rxlev_req_count = 5"
 
         L1_send_trace_cpy(str);
       }
@@ -4262,64 +3182,25 @@
 
       case MPHC_RXLEV_PERIODIC_REQ:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("IBA_R %ld %d %d %d",
-                l1s.actual_time.fn_mod42432,
-                ((T_MPHC_RXLEV_PERIODIC_REQ *)(msg->SigP))->num_of_chans,
-                ((T_MPHC_RXLEV_PERIODIC_REQ *)(msg->SigP))->ba_id,
-                ((T_MPHC_RXLEV_PERIODIC_REQ *)(msg->SigP))->next_radio_freq_measured);
-#else
         sprintf(str,"IBA_R %ld %d %d %d\n\r",
                 l1s.actual_time.fn_mod42432,
                 ((T_MPHC_RXLEV_PERIODIC_REQ *)(msg->SigP))->num_of_chans,
                 ((T_MPHC_RXLEV_PERIODIC_REQ *)(msg->SigP))->ba_id,
                 ((T_MPHC_RXLEV_PERIODIC_REQ *)(msg->SigP))->next_radio_freq_measured);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case MPHC_STOP_RXLEV_PERIODIC_REQ:
       {
-
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("IBA_S %ld",
-                l1s.actual_time.fn_mod42432);
-#else
         sprintf(str,"IBA_S %ld\n\r",
                 l1s.actual_time.fn_mod42432);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case L1C_RXLEV_PERIODIC_DONE:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-vsi_o_event_ttrace("IBA_I %ld %d %d %d %d %d (%d %d)(%d %d)(%d %d)(%d %d)(%d %d)(%d %d)(%d %d)(%d %d)",
-                l1s.actual_time.fn_mod42432,
-                ((T_MPHC_RXLEV_PERIODIC_IND *)(msg->SigP))->ba_id,
-                ((T_MPHC_RXLEV_PERIODIC_IND *)(msg->SigP))->s_rxlev,
-                ((T_MPHC_RXLEV_PERIODIC_IND *)(msg->SigP))->qual_acc_idle,
-                ((T_MPHC_RXLEV_PERIODIC_IND *)(msg->SigP))->qual_nbr_meas_idle,
-                ((T_MPHC_RXLEV_PERIODIC_IND *)(msg->SigP))->nbr_of_carriers,
-                ((T_MPHC_RXLEV_PERIODIC_IND *)(msg->SigP))->A[0].radio_freq_no,
-                ((T_MPHC_RXLEV_PERIODIC_IND *)(msg->SigP))->A[0].rxlev,
-                ((T_MPHC_RXLEV_PERIODIC_IND *)(msg->SigP))->A[1].radio_freq_no,
-                ((T_MPHC_RXLEV_PERIODIC_IND *)(msg->SigP))->A[1].rxlev,
-                ((T_MPHC_RXLEV_PERIODIC_IND *)(msg->SigP))->A[2].radio_freq_no,
-                ((T_MPHC_RXLEV_PERIODIC_IND *)(msg->SigP))->A[2].rxlev,
-                ((T_MPHC_RXLEV_PERIODIC_IND *)(msg->SigP))->A[3].radio_freq_no,
-                ((T_MPHC_RXLEV_PERIODIC_IND *)(msg->SigP))->A[3].rxlev,
-                ((T_MPHC_RXLEV_PERIODIC_IND *)(msg->SigP))->A[4].radio_freq_no,
-                ((T_MPHC_RXLEV_PERIODIC_IND *)(msg->SigP))->A[4].rxlev,
-                ((T_MPHC_RXLEV_PERIODIC_IND *)(msg->SigP))->A[5].radio_freq_no,
-                ((T_MPHC_RXLEV_PERIODIC_IND *)(msg->SigP))->A[5].rxlev,
-                ((T_MPHC_RXLEV_PERIODIC_IND *)(msg->SigP))->A[6].radio_freq_no,
-                ((T_MPHC_RXLEV_PERIODIC_IND *)(msg->SigP))->A[6].rxlev,
-                ((T_MPHC_RXLEV_PERIODIC_IND *)(msg->SigP))->A[7].radio_freq_no,
-                ((T_MPHC_RXLEV_PERIODIC_IND *)(msg->SigP))->A[7].rxlev);
-#else
 sprintf(str,"IBA_I %ld %d %d (%d %d)(%d %d)(%d %d)(%d %d)(%d %d)(%d %d)(%d %d)(%d %d)\n\r",
                 l1s.actual_time.fn_mod42432,
                 ((T_MPHC_RXLEV_PERIODIC_IND *)(msg->SigP))->ba_id,
@@ -4341,102 +3222,13 @@
                 ((T_MPHC_RXLEV_PERIODIC_IND *)(msg->SigP))->A[7].radio_freq_no,
                 ((T_MPHC_RXLEV_PERIODIC_IND *)(msg->SigP))->A[7].rxlev);
         L1_send_trace_cpy(str);
-#endif
-      }
-      break;
-
+      }
+      break;
 
       // Dedicated mode BA list
 
       case MPHC_MEAS_REPORT:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-     #if REL99
-     #if FF_EMR
-        vsi_o_event_ttrace("DBA_I_1 %ld %d %d %d L(%d %d)(%d %d) Q(%d %d)(%d %d) EM(%d %d %ld %d %d %d %d) U%d D%d DF%d",
-                l1s.actual_time.fn_mod42432,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->meas_valid,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->txpwr_used,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->timing_advance,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->rxlev_full_acc,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->rxlev_full_nbr_meas,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->rxlev_sub_acc,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->rxlev_sub_nbr_meas,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->rxqual_full_acc_errors,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->rxqual_full_nbr_bits,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->rxqual_sub_acc_errors,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->rxqual_sub_nbr_bits,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->rxlev_val_acc,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->rxlev_val_nbr_meas,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->mean_bep_block_acc,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->cv_bep_block_acc,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->mean_bep_block_num,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->cv_bep_block_num,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->nbr_rcvd_blocks,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->facch_ul_count,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->facch_dl_count,
-                trace_info.facch_dl_fail_count_trace);
-
-        vsi_o_event_ttrace("DBA_I_2 (%d %d %d)(%d %d %d)(%d %d %d)(%d %d %d)(%d %d %d)(%d %d %d)",
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[0].bcch_freq,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[0].rxlev_acc,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[0].rxlev_nbr_meas,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[1].bcch_freq,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[1].rxlev_acc,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[1].rxlev_nbr_meas,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[2].bcch_freq,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[2].rxlev_acc,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[2].rxlev_nbr_meas,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[3].bcch_freq,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[3].rxlev_acc,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[3].rxlev_nbr_meas,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[4].bcch_freq,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[4].rxlev_acc,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[4].rxlev_nbr_meas,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[5].bcch_freq,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[5].rxlev_acc,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[5].rxlev_nbr_meas);
-
-	 #endif
-	 #else
-        vsi_o_event_ttrace("DBA_I_1 %ld %d %d %d L(%d %d)(%d %d) Q(%d %d)(%d %d) U%d D%d DF%d",
-                l1s.actual_time.fn_mod42432,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->meas_valid,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->txpwr_used,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->timing_advance,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->rxlev_full_acc,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->rxlev_full_nbr_meas,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->rxlev_sub_acc,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->rxlev_sub_nbr_meas,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->rxqual_full_acc_errors,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->rxqual_full_nbr_bits,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->rxqual_sub_acc_errors,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->rxqual_sub_nbr_bits,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->facch_ul_count,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->facch_dl_count,
-                trace_info.facch_dl_fail_count_trace);
-
-        vsi_o_event_ttrace("DBA_I_2 (%d %d %d)(%d %d %d)(%d %d %d)(%d %d %d)(%d %d %d)(%d %d %d)",
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[0].bcch_freq,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[0].rxlev_acc,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[0].rxlev_nbr_meas,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[1].bcch_freq,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[1].rxlev_acc,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[1].rxlev_nbr_meas,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[2].bcch_freq,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[2].rxlev_acc,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[2].rxlev_nbr_meas,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[3].bcch_freq,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[3].rxlev_acc,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[3].rxlev_nbr_meas,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[4].bcch_freq,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[4].rxlev_acc,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[4].rxlev_nbr_meas,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[5].bcch_freq,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[5].rxlev_acc,
-                ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[5].rxlev_nbr_meas);
-     #endif
-#else
      #if REL99
      #if FF_EMR
 	  #if (FF_REPEATED_DL_FACCH == 1 )
@@ -4535,7 +3327,6 @@
                 ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[5].rxlev_nbr_meas);
       #endif
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -4543,14 +3334,6 @@
 
       case MPHC_UPDATE_BA_LIST:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("BAU_R %ld %d %d %d %d",
-                l1s.actual_time.fn_mod42432,
-                ((T_MPHC_UPDATE_BA_LIST *)(msg->SigP))->num_of_chans,
-                ((T_MPHC_UPDATE_BA_LIST *)(msg->SigP))->pwrc,
-                ((T_MPHC_UPDATE_BA_LIST *)(msg->SigP))->dtx_allowed,
-                ((T_MPHC_UPDATE_BA_LIST *)(msg->SigP))->ba_id);
-#else
         sprintf(str,"BAU_R %ld %d %d %d %d\n\r",
                 l1s.actual_time.fn_mod42432,
                 ((T_MPHC_UPDATE_BA_LIST *)(msg->SigP))->num_of_chans,
@@ -4558,7 +3341,6 @@
                 ((T_MPHC_UPDATE_BA_LIST *)(msg->SigP))->dtx_allowed,
                 ((T_MPHC_UPDATE_BA_LIST *)(msg->SigP))->ba_id);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -4576,22 +3358,6 @@
 
       case MPHP_NCELL_PBCCH_REQ:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("PBN_R %ld %d %d %d %d %d %d %d %d %d %d %ld %ld",
-                l1s.actual_time.fn_mod42432,
-                ((T_MPHP_NCELL_PBCCH_REQ *)(msg->SigP))->bs_pbcch_blks,
-                ((T_MPHP_NCELL_PBCCH_REQ *)(msg->SigP))->pb,
-                ((T_MPHP_NCELL_PBCCH_REQ *)(msg->SigP))->psi1_repeat_period,
-                ((T_MPHP_NCELL_PBCCH_REQ *)(msg->SigP))->relative_position,
-                ((T_MPHP_NCELL_PBCCH_REQ *)(msg->SigP))->packet_chn_desc.chan_sel.h,
-                ((T_MPHP_NCELL_PBCCH_REQ *)(msg->SigP))->packet_chn_desc.chan_sel.rf_channel.single_rf.radio_freq,
-                ((T_MPHP_NCELL_PBCCH_REQ *)(msg->SigP))->packet_chn_desc.timeslot_no,
-                ((T_MPHP_NCELL_PBCCH_REQ *)(msg->SigP))->packet_chn_desc.tsc,
-                ((T_MPHP_NCELL_PBCCH_REQ *)(msg->SigP))->frequency_list.rf_chan_cnt,
-                ((T_MPHP_NCELL_PBCCH_REQ *)(msg->SigP))->bcch_carrier,
-                ((T_MPHP_NCELL_PBCCH_REQ *)(msg->SigP))->fn_offset,
-                ((T_MPHP_NCELL_PBCCH_REQ *)(msg->SigP))->time_alignment);
-#else
         sprintf(str,"PBN_R %ld %d %d %d %d %d %d %d %d %d %d %ld %ld\n\r",
                 l1s.actual_time.fn_mod42432,
                 ((T_MPHP_NCELL_PBCCH_REQ *)(msg->SigP))->bs_pbcch_blks,
@@ -4607,20 +3373,14 @@
                 ((T_MPHP_NCELL_PBCCH_REQ *)(msg->SigP))->fn_offset,
                 ((T_MPHP_NCELL_PBCCH_REQ *)(msg->SigP))->time_alignment);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case MPHP_NCELL_PBCCH_STOP_REQ:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("PBN_S %ld",
-                l1s.actual_time.fn_mod42432);
-#else
         sprintf(str,"PBN_S %ld\n\r",
                 l1s.actual_time.fn_mod42432);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -4631,22 +3391,6 @@
         operative_radio_freq = l1_multiband_radio_freq_convert_into_operative_radio_freq(((T_MPHP_DATA_IND *)(msg->SigP))->radio_freq);
 #endif
         
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("PBN_I %ld %d %d %d %d %ld %d",
-                ((T_MPHP_DATA_IND *)(msg->SigP))->fn % 42432,
-                ((T_MPHP_DATA_IND *)(msg->SigP))->error_flag,
-                ((T_MPHP_DATA_IND *)(msg->SigP))->radio_freq,
-                ((T_MPHP_DATA_IND *)(msg->SigP))->relative_position,
-#if(L1_FF_MULTIBAND == 0)
-                l1a_l1s_com.last_input_level[l1pa_l1ps_com.pbcchn.bcch_carrier -
-                                             l1_config.std.radio_freq_index_offset].input_level,
-#else
-                l1a_l1s_com.last_input_level[operative_radio_freq].input_level,
-#endif
-
-                l1s.tpu_offset,
-                l1s.afc);
-#else
         sprintf(str,"PBN_I %ld %d %d %d %d %ld %d\n\r",
                 ((T_MPHP_DATA_IND *)(msg->SigP))->fn % 42432,
                 ((T_MPHP_DATA_IND *)(msg->SigP))->error_flag,
@@ -4662,7 +3406,6 @@
                 l1s.tpu_offset,
                 l1s.afc);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -4674,22 +3417,6 @@
 
       case MPHP_START_PCCCH_REQ:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("PCC_R %ld %d %d %d %d %d %d %d %d %d %d %d %d",
-                l1s.actual_time.fn_mod42432,
-                ((T_MPHP_START_PCCCH_REQ *)(msg->SigP))->imsimod,
-                ((T_MPHP_START_PCCCH_REQ *)(msg->SigP))->kcn,
-                ((T_MPHP_START_PCCCH_REQ *)(msg->SigP))->split_pg_cycle,
-                ((T_MPHP_START_PCCCH_REQ *)(msg->SigP))->bs_pag_blks_res,
-                ((T_MPHP_START_PCCCH_REQ *)(msg->SigP))->bs_pbcch_blks,
-                ((T_MPHP_START_PCCCH_REQ *)(msg->SigP))->pb,
-                ((T_MPHP_START_PCCCH_REQ *)(msg->SigP))->page_mode,
-                ((T_MPHP_START_PCCCH_REQ *)(msg->SigP))->packet_chn_desc.chan_sel.h,
-                ((T_MPHP_START_PCCCH_REQ *)(msg->SigP))->packet_chn_desc.chan_sel.rf_channel.single_rf.radio_freq,
-                ((T_MPHP_START_PCCCH_REQ *)(msg->SigP))->packet_chn_desc.timeslot_no,
-                ((T_MPHP_START_PCCCH_REQ *)(msg->SigP))->packet_chn_desc.tsc,
-                ((T_MPHP_START_PCCCH_REQ *)(msg->SigP))->frequency_list.rf_chan_cnt);
-#else
         sprintf(str,"PCC_R %ld %d %d %d %d %d %d %d %d %d %d %d %d\n\r",
                 l1s.actual_time.fn_mod42432,
                 ((T_MPHP_START_PCCCH_REQ *)(msg->SigP))->imsimod,
@@ -4705,43 +3432,19 @@
                 ((T_MPHP_START_PCCCH_REQ *)(msg->SigP))->packet_chn_desc.tsc,
                 ((T_MPHP_START_PCCCH_REQ *)(msg->SigP))->frequency_list.rf_chan_cnt);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case MPHP_STOP_PCCCH_REQ:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("PCC_S %ld",
-                l1s.actual_time.fn_mod42432);
-#else
         sprintf(str,"PCC_S %ld\n\r",
                 l1s.actual_time.fn_mod42432);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case L1P_PNP_INFO:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-#if (FF_L1_FAST_DECODING == 1)
-        vsi_o_event_ttrace("PNP_I %ld %d %d %d %d %ld %d %d %c",
-#else
-        vsi_o_event_ttrace("PNP_I %ld %d %d %d %d %ld %d %c",
-#endif
-                ((T_MPHP_DATA_IND *)(msg->SigP))->fn % 42432,
-                ((T_MPHP_DATA_IND *)(msg->SigP))->error_flag,
-                ((T_MPHP_DATA_IND *)(msg->SigP))->radio_freq,
-                ((T_MPHP_DATA_IND *)(msg->SigP))->relative_position,
-                l1a_l1s_com.Scell_IL_for_rxlev,
-                l1s.tpu_offset,
-                l1s.afc,
-#if (FF_L1_FAST_DECODING == 1)
-                l1a_l1s_com.last_fast_decoding,
-#endif
-                trace_info.l1_memorize_error);
-#else
 #if (FF_L1_FAST_DECODING == 1)
         sprintf(str,"PNP_I %ld %d %d %d %d %ld %d %d %c\n\r",
 #else
@@ -4759,22 +3462,11 @@
 #endif
                 trace_info.l1_memorize_error);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case L1P_PEP_INFO:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("PEP_I %ld %d %d %d %d %ld %d",
-                ((T_MPHP_DATA_IND *)(msg->SigP))->fn % 42432,
-                ((T_MPHP_DATA_IND *)(msg->SigP))->error_flag,
-                ((T_MPHP_DATA_IND *)(msg->SigP))->radio_freq,
-                ((T_MPHP_DATA_IND *)(msg->SigP))->relative_position,
-                l1a_l1s_com.Scell_IL_for_rxlev,
-                l1s.tpu_offset,
-                l1s.afc);
-#else
         sprintf(str,"PEP_I %ld %d %d %d %d %ld %d\n\r",
                 ((T_MPHP_DATA_IND *)(msg->SigP))->fn % 42432,
                 ((T_MPHP_DATA_IND *)(msg->SigP))->error_flag,
@@ -4784,22 +3476,11 @@
                 l1s.tpu_offset,
                 l1s.afc);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case L1P_PALLC_INFO:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("PCC_I %ld %d %d %d %d %ld %d",
-                ((T_MPHP_DATA_IND *)(msg->SigP))->fn % 42432,
-                ((T_MPHP_DATA_IND *)(msg->SigP))->error_flag,
-                ((T_MPHP_DATA_IND *)(msg->SigP))->radio_freq,
-                ((T_MPHP_DATA_IND *)(msg->SigP))->relative_position,
-                l1a_l1s_com.Scell_IL_for_rxlev,
-                l1s.tpu_offset,
-                l1s.afc);
-#else
         sprintf(str,"PCC_I %ld %d %d %d %d %ld %d\n\r",
                 ((T_MPHP_DATA_IND *)(msg->SigP))->fn % 42432,
                 ((T_MPHP_DATA_IND *)(msg->SigP))->error_flag,
@@ -4809,7 +3490,6 @@
                 l1s.tpu_offset,
                 l1s.afc);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -4845,29 +3525,14 @@
 
       case MPHP_SCELL_PBCCH_STOP_REQ:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("PBS_S %ld",
-                l1s.actual_time.fn_mod42432);
-#else
         sprintf(str,"PBS_S %ld\n\r",
                 l1s.actual_time.fn_mod42432);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case L1P_PBCCHS_INFO:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("PBS_I %ld %d %d %d %d %ld %d",
-                ((T_MPHP_DATA_IND *)(msg->SigP))->fn % 42432,
-                ((T_MPHP_DATA_IND *)(msg->SigP))->error_flag,
-                ((T_MPHP_DATA_IND *)(msg->SigP))->radio_freq,
-                ((T_MPHP_DATA_IND *)(msg->SigP))->relative_position,
-                l1a_l1s_com.Scell_IL_for_rxlev,
-                l1s.tpu_offset,
-                l1s.afc);
-#else
         sprintf(str,"PBS_I %ld %d %d %d %d %ld %d\n\r",
                 ((T_MPHP_DATA_IND *)(msg->SigP))->fn % 42432,
                 ((T_MPHP_DATA_IND *)(msg->SigP))->error_flag,
@@ -4877,7 +3542,6 @@
                 l1s.tpu_offset,
                 l1s.afc);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -4889,15 +3553,6 @@
 
       case MPHP_RA_REQ:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("PRA_R %ld %d %d %d %d %d",
-                l1s.actual_time.fn_mod42432,
-                ((T_MPHP_RA_REQ *)(msg->SigP))->txpwr,
-                ((T_MPHP_RA_REQ *)(msg->SigP))->rand,
-                ((T_MPHP_RA_REQ *)(msg->SigP))->channel_request_data,
-                ((T_MPHP_RA_REQ *)(msg->SigP))->bs_prach_blks,
-                ((T_MPHP_RA_REQ *)(msg->SigP))->access_burst_type);
-#else
         sprintf(str,"PRA_R %ld %d %d %d %d %d\n\r",
                 l1s.actual_time.fn_mod42432,
                 ((T_MPHP_RA_REQ *)(msg->SigP))->txpwr,
@@ -4906,35 +3561,23 @@
                 ((T_MPHP_RA_REQ *)(msg->SigP))->bs_prach_blks,
                 ((T_MPHP_RA_REQ *)(msg->SigP))->access_burst_type);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case MPHP_RA_STOP_REQ:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("PRA_S %ld",
-                l1s.actual_time.fn_mod42432);
-#else
         sprintf(str,"PRA_S %ld\n\r",
                 l1s.actual_time.fn_mod42432);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case L1P_RA_DONE:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("PRA_C %ld %d",
-                ((T_MPHP_RA_CON *)(msg->SigP))->fn % 42432,
-                ((T_MPHP_RA_CON *)(msg->SigP))->channel_request_data);
-#else
         sprintf(str,"PRA_C %ld %d\n\r",
                 ((T_MPHP_RA_CON *)(msg->SigP))->fn % 42432,
                 ((T_MPHP_RA_CON *)(msg->SigP))->channel_request_data);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -4949,24 +3592,6 @@
         else
           sti = (WORD32) ((T_MPHP_SINGLE_BLOCK_REQ *)(msg->SigP))->tbf_sti.absolute_fn;
 
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("BLK_R %ld %d %d %d %d %d (%d %d %d) %d %d %d %d %ld %d",
-                l1s.actual_time.fn_mod42432,
-                ((T_MPHP_SINGLE_BLOCK_REQ *)(msg->SigP))->assignment_id,
-                ((T_MPHP_SINGLE_BLOCK_REQ *)(msg->SigP))->purpose,
-                ((T_MPHP_SINGLE_BLOCK_REQ *)(msg->SigP))->pc_meas_chan,
-                ((T_MPHP_SINGLE_BLOCK_REQ *)(msg->SigP))->access_burst_type,
-                ((T_MPHP_SINGLE_BLOCK_REQ *)(msg->SigP))->packet_ta.ta,
-                ((T_MPHP_SINGLE_BLOCK_REQ *)(msg->SigP))->dl_pwr_ctl.p0,
-                ((T_MPHP_SINGLE_BLOCK_REQ *)(msg->SigP))->dl_pwr_ctl.bts_pwr_ctl_mode,
-                ((T_MPHP_SINGLE_BLOCK_REQ *)(msg->SigP))->dl_pwr_ctl.pr_mode,
-                ((T_MPHP_SINGLE_BLOCK_REQ *)(msg->SigP))->tsc,
-                ((T_MPHP_SINGLE_BLOCK_REQ *)(msg->SigP))->freq_param.chan_sel.h,
-                ((T_MPHP_SINGLE_BLOCK_REQ *)(msg->SigP))->freq_param.chan_sel.rf_channel.single_rf.radio_freq,
-                ((T_MPHP_SINGLE_BLOCK_REQ *)(msg->SigP))->freq_param.freq_list.rf_chan_cnt,
-                sti,
-                ((T_MPHP_SINGLE_BLOCK_REQ *)(msg->SigP))->timeslot_number);
-#else
         sprintf(str,"BLK_R %ld %d %d %d %d %d (%d %d %d) %d %d %d %d %ld %d\n\r",
                 l1s.actual_time.fn_mod42432,
                 ((T_MPHP_SINGLE_BLOCK_REQ *)(msg->SigP))->assignment_id,
@@ -4983,36 +3608,20 @@
                 ((T_MPHP_SINGLE_BLOCK_REQ *)(msg->SigP))->freq_param.freq_list.rf_chan_cnt,
                 sti,
                 ((T_MPHP_SINGLE_BLOCK_REQ *)(msg->SigP))->timeslot_number);
-#endif
         L1_send_trace_cpy(str);
       }
       break;
 
       case MPHP_STOP_SINGLE_BLOCK_REQ:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("BLK_S %ld",
-                l1s.actual_time.fn_mod42432);
-#else
         sprintf(str,"BLK_S %ld\n\r",
                 l1s.actual_time.fn_mod42432);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case L1P_PACCH_INFO:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("BLK_I %ld %d %d %d %d %ld %d",
-                ((T_MPHP_DATA_IND *)(msg->SigP))->fn % 42432,
-                ((T_MPHP_DATA_IND *)(msg->SigP))->error_flag,
-                ((T_MPHP_DATA_IND *)(msg->SigP))->radio_freq,
-                ((T_MPHP_DATA_IND *)(msg->SigP))->relative_position,
-                l1a_l1s_com.Scell_IL_for_rxlev,
-                l1s.tpu_offset,
-                l1s.afc);
-#else
         sprintf(str,"BLK_I %ld %d %d %d %d %ld %d\n\r",
                 ((T_MPHP_DATA_IND *)(msg->SigP))->fn % 42432,
                 ((T_MPHP_DATA_IND *)(msg->SigP))->error_flag,
@@ -5022,24 +3631,11 @@
                 l1s.tpu_offset,
                 l1s.afc);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case L1P_SINGLE_BLOCK_CON:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("BLK_C %ld %d %d %d %d  %d %d %d %d",
-                l1s.actual_time.fn_mod42432,
-                ((T_MPHP_SINGLE_BLOCK_CON *)(msg->SigP))->assignment_id,
-                ((T_MPHP_SINGLE_BLOCK_CON *)(msg->SigP))->dl_error_flag,
-                ((T_MPHP_SINGLE_BLOCK_CON *)(msg->SigP))->purpose,
-                ((T_MPHP_SINGLE_BLOCK_CON *)(msg->SigP))->status,
-                l1pa_l1ps_com.transfer.dl_pwr_ctrl.txpwr[0],
-                l1pa_l1ps_com.transfer.dl_pwr_ctrl.txpwr[1],
-                l1pa_l1ps_com.transfer.dl_pwr_ctrl.txpwr[2],
-                l1pa_l1ps_com.transfer.dl_pwr_ctrl.txpwr[3]);
-#else
         sprintf(str,"BLK_C %ld %d %d %d %d  %d %d %d %d\n\r",
                 l1s.actual_time.fn_mod42432,
                 ((T_MPHP_SINGLE_BLOCK_CON *)(msg->SigP))->assignment_id,
@@ -5051,7 +3647,6 @@
                 l1pa_l1ps_com.transfer.dl_pwr_ctrl.txpwr[2],
                 l1pa_l1ps_com.transfer.dl_pwr_ctrl.txpwr[3]);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -5059,14 +3654,6 @@
 
       case MPHP_POLLING_RESPONSE_REQ:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("POL_R %ld %d %ld %d %d",
-                l1s.actual_time.fn_mod42432,
-                ((T_MPHP_POLLING_RESPONSE_REQ *)(msg->SigP))->pol_resp_type,
-                ((T_MPHP_POLLING_RESPONSE_REQ *)(msg->SigP))->fn,
-                ((T_MPHP_POLLING_RESPONSE_REQ *)(msg->SigP))->timing_advance,
-                ((T_MPHP_POLLING_RESPONSE_REQ *)(msg->SigP))->txpwr);
-#else
         sprintf(str,"POL_R %ld %d %ld %d %d\n\r",
                 l1s.actual_time.fn_mod42432,
                 ((T_MPHP_POLLING_RESPONSE_REQ *)(msg->SigP))->pol_resp_type,
@@ -5074,20 +3661,14 @@
                 ((T_MPHP_POLLING_RESPONSE_REQ *)(msg->SigP))->timing_advance,
                 ((T_MPHP_POLLING_RESPONSE_REQ *)(msg->SigP))->txpwr);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case L1P_POLL_DONE:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("POL_I %ld",
-                ((T_MPHP_POLLING_IND *)(msg->SigP))->fn % 42432);
-#else
         sprintf(str,"POL_I %ld\n\r",
                 ((T_MPHP_POLLING_IND *)(msg->SigP))->fn % 42432);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -5147,31 +3728,19 @@
 
       case MPHP_ASSIGNMENT_CON:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("TBF_C %ld %d",
-                l1s.actual_time.fn_mod42432,
-                l1a_l1s_com.dl_tn);
-#else
         sprintf(str,"TBF_C %ld %d\n\r",
                 l1s.actual_time.fn_mod42432,
                 l1a_l1s_com.dl_tn);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case MPHP_TBF_RELEASE_REQ:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("REL_R %ld %d",
-                l1s.actual_time.fn_mod42432,
-                ((T_MPHP_TBF_RELEASE_REQ *)(msg->SigP))->tbf_type);
-#else
         sprintf(str,"REL_R %ld %d\n\r",
                 l1s.actual_time.fn_mod42432,
                 ((T_MPHP_TBF_RELEASE_REQ *)(msg->SigP))->tbf_type);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -5180,20 +3749,12 @@
         if (((T_L1P_TBF_RELEASED *)(msg->SigP))->released_all == 1)
           trace_info.new_tcr_list = 0;
 
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("REL_C %ld %d %d %d",
-                l1s.actual_time.fn_mod42432,
-                ((T_L1P_TBF_RELEASED *)(msg->SigP))->released_all,
-                ((T_L1P_TBF_RELEASED *)(msg->SigP))->tbf_type,
-                l1a_l1s_com.dl_tn);
-#else
         sprintf(str,"REL_C %ld %d %d %d\n\r",
                 l1s.actual_time.fn_mod42432,
                 ((T_L1P_TBF_RELEASED *)(msg->SigP))->released_all,
                 ((T_L1P_TBF_RELEASED *)(msg->SigP))->tbf_type,
                 l1a_l1s_com.dl_tn);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -5201,35 +3762,21 @@
 
       case MPHP_PDCH_RELEASE_REQ:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("CHR_R %ld %d %x",
-                l1s.actual_time.fn_mod42432,
-                ((T_MPHP_PDCH_RELEASE_REQ *)(msg->SigP))->assignment_id,
-                ((T_MPHP_PDCH_RELEASE_REQ *)(msg->SigP))->timeslot_available);
-#else
         sprintf(str,"CHR_R %ld %d %x\n\r",
                 l1s.actual_time.fn_mod42432,
                 ((T_MPHP_PDCH_RELEASE_REQ *)(msg->SigP))->assignment_id,
                 ((T_MPHP_PDCH_RELEASE_REQ *)(msg->SigP))->timeslot_available);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case L1P_PDCH_RELEASED:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("CHR_C %ld %d %d",
-                l1s.actual_time.fn_mod42432,
-                ((T_MPHP_PDCH_RELEASE_CON *)(msg->SigP))->assignment_id,
-                l1a_l1s_com.dl_tn);
-#else
         sprintf(str,"CHR_C %ld %d %d\n\r",
                 l1s.actual_time.fn_mod42432,
                 ((T_MPHP_PDCH_RELEASE_CON *)(msg->SigP))->assignment_id,
                 l1a_l1s_com.dl_tn);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -5237,14 +3784,6 @@
 
       case MPHP_TIMING_ADVANCE_REQ:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("TAU_R %ld %d (%d %d %d)",
-                l1s.actual_time.fn_mod42432,
-                ((T_MPHP_TIMING_ADVANCE_REQ *)(msg->SigP))->assignment_id,
-                ((T_MPHP_TIMING_ADVANCE_REQ *)(msg->SigP))->packet_ta.ta,
-                ((T_MPHP_TIMING_ADVANCE_REQ *)(msg->SigP))->packet_ta.ta_index,
-                ((T_MPHP_TIMING_ADVANCE_REQ *)(msg->SigP))->packet_ta.ta_tn);
-#else
         sprintf(str,"TAU_R %ld %d (%d %d %d)\n\r",
                 l1s.actual_time.fn_mod42432,
                 ((T_MPHP_TIMING_ADVANCE_REQ *)(msg->SigP))->assignment_id,
@@ -5252,20 +3791,14 @@
                 ((T_MPHP_TIMING_ADVANCE_REQ *)(msg->SigP))->packet_ta.ta_index,
                 ((T_MPHP_TIMING_ADVANCE_REQ *)(msg->SigP))->packet_ta.ta_tn);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case L1P_TA_CONFIG_DONE:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("TAU_C %ld",
-                l1s.actual_time.fn_mod42432);
-#else
         sprintf(str,"TAU_C %ld\n\r",
                 l1s.actual_time.fn_mod42432);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -5273,18 +3806,11 @@
 
       case MPHP_UPDATE_PSI_PARAM_REQ:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("PSI_R %ld %d %d",
-                l1s.actual_time.fn_mod42432,
-                ((T_MPHP_UPDATE_PSI_PARAM_REQ *)(msg->SigP))->pb,
-                ((T_MPHP_UPDATE_PSI_PARAM_REQ *)(msg->SigP))->access_burst_type);
-#else
         sprintf(str,"PSI_R %ld %d %d\n\r",
                 l1s.actual_time.fn_mod42432,
                 ((T_MPHP_UPDATE_PSI_PARAM_REQ *)(msg->SigP))->pb,
                 ((T_MPHP_UPDATE_PSI_PARAM_REQ *)(msg->SigP))->access_burst_type);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -5298,35 +3824,21 @@
           sti = -1;
         else
           sti = (WORD32) ((T_MPHP_REPEAT_UL_FIXED_ALLOC_REQ *)(msg->SigP))->tbf_sti.absolute_fn;
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("REP_R %ld %d %x %ld",
-                l1s.actual_time.fn_mod42432,
-                ((T_MPHP_REPEAT_UL_FIXED_ALLOC_REQ *)(msg->SigP))->repeat_allocation,
-                ((T_MPHP_REPEAT_UL_FIXED_ALLOC_REQ *)(msg->SigP))->ts_override,
-                sti);
-#else
         sprintf(str,"REP_R %ld %d %x %ld\n\r",
                 l1s.actual_time.fn_mod42432,
                 ((T_MPHP_REPEAT_UL_FIXED_ALLOC_REQ *)(msg->SigP))->repeat_allocation,
                 ((T_MPHP_REPEAT_UL_FIXED_ALLOC_REQ *)(msg->SigP))->ts_override,
                 sti);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case L1P_REPEAT_ALLOC_DONE:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("REP_C %ld %d",
-                l1s.actual_time.fn_mod42432,
-                l1a_l1s_com.dl_tn);
-#else
         sprintf(str,"REP_C %ld %d\n\r",
                 l1s.actual_time.fn_mod42432,
                 l1a_l1s_com.dl_tn);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -5334,16 +3846,10 @@
 
       case L1P_ALLOC_EXHAUST_DONE:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("EXH_I %ld %d",
-                l1s.actual_time.fn_mod42432,
-                l1a_l1s_com.dl_tn);
-#else
         sprintf(str,"EXH_I %ld %d\n\r",
                 l1s.actual_time.fn_mod42432,
                 l1a_l1s_com.dl_tn);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -5355,32 +3861,19 @@
 
       case MPHP_CR_MEAS_REQ:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("CR_R  %ld %d %d",
-                l1s.actual_time.fn_mod42432,
-                ((T_MPHP_CR_MEAS_REQ *)(msg->SigP))->nb_carrier,
-                ((T_MPHP_CR_MEAS_REQ *)(msg->SigP))->list_id);
-#else
         sprintf(str,"CR_R  %ld %d %d\n\r",
                 l1s.actual_time.fn_mod42432,
                 ((T_MPHP_CR_MEAS_REQ *)(msg->SigP))->nb_carrier,
                 ((T_MPHP_CR_MEAS_REQ *)(msg->SigP))->list_id);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case MPHP_CR_MEAS_STOP_REQ:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("CR_S  %ld",
-                l1s.actual_time.fn_mod42432);
-#else
         sprintf(str,"CR_S  %ld\n\r",
                 l1s.actual_time.fn_mod42432);
         L1_send_trace_cpy(str);
-
-#endif
       }
       break;
 
@@ -5418,18 +3911,12 @@
       case MPHP_TCR_MEAS_REQ:
       {
         trace_info.new_tcr_list = 1;
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("TCR_R %ld %d %d",
-                l1s.actual_time.fn_mod42432,
-                ((T_MPHP_TCR_MEAS_REQ *)(msg->SigP))->nb_carrier,
-                ((T_MPHP_TCR_MEAS_REQ *)(msg->SigP))->list_id);
-#else
+
         sprintf(str,"TCR_R %ld %d %d\n\r",
                 l1s.actual_time.fn_mod42432,
                 ((T_MPHP_TCR_MEAS_REQ *)(msg->SigP))->nb_carrier,
                 ((T_MPHP_TCR_MEAS_REQ *)(msg->SigP))->list_id);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -5437,14 +3924,9 @@
       {
         trace_info.new_tcr_list = 0;
 
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("TCR_S %ld",
-                l1s.actual_time.fn_mod42432);
-#else
         sprintf(str,"TCR_S %ld\n\r",
                 l1s.actual_time.fn_mod42432);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -5502,15 +3984,6 @@
 
       case MPHP_INT_MEAS_REQ:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("ITM_R %ld %d %d %d %x %d",
-                l1s.actual_time.fn_mod42432,
-                ((T_MPHP_INT_MEAS_REQ *)(msg->SigP))->packet_intm_freq_param.chan_sel.h,
-                ((T_MPHP_INT_MEAS_REQ *)(msg->SigP))->packet_intm_freq_param.chan_sel.rf_channel.single_rf.radio_freq,
-                ((T_MPHP_INT_MEAS_REQ *)(msg->SigP))->packet_intm_freq_param.freq_list.rf_chan_cnt,
-                ((T_MPHP_INT_MEAS_REQ *)(msg->SigP))->tn,
-                ((T_MPHP_INT_MEAS_REQ *)(msg->SigP))->multislot_class);
-#else
         sprintf(str,"ITM_R %ld %d %d %d %x %d\n\r",
                 l1s.actual_time.fn_mod42432,
                 ((T_MPHP_INT_MEAS_REQ *)(msg->SigP))->packet_intm_freq_param.chan_sel.h,
@@ -5519,62 +3992,29 @@
                 ((T_MPHP_INT_MEAS_REQ *)(msg->SigP))->tn,
                 ((T_MPHP_INT_MEAS_REQ *)(msg->SigP))->multislot_class);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case MPHP_INT_MEAS_STOP_REQ:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("ITM_S %ld",
-                l1s.actual_time.fn_mod42432);
-#else
         sprintf(str,"ITM_S %ld\n\r",
                 l1s.actual_time.fn_mod42432);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case L1P_ITMEAS_IND:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("IT_I  %ld %d %x",
-                ((T_L1P_ITMEAS_IND *)(msg->SigP))->fn % 42432,
-                ((T_L1P_ITMEAS_IND *)(msg->SigP))->position,
-                ((T_L1P_ITMEAS_IND *)(msg->SigP))->meas_bitmap);
-#else
         sprintf(str,"IT_I  %ld %d %x\n\r",
                 ((T_L1P_ITMEAS_IND *)(msg->SigP))->fn % 42432,
                 ((T_L1P_ITMEAS_IND *)(msg->SigP))->position,
                 ((T_L1P_ITMEAS_IND *)(msg->SigP))->meas_bitmap);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case MPHP_INT_MEAS_IND:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("ITM_I %ld (%d %d %d %d %d %d %d %d)(%d %d %d %d %d %d %d %d)",
-                l1s.actual_time.fn_mod42432,
-                ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[0].rxlev[0],
-                ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[1].rxlev[0],
-                ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[2].rxlev[0],
-                ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[3].rxlev[0],
-                ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[4].rxlev[0],
-                ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[5].rxlev[0],
-                ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[6].rxlev[0],
-                ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[7].rxlev[0],
-                ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[0].rxlev[1],
-                ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[1].rxlev[1],
-                ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[2].rxlev[1],
-                ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[3].rxlev[1],
-                ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[4].rxlev[1],
-                ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[5].rxlev[1],
-                ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[6].rxlev[1],
-                ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[7].rxlev[1]);
-#else
         sprintf(str,"ITM_I %ld (%d %d %d %d %d %d %d %d)(%d %d %d %d %d %d %d %d)\n\r",
                 l1s.actual_time.fn_mod42432,
                 ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[0].rxlev[0],
@@ -5594,7 +4034,6 @@
                 ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[6].rxlev[1],
                 ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[7].rxlev[1]);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -5602,30 +4041,6 @@
 
       case MPHP_TINT_MEAS_IND:
       {
-
-
-
-
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("TIT_I %ld (%d %d %d %d %d %d %d %d)(%d %d %d %d %d %d %d %d)",
-                l1s.actual_time.fn_mod42432,
-                ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[0].rxlev[0],
-                ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[1].rxlev[0],
-                ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[2].rxlev[0],
-                ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[3].rxlev[0],
-                ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[4].rxlev[0],
-                ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[5].rxlev[0],
-                ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[6].rxlev[0],
-                ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[7].rxlev[0],
-                ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[0].rxlev[1],
-                ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[1].rxlev[1],
-                ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[2].rxlev[1],
-                ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[3].rxlev[1],
-                ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[4].rxlev[1],
-                ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[5].rxlev[1],
-                ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[6].rxlev[1],
-                ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[7].rxlev[1]);
-#else
         sprintf(str,"TIT_I %ld (%d %d %d %d %d %d %d %d)(%d %d %d %d %d %d %d %d)\n\r",
                 l1s.actual_time.fn_mod42432,
                 ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[0].rxlev[0],
@@ -5645,7 +4060,6 @@
                 ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[6].rxlev[1],
                 ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[7].rxlev[1]);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -5667,59 +4081,36 @@
         // Keybeep
         case MMI_KEYBEEP_START_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("KBP_R %ld %04lx %04lx %04lx",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_MMI_KEYBEEP_REQ *)(msg->SigP))->d_k_x1_kt0,
-                  ((T_MMI_KEYBEEP_REQ *)(msg->SigP))->d_k_x1_kt1,
-                  ((T_MMI_KEYBEEP_REQ *)(msg->SigP))->d_dur_kb);
-#else
           sprintf(str,"KBP_R %ld %04lx %04lx %04lx\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_MMI_KEYBEEP_REQ *)(msg->SigP))->d_k_x1_kt0,
                   ((T_MMI_KEYBEEP_REQ *)(msg->SigP))->d_k_x1_kt1,
                   ((T_MMI_KEYBEEP_REQ *)(msg->SigP))->d_dur_kb);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_KEYBEEP_START_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("KBP_C %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"KBP_C %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_KEYBEEP_STOP_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("KBP_S %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"KBP_S %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_KEYBEEP_STOP_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("KBP_E %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"KBP_E %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
       #endif // KEYBEEP
@@ -5728,23 +4119,6 @@
         // Tone
         case MMI_TONE_START_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("TON_R %ld %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_MMI_TONE_REQ *)(msg->SigP))->d_k_x1_t0,
-                  ((T_MMI_TONE_REQ *)(msg->SigP))->d_k_x1_t1,
-                  ((T_MMI_TONE_REQ *)(msg->SigP))->d_k_x1_t2,
-                  ((T_MMI_TONE_REQ *)(msg->SigP))->d_pe_rep,
-                  ((T_MMI_TONE_REQ *)(msg->SigP))->d_pe_off,
-                  ((T_MMI_TONE_REQ *)(msg->SigP))->d_se_off,
-                  ((T_MMI_TONE_REQ *)(msg->SigP))->d_bu_off,
-                  ((T_MMI_TONE_REQ *)(msg->SigP))->d_t0_on,
-                  ((T_MMI_TONE_REQ *)(msg->SigP))->d_t0_off,
-                  ((T_MMI_TONE_REQ *)(msg->SigP))->d_t1_on,
-                  ((T_MMI_TONE_REQ *)(msg->SigP))->d_t1_off,
-                  ((T_MMI_TONE_REQ *)(msg->SigP))->d_t2_on,
-                  ((T_MMI_TONE_REQ *)(msg->SigP))->d_t2_off);
-#else
           sprintf(str,"TON_R %ld %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_MMI_TONE_REQ *)(msg->SigP))->d_k_x1_t0,
@@ -5761,46 +4135,30 @@
                   ((T_MMI_TONE_REQ *)(msg->SigP))->d_t2_on,
                   ((T_MMI_TONE_REQ *)(msg->SigP))->d_t2_off);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_TONE_START_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("TON_C %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"TON_C %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
-        }
-       break;
+        }
+        break;
 
         case MMI_TONE_STOP_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("TON_S %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"TON_S %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_TONE_STOP_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("TON_E %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"TON_E %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
       #endif // TONE
@@ -5809,118 +4167,72 @@
         // Melody 0
         case MMI_MELODY0_START_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("ME0_R %ld %02lx %01lx %04lx",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_MMI_MELODY_REQ *)(msg->SigP))->session_id,
-                  ((T_MMI_MELODY_REQ *)(msg->SigP))->loopback,
-                  ((T_MMI_MELODY_REQ *)(msg->SigP))->oscillator_used_bitmap);
-#else
           sprintf(str,"ME0_R %ld %02lx %01lx %04lx \n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_MMI_MELODY_REQ *)(msg->SigP))->session_id,
                   ((T_MMI_MELODY_REQ *)(msg->SigP))->loopback,
                   ((T_MMI_MELODY_REQ *)(msg->SigP))->oscillator_used_bitmap);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_MELODY0_START_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("ME0_C %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"ME0_C %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_MELODY0_STOP_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("ME0_S %ld",
-                 l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"ME0_S %ld\n\r",
                  l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_MELODY0_STOP_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("ME0_E %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"ME0_E %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
               // Melody 1
         case MMI_MELODY1_START_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("ME1_R %ld %02lx %01lx %04lx",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_MMI_MELODY_REQ *)(msg->SigP))->session_id,
-                  ((T_MMI_MELODY_REQ *)(msg->SigP))->loopback,
-                  ((T_MMI_MELODY_REQ *)(msg->SigP))->oscillator_used_bitmap);
-#else
           sprintf(str,"ME1_R %ld %02lx %01lx %04lx \n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_MMI_MELODY_REQ *)(msg->SigP))->session_id,
                   ((T_MMI_MELODY_REQ *)(msg->SigP))->loopback,
                   ((T_MMI_MELODY_REQ *)(msg->SigP))->oscillator_used_bitmap);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_MELODY1_START_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("ME1_C %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"ME1_C %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_MELODY1_STOP_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("ME1_S %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"ME1_S %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_MELODY1_STOP_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("ME1_E %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"ME1_E %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
       #endif // MELODY_E1
@@ -5929,28 +4241,6 @@
         // Voice memo recording
         case MMI_VM_RECORD_START_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("VMR_R %ld %02lx %08lx %01lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_MMI_VM_RECORD_REQ *)(msg->SigP))->session_id,
-                  ((T_MMI_VM_RECORD_REQ *)(msg->SigP))->maximum_size,
-                  ((T_MMI_VM_RECORD_REQ *)(msg->SigP))->dtx_used,
-                  ((T_MMI_VM_RECORD_REQ *)(msg->SigP))->record_coeff_dl,
-                  ((T_MMI_VM_RECORD_REQ *)(msg->SigP))->record_coeff_ul,
-                  ((T_MMI_VM_RECORD_REQ *)(msg->SigP))->d_k_x1_t0,
-                  ((T_MMI_VM_RECORD_REQ *)(msg->SigP))->d_k_x1_t1,
-                  ((T_MMI_VM_RECORD_REQ *)(msg->SigP))->d_k_x1_t2,
-                  ((T_MMI_VM_RECORD_REQ *)(msg->SigP))->d_pe_rep,
-                  ((T_MMI_VM_RECORD_REQ *)(msg->SigP))->d_pe_off,
-                  ((T_MMI_VM_RECORD_REQ *)(msg->SigP))->d_se_off,
-                  ((T_MMI_VM_RECORD_REQ *)(msg->SigP))->d_bu_off,
-                  ((T_MMI_VM_RECORD_REQ *)(msg->SigP))->d_t0_on,
-                  ((T_MMI_VM_RECORD_REQ *)(msg->SigP))->d_t0_off,
-                  ((T_MMI_VM_RECORD_REQ *)(msg->SigP))->d_t1_on,
-                  ((T_MMI_VM_RECORD_REQ *)(msg->SigP))->d_t1_off,
-                  ((T_MMI_VM_RECORD_REQ *)(msg->SigP))->d_t2_on,
-                  ((T_MMI_VM_RECORD_REQ *)(msg->SigP))->d_t2_off);
-#else
           sprintf(str,"VMR_R %ld %02lx %08lx %01lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_MMI_VM_RECORD_REQ *)(msg->SigP))->session_id,
@@ -5972,101 +4262,64 @@
                   ((T_MMI_VM_RECORD_REQ *)(msg->SigP))->d_t2_on,
                   ((T_MMI_VM_RECORD_REQ *)(msg->SigP))->d_t2_off);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_VM_RECORD_START_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("VMR_C %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"VMR_C %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_VM_RECORD_STOP_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("VMR_S %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"VMR_S %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_VM_RECORD_STOP_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("VMR_E %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"VMR_E %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         // Voice memo playing
         case MMI_VM_PLAY_START_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("VMP_R %ld %02lx",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_MMI_VM_PLAY_REQ *)(msg->SigP))->session_id);
-#else
           sprintf(str,"VMP_R %ld %02lx\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_MMI_VM_PLAY_REQ *)(msg->SigP))->session_id);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_VM_PLAY_START_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("VMP_C %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"VMP_C %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_VM_PLAY_STOP_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("VMP_S %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"VMP_S %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_VM_PLAY_STOP_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("VMP_E %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"VMP_E %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
       #endif // VOICE_MEMO
@@ -6147,15 +4400,6 @@
         // Voice memo recording
         case MMI_VM_AMR_RECORD_START_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("VMAR_R %ld %02lx %08lx %01lx %04lx %02lx",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_MMI_VM_AMR_RECORD_REQ *)(msg->SigP))->session_id,
-                  ((T_MMI_VM_AMR_RECORD_REQ *)(msg->SigP))->maximum_size,
-                  ((T_MMI_VM_AMR_RECORD_REQ *)(msg->SigP))->dtx_used,
-                  ((T_MMI_VM_AMR_RECORD_REQ *)(msg->SigP))->record_coeff_ul,
-                  ((T_MMI_VM_AMR_RECORD_REQ *)(msg->SigP))->amr_vocoder);
-#else
           sprintf(str,"VMAR_R %ld %02lx %08lx %01lx %04lx %02lx\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_MMI_VM_AMR_RECORD_REQ *)(msg->SigP))->session_id,
@@ -6164,103 +4408,65 @@
                   ((T_MMI_VM_AMR_RECORD_REQ *)(msg->SigP))->record_coeff_ul,
                   ((T_MMI_VM_AMR_RECORD_REQ *)(msg->SigP))->amr_vocoder);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_VM_AMR_RECORD_START_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("VMAR_C %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"VMAR_C %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_VM_AMR_RECORD_STOP_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("VMAR_S %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"VMAR_S %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_VM_AMR_RECORD_STOP_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("VMAR_E %ld %08lx",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_MMI_VM_AMR_RECORD_CON *)(msg->SigP))->recorded_size);
-#else
           sprintf(str,"VMAR_E %ld %08lx\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_MMI_VM_AMR_RECORD_CON *)(msg->SigP))->recorded_size);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         // Voice memo playing
         case MMI_VM_AMR_PLAY_START_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("VMAP_R %ld %02lx",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_MMI_VM_AMR_PLAY_REQ *)(msg->SigP))->session_id);
-#else
           sprintf(str,"VMAP_R %ld %02lx\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_MMI_VM_AMR_PLAY_REQ *)(msg->SigP))->session_id);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_VM_AMR_PLAY_START_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("VMAP_C %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"VMAP_C %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_VM_AMR_PLAY_STOP_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("VMAP_S %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"VMAP_S %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_VM_AMR_PLAY_STOP_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("VMAP_E %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"VMAP_E %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
@@ -6272,58 +4478,36 @@
 // Voice memo playing
         case MMI_VM_AMR_PAUSE_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("VMAPP_R %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"VMAPP_R %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
-        }
-        break;
-
- case MMI_VM_AMR_PAUSE_CON:
-        {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("VMAPP_C %ld ",
-                  l1s.actual_time.fn_mod42432
-                 );
-#else
+        }
+        break;
+
+        case MMI_VM_AMR_PAUSE_CON:
+        {
           sprintf(str,"VMAPP_C %ld\n\r",
                   l1s.actual_time.fn_mod42432
                   );
           L1_send_trace_cpy(str);
-#endif
-        }
-        break;
-
- case MMI_VM_AMR_RESUME_REQ:
-        {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("VMAPR_R %ld ",
-                  l1s.actual_time.fn_mod42432
-                 );
-#else
+        }
+        break;
+
+        case MMI_VM_AMR_RESUME_REQ:
+        {
           sprintf(str,"VMAPR_R %ld \n\r",
                   l1s.actual_time.fn_mod42432
                );
           L1_send_trace_cpy(str);
-#endif
-        }
-        break;
- case MMI_VM_AMR_RESUME_CON:
-        {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("VMAPR_C %ld ",
-                  l1s.actual_time.fn_mod42432
-                  );
-#else
+        }
+        break;
+
+        case MMI_VM_AMR_RESUME_CON:
+        {
           sprintf(str,"VMAPR_C %ld \n\r",
                   l1s.actual_time.fn_mod42432
                   );
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 #endif	/* FreeCalypso */
@@ -6335,18 +4519,11 @@
           case L1_AUDIO_DRIVER_IND:
           {
 		  	#if 0
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-            vsi_o_event_ttrace("AUD_I %ld %02ld %08lx",
-                    l1s.actual_time.fn_mod42432,
-                    ((T_L1_AUDIO_DRIVER_IND *)(msg->SigP))->channel_id,
-                    ((T_L1_AUDIO_DRIVER_IND *)(msg->SigP))->p_buffer);
-#else
             sprintf(str,"AUD_I %ld %02ld %08lx\n\r",
                    (WORD32)  l1s.actual_time.fn_mod42432,
                  (WORD32)   ((T_L1_AUDIO_DRIVER_IND *)(msg->SigP))->channel_id,
                     (WORD32)((T_L1_AUDIO_DRIVER_IND *)(msg->SigP))->p_buffer);
             L1_send_trace_cpy(str);
-#endif             
           #endif  //endof aud_i
           }
           break;
@@ -6356,14 +4533,6 @@
       #if (SPEECH_RECO)
         case MMI_SR_ENROLL_START_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("SRE_R %ld %02ld %02ld %01ld %08lx",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_MMI_SR_ENROLL_REQ *)(msg->SigP))->database_id,
-                  ((T_MMI_SR_ENROLL_REQ *)(msg->SigP))->word_index,
-                  ((T_MMI_SR_ENROLL_REQ *)(msg->SigP))->speech,
-                  ((T_MMI_SR_ENROLL_REQ *)(msg->SigP))->speech_address);
-#else
           sprintf(str,"SRE_R %ld %02ld %02ld %01ld %08lx\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_MMI_SR_ENROLL_REQ *)(msg->SigP))->database_id,
@@ -6371,61 +4540,36 @@
                   ((T_MMI_SR_ENROLL_REQ *)(msg->SigP))->speech,
                   ((T_MMI_SR_ENROLL_REQ *)(msg->SigP))->speech_address);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_SR_ENROLL_STOP_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("SRE_S %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"SRE_S %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_SR_ENROLL_START_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("SRE_C %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"SRE_C %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_SR_ENROLL_STOP_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("SRE_E %ld %02ld",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_MMI_SR_ENROLL_STOP_CON *)(msg->SigP))->error_id);
-#else
           sprintf(str,"SRE_E %ld %02ld\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_MMI_SR_ENROLL_STOP_CON *)(msg->SigP))->error_id);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_SR_UPDATE_START_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("SRU_R %ld %02ld %02ld %01ld %08lx",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_MMI_SR_UPDATE_REQ *)(msg->SigP))->database_id,
-                  ((T_MMI_SR_UPDATE_REQ *)(msg->SigP))->word_index,
-                  ((T_MMI_SR_UPDATE_REQ *)(msg->SigP))->speech,
-                  ((T_MMI_SR_UPDATE_REQ *)(msg->SigP))->speech_address);
-#else
           sprintf(str,"SRU_R %ld %02ld %02ld %01ld %08lx\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_MMI_SR_UPDATE_REQ *)(msg->SigP))->database_id,
@@ -6433,112 +4577,62 @@
                   ((T_MMI_SR_UPDATE_REQ *)(msg->SigP))->speech,
                   ((T_MMI_SR_UPDATE_REQ *)(msg->SigP))->speech_address);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_SR_UPDATE_STOP_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("SRU_S %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"SRU_S %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_SR_UPDATE_START_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("SRU_C %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"SRU_C %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_SR_UPDATE_STOP_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("SRU_E %ld %02ld",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_MMI_SR_UPDATE_STOP_CON *)(msg->SigP))->error_id);
-#else
           sprintf(str,"SRU_E %ld %02ld\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_MMI_SR_UPDATE_STOP_CON *)(msg->SigP))->error_id);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_SR_RECO_START_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("SRR_R %ld %02ld %02ld",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_MMI_SR_RECO_REQ *)(msg->SigP))->database_id,
-                  ((T_MMI_SR_RECO_REQ *)(msg->SigP))->vocabulary_size);
-#else
           sprintf(str,"SRR_R %ld %02ld %02ld\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_MMI_SR_RECO_REQ *)(msg->SigP))->database_id,
                   ((T_MMI_SR_RECO_REQ *)(msg->SigP))->vocabulary_size);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_SR_RECO_STOP_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("SRR_S %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"SRR_S %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_SR_RECO_START_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("SRR_C %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"SRR_C %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_SR_RECO_STOP_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("SRR_E %ld %02ld %02ld %08lx %02ld %08lx %02ld %08lx %02ld %08lx %04lx %04lx %04lx",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_MMI_SR_RECO_STOP_CON *)(msg->SigP))->error_id,
-                  ((T_MMI_SR_RECO_STOP_CON *)(msg->SigP))->best_word_index,
-                  ((T_MMI_SR_RECO_STOP_CON *)(msg->SigP))->best_word_score,
-                  ((T_MMI_SR_RECO_STOP_CON *)(msg->SigP))->second_best_word_index,
-                  ((T_MMI_SR_RECO_STOP_CON *)(msg->SigP))->second_best_word_score,
-                  ((T_MMI_SR_RECO_STOP_CON *)(msg->SigP))->third_best_word_index,
-                  ((T_MMI_SR_RECO_STOP_CON *)(msg->SigP))->third_best_word_score,
-                  ((T_MMI_SR_RECO_STOP_CON *)(msg->SigP))->fourth_best_word_index,
-                  ((T_MMI_SR_RECO_STOP_CON *)(msg->SigP))->fourth_best_word_score,
-                  ((T_MMI_SR_RECO_STOP_CON *)(msg->SigP))->d_sr_db_level,
-                  ((T_MMI_SR_RECO_STOP_CON *)(msg->SigP))->d_sr_db_noise,
-                  ((T_MMI_SR_RECO_STOP_CON *)(msg->SigP))->d_sr_model_size);
-#else
           sprintf(str,"SRR_E %ld %02ld %02ld %08lx %02ld %08lx %02ld %08lx %02ld %08lx %04lx %04lx %04lx\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_MMI_SR_RECO_STOP_CON *)(msg->SigP))->error_id,
@@ -6554,22 +4648,11 @@
                   ((T_MMI_SR_RECO_STOP_CON *)(msg->SigP))->d_sr_db_noise,
                   ((T_MMI_SR_RECO_STOP_CON *)(msg->SigP))->d_sr_model_size);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_SR_UPDATE_CHECK_START_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("SRC_R %ld %02ld %02ld %02ld %08lx %01ld %08lx",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_MMI_SR_UPDATE_CHECK_REQ *)(msg->SigP))->database_id,
-                  ((T_MMI_SR_UPDATE_CHECK_REQ *)(msg->SigP))->word_index,
-                  ((T_MMI_SR_UPDATE_CHECK_REQ *)(msg->SigP))->vocabulary_size,
-                  ((T_MMI_SR_UPDATE_CHECK_REQ *)(msg->SigP))->model_address,
-                  ((T_MMI_SR_UPDATE_CHECK_REQ *)(msg->SigP))->speech,
-                  ((T_MMI_SR_UPDATE_CHECK_REQ *)(msg->SigP))->speech_address);
-#else
           sprintf(str,"SRC_R %ld %02ld %02ld %02ld %08lx %01ld %08lx\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_MMI_SR_UPDATE_CHECK_REQ *)(msg->SigP))->database_id,
@@ -6579,54 +4662,27 @@
                   ((T_MMI_SR_UPDATE_CHECK_REQ *)(msg->SigP))->speech,
                   ((T_MMI_SR_UPDATE_CHECK_REQ *)(msg->SigP))->speech_address);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_SR_UPDATE_CHECK_STOP_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("SRC_S %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"SRC_S %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_SR_UPDATE_CHECK_START_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("SRC_C %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"SRC_C %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_SR_UPDATE_CHECK_STOP_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("SRC_E %ld %02ld %02ld %08lx %02ld %08lx %02ld %08lx %02ld %08lx %04lx %04lx %04lx",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_MMI_SR_UPDATE_CHECK_STOP_CON *)(msg->SigP))->error_id,
-                  ((T_MMI_SR_UPDATE_CHECK_STOP_CON *)(msg->SigP))->best_word_index,
-                  ((T_MMI_SR_UPDATE_CHECK_STOP_CON *)(msg->SigP))->best_word_score,
-                  ((T_MMI_SR_UPDATE_CHECK_STOP_CON *)(msg->SigP))->second_best_word_index,
-                  ((T_MMI_SR_UPDATE_CHECK_STOP_CON *)(msg->SigP))->second_best_word_score,
-                  ((T_MMI_SR_UPDATE_CHECK_STOP_CON *)(msg->SigP))->third_best_word_index,
-                  ((T_MMI_SR_UPDATE_CHECK_STOP_CON *)(msg->SigP))->third_best_word_score,
-                  ((T_MMI_SR_UPDATE_CHECK_STOP_CON *)(msg->SigP))->fourth_best_word_index,
-                  ((T_MMI_SR_UPDATE_CHECK_STOP_CON *)(msg->SigP))->fourth_best_word_score,
-                  ((T_MMI_SR_UPDATE_CHECK_STOP_CON *)(msg->SigP))->d_sr_db_level,
-                  ((T_MMI_SR_UPDATE_CHECK_STOP_CON *)(msg->SigP))->d_sr_db_noise,
-                  ((T_MMI_SR_UPDATE_CHECK_STOP_CON *)(msg->SigP))->d_sr_model_size);
-#else
           sprintf(str,"SRC_E %ld %02ld %02ld %08lx %02ld %08lx %02ld %08lx %02ld %08lx %04lx %04lx %04lx\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_MMI_SR_UPDATE_CHECK_STOP_CON *)(msg->SigP))->error_id,
@@ -6642,24 +4698,11 @@
                   ((T_MMI_SR_UPDATE_CHECK_STOP_CON *)(msg->SigP))->d_sr_db_noise,
                   ((T_MMI_SR_UPDATE_CHECK_STOP_CON *)(msg->SigP))->d_sr_model_size);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case L1_SRBACK_SAVE_DATA_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("SRB_SR %ld %02ld %02ld %08lx %01ld %08lx %08lx %08lx %08lx",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_L1_SRBACK_SAVE_DATA_REQ *)(msg->SigP))->database_id,
-                  ((T_L1_SRBACK_SAVE_DATA_REQ *)(msg->SigP))->model_index,
-                  ((T_L1_SRBACK_SAVE_DATA_REQ *)(msg->SigP))->model_RAM_address,
-                  ((T_L1_SRBACK_SAVE_DATA_REQ *)(msg->SigP))->speech,
-                  ((T_L1_SRBACK_SAVE_DATA_REQ *)(msg->SigP))->start_buffer,
-                  ((T_L1_SRBACK_SAVE_DATA_REQ *)(msg->SigP))->stop_buffer,
-                  ((T_L1_SRBACK_SAVE_DATA_REQ *)(msg->SigP))->start_address,
-                  ((T_L1_SRBACK_SAVE_DATA_REQ *)(msg->SigP))->stop_address);
-#else
           sprintf(str,"SRB_SR %ld %02ld %02ld %08lx %01ld %08lx %08lx %08lx %08lx\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_L1_SRBACK_SAVE_DATA_REQ *)(msg->SigP))->database_id,
@@ -6671,33 +4714,19 @@
                   ((T_L1_SRBACK_SAVE_DATA_REQ *)(msg->SigP))->start_address,
                   ((T_L1_SRBACK_SAVE_DATA_REQ *)(msg->SigP))->stop_address);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case L1_SRBACK_SAVE_DATA_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("SRB_SC %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"SRB_SC %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case L1_SRBACK_LOAD_MODEL_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("SRB_LR %ld %02ld %02lx %04lx %01ld",
-                 l1s.actual_time.fn_mod42432,
-                  ((T_L1_SRBACK_LOAD_MODEL_REQ *)(msg->SigP))->database_id,
-                  ((T_L1_SRBACK_LOAD_MODEL_REQ *)(msg->SigP))->model_index,
-                  ((T_L1_SRBACK_LOAD_MODEL_REQ *)(msg->SigP))->model_RAM_address,
-                  ((T_L1_SRBACK_LOAD_MODEL_REQ *)(msg->SigP))->CTO_enable);
-#else
           sprintf(str,"SRB_LR %ld %02ld %02lx %04lx %01ld\n\r",
                  l1s.actual_time.fn_mod42432,
                   ((T_L1_SRBACK_LOAD_MODEL_REQ *)(msg->SigP))->database_id,
@@ -6705,64 +4734,39 @@
                   ((T_L1_SRBACK_LOAD_MODEL_REQ *)(msg->SigP))->model_RAM_address,
                   ((T_L1_SRBACK_LOAD_MODEL_REQ *)(msg->SigP))->CTO_enable);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case L1_SRBACK_LOAD_MODEL_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("SRB_LC %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"SRB_LC %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case L1_SRBACK_TEMP_SAVE_DATA_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("SRB_TR %ld %08lx %08lx",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_L1_SRBACK_TEMP_SAVE_DATA_REQ *)(msg->SigP))->model_RAM_address_input,
-                  ((T_L1_SRBACK_TEMP_SAVE_DATA_REQ *)(msg->SigP))->model_RAM_address_output);
-#else
           sprintf(str,"SRB_TR %ld %08lx %08lx\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_L1_SRBACK_TEMP_SAVE_DATA_REQ *)(msg->SigP))->model_RAM_address_input,
                   ((T_L1_SRBACK_TEMP_SAVE_DATA_REQ *)(msg->SigP))->model_RAM_address_output);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case L1_SRBACK_TEMP_SAVE_DATA_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("SRB_TC %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"SRB_TC %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
       #endif  // SPEECH_RECO
+
       #if (FIR)
         case MMI_AUDIO_FIR_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("FIR_R %ld %01lx %02ld %08lx %08lx",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_MMI_AUDIO_FIR_REQ *)(msg->SigP))->fir_loop,
-                  ((T_MMI_AUDIO_FIR_REQ *)(msg->SigP))->update_fir,
-                  ((T_MMI_AUDIO_FIR_REQ *)(msg->SigP))->fir_ul_coefficient,
-                  ((T_MMI_AUDIO_FIR_REQ *)(msg->SigP))->fir_dl_coefficient);
-#else
           sprintf(str,"FIR_R %ld %01lx %02ld %08lx %08lx\n\r",
                  (WORD32)  l1s.actual_time.fn_mod42432,
                  (WORD32)  ((T_MMI_AUDIO_FIR_REQ *)(msg->SigP))->fir_loop,
@@ -6771,45 +4775,21 @@
                   (WORD32) ((T_MMI_AUDIO_FIR_REQ *)(msg->SigP))->fir_dl_coefficient);
 
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_AUDIO_FIR_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("FIR_C %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"FIR_C %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
       #endif //FIR
+
       #if (L1_AEC == 1)
         case MMI_AEC_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        #if (L1_NEW_AEC)
-          vsi_o_event_ttrace("AEC_R %ld %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_MMI_AEC_REQ *)(msg->SigP))->aec_control,
-                  ((T_MMI_AEC_REQ *)(msg->SigP))->cont_filter,
-                  ((T_MMI_AEC_REQ *)(msg->SigP))->granularity_att,
-                  ((T_MMI_AEC_REQ *)(msg->SigP))->coef_smooth,
-                  ((T_MMI_AEC_REQ *)(msg->SigP))->es_level_max,
-                  ((T_MMI_AEC_REQ *)(msg->SigP))->fact_vad,
-                  ((T_MMI_AEC_REQ *)(msg->SigP))->thrs_abs,
-                  ((T_MMI_AEC_REQ *)(msg->SigP))->fact_asd_fil,
-                  ((T_MMI_AEC_REQ *)(msg->SigP))->fact_asd_mut);
-        #else
-          vsi_o_event_ttrace("AEC_R %ld %04lx",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_MMI_AEC_REQ *)(msg->SigP))->aec_control);
-        #endif //(L1_NEW_AEC)
-#else
         #if (L1_NEW_AEC)
           sprintf(str,"AEC_R %ld %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx\n\r",
                   l1s.actual_time.fn_mod42432,
@@ -6828,40 +4808,26 @@
                   ((T_MMI_AEC_REQ *)(msg->SigP))->aec_control);
         #endif //(L1_NEW_AEC)
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_AEC_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("AEC_C %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"AEC_C %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         #if (L1_NEW_AEC)
           case L1_AEC_IND:
           {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("AEC_I %ld %4.4x %8.8x %8.8x",
-                    l1s.actual_time.fn_mod42432,
-                    ((T_L1_AEC_IND *)(msg->SigP))->es_level,
-                    ((T_L1_AEC_IND *)(msg->SigP))->far_end_pow,
-                    ((T_L1_AEC_IND *)(msg->SigP))->far_end_noise);
-#else
             sprintf(str,"AEC_I %ld %4.4x %8.8x %8.8x\n\r",
                     l1s.actual_time.fn_mod42432,
                     ((T_L1_AEC_IND *)(msg->SigP))->es_level,
                     ((T_L1_AEC_IND *)(msg->SigP))->far_end_pow,
                     ((T_L1_AEC_IND *)(msg->SigP))->far_end_noise);
             L1_send_trace_cpy(str);
-#endif
           }
           break;
         #endif //(L1_NEW_AEC)
@@ -6870,29 +4836,18 @@
       #if (AUDIO_MODE)
         case MMI_AUDIO_MODE_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("AUM_R %ld %04lx",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_MMI_AUDIO_MODE *)(msg->SigP))->audio_mode);
-#else
           sprintf(str,"AUM_R %ld %04lx\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_MMI_AUDIO_MODE *)(msg->SigP))->audio_mode);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_AUDIO_MODE_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("AUM_C %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"AUM_C %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
       #endif // AUDIO_MODE
@@ -6901,133 +4856,75 @@
         // MMI command and request
         case MMI_MELODY0_E2_START_REQ :
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("E20_R %ld %02ld %02ld",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_MMI_MELODY_E2_REQ *)(msg->SigP))->session_id,
-                  ((T_MMI_MELODY_E2_REQ *)(msg->SigP))->loopback);
-#else
           sprintf(str,"E20_R %ld %02ld %02ld\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_MMI_MELODY_E2_REQ *)(msg->SigP))->session_id,
                   ((T_MMI_MELODY_E2_REQ *)(msg->SigP))->loopback);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_MELODY0_E2_STOP_REQ :
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("E20_S %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"E20_S %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_MELODY0_E2_START_CON :
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("E20_C %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"E20_C %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_MELODY0_E2_STOP_CON :
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("E20_E %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"E20_E %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_MELODY1_E2_START_REQ :
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("E21_R %ld %02ld %02ld",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_MMI_MELODY_E2_REQ *)(msg->SigP))->session_id,
-                  ((T_MMI_MELODY_E2_REQ *)(msg->SigP))->loopback);
-#else
           sprintf(str,"E21_R %ld %02ld %02ld\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_MMI_MELODY_E2_REQ *)(msg->SigP))->session_id,
                   ((T_MMI_MELODY_E2_REQ *)(msg->SigP))->loopback);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_MELODY1_E2_STOP_REQ :
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("E21_S %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"E21_S %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_MELODY1_E2_START_CON :
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("E21_C %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"E21_C %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_MELODY1_E2_STOP_CON :
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("E21_E %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"E21_E %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         // Audio download instrument message
         case L1_BACK_MELODY_E2_LOAD_INSTRUMENT_REQ :
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("E2B_L %ld %02ld %02ld %02ld %02ld %02ld %02ld %02ld %02ld %02ld %02ld",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_REQ *)(msg->SigP))->melody_id,
-                  ((T_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_REQ *)(msg->SigP))->number_of_instrument,
-                  ((T_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_REQ *)(msg->SigP))->waves_table_id[0],
-                  ((T_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_REQ *)(msg->SigP))->waves_table_id[1],
-                  ((T_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_REQ *)(msg->SigP))->waves_table_id[2],
-                  ((T_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_REQ *)(msg->SigP))->waves_table_id[3],
-                  ((T_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_REQ *)(msg->SigP))->waves_table_id[4],
-                  ((T_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_REQ *)(msg->SigP))->waves_table_id[5],
-                  ((T_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_REQ *)(msg->SigP))->waves_table_id[6],
-                  ((T_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_REQ *)(msg->SigP))->waves_table_id[7]);
-#else
           sprintf(str,"E2B_L %ld %02ld %02ld %02ld %02ld %02ld %02ld %02ld %02ld %02ld %02ld\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_REQ *)(msg->SigP))->melody_id,
@@ -7041,83 +4938,51 @@
                   ((T_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_REQ *)(msg->SigP))->waves_table_id[6],
                   ((T_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_REQ *)(msg->SigP))->waves_table_id[7]);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case L1_BACK_MELODY_E2_LOAD_INSTRUMENT_CON :
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("E2B_LC %ld %02ld",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_CON *)(msg->SigP))->melody_id);
-#else
           sprintf(str,"E2B_LC %ld %02ld\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_CON *)(msg->SigP))->melody_id);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case L1_BACK_MELODY_E2_UNLOAD_INSTRUMENT_REQ :
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("E2B_U %ld %02ld %02ld",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_L1_BACK_MELODY_E2_UNLOAD_INSTRUMENT_REQ *)(msg->SigP))->melody_id,
-                  ((T_L1_BACK_MELODY_E2_UNLOAD_INSTRUMENT_REQ *)(msg->SigP))->number_of_instrument);
-#else
           sprintf(str,"E2B_U %ld %02ld %02ld\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_L1_BACK_MELODY_E2_UNLOAD_INSTRUMENT_REQ *)(msg->SigP))->melody_id,
                   ((T_L1_BACK_MELODY_E2_UNLOAD_INSTRUMENT_REQ *)(msg->SigP))->number_of_instrument);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case L1_BACK_MELODY_E2_UNLOAD_INSTRUMENT_CON :
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("E2B_UC %ld %02ld",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_L1_BACK_MELODY_E2_UNLOAD_INSTRUMENT_CON *)(msg->SigP))->melody_id);
-
-#else
           sprintf(str,"E2B_UC %ld %02ld\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_L1_BACK_MELODY_E2_UNLOAD_INSTRUMENT_CON *)(msg->SigP))->melody_id);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         // L1S stop confirmation
         case L1_MELODY0_E2_STOP_CON :
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("E20_L1SC %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"E20_L1SC %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case L1_MELODY1_E2_STOP_CON :
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("E21_L1SC %ld",
-                  l1s.actual_time.fn_mod42432);
-
-#else
           sprintf(str,"E21_L1SC %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
@@ -7128,231 +4993,141 @@
         // MP3
         case MMI_MP3_START_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("MP3_R %ld %02ld %02ld",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_MMI_MP3_REQ *)(msg->SigP))->session_id,
-                  ((T_MMI_MP3_REQ *)(msg->SigP))->loopback);
-#else
           sprintf(str,"MP3_R %ld %02ld %02ld\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_MMI_MP3_REQ *)(msg->SigP))->session_id,
                   ((T_MMI_MP3_REQ *)(msg->SigP))->loopback);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_MP3_START_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("MP3_C %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"MP3_C %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_MP3_STOP_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("MP3_S %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"MP3_S %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_MP3_STOP_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("MP3_E %ld %d",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_L1A_MP3_CON *)(msg->SigP))->error_code);
-#else
           sprintf(str,"MP3_E %ld %d\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_L1A_MP3_CON *)(msg->SigP))->error_code);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_MP3_PAUSE_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("MP3_PAUSE_R %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"MP3_PAUSE_R %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_MP3_PAUSE_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("MP3_PAUSE_C %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"MP3_PAUSE_C %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_MP3_RESUME_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("MP3_RESUME_R %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"MP3_RESUME_R %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_MP3_RESUME_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("MP3_RESUME_C %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"MP3_RESUME_C %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_MP3_RESTART_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("MP3_RESTART_R %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"MP3_RESTART_R %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_MP3_RESTART_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("MP3_RESTART_C %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"MP3_RESTART_C %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case L1_MP3_ENABLE_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("MPS_C %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"MPS_C %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case L1_MP3_DISABLE_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("MPS_E %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"MPS_E %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
-
         }
         break;
 
         case API_MP3_START_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("MPA_C %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"MPA_C %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case API_MP3_STOP_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("MPA_E %ld %d",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_L1_API_MP3_STOP_CON *)(msg->SigP))->error_code);
-#else
           sprintf(str,"MPA_E %ld %d\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_L1_API_MP3_STOP_CON *)(msg->SigP))->error_code);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case API_MP3_PAUSE_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("MPA_PAUSE_C %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"MPA_PAUSE_C %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case API_MP3_RESUME_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("MPA_RESUME_C %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"MPA_RESUME_C %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case API_MP3_RESTART_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("MPA_RESTART_C %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"MPA_RESTART_C %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
       #endif // L1_MP3
@@ -7361,14 +5136,6 @@
         // AAC
         case MMI_AAC_START_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("AAC_R %ld %02ld %02ld %02ld %02ld",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_MMI_AAC_REQ *)(msg->SigP))->session_id,
-                  ((T_MMI_AAC_REQ *)(msg->SigP))->stereo,
-                  ((T_MMI_AAC_REQ *)(msg->SigP))->loopback,
-                  ((T_MMI_AAC_REQ *)(msg->SigP))->dma_channel_number);
-#else
           sprintf(str,"AAC_R %ld %02ld %02ld %02ld %02ld\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_MMI_AAC_REQ *)(msg->SigP))->session_id,
@@ -7376,154 +5143,93 @@
                   ((T_MMI_AAC_REQ *)(msg->SigP))->loopback,
                   ((T_MMI_AAC_REQ *)(msg->SigP))->dma_channel_number);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_AAC_START_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("AAC_C %ld %02ld",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_L1A_AAC_START_CON *)(msg->SigP))->aac_format);
-#else
           sprintf(str,"AAC_C %ld %02ld\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_L1A_AAC_START_CON *)(msg->SigP))->aac_format);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_AAC_STOP_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("AAC_S %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"AAC_S %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_AAC_STOP_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("AAC_E %ld %d",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_L1A_AAC_CON *)(msg->SigP))->error_code);
-#else
           sprintf(str,"AAC_E %ld %d\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_L1A_AAC_CON *)(msg->SigP))->error_code);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_AAC_PAUSE_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("AAC_PAUSE_R %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"AAC_PAUSE_R %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_AAC_PAUSE_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("AAC_PAUSE_C %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"AAC_PAUSE_C %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_AAC_RESUME_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("AAC_RESUME_R %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"AAC_RESUME_R %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_AAC_RESUME_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("AAC_RESUME_C %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"AAC_RESUME_C %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_AAC_RESTART_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("AAC_RESTART_R %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"AAC_RESTART_R %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_AAC_RESTART_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("AAC_RESTART_C %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"AAC_RESTART_C %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_AAC_INFO_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("AAC_INFO_R %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"AAC_INFO_R %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_AAC_INFO_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("AAC_INFO_C %ld %d %d %02ld %02ld",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_L1A_AAC_INFO_CON *)(msg->SigP))->bitrate,
-                  ((T_L1A_AAC_INFO_CON *)(msg->SigP))->frequency,
-                  ((T_L1A_AAC_INFO_CON *)(msg->SigP))->aac_format,
-                  ((T_L1A_AAC_INFO_CON *)(msg->SigP))->channel);
-#else
           sprintf(str,"AAC_INFO_C %ld %d %d %02ld %02ld\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_L1A_AAC_INFO_CON *)(msg->SigP))->bitrate,
@@ -7531,122 +5237,71 @@
                   ((T_L1A_AAC_INFO_CON *)(msg->SigP))->aac_format,
                   ((T_L1A_AAC_INFO_CON *)(msg->SigP))->channel);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case L1_AAC_ENABLE_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("AACS_C %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"AACS_C %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case L1_AAC_DISABLE_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("AACS_E %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"AACS_E %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
-
         }
         break;
 
         case API_AAC_START_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("AACA_C %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"AACA_C %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case API_AAC_STOP_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("AACA_E %ld %d",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_L1_API_AAC_STOP_CON *)(msg->SigP))->error_code);
-#else
           sprintf(str,"AACA_E %ld %d\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_L1_API_AAC_STOP_CON *)(msg->SigP))->error_code);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case API_AAC_PAUSE_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("AACA_PAUSE_C %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"AACA_PAUSE_C %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case API_AAC_RESUME_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("AACA_RESUME_C %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"AACA_RESUME_C %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case API_AAC_RESTART_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("AACA_RESTART_C %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"AACA_RESTART_C %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
       #endif // L1_AAC
+
       #if (L1_CPORT)
         //  Cport
         case MMI_CPORT_CONFIGURE_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("CPO_R %ld %04lx %04lx %02lx %02lx %02lx %02lx %02lx %02lx %04lx %04lx",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_MMI_CPORT_CONFIGURE_REQ *)(msg->SigP))->configuration,
-                  ((T_MMI_CPORT_CONFIGURE_REQ *)(msg->SigP))->ctrl,
-                  ((T_MMI_CPORT_CONFIGURE_REQ *)(msg->SigP))->cpcfr1,
-                  ((T_MMI_CPORT_CONFIGURE_REQ *)(msg->SigP))->cpcfr2,
-                  ((T_MMI_CPORT_CONFIGURE_REQ *)(msg->SigP))->cpcfr3,
-                  ((T_MMI_CPORT_CONFIGURE_REQ *)(msg->SigP))->cpcfr4,
-                  ((T_MMI_CPORT_CONFIGURE_REQ *)(msg->SigP))->cptctl,
-                  ((T_MMI_CPORT_CONFIGURE_REQ *)(msg->SigP))->cpttaddr,
-                  ((T_MMI_CPORT_CONFIGURE_REQ *)(msg->SigP))->cptdat,
-                  ((T_MMI_CPORT_CONFIGURE_REQ *)(msg->SigP))->cptvs);
-#else
           sprintf(str,"CPO_R %ld %04lx %04lx %02lx %02lx %02lx %02lx %02lx %02lx %04lx %04lx\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_MMI_CPORT_CONFIGURE_REQ *)(msg->SigP))->configuration,
@@ -7660,24 +5315,16 @@
                   ((T_MMI_CPORT_CONFIGURE_REQ *)(msg->SigP))->cptdat,
                   ((T_MMI_CPORT_CONFIGURE_REQ *)(msg->SigP))->cptvs);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_CPORT_CONFIGURE_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("CPO_C %ld %04lx %04lx",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_MMI_CPORT_CONFIGURE_CON *)(msg->SigP))->register_id,
-                  ((T_MMI_CPORT_CONFIGURE_CON *)(msg->SigP))->register_value);
-#else
           sprintf(str,"CPO_C %ld %04lx %04lx\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_MMI_CPORT_CONFIGURE_CON *)(msg->SigP))->register_id,
                   ((T_MMI_CPORT_CONFIGURE_CON *)(msg->SigP))->register_value);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
@@ -7687,18 +5334,6 @@
         //  External audio management
         case MMI_EXT_AUDIO_MGT_START_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("EAM_R %ld %02lx %02lx %02lx %02lx %04lx %08lx %02lx %02lx",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_MMI_EXT_AUDIO_MGT_START_REQ *)(msg->SigP))->sampling_frequency,
-                  ((T_MMI_EXT_AUDIO_MGT_START_REQ *)(msg->SigP))->DMA_channel_number,
-                  ((T_MMI_EXT_AUDIO_MGT_START_REQ *)(msg->SigP))->data_type,
-                  ((T_MMI_EXT_AUDIO_MGT_START_REQ *)(msg->SigP))->element_number,
-                  ((T_MMI_EXT_AUDIO_MGT_START_REQ *)(msg->SigP))->frame_number,
-                  ((T_MMI_EXT_AUDIO_MGT_START_REQ *)(msg->SigP))->source_buffer_address,
-                  ((T_MMI_EXT_AUDIO_MGT_START_REQ *)(msg->SigP))->mono_stereo,
-                  ((T_MMI_EXT_AUDIO_MGT_START_REQ *)(msg->SigP))->session_id);
-#else
           sprintf(str,"EAM_R %ld %02lx %02lx %02lx %02lx %04lx %08lx %02lx %02lx\n\r",
                   (WORD32) l1s.actual_time.fn_mod42432,
                  (WORD32)  ((T_MMI_EXT_AUDIO_MGT_START_REQ *)(msg->SigP))->sampling_frequency,
@@ -7711,50 +5346,33 @@
                  (WORD32)  ((T_MMI_EXT_AUDIO_MGT_START_REQ *)(msg->SigP))->session_id);
 rvt_send_trace_cpy ((T_RVT_BUFFER) str, trace_info.l1_trace_user_id, (T_RVT_MSG_LG)strlen(str), RVT_ASCII_FORMAT);
 //          L1_send_trace_cpy(str);  //omaps00090550
-#endif
         }
         break;
 
         case MMI_EXT_AUDIO_MGT_START_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("EAM_C %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"EAM_C %ld\n\r",
                   l1s.actual_time.fn_mod42432);
 rvt_send_trace_cpy ((T_RVT_BUFFER) str, trace_info.l1_trace_user_id, (T_RVT_MSG_LG)strlen(str), RVT_ASCII_FORMAT);
 //          L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_EXT_AUDIO_MGT_STOP_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("EAM_S %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"EAM_S %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_EXT_AUDIO_MGT_STOP_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("EAM_E %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"EAM_E %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
-        }
-        break;
-
+        }
+        break;
       #endif // L1_EXT_AUDIO_MGT
 
       #if TESTMODE
@@ -7763,20 +5381,6 @@
           //  Stereopath
           case TMODE_AUDIO_STEREOPATH_START_REQ:
           {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("STP_R %ld %02lx %02lx %02lx %02lx %02lx %02lx %04lx %04lx %02lx %02lx",
-                    l1s.actual_time.fn_mod42432,
-                    ((T_TMODE_AUDIO_STEREOPATH_START_REQ *)(msg->SigP))->configuration,
-                    ((T_TMODE_AUDIO_STEREOPATH_START_REQ *)(msg->SigP))->sampling_frequency,
-                    ((T_TMODE_AUDIO_STEREOPATH_START_REQ *)(msg->SigP))->DMA_allocation,
-                    ((T_TMODE_AUDIO_STEREOPATH_START_REQ *)(msg->SigP))->DMA_channel_number,
-                    ((T_TMODE_AUDIO_STEREOPATH_START_REQ *)(msg->SigP))->data_type,
-                    ((T_TMODE_AUDIO_STEREOPATH_START_REQ *)(msg->SigP))->source_port,
-                    ((T_TMODE_AUDIO_STEREOPATH_START_REQ *)(msg->SigP))->element_number,
-                    ((T_TMODE_AUDIO_STEREOPATH_START_REQ *)(msg->SigP))->frame_number,
-                    ((T_TMODE_AUDIO_STEREOPATH_START_REQ *)(msg->SigP))->mono_stereo,
-                    ((T_TMODE_AUDIO_STEREOPATH_START_REQ *)(msg->SigP))->pattern_identifier);
-#else
             sprintf(str,"STP_R %ld %02lx %02lx %02lx %02lx %02lx %02lx %04lx %04lx %02lx %02lx\n\r",
                     l1s.actual_time.fn_mod42432,
                     ((T_TMODE_AUDIO_STEREOPATH_START_REQ *)(msg->SigP))->configuration,
@@ -7790,47 +5394,27 @@
                     ((T_TMODE_AUDIO_STEREOPATH_START_REQ *)(msg->SigP))->mono_stereo,
                     ((T_TMODE_AUDIO_STEREOPATH_START_REQ *)(msg->SigP))->pattern_identifier);
             L1_send_trace_cpy(str);
-#endif
           }
           break;
 
           case TMODE_AUDIO_STEREOPATH_START_CON:
           {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("STP_C %ld",
-                    l1s.actual_time.fn_mod42432);
-#else
             sprintf(str,"STP_C %ld\n\r",
                     l1s.actual_time.fn_mod42432);
             L1_send_trace_cpy(str);
-#endif
           }
           break;
 
           case TMODE_AUDIO_STEREOPATH_STOP_REQ:
           {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("STP_S %ld",
-                    l1s.actual_time.fn_mod42432);
-#else
             sprintf(str,"STP_S %ld\n\r",
                     l1s.actual_time.fn_mod42432);
             L1_send_trace_cpy(str);
-#endif
           }
           break;
 
           case TMODE_AUDIO_STEREOPATH_STOP_CON:
           {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("STP_E %ld %04lx %04lx %04lx %04lx %04lx",
-                    l1s.actual_time.fn_mod42432,
-                    l1tm.stereopath.stereopath_source_timeout,
-                    l1tm.stereopath.stereopath_dest_timeout,
-                    l1tm.stereopath.stereopath_drop,
-                    l1tm.stereopath.stereopath_half_block,
-                    l1tm.stereopath.stereopath_block);
-#else
             sprintf(str,"STP_E %ld %04lx %04lx %04lx %04lx %04lx\n\r",
                     l1s.actual_time.fn_mod42432,
                     l1tm.stereopath.stereopath_source_timeout,
@@ -7839,7 +5423,6 @@
                     l1tm.stereopath.stereopath_half_block,
                     l1tm.stereopath.stereopath_block);
             L1_send_trace_cpy(str);
-#endif
           }
           break;
 
@@ -7851,16 +5434,6 @@
 
         case MMI_ANR_REQ:
         {
-
-		#if ( L1_COMPRESSED_TRACING == 1 )
-		vsi_o_event_ttrace("ANR_R %ld %d %04lx %d %d",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_MMI_ANR_REQ *)(msg->SigP))->anr_enable,
-                  ((T_MMI_ANR_REQ *)(msg->SigP))->min_gain,
-                  ((T_MMI_ANR_REQ *)(msg->SigP))->div_factor_shift,
-                  ((T_MMI_ANR_REQ *)(msg->SigP))->ns_level);
-
-		#else
           sprintf(str,"ANR_R %ld %d %04lx %d %d\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_MMI_ANR_REQ *)(msg->SigP))->anr_enable,
@@ -7868,23 +5441,14 @@
                   ((T_MMI_ANR_REQ *)(msg->SigP))->div_factor_shift,
                   ((T_MMI_ANR_REQ *)(msg->SigP))->ns_level);
           L1_send_trace_cpy(str);
-        #endif
         }
         break;
 
         case L1_ANR_CON:
         {
-
-		#if ( L1_COMPRESSED_TRACING == 1 )
-		  vsi_o_event_ttrace("ANR_C %ld",
-		                  l1s.actual_time.fn_mod42432);
-
-        #else
           sprintf(str,"ANR_C %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-        #endif
-
         }
         break;
 
@@ -7894,16 +5458,6 @@
 
         case MMI_AQI_ANR_REQ:
         {
-
-		#if( L1_COMPRESSED_TRACING == 1 )
-          vsi_o_event_ttrace("ANR_R %ld %d %d %d %d %d",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_MMI_AQI_ANR_REQ *)(msg->SigP))->anr_ul_control,
-                  ((T_MMI_AQI_ANR_REQ *)(msg->SigP))->parameters.control,
-                  ((T_MMI_AQI_ANR_REQ *)(msg->SigP))->parameters.ns_level,
-                  ((T_MMI_AQI_ANR_REQ *)(msg->SigP))->parameters.tone_ene_th,
-                  ((T_MMI_AQI_ANR_REQ *)(msg->SigP))->parameters.tone_cnt_th);
-		#else
           sprintf(str,"ANR_R %ld %d %d %d %d %d\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_MMI_AQI_ANR_REQ *)(msg->SigP))->anr_ul_control,
@@ -7912,52 +5466,24 @@
                   ((T_MMI_AQI_ANR_REQ *)(msg->SigP))->parameters.tone_ene_th,
                   ((T_MMI_AQI_ANR_REQ *)(msg->SigP))->parameters.tone_cnt_th);
           L1_send_trace_cpy(str);
-        #endif
         }
         break;
 
         case L1_AQI_ANR_CON:
         {
-		#if( L1_COMPRESSED_TRACING == 1 )
-		  vsi_o_event_ttrace("ANR_C %ld %d",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_L1_AQI_ANR_CON *)(msg->SigP))->anr_ul_action);
-		#else
           sprintf(str,"ANR_C %ld %d\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_L1_AQI_ANR_CON *)(msg->SigP))->anr_ul_action);
           L1_send_trace_cpy(str);
-        #endif
         }
         break;
 
       #endif // L1_ANR == 2
 
-#if(L1_AEC == 2)
+  #if(L1_AEC == 2)
 
         case MMI_AQI_AEC_REQ:
 	    {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("AEC_R %1d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d ",
-          l1s.actual_time.fn_mod42432,
-      	  ((T_MMI_AQI_AEC_REQ *)(msg->SigP))->aec_control,
-	      ((T_MMI_AQI_AEC_REQ *)(msg->SigP))->aec_parameters.aec_mode,
-	      ((T_MMI_AQI_AEC_REQ *)(msg->SigP))->aec_parameters.mu,
-	      ((T_MMI_AQI_AEC_REQ *)(msg->SigP))->aec_parameters.cont_filter,
-	      ((T_MMI_AQI_AEC_REQ *)(msg->SigP))->aec_parameters.scale_input_ul,
-	      ((T_MMI_AQI_AEC_REQ *)(msg->SigP))->aec_parameters.scale_input_dl,
-	      ((T_MMI_AQI_AEC_REQ *)(msg->SigP))->aec_parameters.div_dmax,
-	      ((T_MMI_AQI_AEC_REQ *)(msg->SigP))->aec_parameters.div_swap_good,
-	      ((T_MMI_AQI_AEC_REQ *)(msg->SigP))->aec_parameters.div_swap_bad,
-	      ((T_MMI_AQI_AEC_REQ *)(msg->SigP))->aec_parameters.block_init,
-	      ((T_MMI_AQI_AEC_REQ *)(msg->SigP))->aec_parameters.fact_vad,
-	      ((T_MMI_AQI_AEC_REQ *)(msg->SigP))->aec_parameters.fact_asd_fil,
-	      ((T_MMI_AQI_AEC_REQ *)(msg->SigP))->aec_parameters.fact_asd_mut,
-	      ((T_MMI_AQI_AEC_REQ *)(msg->SigP))->aec_parameters.thrs_abs,
-	      ((T_MMI_AQI_AEC_REQ *)(msg->SigP))->aec_parameters.es_level_max,
-	      ((T_MMI_AQI_AEC_REQ *)(msg->SigP))->aec_parameters.granularity_att,
-	      ((T_MMI_AQI_AEC_REQ *)(msg->SigP))->aec_parameters.coef_smooth );
-#else
 	       sprintf(str,"AEC_R %1d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d \n\r",
           l1s.actual_time.fn_mod42432,
       	  ((T_MMI_AQI_AEC_REQ *)(msg->SigP))->aec_control,
@@ -7979,45 +5505,23 @@
 	      ((T_MMI_AQI_AEC_REQ *)(msg->SigP))->aec_parameters.coef_smooth );
 
 	      L1_send_trace_cpy(str);
-#endif
 	     }
 	     break;
 
 	     case L1_AQI_AEC_CON:
 	     {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("AEC_C %ld %d ",
-	       l1s.actual_time.fn_mod42432,
-	       ((T_L1_AQI_AEC_CON*)(msg->SigP))->aec_action);
-#else
 	       sprintf(str,"AEC_C %ld %d \n\r",
 	       l1s.actual_time.fn_mod42432,
 	       ((T_L1_AQI_AEC_CON*)(msg->SigP))->aec_action);
 	       L1_send_trace_cpy(str);
-#endif
 	     }
 	     break;
-	     #endif
+  #endif
 
   #if (L1_IIR == 1)
 
         case MMI_IIR_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("IIR_R %ld %d %d %08lx %d %08lx %ld %ld %ld %ld %04lx %04lx",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_MMI_IIR_REQ *)(msg->SigP))->iir_enable,
-                  ((T_MMI_IIR_REQ *)(msg->SigP))->nb_iir_blocks,
-                  ((T_MMI_IIR_REQ *)(msg->SigP))->iir_coefs,
-                  ((T_MMI_IIR_REQ *)(msg->SigP))->nb_fir_coefs,
-                  ((T_MMI_IIR_REQ *)(msg->SigP))->fir_coefs,
-                  ((T_MMI_IIR_REQ *)(msg->SigP))->input_scaling,
-                  ((T_MMI_IIR_REQ *)(msg->SigP))->fir_scaling,
-                  ((T_MMI_IIR_REQ *)(msg->SigP))->input_gain_scaling,
-                  ((T_MMI_IIR_REQ *)(msg->SigP))->output_gain_scaling,
-                  ((T_MMI_IIR_REQ *)(msg->SigP))->output_gain,
-                  ((T_MMI_IIR_REQ *)(msg->SigP))->feedback);
-#else
           sprintf(str,"IIR_R %ld %d %d %08lx %d %08lx %ld %ld %ld %ld %04lx %04lx\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_MMI_IIR_REQ *)(msg->SigP))->iir_enable,
@@ -8032,20 +5536,14 @@
                   ((T_MMI_IIR_REQ *)(msg->SigP))->output_gain,
                   ((T_MMI_IIR_REQ *)(msg->SigP))->feedback);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case L1_IIR_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("IIR_C %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"IIR_C %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
@@ -8055,16 +5553,6 @@
 
         case MMI_AQI_WCM_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("WCM_R %ld %d %d %d %d %d %d",
-                  l1s.actual_time.fn_mod42432,
-		  ((T_MMI_AQI_WCM_REQ *)(msg->SigP))->wcm_control,
-                  ((T_MMI_AQI_WCM_REQ *)(msg->SigP))->parameters.mode,
-                  ((T_MMI_AQI_WCM_REQ *)(msg->SigP))->parameters.frame_size,
-				  ((T_MMI_AQI_WCM_REQ *)(msg->SigP))->parameters.num_sub_frames,
-                  ((T_MMI_AQI_WCM_REQ *)(msg->SigP))->parameters.ratio,
-                  ((T_MMI_AQI_WCM_REQ *)(msg->SigP))->parameters.threshold);
-#else
           sprintf(str,"WCM_R %ld %d %d %d %d %d %d\n\r",
                   l1s.actual_time.fn_mod42432,
 		  ((T_MMI_AQI_WCM_REQ *)(msg->SigP))->wcm_control,
@@ -8074,22 +5562,15 @@
                   ((T_MMI_AQI_WCM_REQ *)(msg->SigP))->parameters.ratio,
                   ((T_MMI_AQI_WCM_REQ *)(msg->SigP))->parameters.threshold);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case L1_AQI_WCM_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("WCM_C %ld  %d",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_L1_AQI_WCM_CON *)(msg->SigP))->wcm_action);
-#else
           sprintf(str,"WCM_C %ld  %d\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_L1_AQI_WCM_CON *)(msg->SigP))->wcm_action);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
@@ -8100,22 +5581,6 @@
 
         case MMI_AQI_AGC_UL_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("AGCU_R %1d %d %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx",
-                  l1s.actual_time.fn_mod42432,
-				  ((T_MMI_AQI_AGC_UL_REQ *)(msg->SigP))->agc_ul_control,
-                  ((T_MMI_AQI_AGC_UL_REQ *)(msg->SigP))->parameters.control,
-                  ((T_MMI_AQI_AGC_UL_REQ *)(msg->SigP))->parameters.frame_size,
-                  ((T_MMI_AQI_AGC_UL_REQ *)(msg->SigP))->parameters.targeted_level,
-                  ((T_MMI_AQI_AGC_UL_REQ *)(msg->SigP))->parameters.signal_up,
-                  ((T_MMI_AQI_AGC_UL_REQ *)(msg->SigP))->parameters.signal_down,
-                  ((T_MMI_AQI_AGC_UL_REQ *)(msg->SigP))->parameters.max_scale,
-                  ((T_MMI_AQI_AGC_UL_REQ *)(msg->SigP))->parameters.gain_smooth_alpha,
-                  ((T_MMI_AQI_AGC_UL_REQ *)(msg->SigP))->parameters.gain_smooth_alpha_fast,
-                  ((T_MMI_AQI_AGC_UL_REQ *)(msg->SigP))->parameters.gain_smooth_beta,
-                  ((T_MMI_AQI_AGC_UL_REQ *)(msg->SigP))->parameters.gain_smooth_beta_fast,
-                  ((T_MMI_AQI_AGC_UL_REQ *)(msg->SigP))->parameters.gain_intp_flag);
-#else
           sprintf(str,"AGCU_R %1d %d %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx\n\r",
                   l1s.actual_time.fn_mod42432,
 				  ((T_MMI_AQI_AGC_UL_REQ *)(msg->SigP))->agc_ul_control,
@@ -8131,22 +5596,15 @@
                   ((T_MMI_AQI_AGC_UL_REQ *)(msg->SigP))->parameters.gain_smooth_beta_fast,
                   ((T_MMI_AQI_AGC_UL_REQ *)(msg->SigP))->parameters.gain_intp_flag);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case L1_AQI_AGC_UL_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("AGCU_C %ld  %d",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_L1_AQI_AGC_UL_CON *)(msg->SigP))->agc_ul_action  );
-#else
           sprintf(str,"AGCU_C %ld  %d\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_L1_AQI_AGC_UL_CON *)(msg->SigP))->agc_ul_action  );
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
@@ -8156,22 +5614,6 @@
 
         case MMI_AQI_AGC_DL_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("AGCD_R %1d %d %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx",
-                  l1s.actual_time.fn_mod42432,
-				  ((T_MMI_AQI_AGC_DL_REQ *)(msg->SigP))->agc_dl_control,
-                  ((T_MMI_AQI_AGC_DL_REQ *)(msg->SigP))->parameters.control,
-                  ((T_MMI_AQI_AGC_DL_REQ *)(msg->SigP))->parameters.frame_size,
-                  ((T_MMI_AQI_AGC_DL_REQ *)(msg->SigP))->parameters.targeted_level,
-                  ((T_MMI_AQI_AGC_DL_REQ *)(msg->SigP))->parameters.signal_up,
-                  ((T_MMI_AQI_AGC_DL_REQ *)(msg->SigP))->parameters.signal_down,
-                  ((T_MMI_AQI_AGC_DL_REQ *)(msg->SigP))->parameters.max_scale,
-                  ((T_MMI_AQI_AGC_DL_REQ *)(msg->SigP))->parameters.gain_smooth_alpha,
-                  ((T_MMI_AQI_AGC_DL_REQ *)(msg->SigP))->parameters.gain_smooth_alpha_fast,
-                  ((T_MMI_AQI_AGC_DL_REQ *)(msg->SigP))->parameters.gain_smooth_beta,
-                  ((T_MMI_AQI_AGC_DL_REQ *)(msg->SigP))->parameters.gain_smooth_beta_fast,
-                  ((T_MMI_AQI_AGC_DL_REQ *)(msg->SigP))->parameters.gain_intp_flag);
-#else
           sprintf(str,"AGCD_R %1d %d %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx\n\r",
                   l1s.actual_time.fn_mod42432,
 				  ((T_MMI_AQI_AGC_DL_REQ *)(msg->SigP))->agc_dl_control,
@@ -8187,47 +5629,25 @@
                   ((T_MMI_AQI_AGC_DL_REQ *)(msg->SigP))->parameters.gain_smooth_beta_fast,
                   ((T_MMI_AQI_AGC_DL_REQ *)(msg->SigP))->parameters.gain_intp_flag);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case L1_AQI_AGC_DL_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("AGCD_C %ld  %d",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_L1_AQI_AGC_DL_CON *)(msg->SigP))->agc_dl_action  );
-#else
           sprintf(str,"AGCD_C %ld  %d\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_L1_AQI_AGC_DL_CON *)(msg->SigP))->agc_dl_action  );
           L1_send_trace_cpy(str);
-#endif
-
         }
         break;
 
       #endif // L1_AGC_DL == 1
 
 
-	  #if (L1_IIR == 2)
+    #if (L1_IIR == 2)
 
         case MMI_AQI_IIR_DL_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("IIR_R %d %d %d %d %d %d %d %04lx %d %d %04lx",
-                   l1s.actual_time.fn_mod42432,
-				   ((T_MMI_AQI_IIR_DL_REQ *)(msg->SigP))->iir_dl_control,
-                   ((T_MMI_AQI_IIR_DL_REQ *)(msg->SigP))->parameters.control,
-                   ((T_MMI_AQI_IIR_DL_REQ *)(msg->SigP))->parameters.frame_size,
-                   ((T_MMI_AQI_IIR_DL_REQ *)(msg->SigP))->parameters.fir_swap,
-                   ((T_MMI_AQI_IIR_DL_REQ *)(msg->SigP))->parameters.fir_filter.fir_enable,
-                   ((T_MMI_AQI_IIR_DL_REQ *)(msg->SigP))->parameters.fir_filter.fir_length,
-                   ((T_MMI_AQI_IIR_DL_REQ *)(msg->SigP))->parameters.fir_filter.fir_shift,
-                   ((T_MMI_AQI_IIR_DL_REQ *)(msg->SigP))->parameters.sos_filter.sos_enable,
-                   ((T_MMI_AQI_IIR_DL_REQ *)(msg->SigP))->parameters.sos_filter.sos_number,
-                   ((T_MMI_AQI_IIR_DL_REQ *)(msg->SigP))->parameters.gain);
-#else
           sprintf(str,"IIR_R %d %d %d %d %d %d %d %04lx %d %d %04lx\n\r",
                    l1s.actual_time.fn_mod42432,
 				   ((T_MMI_AQI_IIR_DL_REQ *)(msg->SigP))->iir_dl_control,
@@ -8241,46 +5661,24 @@
                    ((T_MMI_AQI_IIR_DL_REQ *)(msg->SigP))->parameters.sos_filter.sos_number,
                    ((T_MMI_AQI_IIR_DL_REQ *)(msg->SigP))->parameters.gain);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case L1_AQI_IIR_DL_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("IIR_C %ld  %d",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_L1_AQI_IIR_DL_CON *)(msg->SigP))->iir_dl_action );
-#else
           sprintf(str,"IIR_C %ld  %d\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_L1_AQI_IIR_DL_CON *)(msg->SigP))->iir_dl_action );
           L1_send_trace_cpy(str);
-#endif
-        }
-        break;
-
-      #endif // L1_IIR == 2
-
-      #if (L1_LIMITER == 1)
+        }
+        break;
+
+    #endif // L1_IIR == 2
+
+    #if (L1_LIMITER == 1)
 
         case MMI_LIMITER_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("LIM_R %ld %d %ld %ld %ld %08lx %ld %ld %ld %ld %04lx %04lx",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_MMI_LIMITER_REQ *)(msg->SigP))->limiter_enable,
-                  ((T_MMI_LIMITER_REQ *)(msg->SigP))->block_size,
-                  ((T_MMI_LIMITER_REQ *)(msg->SigP))->slope_update_period,
-                  ((T_MMI_LIMITER_REQ *)(msg->SigP))->nb_fir_coefs,
-                  ((T_MMI_LIMITER_REQ *)(msg->SigP))->filter_coefs,
-                  ((T_MMI_LIMITER_REQ *)(msg->SigP))->thr_low_0,
-                  ((T_MMI_LIMITER_REQ *)(msg->SigP))->thr_low_slope,
-                  ((T_MMI_LIMITER_REQ *)(msg->SigP))->thr_high_0,
-                  ((T_MMI_LIMITER_REQ *)(msg->SigP))->thr_high_slope,
-                  ((T_MMI_LIMITER_REQ *)(msg->SigP))->gain_fall,
-                  ((T_MMI_LIMITER_REQ *)(msg->SigP))->gain_rise);
-#else
           sprintf(str,"LIM_R %ld %d %ld %ld %ld %08lx %ld %ld %ld %ld %04lx %04lx\n\r",
                 (WORD32)   l1s.actual_time.fn_mod42432,
                  (WORD32)  ((T_MMI_LIMITER_REQ *)(msg->SigP))->limiter_enable,
@@ -8295,44 +5693,13 @@
                 (WORD32)   ((T_MMI_LIMITER_REQ *)(msg->SigP))->gain_fall,
                  (WORD32)  ((T_MMI_LIMITER_REQ *)(msg->SigP))->gain_rise);
           L1_send_trace_cpy(str);
-#endif
-        }
-        break;
-
-        #if (L1_DRC == 1)
+        }
+        break;
+
+      #if (L1_DRC == 1)
 
         case MMI_AQI_DRC_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("DRC_R %d %d %04lx %d %d %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx",
-                   l1s.actual_time.fn_mod42432,
-				   ((T_MMI_AQI_DRC_REQ *)(msg->SigP))->drc_dl_control,
-                   ((T_MMI_AQI_DRC_REQ *)(msg->SigP))->parameters.speech_mode_samp_f,
-                   ((T_MMI_AQI_DRC_REQ *)(msg->SigP))->parameters.num_subbands,
-                   ((T_MMI_AQI_DRC_REQ *)(msg->SigP))->parameters.frame_len,
-                   ((T_MMI_AQI_DRC_REQ *)(msg->SigP))->parameters.expansion_knee_fb_bs,
-                   ((T_MMI_AQI_DRC_REQ *)(msg->SigP))->parameters.expansion_knee_md_hg,
-                   ((T_MMI_AQI_DRC_REQ *)(msg->SigP))->parameters.expansion_ratio_fb_bs,
-                   ((T_MMI_AQI_DRC_REQ *)(msg->SigP))->parameters.expansion_ratio_md_hg,
-                   ((T_MMI_AQI_DRC_REQ *)(msg->SigP))->parameters.max_amplification_fb_bs,
-                   ((T_MMI_AQI_DRC_REQ *)(msg->SigP))->parameters.max_amplification_md_hg,
-                   ((T_MMI_AQI_DRC_REQ *)(msg->SigP))->parameters.compression_knee_fb_bs,
-                   ((T_MMI_AQI_DRC_REQ *)(msg->SigP))->parameters.compression_knee_md_hg,
-                   ((T_MMI_AQI_DRC_REQ *)(msg->SigP))->parameters.compression_ratio_fb_bs,
-                   ((T_MMI_AQI_DRC_REQ *)(msg->SigP))->parameters.compression_ratio_md_hg,
-                   ((T_MMI_AQI_DRC_REQ *)(msg->SigP))->parameters.energy_limiting_th_fb_bs,
-                   ((T_MMI_AQI_DRC_REQ *)(msg->SigP))->parameters.energy_limiting_th_md_hg,
-                   ((T_MMI_AQI_DRC_REQ *)(msg->SigP))->parameters.limiter_threshold_fb,
-                   ((T_MMI_AQI_DRC_REQ *)(msg->SigP))->parameters.limiter_threshold_bs,
-                   ((T_MMI_AQI_DRC_REQ *)(msg->SigP))->parameters.limiter_threshold_md,
-                   ((T_MMI_AQI_DRC_REQ *)(msg->SigP))->parameters.limiter_threshold_hg,
-                   ((T_MMI_AQI_DRC_REQ *)(msg->SigP))->parameters.limiter_hangover_spect_preserve,
-                   ((T_MMI_AQI_DRC_REQ *)(msg->SigP))->parameters.limiter_release_fb_bs,
-                   ((T_MMI_AQI_DRC_REQ *)(msg->SigP))->parameters.limiter_release_md_hg,
-                   ((T_MMI_AQI_DRC_REQ *)(msg->SigP))->parameters.gain_track_fb_bs,
-                   ((T_MMI_AQI_DRC_REQ *)(msg->SigP))->parameters.gain_track_md_hg
-				   );
-#else
           sprintf(str,"DRC_R %d %d %04lx %d %d %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx\n\r",
                    l1s.actual_time.fn_mod42432,
 				   ((T_MMI_AQI_DRC_REQ *)(msg->SigP))->drc_dl_control,
@@ -8362,22 +5729,15 @@
                    ((T_MMI_AQI_DRC_REQ *)(msg->SigP))->parameters.gain_track_md_hg
 				   );
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case L1_AQI_DRC_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("DRC_C %ld  %d",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_L1_AQI_DRC_CON *)(msg->SigP))->drc_dl_action );
-#else
           sprintf(str,"DRC_C %ld  %d\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_L1_AQI_DRC_CON *)(msg->SigP))->drc_dl_action );
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
@@ -8386,50 +5746,18 @@
 
         case L1_LIMITER_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("LIM_C %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"LIM_C %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
-        }
-        break;
-
-      #endif // L1_LIMITER == 1
-
-      #if (L1_ES == 1)
+        }
+        break;
+
+    #endif // L1_LIMITER == 1
+
+    #if (L1_ES == 1)
 
         case MMI_ES_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("ES_R  %ld %d %d %d %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %ld %ld %ld %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_MMI_ES_REQ *)(msg->SigP))->es_enable,
-                  ((T_MMI_ES_REQ *)(msg->SigP))->es_behavior,
-                  ((T_MMI_ES_REQ *)(msg->SigP))->es_mode,
-                  ((T_MMI_ES_REQ *)(msg->SigP))->es_gain_dl,
-                  ((T_MMI_ES_REQ *)(msg->SigP))->es_gain_ul_1,
-                  ((T_MMI_ES_REQ *)(msg->SigP))->es_gain_ul_2,
-                  ((T_MMI_ES_REQ *)(msg->SigP))->tcl_fe_ls_thr,
-                  ((T_MMI_ES_REQ *)(msg->SigP))->tcl_dt_ls_thr,
-                  ((T_MMI_ES_REQ *)(msg->SigP))->tcl_fe_ns_thr,
-                  ((T_MMI_ES_REQ *)(msg->SigP))->tcl_dt_ns_thr,
-                  ((T_MMI_ES_REQ *)(msg->SigP))->tcl_ne_thr,
-                  ((T_MMI_ES_REQ *)(msg->SigP))->ref_ls_pwr,
-                  ((T_MMI_ES_REQ *)(msg->SigP))->switching_time,
-                  ((T_MMI_ES_REQ *)(msg->SigP))->switching_time_dt,
-                  ((T_MMI_ES_REQ *)(msg->SigP))->hang_time,
-                  ((T_MMI_ES_REQ *)(msg->SigP))->gain_lin_dl_vect[0],
-                  ((T_MMI_ES_REQ *)(msg->SigP))->gain_lin_dl_vect[1],
-                  ((T_MMI_ES_REQ *)(msg->SigP))->gain_lin_dl_vect[2],
-                  ((T_MMI_ES_REQ *)(msg->SigP))->gain_lin_dl_vect[3],
-                  ((T_MMI_ES_REQ *)(msg->SigP))->gain_lin_ul_vect[0],
-                  ((T_MMI_ES_REQ *)(msg->SigP))->gain_lin_ul_vect[1],
-                  ((T_MMI_ES_REQ *)(msg->SigP))->gain_lin_ul_vect[2],
-                  ((T_MMI_ES_REQ *)(msg->SigP))->gain_lin_ul_vect[3]);
-#else
           sprintf(str,"ES_R  %ld %d %d %d %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx %ld %ld %ld %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_MMI_ES_REQ *)(msg->SigP))->es_enable,
@@ -8456,217 +5784,138 @@
                   ((T_MMI_ES_REQ *)(msg->SigP))->gain_lin_ul_vect[2],
                   ((T_MMI_ES_REQ *)(msg->SigP))->gain_lin_ul_vect[3]);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case L1_ES_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("ES_C  %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"ES_C  %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
-        }
-        break;
-
-      #endif // L1_ES == 1
+        }
+        break;
+
+    #endif // L1_ES == 1
 
       #if (L1_MIDI == 1)
         // MIDI
         case MMI_MIDI_START_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("MID_R %ld %02ld %02ld",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_MMI_MIDI_REQ *)(msg->SigP))->session_id,
-                  ((T_MMI_MIDI_REQ *)(msg->SigP))->loopback);
-#else
           sprintf(str,"MID_R %ld %02ld %02ld\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_MMI_MIDI_REQ *)(msg->SigP))->session_id,
                   ((T_MMI_MIDI_REQ *)(msg->SigP))->loopback);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_MIDI_START_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("MID_C %ld %d",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_L1A_MIDI_CON *)(msg->SigP))->error_code);
-#else
           sprintf(str,"MID_C %ld %d\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_L1A_MIDI_CON *)(msg->SigP))->error_code);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_MIDI_STOP_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("MID_S %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"MID_S %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case MMI_MIDI_STOP_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("MID_E %ld %d",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_L1A_MIDI_CON *)(msg->SigP))->error_code);
-#else
           sprintf(str,"MID_E %ld %d\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_L1A_MIDI_CON *)(msg->SigP))->error_code);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case API_MIDI_INIT_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("MDA_C %ld %d",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_L1_API_MIDI_INIT_CON *)(msg->SigP))->error_code);
-#else
           sprintf(str,"MDA_C %ld %d\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_L1_API_MIDI_INIT_CON *)(msg->SigP))->error_code);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case API_MIDI_STOP_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("MDA_E %ld %d",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_L1_API_MIDI_STOP_CON *)(msg->SigP))->error_code);
-#else
           sprintf(str,"MDA_E %ld %d\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_L1_API_MIDI_STOP_CON *)(msg->SigP))->error_code);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case L1_MIDI_ENABLE_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("MDS_C %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"MDS_C %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case L1_MIDI_DISABLE_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("MDS_E %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
           sprintf(str,"MDS_E %ld\n\r",
                   l1s.actual_time.fn_mod42432);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case L1_BACK_MIDI_INIT_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("MDB_C %ld %d",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_L1_BACK_MIDI_INIT_CON *)(msg->SigP))->error_code);
-#else
           sprintf(str,"MDB_C %ld %d\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_L1_BACK_MIDI_INIT_CON *)(msg->SigP))->error_code);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case L1_BACK_MIDI_STOP_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("MDB_E %ld %d",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_L1_BACK_MIDI_STOP_CON *)(msg->SigP))->error_code);
-#else
           sprintf(str,"MDB_E %ld %d\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_L1_BACK_MIDI_STOP_CON *)(msg->SigP))->error_code);
           L1_send_trace_cpy(str);
-#endif
         }
         break;
       #endif // L1_MIDI
+
       #if (L1_VOCODER_IF_CHANGE == 1)
         case MMI_TCH_VOCODER_CFG_REQ:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("VCH_R %ld %d",
-           l1s.actual_time.fn_mod42432,
-           ((T_MMI_TCH_VOCODER_CFG_REQ *)(msg->SigP))->vocoder_state);
-#else
            sprintf(str,"VCH_R %ld %d\n\r",
            l1s.actual_time.fn_mod42432,
            ((T_MMI_TCH_VOCODER_CFG_REQ *)(msg->SigP))->vocoder_state);
            L1_send_trace_cpy(str);
-#endif
-        }
-        break;
+        }
+        break;
+
         case MMI_TCH_VOCODER_CFG_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("VCH_C %ld ", l1s.actual_time.fn_mod42432);
-#else
            sprintf(str,"VCH_C %ld \n\r", l1s.actual_time.fn_mod42432);
            L1_send_trace_cpy(str);
-#endif
         }
         break;
 
         case L1_VOCODER_CFG_ENABLE_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("VEN_C %ld ", l1s.actual_time.fn_mod42432);
-#else
            sprintf(str,"VEN_C %ld \n\r", l1s.actual_time.fn_mod42432);
            L1_send_trace_cpy(str);
-#endif
-        }
-        break;
+        }
+        break;
+
         case L1_VOCODER_CFG_DISABLE_CON:
         {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("VDS_C %ld ", l1s.actual_time.fn_mod42432);
-#else
            sprintf(str,"VDS_C %ld \n\r", l1s.actual_time.fn_mod42432);
            L1_send_trace_cpy(str);
-#endif
         }
         break;
       #endif // L1_VOCODER_IF_CHANGE == 1
@@ -8681,58 +5930,38 @@
 
       case MMI_GTT_START_REQ:
       {UWORD8  length =strlen(str);
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("GTT_R %ld",
-                l1s.actual_time.fn_mod42432);
-#else
         sprintf(str, "GTT_R %ld\n\r",
                 l1s.actual_time.fn_mod42432);
 
 rvt_send_trace_cpy ((T_RVT_BUFFER) str, trace_info.l1_trace_user_id, (T_RVT_MSG_LG)length, RVT_BINARY_FORMAT);
 //      L1_send_trace_cpy(str); //omaps00090550
-#endif
       }
       break;
 
       case MMI_GTT_START_CON:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("GTT_C %ld",
-                l1s.actual_time.fn_mod42432);
-#else
         sprintf(str, "GTT_C %ld\n\r",
                 l1s.actual_time.fn_mod42432);
 
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case MMI_GTT_STOP_REQ:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("GTT_S %ld",
-                l1s.actual_time.fn_mod42432);
-#else
         sprintf(str, "GTT_S %ld\n\r",
                 l1s.actual_time.fn_mod42432);
 
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
       case MMI_GTT_STOP_CON:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("GTT_E %ld",
-                l1s.actual_time.fn_mod42432);
-#else
         sprintf(str, "GTT_E %ld\n\r",
                 l1s.actual_time.fn_mod42432);
 
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -8741,96 +5970,64 @@
 #if (L1_DYN_DSP_DWNLD == 1)
       case API_L1_DYN_DWNLD_START_CON:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("D_DWL_C %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
         sprintf(str, "D_DWL_C %ld\n\r",
                   l1s.actual_time.fn_mod42432);
 
         L1_send_trace_cpy(str);
-#endif
-      }
-      break;
+      }
+      break;
+
       case API_L1_DYN_DWNLD_FINISHED:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace( "D_DWL_E %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
         sprintf(str, "D_DWL_E %ld\n\r",
                   l1s.actual_time.fn_mod42432);
 
         L1_send_trace_cpy(str);
-#endif
-      }
-      break;
+      }
+      break;
+
       case L1_DYN_DWNLD_STOP_CON:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("D_DWL_S_L1s %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
         sprintf(str, "D_DWL_S_L1s %ld\n\r",
                   l1s.actual_time.fn_mod42432);
 
         L1_send_trace_cpy(str);
-#endif
-      }
-      break;
+      }
+      break;
+
       case API_L1_DYN_DWNLD_UNINST_OK:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("D_UNST_OK %ld",
-                  l1s.actual_time.fn_mod42432);
-#else
         sprintf(str, "D_UNST_OK %ld\n\r",
                   l1s.actual_time.fn_mod42432);
         L1_send_trace_cpy(str);
-#endif
-      }
-      break;
+      }
+      break;
+
       case API_L1_DYN_DWNLD_STOP:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("D_DWL_ERR %ld %04lx",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_API_L1_DYN_DWNLD_STOP *) (msg->SigP))->error);
-#else
         sprintf(str, "D_DWL_ERR %ld %04lx\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_API_L1_DYN_DWNLD_STOP *) (msg->SigP))->error);
         L1_send_trace_cpy(str);
-#endif
-      }
-      break;
+      }
+      break;
+
       case API_L1_CRC_NOT_OK:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("D_CRC_KO %ld %04lx",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_API_L1_CRC_NOT_OK *) (msg->SigP))->patch_id);
-#else
         sprintf(str, "D_CRC_KO %ld %04lx\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_API_L1_CRC_NOT_OK *) (msg->SigP))->patch_id);
 
         L1_send_trace_cpy(str);
-#endif
-      }
-      break;
+      }
+      break;
+
       case API_L1_CRC_OK:
       {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("D_CRC_OK %ld %04lx",
-                  l1s.actual_time.fn_mod42432,
-                  ((T_API_L1_CRC_NOT_OK *) (msg->SigP))->patch_id);
-#else
         sprintf(str, "D_CRC_OK %ld %04lx\n\r",
                   l1s.actual_time.fn_mod42432,
                   ((T_API_L1_CRC_NOT_OK *) (msg->SigP))->patch_id);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 #endif // L1_DYN_DSP_DWNLD == 1
@@ -8841,59 +6038,36 @@
 
     case OML1_CLOSE_TCH_LOOP_REQ:
     {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("CLO_R %ld %d %d",
-              l1s.actual_time.fn_mod42432,
-              ((T_OML1_CLOSE_TCH_LOOP_REQ *)(msg->SigP))->sub_channel,
-              ((T_OML1_CLOSE_TCH_LOOP_REQ *)(msg->SigP))->frame_erasure);
-#else
       sprintf(str,"CLO_R %ld %d %d\n\r",
               l1s.actual_time.fn_mod42432,
               ((T_OML1_CLOSE_TCH_LOOP_REQ *)(msg->SigP))->sub_channel,
               ((T_OML1_CLOSE_TCH_LOOP_REQ *)(msg->SigP))->frame_erasure);
       L1_send_trace_cpy(str);
-#endif
     }
     break;
 
     case OML1_OPEN_TCH_LOOP_REQ:
     {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-        vsi_o_event_ttrace("OLO_R %ld",
-              l1s.actual_time.fn_mod42432);
-#else
       sprintf(str,"OLO_R %ld\n\r",
               l1s.actual_time.fn_mod42432);
       L1_send_trace_cpy(str);
-#endif
     }
     break;
 
     case OML1_START_DAI_TEST_REQ:
     {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-      vsi_o_event_ttrace("SDA_R %ld %d",
-              l1s.actual_time.fn_mod42432,
-              ((T_OML1_START_DAI_TEST_REQ *)(msg->SigP))->tested_device);
-#else
       sprintf(str,"SDA_R %ld %d\n\r",
               l1s.actual_time.fn_mod42432,
               ((T_OML1_START_DAI_TEST_REQ *)(msg->SigP))->tested_device);
       L1_send_trace_cpy(str);
-#endif
     }
     break;
 
     case OML1_STOP_DAI_TEST_REQ:
     {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-      vsi_o_event_ttrace("EDA_R %ld",
-              l1s.actual_time.fn_mod42432);
-#else
       sprintf(str,"EDA_R %ld\n\r",
               l1s.actual_time.fn_mod42432);
       L1_send_trace_cpy(str);
-#endif
     }
     break;
 
@@ -8903,14 +6077,9 @@
 
     case TST_TEST_HW_REQ:
     {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-      vsi_o_event_ttrace("TST_R %ld",
-            l1s.actual_time.fn_mod42432);
-#else
       sprintf(str,"TST_R %ld\n\r",
             l1s.actual_time.fn_mod42432);
       L1_send_trace_cpy(str);
-#endif
     }
     break;
 
@@ -8968,18 +6137,11 @@
 
     case TST_SLEEP_REQ:
     {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-      vsi_o_event_ttrace("SLE_R %ld %d %d",
-              l1s.actual_time.fn_mod42432,
-              ((T_TST_SLEEP_REQ*)(msg->SigP))->sleep_mode,
-              ((T_TST_SLEEP_REQ*)(msg->SigP))->clocks);
-#else
       sprintf(str,"SLE_R %ld %d %d\n\r",
               l1s.actual_time.fn_mod42432,
               ((T_TST_SLEEP_REQ*)(msg->SigP))->sleep_mode,
               ((T_TST_SLEEP_REQ*)(msg->SigP))->clocks);
       L1_send_trace_cpy(str);
-#endif
     }
     break;
 
@@ -8989,40 +6151,25 @@
 
     case MMI_ADC_REQ:
     {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-      vsi_o_event_ttrace("ADC_R %ld",
-              l1s.actual_time.fn_mod42432);
-#else
       sprintf(str,"ADC_R %ld\n\r",
               l1s.actual_time.fn_mod42432);
       L1_send_trace_cpy(str);
-#endif
     }
     break;
 
     case MMI_STOP_ADC_REQ:
     {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-      vsi_o_event_ttrace("ADC_S %ld",
-              l1s.actual_time.fn_mod42432);
-#else
       sprintf(str,"ADC_S %ld\n\r",
               l1s.actual_time.fn_mod42432);
       L1_send_trace_cpy(str);
-#endif
     }
     break;
 
     case MMI_STOP_ADC_CON:
     {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-      vsi_o_event_ttrace("ADC_C %ld",
-              l1s.actual_time.fn_mod42432);
-#else
       sprintf(str,"ADC_C %ld\n\r",
               l1s.actual_time.fn_mod42432);
       L1_send_trace_cpy(str);
-#endif
     }
     break;
 
@@ -9275,93 +6422,6 @@
   DEBUGMSG(status,NU_SEND_QUEUE_ERR)
 #else
 
-  #if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-
-                switch (debug_code)
-                {
-                  case PM_EQUAL_0:
-                  {
-                    vsi_o_event_ttrace(">  PM %ld %ld %ld %ld %ld %ld %ld %d %ld %d",
-                             l1s.actual_time.fn_mod42432,
-                             task,
-                             l1s_dsp_com.dsp_db_r_ptr->d_debug & 0xffff,
-                             l1s.debug_time & 0xffff,
-                             l1s.actual_time.fn,
-                             l1s.tpu_offset,
-                             l1s.tpu_offset_hw,
-                             l1a_l1s_com.adc_mode,
-                             (trace_info.Not_PM_Task << 16));
-
-                    if (trace_info.trace_filter == FALSE)
-                    {
-                      #if (GSM_IDLE_RAM == 0)
-                        l1_trace_L1_tasks();            // trace L1 tasks status
-                      #else
-                        l1s_trace_mftab();
-                      #endif
-                      l1_display_buffer_trace_fct();  // display buffer fct called
-                      trace_info.trace_filter = TRUE; // avoid too much traces displayed
-                    }
-                  }
-                  break;
-
-                  case NO_PM_EQUAL_0:
-                  {
-                    vsi_o_event_ttrace(">  !PM %ld %ld %ld %ld %ld %ld %ld %d %ld",
-                             l1s.actual_time.fn_mod42432,
-                             task,
-                             l1s_dsp_com.dsp_db_r_ptr->d_debug & 0xffff,
-                             l1s.debug_time & 0xffff,
-                             l1s.actual_time.fn,
-                             l1s.tpu_offset,
-                             l1s.tpu_offset_hw,
-                             l1a_l1s_com.adc_mode);
-                  }
-                  break;
-                  case L1S_ABORT:
-                  {
-                    vsi_o_event_ttrace("ABORT %ld %ld %ld %ld %ld %ld %ld %ld",
-                             l1s.actual_time.fn_mod42432,
-                             task,
-                             l1s_dsp_com.dsp_db_r_ptr->d_debug & 0xffff,
-                             l1s.debug_time & 0xffff,
-                             l1s.actual_time.fn,
-                             l1s.tpu_offset,
-                             l1s.tpu_offset_hw,
-                             l1a_l1s_com.adc_mode);
-				  }
-                  break;
-
-                  case MCU_DSP_MISMATCH:
-                  {
-                    vsi_o_event_ttrace("> COM %ld %ld %ld %ld %ld %ld %ld %ld",
-                             l1s.actual_time.fn_mod42432,
-                             task,
-                             l1s_dsp_com.dsp_db_r_ptr->d_debug & 0xffff,
-                             l1s.debug_time & 0xffff,
-                             l1s.actual_time.fn,
-                             l1s.tpu_offset,
-                             l1s.tpu_offset_hw,
-                             l1a_l1s_com.adc_mode);
-                  }
-                  break;
-
-                  case NO_MCU_DSP_MISMATCH:
-                  {
-                    vsi_o_event_ttrace(">!COM %ld %ld %ld %ld %ld %ld %ld %ld",
-                             l1s.actual_time.fn_mod42432,
-                             task,
-                             l1s_dsp_com.dsp_db_r_ptr->d_debug & 0xffff,
-                             l1s.debug_time & 0xffff,
-                             l1s.actual_time.fn,
-                             l1s.tpu_offset,
-                             l1s.tpu_offset_hw,
-                             l1a_l1s_com.adc_mode);
-                  }
-                  break;
-                }
-
-  #else
               CHAR str[128];
 
                 switch (debug_code)
@@ -9449,7 +6509,6 @@
                 }
 
                 l1_intram_put_trace(str);
-  #endif // L1_COMPRESSED_TRACING
 
             #endif // (GSM_IDLE_RAM == 0)
           }
@@ -10182,29 +7241,6 @@
   //UWORD8 index = trace_info.trace_fct_buff_index; - OMAPS90550-new
   trace_info.trace_buff_stop = TRUE; // stop buffer trace
 
-
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-
-  if (((l1s.version.mcu_tcs_program_release & 0xFFF0) == 0x2110) ||
-      ((l1s.version.mcu_tcs_program_release & 0xFFF0) == 0x2120))
-    vsi_o_event_ttrace("SW version: TCS%x.%x.%x.%x_L1_%x_%x",
-            (l1s.version.mcu_tcs_program_release & 0xF000) >> 12,
-            (l1s.version.mcu_tcs_program_release & 0x0F00) >> 8,
-            (l1s.version.mcu_tcs_program_release & 0x00F0) >> 4,
-            l1s.version.mcu_tcs_program_release & 0x000F,
-            l1s.version.mcu_tcs_official,
-            l1s.version.mcu_tcs_internal);
-  else
-    vsi_o_event_ttrace("SW version: TCS.%x.%x.%x_L1_%x_%x",
-            (l1s.version.mcu_tcs_program_release & 0xF000) >> 12,
-            (l1s.version.mcu_tcs_program_release & 0x0F00) >> 8,
-            l1s.version.mcu_tcs_program_release & 0x00FF,
-            l1s.version.mcu_tcs_official,
-            l1s.version.mcu_tcs_internal);
-
-#else
-
-
   if (((l1s.version.mcu_tcs_program_release & 0xFFF0) == 0x2110) ||
       ((l1s.version.mcu_tcs_program_release & 0xFFF0) == 0x2120))
     sprintf(str,"SW version: TCS%x.%x.%x.%x_L1_%x_%x\n\r",
@@ -10228,14 +7264,6 @@
   l1_intram_put_trace(str);
 #endif
 
-#endif
-
-
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-
-  vsi_o_event_ttrace(" array index: %d",trace_info.trace_fct_buff_index);
-
-#else
   sprintf (str,"\n\r array index: %d\n\r",trace_info.trace_fct_buff_index);
 
 #if (GSM_IDLE_RAM == 0)
@@ -10244,31 +7272,8 @@
   l1_intram_put_trace(str);
 #endif
 
-
-#endif
-
-
   i = trace_info.trace_fct_buff_index;
 
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-
-  for (j=0;j<TRACE_FCT_BUFF_SIZE;j++)
-  {
-    fct_id = trace_info.trace_fct_buff[i];
-
-    #if TRACE_FULL_NAME
-      // display the function by its name (cost in code size and CPU)
-      vsi_o_event_ttrace("%d: %d %s",i,fct_id,string_fct_trace[fct_id]);
-    #else
-      // or display the fct by its id
-      vsi_o_event_ttrace("%d: %d\n\r",i,fct_id);
-    #endif
-
-    i = (i + 1) % TRACE_FCT_BUFF_SIZE;
-  }
-
-
-#else
   for (j=0;j<TRACE_FCT_BUFF_SIZE;j++)
   {
     fct_id = trace_info.trace_fct_buff[i];
@@ -10289,7 +7294,6 @@
 
     i = (i + 1) % TRACE_FCT_BUFF_SIZE;
   }
-#endif
   trace_info.trace_buff_stop = FALSE; // start buffer trace
 }
 
@@ -10548,17 +7552,6 @@
 
           default:
           {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-            vsi_o_event_ttrace("DEB_I %ld %ld %ld %ld %ld %ld %ld %ld",
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[0],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[1],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[2],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[3],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[4],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[5],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[6],
-                     ((T_TRACE_INFO *)(msg->SigP))->tab[7]);
-#else
             sprintf (str,"DEB_I %ld %ld %ld %ld %ld %ld %ld %ld\n\r",
                      ((T_TRACE_INFO *)(msg->SigP))->tab[0],
                      ((T_TRACE_INFO *)(msg->SigP))->tab[1],
@@ -10569,7 +7562,6 @@
                      ((T_TRACE_INFO *)(msg->SigP))->tab[6],
                      ((T_TRACE_INFO *)(msg->SigP))->tab[7]);
             L1_send_trace_no_cpy(str);
-#endif
           }
           break;
 
@@ -10725,12 +7717,8 @@
 void l1_trace_cpu_load(UWORD8 cpu_load)
 {
   char      str[240];
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-   vsi_o_event_ttrace("%d", cpu_load);
-#else
   sprintf(str,"%d\n\r", cpu_load);
   L1_send_trace_cpy(str);
-#endif
 }
 
 #endif // TRACE_TYPE 6
@@ -10927,12 +7915,8 @@
 
        if (trace_info.current_config->l1_dyn_trace & 1<<L1_DYN_TRACE_L1S_DEBUG)
        {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-         vsi_o_event_ttrace(">  MCU CPU overload %ld\n\r", l1s.actual_time.fn_mod42432);
-#else
          sprintf (str,">  MCU CPU overload %ld\n\r", l1s.actual_time.fn_mod42432);
          l1_intram_put_trace(str);
-#endif
        }
     #endif
   }
@@ -11026,32 +8010,6 @@
          else
            index = 0;
 
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-         if (type_sleep == CLOCK_STOP)
-         // deep sleep trace
-         {
-           vsi_o_event_ttrace("      deep_sleep: %ld %ld %d %d %s",
-                    start_fn,
-                    end_fn,
-                    wakeup_type,
-                    int_id,
-                    array_special_cases[index]);
-         }
-         else
-         // big sleep
-         {
-           char *array_string[]={"undefined","ligth on","uart","sim","gauging","sleep mode","DSP","BT","camera","??"};
-           vsi_o_event_ttrace("      big sleep: %ld %ld %d %d cause:%s %s",
-                    start_fn,
-                    end_fn,
-                    wakeup_type,
-                    int_id,
-                    array_string[big_sleep_type],
-                    array_special_cases[index]);
-         }
-
-#else
-
          if (type_sleep == CLOCK_STOP)
          // deep sleep trace
          {
@@ -11075,7 +8033,6 @@
                     array_special_cases[index]);
          }
          l1_intram_put_trace(str);
-#endif
       }
 
       #endif
@@ -11122,23 +8079,13 @@
 
            if (trace_info.reset_gauging_algo == TRUE)
            {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-             vsi_o_event_ttrace("      reset gauging algo");
-
-#else
              sprintf (str,"      reset gauging algo");
              l1_intram_put_trace(str);
-#endif
              trace_info.reset_gauging_algo = FALSE;
            }
 
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-           vsi_o_event_ttrace("      gauging %ld", l1s.actual_time.fn_mod42432);
-
-#else
            sprintf (str,"      gauging %ld", l1s.actual_time.fn_mod42432);
            l1_intram_put_trace(str);
-#endif
         }
 
         #endif
@@ -11158,18 +8105,10 @@
     #if (TRACE_TYPE==1) || (TRACE_TYPE==4)
        if (trace_info.current_config->l1_dyn_trace & 1<<L1_DYN_TRACE_L1A_MESSAGES)
        {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-          vsi_o_event_ttrace("      ADC :%ld %ld",
-                   l1s.actual_time.fn_mod42432,
-                   type);
-
-#else
           sprintf (str,"      ADC :%ld %ld\n\r",
                    l1s.actual_time.fn_mod42432,
                    type);
           l1_intram_put_trace(str);
-
-#endif
        }
     #endif
   }
@@ -11184,25 +8123,6 @@
     char      str[64];
     #if (TRACE_TYPE==1) || (TRACE_TYPE==4)
 
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-       if (trace_info.current_config->l1_dyn_trace & 1<<L1_DYN_TRACE_L1A_MESSAGES)
-       {
-         #if (TOA_ALGO == 2)
-           vsi_o_event_ttrace("      TOA updated:%ld %ld %ld %ld %ld",
-                    l1s.actual_time.fn_mod42432,
-                    l1s.toa_var.toa_shift,
-                    trace_info.toa_trace_var.toa_frames_counter,
-                    trace_info.toa_trace_var.toa_accumul_counter,
-                    trace_info.toa_trace_var.toa_accumul_value);
-         #else
-           vsi_o_event_ttrace("      TOA updated:%ld %ld",
-                    l1s.actual_time.fn_mod42432,
-                    l1s.toa_shift);
-         #endif
-
-       }
-
-#else
        if (trace_info.current_config->l1_dyn_trace & 1<<L1_DYN_TRACE_L1A_MESSAGES)
        {
          #if (TOA_ALGO == 2)
@@ -11220,7 +8140,6 @@
 
          l1_intram_put_trace(str);
        }
-#endif
     #endif
   }
 
@@ -11255,21 +8174,12 @@
     {
 
       // trace the d_error_status word with the correct mask applied
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-      vsi_o_event_ttrace("> DSP %ld %ld %xh %ld",
-                 l1s.actual_time.fn_mod42432,
-                 (UWORD16)l1s.debug_time,
-                 d_error_status_masked,
-                 (l1s_dsp_com.dsp_db_r_ptr->d_debug & 0xffff));
-
-#else
       sprintf (str,"> DSP %ld %ld %xh %ld\n\r",
                  l1s.actual_time.fn_mod42432,
                  (UWORD16)l1s.debug_time,
                  d_error_status_masked,
                  (l1s_dsp_com.dsp_db_r_ptr->d_debug & 0xffff));
       l1_intram_put_trace(str);
-#endif
       #if (DSP_DEBUG_TRACE_ENABLE == 1)
         if (trace_info.current_config->l1_dyn_trace & 1<<L1_DYN_TRACE_DSP_DEBUG)
         {
@@ -14249,15 +11159,6 @@
   l1_audio_regs_debug_read();
   if(audio_reg_read_status==1)
   {
-#if ( (OP_L1_STANDALONE == 0) && (L1_COMPRESSED_TRACING == 1) )
-   vsi_o_event_ttrace("AU_REG  %x %x %x %x %x %x %x %x %x %x %x",
-            audio_regs_cpy[0], audio_regs_cpy[1],
-            audio_regs_cpy[2], audio_regs_cpy[3],
-            audio_regs_cpy[4], audio_regs_cpy[5],
-            audio_regs_cpy[6], audio_regs_cpy[7],
-            audio_regs_cpy[8], audio_regs_cpy[9],
-            audio_regs_cpy[10]);
-#else
     sprintf(str2,"AU_REG  %x %x %x %x %x %x %x %x %x %x %x\n\r",
             audio_regs_cpy[0], audio_regs_cpy[1],
             audio_regs_cpy[2], audio_regs_cpy[3],
@@ -14266,7 +11167,6 @@
             audio_regs_cpy[8], audio_regs_cpy[9],
             audio_regs_cpy[10]);
     L1_send_trace_cpy(str2);
-#endif
     audio_reg_read_status=0;
   }
 }