changeset 8:b36540edb046

L1/cfile/l1_*.c: initial import from tcs211-l1-reconst
author Mychaela Falconia <falcon@freecalypso.org>
date Thu, 09 Jun 2016 05:45:03 +0000 (2016-06-09)
parents b7d857ebc9ca
children b80f0c5016ee
files L1/cfile/l1_afunc.c L1/cfile/l1_api_hisr.c L1/cfile/l1_async.c L1/cfile/l1_cmplx.c L1/cfile/l1_ctl.c L1/cfile/l1_drive.c L1/cfile/l1_func.c L1/cfile/l1_init.c L1/cfile/l1_mfmgr.c L1/cfile/l1_pwmgr.c L1/cfile/l1_sync.c L1/cfile/l1_trace.c
diffstat 12 files changed, 1547 insertions(+), 11575 deletions(-) [+]
line wrap: on
line diff
--- a/L1/cfile/l1_afunc.c	Thu Jun 09 05:38:18 2016 +0000
+++ b/L1/cfile/l1_afunc.c	Thu Jun 09 05:45:03 2016 +0000
@@ -9,9 +9,8 @@
 
 #define  L1_AFUNC_C
 
-#include "config.h"
+#include "l1_macro.h"
 #include "l1_confg.h"
-#include "l1_macro.h"
 
 #if (CODE_VERSION == SIMULATION)
   #include <string.h>
@@ -85,7 +84,7 @@
     #include "l1aac_defty.h"
   #endif
   #include "l1_defty.h"
-  #include "../../gpf/inc/cust_os.h"
+  #include "cust_os.h"
   #include "l1_msgty.h"
   #include "l1_varex.h"
   #include "l1_proto.h"
@@ -107,7 +106,7 @@
 
 
 #if (OP_L1_STANDALONE == 1)
-#if (ANALOG == 11)
+#if (ANLG_FAM == 11)
 #include "bspTwl3029_Madc.h"
 #endif
 #endif
@@ -120,7 +119,7 @@
 #include <string.h>
 extern T_DRP_SRM_API* drp_srm_api;
 #endif
-#if (ANALOG == 11)
+#if (ANLG_FAM == 11)
 BspTwl3029_MadcResults l1_madc_results;
 void l1a_madc_callback(void);
 #endif
@@ -1112,7 +1111,7 @@
 
 #if (L1_MADC_ON == 1)
 #if (OP_L1_STANDALONE == 1)
-#if (ANALOG == 11)
+#if (ANLG_FAM == 11)
 void   l1a_madc_callback(void)
 {
 	char str[40];
@@ -1159,7 +1158,7 @@
    os_send_sig(adc_msg, RRM1_QUEUE);
 #endif
 }
-#endif // ANALOG == 11
+#endif // ANLG_FAM == 11
 #endif //OP_L1_STANDALONE
 #endif // L1_MADC_ON
 
--- a/L1/cfile/l1_api_hisr.c	Thu Jun 09 05:38:18 2016 +0000
+++ b/L1/cfile/l1_api_hisr.c	Thu Jun 09 05:45:03 2016 +0000
@@ -7,16 +7,15 @@
  *
  ************* Revision Controle System Header *************/
 
-#include "config.h"
 #include "l1_confg.h"
-#include "../../nucleus/nucleus.h"
+#include "nucleus.h"
 #include "sys_types.h"
 #include "l1_types.h"
 #include "l1audio_cust.h"
 #include "l1audio_defty.h"
 #include "l1audio_const.h"
 #include "l1_const.h"
-#include "../../gpf/inc/cust_os.h"
+#include "cust_os.h"
 #include "l1tm_defty.h"
 #if (L1_GTT == 1)
   #include "l1gtt_const.h"
@@ -54,7 +53,7 @@
 #include "l1audio_signa.h"
 #include "l1_varex.h"
 #include "l1_macro.h"
-#include "../../bsp/mem.h"
+#include "mem.h"
 
 
 /*-------------------------------------------------------------*/
@@ -141,6 +140,8 @@
 #endif // (L1_MP3 == 1) || (L1_MIDI == 1) || (L1_DYN_DSP_DWNLD == 1)
 #endif //(FF_L1_IT_DSP_USF == 1) || //(FF_L1_IT_DSP_DTX == 1)
 
+#if 0	/* FreeCalypso Frankenstein */
+/* This is the original LoCosto code */
 
 //When Fast USF is not enabled, then the API HISR needs to be called every time the DSP 
 //sends a HINT interrupt.
@@ -151,6 +152,18 @@
 #endif
 //NU_Activate_HISR(&apiHISR); //hack remove
   return;
+
+#else
+
+/* reconstruction of what the TCS211 code was probably like */
+#if (L1_DYN_DSP_DWNLD == 1)
+  if( l1_apihisr.dyn_dwnld.running == TRUE )
+  {
+    NU_Activate_HISR(&apiHISR); 
+  }
+#endif
+
+#endif
 }
 
 /*-------------------------------------------------------------*/
@@ -193,6 +206,7 @@
 
 }
 
+#if 0	/* FreeCalypso */
 /*-------------------------------------------------------------*/
 /* api_modem_hisr()                                            */
 /*-------------------------------------------------------------*/
@@ -229,6 +243,7 @@
   }
 #endif
 }
+#endif	/* FreeCalypso */
 
 /*-------------------------------------------------------------*/
 /* l1_trigger_api_interrupt()                                  */
--- a/L1/cfile/l1_async.c	Thu Jun 09 05:38:18 2016 +0000
+++ b/L1/cfile/l1_async.c	Thu Jun 09 05:45:03 2016 +0000
@@ -8,9 +8,8 @@
  ************* Revision Controle System Header *************/
 
 //#pragma DUPLICATE_FOR_INTERNAL_RAM_START
-#include "config.h"
+#include "l1_macro.h"
 #include "l1_confg.h"
-#include "l1_macro.h"
 //#pragma DUPLICATE_FOR_INTERNAL_RAM_END
 
 #if !((MOVE_IN_INTERNAL_RAM == 1) && (GSM_IDLE_RAM !=0))  // MOVE TO INTERNAL MEM IN CASE GSM_IDLE_RAM enabled
@@ -88,7 +87,7 @@
   #include "l1_const.h"
   #include "l1_time.h"
   #include "l1_signa.h"
-  #include "../../gpf/inc/cust_os.h"
+  #include "cust_os.h"
   #if TESTMODE
     #include "l1tm_defty.h"
     #include "l1tm_signa.h"
@@ -117,6 +116,7 @@
     #include "l1aac_signa.h"
   #endif
   #if (L1_DYN_DSP_DWNLD == 1)
+    #include <stdio.h>
     #include "l1_dyn_dwl_signa.h"
   #endif
 
@@ -141,10 +141,11 @@
     #if ((CHIPSET == 12) || (CHIPSET == 15))
         #include "sys_inth.h"
     #else
-        #include "../../bsp/iq.h"
-        #include "../../bsp/inth.h"
-        #include "../../bsp/mem.h"
+        #include "iq.h"
+        #include "inth.h"
+        #include "mem.h"
     #endif
+
   #endif
 
   #if (VCXO_ALGO == 1)
@@ -236,11 +237,7 @@
     // Speech recognition update-check process
     extern void l1a_mmi_sr_update_check_process (xSignalHeaderRec *msg);
   #endif
-  #if (L1_AEC == 1)
-    // AEC process
-    extern void l1a_mmi_aec_process             (xSignalHeaderRec *msg);
-  #endif
-  #if (L1_AEC == 2)
+  #if (AEC)
     // AEC process
     extern void l1a_mmi_aec_process             (xSignalHeaderRec *msg);
   #endif
@@ -616,11 +613,7 @@
         // Speech recognition update-check process
         l1a_mmi_sr_update_check_process(msg);
       #endif
-      #if (L1_AEC == 1)
-        // AEC process
-        l1a_mmi_aec_process(msg);
-      #endif
-      #if (L1_AEC == 2)
+      #if (AEC)
         // AEC process
         l1a_mmi_aec_process(msg);
       #endif
@@ -687,13 +680,16 @@
       #if(L1_BT_AUDIO ==1)
         l1a_mmi_bt_process(msg); 
       #endif // L1_VOCODER_IF_CHANGE == 1
-      /*
-       * FreeCalypso change: the following call to l1a_mmi_outen_cfg_process()
-       * (a function that doesn't exist in the Leonardo objects) has been
-       * moved inside the #if (AUDIO_TASK == 1) conditional, otherwise
-       * the link fails - it is definitely an audio function of some kind.
-       */
-      l1a_mmi_outen_cfg_process(msg);
+       /*
+	* FreeCalypso Frankenstein: the following call to
+	* l1a_mmi_outen_cfg_process() was totally unconditional
+	* in the LoCosto source we got, but no such function
+	* exists in TCS211.  To be investigated further when
+	* we reach the audio stuff.
+	*/
+      #if 0
+        l1a_mmi_outen_cfg_process(msg);
+      #endif
     #endif //AUDIO TASK
 
     // Only processes supported by GSM IDLE in Internal RAM
@@ -1845,10 +1841,7 @@
 
         // Look for first free location within L1 structure.
         while((neigh_number < 6) && (l1a_l1s_com.bcchn.list[neigh_number].status != NSYNC_FREE))
-	{
-	    if(neigh_number != 5 )
           neigh_number++;
-	}
 
 
         // Download neighbour info from request message.
@@ -1863,8 +1856,6 @@
         time_alignmt =time_alignmt_mem;
         fn_offset    =fn_offset_mem;
         l1a_sub_timeslot(&time_alignmt, &fn_offset, l1a_l1s_com.dl_tn);
-	if (neigh_number < 6 )
-	{
 
         l1a_l1s_com.bcchn.list[neigh_number].radio_freq    = ((T_MPHC_NCELL_BCCH_REQ *)(msg->SigP))->radio_freq;
         l1a_l1s_com.bcchn.list[neigh_number].fn_offset     = fn_offset;
@@ -1883,9 +1874,7 @@
           l1a_l1s_com.bcchn.list[neigh_number].gprs_priority = NORMAL_PRIORITY;
         #endif
 
-	}
         // Enable L1S activity on this new neighbour task BCCH.
-     if (neigh_number < 6 )//OMAPS00090550
         l1a_l1s_com.bcchn.list[neigh_number].status  = NSYNC_PENDING;
 
         l1a_l1s_com.bcchn.current_list_size         += 1;
@@ -1984,15 +1973,7 @@
                       (l1a_l1s_com.bcchn.list[j].status != NSYNC_FREE)) &&
                     (j < 6))
               {
-				if(j < 5 ) //OMAPS00090550
-				{
                 	j++;
-				}
-				else
-				{
-					j++;
-					break;
-				}
               }
 
               // If found, reset L1 structure for this carrier.
@@ -2153,7 +2134,6 @@
 
           UWORD8  *state      = &l1a.state[I_6MP];
           UWORD32  SignalCode = msg->SignalCode;
-  static  UWORD8   sb_attempt;
 
 
 #if (L1_12NEIGH == 1)
@@ -3526,9 +3506,24 @@
 /* -----------------------  (MPHC_STOP_CCCH_CON)         */
 /*                                                       */
 /*-------------------------------------------------------*/
-//Nina added
+
+/*
+ * FreeCalypso Frankenstein: the source we got with LoCosto contains
+ * some logic, apparently designed to increase opportunities for
+ * deep sleep, marked with "Nina added" comments.  This addition by
+ * Nina showed up on our radar because it makes use of a new member
+ * in the l1s structure which is not present in the TCS211 version
+ * of this data structure, which we are not allowed to change while
+ * deblobbing L1 one module at a time.  I am going to turn Nina's
+ * addition into a conditional compilation option. -- Mychaela
+ */
+
+#define	NINA_ADDED	0
+
+#if NINA_ADDED
 INT8 last_page_mode = 2; //REORG;
-//End Nina added
+#endif
+
 void l1a_idle_serving_cell_paging_process(xSignalHeaderRec *msg)
 {
   enum states
@@ -3566,7 +3561,9 @@
 
         // No Paging  => no gauging => no Deep sleep
         //Nina modify to save power, not forbid deep sleep, only force gauging in next paging
+#if NINA_ADDED
         if(l1s.force_gauging_next_paging_due_to_CCHR == 0) // Force gauging next paging
+#endif
         l1s.pw_mgr.enough_gaug = FALSE;  // forbid Deep sleep
 
       }
@@ -3578,14 +3575,14 @@
         {
           // download page mode from message (msg)
           page_mode = ((T_MPHC_START_CCCH_REQ *)(msg->SigP))->page_mode;
-//Nina added
+#if NINA_ADDED
 if(((last_page_mode == NORMAL) && (page_mode == EXTENDED)) ||
 	((last_page_mode == EXTENDED) && (page_mode == NORMAL)))
 {
 l1s.force_gauging_next_paging_due_to_CCHR = 1;
 }
 			last_page_mode = page_mode;
-//End Nina added
+#endif
 
           if(page_mode == REORG)
           // Request to enter the PAGING REORGANIZATION paging mode.
@@ -3837,7 +3834,7 @@
         {
           // download paging mode from msg
           page_mode = ((T_MPHC_START_CCCH_REQ *)(msg->SigP))->page_mode;
-//Nina added
+#if NINA_ADDED
 
 			if(((last_page_mode == NORMAL) && (page_mode == EXTENDED)) ||
 				((last_page_mode == EXTENDED) && (page_mode == NORMAL)))
@@ -3845,7 +3842,7 @@
 			l1s.force_gauging_next_paging_due_to_CCHR = 1;
 			}
 			last_page_mode = page_mode;
-//End Nina added
+#endif
           if ((page_mode == NORMAL) || (page_mode == REORG))
           {
             // Step in state machine.
@@ -3973,7 +3970,9 @@
 
             // Paging parameters change => perform the gauging on the next paging
         //Nina modify to save power, not forbid deep sleep, only force gauging in next paging
+#if NINA_ADDED
 if(l1s.force_gauging_next_paging_due_to_CCHR == 0)
+#endif
 l1s.pw_mgr.enough_gaug = FALSE;  // forbid Deep sleep until next gauging
 //End Nina modify
 
@@ -4133,7 +4132,6 @@
   static WORD16   static_attempt_counter_1;
 
 
-  static UWORD8   static_first_synch_flag = TRUE;
   static UWORD8   static_sb_found_flag;
   static UWORD8   static_bsic;
   static UWORD32  static_fn_offset;
@@ -5127,10 +5125,10 @@
   UWORD8                *state      = &l1a.state[I_SMSCB];
   UWORD32                SignalCode = msg->SignalCode;
 
-  UWORD32                first_block_0 =0;
-  UWORD32                first_block_1= 0;
-  BOOL                   extended_cbch =FALSE; //oamps00090550
-  T_CBCH_HEAD_SCHEDULE  *cbch_schedule_ptr= NULL ;
+  UWORD32                first_block_0;
+  UWORD32                first_block_1;
+  BOOL                   extended_cbch;
+  T_CBCH_HEAD_SCHEDULE  *cbch_schedule_ptr;
   UWORD8                 schedule_length;
 
   BOOL end_process = 0;
@@ -5446,9 +5444,10 @@
             return;
           }
         }
-          else
-          if(SignalCode == L1C_DEDIC_DONE)
-          {
+#if 0	/* match TCS211 */
+        else
+        if(SignalCode == L1C_DEDIC_DONE)
+        {
             // Stop SMSCB task.
             l1a_l1s_com.l1s_en_task[SMSCB] = TASK_DISABLED;
 
@@ -5460,8 +5459,8 @@
 
 	    // Step in state machine.
            *state = RESET;        
-
-        }
+        }
+#endif
 
         else
         // No action in this machine for other messages.
@@ -5475,8 +5474,6 @@
 
       case SET_SCHEDULE:
       {
-        if(cbch_schedule_ptr != NULL)
-        {
         UWORD8  i,j;
         UWORD8  mf51_offset;
 
@@ -5530,7 +5527,7 @@
 
         // Step in state machine.
         *state = WAIT_RESULT;
-       }
+
         // End of process.
         return;
       }
@@ -5561,7 +5558,8 @@
         }
 
         else
-        if((SignalCode == MPHC_STOP_CBCH_REQ)||(SignalCode == L1C_DEDIC_DONE))
+        //if((SignalCode == MPHC_STOP_CBCH_REQ)||(SignalCode == L1C_DEDIC_DONE))
+        if(SignalCode == MPHC_STOP_CBCH_REQ)
         // Request to (may be partially) STOP reading the CBCH.
         //-----------------------------------------------------
         {
@@ -5803,9 +5801,10 @@
 {
   enum states
   {
-    RESET     = 0,
-    WAIT_INIT = 1,
-    WAIT_MSG  = 2
+    RESET          = 0,
+    WAIT_INIT      = 1,
+    WAIT_DYN_DWNLD = 2,
+    WAIT_MSG       = 3
   };
 
           T_DEDIC_SET  *free_set;
@@ -5941,18 +5940,46 @@
             // Set "fset" pointer to the new parameter set.
             l1a_l1s_com.dedic_set.fset = free_set;
 
-            // Give new msg code to L1S.
-            l1a_l1s_com.dedic_set.SignalCode = MPHC_IMMED_ASSIGN_REQ;
-
-            #if (TRACE_TYPE==5) && FLOWCHART
-              trace_flowchart_dedic(l1a_l1s_com.dedic_set.SignalCode);
-            #endif
-
-            // Set confirmation message name.
-            l1a.confirm_SignalCode = MPHC_IMMED_ASSIGN_CON;
-
-            // step in state machine.
-            *state = WAIT_MSG;
+            /*
+             * FreeCalypso: the following logic related to dynamic DSP
+             * patching has been reconstructed from our only available
+             * binary object version.
+             */
+          #if (L1_DYN_DSP_DWNLD == 1)
+            if (l1a.dyn_dwnld.semaphore_vect[DEDI_STATE_MACHINE]==GREEN)
+          #endif
+            {
+              // Give new msg code to L1S.
+              l1a_l1s_com.dedic_set.SignalCode = MPHC_IMMED_ASSIGN_REQ;
+
+              #if (TRACE_TYPE==5) && FLOWCHART
+                trace_flowchart_dedic(l1a_l1s_com.dedic_set.SignalCode);
+              #endif
+
+              // Set confirmation message name.
+              l1a.confirm_SignalCode = MPHC_IMMED_ASSIGN_CON;
+
+              // step in state machine.
+              *state = WAIT_MSG;
+            }
+          #if (L1_DYN_DSP_DWNLD == 1)
+            else
+            {
+              *state = WAIT_DYN_DWNLD;
+              #if ((TRACE_TYPE == 1) || (TRACE_TYPE == 4) || (TRACE_TYPE == 5))
+                if((trace_info.current_config->l1_dyn_trace) & (1<<L1_DYN_TRACE_DYN_DWNLD))
+                {
+                  char str[30];
+                  sprintf(str,"DEDI SM blocked by DYN DWNLD\r\n");
+                  #if(CODE_VERSION == SIMULATION)
+                     trace_fct_simu_dyn_dwnld(str);
+                  #else
+                     rvt_send_trace_cpy((T_RVT_BUFFER)str,trace_info.l1_trace_user_id,strlen(str),RVT_ASCII_FORMAT);
+                  #endif
+                }
+              #endif    // (TRACE_TYPE == 1) || (TRACE_TYPE == 4)
+            }
+          #endif
           }
           break;
 
@@ -6206,6 +6233,7 @@
             free_set->cell_desc.meas.acc         = 0;
             free_set->cell_desc.meas.nbr_meas    = 0;
 
+#if 0	/* FreeCalypso TCS211 reconstruction */
 #if (L1_FF_MULTIBAND == 0) // TBD 
             free_set->cell_desc.traffic_meas_beacon = l1a_l1s_com.last_input_level[radio_freq - l1_config.std.radio_freq_index_offset];
             free_set->cell_desc.traffic_meas        = l1a_l1s_com.last_input_level[radio_freq - l1_config.std.radio_freq_index_offset];
@@ -6218,6 +6246,7 @@
             free_set->cell_desc.traffic_meas        = l1a_l1s_com.last_input_level[operative_radio_freq];
             
 #endif // #if (L1_FF_MULTIBAND == 1) else                    
+#endif
 
             // Download the message content.
             free_set->chan1.desc           = ((T_MPHC_SYNC_HO_REQ *)(msg->SigP))->handover_command.channel_desc_1;
@@ -6601,6 +6630,50 @@
       }
       break;
 
+      /*
+       * FreeCalypso: the following logic related to dynamic DSP
+       * patching has been reconstructed from our only available
+       * binary object version.
+       */
+    #if (L1_DYN_DSP_DWNLD == 1)
+      case WAIT_DYN_DWNLD:
+      {
+        if((SignalCode==API_L1_DYN_DWNLD_FINISHED) && (l1a.dyn_dwnld.semaphore_vect[DEDI_STATE_MACHINE] == GREEN))
+        {
+          /* replicate the code that would have executed originally */
+
+          // Give new msg code to L1S.
+          l1a_l1s_com.dedic_set.SignalCode = MPHC_IMMED_ASSIGN_REQ;
+
+          #if (TRACE_TYPE==5) && FLOWCHART
+            trace_flowchart_dedic(l1a_l1s_com.dedic_set.SignalCode);
+          #endif
+
+          // Set confirmation message name.
+          l1a.confirm_SignalCode = MPHC_IMMED_ASSIGN_CON;
+
+          #if ((TRACE_TYPE == 1) || (TRACE_TYPE == 4) || (TRACE_TYPE == 5))
+            if((trace_info.current_config->l1_dyn_trace) & (1<<L1_DYN_TRACE_DYN_DWNLD))
+            {
+              char str[30];
+              sprintf(str,"DEDI SM un-blocked\r\n");
+              #if(CODE_VERSION == SIMULATION)
+                 trace_fct_simu_dyn_dwnld(str);
+              #else
+                 rvt_send_trace_cpy((T_RVT_BUFFER)str,trace_info.l1_trace_user_id,strlen(str),RVT_ASCII_FORMAT);
+              #endif
+            }
+          #endif    // (TRACE_TYPE == 1) || (TRACE_TYPE == 4)
+
+          // step in state machine.
+          *state = WAIT_MSG;
+        }
+        // End process
+        end_process = 1;
+      }
+      break;
+    #endif
+
       case WAIT_MSG:
       {
         switch(SignalCode)
@@ -6764,7 +6837,7 @@
             //         0   |    1   speech decoder
             //         0   |    0   no test
 
-            #if ((ANALOG == 1) || (ANALOG == 2) || (ANALOG == 3) || (ANALOG == 11))
+            #if ((ANLG_FAM == 1) || (ANLG_FAM == 2) || (ANLG_FAM == 3) || (ANLG_FAM == 11))
               vbctl3 = ( (l1s_dsp_com.dsp_ndb_ptr ->d_dai_onoff & 0xE7FF) |
                        (dai_vbctl3[((T_OML1_START_DAI_TEST_REQ *)(msg->SigP))->tested_device] << 11) );
               l1s_dsp_com.dsp_ndb_ptr ->d_dai_onoff = vbctl3 | TRUE;
@@ -6793,7 +6866,7 @@
             // DAI test is stopped "on fly".
             l1a_l1s_com.dedic_set.aset->dai_mode = 0;
 
-             #if ((ANALOG == 1) || (ANALOG == 2) || (ANALOG == 3))
+             #if ((ANLG_FAM == 1) || (ANLG_FAM == 2) || (ANLG_FAM == 3))
               // program vbctl3
               vbctl3 = (l1s_dsp_com.dsp_ndb_ptr ->d_dai_onoff & 0xE7FF);
               l1s_dsp_com.dsp_ndb_ptr ->d_dai_onoff = vbctl3 | TRUE;
@@ -7882,10 +7955,6 @@
   UWORD8  *state      = &l1a.state[DEDIC_6];
   UWORD32  SignalCode = msg->SignalCode;
 
- // use only in packet transfer mode
-  // these variables memorize this SBCNF parameters.
-  static UWORD32  time_alignmt_mem;
-  static UWORD32  fn_offset_mem;
   //#if !L1_R99
   static UWORD8   nb_fb_attempt;
   //#endif
@@ -7981,8 +8050,8 @@
       case NSYNC_CONFIG:
       {
         UWORD8   neigh_id = l1a_l1s_com.nsync.first_in_list;
-        UWORD32  time_alignmt =0; //omaps00090550
-        UWORD32  fn_offset=0; //omaps00090550;
+        UWORD32  time_alignmt;
+        UWORD32  fn_offset;
 
         // Request to acquire FB/SB or to confirm FB or SB from one ncell.
         //----------------------------------------------------------------
@@ -8268,6 +8337,12 @@
 
         // disable all tasks
         l1a_l1s_com.l1s_en_task[NSYNC] = TASK_DISABLED;
+        l1a_l1s_com.l1s_en_task[FB51]  = TASK_DISABLED; 
+        l1a_l1s_com.l1s_en_task[FB26]  = TASK_DISABLED; 
+        l1a_l1s_com.l1s_en_task[SB51]  = TASK_DISABLED; 
+        l1a_l1s_com.l1s_en_task[SB26]  = TASK_DISABLED; 
+        l1a_l1s_com.l1s_en_task[SBCNF26]  = TASK_DISABLED; 
+        l1a_l1s_com.l1s_en_task[SBCNF51]  = TASK_DISABLED; 
 
         // Set semaphores for all neighbor relative task.
         l1a_l1s_com.task_param[NSYNC]= SEMAPHORE_SET;     // Set NSYNC   task semaphore.
@@ -8900,6 +8975,12 @@
 
           // Disable neighbor sync. tasks.
           l1a_l1s_com.l1s_en_task[NSYNC] = TASK_DISABLED;
+          l1a_l1s_com.l1s_en_task[FB51]  = TASK_DISABLED; 
+          l1a_l1s_com.l1s_en_task[FB26]  = TASK_DISABLED; 
+          l1a_l1s_com.l1s_en_task[SB51]  = TASK_DISABLED; 
+          l1a_l1s_com.l1s_en_task[SB26]  = TASK_DISABLED; 
+          l1a_l1s_com.l1s_en_task[SBCNF26]  = TASK_DISABLED; 
+          l1a_l1s_com.l1s_en_task[SBCNF51]  = TASK_DISABLED; 
 
           if(array_size != NBR_NEIGHBOURS)
           {
@@ -8922,8 +9003,10 @@
               {
                 l1a_l1s_com.nsync.list[j].status = NSYNC_FREE;
                 l1a_l1s_com.nsync.current_list_size --;
-				if (l1a_l1s_com.nsync.list[l1a_l1s_com.nsync.active_fb_id].radio_freq == radio_freq)
-                  l1a_l1s_com.l1s_en_task[FB26]  = TASK_DISABLED;
+                #if 0	/* FreeCalypso: match TCS211 object */
+                  if (l1a_l1s_com.nsync.list[l1a_l1s_com.nsync.active_fb_id].radio_freq == radio_freq)
+                    l1a_l1s_com.l1s_en_task[FB26]  = TASK_DISABLED;
+                #endif
               }
             }
           }
@@ -9000,6 +9083,7 @@
                 (l1a.confirm_SignalCode == MPHC_ASYNC_HO_CON) ||
                 (l1a.confirm_SignalCode == MPHC_HANDOVER_FAIL_CON)) )
               {
+              #if 0	/* LoCosto L1 code, doesn't match TCS211 */
                 l1a_l1s_com.l1s_en_task[NSYNC] = TASK_DISABLED;
                 l1a_l1s_com.l1s_en_task[FB51]  = TASK_DISABLED;
                 l1a_l1s_com.l1s_en_task[FB26]  = TASK_DISABLED;
@@ -9057,6 +9141,17 @@
                   // Enable neighbour sync task.
                   l1a_l1s_com.l1s_en_task[NSYNC] = TASK_ENABLED;
                 } // if
+              #else
+                /* code from TSM30 version, matches TCS211 object */
+                #if (L1_EOTD ==1)
+                  // FN and time reference are WRONG for remaining neigbours....
+                  // --> abort all.
+                  l1a_l1s_com.nsync.eotd_meas_session = FALSE;
+                #endif
+                // Step in state machine.
+                *state = STOP_NSYNC;                
+                break;
+              #endif
               } // if
 
             else
@@ -9391,6 +9486,8 @@
 
       case WAIT_INIT:
       {
+#if 0	/* FreeCalypso: match TCS211 object */
+
 #if (OP_SAP == 0)
         if (SignalCode == MPHC_UPDATE_BA_LIST)
 #else
@@ -9447,15 +9544,18 @@
           *state = WAIT_RESULT;
         }
         else
+#endif	/* FreeCalypso TCS211 reconstruction */
 
         if(SignalCode == L1C_DEDIC_DONE)
         // We enter DEDICATED mode.
         //-------------------------
         {
+#if 0	/* FreeCalypso: match TCS211 object */
 #if (CODE_VERSION == NOT_SIMULATION)
           if (l1a_l1s_com.ba_list.nbr_carrier == 0)
              return;
 #endif
+#endif
 
           // Set parameter synchro semaphore for D_BAMS task.
           l1a_l1s_com.meas_param |= D_BAMS_MEAS;
--- a/L1/cfile/l1_cmplx.c	Thu Jun 09 05:38:18 2016 +0000
+++ b/L1/cfile/l1_cmplx.c	Thu Jun 09 05:45:03 2016 +0000
@@ -11,9 +11,8 @@
 
 //#pragma DUPLICATE_FOR_INTERNAL_RAM_START
 
-#include "config.h"
+#include "l1_macro.h"
 #include "l1_confg.h"
-#include "l1_macro.h"
 
 #if (CODE_VERSION == SIMULATION)
   #include <string.h>
@@ -74,7 +73,7 @@
   extern T_hw FAR hw;
 
 #else
-  #include "../../bsp/abb+spi/abb.h"
+  #include "abb.h"
   #include <string.h>
   #include "l1_types.h"
   #include "sys_types.h"
@@ -109,7 +108,7 @@
     #include "l1aac_defty.h"
   #endif
   #include "l1_defty.h"
-  #include "../../gpf/inc/cust_os.h"
+  #include "cust_os.h"
   #include "l1_msgty.h"
   #include "l1_varex.h"
   #include "l1_proto.h"
@@ -148,7 +147,7 @@
   #include "l1tm_signa.h"
   #include "l1tm_varex.h"
   void l1tm_fill_burst (UWORD16 pattern, UWORD16 *TM_ul_data);
-  #if (ANALOG != 11)
+  #if (ANLG_FAM != 11)
   void ABB_Write_Uplink_Data(SYS_UWORD16 *TM_ul_data);
   #else
   // TODO
@@ -213,13 +212,13 @@
                               );
 #endif /* RF_FAM == 61*/
 
-void l1ddsp_meas_read        (UWORD8 nbmeas, UWORD16 *pm);
+void l1ddsp_meas_read        (UWORD8 nbmeas, UWORD8 *pm);
 
 #if L1_GPRS
 void l1pddsp_synchro         (UWORD8 switch_mode, UWORD8  camp_timeslot);
 void l1pddsp_load_bcchn_task (UWORD8 tsq,UWORD16 radio_freq);
 void l1pddsp_meas_ctrl       (UWORD8 nbmeas, UWORD8 pm_pos);
-void l1pddsp_meas_read       (UWORD8 nbmeas, UWORD16 *a_pm);
+void l1pddsp_meas_read       (UWORD8 nbmeas, UWORD8 *a_pm);
 #if FF_L1_IT_DSP_USF
 void l1pddsp_idle_rx_nb      (UWORD8 burst_nb, UWORD8 tsq, UWORD16 radio_freq,
                               UWORD8 timeslot_no, BOOL ptcch_dl, BOOL usf_interrupt);
@@ -234,11 +233,6 @@
   UWORD8 input_level_flag, UWORD8 input_level, UWORD16 radio_freq, UWORD8 if_threshold);
 #endif
 
-#if FEATURE_TCH_REROUTE
-extern BOOL tch_reroute_downlink;
-extern void tch_send_downlink_bits(API *dsp_buffer);
-extern void tch_substitute_uplink(API *dsp_buffer);
-#endif
 
 //#pragma DUPLICATE_FOR_INTERNAL_RAM_END
 
@@ -455,12 +449,14 @@
   l1a_l1s_com.l1s_en_task[SYNCHRO] = TASK_DISABLED;
   l1s.task_status[SYNCHRO].current_status = INACTIVE;
 
+  #if 0	/* FreeCalypso TCS211 reconstruction */
   #if L1_GPRS
   //Change of mode when synchro is executed when switching from idle to transfer
   //In this case, PDTCH task has been enabled in transfer mode manager, but the mode is still not PACKET_TRANSFER_MODE
   if((l1a_l1s_com.l1s_en_task[PDTCH] == TASK_ENABLED) && (l1a_l1s_com.mode != PACKET_TRANSFER_MODE))
     l1a_l1s_com.mode = PACKET_TRANSFER_MODE;
   #endif
+  #endif
 
   // Compute timeshift.
   // *******************
@@ -544,7 +540,11 @@
 
   // the FN was changed: it could have an impact on the gauging algorithm
         //Nina modify to save power, not forbid deep sleep, only force gauging in next paging
+	/* FreeCalypso Frankenstein: see l1_async.c regarding Nina's change */
+#define	NINA_ADDED	0
+#if NINA_ADDED
 if(l1s.force_gauging_next_paging_due_to_CCHR != 1)
+#endif
 {
 l1s.pw_mgr.enough_gaug = FALSE;  // forbid Deep sleep until next gauging
 }
@@ -1116,10 +1116,10 @@
     // ********************************
 #if (L1_FF_MULTIBAND == 0)
 
+    // Get AGC to be applied.
+    agc = Cust_get_agc_from_IL(cell_info_ptr->radio_freq,l1a_l1s_com.last_input_level[cell_info_ptr->radio_freq - l1_config.std.radio_freq_index_offset].input_level >> 1, AV_ID);
     // lna_off flag is updated ONLY in case of l1ctl_pgc2 control algo
     lna_off = l1a_l1s_com.last_input_level[cell_info_ptr->radio_freq - l1_config.std.radio_freq_index_offset].lna_off;
-    // Get AGC to be applied.
-    agc = Cust_get_agc_from_IL(cell_info_ptr->radio_freq,l1a_l1s_com.last_input_level[cell_info_ptr->radio_freq - l1_config.std.radio_freq_index_offset].input_level >> 1, AV_ID, lna_off);
 
 #else // L1_FF_MULTIBAND = 1 below
 
@@ -1127,7 +1127,7 @@
     // lna_off flag is updated ONLY in case of l1ctl_pgc2 control algo
     lna_off = l1a_l1s_com.last_input_level[operative_radio_freq].lna_off;
     // Get AGC to be applied.
-    agc = Cust_get_agc_from_IL(cell_info_ptr->radio_freq,l1a_l1s_com.last_input_level[operative_radio_freq].input_level >> 1, AV_ID, lna_off);
+    agc = Cust_get_agc_from_IL(cell_info_ptr->radio_freq,l1a_l1s_com.last_input_level[operative_radio_freq].input_level >> 1, AV_ID);
     
 #endif // #if (L1_FF_MULTIBAND == 0) else
 
@@ -1270,7 +1270,7 @@
   lna_off = l1a_l1s_com.last_input_level[l1a_l1s_com.nsync_fbsb.radio_freq - l1_config.std.radio_freq_index_offset].lna_off;
 
   // Get AGC to be applied.
-  agc = Cust_get_agc_from_IL(l1a_l1s_com.nsync_fbsb.radio_freq, l1a_l1s_com.last_input_level[l1a_l1s_com.nsync_fbsb.radio_freq - l1_config.std.radio_freq_index_offset].input_level >> 1, AV_ID, lna_off);
+  agc = Cust_get_agc_from_IL(l1a_l1s_com.nsync_fbsb.radio_freq, l1a_l1s_com.last_input_level[l1a_l1s_com.nsync_fbsb.radio_freq - l1_config.std.radio_freq_index_offset].input_level >> 1, AV_ID);
 
 #else // L1_FF_MULTIBAND = 1 below
 
@@ -1282,7 +1282,7 @@
 
   // Get AGC to be applied.
   agc = 
-    Cust_get_agc_from_IL(l1a_l1s_com.nsync_fbsb.radio_freq, l1a_l1s_com.last_input_level[operative_radio_freq].input_level >> 1, AV_ID, lna_off);
+    Cust_get_agc_from_IL(l1a_l1s_com.nsync_fbsb.radio_freq, l1a_l1s_com.last_input_level[operative_radio_freq].input_level >> 1, AV_ID);
 
 #endif // #if (L1_FF_MULTIBAND == 0) else 
 
@@ -1526,10 +1526,10 @@
     // ********************************
 #if (L1_FF_MULTIBAND == 0)
     
+    // Get AGC to be applied.
+    agc = Cust_get_agc_from_IL(cell_info_ptr->radio_freq, input_level >> 1, AV_ID);
     // lna_off flag is ONLY updated in case of l1ctl_pgc2 control algorithm
     lna_off = l1a_l1s_com.last_input_level[cell_info_ptr->radio_freq - l1_config.std.radio_freq_index_offset].lna_off;
-    // Get AGC to be applied.
-    agc = Cust_get_agc_from_IL(cell_info_ptr->radio_freq, input_level >> 1, AV_ID,lna_off);
 
 #else // L1_FF_MULTIBAND = 0 below
 
@@ -1539,7 +1539,7 @@
     lna_off = l1a_l1s_com.last_input_level[operative_radio_freq].lna_off;
     // Get AGC to be applied.
     agc = 
-      Cust_get_agc_from_IL(cell_info_ptr->radio_freq, input_level >> 1, AV_ID,lna_off);
+      Cust_get_agc_from_IL(cell_info_ptr->radio_freq, input_level >> 1, AV_ID);
 
 #endif // #if (L1_FF_MULTIBAND == 0) else
 
@@ -1701,9 +1701,9 @@
     // ****************************
 #if (L1_FF_MULTIBAND == 0)
     
+    // agc is just computed from last stored IL
+    agc     = Cust_get_agc_from_IL(radio_freq, l1a_l1s_com.last_input_level[radio_freq - l1_config.std.radio_freq_index_offset].input_level >> 1, AV_ID);
     lna_off = l1a_l1s_com.last_input_level[radio_freq - l1_config.std.radio_freq_index_offset].lna_off;
-    // agc is just computed from last stored IL
-    agc     = Cust_get_agc_from_IL(radio_freq, l1a_l1s_com.last_input_level[radio_freq - l1_config.std.radio_freq_index_offset].input_level >> 1, AV_ID, lna_off);
 
 #else // L1_FF_MULTIBAND = 1 below
 
@@ -1712,7 +1712,7 @@
     lna_off = l1a_l1s_com.last_input_level[operative_radio_freq].lna_off;
     // agc is just computed from last stored IL
     agc     = 
-    Cust_get_agc_from_IL(radio_freq, l1a_l1s_com.last_input_level[operative_radio_freq].input_level >> 1, AV_ID, lna_off);
+    Cust_get_agc_from_IL(radio_freq, l1a_l1s_com.last_input_level[operative_radio_freq].input_level >> 1, AV_ID);
 
 #endif // #if (L1_FF_MULTIBAND == 1) else
 
@@ -1840,7 +1840,7 @@
     UWORD16  radio_freq = 0;
     UWORD32  time_alignmt = 0;
 #if (L1_12NEIGH ==1)
-    T_NCELL_SINGLE *cell_info_ptr = NULL;
+    T_NCELL_SINGLE *cell_info_ptr;
 
     if (task == SB26)
        cell_info_ptr = &l1a_l1s_com.nsync.list[l1a_l1s_com.nsync.active_sb_id];
@@ -1867,11 +1867,8 @@
        cell_info_ptr = &l1a_l1s_com.nsync.list[l1a_l1s_com.nsync.active_sbconf_id];
 
     }
-if(cell_info_ptr != NULL)//OMAPS00090550
-{
     radio_freq   = cell_info_ptr->radio_freq;
     time_alignmt = cell_info_ptr->time_alignmt;
-}
 
 #else
     // Get the cell information.
@@ -1905,8 +1902,6 @@
     // ********************************
   temp = (UWORD32)(l1_config.params.fb26_anchoring_time - EPSILON_SYNC);
   #if (L1_12NEIGH ==1)
-  if(cell_info_ptr != NULL)//OMAPS00090550
-  {
       if((cell_info_ptr->sb26_offset == 1) &&
          (time_alignmt >= temp)) //omaps00090550
   #else
@@ -1920,16 +1915,13 @@
     {
       nb_nop = 1;
     }
-   #if (L1_12NEIGH ==1)
-	}
-   #endif
 
 #if (L1_FF_MULTIBAND == 0)
 
     // agc is just computed from last stored IL
     input_level = l1a_l1s_com.last_input_level[radio_freq - l1_config.std.radio_freq_index_offset].input_level;
+    agc     = Cust_get_agc_from_IL(radio_freq, input_level >> 1, AV_ID);
     lna_off = l1a_l1s_com.last_input_level[radio_freq - l1_config.std.radio_freq_index_offset].lna_off;
-    agc     = Cust_get_agc_from_IL(radio_freq, input_level >> 1, AV_ID, lna_off);
 
 #else // L1_FF_MULTIBAND = 1 below
 
@@ -1938,7 +1930,7 @@
     // agc is just computed from last stored IL
     input_level = l1a_l1s_com.last_input_level[operative_radio_freq].input_level;
     lna_off = l1a_l1s_com.last_input_level[operative_radio_freq].lna_off;    
-    agc     = Cust_get_agc_from_IL(radio_freq, input_level >> 1, AV_ID, lna_off);    
+    agc     = Cust_get_agc_from_IL(radio_freq, input_level >> 1, AV_ID);    
 
 #endif // #if (L1_FF_MULTIBAND == 0) else
 
@@ -2067,7 +2059,9 @@
   UWORD32  dsp_task;
   static   WORD32 new_tpu_offset;
   static   BOOL   change_synchro;
+#if 0	/* FreeCalypso TCS211 reconstruction */
   UWORD8 input_level;
+#endif
 #if (L1_FF_MULTIBAND == 1)
   UWORD16 operative_radio_freq;
 #endif
@@ -2076,12 +2070,12 @@
   UWORD8 saic_flag=0;
 #endif /* NEW_SNR_THRESHOLD */
 #if (RF_FAM == 61)
-    UWORD16 dco_algo_ctl_nb = 0;
-    UWORD8 if_ctl = 0;
-	UWORD8 if_threshold = C_IF_ZERO_LOW_THRESHOLD_GSM;
-#endif
+  UWORD16 dco_algo_ctl_nb = 0;
+  UWORD8 if_ctl = 0;
+  UWORD8 if_threshold = C_IF_ZERO_LOW_THRESHOLD_GSM;
   // By default we choose the hardware filter
   UWORD8 csf_filter_choice = L1_SAIC_HARDWARE_FILTER;
+#endif
 
   // Needed for simulated DSP GRPS scheduler
   #if (CODE_VERSION == SIMULATION)
@@ -2190,12 +2184,18 @@
     if (offset_smscb >= TPU_CLOCK_RANGE)
       offset_smscb -= TPU_CLOCK_RANGE;
 
-#if (L1_FF_MULTIBAND == 0)
+#if 1	/* FreeCalypso match TCS211 */
+
+    // agc is set with the input_level computed from PAGC algo
+    agc     = Cust_get_agc_from_IL(l1a_l1s_com.Scell_info.radio_freq, l1a_l1s_com.last_input_level[l1a_l1s_com.Scell_info.radio_freq - l1_config.std.radio_freq_index_offset].input_level >> 1, MAX_ID);
+    lna_off = l1a_l1s_com.last_input_level[l1a_l1s_com.Scell_info.radio_freq - l1_config.std.radio_freq_index_offset].lna_off;
+
+#elif (L1_FF_MULTIBAND == 0)
 
     // agc is set with the input_level computed from PAGC algo
     input_level =  l1a_l1s_com.last_input_level[l1a_l1s_com.Scell_info.radio_freq - l1_config.std.radio_freq_index_offset].input_level;
+    agc     = Cust_get_agc_from_IL(l1a_l1s_com.Scell_info.radio_freq,input_level >> 1, MAX_ID);
     lna_off = l1a_l1s_com.last_input_level[l1a_l1s_com.Scell_info.radio_freq - l1_config.std.radio_freq_index_offset].lna_off;
-    agc     = Cust_get_agc_from_IL(l1a_l1s_com.Scell_info.radio_freq,input_level >> 1, MAX_ID, lna_off);
 
 #else // L1_FF_MULTIBAND = 1 below
 
@@ -2203,7 +2203,7 @@
       l1_multiband_radio_freq_convert_into_operative_radio_freq(l1a_l1s_com.Scell_info.radio_freq); 
     input_level =  l1a_l1s_com.last_input_level[operative_radio_freq].input_level;
     lna_off = l1a_l1s_com.last_input_level[operative_radio_freq].lna_off;
-    agc     = Cust_get_agc_from_IL(l1a_l1s_com.Scell_info.radio_freq,input_level >> 1, MAX_ID, lna_off);
+    agc     = Cust_get_agc_from_IL(l1a_l1s_com.Scell_info.radio_freq,input_level >> 1, MAX_ID);
 
 
 #endif // #if (L1_FF_MULTIBAND == 0) else
@@ -2218,7 +2218,12 @@
 
     // Store IL used for current CTRL in order to be able to buil IL from pm
     // in READ phase.
-#if (L1_FF_MULTIBAND == 0)
+#if 1	/* FreeCalypso match TCS211 */
+
+    l1a_l1s_com.Scell_used_IL.input_level = l1a_l1s_com.last_input_level[l1a_l1s_com.Scell_info.radio_freq - l1_config.std.radio_freq_index_offset].input_level;
+    l1a_l1s_com.Scell_used_IL.lna_off     = l1a_l1s_com.last_input_level[l1a_l1s_com.Scell_info.radio_freq - l1_config.std.radio_freq_index_offset].lna_off;
+
+#elif (L1_FF_MULTIBAND == 0)
 
     l1a_l1s_com.Scell_used_IL.input_level = input_level;
     l1a_l1s_com.Scell_used_IL.lna_off     = l1a_l1s_com.last_input_level[l1a_l1s_com.Scell_info.radio_freq - l1_config.std.radio_freq_index_offset].lna_off;
@@ -2315,7 +2320,9 @@
 #if !((MOVE_IN_INTERNAL_RAM == 1) && (GSM_IDLE_RAM !=0))  // MOVE TO INTERNAL MEM IN CASE GSM_IDLE_RAM enabled
 //#pragma GSM_IDLE_DUPLICATE_FOR_INTERNAL_RAM_START         // KEEP IN EXTERNAL MEM otherwise
 
+#if 0	/* FreeCalypso TCS211 reconstruction */
 UWORD32 qual_acc_idle1[2];
+#endif
 
 /*-------------------------------------------------------*/
 /* l1s_ctrl_snb_dl()                                     */
@@ -2425,27 +2432,30 @@
   UWORD8          tsc;
   T_INPUT_LEVEL  *IL_info_ptr;
   UWORD32         dsp_task;
-  //static  BOOL    change_synchro;
+  static  BOOL    change_synchro;
   UWORD8          adc_active = INACTIVE;
 #if (L1_FF_MULTIBAND == 1)
   UWORD16 operative_radio_freq;
 #endif /*L1_FF_MULTIBAND*/
   
 #if L1_GPRS
+  static  BOOL    algo_change_synchro_active = FALSE;
   static  BOOL    BCCHS_in_transfert = FALSE;
-  static  BOOL    change_synchro;//OMAPS90550-new
-#endif
-UWORD8 input_level = 0; //omaps00090550
+#endif
+#if 0	/* FreeCalypso match TCS211 */
+  UWORD8 input_level = 0; //omaps00090550
+#endif
 #if (RF_FAM == 61)
-    UWORD16 dco_algo_ctl_nb = 0;
-    UWORD8 if_ctl = 0;
-	UWORD8 if_threshold = C_IF_ZERO_LOW_THRESHOLD_GSM;
+  UWORD16 dco_algo_ctl_nb = 0;
+  UWORD8 if_ctl = 0;
+  UWORD8 if_threshold = C_IF_ZERO_LOW_THRESHOLD_GSM;
+  // By default we choose the hardware filter
+  UWORD8 csf_filter_choice = L1_SAIC_HARDWARE_FILTER;
 #endif
 #if (NEW_SNR_THRESHOLD == 1)
   UWORD8 saic_flag=0;
 #endif /* NEW_SNR_THRESHOLD */
-  // By default we choose the hardware filter
-  UWORD8 csf_filter_choice = L1_SAIC_HARDWARE_FILTER;
+
 #if (FF_L1_FAST_DECODING == 1)
   BOOL fast_decoding_authorized = FALSE;
 
@@ -2490,53 +2500,53 @@
 
       // Set CIPHERING reduced frame number.
 #if (AMR == 1)
-#if (FF_L1_TCH_VOCODER_CONTROL == 1)
+  #if (FF_L1_TCH_VOCODER_CONTROL == 1)
       l1ddsp_load_tch_param(&(l1s.next_time),
         SIG_ONLY_MODE,
         l1a_l1s_com.dedic_set.aset->achan_ptr->desc_ptr->channel_type,
-                              #if !FF_L1_IT_DSP_DTX
-        0, 0, 0, 0, 0, 0);
-#else
-                                0, 0, 0, 0, 0, 0, 0);
-                              #endif
+        #if !FF_L1_IT_DSP_DTX
+          0, 0, 0, 0, 0, 0);
         #else
+          0, 0, 0, 0, 0, 0, 0);
+        #endif
+  #else
       l1ddsp_load_tch_param(&(l1s.next_time),
         SIG_ONLY_MODE,
         l1a_l1s_com.dedic_set.aset->achan_ptr->desc_ptr->channel_type,
-                              #if !FF_L1_IT_DSP_DTX
-        0, 0, 0, 0);
-                              #else
-                                0, 0, 0, 0, 0);
-#endif
+        #if !FF_L1_IT_DSP_DTX
+          0, 0, 0, 0);
+        #else
+          0, 0, 0, 0, 0);
         #endif
+  #endif
 #else
-#if (FF_L1_TCH_VOCODER_CONTROL == 1)
+  #if (FF_L1_TCH_VOCODER_CONTROL == 1)
       l1ddsp_load_tch_param(&(l1s.next_time),
         SIG_ONLY_MODE,
         l1a_l1s_com.dedic_set.aset->achan_ptr->desc_ptr->channel_type,
-                              #if !FF_L1_IT_DSP_DTX
-        0, 0, 0, 0, 0);
-#else
-                                0, 0, 0, 0, 0, 0);
-                              #endif
+        #if !FF_L1_IT_DSP_DTX
+          0, 0, 0, 0, 0);
         #else
+          0, 0, 0, 0, 0, 0);
+        #endif
+  #else
       l1ddsp_load_tch_param(&(l1s.next_time),
         SIG_ONLY_MODE,
         l1a_l1s_com.dedic_set.aset->achan_ptr->desc_ptr->channel_type,
-                              #if !FF_L1_IT_DSP_DTX
-        0, 0, 0);
-                              #else
-                                0, 0, 0, 0);
-#endif
-#endif
+        #if !FF_L1_IT_DSP_DTX
+          0, 0, 0);
+        #else
+          0, 0, 0, 0);
+        #endif
+  #endif
+#endif
+      // for SDCCH we use DPAGC algorithm.
+#if DPAGC_MAX_FLAG
+      agc = Cust_get_agc_from_IL(rx_radio_freq, IL_info_ptr->input_level >> 1, MAX_ID);
+#else
+      agc = Cust_get_agc_from_IL(rx_radio_freq, IL_info_ptr->input_level >> 1, AV_ID);
 #endif
       lna_off = IL_info_ptr->lna_off;
-      // for SDCCH we use DPAGC algorithm.
-#if DPAGC_MAX_FLAG
-      agc = Cust_get_agc_from_IL(rx_radio_freq, IL_info_ptr->input_level >> 1, MAX_ID, lna_off);
-#else
-      agc = Cust_get_agc_from_IL(rx_radio_freq, IL_info_ptr->input_level >> 1, AV_ID, lna_off);
-#endif
 
 
 
@@ -2553,11 +2563,20 @@
 
       // for PCH/E_PCH/Serving BCCH and All CCCH we use
       // PAGC algorithm.
-#if (L1_FF_MULTIBAND == 0)
+#if 1	/* FreeCalypso match TCS211 */
+
+      agc     = Cust_get_agc_from_IL(rx_radio_freq, l1a_l1s_com.last_input_level[rx_radio_freq - l1_config.std.radio_freq_index_offset].input_level >> 1, MAX_ID);
+      lna_off = l1a_l1s_com.last_input_level[rx_radio_freq - l1_config.std.radio_freq_index_offset].lna_off;
+
+      // Store input_level and lna_off fields used for current CTRL in order to be able
+      // to build IL from pm in READ phase.
+      l1a_l1s_com.Scell_used_IL = l1a_l1s_com.last_input_level[rx_radio_freq - l1_config.std.radio_freq_index_offset];
+
+#elif (L1_FF_MULTIBAND == 0)
 
       input_level = l1a_l1s_com.last_input_level[rx_radio_freq - l1_config.std.radio_freq_index_offset].input_level ;
       lna_off = l1a_l1s_com.last_input_level[rx_radio_freq - l1_config.std.radio_freq_index_offset].lna_off;
-      agc     = Cust_get_agc_from_IL(rx_radio_freq, input_level >> 1, MAX_ID, lna_off);
+      agc     = Cust_get_agc_from_IL(rx_radio_freq, input_level >> 1, MAX_ID);
 
 
       // Store input_level and lna_off fields used for current CTRL in order to be able
@@ -2571,7 +2590,7 @@
 
       input_level = l1a_l1s_com.last_input_level[operative_radio_freq].input_level ;
       lna_off = l1a_l1s_com.last_input_level[operative_radio_freq].lna_off;
-      agc     = Cust_get_agc_from_IL(rx_radio_freq, input_level >> 1, MAX_ID, lna_off);
+      agc     = Cust_get_agc_from_IL(rx_radio_freq, input_level >> 1, MAX_ID);
 
 
       // Store input_level and lna_off fields used for current CTRL in order to be able
@@ -2599,7 +2618,7 @@
           ,&saic_flag
       #endif
           );
-   #endif  //L!SAIC != 0
+   #endif  //L1_SAIC != 0
 
     // ADC measurement
     // ***************
@@ -2733,9 +2752,9 @@
         l1s.forbid_meas = TASK_ROM_MFTAB[task].size;
 
       if (new_offset >= 4)
-        l1s.algo_change_synchro_active = TRUE;
-
-      if (l1s.algo_change_synchro_active)
+        algo_change_synchro_active = TRUE;
+
+      if (algo_change_synchro_active)
       {
         // compute TPU offset for "current timeslot + 4 timeslot"
         new_synchro = l1s.tpu_offset + (4 * TN_WIDTH);
@@ -2894,7 +2913,7 @@
          (l1a_l1s_com.l1s_en_task[PDTCH]  == TASK_ENABLED) ||
          (l1a_l1s_com.l1s_en_task[SINGLE] == TASK_ENABLED)))
     {
-        if((burst_id == BURST_4) && l1s.algo_change_synchro_active)
+        if((burst_id == BURST_4) && algo_change_synchro_active)
         {
 
             // Slide synchro back to mach current serving timeslot.
@@ -2909,7 +2928,7 @@
             l1s.tpu_ctrl_reg |= CTRL_SYCB;
             l1s.dsp_ctrl_reg |= CTRL_SYNC;
             l1s.ctrl_synch_before = FALSE;
-            l1s.algo_change_synchro_active = FALSE;
+            algo_change_synchro_active = FALSE;
 
             #if (TRACE_TYPE == 1) || (TRACE_TYPE == 4)
               trace_fct(CST_L1S_ADJUST_TIME, (UWORD32)(-1));//OMAPS00090550
@@ -3527,9 +3546,9 @@
     // is restored at the end of the 4 burst reading.
 #if (L1_FF_MULTIBAND == 0)
 
+    // agc is computed from PGC2 algo result.
+    agc     = Cust_get_agc_from_IL(cell_info_ptr->radio_freq, l1a_l1s_com.last_input_level[cell_info_ptr->radio_freq - l1_config.std.radio_freq_index_offset].input_level >> 1, AV_ID);
     lna_off = l1a_l1s_com.last_input_level[cell_info_ptr->radio_freq - l1_config.std.radio_freq_index_offset].lna_off;
-    // agc is computed from PGC2 algo result.
-    agc     = Cust_get_agc_from_IL(cell_info_ptr->radio_freq, l1a_l1s_com.last_input_level[cell_info_ptr->radio_freq - l1_config.std.radio_freq_index_offset].input_level >> 1, AV_ID, lna_off);
 
 #else // L1_FF_MULTIBAND = 1 below
 
@@ -3538,7 +3557,7 @@
     lna_off = l1a_l1s_com.last_input_level[operative_radio_freq].lna_off;
     input_level = l1a_l1s_com.last_input_level[operative_radio_freq].input_level;
     // agc is computed from PGC2 algo result.
-    agc     = Cust_get_agc_from_IL(cell_info_ptr->radio_freq, l1a_l1s_com.last_input_level[operative_radio_freq].input_level >> 1, AV_ID, lna_off);
+    agc     = Cust_get_agc_from_IL(cell_info_ptr->radio_freq, l1a_l1s_com.last_input_level[operative_radio_freq].input_level >> 1, AV_ID);
 
 #endif // #if (L1_FF_MULTIBAND == 0) else
 
@@ -4145,12 +4164,12 @@
   UWORD32                 fn_mod_52;
   UWORD8 input_level;
 #if (RF_FAM == 61)
-    UWORD16 dco_algo_ctl_nb = 0;
-    UWORD8 if_ctl = 0;
-	UWORD8 if_threshold = C_IF_ZERO_LOW_THRESHOLD_GSM;
-#endif
+  UWORD16 dco_algo_ctl_nb = 0;
+  UWORD8 if_ctl = 0;
+  UWORD8 if_threshold = C_IF_ZERO_LOW_THRESHOLD_GSM;
   // By default we choose the hardware filter
   UWORD8 csf_filter_choice = L1_SAIC_HARDWARE_FILTER;
+#endif
 #if FF_L1_IT_DSP_DTX
   BOOL                    dtx_dsp_interrupt=FALSE; //omaps00090550
 #endif
@@ -4223,13 +4242,13 @@
   /*--------------------------------------------*/
   /* Program TPU...                             */
   /*--------------------------------------------*/
-  lna_off = IL_info_ptr->lna_off;
   // for TCHTH we use DPAGC algorithm.
   #if DPAGC_MAX_FLAG
-    agc = Cust_get_agc_from_IL(radio_freq, input_level >> 1, MAX_ID, lna_off);
+    agc = Cust_get_agc_from_IL(radio_freq, input_level >> 1, MAX_ID);
   #else
-    agc = Cust_get_agc_from_IL(radio_freq, input_level >> 1, AV_ID, lna_off);
-  #endif
+    agc = Cust_get_agc_from_IL(radio_freq, input_level >> 1, AV_ID);
+  #endif
+  lna_off = IL_info_ptr->lna_off;
 
 
   // Store input_level and lna_off fields used for current CTRL in order to be able
@@ -4723,12 +4742,12 @@
   UWORD32                 dsp_task;
   UWORD32                 fn_mod_104;
 #if (RF_FAM == 61)
-    UWORD16 dco_algo_ctl_nb;
+  UWORD16 dco_algo_ctl_nb;
   UWORD8 if_ctl =0 ; //omaps00090550
   UWORD8 if_threshold = C_IF_ZERO_LOW_THRESHOLD_GSM;
-#endif
   // By default we choose the hardware filter
   UWORD8 csf_filter_choice = L1_SAIC_HARDWARE_FILTER;
+#endif
 #if FF_L1_IT_DSP_DTX
   BOOL                    dtx_dsp_interrupt = FALSE;
 #endif
@@ -4809,13 +4828,13 @@
   /* Program TPU...                             */
   /*--------------------------------------------*/
 
-  lna_off = IL_info_ptr->lna_off;
   // for TCHTF we use DPAGC algorithm.
   #if DPAGC_MAX_FLAG
-    agc = Cust_get_agc_from_IL(radio_freq, IL_info_ptr->input_level >> 1, MAX_ID, lna_off);
+    agc = Cust_get_agc_from_IL(radio_freq, IL_info_ptr->input_level >> 1, MAX_ID);
   #else
-    agc = Cust_get_agc_from_IL(radio_freq, IL_info_ptr->input_level >> 1, AV_ID, lna_off);
-  #endif
+    agc = Cust_get_agc_from_IL(radio_freq, IL_info_ptr->input_level >> 1, AV_ID);
+  #endif
+  lna_off = IL_info_ptr->lna_off;
 
 
   // Store input_level and lna_off fields used for current CTRL in order to be able
@@ -4941,11 +4960,14 @@
         // In ETM test mode, the protocol stack is not active and hence we do not require any FACCH data from L23
         // But this change is applicable only when ETM scripts are run with PS-builds. In case of L1-SA,
         // dll_read_dcch() is called which is just a stub function (It just returns a NULL ptr for L1 SA)
+	/* FreeCalypso: this logic is not present in TCS211 */
+	#if 0
         #if TESTMODE
         #if (OP_L1_STANDALONE == 0)
          if(!l1_config.TestMode)
         #endif // (OP_L1_STANDALONE == 0)
         #endif // TESTMODE
+	#endif
          {
         tx_data = dll_read_dcch(channel_mode);
          }
@@ -5093,10 +5115,6 @@
           }
           #endif
         }
-#if FEATURE_TCH_REROUTE
-        else
-          tch_substitute_uplink(l1s_dsp_com.dsp_ndb_ptr->a_du_1);
-#endif
       }
     }
 
@@ -5448,12 +5466,12 @@
   UWORD8                 adc_active_ul = INACTIVE;
   UWORD8                 adc_active_dl = INACTIVE;
 #if (RF_FAM == 61)
-       UWORD16 dco_algo_ctl_nb = 0;
-       UWORD8 if_ctl = 0;
-	   UWORD8 if_threshold = C_IF_ZERO_LOW_THRESHOLD_GSM;
-#endif
+  UWORD16 dco_algo_ctl_nb = 0;
+  UWORD8 if_ctl = 0;
+  UWORD8 if_threshold = C_IF_ZERO_LOW_THRESHOLD_GSM;
   // By default we choose the hardware filter
   UWORD8 csf_filter_choice = L1_SAIC_HARDWARE_FILTER;
+#endif
 #if (NEW_SNR_THRESHOLD == 1)
   UWORD8 saic_flag=0;
 #endif /*NEW_SNR_THRESHOLD */
@@ -5536,13 +5554,13 @@
       /*--------------------------------------------*/
       /* Program TPU...                             */
       /*--------------------------------------------*/
-      lna_off = IL_info_ptr->lna_off;
       // for TCHA we use DPAGC algorithm.
       #if DPAGC_MAX_FLAG
-        agc = Cust_get_agc_from_IL(radio_freq, IL_info_ptr->input_level >> 1, MAX_ID, lna_off);
+        agc = Cust_get_agc_from_IL(radio_freq, IL_info_ptr->input_level >> 1, MAX_ID);
       #else
-        agc = Cust_get_agc_from_IL(radio_freq, IL_info_ptr->input_level >> 1, AV_ID, lna_off);
-      #endif
+        agc = Cust_get_agc_from_IL(radio_freq, IL_info_ptr->input_level >> 1, AV_ID);
+      #endif
+      lna_off = IL_info_ptr->lna_off;
 
 
 
@@ -5619,9 +5637,18 @@
   // RACH is not allowed on SACCH therefore TX is avoided by setting
   // the txpwr to NO_TXPWR !!!
   {
+#if 0	/* LoCosto code */
     // NOTE: The spec says RACH bursts on SACCH UL is optional. hence it should not be counted
     // Refer spec 04.08
     l1s_ctrl_rach(RAHO,NO_PAR);
+#else	/* TCS211 reconstruction, code taken from TSM30 */
+    // Set TXPWR.
+    l1ddsp_load_txpwr(NO_TXPWR, radio_freq);
+ 
+    #if (TRACE_TYPE == 1) || (TRACE_TYPE == 4)
+      RTTL1_FILL_UL_NB(task, l1a_l1s_com.dedic_set.aset->timing_advance, NO_TXPWR)
+    #endif
+#endif
   }
   else
   // TCH/UL is a normal burst.
@@ -5652,6 +5679,9 @@
             l1a_l1s_com.adc_cpt = 0;
           }
 
+#if 1	/* FreeCalypso TCS211 reconstruction */
+  } // End of "TCH/UL is a normal burst"
+#endif
 
     // In any case (normal TX or no TX due to Handover Access process)
     // the full TCHA task must be controled for TPU and DSP.
@@ -5806,7 +5836,9 @@
             }
     }
 
+#if 0	/* FreeCalypso TCS211 reconstruction */
   } // End of "TCH/UL is a normal burst"
+#endif
 
   /*----------------------------------------------*/
   /* Common for Dedicated mode: DSP parameters... */
@@ -5881,8 +5913,10 @@
   l1a_l1s_com.dedic_set.reset_sacch = FALSE;
 #endif
 
+#if 0	/* FreeCalypso TCS211 reconstruction */
   if(l1a_l1s_com.dedic_set.aset->ho_acc_to_send == 0)
   {
+#endif
     // Set tpu window identifier for Power meas or FS/SB search.
     l1s.tpu_win = (3 * BP_SPLIT) + l1_config.params.tx_nb_load_split + l1_config.params.rx_synth_load_split;
 
@@ -5913,8 +5947,10 @@
       if (l1_config.TestMode && (l1_config.tmode.rf_params.tmode_continuous != TM_NO_CONTINUOUS))
         l1_config.tmode.rf_params.tmode_continuous = TM_CONTINUOUS;
     #endif
+
+#if 0	/* FreeCalypso TCS211 reconstruction */
   }
-
+#endif
 }
 
 #if (MOVE_IN_INTERNAL_RAM == 0) // Must be followed by the pragma used to duplicate the funtion in internal RAM
@@ -6053,7 +6089,11 @@
       // To review (is there any better solution?)...........
       next_neighbor_time_fn = l1s.next_time.fn + l1pa_l1ps_com.pbcchn.fn_offset;
 
+      #if 0	/* correct code (corrected by TI for LoCosto) */
       if (next_neighbor_time_fn > ((WORD32)MAX_FN))//OMAPS00090550
+      #else	/* wrong code to match TCS211 disassembly */
+      if (next_neighbor_time_fn > MAX_FN)
+      #endif
         next_neighbor_time.fn = (UWORD32) (next_neighbor_time_fn - MAX_FN);
       else if (next_neighbor_time_fn < 0)
         next_neighbor_time.fn = (UWORD32) (next_neighbor_time_fn + MAX_FN);
@@ -6144,7 +6184,7 @@
       UWORD8  i = 0;
       UWORD8  m;
       UWORD8  mp;
-      UWORD8  nbin =0; //omaps00090550
+      UWORD8  nbin;
       UWORD8  tp;
       UWORD8  s;
       UWORD8  t1r = (UWORD8)(time_ptr->t1 % 64);
@@ -6298,7 +6338,7 @@
 {
   BOOL      en_task;
   BOOL      task_param;
-  UWORD16   pm_level[2]={0}; //omaps00090550
+  UWORD8    pm_level[2];
 #if (L1_FF_MULTIBAND == 1)
   UWORD16  operative_radio_freq;
 #endif
@@ -6401,10 +6441,7 @@
     l1_check_pm_error(pm_level[0], MS_AGC_ID);
     l1_check_pm_error(pm_level[1], MS_AGC_ID);
 
-    pm_level[0] = pm_level[0] >> 5;
-    pm_level[1] = pm_level[1] >> 5;
-
-    l1ctl_pgc2(((UWORD8 )(pm_level[0])),((UWORD8 )(pm_level[1])),cell_info_ptr->radio_freq);
+    l1ctl_pgc2(pm_level[0], pm_level[1], cell_info_ptr->radio_freq);
 
     #if L2_L3_SIMUL
       #if (DEBUG_TRACE == BUFFER_TRACE_LNA)
@@ -6612,7 +6649,7 @@
     /* Frequency burst detection result...               */
     /*---------------------------------------------------*/
     {
-      if((en_task))
+      if((en_task) && !(task_param))
       // Check the task semaphore and the task enable bit. The reading
       // task body is executed only when the task semaphore is 0 and the
       // task is still enabled.
@@ -6621,7 +6658,7 @@
       {
         flag  = l1s_dsp_com.dsp_ndb_ptr->d_fb_det              & 0xffff; //  1 means FOUND.
         toa   = l1s_dsp_com.dsp_ndb_ptr->a_sync_demod[D_TOA]   & 0xffff; //  Unit is BIT.
-        pm    = (l1s_dsp_com.dsp_ndb_ptr->a_sync_demod[D_PM]   & 0xffff);
+        pm    = (l1s_dsp_com.dsp_ndb_ptr->a_sync_demod[D_PM]   & 0xffff) >> 5;
                                                                          //  WARNING... to be used!!!
         #if TESTMODE
           pm_fullres = l1s_dsp_com.dsp_ndb_ptr->a_sync_demod[D_PM] & 0xffff;  // F26.6
@@ -6649,7 +6686,6 @@
         }
 
 //       l1_check_pm_error(pm, task);
-         pm  = pm >> 5;
 
         #if TRACE_TYPE==3
           stats_samples_fb(flag,toa,pm,angle,snr);
@@ -6738,9 +6774,11 @@
         l1s_clear_mftab(l1s.mftab.frmlst);
         l1s.frame_count = 0;
 
+#if 0	/* FreeCalypso TCS211 reconstruction */
         // This task is not compatible with Neigh. Measurement.
         // Clear "forbid_meas" to indicate when the task is complete.
         l1s.forbid_meas = 0;
+#endif
       }
     }
     break;
@@ -6755,7 +6793,7 @@
       // read cell identifier.
       neigh_id = l1a_l1s_com.nsync.active_fb_id;
 
-      if((en_task))
+      if((en_task) && !(task_param))
       // Check the task semaphore and the task enable bit. The reading
       // task body is executed only when the task semaphore is 0 and the
       // task is still enabled.
@@ -6764,7 +6802,7 @@
       {
         flag  = l1s_dsp_com.dsp_ndb_ptr->d_fb_det              & 0xffff; //  1 means FOUND.
         toa   = l1s_dsp_com.dsp_ndb_ptr->a_sync_demod[D_TOA]   & 0xffff; //  Unit is BIT.
-        pm    = (l1s_dsp_com.dsp_ndb_ptr->a_sync_demod[D_PM]   & 0xffff);
+        pm    = (l1s_dsp_com.dsp_ndb_ptr->a_sync_demod[D_PM]   & 0xffff) >> 5;
                                                                          //  WARNING... to be used!!!
         #if TESTMODE
           pm_fullres = l1s_dsp_com.dsp_ndb_ptr->a_sync_demod[D_PM] & 0xffff;  // F10.6
@@ -6772,7 +6810,6 @@
 
         // CQ 19836: do not check PM on FB26
         //l1_check_pm_error(pm, task);
-        pm = pm >> 5;
 
         angle = l1s_dsp_com.dsp_ndb_ptr->a_sync_demod[D_ANGLE] & 0xffff; //  WARNING... to be used!!!
         snr   = l1s_dsp_com.dsp_ndb_ptr->a_sync_demod[D_SNR]   & 0xffff; //  WARNING... to be used!!!
@@ -6820,7 +6857,7 @@
       {
         flag  = !(((l1s_dsp_com.dsp_ndb_ptr->a_sch26[0] & 0xffff) & (1<<B_SCH_CRC)) >> B_SCH_CRC); //  1 means ERROR.
         toa   = l1s_dsp_com.dsp_ndb_ptr->a_sync_demod[D_TOA]   & 0xffff;  //  Unit is BIT.
-        pm    = (l1s_dsp_com.dsp_ndb_ptr->a_sync_demod[D_PM]   & 0xffff);
+        pm    = (l1s_dsp_com.dsp_ndb_ptr->a_sync_demod[D_PM]   & 0xffff) >> 5;
                                                                           //  WARNING... to be used!!!
         #if TESTMODE
           pm_fullres = l1s_dsp_com.dsp_ndb_ptr->a_sync_demod[D_PM] & 0xffff;  // F26.6
@@ -6831,7 +6868,6 @@
         data  = &(l1s_dsp_com.dsp_ndb_ptr->a_sch26[3]);                   // Set data block pointer (skip header).
 
         l1_check_pm_error(pm, task);
-	pm = pm >> 5;
 
         // Call SB report function (send report msg to L1A).
         #if TESTMODE
@@ -6883,7 +6919,7 @@
 
         flag  = !(((l1s_dsp_com.dsp_db_r_ptr->a_sch[0] & 0xffff) & (1<<B_SCH_CRC)) >> B_SCH_CRC); //  1 means ERROR.
         toa   = l1s_dsp_com.dsp_db_r_ptr->a_serv_demod[D_TOA]   & 0xffff;  //  Unit is BIT.
-        pm    = (l1s_dsp_com.dsp_db_r_ptr->a_serv_demod[D_PM]   & 0xffff);
+        pm    = (l1s_dsp_com.dsp_db_r_ptr->a_serv_demod[D_PM]   & 0xffff) >> 5;
                                                                            //  WARNING... to be used!!!
         #if TESTMODE
           pm_fullres = l1s_dsp_com.dsp_ndb_ptr->a_sync_demod[D_PM] & 0xffff;  // F26.6
@@ -6893,17 +6929,25 @@
         snr   = l1s_dsp_com.dsp_db_r_ptr->a_serv_demod[D_SNR]   & 0xffff;
         data  = &(l1s_dsp_com.dsp_db_r_ptr->a_sch[3]);                     // Set data block pointer (skip header).
 
-        l1ddsp_read_iq_dump(task);
+        #if (L1_DEBUG_IQ_DUMP == 1)
+          l1ddsp_read_iq_dump(task);
+        #endif
 
         l1_check_pm_error(pm, task);
-	pm = pm >> 5;
 
         // CQ30474. In case SNR is too low, the SB shall be considered as failed.
         // This is valuable for code running on target with DSP 3606.
+
+	/*
+	 * FreeCalypso: despite the above comment,
+	 * this code is NOT present in TCS211.
+	 */
+#if 0
 #if (CODE_VERSION == NOT_SIMULATION)
        if ( snr < MIN_ACCEPTABLE_SNR_FOR_SB )
          flag = FALSE;
 #endif
+#endif
 
         #if L2_L3_SIMUL
           #if (DEBUG_TRACE == BUFFER_TRACE_OFFSET_NEIGH)
@@ -7307,26 +7351,25 @@
       if (l1a_l1s_com.dsp_scheduler_mode == GSM_SCHEDULER)
       {
         toa   =  l1s_dsp_com.dsp_db_r_ptr->a_serv_demod[D_TOA]   & 0xffff;
-        pm    = (l1s_dsp_com.dsp_db_r_ptr->a_serv_demod[D_PM]    & 0xffff);
+        pm    = (l1s_dsp_com.dsp_db_r_ptr->a_serv_demod[D_PM]    & 0xffff) >> 5;
         angle =  l1s_dsp_com.dsp_db_r_ptr->a_serv_demod[D_ANGLE] & 0xffff;
         snr   =  l1s_dsp_com.dsp_db_r_ptr->a_serv_demod[D_SNR]   & 0xffff;
       }
       else
       {
         toa   =  l1ps_dsp_com.pdsp_db_r_ptr->a_burst_toa_gprs[0]   & 0xffff;
-        pm    = (l1ps_dsp_com.pdsp_db_r_ptr->a_burst_pm_gprs[0]    & 0xffff);
+        pm    = (l1ps_dsp_com.pdsp_db_r_ptr->a_burst_pm_gprs[0]    & 0xffff) >> 5;
         angle =  l1ps_dsp_com.pdsp_db_r_ptr->a_burst_angle_gprs[0] & 0xffff;
         snr   =  l1ps_dsp_com.pdsp_db_r_ptr->a_burst_snr_gprs[0]   & 0xffff;
       }
     #else
         toa   =  l1s_dsp_com.dsp_db_r_ptr->a_serv_demod[D_TOA]   & 0xffff;
-        pm    = (l1s_dsp_com.dsp_db_r_ptr->a_serv_demod[D_PM]    & 0xffff);
+        pm    = (l1s_dsp_com.dsp_db_r_ptr->a_serv_demod[D_PM]    & 0xffff) >> 5;
         angle =  l1s_dsp_com.dsp_db_r_ptr->a_serv_demod[D_ANGLE] & 0xffff;
         snr   =  l1s_dsp_com.dsp_db_r_ptr->a_serv_demod[D_SNR]   & 0xffff;
     #endif
 
     l1_check_pm_error(pm, task);
-    pm = pm >> 5;
 
     // Update AGC: Call PAGC algorithm
     radio_freq = l1a_l1s_com.Scell_info.radio_freq;
@@ -7509,7 +7552,7 @@
     #if (TRACE_TYPE == 1) || (TRACE_TYPE == 4)
       RTTL1_FILL_DL_BURST(angle, snr, l1s.afc, task, pm, toa, l1a_l1s_com.Scell_IL_for_rxlev)
     #endif
-    #if (TRACE_TYPE == 1) || (TRACE_TYPE == 4)
+    #if ((TRACE_TYPE == 1) || (TRACE_TYPE == 4)) && HAVE_L1_TRACE_BURST_PARAM
       l1_trace_burst_param(angle, snr, l1s.afc, task, pm, toa, l1a_l1s_com.Scell_IL_for_rxlev);
     #endif
     #if (BURST_PARAM_LOG_ENABLE == 1)
@@ -7532,6 +7575,7 @@
           toa_tab[burst_id] = toa;
   }
 
+#if 0	/* FreeCalypso TCS211 reconstruction */
 // added Enhanced RSSI
    if(l1s_dsp_com.dsp_ndb_ptr->a_cd[2] != 0xffff)
    {
@@ -7539,6 +7583,7 @@
         //RX Qual value reporting- total number of decoded bits
          qual_acc_idle1[1] += 1;
    }
+#endif
 
 #if (FF_L1_FAST_DECODING == 1)
     /* Perform the reporting if
@@ -7663,7 +7708,10 @@
 #endif /* #if (FF_L1_FAST_DECODING == 1) */
   }
 
-  l1ddsp_read_iq_dump(task);
+  #if (L1_DEBUG_IQ_DUMP == 1)
+    l1ddsp_read_iq_dump(task);
+  #endif
+
   // Flag the use of the MCU/DSP dual page read interface.
   // ******************************************************
 
@@ -7807,7 +7855,9 @@
 
     // the mean power level is impossible for the neighbor bloc, so the las input level is used.
     neigh_radio_freq = l1a_l1s_com.bcchn.list[active_neigh_id].radio_freq;
-#if (L1_FF_MULTIBAND == 0)
+#if 1	/* FreeCalypso TCS211 reconstruction */
+    pwr_level = l1a_l1s_com.last_input_level[neigh_radio_freq].input_level;
+#elif (L1_FF_MULTIBAND == 0)
     pwr_level = l1a_l1s_com.last_input_level[neigh_radio_freq - l1_config.std.radio_freq_index_offset].input_level;
 #else
     operative_radio_freq = l1_multiband_radio_freq_convert_into_operative_radio_freq(neigh_radio_freq);
@@ -7858,7 +7908,9 @@
   // End of task -> task must become INACTIVE.
   l1s.task_status[task].current_status = INACTIVE;
 
-  l1ddsp_read_iq_dump(task);
+  #if (L1_DEBUG_IQ_DUMP == 1)
+    l1ddsp_read_iq_dump(task);
+  #endif
 
   // Flag the use of the MCU/DSP dual page read interface.
   // ******************************************************
@@ -8024,7 +8076,7 @@
   // Traces and debug.
   // ******************
   #if (TRACE_TYPE!=0) && (TRACE_TYPE !=5)
-      trace_fct(CST_L1S_READ_DEDIC_DL, 1);//omaps00090550
+      trace_fct(CST_L1S_READ_DEDIC_DL, -1);
   #endif
 
   #if (TRACE_TYPE!=0)
@@ -8099,12 +8151,11 @@
 
       // Read control information.
       toa   = l1s_dsp_com.dsp_db_r_ptr->a_serv_demod[D_TOA]   & 0xffff;
-      pm    = (l1s_dsp_com.dsp_db_r_ptr->a_serv_demod[D_PM]   & 0xffff);
+      pm    = (l1s_dsp_com.dsp_db_r_ptr->a_serv_demod[D_PM]   & 0xffff) >> 5;
       angle = l1s_dsp_com.dsp_db_r_ptr->a_serv_demod[D_ANGLE] & 0xffff;
       snr   = l1s_dsp_com.dsp_db_r_ptr->a_serv_demod[D_SNR]   & 0xffff;
 
       l1_check_pm_error(pm, task);
-      pm = pm >> 5;
 
       // Update AGC: Call DPAGC algorithm
       IL_for_rxlev = l1ctl_dpagc(0,beacon,(UWORD8)pm,radio_freq,IL_info_ptr); // dtx_on = 0
@@ -8145,25 +8196,31 @@
             if(l1s.toa_snr_mask == 0)
           #endif
           {
-            UWORD32 snr_temp;
-            snr_temp = (IL_for_rxlev < IL_FOR_RXLEV_SNR)? snr: 0;
-            #if (TOA_ALGO == 2)
-              l1s.toa_var.toa_shift = l1ctl_toa(TOA_RUN, l1a_l1s_com.mode, snr_temp, toa);
+            #if 1	/* FreeCalypso TCS211 reconstruction */
+              if (IL_for_rxlev < IL_FOR_RXLEV_SNR)
+                l1s.toa_shift = l1ctl_toa(TOA_RUN, l1a_l1s_com.mode, snr, toa, &l1s.toa_update, &l1s.toa_period_count);
+              else
+                l1s.toa_shift = l1ctl_toa(TOA_RUN, l1a_l1s_com.mode, 0, toa, &l1s.toa_update, &l1s.toa_period_count);
             #else
-              l1s.toa_shift = l1ctl_toa(TOA_RUN, l1a_l1s_com.mode, snr_temp, toa, &l1s.toa_update, &l1s.toa_period_count
-#if (FF_L1_FAST_DECODING ==1)
-                  ,0
-#endif
-                  );
+              UWORD32 snr_temp;
+              snr_temp = (IL_for_rxlev < IL_FOR_RXLEV_SNR)? snr: 0;
+              #if (TOA_ALGO == 2)
+                l1s.toa_var.toa_shift = l1ctl_toa(TOA_RUN, l1a_l1s_com.mode, snr_temp, toa);
+              #else
+                l1s.toa_shift = l1ctl_toa(TOA_RUN, l1a_l1s_com.mode, snr_temp, toa, &l1s.toa_update, &l1s.toa_period_count
+                #if (FF_L1_FAST_DECODING ==1)
+                    ,0
+                #endif
+                    );
+              #endif
             #endif
-
           }
       #endif
 
        #if (TRACE_TYPE == 1) || (TRACE_TYPE == 4)
          RTTL1_FILL_DL_BURST(angle, snr, l1s.afc, task, pm, toa, IL_for_rxlev)
        #endif
-       #if (TRACE_TYPE == 1) || (TRACE_TYPE == 4)
+       #if ((TRACE_TYPE == 1) || (TRACE_TYPE == 4)) && HAVE_L1_TRACE_BURST_PARAM
          l1_trace_burst_param(angle, snr, l1s.afc, task, pm, toa, IL_for_rxlev);
        #endif
        #if (BURST_PARAM_LOG_ENABLE == 1)
@@ -8245,12 +8302,11 @@
 
       // Read control information.
       toa   = l1s_dsp_com.dsp_db_r_ptr->a_serv_demod[D_TOA]   & 0xffff;
-      pm    = (l1s_dsp_com.dsp_db_r_ptr->a_serv_demod[D_PM]   & 0xffff);
+      pm    = (l1s_dsp_com.dsp_db_r_ptr->a_serv_demod[D_PM]   & 0xffff) >> 5;
       angle = l1s_dsp_com.dsp_db_r_ptr->a_serv_demod[D_ANGLE] & 0xffff;
       snr   = l1s_dsp_com.dsp_db_r_ptr->a_serv_demod[D_SNR]   & 0xffff;
 
       l1_check_pm_error(pm, task);
-      pm = pm >> 5;
 
       #if TRACE_TYPE==3
         stats_samples_tch(toa,pm,angle,snr);
@@ -8395,18 +8451,24 @@
             if(l1s.toa_snr_mask == 0)
           #endif
           {
-            UWORD32 snr_temp;
-            snr_temp = (IL_for_rxlev < IL_FOR_RXLEV_SNR)? snr: 0;
-            #if (TOA_ALGO == 2)
-              l1s.toa_var.toa_shift = l1ctl_toa(TOA_RUN, l1_mode, snr_temp, toa);
+            #if 1	/* FreeCalypso TCS211 reconstruction */
+              if (IL_for_rxlev < IL_FOR_RXLEV_SNR)
+                l1s.toa_shift = l1ctl_toa(TOA_RUN, l1_mode, snr, toa, &l1s.toa_update, &l1s.toa_period_count);
+              else
+                l1s.toa_shift = l1ctl_toa(TOA_RUN, l1_mode, 0, toa, &l1s.toa_update, &l1s.toa_period_count);
             #else
-              l1s.toa_shift = l1ctl_toa(TOA_RUN, l1_mode, snr_temp, toa, &l1s.toa_update, &l1s.toa_period_count
-#if (FF_L1_FAST_DECODING == 1)
-                  ,0
-#endif
-                  );
+              UWORD32 snr_temp;
+              snr_temp = (IL_for_rxlev < IL_FOR_RXLEV_SNR)? snr: 0;
+              #if (TOA_ALGO == 2)
+                l1s.toa_var.toa_shift = l1ctl_toa(TOA_RUN, l1_mode, snr_temp, toa);
+              #else
+                l1s.toa_shift = l1ctl_toa(TOA_RUN, l1_mode, snr_temp, toa, &l1s.toa_update, &l1s.toa_period_count
+                #if (FF_L1_FAST_DECODING == 1)
+                    ,0
+                #endif
+                    );
+              #endif
             #endif
-
           }
         #endif
       } // if(((channel_mode == TCH_HS_MODE) && (subchannel == 0) &&
@@ -8432,7 +8494,7 @@
       #if (TRACE_TYPE == 1) || (TRACE_TYPE == 4)
         RTTL1_FILL_DL_BURST(angle, snr, l1s.afc, task, pm, toa, IL_for_rxlev)
       #endif
-      #if (TRACE_TYPE == 1) || (TRACE_TYPE == 4)
+      #if ((TRACE_TYPE == 1) || (TRACE_TYPE == 4)) && HAVE_L1_TRACE_BURST_PARAM
         l1_trace_burst_param(angle, snr, l1s.afc, task, pm, toa, IL_for_rxlev);
       #endif
       #if (BURST_PARAM_LOG_ENABLE == 1)
@@ -8897,16 +8959,23 @@
               if(l1s.toa_snr_mask == 0)
             #endif
             {
-              UWORD32 snr_temp;
-              snr_temp = (IL_for_rxlev < IL_FOR_RXLEV_SNR)? snr: 0;
-              #if (TOA_ALGO == 2)
-                l1s.toa_var.toa_shift = l1ctl_toa(TOA_RUN, l1a_l1s_com.mode, snr_temp, toa);
+              #if 1	/* FreeCalypso TCS211 reconstruction */
+                if (IL_for_rxlev < IL_FOR_RXLEV_SNR)
+                  l1s.toa_shift = l1ctl_toa(TOA_RUN, l1a_l1s_com.mode, snr, toa, &l1s.toa_update, &l1s.toa_period_count);
+                else
+                  l1s.toa_shift = l1ctl_toa(TOA_RUN, l1a_l1s_com.mode, 0, toa, &l1s.toa_update, &l1s.toa_period_count);
               #else
-                l1s.toa_shift = l1ctl_toa(TOA_RUN, l1a_l1s_com.mode, snr_temp, toa, &l1s.toa_update, &l1s.toa_period_count
-#if (FF_L1_FAST_DECODING == 1)
-                    ,0
-#endif
-                    );
+                UWORD32 snr_temp;
+                snr_temp = (IL_for_rxlev < IL_FOR_RXLEV_SNR)? snr: 0;
+                #if (TOA_ALGO == 2)
+                  l1s.toa_var.toa_shift = l1ctl_toa(TOA_RUN, l1a_l1s_com.mode, snr_temp, toa);
+                #else
+                  l1s.toa_shift = l1ctl_toa(TOA_RUN, l1a_l1s_com.mode, snr_temp, toa, &l1s.toa_update, &l1s.toa_period_count
+                  #if (FF_L1_FAST_DECODING == 1)
+                      ,0
+                  #endif
+                      );
+                #endif
               #endif
             }
           #endif
@@ -9004,12 +9073,11 @@
 
       // Read control information.
       toa   = l1s_dsp_com.dsp_db_r_ptr->a_serv_demod[D_TOA]   & 0xffff;
-      pm    = (l1s_dsp_com.dsp_db_r_ptr->a_serv_demod[D_PM]   & 0xffff);
+      pm    = (l1s_dsp_com.dsp_db_r_ptr->a_serv_demod[D_PM]   & 0xffff) >> 5;
       angle = l1s_dsp_com.dsp_db_r_ptr->a_serv_demod[D_ANGLE] & 0xffff;
       snr   = l1s_dsp_com.dsp_db_r_ptr->a_serv_demod[D_SNR]   & 0xffff;
 
       l1_check_pm_error(pm, task);
-      pm = pm >> 5;
 
       #if TRACE_TYPE==3
         stats_samples_tch(toa,pm,angle,snr);
@@ -9132,16 +9200,23 @@
             if(l1s.toa_snr_mask == 0)
           #endif
           {
-            UWORD32 snr_temp;
-            snr_temp = (IL_for_rxlev < IL_FOR_RXLEV_SNR)? snr: 0;
-            #if (TOA_ALGO == 2)
-              l1s.toa_var.toa_shift = l1ctl_toa(TOA_RUN, l1a_l1s_com.mode, snr_temp, toa);
+            #if 1	/* FreeCalypso TCS211 reconstruction */
+              if (IL_for_rxlev < IL_FOR_RXLEV_SNR)
+                l1s.toa_shift = l1ctl_toa(TOA_RUN, l1a_l1s_com.mode, snr, toa, &l1s.toa_update, &l1s.toa_period_count);
+              else
+                l1s.toa_shift = l1ctl_toa(TOA_RUN, l1a_l1s_com.mode, 0, toa, &l1s.toa_update, &l1s.toa_period_count);
             #else
-              l1s.toa_shift = l1ctl_toa(TOA_RUN, l1a_l1s_com.mode, snr_temp, toa, &l1s.toa_update, &l1s.toa_period_count
-#if (FF_L1_FAST_DECODING == 1)
-                  ,0
-#endif
-                  );
+              UWORD32 snr_temp;
+              snr_temp = (IL_for_rxlev < IL_FOR_RXLEV_SNR)? snr: 0;
+              #if (TOA_ALGO == 2)
+                l1s.toa_var.toa_shift = l1ctl_toa(TOA_RUN, l1a_l1s_com.mode, snr_temp, toa);
+              #else
+                l1s.toa_shift = l1ctl_toa(TOA_RUN, l1a_l1s_com.mode, snr_temp, toa, &l1s.toa_update, &l1s.toa_period_count
+                #if (FF_L1_FAST_DECODING == 1)
+                    ,0
+                #endif
+                    );
+              #endif
             #endif
           }
         #endif
@@ -9167,7 +9242,7 @@
       #if (TRACE_TYPE == 1) || (TRACE_TYPE == 4)
         RTTL1_FILL_DL_BURST(angle, snr, l1s.afc, task, pm, toa, IL_for_rxlev)
       #endif
-      #if (TRACE_TYPE == 1) || (TRACE_TYPE == 4)
+      #if ((TRACE_TYPE == 1) || (TRACE_TYPE == 4)) && HAVE_L1_TRACE_BURST_PARAM
         l1_trace_burst_param(angle, snr, l1s.afc, task, pm, toa, IL_for_rxlev);
       #endif
       #if (BURST_PARAM_LOG_ENABLE == 1)
@@ -9376,11 +9451,6 @@
               }
             #endif
 
-            #if FEATURE_TCH_REROUTE
-              if (tch_reroute_downlink)
-                tch_send_downlink_bits(l1s_dsp_com.dsp_ndb_ptr->a_dd_0);
-            #endif
-
             if(channel_mode == TCH_24F_MODE)
             {
               #if IDS
@@ -9605,16 +9675,23 @@
               if(l1s.toa_snr_mask == 0)
             #endif
             {
-              UWORD32 snr_temp;
-              snr_temp = (IL_for_rxlev < IL_FOR_RXLEV_SNR)? snr: 0;
-              #if (TOA_ALGO == 2)
-                l1s.toa_var.toa_shift = l1ctl_toa(TOA_RUN, l1a_l1s_com.mode, snr_temp, toa);
+              #if 1	/* FreeCalypso TCS211 reconstruction */
+                if (IL_for_rxlev < IL_FOR_RXLEV_SNR)
+                  l1s.toa_shift = l1ctl_toa(TOA_RUN, l1a_l1s_com.mode, snr, toa, &l1s.toa_update, &l1s.toa_period_count);
+                else
+                  l1s.toa_shift = l1ctl_toa(TOA_RUN, l1a_l1s_com.mode, 0, toa, &l1s.toa_update, &l1s.toa_period_count);
               #else
-                l1s.toa_shift = l1ctl_toa(TOA_RUN, l1a_l1s_com.mode, snr_temp, toa, &l1s.toa_update, &l1s.toa_period_count
-#if (FF_L1_FAST_DECODING == 1)
-                    ,0
-#endif
-                    );
+                UWORD32 snr_temp;
+                snr_temp = (IL_for_rxlev < IL_FOR_RXLEV_SNR)? snr: 0;
+                #if (TOA_ALGO == 2)
+                  l1s.toa_var.toa_shift = l1ctl_toa(TOA_RUN, l1a_l1s_com.mode, snr_temp, toa);
+                #else
+                  l1s.toa_shift = l1ctl_toa(TOA_RUN, l1a_l1s_com.mode, snr_temp, toa, &l1s.toa_update, &l1s.toa_period_count
+                  #if (FF_L1_FAST_DECODING == 1)
+                      ,0
+                  #endif
+                      );
+                #endif
               #endif
             }
           #endif
@@ -9681,7 +9758,7 @@
 
       // Read control information.
       toa   = l1s_dsp_com.dsp_db_r_ptr->a_serv_demod[D_TOA]   & 0xffff;
-      pm    = (l1s_dsp_com.dsp_db_r_ptr->a_serv_demod[D_PM]   & 0xffff);
+      pm    = (l1s_dsp_com.dsp_db_r_ptr->a_serv_demod[D_PM]   & 0xffff) >> 5;
       angle = l1s_dsp_com.dsp_db_r_ptr->a_serv_demod[D_ANGLE] & 0xffff;
       snr   = l1s_dsp_com.dsp_db_r_ptr->a_serv_demod[D_SNR]   & 0xffff;
 
@@ -9708,7 +9785,6 @@
         {
             l1_check_pm_error(pm, task);
         }
-	pm = pm >> 5;
 
       #if TRACE_TYPE==3
         stats_samples_tch_sacch(toa,pm,angle,snr);
@@ -9752,25 +9828,31 @@
           if(l1s.toa_snr_mask == 0)
         #endif
         {
-          UWORD32 snr_temp;
-          snr_temp = (IL_for_rxlev < IL_FOR_RXLEV_SNR)? snr: 0;
-          #if (TOA_ALGO == 2)
-            l1s.toa_var.toa_shift = l1ctl_toa(TOA_RUN, l1a_l1s_com.mode, snr_temp, toa);
+          #if 1	/* FreeCalypso TCS211 reconstruction */
+            if (IL_for_rxlev < IL_FOR_RXLEV_SNR)
+              l1s.toa_shift = l1ctl_toa(TOA_RUN, l1a_l1s_com.mode, snr, toa, &l1s.toa_update, &l1s.toa_period_count);
+            else
+              l1s.toa_shift = l1ctl_toa(TOA_RUN, l1a_l1s_com.mode, 0, toa, &l1s.toa_update, &l1s.toa_period_count);
           #else
-            l1s.toa_shift = l1ctl_toa(TOA_RUN, l1a_l1s_com.mode, snr_temp, toa, &l1s.toa_update, &l1s.toa_period_count
-#if (FF_L1_FAST_DECODING == 1)
-                ,0
-#endif
-                );
+            UWORD32 snr_temp;
+            snr_temp = (IL_for_rxlev < IL_FOR_RXLEV_SNR)? snr: 0;
+            #if (TOA_ALGO == 2)
+              l1s.toa_var.toa_shift = l1ctl_toa(TOA_RUN, l1a_l1s_com.mode, snr_temp, toa);
+            #else
+              l1s.toa_shift = l1ctl_toa(TOA_RUN, l1a_l1s_com.mode, snr_temp, toa, &l1s.toa_update, &l1s.toa_period_count
+              #if (FF_L1_FAST_DECODING == 1)
+                  ,0
+              #endif
+                  );
+            #endif
           #endif
-
         }
       #endif
 
        #if (TRACE_TYPE == 1) || (TRACE_TYPE == 4)
          RTTL1_FILL_DL_BURST(angle, snr, l1s.afc, task, pm, toa, IL_for_rxlev)
        #endif
-       #if (TRACE_TYPE == 1) || (TRACE_TYPE == 4)
+       #if ((TRACE_TYPE == 1) || (TRACE_TYPE == 4)) && HAVE_L1_TRACE_BURST_PARAM
          l1_trace_burst_param(angle, snr, l1s.afc, task, pm, toa, IL_for_rxlev);
        #endif
        #if (BURST_PARAM_LOG_ENABLE == 1)
@@ -9830,7 +9912,10 @@
     break;
   } // End switch...
 
-  l1ddsp_read_iq_dump(task);
+  #if (L1_DEBUG_IQ_DUMP == 1)
+    l1ddsp_read_iq_dump(task);
+  #endif
+
   // Flag the use of the MCU/DSP dual page read interface.
   // ******************************************************
 
@@ -9855,13 +9940,13 @@
     if(task==RAACC)
     {
       if((UWORD32)(l1s_dsp_com.dsp_db_r_ptr->d_task_ra & 0xffff) != (UWORD32)DSP_TASK_CODE[task])
-        trace_fct(CST_UL_TASKS_DO_NOT_CORRESPOND, 1);//OMAPS00090550
+        trace_fct(CST_UL_TASKS_DO_NOT_CORRESPOND, -1);
     }
     else
     {
       if(((UWORD32)(l1s_dsp_com.dsp_db_r_ptr->d_task_u & 0xffff) != (UWORD32)DSP_TASK_CODE[task]) &&
          ((UWORD32)(l1s_dsp_com.dsp_db_r_ptr->d_task_u & 0xffff) != TCH_DTX_UL))
-        trace_fct(CST_UL_TASKS_DO_NOT_CORRESPOND, 1);//OMAPS00090550
+        trace_fct(CST_UL_TASKS_DO_NOT_CORRESPOND, -1);
     }
   #endif
 
@@ -10902,8 +10987,8 @@
 {
   xSignalHeaderRec  *msg;
   WORD32             modif_toa = 0;
-  WORD32             ntdma  =0 ; //omaps000090550
-  UWORD32            fn_offset =0 ; //omaps000090550 ;
+  WORD32             ntdma;
+  UWORD32            fn_offset;
 
   // For detail of the here below equation cf. BUG1558
   #define MAX_TOA_FOR_SB (D_NSUBB_DEDIC*48)+DL_ABB_DELAY/4-(SB_BURST_DURATION+DL_ABB_DELAY+SB_MARGIN)/4-2
@@ -11135,7 +11220,6 @@
     // "time_alignmt" must be corrected (use "modif_toa" from the SB read).
     // Check that "time_alignmt" do not become bigger than "TPU_CLOCK_RANGE".
     // If so, "fn_offset" must be decremented.
-    if(cell_ptr != NULL)//OMAPS00090550
     time_alignmt   = cell_ptr->time_alignmt + modif_toa;
     if(time_alignmt >= TPU_CLOCK_RANGE)
     {
@@ -11167,7 +11251,6 @@
   DEBUGMSG(status,NU_ALLOC_ERR)
   msg->SignalCode   = SignalCode;
   ((T_MPHC_NCELL_SYNC_IND*)(msg->SigP))->sb_flag      = flag;
-  if(cell_ptr != NULL)//OMAPS00090550
   ((T_MPHC_NCELL_SYNC_IND*)(msg->SigP))->radio_freq   = cell_ptr->radio_freq;
   ((T_MPHC_NCELL_SYNC_IND*)(msg->SigP))->bsic         = bsic;
   ((T_MPHC_NCELL_SYNC_IND*)(msg->SigP))->fn_offset    = fn_offset;
@@ -11591,9 +11674,13 @@
       {
         // Data downloaded from a_dd_gprs[0][]...
         word32 = info_address[4 + i]; // Get info word, rem: skip info. header.
+        #if 0	/* FreeCalypso TCS211 reconstruction */
         if(j<23)
+        #endif
         ((T_MPHC_DATA_IND *)(msg->SigP))->l2_frame.A[j++] = (word32 & 0x000000ff);
+        #if 0	/* FreeCalypso TCS211 reconstruction */
         if(j<23)
+        #endif
         ((T_MPHC_DATA_IND *)(msg->SigP))->l2_frame.A[j++] = (word32 & 0x0000ff00) >> 8;
       }
 
@@ -11957,6 +12044,7 @@
 
 }
 
+#if (CHIPSET==15)
 /*-------------------------------------------------------*/
 /* l1s_reset_tx_ptr()                                    */
 /*-------------------------------------------------------*/
@@ -11971,7 +12059,6 @@
 
 void l1s_reset_tx_ptr(UWORD8 param1, UWORD8 param2)
 {
-#if (CHIPSET==15)
     volatile UWORD32 *ptr_drp_init32;
     ptr_drp_init32 = (UWORD32 *) (DRP_API_BASE_ADDRESS + DRP_REG_SRM_CW_ADDR); //0xFFFF1E00;
 
@@ -11980,6 +12067,5 @@
 
     // Reset the bit to zero as aslong as the bit is 1, pointers are in reset state
     (*ptr_drp_init32) = (*ptr_drp_init32)&(L1_DRP_TX_PTR_RESET_RESET);
-#endif
 }
-
+#endif
--- a/L1/cfile/l1_ctl.c	Thu Jun 09 05:38:18 2016 +0000
+++ b/L1/cfile/l1_ctl.c	Thu Jun 09 05:45:03 2016 +0000
@@ -9,9 +9,8 @@
 
 #define  L1_CTL_C
 
-#include "config.h"
+#include "l1_macro.h"
 #include "l1_confg.h"
-#include "l1_macro.h"
 
 #if (CODE_VERSION == SIMULATION)
   #include <string.h>
@@ -104,7 +103,7 @@
     #include "l1aac_defty.h"
   #endif
   #include "l1_defty.h"
-  #include "../../gpf/inc/cust_os.h"
+  #include "cust_os.h"
   #include "l1_msgty.h"
   #include "l1_varex.h"
   #include "l1_proto.h"
@@ -148,6 +147,18 @@
 /* Automatic frequency compensation */
 /************************************/
 
+/*
+ * FreeCalypso TCS211 reconstruction: the following 3 functions
+ * have been added in the LoCosto version of this module.
+ * We have conditioned them out in order to match the original
+ * TCS211 object; their uses have been conditioned out as well.
+ *
+ * These functions will need to re-enabled when their uses are
+ * re-enabled.
+ */
+
+#if 0
+
 #define L1_WORD16_POS_MAX (32767)
 #define L1_WORD16_NEG_MAX (-32768)
 #define L1_WORD32_POS_MAX ((unsigned long)(1<<31)-1)
@@ -225,7 +236,7 @@
   }
   return(result);
 }
-
+#endif
 
 INLINE WORD32 Add_40b( WORD32 guard1guard2, WORD32 lvar1, WORD32 lvar2, WORD16 *guardout )
 {
@@ -395,7 +406,9 @@
     static UWORD32 M_Count;
     static WORD32  psi_avg[C_PSI_AVG_SIZE_D+1]; // Data history array
     static WORD16  B_Count;                     // Counter for consecutive SNR below C_thr_snr
-    UWORD16 L = 10433;                          // Gain algo2
+    #if 0	/* LoCosto added var */
+      UWORD16 L = 10433;                          // Gain algo2
+    #endif
     static UWORD16 first_avg;
     static UWORD16 good_snr;
 
@@ -409,13 +422,13 @@
     UWORD8 physical_band_id;
 #endif
 
-
+#if 0	/* LoCosto added var init */
 //Set AFC close loop gain for ALGO_AFC_LQG_PREDICTOR.
 if(l1_mode==I_MODE)//MS is in Idle mode
 L = 41732; //F0.20 L=41732/2^20 = 0.04
 else //All other modes than Idle
 L = 10433; //F0.20 L=10433/2^20 = 0.01
-
+#endif
 
 #if (L1_FF_MULTIBAND == 0)
 
@@ -656,9 +669,7 @@
      } /* end else AFC_INIT*/
 
      *frame_count=0;
-//Locosto
-//     return(Psi_quant[C_N_del]>>3); /* F16.0 */
-     return(CONVERT_PSI_QUANT(Psi_quant[C_N_del])); /* F16.0 to 14.2 or 13.3 */
+     return(Psi_quant[C_N_del]>>3); /* F16.0 */
 
 #else
 
@@ -678,10 +689,12 @@
             case AFC_INIT_MIN     :
             quant_avg = 0;
             M_Count = 0;
-                for (i = 0; i <= C_PSI_AVG_SIZE_D ; i++)  //omaps00090550
-                    psi_avg[i] = 0;
-                first_avg = 1;
-                good_snr = 0;
+#if 0	/* present in LoCosto but not in TCS211 */
+            for (i = 0; i <= C_PSI_AVG_SIZE_D ; i++)  //omaps00090550
+                psi_avg[i] = 0;
+#endif
+            first_avg = 1;
+            good_snr = 0;
 
             // DAC search algorithm is as follows - up to 12 attempts are made
             // DAC search algorithm uses three values : DAC_center -> DAC_max -> DAC_min ->
@@ -752,11 +765,21 @@
                     ((WORD32) (((WORD32)(var_32 + (1<<18))) / (1<<19)));
                 var_16 = var_16 * 8;
 #endif
+
+              #if 0	/* LoCosto code with saturation */
                 if (var_16 > C_max_step)
                     psi_quant = Add_Sat_sign_16b(psi_quant,C_max_step);
                 else if (var_16 < C_min_step)
                     psi_quant = Add_Sat_sign_16b(psi_quant,C_min_step);
                 else psi_quant = Add_Sat_sign_16b(psi_quant,var_16); /* F13.3 */
+              #else	/* matching TCS211 */
+                if (var_16 > C_max_step)
+                    psi_quant += C_max_step;
+                else if (var_16 < C_min_step)
+                    psi_quant += C_min_step;
+                else psi_quant += var_16; /* F13.3 */
+              #endif
+
                 /* F0.32 * F13.3 = F5.35    */
                 psi_past[C_N_del]=Mult_40b(l1_config.params.psi_st_32,psi_quant, &guardout);
                 /*  (F13.3<<16 )+(F5.35>>16) = F13.19 */
@@ -846,11 +869,18 @@
                     /* Phi = angle - Phi_32*/
                     Phi_32 = ((WORD32) angle << 4) - Phi_32;
                     /* F1.15 * 4 = F13.19 */
-		    Phi = (WORD16)((WORD32)((WORD32)(Phi_32 + (1<<3)))/ (1<<4)); /* F17.15 */
+                    #if 0	/* LoCosto code */
+                      Phi = (WORD16)((WORD32)((WORD32)(Phi_32 + (1<<3)))/ (1<<4)); /* F17.15 */
+                    #else	/* TCS211 reconstruction */
+                      Phi = Phi_32 >> 4;
+                    #endif
                     /* (F0.20 * F1.15) >> 16 = F13.19 */
-                    var_32 = (L * Phi + (1<<15)) >> 16;
-                    psi_past[C_N_del] = Add_Sat_sign_32b(psi_past[C_N_del],var_32);
-
+                    #if 0	/* LoCosto code with saturation and L */
+                      var_32 = (L * Phi + (1<<15)) >> 16;
+                      psi_past[C_N_del] = Add_Sat_sign_32b(psi_past[C_N_del],var_32);
+                    #else	/* matching TCS211 */
+                      psi_past[C_N_del] += (10433 * Phi) >> 16;
+                    #endif
 
                 }
                 else
@@ -884,9 +914,14 @@
                             // Predict with 1st order estimation
                             if (l1_config.params.rgap_algo >= 1)
                             {
+                            #if 0	/* LoCosto code with saturation */
                                  psi_past[C_N_del] = Add_Sat_sign_32b(psi_past[C_N_del],
                                      ((quant_avg * (l1_config.params.rgap_bad_snr_count_B))/(C_MSIZE))
                                      );
+                            #else	/* matching TCS211 */
+                                 psi_past[C_N_del] +=
+                                     ((quant_avg * (l1_config.params.rgap_bad_snr_count_B))/(C_MSIZE));
+                            #endif
                             }
 
                             B_Count= B_Count - l1_config.params.rgap_bad_snr_count_B;
@@ -906,7 +941,11 @@
                 /* Quantize psi value */
 
                 /* F0.19 * 16.0 = F16.19 */
-                var_32 = Sat_Mult_20sign_16unsign(psi_past[C_N_del],l1_config.params.psi_st_inv);
+                #if 0	/* LoCosto code */
+                  var_32 = Sat_Mult_20sign_16unsign(psi_past[C_N_del],l1_config.params.psi_st_inv);
+                #else	/* TCS211 reconstruction */
+		  var_32 = psi_past[C_N_del] * l1_config.params.psi_st_inv;
+                #endif
 
 #if(RF_FAM == 61)
                 /* In order to implement the NINT function for a F13.3,*/
@@ -932,9 +971,7 @@
 
         *frame_count = 0;
 
-//Locosto
-//        return (psi_quant >> 3); /* F16.0 */
-     return(CONVERT_PSI_QUANT(psi_quant)); /* F16.0 to 14.2 or 13.3 */
+        return (psi_quant >> 3); /* F16.0 */
     } /* end case algo 2 */
 
     /* algo1 + init + estimator/predictor */
@@ -949,10 +986,12 @@
 
         quant_avg = 0;
         M_Count = 0;
-            for (i = 0; i <=C_PSI_AVG_SIZE_D ; i++)   //omaps00090550
-                psi_avg[i] = 0;
-            first_avg = 1;
-            good_snr = 0;
+#if 0	/* present in LoCosto but not in TCS211 */
+        for (i = 0; i <=C_PSI_AVG_SIZE_D ; i++)   //omaps00090550
+            psi_avg[i] = 0;
+#endif
+        first_avg = 1;
+        good_snr = 0;
 
         // DAC search algorithm is as follows - up to 12 attempts are made
         // DAC search algorithm uses three values : DAC_center -> DAC_max -> DAC_min ->
@@ -1027,14 +1066,20 @@
           quotient=(WORD16)((WORD32)(((WORD32)(var_32+(1<<18)))/(1<<19)));
           var_16=quotient*8;
 #endif
+
+#if 0	/* LoCosto code with saturation */
           if (var_16>C_max_step)
             Psi_quant[C_N_del]=Add_Sat_sign_16b(Psi_quant[C_N_del],C_max_step);
-           else
-           if(var_16<C_min_step)
-             Psi_quant[C_N_del]=Add_Sat_sign_16b(Psi_quant[C_N_del],C_min_step);
-           else Psi_quant[C_N_del]=Add_Sat_sign_16b(Psi_quant[C_N_del],var_16);     /* F13.3                  */
-
-
+          else if (var_16<C_min_step)
+            Psi_quant[C_N_del]=Add_Sat_sign_16b(Psi_quant[C_N_del],C_min_step);
+          else Psi_quant[C_N_del]=Add_Sat_sign_16b(Psi_quant[C_N_del],var_16);     /* F13.3                  */
+#else	/* matching TCS211 */
+          if (var_16>C_max_step)
+            Psi_quant[C_N_del] += C_max_step;
+          else if (var_16<C_min_step)
+            Psi_quant[C_N_del] += C_min_step;
+          else Psi_quant[C_N_del] += var_16;     /* F13.3                  */
+#endif
 
                  /* F0.32 * F13.3 = F5.35    */
          Psi=Mult_40b(l1_config.params.psi_st_32,Psi_quant[C_N_del], &guardout);
@@ -1153,7 +1198,11 @@
            var1=(WORD32)var1<<8;
            /* var2 is an unsigned variable, var1 contains signed guard*/
            /* bits.                                                   */
-           var2=  ((WORD32)(denom)/(num));  //omaps00090550
+           #if 0	/* fixed LoCosto code */
+             var2=  ((WORD32)(denom)/(num));  //omaps00090550
+           #else	/* matching TCS211 */
+             var2=  denom / num;
+           #endif
            K = (var1+var2)<<1;             /* F1.39 / F12.20 = F13.19 */
                                            /* F13.19 << 1 = F12.20    */
 
@@ -1275,12 +1324,10 @@
 
 
        }/*end AFC_CLOSE_LOOP*/
-     } /* end else AFC_INIT*/
-
-        *frame_count = 0;
-//Locosto
-//     return(Psi_quant[C_N_del]>>3); /* F16.0 */
-     return(((CONVERT_PSI_QUANT(Psi_quant[C_N_del]))&0x3FFF)); /* F16.0 to 14.2 or 13.3 */
+    } /* end else AFC_INIT*/
+
+       *frame_count = 0;
+       return(Psi_quant[C_N_del]>>3); /* F16.0 */
     } /* end case algo 3 */
 #endif
 
@@ -1630,19 +1677,25 @@
   }
   else
   {
-    UWORD32 TOA_divisor = 0;
+#if 0	/* fix added in LoCosto, not present in TCS211 */
+    UWORD32 TOA_divisor;
+#endif
     TOA_estimated=(TOASP[IZW]*IZW)+(TOASP[IZW-1]*(IZW-1)>>C_GEW);
     TOA_estimated *= 8; //F13.3 in order to have qBit precision
+#if 0
     TOA_divisor = TOASP[IZW]+(TOASP[IZW-1] >> C_GEW);
     if (TOA_divisor!=0)
+#endif
     {
-    TOA_estimated/= TOASP[IZW]+(TOASP[IZW-1] >> C_GEW);
-    TOA_estimated /= 2; // unit in QBit ("/8" then "*4" = "/2")
-  }
+      TOA_estimated /= TOASP[IZW]+(TOASP[IZW-1] >> C_GEW);
+      TOA_estimated /= 2; // unit in QBit ("/8" then "*4" = "/2")
+    }
+#if 0
     else
     {
       TOA_estimated = 0;
     }
+#endif
   }
 
   if (Trans_active)
@@ -1830,6 +1883,8 @@
 #if(L1_FF_MULTIBAND == 0)
 WORD8 l1ctl_encode_delta1(UWORD16 radio_freq)
 {
+  WORD8 freq_band;
+
   switch(l1_config.std.id)
   {
     case GSM:
@@ -1837,17 +1892,18 @@
     case DCS1800:
     case PCS1900:
     case GSM850:
-      return(l1_config.std.cal_freq1_band1);
+      freq_band = l1_config.std.cal_freq1_band1;
+      break;
     case DUAL:
     case DUALEXT:
     case DUAL_US:
       if(radio_freq >= l1_config.std.first_radio_freq_band2)
-        return(l1_config.std.cal_freq1_band2);
+        freq_band = l1_config.std.cal_freq1_band2;
       else
-        return(l1_config.std.cal_freq1_band1);
+        freq_band = l1_config.std.cal_freq1_band1;
+      break;
   }
-return 0;//omaps00090550
-
+  return(freq_band);
 }
 #endif
 /*-------------------------------------------------------*/
@@ -1927,16 +1983,18 @@
 /*-------------------------------------------------------*/
 UWORD8 l1ctl_csgc(UWORD8 pm, UWORD16 radio_freq)
 {
-   WORD16   current_IL, current_calibrated_IL =0;  //omaps00090550
+   WORD16   current_IL, current_calibrated_IL;
    WORD8    delta1_freq, delta2_freq;
    WORD16   delta_drp_gain=0;
    UWORD32  index;
    UWORD16  g_magic;
-   UWORD16  arfcn;
+   #if (RF_FAM == 61) && (L1_FF_MULTIBAND == 0)
+     UWORD16  arfcn;
+   #endif 
    UWORD16 dco_algo_ctl_pw_temp = 0;
    UWORD8 if_ctl = 0;
    #if (RF_RAM == 61) && (CODE_VERSION != SIMULATION)
-   UWORD8 if_threshold = C_IF_ZERO_LOW_THRESHOLD_GSM;
+     UWORD8 if_threshold = C_IF_ZERO_LOW_THRESHOLD_GSM;
    #endif
 
 #if (L1_FF_MULTIBAND == 0)
@@ -1955,7 +2013,8 @@
    delta2_freq = l1ctl_encode_delta2(radio_freq);
 
    g_magic = l1ctl_get_g_magic(radio_freq);
-#if (L1_FF_MULTIBAND == 0)
+
+#if (RF_FAM == 61) && (L1_FF_MULTIBAND == 0)
    arfcn = Convert_l1_radio_freq(radio_freq);
 #endif 
 
@@ -1967,7 +2026,7 @@
 #if(RF_FAM == 61)
    #if (CODE_VERSION != SIMULATION)
 
-#if (PWMEAS_IF_MODE_FORCE == 0)
+     #if (PWMEAS_IF_MODE_FORCE == 0)
        cust_get_if_dco_ctl_algo(&dco_algo_ctl_pw_temp, &if_ctl, (UWORD8) L1_IL_INVALID ,
            0,
            radio_freq,if_threshold);
@@ -1976,11 +2035,11 @@
        dco_algo_ctl_pw_temp = DCO_IF_0KHZ;
      #endif
 
-#if (L1_FF_MULTIBAND == 0)
-	 delta_drp_gain = drp_gain_correction(arfcn, LNA_ON, (l1_config.params.high_agc << 1));    // F7.1 format
-#else
-     delta_drp_gain = drp_gain_correction(radio_freq, LNA_ON, (l1_config.params.high_agc << 1));    // F7.1 format
-#endif // MULTIBAND == 0 else
+     #if (L1_FF_MULTIBAND == 0)
+       delta_drp_gain = drp_gain_correction(arfcn, LNA_ON, (l1_config.params.high_agc << 1));    // F7.1 format
+     #else
+       delta_drp_gain = drp_gain_correction(radio_freq, LNA_ON, (l1_config.params.high_agc << 1));    // F7.1 format
+     #endif // MULTIBAND == 0 else
 
      if(if_ctl == IF_100KHZ_DSP){
        delta_drp_gain += SCF_ATTENUATION_LIF_100KHZ;
@@ -2045,7 +2104,10 @@
                         &(l1a_l1s_com.last_input_level[index].lna_off),
                         radio_freq);
 
-       l1a_l1s_com.last_input_level[index].input_level = (UWORD8)current_IL;
+       l1a_l1s_com.last_input_level[index].input_level = (UWORD8)current_IL +
+	 l1ctl_get_lna_att(radio_freq) *
+	   l1a_l1s_com.last_input_level[index].lna_off;
+
        l1a_l1s_com.full_list.sat_flag[l1a_l1s_com.full_list.next_to_read] = 0;
      }
    }
@@ -2057,11 +2119,11 @@
        #if (CODE_VERSION != SIMULATION)
         cust_get_if_dco_ctl_algo(&dco_algo_ctl_pw_temp, &if_ctl, (UWORD8) L1_IL_INVALID,
             0,radio_freq,if_threshold);
-#if (L1_FF_MULTIBAND == 0)       
-         delta_drp_gain = drp_gain_correction(arfcn, LNA_ON, (l1_config.params.low_agc << 1));    // F7.1 format
-#else
-        delta_drp_gain = drp_gain_correction(radio_freq, LNA_ON, (l1_config.params.low_agc << 1));    // F7.1 format
-#endif 
+        #if (L1_FF_MULTIBAND == 0)       
+          delta_drp_gain = drp_gain_correction(arfcn, LNA_ON, (l1_config.params.low_agc << 1));    // F7.1 format
+        #else
+          delta_drp_gain = drp_gain_correction(radio_freq, LNA_ON, (l1_config.params.low_agc << 1));    // F7.1 format
+        #endif 
         if(if_ctl == IF_100KHZ_DSP){
           delta_drp_gain += SCF_ATTENUATION_LIF_100KHZ;
         }
@@ -2089,7 +2151,9 @@
                       &(l1a_l1s_com.last_input_level[index].lna_off),
                       radio_freq);
 
-     l1a_l1s_com.last_input_level[index].input_level = (UWORD8)current_IL;
+     l1a_l1s_com.last_input_level[index].input_level = (UWORD8)current_IL +
+	l1ctl_get_lna_att(radio_freq) *
+	  l1a_l1s_com.last_input_level[index].lna_off;
 
      l1a_l1s_com.full_list.sat_flag[l1a_l1s_com.full_list.next_to_read] = 0;
    }
@@ -2116,11 +2180,13 @@
    WORD8   delta1_freq, delta2_freq;
    WORD16  delta_drp_gain=0;
    WORD32  index, lna_value;
-   UWORD16 arfcn;
+   #if (RF_RAM == 61) && (CODE_VERSION != SIMULATION)
+     UWORD16 arfcn;
+   #endif
    UWORD16 dco_algo_ctl_pw_temp = 0;
    UWORD8 if_ctl = 0;
    #if (RF_RAM == 61) && (CODE_VERSION != SIMULATION)
-   UWORD8 if_threshold = C_IF_ZERO_LOW_THRESHOLD_GSM;
+     UWORD8 if_threshold = C_IF_ZERO_LOW_THRESHOLD_GSM;
    #endif
 
 #if (L1_FF_MULTIBAND == 0)
@@ -2139,17 +2205,20 @@
 
    lna_value = lna_off * l1ctl_get_lna_att(radio_freq);
 
-   last_known_agc = (Cust_get_agc_from_IL(radio_freq, last_known_il >> 1, PWR_ID, lna_off)) << 1;
+   last_known_agc = (Cust_get_agc_from_IL(radio_freq, last_known_il >> 1, PWR_ID)) << 1;
    // F7.1 in order to be compatible with
    // pm and IL formats [-20,+140 in F7.1]
    // contain the input_level value we use
    // in the associated CTL task to build
    // the agc used in this CTL.
-#if (L1_FF_MULTIBAND == 0)  
+
+#if (RF_RAM == 61) && (CODE_VERSION != SIMULATION)
+#if (L1_FF_MULTIBAND == 0)
   arfcn = Convert_l1_radio_freq(radio_freq);
 #else
-  arfcn=radio_freq;
-#endif 
+  arfcn = radio_freq;
+#endif
+#endif
 
 #if(RF_FAM == 61)
    #if (CODE_VERSION != SIMULATION)
@@ -2175,7 +2244,7 @@
 #endif
 
    if (0==pm)  // Check and filter illegal pm value by using last valid IL
-     current_IL = l1a_l1s_com.last_input_level[index].input_level ;
+     current_IL = l1a_l1s_com.last_input_level[index].input_level - lna_value;
    else
      current_IL = -(pm - (last_known_agc - delta_drp_gain) + lna_value - l1ctl_get_g_magic(radio_freq));
 
@@ -2192,7 +2261,9 @@
                     &(l1a_l1s_com.last_input_level[index].lna_off),
                     radio_freq);
 
-   l1a_l1s_com.last_input_level[index].input_level = (UWORD8)current_IL;
+   l1a_l1s_com.last_input_level[index].input_level = (UWORD8)current_IL +
+      l1ctl_get_lna_att(radio_freq) *
+	l1a_l1s_com.last_input_level[index].lna_off;
 
    return((UWORD8)current_calibrated_IL);
 }
@@ -2217,11 +2288,13 @@
    WORD16   delta_low_drp_gain=0;
    WORD32   index;
    UWORD16  g_magic;
-   UWORD16  arfcn;
+   #if (RF_RAM == 61) && (CODE_VERSION != SIMULATION)
+     UWORD16  arfcn;
+   #endif
    UWORD16 dco_algo_ctl_pw_temp = 0;
    UWORD8 if_ctl = 0;
    #if (RF_RAM == 61) && (CODE_VERSION != SIMULATION)
-   UWORD8 if_threshold = C_IF_ZERO_LOW_THRESHOLD_GSM;
+     UWORD8 if_threshold = C_IF_ZERO_LOW_THRESHOLD_GSM;
    #endif
 
 #if (L1_FF_MULTIBAND == 0)
@@ -2244,11 +2317,13 @@
    // lna_off was set to 0 during CTRL, so lna_value = 0 do not appear in the following
    // formula.
 
-#if (L1_FF_MULTIBAND == 0)  
+#if (RF_RAM == 61) && (CODE_VERSION != SIMULATION)
+#if (L1_FF_MULTIBAND == 0)
   arfcn = Convert_l1_radio_freq(radio_freq);
 #else
-  arfcn=radio_freq;
-#endif 
+  arfcn = radio_freq;
+#endif
+#endif
 
    if ((0==pm_high_agc) || (0==pm_low_agc))  // Check and filter illegal pm value(s) by using last valid IL
      new_IL      = l1a_l1s_com.last_input_level[index].input_level;
@@ -2341,7 +2416,9 @@
                     &(l1a_l1s_com.last_input_level[index].lna_off),
                     radio_freq);
 
-   l1a_l1s_com.last_input_level[index].input_level = (UWORD8)new_IL;
+   l1a_l1s_com.last_input_level[index].input_level = (UWORD8)new_IL +
+      l1ctl_get_lna_att(radio_freq) *
+	l1a_l1s_com.last_input_level[index].lna_off;
 }
 
 
@@ -2395,12 +2472,14 @@
    WORD32  current_IL, current_calibrated_IL;
    UWORD8  i;
    WORD32  lna_value;
-   UWORD16 arfcn;
+   #if (RF_RAM == 61) && (CODE_VERSION != SIMULATION)
+     UWORD16 arfcn;
+   #endif
    UWORD8  lna_off;
    UWORD16 dco_algo_ctl_pw_temp = 0;
    UWORD8 if_ctl = 0;
    #if (RF_RAM == 61) && (CODE_VERSION != SIMULATION)
-   UWORD8 if_threshold = C_IF_ZERO_LOW_THRESHOLD_GSM;
+     UWORD8 if_threshold = C_IF_ZERO_LOW_THRESHOLD_GSM;
    #endif
 
    delta1_freq = l1ctl_encode_delta1(radio_freq);
@@ -2416,18 +2495,20 @@
    lna_value = l1a_l1s_com.Scell_used_IL_dd.lna_off * l1ctl_get_lna_att(radio_freq);
 
    // Compute applied agc for this pm
-   last_known_agc = (Cust_get_agc_from_IL(radio_freq, l1a_l1s_com.Scell_used_IL_dd.input_level >> 1, MAX_ID,l1a_l1s_com.Scell_used_IL_dd.lna_off )) << 1;
+   last_known_agc = (Cust_get_agc_from_IL(radio_freq, l1a_l1s_com.Scell_used_IL_dd.input_level >> 1, MAX_ID)) << 1;
                                   // F7.1 in order to be compatible
                                   // with pm and IL formats
                                   // contain the input_level value we use
                                   // in the associated CTL task to build
                                   // the agc used in this CTL.
 
-#if (L1_FF_MULTIBAND == 0)  
+#if (RF_RAM == 61) && (CODE_VERSION != SIMULATION)
+#if (L1_FF_MULTIBAND == 0)
   arfcn = Convert_l1_radio_freq(radio_freq);
 #else
-  arfcn=radio_freq;
-#endif 
+  arfcn = radio_freq;
+#endif
+#endif
 
 #if(RF_FAM == 61)
    #if (CODE_VERSION != SIMULATION)
@@ -2448,7 +2529,7 @@
 #endif
 
    if (0==pm)  // Check and filter illegal pm value by using last valid IL
-     current_IL = IL_info_ptr->input_level;
+     current_IL = IL_info_ptr->input_level - lna_value;
    else
      current_IL = -(pm - (last_known_agc - delta_drp_gain) + lna_value - l1ctl_get_g_magic(radio_freq));
 
@@ -2469,12 +2550,13 @@
                      &(IL_info_ptr->lna_off),
                      radio_freq );
 
-   IL_info_ptr->input_level = IL_max;
+   IL_info_ptr->input_level = IL_max + l1ctl_get_lna_att(radio_freq) *
+					IL_info_ptr->lna_off;
 
    #if L2_L3_SIMUL
      #if (DEBUG_TRACE==BUFFER_TRACE_PAGC)
        buffer_trace(4,IL_info_ptr->input_level,last_known_agc,
-                      l1a_l1s_com.Scell_used_IL_dd.input_level,Cust_get_agc_from_IL(radio_freq, IL_max >> 1, MAX_ID, l1a_l1s_com.Scell_used_IL_dd.lna_off));
+                      l1a_l1s_com.Scell_used_IL_dd.input_level,Cust_get_agc_from_IL(radio_freq, IL_max >> 1, MAX_ID));
      #endif
    #endif
 
@@ -2505,12 +2587,14 @@
   UWORD8      *tab_ptr;
   T_DEDIC_SET *aset;
   WORD32       lna_value;
-  UWORD16      arfcn;
+  #if (RF_RAM == 61) && (CODE_VERSION != SIMULATION)
+    UWORD16      arfcn;
+  #endif
   UWORD8       lna_off;
   UWORD16 dco_algo_ctl_pw_temp = 0;
   UWORD8 if_ctl = 0;
   #if (RF_RAM == 61) && (CODE_VERSION != SIMULATION)
-  UWORD8 if_threshold = C_IF_ZERO_LOW_THRESHOLD_GSM;
+    UWORD8 if_threshold = C_IF_ZERO_LOW_THRESHOLD_GSM;
   #endif
 
   delta1_freq = l1ctl_encode_delta1(radio_freq);
@@ -2539,10 +2623,10 @@
   #endif
     {
       #if DPAGC_MAX_FLAG
-        last_known_agc  = (Cust_get_agc_from_IL(radio_freq, l1a_l1s_com.Scell_used_IL_dd.input_level >> 1, MAX_ID,l1a_l1s_com.Scell_used_IL_dd.lna_off)) << 1;
+        last_known_agc  = (Cust_get_agc_from_IL(radio_freq, l1a_l1s_com.Scell_used_IL_dd.input_level >> 1, MAX_ID)) << 1;
         // F7.1 in order to be compatible with pm and IL formats
       #else
-        last_known_agc  = (Cust_get_agc_from_IL(radio_freq, l1a_l1s_com.Scell_used_IL_dd.input_level >> 1, AV_ID,l1a_l1s_com.Scell_used_IL_dd.lna_off)) << 1;
+        last_known_agc  = (Cust_get_agc_from_IL(radio_freq, l1a_l1s_com.Scell_used_IL_dd.input_level >> 1, AV_ID)) << 1;
         // F7.1 in order to be compatible with pm and IL formats
       #endif
       // input_level_dd : contain the input_level value we use
@@ -2551,11 +2635,13 @@
       lna_value = l1a_l1s_com.Scell_used_IL_dd.lna_off * l1ctl_get_lna_att(radio_freq);
     }
 
-#if (L1_FF_MULTIBAND == 0)  
+#if (RF_RAM == 61) && (CODE_VERSION != SIMULATION)
+#if (L1_FF_MULTIBAND == 0)
   arfcn = Convert_l1_radio_freq(radio_freq);
 #else
-  arfcn=radio_freq;
-#endif 
+  arfcn = radio_freq;
+#endif
+#endif
 
 #if(RF_FAM == 61)
    #if (CODE_VERSION != SIMULATION)
@@ -2576,7 +2662,7 @@
 #endif
 
   if (0==pm)  // Check and filter illegal pm value by using last valid IL
-    new_IL    = IL_info_ptr->input_level;
+    new_IL    = IL_info_ptr->input_level - lna_value;
   else
     new_IL    = -(pm - (last_known_agc - delta_drp_gain) + lna_value - l1ctl_get_g_magic(radio_freq));
 
@@ -2663,12 +2749,13 @@
                     &(IL_info_ptr->lna_off),
                     radio_freq );
 
-  IL_info_ptr->input_level = (UWORD8)new_IL ;
+  IL_info_ptr->input_level = (UWORD8)new_IL + l1ctl_get_lna_att(radio_freq) *
+					IL_info_ptr->lna_off;
 
   #if L2_L3_SIMUL
     #if (DEBUG_TRACE==BUFFER_TRACE_DPAGC)
       buffer_trace(4,IL_info_ptr->input_level,last_known_agc,
-                     l1a_l1s_com.Scell_used_IL_dd.input_level,Cust_get_agc_from_IL(radio_freq, new_IL >> 1, MAX_ID,l1a_l1s_com.Scell_used_IL_dd.lna_off));
+                     l1a_l1s_com.Scell_used_IL_dd.input_level,Cust_get_agc_from_IL(radio_freq, new_IL >> 1, MAX_ID));
     #endif
   #endif
 
@@ -2696,7 +2783,9 @@
     UWORD8       *tab_ptr, *tab_amr_ptr;
     T_DEDIC_SET *aset;
     WORD32       lna_value;
-    UWORD16      arfcn;
+    #if (RF_RAM == 61) && (CODE_VERSION != SIMULATION)
+	UWORD16  arfcn;
+    #endif
     UWORD8       lna_off;
     UWORD16 dco_algo_ctl_pw_temp = 0;
     UWORD8 if_ctl = 0;
@@ -2734,10 +2823,10 @@
     #endif
       {
         #if DPAGC_MAX_FLAG
-          last_known_agc  = (Cust_get_agc_from_IL(radio_freq, l1a_l1s_com.Scell_used_IL_dd.input_level >> 1, MAX_ID,l1a_l1s_com.Scell_used_IL_dd.lna_off)) << 1;
+          last_known_agc  = (Cust_get_agc_from_IL(radio_freq, l1a_l1s_com.Scell_used_IL_dd.input_level >> 1, MAX_ID)) << 1;
           // F7.1 in order to be compatible with pm and IL formats
         #else
-          last_known_agc  = (Cust_get_agc_from_IL(radio_freq, l1a_l1s_com.Scell_used_IL_dd.input_level >> 1, AV_ID,l1a_l1s_com.Scell_used_IL_dd.lna_off)) << 1;
+          last_known_agc  = (Cust_get_agc_from_IL(radio_freq, l1a_l1s_com.Scell_used_IL_dd.input_level >> 1, AV_ID)) << 1;
           // F7.1 in order to be compatible with pm and IL formats
         #endif
         // input_level_dd : contain the input_level value we use
@@ -2746,11 +2835,13 @@
         lna_value = l1a_l1s_com.Scell_used_IL_dd.lna_off * l1ctl_get_lna_att(radio_freq);
       }
 
-#if (L1_FF_MULTIBAND == 0)  
+#if (RF_RAM == 61) && (CODE_VERSION != SIMULATION)
+#if (L1_FF_MULTIBAND == 0)
   arfcn = Convert_l1_radio_freq(radio_freq);
 #else
-  arfcn=radio_freq;
-#endif 
+  arfcn = radio_freq;
+#endif
+#endif
 
 #if(RF_FAM == 61)
    #if (CODE_VERSION != SIMULATION)
@@ -2769,7 +2860,7 @@
 #endif
 
     if (0==pm)  // Check and filter illegal pm value by using last valid IL
-      new_IL    = IL_info_ptr->input_level;
+      new_IL    = IL_info_ptr->input_level - lna_value;
     else
       new_IL    = -(pm - (last_known_agc - delta_drp_gain) + lna_value - l1ctl_get_g_magic(radio_freq));
 
@@ -2871,12 +2962,13 @@
     l1ctl_encode_lna( (UWORD8)(current_calibrated_IL>>1),
                       &(IL_info_ptr->lna_off),
                       radio_freq );
-    IL_info_ptr->input_level = (UWORD8)new_IL ;
+    IL_info_ptr->input_level = (UWORD8)new_IL + l1ctl_get_lna_att(radio_freq) *
+						IL_info_ptr->lna_off;
 
     #if L2_L3_SIMUL
       #if (DEBUG_TRACE==BUFFER_TRACE_DPAGC)
         buffer_trace(4,IL_info_ptr->input_level,last_known_agc,
-                       l1a_l1s_com.Scell_used_IL_dd.input_level,Cust_get_agc_from_IL(radio_freq, new_IL >> 1, MAX_ID,l1a_l1s_com.Scell_used_IL_dd.lna_off));
+                       l1a_l1s_com.Scell_used_IL_dd.input_level,Cust_get_agc_from_IL(radio_freq, new_IL >> 1, MAX_ID));
       #endif
     #endif
 
@@ -2942,7 +3034,7 @@
 /* Return     :                                          */
 /* Functionality :                                       */
 /*-------------------------------------------------------*/
-UWORD16 l1ctl_update_TPU_with_toa(void)
+void l1ctl_update_TPU_with_toa(void)
 {
   #if (TOA_ALGO != 0)
     WORD16 toa_shift;
@@ -3006,7 +3098,6 @@
       #endif
     }
   #endif
-return 0; //omaps00090550
 }
 
 
--- a/L1/cfile/l1_drive.c	Thu Jun 09 05:38:18 2016 +0000
+++ b/L1/cfile/l1_drive.c	Thu Jun 09 05:45:03 2016 +0000
@@ -9,15 +9,16 @@
 
 #define  L1_DRIVE_C
 
-#include "config.h"
 #include "l1_confg.h"
 
 #if (RF_FAM == 61)
 #include "apc.h"
 #endif
 
-#if ((W_A_WAIT_DSP_RESTART_AFTER_VOCODER_ENABLE ==1)&&(W_A_DSP_PR20037 == 1))
-  #include "../../nucleus/nucleus.h"
+#define	W_A_DSP_PR20037	1	/* FreeCalypso */
+
+#if ((L1M_WAIT_DSP_RESTART_AFTER_VOCODER_ENABLE ==1)&&(W_A_DSP_PR20037 == 1))
+  #include "nucleus.h"
 #endif
 #include "l1_macro.h"
 #if (CODE_VERSION == SIMULATION)
@@ -106,7 +107,7 @@
   #endif
   #include "l1_defty.h"
   #include "l1_varex.h"
-  #include "../../gpf/inc/cust_os.h"
+  #include "cust_os.h"
   #include "l1_msgty.h"
   #if TESTMODE
     #include "l1tm_varex.h"
@@ -150,7 +151,7 @@
 #endif//#if ((REL99 == 1) && (FF_BHO == 1))
 
 void Cust_get_ramp_tab(API *a_ramp, UWORD8 txpwr_ramp_up, UWORD8 txpwr_ramp_down, UWORD16 radio_freq);
-#if ((ANALOG == 1) || (ANALOG == 2) || (ANALOG == 3) || (RF_FAM == 61))
+#if ((ANLG_FAM == 1) || (ANLG_FAM == 2) || (ANLG_FAM == 3) || (RF_FAM == 61))
   UWORD16 Cust_get_pwr_data(UWORD8 txpwr, UWORD16 radio_freq
   										  #if(REL99 && FF_PRF)
   										  ,UWORD8 number_uplink_timeslot
@@ -334,7 +335,7 @@
 #endif
     //######################## For DSP Rom #################################
     l1s_dsp_com.dsp_db_w_ptr->d_afc = afc;                      // Write new afc command.
-    #if ((ANALOG == 1) || (ANALOG == 2) || (ANALOG == 3) || (RF_FAM == 61))
+    #if ((ANLG_FAM == 1) || (ANLG_FAM == 2) || (ANLG_FAM == 3) || (RF_FAM == 61))
     // NOTE: In Locosto AFC loading is w.r.t DRP not in ABB
       l1s_dsp_com.dsp_db_w_ptr->d_ctrl_abb |= (1 << B_AFC);     // Validate new afc value.
     #endif
@@ -376,7 +377,7 @@
 /*-------------------------------------------------------*/
 void l1ddsp_load_txpwr(UWORD8 txpwr, UWORD16 radio_freq)
 {
-  #if ((ANALOG == 1) || (ANALOG == 2) || (ANALOG == 3) || (RF_FAM == 61))
+  #if ((ANLG_FAM == 1) || (ANLG_FAM == 2) || (ANLG_FAM == 3) || (RF_FAM == 61))
     UWORD16 pwr_data;
   #endif
 
@@ -399,7 +400,7 @@
        #endif
     #endif
 
-    #if ((ANALOG == 1) || (ANALOG == 2) || (ANALOG == 3))
+    #if ((ANLG_FAM == 1) || (ANLG_FAM == 2) || (ANLG_FAM == 3))
       l1s_dsp_com.dsp_db_w_ptr->d_ctrl_abb |= ( (1 << B_RAMP) | (1 << B_BULRAMPDEL) | (1 << B_BULRAMPDEL2));
     #endif
 
@@ -441,7 +442,7 @@
     if(txpwr == NO_TXPWR)
     {
        /*** No transmit ***/
-       #if ((ANALOG == 1) || (ANALOG == 2) || (ANALOG == 3))
+       #if ((ANLG_FAM == 1) || (ANLG_FAM == 2) || (ANLG_FAM == 3))
          l1s_dsp_com.dsp_db_w_ptr->d_power_ctl = 0x12; // AUXAPC initialization addr 9 pg 0 Omega
          l1s_dsp_com.dsp_db_w_ptr->d_ctrl_abb |= ( (1 << B_RAMP) | (1 << B_BULRAMPDEL)  | (1 << B_BULRAMPDEL2));
        #endif
@@ -464,7 +465,7 @@
       									  );
 
       /*** Load power control level adding the APC address register ***/
-      #if ((ANALOG == 1) || (ANALOG == 2) || (ANALOG == 3))
+      #if ((ANLG_FAM == 1) || (ANLG_FAM == 2) || (ANLG_FAM == 3))
         l1s_dsp_com.dsp_db_w_ptr->d_power_ctl = ((pwr_data << 6) | 0x12);
         // AUXAPC initialization addr 9 pg 0 Omega
       #endif
@@ -494,7 +495,7 @@
 		    #endif
           #endif
 
-          #if ((ANALOG == 1) || (ANALOG == 2) || (ANALOG == 3))
+          #if ((ANLG_FAM == 1) || (ANLG_FAM == 2) || (ANLG_FAM == 3))
 	    // Setting bit 3 of this register causes DSP to write to APCDEL1 register in Omega. However,
             // we are controlling this register from MCU through the SPI. Therefore, set it to 0.
             l1s_dsp_com.dsp_db_w_ptr->d_ctrl_abb |= ( (1 << B_RAMP) | (0 << B_BULRAMPDEL)  | (1 << B_BULRAMPDEL2));
@@ -528,7 +529,7 @@
        #endif
       #endif
 
-      #if ((ANALOG == 1) || (ANALOG == 2) || (ANALOG == 3) ||(RF_FAM == 61))
+      #if ((ANLG_FAM == 1) || (ANLG_FAM == 2) || (ANLG_FAM == 3) ||(RF_FAM == 61))
         l1s_dsp_com.dsp_db_w_ptr->d_ctrl_abb |= ( (1 << B_RAMP) | (1 << B_BULRAMPDEL)  | (1 << B_BULRAMPDEL2));
       #endif
     }
@@ -816,7 +817,7 @@
       {
         l1a_l1s_com.dedic_set.start_vocoder = TCH_VOCODER_ENABLE_REQ;
 
-        #if ( W_A_WAIT_DSP_RESTART_AFTER_VOCODER_ENABLE ==1)
+        #if ( L1M_WAIT_DSP_RESTART_AFTER_VOCODER_ENABLE ==1)
           NU_Sleep(DSP_VOCODER_ON_TRANSITION); // DSP transition
         #endif
       }
@@ -934,13 +935,13 @@
 /* Return     :                                          */
 /* Functionality :                                       */
 /*-------------------------------------------------------*/
-void l1ddsp_meas_read(UWORD8 nbmeas, UWORD16 *pm)
+void l1ddsp_meas_read(UWORD8 nbmeas, UWORD8 *pm)
 {
   UWORD8 i;
 
   for (i= 0; i < nbmeas; i++)
   {
-    pm[i] = ((l1s_dsp_com.dsp_db_r_ptr->a_pm[i] & 0xffff));
+    pm[i] = ((l1s_dsp_com.dsp_db_r_ptr->a_pm[i] & 0xffff) >> 5);
   }
 
   #if TESTMODE
@@ -1061,19 +1062,19 @@
     #endif // AUDIO_SIMULATION
 
   #else // NOT_SIMULATION
-    UWORD32 dsp_task=0 ;//omaps00090550;
+    UWORD32 dsp_task;
     switch(type)
     {
       case GSM_CTL:
       // a DSP control for a GSM task
       //-----------------------------
       {
-      // set only GSM task and GSM page
-      dsp_task = B_GSM_TASK | l1s_dsp_com.dsp_w_page;
-      // change DSP page pointer for next controle
-      l1s_dsp_com.dsp_w_page  ^= 1;
-    }
-    break;
+        // set only GSM task and GSM page
+        dsp_task = B_GSM_TASK | l1s_dsp_com.dsp_w_page;
+        // change DSP page pointer for next controle
+        l1s_dsp_com.dsp_w_page  ^= 1;
+      }
+      break;
 
       case MISC_CTL:
       // a DSP control for a MISC task
@@ -1081,28 +1082,33 @@
       {
         UWORD32  previous_page = l1s_dsp_com.dsp_w_page ^ 1;
 
-      // set only MISC task and reset MISC page
-      // (don't change GSM PAGE).
-      // set DSP communication Interrupt.
-      dsp_task = B_MISC_TASK | previous_page;
+        // set only MISC task and reset MISC page
+        // (don't change GSM PAGE).
+        // set DSP communication Interrupt.
+        dsp_task = B_MISC_TASK | previous_page;
+
+        // Rem: DSP makes the DB header feedback even in case
+        //      of MISC task (like TONES). This created some
+        //      side effect which are "work-around" passing
+        //      the correct DB page to the DSP.
+      }
+      break;
 
-      // Rem: DSP makes the DB header feedback even in case
-      //      of MISC task (like TONES). This created some
-      //      side effect which are "work-around" passing
-      //      the correct DB page to the DSP.
-    }
-    break;
+      case GSM_MISC_CTL:
+      // a DSP control for a GSM and a MISC tasks
+      //-----------------------------------------
+      {
+        // set GSM task, MISC task and GSM page bit.....
+        dsp_task =  B_GSM_TASK | B_MISC_TASK | l1s_dsp_com.dsp_w_page;
+        // change DSP page pointer for next controle
+        l1s_dsp_com.dsp_w_page  ^= 1;
+      }
+      break;
 
-    case GSM_MISC_CTL:
-    // a DSP control for a GSM and a MISC tasks
-    //-----------------------------------------
-    {
-      // set GSM task, MISC task and GSM page bit.....
-      dsp_task =  B_GSM_TASK | B_MISC_TASK | l1s_dsp_com.dsp_w_page;
-      // change DSP page pointer for next controle
-      l1s_dsp_com.dsp_w_page  ^= 1;
-    }
-      break;
+      #if 0	/* enable this after TCS211 reconstruction */
+      default:
+	dsp_task = 0;
+      #endif
     }
 
     // write dsp tasks.....
@@ -1202,7 +1208,7 @@
     if (win_id == 0)
   #endif
   {
-    #if ((ANALOG == 1) || (ANALOG == 2) || (ANALOG == 3))
+    #if ((ANLG_FAM == 1) || (ANLG_FAM == 2) || (ANLG_FAM == 3))
     // NOTE: In Locosto AFC is in DRP not in triton
         l1ddsp_load_afc(l1s.afc);
     #endif
@@ -1562,7 +1568,7 @@
    #endif
  #endif
 
-  #if ((ANALOG == 1) || (ANALOG == 2) || (ANALOG == 3))
+  #if ((ANLG_FAM == 1) || (ANLG_FAM == 2) || (ANLG_FAM == 3))
       l1ddsp_load_afc(l1s.afc);
   #endif
   #if (RF_FAM == 61)
@@ -2074,12 +2080,8 @@
 UWORD32         iq_dump_buffer_log_index = 0;
 UWORD32         iq_overflow_ind=0;
 
-#endif
-
 void l1ddsp_read_iq_dump(UWORD8 task)
 {
-
-#if (L1_DEBUG_IQ_DUMP == 1)
   UWORD16 *p_dsp_iq_buffer_ptr;
   UWORD16 size;
   int i;
@@ -2119,8 +2121,5 @@
       size*2*2); /* size * 2 (as size is in IQsample pair) * 2 (to convert to bytes) */
 
   iq_dump_buffer_log_index = iq_dump_buffer_log_index + 1;
-
+}
 #endif
-}
-
-
--- a/L1/cfile/l1_func.c	Thu Jun 09 05:38:18 2016 +0000
+++ b/L1/cfile/l1_func.c	Thu Jun 09 05:45:03 2016 +0000
@@ -9,9 +9,8 @@
 
 #define  L1_FUNC_C
 
-#include "config.h"
+#include "l1_macro.h"
 #include "l1_confg.h"
-#include "l1_macro.h"
 
 #if (CODE_VERSION == SIMULATION)
   #include <string.h>
@@ -104,7 +103,7 @@
     #include "l1aac_defty.h"
   #endif
   #include "l1_defty.h"
-  #include "../../gpf/inc/cust_os.h"
+  #include "cust_os.h"
   #include "l1_msgty.h"
   #include "l1_varex.h"
   #include "l1_proto.h"
@@ -113,13 +112,13 @@
   #include "l1_ver.h"
   #include "tpudrv.h"
 
-  #include "../../bsp/mem.h"
-  #include "../../bsp/inth.h"
-  #include "../../bsp/clkm.h"
-  #include "../../bsp/rhea_arm.h"
-  #include "../../bsp/dma.h"
-  #include "../../bsp/ulpd.h"
-  #include "../dsp/leadapi.h"
+  #include "mem.h"
+  #include "inth.h"
+  #include "clkm.h"
+  #include "rhea_arm.h"
+  #include "dma.h"
+  #include "ulpd.h"
+  #include "leadapi.h"
 
   #if (OP_L1_STANDALONE)
   #if (CHIPSET == 4) || (CHIPSET == 7) || (CHIPSET == 8) || (CHIPSET == 10) || \
@@ -150,15 +149,15 @@
 
   /* DSP patch */
   #if (DWNLD == NO_DWNLD)
-    const UWORD8  patch_array[1] = {0};
-    const UWORD8  DspCode_array[1] = {0};
-    const UWORD8  DspData_array[1] = {0};
+    const UWORD8  patch_array[1];
+    const UWORD8  DspCode_array[1] ;
+    const UWORD8  DspData_array[1];
   #elif (DWNLD == PATCH_DWNLD)
     extern const UWORD8  patch_array[] ;
-    const UWORD8  DspCode_array[1] = {0};
-    const UWORD8  DspData_array[1] = {0};
+    const UWORD8  DspCode_array[1] ;
+    const UWORD8  DspData_array[1];
   #elif (DWNLD == DSP_DWNLD)
-    const UWORD8 patch_array[1] = {0};
+    const UWORD8 patch_array[1] ;
     extern const UWORD8 DspCode_array[] ;
     extern const UWORD8 DspData_array[];
   #else
@@ -168,9 +167,11 @@
   #endif
 
   extern const UWORD8  bootCode[] ;
-   UWORD32  fn_prev; // Added as a debug stage..
   /* DSP patch */
 
+#if ( FF_REPEATED_DL_FACCH == 1 )
+   UWORD32  fn_prev; // Added as a debug stage..
+#endif
 
 /*-------------------------------------------------------*/
 /* Prototypes of internal functions used in this file.   */
@@ -205,7 +206,7 @@
 /*-------------------------------------------------------*/
 void dsp_power_on(void)
 {
-  UWORD16 dsp_start_address =0 ;//omaps00090550
+    UWORD16 dsp_start_address;
     UWORD16 param_size;
     #if IDS
       UWORD16 param_size2;
@@ -1107,9 +1108,6 @@
     IncMod(time->t3, 1, 51);                // increment T3 % 51.
     IncMod(time->fn_mod42432, 1, 42432);    // increment FN % 42432.
     IncMod(time->fn_mod13, 1, 13);          // increment FN % 13.
-    IncMod(time->fn_mod13_mod4, 1, 4);      // increment (FN % 13) % 4.
-    if(time->fn_mod13 == 0)
-      time->fn_mod13_mod4 = 0;
 
     if(time->t3 == 0)
     // new FN is a multiple of 51.
@@ -1125,6 +1123,10 @@
       IncMod(time->fn_mod52, 1, 52);        // increment FN % 52.
       IncMod(time->fn_mod104, 1, 104);      // increment FN % 104.
 
+      IncMod(time->fn_mod13_mod4, 1, 4);      // increment (FN % 13) % 4.
+      if(time->fn_mod13 == 0)
+        time->fn_mod13_mod4 = 0;
+
       if((time->fn_mod13 == 0) || (time->fn_mod13 == 4) || (time->fn_mod13 == 8))
         IncMod(time->block_id, 1, MAX_BLOCK_ID);
     #endif
@@ -1141,7 +1143,6 @@
     time->tc = (time->fn / 51) % 8;        // TC = (FN div 51) % 8
     time->fn_mod42432 = time->fn % 42432;  // FN%42432.
     time->fn_mod13    = time->fn % 13;     // FN % 13.
-    time->fn_mod13_mod4 = time->fn_mod13 % 4; // FN % 13 % 4.
 
     #if (L1_GPRS)
       time->fn_mod104     = time->fn % 104;     // FN % 104.
@@ -1151,6 +1152,8 @@
       else
         time->fn_mod52    = time->fn_mod104;
 
+      time->fn_mod13_mod4 = time->fn_mod13 % 4; // FN % 13 % 4.
+
       time->block_id      = ((3 * (time->fn / 13)) + (time->fn_mod13 / 4));
     #endif
 
@@ -1320,7 +1323,7 @@
 UWORD32 l1s_swap_iq_dl(UWORD16 radio_freq, UWORD8 task)
 {
   UWORD8   swap_iq;
-  UWORD32  task_tab= 0; //omaps00090550
+  UWORD32  task_tab;
 
 #if (L1_FF_MULTIBAND == 0)  
   if(((l1_config.std.id == DUAL) || (l1_config.std.id == DUALEXT) || (l1_config.std.id == DUAL_US)) &&
@@ -1366,7 +1369,7 @@
 UWORD32 l1s_swap_iq_ul(UWORD16 radio_freq, UWORD8 task)
 {
   UWORD8   swap_iq;
-  UWORD32  task_tab = 0; //omaps00090550
+  UWORD32  task_tab;
 
 #if (L1_FF_MULTIBAND == 0)
 
@@ -1724,7 +1727,12 @@
 #endif    // AMR
 
 
+/*
+ * FreeCalypso TCS211 reconstruction: the following l1_memcpy_16bit()
+ * function has been moved to l1_dyn_dwl_func.c.
+ */
 
+#if 0
 /*--------------------------------------------------------*/
 /* l1_memcpy_16bit()                                      */
 /*--------------------------------------------------------*/
@@ -1780,7 +1788,9 @@
   }
   return;
 }
+#endif
 
+#if (FF_L1_FAST_DECODING == 1)
 /*-----------------------------------------------------------------*/
 /* l1s_restore_synchro                                             */
 /*-----------------------------------------------------------------*/
@@ -1834,7 +1844,6 @@
 #endif
 }
 
-#if (FF_L1_FAST_DECODING == 1)
 BOOL l1s_check_deferred_control(UWORD8 task, UWORD8 burst_id)
 {
   /* Control activities are performed only if:
@@ -2312,9 +2321,9 @@
 
 #endif 
 
+#if (L1_FF_MULTIBAND == 1)
 void l1_multiband_error_handler(UWORD16 radio_freq)
 {
     while(1);
 }
-
-
+#endif
--- a/L1/cfile/l1_init.c	Thu Jun 09 05:38:18 2016 +0000
+++ b/L1/cfile/l1_init.c	Thu Jun 09 05:45:03 2016 +0000
@@ -9,9 +9,10 @@
 
 #define  L1_INIT_C
 
-#include "config.h"
 #include "l1_confg.h"
 
+#define	W_A_DSP_PR20037	1	/* FreeCalypso */
+
 #if (CODE_VERSION == SIMULATION)
   #include <string.h>
   #include "l1_types.h"
@@ -83,10 +84,10 @@
 #else // NO SIMULATION
 
   #include <string.h>
-  /* #include "tm_defs.h" */
+  #include "tm_defs.h"
   #include "l1_types.h"
   #include "sys_types.h"
-  #include "../dsp/leadapi.h"
+  #include "leadapi.h"
   #include "l1_const.h"
   #include "l1_macro.h"
   #include "l1_time.h"
@@ -98,10 +99,10 @@
   #endif
 
 
-  #include "../../bsp/abb+spi/spi_drv.h"
-  #include "../../bsp/abb+spi/abb.h"
-  #if (ANALOG != 11)
-  #include "../../bsp/abb+spi/abb_core_inth.h"
+  #include "spi_drv.h"
+  #include "abb.h"
+  #if (ANLG_FAM != 11)
+  #include "abb_core_inth.h"
   #endif
 
   #if TESTMODE
@@ -129,7 +130,7 @@
   #endif
 
   #include "l1_defty.h"
-  #include "../../gpf/inc/cust_os.h"
+  #include "cust_os.h"
   #include "l1_msgty.h"
   #include "l1_varex.h"
   #include "l1_proto.h"
@@ -141,15 +142,15 @@
   #if (CHIPSET == 12) || (CHIPSET == 15)
     #include "sys_inth.h"
   #else
-    #include "../../bsp/mem.h"
-    #include "../../bsp/inth.h"
-    #include "../../bsp/dma.h"
-    #include "../../bsp/iq.h"
+    #include "mem.h"
+    #include "inth.h"
+    #include "dma.h"
+    #include "iq.h"
   #endif
 
-  #include "../../bsp/clkm.h"
-  #include "../../bsp/rhea_arm.h"
-  #include "../../bsp/ulpd.h"
+  #include "clkm.h"
+  #include "rhea_arm.h"
+  #include "ulpd.h"
 
   #include "l1_proto.h"
 
@@ -197,7 +198,7 @@
   #include <string.h>
   #include <stdio.h>
 
-#if (ANALOG == 11)
+#if (ANLG_FAM == 11)
   #include "bspTwl3029_I2c.h"
   #include "bspTwl3029_Aud_Map.h"
   #include "bspTwl3029_Madc.h"
@@ -209,7 +210,7 @@
 #include "drp_main.h" 
 #endif
 
-#if (ANALOG == 11)
+#if (ANLG_FAM == 11)
 #if (L1_MADC_ON == 1)
 extern BspTwl3029_MadcResults l1_madc_results;
 extern void l1a_madc_callback(void);
@@ -379,14 +380,14 @@
     l1s_dsp_com.dsp_ndb_ptr->a_fd[2]          = 0xffff;        // NERR = 0xffff
     l1s_dsp_com.dsp_ndb_ptr->d_a5mode         = 0;
 
-    #if ((ANALOG == 1) || (ANALOG == 2)  || (ANALOG == 3) || (ANALOG == 11))
+    #if ((ANLG_FAM == 1) || (ANLG_FAM == 2)  || (ANLG_FAM == 3) || (ANLG_FAM == 11))
       l1s_dsp_com.dsp_ndb_ptr->d_tch_mode     = 0x0800;  // Analog base band selected = Nausica, Iota, Syren (bit 11)
     #endif
 
-    #if ((ANALOG == 1) || (ANALOG == 2)  || (ANALOG == 3))
+    #if ((ANLG_FAM == 1) || (ANLG_FAM == 2)  || (ANLG_FAM == 3))
       l1s_dsp_com.dsp_ndb_ptr->d_tch_mode    |= (((l1_config.params.guard_bits - 4) & 0x000F) << 7); //Bit 7..10: guard bits
     #endif
-    #if (ANALOG == 11)
+    #if (ANLG_FAM == 11)
       l1s_dsp_com.dsp_ndb_ptr->d_tch_mode    |= (((l1_config.params.guard_bits) & 0x000F) << 7); //Bit 7..10: guard bits
     #endif
 
@@ -414,7 +415,7 @@
 
 #endif
 
-#if (DSP == 33) || (DSP == 34) || (DSP == 35) || (DSP == 36) || (DSP == 37) || (DSP == 38) || (DSP == 39)
+#if (DSP >= 33)
   // Initialize V42b variables
   l1s_dsp_com.dsp_ndb_ptr->d_v42b_nego0       = 0;
   l1s_dsp_com.dsp_ndb_ptr->d_v42b_nego1       = 0;
@@ -449,7 +450,7 @@
       // Initialize the poll response buffer to "no poll request"
       l1ps_dsp_com.pdsp_ndb_ptr->a_pu_gprs[0][0]     = CS_NONE_TYPE;
     #else // L1_GPRS
-      #if ((DSP == 31) || (DSP == 32) || (DSP == 33) || (DSP == 34) || (DSP == 35) || (DSP == 36) || (DSP == 37) || (DSP == 38) || (DSP == 39))
+      #if (DSP >= 31)
         l1s_dsp_com.dsp_ndb_ptr->d_sched_mode_gprs_ovly = GSM_SCHEDULER;
       #endif
     #endif // L1_GPRS
@@ -475,14 +476,14 @@
       #endif // DSP
     #endif // DCO_ALGO
 
-    #if ((DSP == 34) || (DSP == 35) || (DSP == 36) || (DSP == 37) || (DSP == 38)) || (DSP == 39)
+    #if (DSP >= 34)
       l1s_dsp_com.dsp_ndb_ptr->a_amr_config[0] = 0;
       l1s_dsp_com.dsp_ndb_ptr->a_amr_config[1] = 0;
       l1s_dsp_com.dsp_ndb_ptr->a_amr_config[2] = 0;
       l1s_dsp_com.dsp_ndb_ptr->a_amr_config[3] = 0;
     #endif
 
-    #if (DSP == 35) || (DSP == 36) || (DSP == 37) || (DSP == 38) || (DSP == 39)
+    #if (DSP >= 35)
       l1s_dsp_com.dsp_ndb_ptr->d_thr_onset_afs      = 400; // thresh detection ONSET AFS
       l1s_dsp_com.dsp_ndb_ptr->d_thr_sid_first_afs  = 150; // thresh detection SID_FIRST AFS
       l1s_dsp_com.dsp_ndb_ptr->d_thr_ratscch_afs    = 450; // thresh detection RATSCCH AFS
@@ -494,7 +495,7 @@
       l1s_dsp_com.dsp_ndb_ptr->d_thr_soft_bits    = 0; // thresh detection SPEECH DEGRADED/NO_DATA
     #endif
 
-    #if ((DSP==36 || (DSP == 37) || (DSP == 38) || (DSP == 39))&&(W_A_AMR_THRESHOLDS==1))
+    #if ((DSP >= 36) && (AMR_THRESHOLDS_WORKAROUND == 1))
       // init of the afs thresholds parameters
       l1s_dsp_com.dsp_ndb_ptr->a_d_macc_thr_afs[0]=0;
       l1s_dsp_com.dsp_ndb_ptr->a_d_macc_thr_afs[1]=0;
@@ -503,7 +504,7 @@
       l1s_dsp_com.dsp_ndb_ptr->a_d_macc_thr_afs[4]=0;
       l1s_dsp_com.dsp_ndb_ptr->a_d_macc_thr_afs[5]=0;
       l1s_dsp_com.dsp_ndb_ptr->a_d_macc_thr_afs[6]=0;
-      l1s_dsp_com.dsp_ndb_ptr->a_d_macc_thr_afs[7]=1950;
+      l1s_dsp_com.dsp_ndb_ptr->a_d_macc_thr_afs[7]=1500;
 
       // init of the ahs thresholds parameters
       l1s_dsp_com.dsp_ndb_ptr->a_d_macc_thr_ahs[0]=1500;
@@ -515,14 +516,16 @@
     #endif
 
     // init of of the threshold for USF detection
-    #if (L1_FALSE_USF_DETECTION == 1)
+    #if 1	/* match TCS211 object */
+      l1s_dsp_com.dsp_ndb_ptr->d_thr_usf_detect = 2140;
+    #elif (L1_FALSE_USF_DETECTION == 1)
       l1s_dsp_com.dsp_ndb_ptr->d_thr_usf_detect = 2300;
     #else
       l1s_dsp_com.dsp_ndb_ptr->d_thr_usf_detect = 0;
     #endif
 
     #if (CHIPSET == 12) || (CHIPSET == 15)
-      #if (DSP == 35) || (DSP == 36) || (DSP == 37) || (DSP == 38) || (DSP == 39)
+      #if (DSP >= 35)
         l1s_dsp_com.dsp_ndb_ptr->d_cport_init  = 0;
       #endif
     #endif
@@ -760,7 +763,7 @@
   #endif
 
 
-    #if (ANALOG == 1)
+    #if (ANLG_FAM == 1)
       // Omega registers values will be programmed at 1st DSP communication interrupt
 
       dsp_ndb_ptr->d_debug1      = l1_config.params.debug1;      // Enable f_tx delay of 400000 cyc DEBUG
@@ -786,7 +789,7 @@
         dsp_ndb_ptr->d_apcdel2     = 0x0000;
       #endif
     #endif
-    #if (ANALOG == 2)
+    #if (ANLG_FAM == 2)
       // Iota registers values will be programmed at 1st DSP communication interrupt
 
       dsp_ndb_ptr->d_debug1      = l1_config.params.debug1;      // Enable f_tx delay of 400000 cyc DEBUG
@@ -807,7 +810,7 @@
       dsp_ndb_ptr->d_apcdel1     =l1_config.params.apcdel1;
       dsp_ndb_ptr->d_apcdel2     = l1_config.params.apcdel2;
     #endif
-    #if (ANALOG == 3)
+    #if (ANLG_FAM == 3)
       // Syren registers values will be programmed at 1st DSP communication interrupt
 
       dsp_ndb_ptr->d_debug1      = l1_config.params.debug1;      // Enable f_tx delay of 400000 cyc DEBUG
@@ -842,7 +845,7 @@
 
     #endif
 
-    #if (ANALOG == 11)
+    #if (ANLG_FAM == 11)
 // The following settings need to be done only in L1 StandALoen as PSP would
 // do in the case of full PS Build...
 
@@ -941,7 +944,9 @@
   // flags for wake-up ....
   l1s.pw_mgr.Os_ticks_required = FALSE;
   l1s.pw_mgr.frame_adjust      = FALSE;
+#if 0	/* not present in TCS211 */
   l1s.pw_mgr.wakeup_time       = 0;
+#endif
 
   // variables for sleep ....
   l1s.pw_mgr.sleep_duration    = 0;
@@ -949,7 +954,7 @@
   l1s.pw_mgr.modules_status    = 0;            // all clocks ON
   l1s.pw_mgr.paging_scheduled  = FALSE;
 
-#if 0	/* removed in FreeCalypso */
+#if 0	/* not present in TCS211 */
   // variable for afc bypass mode
   l1s.pw_mgr.afc_bypass_mode   = AFC_BYPASS_MODE;
 #endif
@@ -958,7 +963,9 @@
   l1s.pw_mgr.gaug_count        = 0;
   l1s.pw_mgr.enough_gaug       = FALSE;
         //Nina modify to save power, not forbid deep sleep, only force gauging in next paging
+#if 0	/* not present in TCS211 */
   l1s.force_gauging_next_paging_due_to_CCHR = 0;
+#endif
   l1s.pw_mgr.gauging_task      = INACTIVE;
 
   // GAUGING duration
@@ -1018,17 +1025,27 @@
     // 78000/32.7712768 = 2380.13308
     l1s.pw_mgr.c_clk_min      = (UWORD32)((l1_config.dpll*MCUCLK)/LF_100PPM);
     // 0.13308*2^16
-    l1s.pw_mgr.c_clk_init_min =(UWORD32) ((UWORD32)((UWORD32)(((UWORD32)(l1_config.dpll*MCUCLK))-
+    #if 0	/* LoCosto version */
+      l1s.pw_mgr.c_clk_init_min =(UWORD32) ((UWORD32)((UWORD32)(((UWORD32)(l1_config.dpll*MCUCLK))-
                                           (l1s.pw_mgr.c_clk_min*LF_100PPM))*
                                            65536)/LF_100PPM);  //omaps00090550
-
+    #else	/* TSM30 version */
+      l1s.pw_mgr.c_clk_init_min = (UWORD32)(((double)(l1_config.dpll*MCUCLK)-
+                                          (double)(l1s.pw_mgr.c_clk_min*LF_100PPM))*
+                                           65536)/LF_100PPM;
+    #endif
     // 78000/32.751616 = 2381.561875
     l1s.pw_mgr.c_clk_max      = (UWORD32)((l1_config.dpll*MCUCLK)/LF_500PPM); //omaps00090550
     // 0.561875*2^16
-    l1s.pw_mgr.c_clk_init_max =(UWORD32)((UWORD32)(((double)(l1_config.dpll*MCUCLK)-
+    #if 0	/* LoCosto version */
+      l1s.pw_mgr.c_clk_init_max =(UWORD32)((UWORD32)(((double)(l1_config.dpll*MCUCLK)-
                                          (double)(l1s.pw_mgr.c_clk_max*LF_500PPM))*
                                          65536)/LF_500PPM);//omaps00090550
-
+    #else	/* TSM30 version */
+      l1s.pw_mgr.c_clk_init_max =(UWORD32)(((double)(l1_config.dpll*MCUCLK)-
+                                         (double)(l1s.pw_mgr.c_clk_max*LF_500PPM))*
+                                         65536)/LF_500PPM;
+    #endif
     // remember hf is expressed in nbr of clock in hz (ex 65Mhz,104Mhz)
     l1s.pw_mgr.c_delta_hf_acquis =(UWORD32) (((GAUG_IN_32T/LF)-(GAUG_IN_32T/LF_50PPM))*(l1_config.dpll*MCUCLK));//omaps00090550
     l1s.pw_mgr.c_delta_hf_update =(UWORD32)( ((GAUG_IN_32T/LF)-(GAUG_IN_32T/LF_6PPM ))*(l1_config.dpll*MCUCLK));//omaps00090550
@@ -1078,8 +1095,10 @@
   l1s.frame_count = 0;
   l1s.forbid_meas = 0;
 #if L1_GPRS
+#if 0	/* not present in TCS211 */
   l1s.tcr_prog_done=0;
 #endif
+#endif
 #if (AUDIO_DEBUG == 1)
   audio_reg_read_status=0;
 #endif
@@ -1118,8 +1137,10 @@
   #endif
 
 #if (L1_GPRS == 1)
+#if 0	/* not present in TCS211 */
    l1s.algo_change_synchro_active = FALSE;
 #endif
+#endif
 
 #if (L1_RF_KBD_FIX == 1)
 l1s.total_kbd_on_time = 5000;
@@ -1175,7 +1196,9 @@
       l1s.next_plus_time = l1s.next_time;
       l1s_increment_time(&(l1s.next_plus_time),1);
       l1s.ctrl_synch_before = FALSE;
-      l1s.next_gauging_scheduled_for_PNP= 0;
+      #if 0	/* not present in TCS211 */
+        l1s.next_gauging_scheduled_for_PNP= 0;
+      #endif
     #endif
   }
 
@@ -1214,7 +1237,7 @@
 
   l1s.version.mcu_tcs_program_release = PROGRAM_RELEASE_VERSION;
   l1s.version.mcu_tcs_internal        = INTERNAL_VERSION;
-  l1s.version.mcu_tcs_official        = MAINTENANCE_VERSION;
+  l1s.version.mcu_tcs_official        = OFFICIAL_VERSION;
 
   #if TESTMODE
     l1s.version.mcu_tm_version    = TESTMODEVERSION;
@@ -1392,21 +1415,21 @@
   l1a_l1s_com.dedic_set.fset        = NULL;
   l1a_l1s_com.dedic_set.SignalCode  = 0;
   l1a_l1s_com.dedic_set.sync_tch    = 0;
+  l1a_l1s_com.dedic_set.reset_facch = FALSE;
   l1a_l1s_com.dedic_set.stop_tch    = 0;
-  l1a_l1s_com.dedic_set.reset_facch = FALSE;
 #if (FF_L1_TCH_VOCODER_CONTROL)
   l1a_l1s_com.dedic_set.reset_sacch = FALSE;
-#if (L1_VOCODER_IF_CHANGE == 0)
-  l1a_l1s_com.dedic_set.vocoder_on = TRUE;
-  #if (W_A_DSP_PR20037 == 1)
-    l1a_l1s_com.dedic_set.start_vocoder = TCH_VOCODER_ENABLE_REQ;
-  #else // W_A_DSP_PR20037 == 0
-    l1a_l1s_com.dedic_set.start_vocoder = FALSE;
-  #endif // W_A_DSP_PR20037
-#else // L1_VOCODER_IF_CHANGE
+  #if (L1_VOCODER_IF_CHANGE == 0)
+    l1a_l1s_com.dedic_set.vocoder_on = TRUE;
+    #if (W_A_DSP_PR20037 == 1)
+      l1a_l1s_com.dedic_set.start_vocoder = TCH_VOCODER_ENABLE_REQ;
+    #else // W_A_DSP_PR20037 == 0
+      l1a_l1s_com.dedic_set.start_vocoder = FALSE;
+    #endif // W_A_DSP_PR20037
+  #else // L1_VOCODER_IF_CHANGE
     l1a_l1s_com.dedic_set.vocoder_on = FALSE;
     l1a_l1s_com.dedic_set.start_vocoder = TCH_VOCODER_RESET_COMMAND;
-#endif // L1_VOCODER_IF_CHANGE
+  #endif // L1_VOCODER_IF_CHANGE
 #endif // FF_L1_TCH_VOCODER_CONTROL
 
   l1a_l1s_com.dedic_set.radio_freq       = 0;
@@ -1611,13 +1634,12 @@
 
 /*-------------------------------------------------------------*/
 
+#if(RF_FAM == 61)
 void l1_drp_wrapper_init (void)
-  {
-  #if(RF_FAM == 61)
+{
     l1ddsp_apc_load_apcctrl2(l1_config.params.apcctrl2);
-  #endif
-
-  }
+}
+#endif
 
 /*-------------------------------------------------------------*/
 /* FUNCTION: l1_drp_init */
@@ -1766,11 +1788,13 @@
 #endif
 
   l1_config.tx_pwr_code       = mmi_l1_config->tx_pwr_code;
-  #if IDS
-    l1_config.ids_enable      = mmi_l1_config->ids_enable;
+  #if 0	/* not present in TCS211 */
+    #if IDS
+      l1_config.ids_enable      = mmi_l1_config->ids_enable;
+    #endif
+    l1_config.facch_test.enable = mmi_l1_config->facch_test.enable;
+    l1_config.facch_test.period = mmi_l1_config->facch_test.period;
   #endif
-  l1_config.facch_test.enable = mmi_l1_config->facch_test.enable;
-  l1_config.facch_test.period = mmi_l1_config->facch_test.period;
   l1_config.dwnld             = mmi_l1_config->dwnld;
 
   #if TESTMODE
@@ -1851,13 +1875,10 @@
   #if TRACE_TYPE==3
     reset_stats();
   #endif
-  #if(OP_L1_STANDALONE == 1 || L1_NAVC == 1 )//NAVC
+ #if(OP_L1_STANDALONE == 1 || L1_NAVC == 1 )//NAVC
     Cust_navc_ctrl_status(1);//start - NAVC
-  #endif//end of (OP_L1_STANDALONE == 1 || L1_NAVC == 1 )
+ #endif//end of (OP_L1_STANDALONE == 1 || L1_NAVC == 1 )
 
-  #if FEATURE_TCH_REROUTE
-    feature_tch_reroute_init();
-  #endif
 }
 
 /*-------------------------------------------------------*/
@@ -1888,7 +1909,9 @@
       drp_efuse_init();
     #endif
     l1_tpu_init();
-    wait_ARM_cycles(convert_nanosec_to_cycles(11000000));  // wait of 5.5 msec
+    #if 0	/* not in TCS211 */
+      wait_ARM_cycles(convert_nanosec_to_cycles(11000000));  // wait of 5.5 msec
+    #endif
     l1_dsp_init();
     l1_initialize_var();
 
@@ -1911,6 +1934,3 @@
 
   }
 #endif
-
-
-
--- a/L1/cfile/l1_mfmgr.c	Thu Jun 09 05:38:18 2016 +0000
+++ b/L1/cfile/l1_mfmgr.c	Thu Jun 09 05:45:03 2016 +0000
@@ -10,9 +10,8 @@
 
 #define  L1_MFMGR_C
 
-#include "config.h"
+#include "l1_macro.h"
 #include "l1_confg.h"
-#include "l1_macro.h"
 
 #if (CODE_VERSION == SIMULATION)
   #include <string.h>
@@ -73,7 +72,7 @@
     #include "l1aac_defty.h"
   #endif
   #include "l1_defty.h"
-  #include "../../gpf/inc/cust_os.h"
+  #include "cust_os.h"
   #include "l1_msgty.h"
   #include "l1_varex.h"
   #include "l1_proto.h"
--- a/L1/cfile/l1_pwmgr.c	Thu Jun 09 05:38:18 2016 +0000
+++ b/L1/cfile/l1_pwmgr.c	Thu Jun 09 05:45:03 2016 +0000
@@ -7,81 +7,22 @@
  *
  ************* Revision Controle System Header *************/
 
-// pinghua add these programe code section to put some sleep code into internal ram.
-/*
- * FreeCalypso: the Leonardo binary object version puts all of l1_pwmgr
- * into the regular run-from-flash text section, so we'll do the same
- * for now.
- */
-#if 0
-#pragma CODE_SECTION(l1s_sleep_manager,".emifconf")
-#pragma CODE_SECTION(EMIF_SetConfReg,".emifconf")
-#pragma CODE_SECTION(audio_madc_sleep,".emifconf")
-#pragma CODE_SECTION(Check_Peripheral_App,".emifconf")
-#pragma CODE_SECTION(DBB_Configure_DS,".emifconf")
-#pragma CODE_SECTION(DBB_Wakeup_DS,".emifconf")
-#pragma CODE_SECTION(l1ctl_pgm_clk32,".emifconf")
-#pragma CODE_SECTION(l1ctl_gauging,".emifconf")
-#pragma CODE_SECTION(GAUGING_Handler,".emifconf")
-#pragma CODE_SECTION(l1s_get_HWTimers_ticks,".emifconf")
-#pragma CODE_SECTION(l1s_adapt_traffic_controller,".emifconf")
-#pragma CODE_SECTION(l1s_wakeup,".emifconf")
-#pragma CODE_SECTION(l1s_wakeup_adjust,".emifconf")
-#pragma CODE_SECTION(l1s_compute_wakeup_ticks,".emifconf")
-#pragma CODE_SECTION(l1s_recover_Frame,".emifconf")
-#pragma CODE_SECTION(l1s_recover_HWTimers,".emifconf")
-#pragma CODE_SECTION(l1s_get_next_gauging_in_Packet_Idle,".emifconf")
-#pragma CODE_SECTION(l1s_gauging_decision_with_PNP,".emifconf")
-#pragma CODE_SECTION(l1s_gauging_decision_with_NP,".emifconf")
-#pragma CODE_SECTION(l1s_gauging_task,".emifconf")
-#pragma CODE_SECTION(l1s_gauging_task_end,".emifconf")
-// 2-03-2007 pinghua added end
-#endif
-
 #define  L1_PWMGR_C
 //#pragma DUPLICATE_FOR_INTERNAL_RAM_START
 
-#include "config.h"
+#include "timer/timer2.h"
+#include "armio/armio.h"
+
+//omaps00090550 #include "l1_macro.h"
 #include "l1_confg.h"
 
-//sajal added .....................................
-  #if (CODE_VERSION == SIMULATION)
-  //#include "l1_pwmgr.h"
-//omaps00090550 #303 warning removal 	typedef unsigned char  UWORD_8;
-
-//	typedef volatile unsigned short REG_UWORD16; //omaps00090550
-//	#define REG16(A)    (*(REG_UWORD16*)(A))  //omaps00090550
-//	typedef volatile unsigned short REGISTER_UWORD16;  //omaps00090550
-
-	#define MAP_ULPD_REG	                0xFFFE2000	//ULPD registers start address            (CS4)
-	#define ULPD_SETUP_CLK13_REG   	       (*(REGISTER_UWORD16*)((REGISTER_UWORD16 *)(MAP_ULPD_REG) + 14))
-	#define ULPD_SETUP_SLICER_REG	       (*(REGISTER_UWORD16*)((REGISTER_UWORD16 *)(MAP_ULPD_REG) + 15))
-	#define ULPD_SETUP_VTCXO_REG           (*(REGISTER_UWORD16*)((REGISTER_UWORD16 *)(MAP_ULPD_REG) + 16))
-
-	#define MAP_CLKM_REG	          0xFFFFFD00	 //CLOCKM         registers start address  (CS31)
-	#define CLKM_CNTL_CLK_OFFSET         0x02
-	#define CLKM_CNTL_CLK_REG            REG16 (MAP_CLKM_REG + CLKM_CNTL_CLK_OFFSET)
+#if (OP_L1_STANDALONE == 1)
+  #include "uart/serialswitch_core.h"
+#else
+  #include "uart/serialswitch.h"
+#endif
 
-	#define EMIF_CONFIG_PWD_POS                      0
-	#define EMIF_CONFIG_PDE_POS                      1
-	#define EMIF_CONFIG_PREFETCH_POS                3
-	#define EMIF_CONFIG_FLUSH_PREFETCH_POS          5
-	#define EMIF_CONFIG_WP_POS                      6
-
-	#define            EMIF_CONFIG                              REG16(EMIF_CONFIG_BASE_ADDR+EMIF_CONFIG_REG_OFFSET)
-	#define EMIF_CONFIG_BASE_ADDR      0xFFFFFB00      //External Memory inter registers address (CS31)   (NEW)
-	#define EMIF_CONFIG_REG_OFFSET          0x02    // Emif configuration register
-
-#endif
-//sajal added till here......
-
-
-
-#include "../../bsp/timer2.h"
-#include "../../bsp/armio.h"
-#include "../../serial/serialswitch.h"
-
-#if 0 //(OP_L1_STANDALONE == 0)
+#if (OP_L1_STANDALONE == 0)
   #include "sim/sim.h"
   #include "rv_swe.h"
 #endif
@@ -166,8 +107,8 @@
   #include "l1_types.h"
   #include "l1_const.h"
 
-  #include "../../bsp/abb+spi/abb.h"
-  /* #include "dma/sys_dma.h" */
+  #include "abb/abb.h"
+  #include "dma/sys_dma.h"
 
   #if (OP_BT == 1)
     #include "hci_ll_simul.h"
@@ -204,148 +145,26 @@
   #include "l1_tabs.h"
   #include "sys_types.h"
   #include "tpudrv.h"
-  #include "../../gpf/inc/cust_os.h"
+  #include "cust_os.h"
   #include "l1_msgty.h"
   #include "l1_proto.h"
   #include "l1_trace.h"
-  #include "../../bsp/timer.h"
-
-  #include "l1_pwmgr.h"
+  #include "timer/timer.h"
 
   #if (CHIPSET == 12) || (CHIPSET == 15)
     #include "timer/timer_sec.h"
     #include "inth/sys_inth.h"
 
-
-
-  #if(CHIPSET == 15)
-	#include "l1_pwmgr.h"
-  #if (OP_L1_STANDALONE == 0)
-        #include "lcc/lcc_api.h"
-  #endif
-
-	/* If NAND is enabled */
-	#if defined(RVM_DATALIGHT_SWE) || defined(RVM_NAN_SWE)
-		unsigned int temp_NAND_Reg1;
-		unsigned int temp_NAND_Reg2;
-		unsigned int temp_NAND_Reg3;
-	#endif
-
-
-
-
-
-	#if (OP_L1_STANDALONE == 1)
-
-	       const 	t_peripheral_interface  Peripheral_interface [MAX_PERIPHERAL]=
-		{
-			f_peripheral_interface_dummy,
-			f_peripheral_interface_dummy,
-			f_peripheral_interface_dummy,
-			f_peripheral_interface_dummy,
-			f_peripheral_interface_dummy,
-			f_peripheral_interface_dummy,
-			f_peripheral_interface_dummy,
-			f_peripheral_interface_dummy,
-			madc_outen_check,             /* MADC_AS_ID = 8 */
-			f_peripheral_interface_dummy,
-			f_peripheral_interface_dummy,
-			f_peripheral_interface_dummy,
-			f_peripheral_interface_dummy,
-			f_peripheral_interface_dummy,
-			f_peripheral_interface_dummy,
-			f_peripheral_interface_dummy,
-		};
-
-		const t_application_interface  Application_interface [MAX_APPLICATIONS] =
-		{
-			f_application_interface_dummy,
-			f_application_interface_dummy,
-			f_application_interface_dummy,
-			f_application_interface_dummy,
-			f_application_interface_dummy,
-			f_application_interface_dummy,
-			f_application_interface_dummy,
-			f_application_interface_dummy,
-			f_application_interface_dummy,
-			f_application_interface_dummy,
-			f_application_interface_dummy,
-			f_application_interface_dummy,
-			f_application_interface_dummy,
-			f_application_interface_dummy,
-			f_application_interface_dummy,
-			f_application_interface_dummy,
-		};
-	#else  // For integrated Build
-		const t_peripheral_interface  Peripheral_interface [MAX_PERIPHERAL]=
-		{
-			uart_pwr_interface,
-#ifdef RVM_USB_SWE
-			usb_pwr_interface,
-#else
-            f_peripheral_interface_dummy,
-#endif
-			usim_pwr_interface,
-			i2c_pwr_interface,
-			lcd_pwr_interface,
-#ifdef RVM_CAMD_SWE
-#if (OP_L1_STANDALONE == 0)
-				camera_pwr_interface,
-#endif
-#else
-                f_peripheral_interface_dummy,
-#endif
-			backlight_pwr_interface,
-			f_peripheral_interface_dummy,
-			audio_madc_sleep,				/* MADC_AS_ID = 8 */
-			lcc_pwr_interface,
-			f_peripheral_interface_dummy,
-			f_peripheral_interface_dummy,
-			f_peripheral_interface_dummy,
-			f_peripheral_interface_dummy,
-			f_peripheral_interface_dummy,
-			f_peripheral_interface_dummy,
-		};
-
-		const t_application_interface  Application_interface [MAX_APPLICATIONS] =
-		{
-#ifdef BTS
-
-			BTHAL_PM_HandleSleepManagerReq,
-#else
-			f_application_interface_dummy,
-#endif
-			f_application_interface_dummy,
-			f_application_interface_dummy,
-			f_application_interface_dummy,
-			f_application_interface_dummy,
-			f_application_interface_dummy,
-			f_application_interface_dummy,
-			f_application_interface_dummy,
-			f_application_interface_dummy,
-			f_application_interface_dummy,
-			f_application_interface_dummy,
-			f_application_interface_dummy,
-			f_application_interface_dummy,
-			f_application_interface_dummy,
-			f_application_interface_dummy,
-			f_application_interface_dummy,
-		};
-
-
-	   #endif // (OP_L1_STANDALONE == 1)
-
-    #endif // omaps00090550 #14 -d removal (CHIPSET = 15)
-
+    /* FreeCalypso: massive #if (CHIPSET == 15) chunk removed */
 
   #else  //(CHIPSET == 12) || (CHIPSET == 15)
-    #include "../../bsp/iq.h"
-    #include "../../bsp/inth.h"
+    #include "inth/iq.h"
+    #include "inth/inth.h"
   #endif
 //  #include "timer1.h"
-  #include "../../bsp/ulpd.h"
-  #include "../../bsp/clkm.h"
-  #include "../../bsp/mem.h"
+  #include "ulpd/ulpd.h"
+  #include "clkm/clkm.h"
+  #include "memif/mem.h"
   #if L2_L3_SIMUL
     #include "hw_debug.h"
   #endif
@@ -413,7 +232,7 @@
 #endif
 
 #if L1_GPRS
-  UWORD32 l1s_get_next_gauging_in_Packet_Idle(void);
+  WORD32 l1s_get_next_gauging_in_Packet_Idle(void);
 #endif
 //#pragma DUPLICATE_FOR_INTERNAL_RAM_END
 
@@ -439,10 +258,17 @@
   frac = (UWORD32)(((HF - (root*LF)) << 16) / LF);
 
 // previous ratio with frac + 0.5
+#if 0	/* original LoCosto code */
 #define RATIO2(HF,LF, root, frac)         \
 if(LF){                                       \
  root = (UWORD32)(HF/LF);                           \
   frac = (UWORD32)((((HF - (root*LF)) << 16) + 0.5*LF) / LF);}
+#else	/* FreeCalypso TCS211 reconstruction */
+#define RATIO2(HF,LF, root, frac)	\
+{					\
+  root = (UWORD32)(HF/LF);                           \
+  frac = (UWORD32)((((HF - (root*LF)) << 16) + 0.5*LF) / LF);}
+#endif
 
 #define HFTHEO(LF, root, frac, hftheo) \
   hftheo = root*LF + ((frac*LF) >>16);
@@ -456,620 +282,12 @@
   }
 
 
-
-#if (CODE_VERSION!=SIMULATION)
+#if 0	/* FreeCalypso TCS211 reconstruction */
 T_PWMGR_DEBUG l1_pwmgr_debug;
-#endif // NOT SIMULATION
-
-#if(CHIPSET == 15)
-
-/************************************************************/
-/* Configure EMIF for optimal consumption                   */
-/************************************************************/
-
-
-    void EMIF_SetConfReg(const UWORD8 wp,const UWORD8 flush_prefetch,const UWORD8 Prefetch_mode,const UWORD8 pde,const UWORD8 pwd_en)
-	{
-    UWORD16 Emif_config_Reg;
-    Emif_config_Reg  = (pwd_en << EMIF_CONFIG_PWD_POS | pde << EMIF_CONFIG_PDE_POS | Prefetch_mode << EMIF_CONFIG_PREFETCH_POS | flush_prefetch << EMIF_CONFIG_FLUSH_PREFETCH_POS | wp << EMIF_CONFIG_WP_POS);
-    /*p_Emifreg -> EMIF_Config =  (Emif_config_Reg & EMIF_CONFIG_REG_MASK );*/
-    EMIF_CONFIG              = Emif_config_Reg;
-	} // End of  EMIF_SetConfReg
-
-
-
-#if (OP_L1_STANDALONE == 1)  // API for Audio and MADC
-
-
-
-	T_AUDIO_OUTEN_REG audio_outen_pm;
-
-// L1 Standalone function for Configuring Audio registers.
-// Argument CLK_MASK checks if Audio path is active
-// Argument SLEEP_CMD configures Audio registers for optimal consumption
-// Argument WAKE_CMD reconfigure audio registers after wakeup
-
-	Uint8 madc_outen_check(Uint8 cmd)  {
-		BspTwl3029_ReturnCode returnVal = BSP_TWL3029_RETURN_CODE_FAILURE;
-	   /* I2C array */
-		Bsp_Twl3029_I2cTransReqArray i2cTransArray;
-		Bsp_Twl3029_I2cTransReqArrayPtr i2cTransArrayPtr= &i2cTransArray;
-
-		/* twl3029 I2C reg info struct */
-		BspTwl3029_I2C_RegisterInfo regInfo[8] ;
-		BspTwl3029_I2C_RegisterInfo* regInfoPtr = regInfo;
-		BspTwl3029_I2C_RegData shadow_pwronstatus, ston_bit;
-		Uint8 count = 0;//OMAPS90550-new
-
-
-		switch( cmd )  {
-
-			case CLK_MASK:
-				  returnVal = BspTwl3029_I2c_shadowRegRead(BSP_TWL3029_I2C_AUD, BSP_TWL_3029_MAP_AUDIO_PWRONSTATUS_OFFSET,
-									 &shadow_pwronstatus);
-				  ston_bit = (shadow_pwronstatus & (1 << BSP_TWL3029_LLIF_AUDIO_PWRONSTATUS_STON_OFFSET));
-
-				  if (ston_bit == 1) return DCXO_CLOCK;
-				  else return NO_CLOCK;
- // omaps00090550 		break;
-
-			case SLEEP_CMD:
-				/* store the output enable 1 register  */
-				returnVal = BspTwl3029_I2c_shadowRegRead(BSP_TWL3029_I2C_AUD, BSP_TWL_3029_MAP_AUDIO_OUTEN1_OFFSET,
-									 &audio_outen_pm.outen1);
-
-				/* store the output enable 2 register  */
-				returnVal = BspTwl3029_I2c_shadowRegRead(BSP_TWL3029_I2C_AUD, BSP_TWL_3029_MAP_AUDIO_OUTEN2_OFFSET,
-									 &audio_outen_pm.outen2);
-
-				/* store the output enable 3 register  */
-				returnVal = BspTwl3029_I2c_shadowRegRead(BSP_TWL3029_I2C_AUD, BSP_TWL_3029_MAP_AUDIO_OUTEN3_OFFSET,
-								 &audio_outen_pm.outen3);
-
-
-				/* write default values into OUTEN1,OUTEN2 & OUTEN3 */
-				returnVal = BspTwl3029_I2c_regQueWrite(BSP_TWL3029_I2C_AUD, BSP_TWL_3029_MAP_AUDIO_OUTEN1_OFFSET,
-	  											 BSP_TWL_3029_MAP_AUDIO_OUTEN1_DEFAULT,regInfoPtr++);
-				count++;
-
-				/* store the output enable 2 register  */
-				returnVal = BspTwl3029_I2c_regQueWrite(BSP_TWL3029_I2C_AUD, BSP_TWL_3029_MAP_AUDIO_OUTEN2_OFFSET,
-	 											 BSP_TWL_3029_MAP_AUDIO_OUTEN2_DEFAULT,regInfoPtr++);
-				count++;
-
-				/* store the output enable 3 register  */
-				returnVal = BspTwl3029_I2c_regQueWrite(BSP_TWL3029_I2C_AUD, BSP_TWL_3029_MAP_AUDIO_OUTEN3_OFFSET,
-								 BSP_TWL_3029_MAP_AUDIO_OUTEN3_DEFAULT,regInfoPtr++);
-				count++;
-
-
-				/* now request to I2C manager to write to Triton registers */
-				if (returnVal != BSP_TWL3029_RETURN_CODE_FAILURE)
-				{
-							returnVal = BspTwl3029_I2c_regInfoSend(regInfo,(Uint16)count,NULL,
-						   (BspI2c_TransactionRequest*)i2cTransArrayPtr);
-				}
-
-				if (returnVal == BSP_TWL3029_RETURN_CODE_SUCCESS) return SUCCESS;
-				else return FAILURE;
-
- // omaps00090550 		break;
-
-			case WAKE_CMD:
-				/* write default values into OUTEN1,OUTEN2 & OUTEN3 */
-				returnVal = BspTwl3029_I2c_regQueWrite(BSP_TWL3029_I2C_AUD, BSP_TWL_3029_MAP_AUDIO_OUTEN1_OFFSET,
-	  											 audio_outen_pm.outen1,regInfoPtr++);
-				count++;
-
-				/* store the output enable 2 register  */
-				returnVal = BspTwl3029_I2c_regQueWrite(BSP_TWL3029_I2C_AUD, BSP_TWL_3029_MAP_AUDIO_OUTEN2_OFFSET,
-	 											 audio_outen_pm.outen2,regInfoPtr++);
-				count++;
-
-				/* store the output enable 3 register  */
-				returnVal = BspTwl3029_I2c_regQueWrite(BSP_TWL3029_I2C_AUD, BSP_TWL_3029_MAP_AUDIO_OUTEN3_OFFSET,
-								 audio_outen_pm.outen3,regInfoPtr++);
-				count++;
-
-
-
-				/* now request to I2C manager to write to Triton registers */
-				if (returnVal != BSP_TWL3029_RETURN_CODE_FAILURE)
-				{
-							returnVal = BspTwl3029_I2c_regInfoSend(regInfo,(Uint16)count,NULL,
-						   (BspI2c_TransactionRequest*)i2cTransArrayPtr);
-				}
-
-  				if (returnVal == BSP_TWL3029_RETURN_CODE_SUCCESS) return SUCCESS;
-  					else return FAILURE;
- // omaps00090550 			break;
-		}
-		return SUCCESS;//omaps00090550
-	}
-#else  // Integrated build  API for Audio and MADC
-
-// Full PS build function for Configuring Audio registers.
-// Argument CLK_MASK checks if Audio path is active
-// Argument SLEEP_CMD configures Audio registers for optimal consumption
-// Argument WAKE_CMD reconfigure audio registers after wakeup
-
-
-	T_AUDIO_OUTEN_REG audio_outen_pm;
-	BspTwl3029_I2C_RegData audio_ctrl3;
-
-	Uint8 audio_madc_sleep(Uint8 cmd)  {
-		BspTwl3029_ReturnCode returnVal = BSP_TWL3029_RETURN_CODE_FAILURE;
-	   /* I2C array */
-		//Bsp_Twl3029_I2cTransReqArray i2cTransArray;
-		//Bsp_Twl3029_I2cTransReqArrayPtr i2cTransArrayPtr= &i2cTransArray;
-
-		/* twl3029 I2C reg info struct */
-		//BspTwl3029_I2C_RegisterInfo regInfo[8] ;
-		//BspTwl3029_I2C_RegisterInfo* regInfoPtr = regInfo;
-		BspTwl3029_I2C_RegData shadow_pwronstatus, ston_bit;
-
-
-		Uint8 count = 0;
-
-
-		switch( cmd )  {
-
-			case CLK_MASK:
-				  returnVal = BspTwl3029_I2c_shadowRegRead(BSP_TWL3029_I2C_AUD, BSP_TWL_3029_MAP_AUDIO_PWRONSTATUS_OFFSET,
-									 &shadow_pwronstatus);
-				  ston_bit = (shadow_pwronstatus & (1 << BSP_TWL3029_LLIF_AUDIO_PWRONSTATUS_STON_OFFSET));
-
-				  if (ston_bit == 1) return DCXO_CLOCK;
-				  else return NO_CLOCK;
-//omaps00090550			break;
-
-			case SLEEP_CMD:
-    #if 0
-				/* store the output enable 1 register  */
-				returnVal = BspTwl3029_I2c_shadowRegRead(BSP_TWL3029_I2C_AUD, BSP_TWL_3029_MAP_AUDIO_OUTEN1_OFFSET,
-									 &audio_outen_pm.outen1);
-
-				/* store the output enable 2 register  */
-				returnVal = BspTwl3029_I2c_shadowRegRead(BSP_TWL3029_I2C_AUD, BSP_TWL_3029_MAP_AUDIO_OUTEN2_OFFSET,
-									 &audio_outen_pm.outen2);
-
-				/* store the output enable 3 register  */
-				returnVal = BspTwl3029_I2c_shadowRegRead(BSP_TWL3029_I2C_AUD, BSP_TWL_3029_MAP_AUDIO_OUTEN3_OFFSET,
-								 &audio_outen_pm.outen3);
-
-				returnVal = BspTwl3029_I2c_shadowRegRead(BSP_TWL3029_I2C_AUD, BSP_TWL_3029_MAP_AUDIO_OUTEN3_OFFSET,
-								 &audio_ctrl3);
-
-				if( audio_outen_pm.outen1 )
-				{
-					/* write default values into OUTEN1,OUTEN2 & OUTEN3 */
-					returnVal = BspTwl3029_I2c_regQueWrite(BSP_TWL3029_I2C_AUD, BSP_TWL_3029_MAP_AUDIO_OUTEN1_OFFSET,
-	  											 BSP_TWL_3029_MAP_AUDIO_OUTEN1_DEFAULT,regInfoPtr++);
-					count++;
-				}
-
-				if( audio_outen_pm.outen2 )
-				{
-
-					/* store the output enable 2 register  */
-					returnVal = BspTwl3029_I2c_regQueWrite(BSP_TWL3029_I2C_AUD, BSP_TWL_3029_MAP_AUDIO_OUTEN2_OFFSET,
-	 											 BSP_TWL_3029_MAP_AUDIO_OUTEN2_DEFAULT,regInfoPtr++);
-					count++;
-				}
-
-				if( audio_outen_pm.outen3 )
-				{
-					/* store the output enable 3 register  */
-					returnVal = BspTwl3029_I2c_regQueWrite(BSP_TWL3029_I2C_AUD, BSP_TWL_3029_MAP_AUDIO_OUTEN3_OFFSET,
-								 BSP_TWL_3029_MAP_AUDIO_OUTEN3_DEFAULT,regInfoPtr++);
-					count++;
-				}
-
-				/* Selectively checking if INMODE is set or not. Write is queued only when INMODE(0-3)
-					is non-zero */
-				if( audio_ctrl3 & 0xf)
-				{
-					/* store the output enable 3 register  */
-					returnVal = BspTwl3029_I2c_regQueWrite(BSP_TWL3029_I2C_AUD, BSP_TWL_3029_MAP_AUDIO_CTRL3_OFFSET,
-								 BSP_TWL_3029_MAP_AUDIO_CTRL3_DEFAULT,regInfoPtr++);
-					count++;
-				}
-
-			    returnVal =  BspTwl3029_I2c_regQueWrite(BSP_TWL3029_I2C_AUX,BSP_TWL3029_MAP_AUX_REG_TOGGLE1_OFFSET,
-								1 << BSP_TWL3029_LLIF_AUX_REG_TOGGLE1_MADCR_OFFSET, regInfoPtr++);
-			    count++;
-
-                //Turn off the USB leakage currrent
-
-               // returnVal = BspTwl3029_I2c_regQueWrite(BSP_TWL3029_I2C_PAGE0, BSP_TWL_3029_MAP_CKG_TESTUNLOCK_OFFSET,0xb6,regInfoPtr++);
-               // count++;
-
-                //returnVal = BspTwl3029_I2c_regQueWrite(BSP_TWL3029_I2C_PAGE2, BSP_TWL3029_MAP_USB_PSM_EN_TEST_SET_OFFSET,0x80,regInfoPtr++);
-                //count++;
-
-             //   returnVal = BspTwl3029_I2c_regQueWrite(BSP_TWL3029_I2C_PAGE2,BSP_TWL3029_MAP_USB_VBUS_EN_TEST_OFFSET,0x00,regInfoPtr++);
-             //   count++;
-
-                //returnVal = BspTwl3029_I2c_regQueWrite(BSP_TWL3029_I2C_PAGE0, BSP_TWL_3029_MAP_CKG_TESTUNLOCK_OFFSET,0x00,regInfoPtr++);
-                //count++;
-
-				// now request to I2C manager to write to Triton registers
-				//if (returnVal != BSP_TWL3029_RETURN_CODE_FAILURE && !is_i2c_bus_locked())
-				if (returnVal != BSP_TWL3029_RETURN_CODE_FAILURE)
-				{
-					returnVal = BspTwl3029_I2c_regInfoSend(regInfo,(Uint16)count,NULL,
-						   (BspI2c_TransactionRequest*)i2cTransArrayPtr);
-				}
-
-				if (returnVal == BSP_TWL3029_RETURN_CODE_SUCCESS) return SUCCESS;
-				else return FAILURE;
-
 #endif
 
-//omaps00090550			break;
-
-			case WAKE_CMD:
-#if 0
-
-				if( audio_outen_pm.outen1 )
-				{
-					/* write default values into OUTEN1,OUTEN2 & OUTEN3 */
-					returnVal = BspTwl3029_I2c_regQueWrite(BSP_TWL3029_I2C_AUD, BSP_TWL_3029_MAP_AUDIO_OUTEN1_OFFSET,
-	  											 audio_outen_pm.outen1,regInfoPtr++);
-					count++;
-				}
-
-				if( audio_outen_pm.outen2 )
-				{
-
-					/* store the output enable 2 register  */
-					returnVal = BspTwl3029_I2c_regQueWrite(BSP_TWL3029_I2C_AUD, BSP_TWL_3029_MAP_AUDIO_OUTEN2_OFFSET,
-	 											 audio_outen_pm.outen2,regInfoPtr++);
-					count++;
-				}
-
-				if( audio_outen_pm.outen3 )
-				{
-					/* store the output enable 3 register  */
-					returnVal = BspTwl3029_I2c_regQueWrite(BSP_TWL3029_I2C_AUD, BSP_TWL_3029_MAP_AUDIO_OUTEN3_OFFSET,
-								 audio_outen_pm.outen3,regInfoPtr++);
-					count++;
-				}
-
-				/* Selectively checking if INMODE is set or not. Write is queued only when INMODE(0-3)
-					is non-zero */
-				if( audio_ctrl3 & 0xf)
-				{
-					/* store the output enable 3 register  */
-					returnVal = BspTwl3029_I2c_regQueWrite(BSP_TWL3029_I2C_AUD, BSP_TWL_3029_MAP_AUDIO_CTRL3_OFFSET,
-								 audio_ctrl3,regInfoPtr++);
-					count++;
-				}
-
 
-				//wake up mode: Enable MADC
-				returnVal =  BspTwl3029_I2c_regQueWrite(BSP_TWL3029_I2C_AUX,BSP_TWL3029_MAP_AUX_REG_TOGGLE1_OFFSET,
-								1 << BSP_TWL3029_LLIF_AUX_REG_TOGGLE1_MADCS_OFFSET, regInfoPtr++);
-
-				count++;		//TI_SH added to set the madc on correctly
-
-                //Enable the USB leakage current after wake up
-
-              //  returnVal = BspTwl3029_I2c_regQueWrite(BSP_TWL3029_I2C_PAGE0,BSP_TWL_3029_MAP_CKG_TESTUNLOCK_OFFSET,0xb6,regInfoPtr++);
-               // count++;
-
-               // returnVal = BspTwl3029_I2c_regQueWrite(BSP_TWL3029_I2C_PAGE2,BSP_TWL3029_MAP_USB_VBUS_EN_TEST_OFFSET,0x0F,regInfoPtr++);
-               // count++;
-
-                //returnVal = BspTwl3029_I2c_regQueWrite(BSP_TWL3029_I2C_PAGE2,BSP_TWL3029_MAP_USB_PSM_EN_TEST_CLR_OFFSET,0x80,regInfoPtr++);
-                //count++;
-
-               // returnVal = BspTwl3029_I2c_regQueWrite(BSP_TWL3029_I2C_PAGE0,BSP_TWL_3029_MAP_CKG_TESTUNLOCK_OFFSET,0x00,regInfoPtr++);
-               // count++;
-
-								// now request to I2C manager to write to Triton registers
-				//if (returnVal != BSP_TWL3029_RETURN_CODE_FAILURE && !is_i2c_bus_locked())
-				if (returnVal != BSP_TWL3029_RETURN_CODE_FAILURE)
-				{
-							returnVal = BspTwl3029_I2c_regInfoSend(regInfo,(Uint16)count,NULL,
-						   (BspI2c_TransactionRequest*)i2cTransArrayPtr);
-				}
-
-  				if (returnVal == BSP_TWL3029_RETURN_CODE_SUCCESS) return SUCCESS;
-  					else return FAILURE;
-#endif
-	break;
-		}
-	return SUCCESS;
-	}
-#endif  // API for Audio and MADC
-
-
-
-//Function to check status of Backlight Only Argument 0 is valid
-
-
-	Uint8 backlight_pwr_interface(Uint8 cmd)
-	{
-		BspTwl3029_I2C_RegData regData;
-
-
-		if(cmd == 0)
-		{
-			BspTwl3029_I2c_shadowRegRead(BSP_TWL3029_I2C_PAGE0,PWDNSTATUS,&regData);
-			if((regData) & 0x70)
-			{
-				return(DCXO_CLOCK);
-			}
-			else
-			{
-				return(NO_CLOCK);
-			}
-
-		}
-		else
-		{
-			return(SUCCESS);
-		}
-	}
-
-//Dummy Function for peripheral check to populate Function pointer table for unused APIs
-
-
-	Uint8  f_peripheral_interface_dummy(Uint8 cmd)
-	{
-		if(cmd == 0)
-		{
-			return(NO_CLOCK);
-		}
-		else
-		{
-			return(SUCCESS);
-		}
-
-	}
-
-//Dummy Function for Application check to populate Function pointer table for unused APIs
-
-	Uint8 f_application_interface_dummy(Uint8 cmd)
-	{
-		if(cmd == 0)
-		{
-			return(PM_INACTIVE);
-		}
-		else
-		{
-			return(SUCCESS);
-		}
-	}
-
-//Function not used as of now //OMAPS00090550
-	void Update_Sleep_Status( Uint8 ID, Uint8 state)
-	{
-		if(state)
-		{
-			SLEEP_STATE |= (state << ID); //omaps00090550 ! was present before
-		}
-		else
-		{
-			SLEEP_STATE &=((Uint8)~1 <<ID);  //omaps00090550
-		}
-	}
-
-//Function polls the status of the following peripherals to take
-//Sleep Decision:
-//UART, USB, I2C, LCD, Camera, Backlight, Audio Stereo path,
-//Bluetooth and USIM.
-//All peripherals either cause Deep Sleep or No Sleep.
-//Only USIM can also cause Big Sleep.
-
-
-
-	UWORD32 Check_Peripheral_App(void)
-	{
- #if (CODE_VERSION!=SIMULATION)
-    UWORD8 ret_value;
-		/* Check Peripherals */
-    ret_value = Peripheral_interface[UART_ID](CLK_MASK);
-    if(ret_value)
-    {
-      l1_pwmgr_debug.fail_id = UART_ID;
-      l1_pwmgr_debug.fail_ret_val = ret_value;
-      return(DO_NOT_SLEEP);
-    }
-    ret_value = Peripheral_interface[USB_ID](CLK_MASK);
-    if(ret_value)
-    {
-      l1_pwmgr_debug.fail_id = USB_ID;
-      l1_pwmgr_debug.fail_ret_val = ret_value;
-      return(DO_NOT_SLEEP);
-    }
-    ret_value = Peripheral_interface[I2C_ID](CLK_MASK);
-    if(ret_value)
-    {
-      l1_pwmgr_debug.fail_id = I2C_ID;
-      l1_pwmgr_debug.fail_ret_val = ret_value;
-      return(DO_NOT_SLEEP);
-    }
-    ret_value = Peripheral_interface[LCD_ID](CLK_MASK);
-    if(ret_value)
-    {
-      l1_pwmgr_debug.fail_id = LCD_ID;
-      l1_pwmgr_debug.fail_ret_val = ret_value;
-      return(DO_NOT_SLEEP);
-    }
-    ret_value = Peripheral_interface[CAMERA_ID](CLK_MASK);
-    if(ret_value)
-    {
-      l1_pwmgr_debug.fail_id = CAMERA_ID;
-      l1_pwmgr_debug.fail_ret_val = ret_value;
-      return(DO_NOT_SLEEP);
-    }
-    ret_value = Peripheral_interface[BACKLIGHT_ID](CLK_MASK);
-    if(ret_value)
-    {
-      l1_pwmgr_debug.fail_id = BACKLIGHT_ID;
-      l1_pwmgr_debug.fail_ret_val = ret_value;
-      return(DO_NOT_SLEEP);
-    }
-    ret_value = Peripheral_interface[MADC_AS_ID](CLK_MASK);
-    if(ret_value)
-    {
-      l1_pwmgr_debug.fail_id = MADC_AS_ID;
-      l1_pwmgr_debug.fail_ret_val = ret_value;
-			return(DO_NOT_SLEEP);
-		}
-/* check battery charger */
-	ret_value = Peripheral_interface[BCI_ID](CLK_MASK);
-	if(ret_value)
-	{
-	      l1_pwmgr_debug.fail_id = BCI_ID;
-	      l1_pwmgr_debug.fail_ret_val = ret_value;
-	      return(DO_NOT_SLEEP);
-	}
-
-		/* Check Applications */
-    ret_value = Application_interface[BT_Stack_ID](APP_ACTIVITY);
-    if(ret_value)
-    {
-      // L1_APPLICATION_OFFSET is added to distinguish Application interface
-      l1_pwmgr_debug.fail_id = BT_Stack_ID + (L1_PWMGR_APP_OFFSET);
-      l1_pwmgr_debug.fail_ret_val = ret_value;
-      return(DO_NOT_SLEEP);
-    }
-    ret_value = Peripheral_interface[USIM_ID](CLK_MASK);
-    if(ret_value)
-    {
-      l1_pwmgr_debug.fail_id = USIM_ID;
-      l1_pwmgr_debug.fail_ret_val = ret_value;
-			l1s.pw_mgr.why_big_sleep = BIG_SLEEP_DUE_TO_SIM;
-			return(FRAME_STOP);
-		}
-		else
-		{
-			return(CLOCK_STOP);
-		}
-   #endif //NOT SIMULATION
-	}
-
-//This function Configures  DBB for optimal Power Consumption
-//during Deep Sleep
-
-
-
-	void DBB_Configure_DS()
-	{
-	// FDP enabling and disabling of burst configuration in flash not required in Locosto
-       // Hardware Settings as per Power Bench
-
-		// Stop RNG oscillators
-		RNG_CONFIG &= 0xF03F;
-
-
-		/* Set GPIOs 19 to 22 as outputs to avoid floating pins */
-		GPIO1_CNTL_REG &= ~0x0078;
-
-		/* Set PD on VDR and VFSRX for VSP bus to avoid floating pins */
-		CONF_VDR	|= 0x0008;
-		CONF_VFSRX  |= 0x0008;
-
-		/* Set HASH in auto-idle */
-	    SHA_MASK = 0x0001;
-
-		/* Set DES in auto-idle */
-		DES_MASK = 0x0001;
-
-		/* Set RNG in auto-idle */
-		RNG_MASK = 0x0001;
-
-
-	/*	uart_in_pull_down(); */
-
-	#if defined(RVM_DATALIGHT_SWE) || defined(RVM_NAN_SWE)
-
-
-		temp_NAND_Reg1 = COMMAND_REG;
-		temp_NAND_Reg2 = CONTROL_REG;
-		temp_NAND_Reg3 = STATUS_IT_REG;
-
-		COMMAND_REG	 = 0x06;
-		CONTROL_REG	 = 0x0;
-		STATUS_IT_REG = 0x0;
-
-	#endif
-		// RANGA: All these bit fields should be replaced by macros
-		// Set DPLL in idle mode
-		// Cut C-PORT (new), IRQ, BRIDGE and TIMER clocks
-		/* Set DPLL in idle mode */
-		/* Cut C-PORT (new), IRQ, BRIDGE and TIMER clocks */
-		CLKM_CNTL_CLK_REG &= ~0x0010 ;
-		CLKM_CNTL_CLK_REG |= 0x000F ;
-
-		CNTL_APLL_DIV_CLK &= ~0x0001;  /* Disable APLL */
-
-         // Statements below are not required for the current hardware version.
-		 // This was done to solve the problem of DCXO taking 10 frames
-		 // to wake-up from Deep Sleep in older hardware versions.
-
-		 //DCXO_THRESH_L  = 0xC040;  // Setting DCXO Thresholds
-		 //DCXO_THRESH_H  = 0x051F;  // to solve Deep Sleep problem
-	}
-
-//This function Restores  DBB after wakeup from Deep Sleep
-
-
-	void DBB_Wakeup_DS()
-	{
-// FDP re-enabling and burst re-configuration are not required if FDP is disabled
-	//	during deep-sleep
-
-	  CLKM_CNTL_CLK_REG |= 0x0010 ; // Enable CPORT Clock
-
-	  CNTL_APLL_DIV_CLK |= 0x0001;  // Enable APLL clock
-
-		#if defined(RVM_DATALIGHT_SWE) || defined(RVM_NAN_SWE)
-
-		  // Restoring NAND
-			COMMAND_REG  = temp_NAND_Reg1;
-			CONTROL_REG  = temp_NAND_Reg2;
-			STATUS_IT_REG  = temp_NAND_Reg3;
-		  // Restoring NAND
-		#endif
-
-
-	}
-
-
-//This function shuts down APC Bandgap.Cannot be used for PG 1.0 Can be used only for PG 2.0
-
-
-void Disable_APC_BG()  //omaps00090550
-{
-	while (RHSW_ARM_CNF & DSP_PERIPH_LOCK)
-    RHSW_ARM_CNF |= ARM_PERIPH_LOCK;
-	APCCTRL2 &= ~BGEN;
-	return;
-}
-
-//This function enables APC Bandgap.Cannot be used for PG 1.0 Can be used only for PG 2.0
-
-void Enable_APC_BG() //omaps00090550
-{
-	while (RHSW_ARM_CNF & DSP_PERIPH_LOCK)
-    RHSW_ARM_CNF |= ARM_PERIPH_LOCK;
-	APCCTRL2 |= BGEN;
-	return;
-}
-
-#endif  //CHIPSET = 15
-
-
-
-
-
-
-
-
+/* FreeCalypso: massive #if (CHIPSET == 15) chunk removed */
 
 
 // l1ctl_pgm_clk32()
@@ -1087,7 +305,7 @@
     // that's why nb_hf is divided by 3*l1_config.dpll
     // RATIO2(nb_hf/(3*l1_config.dpll),nb_32khz,inc_sixteen,inc_frac);
     // this line above is equal to the ligne below:
-    lf=(UWORD32)((UWORD32)(3*((UWORD32)((UWORD32)(l1_config.dpll)*nb_32khz))));  //OMAPS00090550
+    lf=(UWORD32)(3*l1_config.dpll*nb_32khz);
     RATIO2(nb_hf,lf,inc_sixteen,inc_frac);
 
     // integer part
@@ -1128,7 +346,7 @@
     static UWORD8  nb_gaug;                // number of gauging in ACQUIS
     static UWORD8  idx,i;                  // index
     static UWORD32 root, frac;             // ratio of HF and LF average
-    UWORD32 sumLF=0 , sumHF=0;                  // sum of HF and LF counts
+    UWORD32 sumLF, sumHF;                  // sum of HF and LF counts
     double nbHF_theo;
 
 
@@ -1185,15 +403,21 @@
 
 
         // allow [-500ppm,+100ppm] derive on 32Khz at startup.
-// Commenting section below for OMAPS00148004
-       /* if ( 
+#if 0	/* really old code, apparently */
+       if ( 
              (root > l1s.pw_mgr.c_clk_min || 
              (root == l1s.pw_mgr.c_clk_min &&
               frac >= l1s.pw_mgr.c_clk_init_min) ) &&
              (root < l1s.pw_mgr.c_clk_max || 
              (root == l1s.pw_mgr.c_clk_max &&
               frac <= l1s.pw_mgr.c_clk_init_max ) )
-			  */
+#elif 1	/* TCS211 reconstruction */
+       if (
+             (root == l1s.pw_mgr.c_clk_min &&
+                frac >= l1s.pw_mgr.c_clk_init_min ) ||
+             (root == l1s.pw_mgr.c_clk_max &&
+                frac <= l1s.pw_mgr.c_clk_init_max )
+#else	/* LoCosto code */
 	       if (
 	             (  l1s.pw_mgr.c_clk_min == l1s.pw_mgr.c_clk_max &&
 	                frac >= l1s.pw_mgr.c_clk_init_min &&
@@ -1206,6 +430,7 @@
                   root < l1s.pw_mgr.c_clk_max ) ||
                  (root == l1s.pw_mgr.c_clk_max &&
                   frac <= l1s.pw_mgr.c_clk_init_max ) ) )
+#endif
 	   )
         {
           l1s.pw_mgr.histo[idx  ][0] = nb_32khz; // init histo with the number of 32kHz
@@ -1326,10 +551,12 @@
     // WARNING WARNING, this case gauging_state == UPDATE modify the algo.
     // In case of trace the parameter root and frac are refresh.
     // it is not the case if no trace and it seems there is  mistake
+  #if 0	/* FreeCalypso TCS211 reconstruction */
     if (gauging_state == UPDATE)
     {
       RATIO2(sumHF,sumLF,root,frac);
     }
+  #endif
     //End of Warning.
     l1s.pw_mgr.hf = nb_hf ;
     l1s.pw_mgr.root = root ;
@@ -1339,8 +566,6 @@
 }
 
 
-
-
 /* GAUGING_Handler()                                     */
 /* Description: update increment counter for 32Khz       */
 /*  This interrupt function computes the ratio between   */
@@ -1383,8 +608,6 @@
 }
 
 
-
-
 // l1s_get_HWTimers_ticks()
 // Description:
 // evaluate the loading of the HW Timers for dep sleep
@@ -1396,8 +619,6 @@
 WORD32 l1s_get_HWTimers_ticks(void)
 {
 #if (CODE_VERSION != SIMULATION)
-  if (l1_config.pwr_mngt == PWR_MNGT)
-  {
     WORD32  timer1,timer2,watchdog,HWTimer;
     #if (CHIPSET == 12) || (CHIPSET == 15)
       WORD32  watchdog_sec;
@@ -1420,7 +641,9 @@
       cntlreg =  Dtimer1_Get_cntlreg();   // AND 0x1F
       if ( (cntlreg & D_TIMER_RUN) == D_TIMER_RUN)
       {
-        cntlreg = cntlreg&0x1F;
+        #if 0	/* match TCS211 object */
+          cntlreg = cntlreg&0x1F;
+        #endif
 	cntlreg >>= 2;   // take PTV
         cntlreg = 1 << (cntlreg+1);
         timer1 = (WORD32) ( ((Dtimer1_ReadValue()+1) * cntlreg * 0.0012308)  / 4.615 );
@@ -1432,7 +655,9 @@
       cntlreg =  Dtimer2_Get_cntlreg();
       if ( (cntlreg & D_TIMER_RUN) == D_TIMER_RUN)
       {
-        cntlreg = cntlreg&0x1F;
+        #if 0	/* match TCS211 object */
+          cntlreg = cntlreg&0x1F;
+        #endif
 	cntlreg >>= 2;   // take PTV
         cntlreg = 1 << (cntlreg+1);
         timer2 = (WORD32) ( ((Dtimer2_ReadValue()+1) * cntlreg * 0.0012308)  / 4.615 );
@@ -1481,11 +706,9 @@
       #endif
 
       return (HWTimer);
-  }
 #else // simulation part
   return (-1);  // no HW timer in simulation
 #endif
-return(-1); //omaps00090550
 }
 
 #if (GSM_IDLE_RAM != 0)  // Compile only if GSM_IDLE_RAM enabled
@@ -1523,6 +746,11 @@
  }
 #endif
 
+UWORD32 last_wakeup = 0;
+UWORD8  wakeup_type;        // Type of the interrupt
+UWORD8  why_big_sleep;      // Type of the big sleep
+
+extern UWORD16 int_id;
 
 // l1s_sleep_manager()
 // Description:
@@ -1545,54 +773,35 @@
     UWORD32 sleep_time = l1s.actual_time.fn;
   #endif
 
-#if(CHIPSET == 15)
-	Uint8   sleep_status;
-#endif
-
-#if (GSM_IDLE_RAM != 0)
-    T_L1S_GSM_IDLE_INTRAM * gsm_idle_ram_ctl;
-    BOOL flag_traffic_controller_state = 0;
-    gsm_idle_ram_ctl = &(l1s.gsm_idle_ram_ctl);
-
-    #if (AUDIO_TASK == 1)
-        gsm_idle_ram_ctl->l1s_full_exec = l1s.l1_audio_it_com;
-    #endif
-
-    if (gsm_idle_ram_ctl->l1s_full_exec == TRUE)
-      return;
-#endif
-
   if (l1_config.pwr_mngt == PWR_MNGT)
   {
 // Power management is enabled
-    WORD32   min_time, OSload, HWtimer,wake_up_time,min_time_gauging;
-    UWORD32  sleep_mode;
-    #if (ANALOG != 11)
+    WORD32   min_time, HWtimer,wake_up_time,min_time_gauging;
     WORD32   afc_fix;
-    #endif
-    UWORD32  uw32_store_next_time;
-   #if (CHIPSET != 15)
-    static UWORD32 previous_sleep = FRAME_STOP;
-   #endif
+    static UWORD32 previous_sleep = CLOCK_STOP;
     #if (W_A_CALYPSO_PLUS_SPR_19599 == 1)
       BOOL     extended_page_mode_state = 0;       //Store state of extended page mode
     #endif
-    #if (CHIPSET != 15)
     WORD32 time_from_last_wakeup=0;
-    #endif
+    UWORD32  sleep_mode;
 
     #if (OP_BT == 1)
       WORD32   hci_ll_status;
     #endif
 
     // init for trace and debug
-    l1s.pw_mgr.why_big_sleep = BIG_SLEEP_DUE_TO_UNDEFINED;
-    l1s.pw_mgr.wakeup_type   = WAKEUP_FOR_UNDEFINED;
+    why_big_sleep = BIG_SLEEP_DUE_TO_UNDEFINED;
+    wakeup_type   = WAKEUP_FOR_UNDEFINED;
+
+    time_from_last_wakeup = (sleep_time - last_wakeup + 42432) % 42432;
 
-#if (CHIPSET != 15)
-    time_from_last_wakeup = (sleep_time - l1s.pw_mgr.wakeup_time + 42432) % 42432;
-#endif
+    //=================================================
+    // check System (SIM, UART, LDC ..... )
+    //=================================================
+    sleep_mode =  Cust_check_system();
 
+    if (sleep_mode == DO_NOT_SLEEP)
+      return;
 
     #if (CODE_VERSION != SIMULATION)
 	      //=================================================
@@ -1606,83 +815,16 @@
 	      //=================================================
 	      INT_DisableIRQ();
     #endif // NOT SIMULATION
-    //=================================================
-    // check System (SIM, UART, LDC ..... )
-    //=================================================
-#if (CHIPSET == 15)
-    #if (WCP_PROF == 0)
-	sleep_mode = Check_Peripheral_App();  /* For Locosto */
-    #else
-	sleep_mode = DO_NOT_SLEEP; //Check_Peripheral_App();  /* For Locosto */
-    #endif
-#else
-    sleep_mode =  Cust_check_system();
-#endif
 
-    #if (GSM_IDLE_RAM != 0)
-    //=================================================
-    // check System (SIM, UART, LDC ..... )
-    //=================================================
-    gsm_idle_ram_ctl->sleep_mode = sleep_mode;
-    #endif
-
-    if (sleep_mode == DO_NOT_SLEEP)
-      {
-        OS_system_Unprotect();
-        // free System structure
-        // Enable all IRQ
-        //l1_pwmgr_irq_dis_flag = 0;
-      #if (CODE_VERSION!=SIMULATION)
-        INT_EnableIRQ();
-        l1_trace_fail_sleep(FAIL_SLEEP_PERIPH_CHECK, l1_pwmgr_debug.fail_id, l1_pwmgr_debug.fail_ret_val);
-      #endif
-    #if (GSM_IDLE_RAM != 0)
-    gsm_idle_ram_ctl->os_load = 0;
-    gsm_idle_ram_ctl->hw_timer = 0;
-    #endif // GSM_IDLE_RAM
-    return;
-      }
-
-
-#if (OP_L1_STANDALONE == 0)
-    /*GC_Sleep(); 	OMAPS00134004*/
-#endif
     //=================================================
     // check OS loading
     //=================================================
-    OSload = OS_get_inactivity_ticks();
-  #if (CODE_VERSION!=SIMULATION)
-    if ((OSload >= 0) && (OSload <= MIN_SLEEP_TIME)){
-      l1_pwmgr_debug.fail_id = FAIL_SLEEP_DUE_TO_OSLOAD;
-      l1_pwmgr_debug.fail_ret_val = OSload;
-    }
-  #endif //NOT SIMULATION
+    min_time = OS_get_inactivity_ticks();
 
     //=================================================
     // check HW Timers loading
     //=================================================
     HWtimer= l1s_get_HWTimers_ticks();
-    #if (CODE_VERSION!=SIMULATION)
-    if (HWtimer == 0){
-      l1_pwmgr_debug.fail_id = FAIL_SLEEP_DUE_TO_HWTIMER;
-      l1_pwmgr_debug.fail_ret_val = 0;
-    }
-    #endif //NOT SIMULATION
-
-    #if (GSM_IDLE_RAM != 0)
-    //=================================================
-    // check OS loading
-    //=================================================
-    gsm_idle_ram_ctl->os_load = OSload;
-
-    //=================================================
-    // check HW Timers loading
-    //=================================================
-    gsm_idle_ram_ctl->hw_timer = HWtimer;
-    #endif // GSM_IDLE_RAM
-
-    if ((OSload > 0) && (OSload <= MIN_SLEEP_TIME))
-      OSload =0;
 
     //=================================================
     // check next gauging task for Packet Idle
@@ -1692,13 +834,6 @@
     #else
       min_time_gauging = -1;   // not used
     #endif
-    #if (CODE_VERSION!=SIMULATION)
-    if (min_time_gauging == 0){
-      l1_pwmgr_debug.fail_id = FAIL_SLEEP_DUE_TO_MINTIMEGAUGING;
-      l1_pwmgr_debug.fail_ret_val = 0;
-    }
-    #endif // NOT SIMULATION
-
 
     #if (OP_BT == 1)
       hci_ll_status = hci_ll_ok_for_sleep();
@@ -1708,12 +843,10 @@
     // in case big sleep is choosen (sleep mode == FRAME_STOP) because of UART or SIM,
     // return and wait end of this activity (few TDMA frames) then check on next TDMA frames
     // if MS can go in deep sleep
-    if (    !OSload
+    if (    !min_time
          || !HWtimer
          || !min_time_gauging
-		#if (CHIPSET != 15)
-         || ((sleep_mode != CLOCK_STOP) && ((l1s.pw_mgr.why_big_sleep == BIG_SLEEP_DUE_TO_UART) || (l1s.pw_mgr.why_big_sleep == BIG_SLEEP_DUE_TO_SIM)))
-		#endif
+         || (sleep_mode != CLOCK_STOP)
        #if (OP_BT == 1)
          || !hci_ll_status
        #endif
@@ -1721,80 +854,38 @@
     {
 
 
-
-#if (OP_L1_STANDALONE == 0)
-	/*GC_Wakeup(); 	OMAPS00134004*/
-#endif
-
 #if (CODE_VERSION != SIMULATION)
         OS_system_Unprotect();
         // free System structure
         // Enable all IRQ
         INT_EnableIRQ();
         // Wake up UART
-#if (GSM_IDLE_RAM != 0)
-        // Traffic controller has to be enabled before calling SER_WakeUpUarts
-        // as this function can access the external RAM.
-        // Reset the flag that will indicates if an interrup will put the traffic
-        // controller ON during that time.
-        l1s.gsm_idle_ram_ctl.trff_ctrl_enable_cause_int = FALSE;
-        if (!READ_TRAFFIC_CONT_STATE)
-        {
-          flag_traffic_controller_state = 1;
-          CSMI_TrafficControllerOn();
-        }
-#endif
 
-#if (CHIPSET != 15)
         SER_WakeUpUarts();  // Wake up Uarts
-#else
-	// To be checked if this needs a change
+
 #endif
-
-#if (GSM_IDLE_RAM != 0)
-        // The traffic controller state shall be restored as it was before
-        // calling SER_WakeUpUarts. Do not disable it if an interrup occured
-        // in between and activated the traffic controller.
-        if ((flag_traffic_controller_state == 1) && (l1s.gsm_idle_ram_ctl.trff_ctrl_enable_cause_int == FALSE))
-        {
-          CSMI_TrafficControllerOff();
-        }
-        flag_traffic_controller_state = 0;
-#endif
-#endif
-      #if (CODE_VERSION!=SIMULATION)
-      l1_trace_fail_sleep(FAIL_SLEEP_OSTIMERGAUGE, l1_pwmgr_debug.fail_id, l1_pwmgr_debug.fail_ret_val);
-      #endif
       return;
     }
     //=================================================
     // Select sleep duration ....
     //=================================================
     // remember: -1 means no activity planned
-    min_time = OSload;
     //l1a_l1s_com.time_to_next_l1s_task is UW32, min_time is W32. Max value of l1a_l1s_com.time_to_next_l1s_task will be 2p31
     //and ,min_time max value will be 2p30. If min_time > l1a_l1s_com.time_to_next_l1s_task,
     //means MSB of l1a_l1s_com.time_to_next_l1s_task is zero. so, we can use- uw32_store_next_time & 0x7FFFFFFF
-    uw32_store_next_time = l1a_l1s_com.time_to_next_l1s_task;
 
-    if (min_time == -1) min_time = (WORD32)uw32_store_next_time;
-    //else                        MIN(min_time, (WORD32)l1a_l1s_com.time_to_next_l1s_task)
-    else
-    {
-     if(min_time > l1a_l1s_com.time_to_next_l1s_task) min_time = uw32_store_next_time & 0x7FFFFFFF;
-     //else min_time = min_time;
-    }
+    if (min_time == -1) min_time = l1a_l1s_com.time_to_next_l1s_task;
+    else		MIN(min_time, l1a_l1s_com.time_to_next_l1s_task)
     if (HWtimer != -1)          MIN(min_time, HWtimer)
     if (min_time_gauging != -1) MIN(min_time, min_time_gauging)
 
     #if (TRACE_TYPE !=0 ) && (TRACE_TYPE != 2) && (TRACE_TYPE != 3)
       // to trace the Wake up source
       // depending of min_time choose the wakeup_type
-      l1s.pw_mgr.wakeup_type = WAKEUP_FOR_L1_TASK;
-      if (min_time == l1a_l1s_com.time_to_next_l1s_task) l1s.pw_mgr.wakeup_type = WAKEUP_FOR_L1_TASK;
-      if (min_time == HWtimer)                           l1s.pw_mgr.wakeup_type = WAKEUP_FOR_HW_TIMER_TASK;
-      if (min_time == min_time_gauging)                  l1s.pw_mgr.wakeup_type = WAKEUP_FOR_GAUGING_TASK;
-      if (min_time == OSload)                            l1s.pw_mgr.wakeup_type = WAKEUP_FOR_OS_TASK;
+      wakeup_type = WAKEUP_FOR_OS_TASK;
+      if (min_time == l1a_l1s_com.time_to_next_l1s_task) wakeup_type = WAKEUP_FOR_L1_TASK;
+      if (min_time == HWtimer)                           wakeup_type = WAKEUP_FOR_HW_TIMER_TASK;
+      if (min_time == min_time_gauging)                  wakeup_type = WAKEUP_FOR_GAUGING_TASK;
     #endif
 
     //=================================================
@@ -1820,165 +911,34 @@
          {
            // BIG SLEEP is chosen : check the reason
            l1s.pw_mgr.sleep_performed = FRAME_STOP;
-           if ((l1s.pw_mgr.enough_gaug != TRUE) && (l1a_l1s_com.mode != CS_MODE0))
-             l1s.pw_mgr.why_big_sleep = BIG_SLEEP_DUE_TO_GAUGING;
+           if (l1s.pw_mgr.enough_gaug != TRUE)
+             why_big_sleep = BIG_SLEEP_DUE_TO_GAUGING;
            else
-             l1s.pw_mgr.why_big_sleep = BIG_SLEEP_DUE_TO_DSP_TRACES;
+             why_big_sleep = BIG_SLEEP_DUE_TO_DSP_TRACES;
          }
       }
       if (l1s.pw_mgr.mode_authorized == BIG_SLEEP)
-        l1s.pw_mgr.why_big_sleep = BIG_SLEEP_DUE_TO_SLEEP_MODE;
+        why_big_sleep = BIG_SLEEP_DUE_TO_SLEEP_MODE;
 
       if ( ((l1s.pw_mgr.mode_authorized == BIG_SLEEP) && (sleep_mode >= FRAME_STOP)) ||
            ((l1s.pw_mgr.mode_authorized >= DEEP_SLEEP) && (sleep_mode == FRAME_STOP)) )
         l1s.pw_mgr.sleep_performed = FRAME_STOP;
 
 
-
-#if (CHIPSET != 15)
       if ((previous_sleep == CLOCK_STOP) && (time_from_last_wakeup < 7))
       {
 		#if (CODE_VERSION != SIMULATION)
-				  OS_system_Unprotect();    // free System structure
-				  INT_EnableIRQ();          // Enable all IRQ
-			#if (GSM_IDLE_RAM != 0)
-					  // Traffic controller has to be enabled before calling SER_WakeUpUarts
-					  // as this function can access the external RAM.
-					  // Reset the flag that will indicates if an interrup will put the traffic
-					  // controller ON during that time.
-					  l1s.gsm_idle_ram_ctl.trff_ctrl_enable_cause_int = FALSE;
-					  if (!READ_TRAFFIC_CONT_STATE)
-					  {
-						flag_traffic_controller_state = 1;
-						CSMI_TrafficControllerOn();
-					  }
-			#endif
+			  OS_system_Unprotect();    // free System structure
+			  INT_EnableIRQ();          // Enable all IRQ
 
-
-				SER_WakeUpUarts();  // Wake up Uarts
-
-
+			  SER_WakeUpUarts();  // Wake up Uarts
 
-			#if (GSM_IDLE_RAM != 0)
-					  // The traffic controller state shall be restored as it was before
-					  // calling SER_WakeUpUarts. Do not disable it if an interrup occured
-					  // in between and activated the traffic controller.
-					  if ((flag_traffic_controller_state == 1) && (l1s.gsm_idle_ram_ctl.trff_ctrl_enable_cause_int == FALSE))
-					  {
-						CSMI_TrafficControllerOff();
-					  }
-					  flag_traffic_controller_state = 0;
-			#endif
 		#endif // NOT SIMULATION
         return;
       }
-#else   // CHIPSET == 15
 
-
-
-	  if (l1s.pw_mgr.sleep_performed == CLOCK_STOP)
-	  {
-
-     #if (CODE_VERSION != SIMULATION)
-      UWORD8 local_sleep_status;
-
-
-     local_sleep_status = Peripheral_interface[UART_ID](SLEEP_CMD);
-     sleep_status = local_sleep_status;
-     if(local_sleep_status == 0)
-     {
-       l1_pwmgr_debug.fail_id = UART_ID;
-       l1_pwmgr_debug.fail_ret_val = sleep_status;
-     }
-
-     OS_system_Unprotect();
-     local_sleep_status = Peripheral_interface[MADC_AS_ID](SLEEP_CMD);  /* Call MADC & Stereo Sleep before I2C */
-     OS_system_protect();
-     sleep_status &= local_sleep_status;
-     if(local_sleep_status == 0)
-     {
-       l1_pwmgr_debug.fail_id = MADC_AS_ID;
-       l1_pwmgr_debug.fail_ret_val = sleep_status;
-     }
-
-     local_sleep_status = Peripheral_interface[USB_ID](SLEEP_CMD);
-     sleep_status &= local_sleep_status;
-     if(local_sleep_status == 0)
-     {
-       l1_pwmgr_debug.fail_id = USB_ID;
-       l1_pwmgr_debug.fail_ret_val = sleep_status;
-     }
-
-     local_sleep_status = Peripheral_interface[USIM_ID](SLEEP_CMD);
-     sleep_status &= local_sleep_status;
-     if(local_sleep_status == 0)
-     {
-       l1_pwmgr_debug.fail_id = USIM_ID;
-       l1_pwmgr_debug.fail_ret_val = sleep_status;
-     }
-
-     local_sleep_status = Peripheral_interface[I2C_ID](SLEEP_CMD);
-     sleep_status &= local_sleep_status;
-     if(local_sleep_status == 0)
-     {
-       l1_pwmgr_debug.fail_id = I2C_ID;
-       l1_pwmgr_debug.fail_ret_val = sleep_status;
-     }
-
-     local_sleep_status = Peripheral_interface[LCD_ID](SLEEP_CMD);
-     sleep_status &= local_sleep_status;
-     if(local_sleep_status == 0)
-     {
-       l1_pwmgr_debug.fail_id = LCD_ID;
-       l1_pwmgr_debug.fail_ret_val = sleep_status;
-     }
-
-     local_sleep_status = Peripheral_interface[CAMERA_ID](SLEEP_CMD);
-     sleep_status &= local_sleep_status;
-     if(local_sleep_status == 0)
-     {
-       l1_pwmgr_debug.fail_id = CAMERA_ID;
-       l1_pwmgr_debug.fail_ret_val = sleep_status;
-     }
-local_sleep_status = Peripheral_interface[BCI_ID](SLEEP_CMD);
-	 sleep_status &= local_sleep_status;
-	 if(local_sleep_status == 0)
-	 {
-	   l1_pwmgr_debug.fail_id = BCI_ID;
-	   l1_pwmgr_debug.fail_ret_val = sleep_status;
-     }
-
-    #endif // NOT SIMULATION
-		 if(!sleep_status)
-		 {
-
-	 #if (OP_L1_STANDALONE == 0)
-		/*GC_Wakeup(); 	OMAPS00134004*/
-	 #endif
-
-            #if (CODE_VERSION != SIMULATION)
-			OS_system_Unprotect();
-      l1_trace_fail_sleep(FAIL_SLEEP_PERIPH_SLEEP, l1_pwmgr_debug.fail_id, l1_pwmgr_debug.fail_ret_val);
-	        #endif // NOT SIMULATION
-			local_sleep_status = Peripheral_interface[UART_ID](WAKE_CMD); //OMAPS00090550
-			local_sleep_status = Peripheral_interface[USB_ID](WAKE_CMD); //OMAPS00090550
-			local_sleep_status = Peripheral_interface[USIM_ID](WAKE_CMD); //OMAPS00090550
-			local_sleep_status = Peripheral_interface[I2C_ID](WAKE_CMD);//OMAPS00090550
-			local_sleep_status = Peripheral_interface[LCD_ID](WAKE_CMD);//OMAPS00090550
-			local_sleep_status = Peripheral_interface[CAMERA_ID](WAKE_CMD);//OMAPS00090550
-			local_sleep_status = Peripheral_interface[MADC_AS_ID](WAKE_CMD);//OMAPS00090550
-            local_sleep_status = Peripheral_interface[BCI_ID](WAKE_CMD);     //wake up for battery charger interface//OMAPS00090550
-			INT_EnableIRQ();
-			return;
-		 }
-	  }
-
-#endif  // CHIPSET == 15
-
-#if (CHIPSET != 15)
      // update previous sleep
        previous_sleep = l1s.pw_mgr.sleep_performed;
-#endif
 
 
       #if (CODE_VERSION != SIMULATION)
@@ -2014,43 +974,9 @@
            // (used when the MS lost the network: in this case the deep sleep may be used)
            if (l1a_l1s_com.mode == CS_MODE0)
            {
-              l1ctl_pgm_clk32(DEFAULT_HFMHZ_VALUE*8,DEFAULT_32KHZ_VALUE);
+              l1ctl_pgm_clk32(DEFAULT_HFMHZ_VALUE, DEFAULT_32KHZ_VALUE);
            }
-
-			#if (CHIPSET == 15)
-
-
-				/* These APIs are to be provided by BSP */
-			   // Disable_APC_BG();
-		        gpio_sleep();  //LCD_Floating Pin Fix
-			    DBB_Configure_DS();
-
-				//gpio_sleep();  //LCD_Floating Pin Fix
-
-			#endif
-
-
        }
-	   #if (CHIPSET == 15)
-	   else
-	   {
-		   //DBB_Configure_BS();  // Not used
-	   }
-	   #endif
-
-
-	     #if (CHIPSET == 15)
-          // The following command writes '0' into CKM_OCPCLK register in DRP;
-          // This is done before disabling DPLL
-          // CKM_OCPCLK (R/W) = Address 0xFFFF040C
-          //   Bit 0:    0 ?OCP clock is the DCXO clock.
-          //             1 ?OCP clock is the divided DSP clock
-          //   Bit 31:1  Not Used
-          (drp_regs->CKM_OCPCLKL) &= (~(0x1));
-          asm(" NOP");
-		      asm(" NOP");
-        #endif
-
 
 
        //==============================================
@@ -2058,17 +984,13 @@
        //==============================================
        #if ((CHIPSET ==4) || (CHIPSET == 7) || (CHIPSET == 8) || (CHIPSET == 10) || (CHIPSET == 11) || (CHIPSET == 12) || (CHIPSET == 15))
          // disable DPLL (do not provide clk to DSP & RIF (Bridge))
-         ( * (volatile SYS_UWORD16 *) CLKM_CNTL_CLK) |= CLKM_DPLL_DIS ; /* CLKM_BRIDGE_DIS removed by Ranga*/
+         ( * (volatile SYS_UWORD16 *) CLKM_CNTL_CLK) |= CLKM_DPLL_DIS | CLKM_BRIDGE_DIS;
        #endif
 
        //==============================================
        // if CLOCK_STOP or FRAME-STOP : Asleep OMEGA (ABB)
        //==============================================
-       #if (ANALOG != 11)
        afc_fix = ABB_sleep(l1s.pw_mgr.sleep_performed, l1s.afc);
-       #else
-       // Nothing to be done as it should be handled by BSP_TWL3029_Configure_DS/BS
-       #endif
 
        #if (OP_BT == 1)
          hci_ll_go_to_sleep();
@@ -2077,9 +999,7 @@
        // STop SPI .....
        //=================================================
 
-	#if(CHIPSET != 15)
-		*((volatile UWORD16 *)MEM_SPI)&=0xFFFE;  // SPI CLK DISABLED
-	#endif
+	*((volatile UWORD16 *)MEM_SPI)&=0xFFFE;  // SPI CLK DISABLED
      #endif // NOT SIMULATION
 
 
@@ -2109,12 +1029,7 @@
       if ( l1s.pw_mgr.sleep_performed == CLOCK_STOP )
       {
         // DEEP SLEEP -> need time to setup afc and rf
-         wake_up_time = min_time - l1_config.params.rf_wakeup_tpu_scenario_duration;
-	 #if (CODE_VERSION == NOT_SIMULATION)
-	// Sleep one more TDMA - this is done as part of merging init and TPU control
-	      wake_up_time += 1;
-	 #endif
-
+         wake_up_time = min_time - l1_config.params.setup_afc_and_rf;
       }
       else
         // BIG SLEEP
@@ -2171,24 +1086,7 @@
             #if (W_A_CALYPSO_BUG_01435 == 1)
               f_arm_sleep_cmd(DEEP_SLEEP);
             #else
-			  	//EMIF_SetConfReg ( 0, 0, 2 ,1 ,0);
-				asm(" NOP");
-				asm(" NOP");
-				asm(" NOP");
-				asm(" NOP");
             *((volatile UWORD16 *)CLKM_ARM_CLK) &= ~(CLKM_DEEP_SLEEP);  // set deep sleep mode
-				asm(" NOP");
-				asm(" NOP");
-				asm(" NOP");
-				asm(" NOP");
-// set deep sleep mode in case it is not set back by hardware
-                               *((volatile UWORD16 *)CLKM_ARM_CLK) |= (CLKM_DEEP_SLEEP);
-
-			    //EMIF_SetConfReg ( 0, 0, 2 ,0 ,0);
-            //  *((volatile UWORD16 *)CLKM_ARM_CLK) &= 0xFFFF;  // set deep sleep mode
-           //   *((volatile UWORD16 *)CLKM_ARM_CLK) &= ~(CLKM_MCLK_EN);     // For Debug only
-
-
             #endif
           #endif // OP_WCP
         }
@@ -2200,16 +1098,12 @@
             //Shut down PERIPHERALS clocks UWIRE and ARMIO if authorized
             //==========================================================
 
-	  #if(CHIPSET != 15)
-		UWORD16  clocks_stopped; //OMAPS90550- new
+	    UWORD16  clocks_stopped; //OMAPS90550- new
             clocks_stopped = (l1s.pw_mgr.clocks & l1s.pw_mgr.modules_status);
             if((clocks_stopped & ARMIO_CLK_CUT) == ARMIO_CLK_CUT)
               *((volatile UWORD16 *)ARMIO_CNTL_REG) &= ~(ARMIO_CLOCKEN);
             if((clocks_stopped & UWIRE_CLK_CUT) == UWIRE_CLK_CUT)
               *((volatile UWORD16 *)(MEM_UWIRE + 0x8)) &= ~(0x0001);
-	  #else
-	     // Nothing to be done as it is taken care by Locosto_Configure_BS
-	  #endif
 
           #if (W_A_CALYPSO_BUG_01435 == 1)
             f_arm_sleep_cmd(BIG_SLEEP);
@@ -2244,25 +1138,13 @@
       #endif
 
 
-	l1s_wakeup();
+      l1s_wakeup();
+
+      last_wakeup = l1s.actual_time.fn_mod42432;
 
-       #if (CHIPSET == 15)
-         // The following command writes '1' into CKM_OCPCLK register in DRP;
-         // This is done after the DPLL is up
-         // CKM_OCPCLK (R/W) = Address 0xFFFF040C
-         //   Bit 0:    0 ?OCP clock is the DCXO clock.
-         //             1 ?OCP clock is the divided DSP clock
-         //   Bit 31:1  Not Used
-         (drp_regs->CKM_OCPCLKL) |= (0x1);
-     	   asm(" NOP");
-         asm(" NOP");
-       #endif
-
-      l1s.pw_mgr.wakeup_time = l1s.actual_time.fn_mod42432;
-
-      if (l1s.pw_mgr.wakeup_time == sleep_time)
+      if (last_wakeup == sleep_time)
       // sleep duration == 0 -> wakeup in the same frame as sleep
-        l1s.pw_mgr.wakeup_type = WAKEUP_ASYNCHRONOUS_SLEEP_DURATION_0;
+        wakeup_type = WAKEUP_ASYNCHRONOUS_SLEEP_DURATION_0;
 
 #if (GSM_IDLE_RAM != 0)
 // Update counters with sleep duration -> will be used case expiration in next wake up phase before traffic controller is enabled by msg sending
@@ -2286,37 +1168,6 @@
             // (*(volatile UWORD16 *)l1s_tpu_com.reg_cmd) = TPU_CTRL_CLK_EN;
 		UWORD8 local_sleep_status;
 
-
-			#if (CHIPSET == 15)
-
-               DBB_Wakeup_DS();
-
-			   gpio_wakeup(); //LCD_Floating Pin Fix
-
-				/* These APIs to be provided by BSP */
-				//Enable_APC_BG();
-				//BT_Wakeup();
-				//IRDA_Wakeup();
-				local_sleep_status = Peripheral_interface[UART_ID](WAKE_CMD); //OMAPS00090550
-				local_sleep_status = Peripheral_interface[USB_ID](WAKE_CMD);//OMAPS00090550
-				local_sleep_status = Peripheral_interface[USIM_ID](WAKE_CMD);//OMAPS00090550
-				local_sleep_status = Peripheral_interface[I2C_ID](WAKE_CMD);//OMAPS00090550
-				local_sleep_status = Peripheral_interface[LCD_ID](WAKE_CMD);//OMAPS00090550
-				local_sleep_status = Peripheral_interface[CAMERA_ID](WAKE_CMD);//OMAPS00090550
-
-				OS_system_Unprotect();
-				local_sleep_status = Peripheral_interface[MADC_AS_ID](WAKE_CMD);//OMAPS00090550
-				local_sleep_status = Peripheral_interface[BCI_ID](WAKE_CMD);  //wake up for battery charger//OMAPS00090550
-          			OS_system_protect();
- //added for OMAPS00090550 warning removal
-     if(local_sleep_status == 0)
-     {
-       l1_pwmgr_debug.fail_ret_val = local_sleep_status;
-     }
-     //upto this OMAPS00090550
-
-
-			#endif
             l1dmacro_RF_wakeup();
 
         }
@@ -2334,18 +1185,12 @@
         //=================================================
         //if CLOCK_STOP or FRAME-STOP : ReStart SPI
         //=================================================
-	#if(CHIPSET != 15)
-		*((volatile UWORD16 *)MEM_SPI)|=0x0001;  // SPI CLK ENABLED
-	#endif
+	*((volatile UWORD16 *)MEM_SPI)|=0x0001;  // SPI CLK ENABLED
 
         //=================================================
         // Wake up ABB
         //=================================================
-        #if (ANALOG != 11)
         ABB_wakeup(l1s.pw_mgr.sleep_performed, l1s.afc);
-        #else
-        // Nothing to be done here as it will be handled by BSP_TWL3029_Wakeup_DS/BS
-        #endif
 
         #if (OP_BT == 1)
           hci_ll_wake_up();
@@ -2376,15 +1221,14 @@
          if (l1a_l1s_com.mode != CS_MODE0) // in this mode the trace prevent from going to deep sleep due to UART activity
          {
            #if (GSM_IDLE_RAM == 0)
-             l1_trace_sleep(sleep_time,l1s.actual_time.fn_mod42432,l1s.pw_mgr.sleep_performed,l1s.pw_mgr.wakeup_type,l1s.pw_mgr.why_big_sleep, l1s.pw_mgr.wake_up_int_id);
+             l1_trace_sleep(sleep_time, l1s.actual_time.fn_mod42432, l1s.pw_mgr.sleep_performed, wakeup_type, why_big_sleep);
            #else
-             l1_trace_sleep_intram(sleep_time,l1s.actual_time.fn_mod42432,l1s.pw_mgr.sleep_performed,l1s.pw_mgr.wakeup_type,l1s.pw_mgr.why_big_sleep, l1s.pw_mgr.wake_up_int_id);
+             l1_trace_sleep_intram(sleep_time, l1s.actual_time.fn_mod42432, l1s.pw_mgr.sleep_performed, wakeup_type, why_big_sleep);
              #if (TRACE_TYPE==1) || (TRACE_TYPE==4)
                l1s_trace_mftab();
              #endif
            #endif
          }
-         l1s.pw_mgr.wake_up_int_id = 0;
        #endif
 
        #if (TRACE_TYPE == 1) || (TRACE_TYPE == 4)
@@ -2427,12 +1271,7 @@
 #endif
 
 
-
-#if (CHIPSET != 15)
         SER_WakeUpUarts();  // Wake up Uarts
-#else
-	// To be checked if this needs a change
-#endif
 
 
 #if (GSM_IDLE_RAM != 0)
@@ -2474,13 +1313,13 @@
       #endif
 
       #if (CHIPSET == 12) || (CHIPSET == 15)
-        l1s.pw_mgr.wake_up_int_id = ((* (SYS_UWORD16 *) C_INTH_B_IRQ_REG) & C_INTH_SRC_NUM);// For debug: Save IRQ that causes the waking up
-        if ( l1s.pw_mgr.wake_up_int_id >= 256 )
-          l1s.pw_mgr.wake_up_int_id = ((* (SYS_UWORD16 *) C_INTH_B_FIQ_REG) & C_INTH_SRC_NUM)+100;
+        int_id = ((* (SYS_UWORD16 *) C_INTH_B_IRQ_REG) & C_INTH_SRC_NUM);// For debug: Save IRQ that causes the waking up
+        if ( int_id >= 256 )
+          int_id = ((* (SYS_UWORD16 *) C_INTH_B_FIQ_REG) & C_INTH_SRC_NUM)+100;
       #else
-        l1s.pw_mgr.wake_up_int_id = ((* (SYS_UWORD16 *) INTH_B_IRQ_REG) & INTH_SRC_NUM);// For debug: Save IRQ that causes the waking up
-        if ( l1s.pw_mgr.wake_up_int_id >= 256 )
-          l1s.pw_mgr.wake_up_int_id = ((* (SYS_UWORD16 *) INTH_B_FIQ_REG) & INTH_SRC_NUM)+100;
+        int_id = ((* (SYS_UWORD16 *) INTH_B_IRQ_REG) & INTH_SRC_NUM);// For debug: Save IRQ that causes the waking up
+        if ( int_id >= 256 )
+          int_id = ((* (SYS_UWORD16 *) INTH_B_FIQ_REG) & INTH_SRC_NUM)+100;
       #endif
 
       // clear pending IQ_FRAME it and unmask it
@@ -2564,7 +1403,7 @@
 
       #if (TRACE_TYPE !=0 ) && (TRACE_TYPE != 2) && (TRACE_TYPE != 3)
         if ((l1s.pw_mgr.frame_adjust == TRUE))
-          l1s.pw_mgr.wakeup_type = WAKEUP_BY_ASYNC_INTERRUPT;
+          wakeup_type = WAKEUP_BY_ASYNC_INTERRUPT;
       #endif
 
 
@@ -2672,8 +1511,6 @@
 {
  UWORD16 temp_clear_intr;
 #if (CODE_VERSION != SIMULATION)
-  if (l1_config.pwr_mngt == PWR_MNGT)
-  {
      // read current value of count down counter
      l1s.pw_mgr.sleep_duration  = READ_ULDP_TIMER_VALUE;
 
@@ -2684,12 +1521,12 @@
        l1s.pw_mgr.sleep_duration  = READ_ULDP_TIMER_INIT;
        // INTH is different from the ULPD interrupt -> aynchronous wakeup
      #if (CHIPSET == 12) || (CHIPSET == 15)
-       if (l1s.pw_mgr.wake_up_int_id != C_INTH_TGSM_IT)
+       if (int_id != C_INTH_TGSM_IT)
      #else
-       if (l1s.pw_mgr.wake_up_int_id != IQ_TGSM)
+       if (int_id != IQ_TGSM)
      #endif
-            {
-         l1s.pw_mgr.wakeup_type = WAKEUP_ASYNCHRONOUS_ULPD_0;
+       {
+         wakeup_type = WAKEUP_ASYNCHRONOUS_ULPD_0;
          // RESET IT_ULPD in ULPD module
         // The ULDP_GSM_TIMER_IT_REG is a read only register and is cleared on reading the register
         temp_clear_intr =(* (volatile UWORD16 *) ULDP_GSM_TIMER_IT_REG) & ULPD_IT_TIMER_GSM;
@@ -2698,13 +1535,13 @@
            F_INTH_RESET_ONE_IT(C_INTH_TGSM_IT);
            // RESET IQ_FRAME in IT register
            F_INTH_RESET_ONE_IT(C_INTH_FRAME_IT);
-           l1s.pw_mgr.wake_up_int_id = C_INTH_TGSM_IT;
+           int_id = C_INTH_TGSM_IT;
          #else
            // RESET IQ_TGSM (IT_ULPD) in IT register
            INTH_RESETONEIT(IQ_TGSM);
            // RESET IQ_FRAME in IT register
            INTH_RESETONEIT(IQ_FRAME);
-           l1s.pw_mgr.wake_up_int_id = IQ_TGSM;
+           int_id = IQ_TGSM;
          #endif
          return(FALSE);
        }
@@ -2717,9 +1554,9 @@
        l1s.pw_mgr.sleep_duration  = READ_ULDP_TIMER_INIT - l1s.pw_mgr.sleep_duration;
        return(TRUE);
      }
-  }
+#else
+ return(FALSE);//omaps00090550
 #endif
- return(FALSE);//omaps00090550
 }
 
 /*-------------------------------------------------------*/
@@ -2817,16 +1654,6 @@
     double duration;
 
 
-
-
-
-
-
-
-
-
-
-
     //WORD32 old;- OMAPS 90550 new
 
     // read Hercules Timers & Watchdog
@@ -2839,14 +1666,18 @@
     cntlreg = Dtimer1_Get_cntlreg();
     if ( (cntlreg & D_TIMER_RUN) == D_TIMER_RUN)
     {
-      cntlreg = cntlreg&0x1F;
+      #if 0	/* match TCS211 object */
+        cntlreg = cntlreg&0x1F;
+      #endif
       cntlreg >>= 2;   // take PTV
       cntlreg = 1 << (cntlreg+1);  // compute 2^(PTV+1)
       // convert sleep duration in HWTimers ticks....
       duration = (l1s.pw_mgr.sleep_duration * 4.615 - (DELTA_TIME/32.768)) / (cntlreg * 0.0012308);
-      if (duration < 0.0){
-        duration = 0.0; // This needs to be done for all the timers
-      }
+      #if 0	/* match TCS211 object */
+        if (duration < 0.0){
+          duration = 0.0; // This needs to be done for all the timers
+        }
+      #endif
       timer1 = Dtimer1_ReadValue() - (UWORD16) duration;
 
       Dtimer1_Start(0);
@@ -2857,14 +1688,18 @@
     cntlreg = Dtimer2_Get_cntlreg();
     if ( (cntlreg & D_TIMER_RUN) == D_TIMER_RUN)
     {
-      cntlreg = cntlreg&0x1F;
+      #if 0	/* match TCS211 object */
+        cntlreg = cntlreg&0x1F;
+      #endif
       cntlreg >>= 2;   // take PTV
       cntlreg = 1 << (cntlreg+1);
       // convert sleep duration in HWTimers ticks....
       duration = (l1s.pw_mgr.sleep_duration * 4.615 - (DELTA_TIME/32.768)) / (cntlreg * 0.0012308);
-      if (duration < 0.0){
-        duration = 0.0; // This needs to be done for all the timers
-      }
+      #if 0	/* match TCS211 object */
+        if (duration < 0.0){
+          duration = 0.0; // This needs to be done for all the timers
+        }
+      #endif
       timer2 = Dtimer2_ReadValue() - (UWORD16) duration;
       Dtimer2_Start(0);
       Dtimer2_WriteValue(timer2);
@@ -2924,19 +1759,21 @@
 /*  return -1 means no activity planned                  */
 /*-------------------------------------------------------*/
 #if L1_GPRS
-  UWORD32 l1s_get_next_gauging_in_Packet_Idle(void)
+  UWORD32 next_gauging_scheduled_for_PNP; // gauging for Packet Idle
+
+  WORD32 l1s_get_next_gauging_in_Packet_Idle(void)
   {
     WORD32 next_gauging;
 
     // gauging performed with Normal Paging (we are in Idle mode)
     if (l1a_l1s_com.l1s_en_task[NP] == TASK_ENABLED)
-      return ((UWORD32)(-1)); // no activity planned   //omaps00090550
+      return (-1); // no activity planned
 
     // we are not in Packet Idle Mode
     if (l1a_l1s_com.l1s_en_task[PNP] != TASK_ENABLED)
-      return ((UWORD32)(-1)); // no activity planned   //omaps00090550
+      return (-1); // no activity planned
 
-    next_gauging = l1s.next_gauging_scheduled_for_PNP - l1s.actual_time.fn ;
+    next_gauging = next_gauging_scheduled_for_PNP - l1s.actual_time.fn ;
     if (next_gauging < 0)
       next_gauging+=MAX_FN;
 
@@ -2957,20 +1794,13 @@
 #if L1_GPRS
   BOOL l1s_gauging_decision_with_PNP(void)
   {
-  #define TWO_SECONDS_IN_FRAME (UWORD16)(2000/4.615)
-  WORD32  time_to_next_gauging=0;  //changed to WORD32- sajal
-    // It's time to perform the next gauging
-  time_to_next_gauging = l1s.next_gauging_scheduled_for_PNP - l1s.actual_time.fn;
-  if (time_to_next_gauging < 0)
-  {
-    time_to_next_gauging += MAX_FN;
-  }
+    #define TWO_SECONDS_IN_FRAME (UWORD16)(2000/4.615)
 
-  if( (time_to_next_gauging == 0) || (time_to_next_gauging > TWO_SECONDS_IN_FRAME))
-  {
-
-      l1s.next_gauging_scheduled_for_PNP = l1s.actual_time.fn + TWO_SECONDS_IN_FRAME;
-      if (l1s.next_gauging_scheduled_for_PNP >= MAX_FN) l1s.next_gauging_scheduled_for_PNP -= MAX_FN;
+    /* reconstructed TCS211 code */
+    if (l1s.actual_time.fn >= next_gauging_scheduled_for_PNP)
+    {
+      next_gauging_scheduled_for_PNP = l1s.actual_time.fn + TWO_SECONDS_IN_FRAME;
+      if (next_gauging_scheduled_for_PNP >= MAX_FN) next_gauging_scheduled_for_PNP -= MAX_FN;
       return (TRUE);
     }
 
@@ -2998,7 +1828,8 @@
     // A gauging session is needed : start gauging session with this paging bloc !
 
         //Nina modify to save power, not forbid deep sleep, only force gauging in next paging
-#if 0
+	// FreeCalypso TCS211 reconstruction: Nina's change reverted
+#if 1
 	if (l1s.pw_mgr.enough_gaug != TRUE)
     time_to_gaug = 0;
 #else
@@ -3207,6 +2038,3 @@
 
 //#pragma GSM_IDLE_DUPLICATE_FOR_INTERNAL_RAM_END
 #endif
-
-
-
--- a/L1/cfile/l1_sync.c	Thu Jun 09 05:38:18 2016 +0000
+++ b/L1/cfile/l1_sync.c	Thu Jun 09 05:45:03 2016 +0000
@@ -8,9 +8,8 @@
  ************* Revision Controle System Header *************/
 
 //#pragma DUPLICATE_FOR_INTERNAL_RAM_START
-  #include "config.h"
+  #include "l1_macro.h"
   #include "l1_confg.h"
-  #include "l1_macro.h"
 //#pragma DUPLICATE_FOR_INTERNAL_RAM_END
 
 #if !((MOVE_IN_INTERNAL_RAM == 1) && (GSM_IDLE_RAM !=0))  // MOVE TO INTERNAL MEM IN CASE GSM_IDLE_RAM enabled
@@ -130,7 +129,7 @@
   #endif
 
   #include "l1_defty.h"
-  #include "../../gpf/inc/cust_os.h"
+  #include "cust_os.h"
   #include "l1_msgty.h"
   #include "l1_varex.h"
   #include "l1_proto.h"
@@ -143,10 +142,10 @@
     #include "hw_debug.h"
   #endif // L2_L3 SIMUL
 
-  #include "../../bsp/ulpd.h"
-  #include "../../bsp/mem.h"
-  #include "../../bsp/inth.h"
-  #include "../../bsp/iq.h"
+  #include "ulpd.h"
+  #include "mem.h"
+  #include "inth.h"
+  #include "iq.h"
 
   #if L1_GPRS
     #include "l1p_cons.h"
@@ -163,9 +162,8 @@
 #if(RF_FAM == 61)
 	#include "l1_rf61.h"
 #endif
-#if (CODE_VERSION!= SIMULATION)
-#include "l1_pwmgr.h"
-#endif //NOT SIMULATION
+
+#define	W_A_DSP_PR20037	1	/* FreeCalypso */
 
 #if (GSM_IDLE_RAM != 0)
 #if (OP_L1_STANDALONE == 1)
@@ -183,10 +181,11 @@
   #include "prf/prf_api.h"
 #endif
 
-
+#if 0	/* FreeCalypso TCS211 reconstruction */
 //Enhanced RSSI    -OMAPS00075410
 #define TOTAL_NO_OF_BITS_IDLE_MEAS    625
 extern UWORD32 qual_acc_idle1[2];
+#endif
 
 #if (RF_FAM == 61)
   #include "tpudrv61.h"
@@ -230,22 +229,18 @@
 /*-------------------------------------------------------*/
 /* Prototypes of external functions used in this file.   */
 /*-------------------------------------------------------*/
-void l1ddsp_meas_read      (UWORD8 nbmeas, UWORD16 *pm);
+void l1ddsp_meas_read      (UWORD8 nbmeas, UWORD8 *pm);
 
 #if L1_GPRS
   void l1ps_transfer_mode_manager  (void);
   void l1ps_reset_db_mcu_to_dsp    (T_DB_MCU_TO_DSP_GPRS *page_ptr);
   void l1pddsp_meas_ctrl           (UWORD8 nbmeas, UWORD8 pm_pos);
-  void l1pddsp_meas_read           (UWORD8 nbmeas, UWORD16 *pm_read);
+  void l1pddsp_meas_read           (UWORD8 nbmeas, UWORD8 *pm_read);
   void l1ps_meas_manager           (void);
   void l1ps_transfer_meas_manager  (void);
   void l1ps_macs_rlc_downlink_call (void);
 #endif
 
-UWORD8 calc_num_pm_to_report(void);
-void update_num_pm_fp_table_for_rach(UWORD8 nbmeas,UWORD8 *p);
-void update_num_pm_table_for_rach(UWORD8 nbmeas,UWORD8 *p);
-
 #if (TRACE_TYPE==7) // CPU_LOAD
   extern void l1_cpu_load_start(void);
   extern void l1_cpu_load_stop(void);
@@ -362,32 +357,12 @@
   extern unsigned short       layer_1_sync_end_time;
   void hisr(void)
   {
-    #if (TRACE_TYPE == 4) && (TI_NUC_MONITOR != 1) && (WCP_PROF == 0)
-       if(trace_info.current_config->l1_dyn_trace & 1<<L1_DYN_TRACE_L1S_CPU_LOAD)
-       {
-          TM_ResetTimer (2, TIMER_RESET_VALUE, 0, 0);
-          TM_StartTimer (2);
-       }
-    #endif
-
-    #if (GSM_IDLE_RAM_DEBUG == 1)
-      (*( volatile unsigned short* )(0xFFFE4802)) |= (1 << 2);    // GPIO-2=1
-    #endif
-
-/*
- * FreeCalypso change: the conditioned-out GPIO twiddling below appears in
- * the LoCosto version of this L1 code without any conditionals around it.
- * Checking the disassembly of the Leonardo binary object confirms that
- * NO GPIO muck takes places in that version.  Needless to say, I am
- * disabling it for FreeCalypso - we don't want to wreak havoc on some
- * target that uses GPIO 0 for something else.
- */
-#if 0
-   // Configure GPIO0 pin as output - Reset Bit 0 i.e. set Bit 0 to 0
-   (*( volatile unsigned short* )(0xFFFE4804)) &= (~(1 << 0));    // GPIO-2=1
-   // write 1 in GPIO pin 0
-   (*( volatile unsigned short* )(0xFFFE4802)) |= (1 << 0);    // GPIO-2=1
-#endif
+    /*
+     * FreeCalypso TCS211 reconstruction: the LoCosto version
+     * of this function had a whole bunch of junk here
+     * which we have removed in order to match the TCS211
+     * binary object.
+     */
 
     // stop the gauging.This function must be called at the
     // begining of the HISR in order to have the IT_GAUGING
@@ -400,7 +375,7 @@
       if (TPU_check_IT_DSP()==TRUE)
       {
         #if (GSM_IDLE_RAM == 0)
-         l1_trace_IT_DSP_error(IT_DSP_ERROR_CPU_OVERLOAD);
+         l1_trace_IT_DSP_error();
         #else
          l1_trace_IT_DSP_error_intram();
         #endif
@@ -471,6 +446,11 @@
 
     l1s_synch();
 
+    /*
+     * The following double invokation of l1s_synch()
+     * is NOT present in the TCS211 version.
+     */
+    #if 0
     if(l1s.pw_mgr.sleep_performed == CLOCK_STOP &&
 	(l1s.pw_mgr.wakeup_type == WAKEUP_FOR_L1_TASK ||
 	 l1s.pw_mgr.wakeup_type == WAKEUP_ASYNCHRONOUS_ULPD_0 ||
@@ -480,6 +460,7 @@
     {
 	l1s_synch();
     }
+    #endif
 
     // Be careful:in case of asynchronous wake-up after sleep
     // an IT_TDMA may be unmasked and executed just after l1s_sleep_manager();
@@ -499,7 +480,8 @@
     #endif
 
 
-    #if (TRACE_TYPE == 1) || (TRACE_TYPE == 4)
+    /* used to be #if (TRACE_TYPE == 1) || (TRACE_TYPE == 4) in LoCosto */
+    #if (TRACE_TYPE == 1)	/* TSM30 code has it this way */
       // CPU load for TRACE_TYPE == 1 and 4 only
       if((trace_info.current_config->l1_dyn_trace & 1<<L1_DYN_TRACE_L1S_CPU_LOAD) &&
           (trace_info.sleep_performed == FALSE))
@@ -524,20 +506,6 @@
       l1_cpu_load_stop();
     #endif
 
-    #if ((TRACE_TYPE == 1) || (TRACE_TYPE == 4)) && (DSP >= 38)
-      // DSP CPU load for TRACE_TYPE == 1 and 4 only
-      if(trace_info.current_config->l1_dyn_trace & 1<<L1_DYN_TRACE_DSP_CPU_LOAD)
-      {
-        // DSP CPU load measurement
-        l1_dsp_cpu_load_read();
-      }
-    #endif
-
-#if 0
-   // write 0 in GPIO pin 0
-   (*( volatile unsigned short* )(0xFFFE4802)) &= (~(1 << 0));    // GPIO-2=1
-#endif
-
   }
 
 #endif // NO SIMULATION
@@ -565,46 +533,6 @@
 
 void l1s_synch()
 {
-
-   #if(L1_RF_KBD_FIX == 1)
-	static int prev_correction_ratio = 0; //omaps00090550
-
-        // Ratio Computation - Rounding Up to the Higher Integer if applicable
-
-    if (l1s.total_kbd_on_time !=0)
-        l1s.correction_ratio = ((FRAME_DURATION+((l1s.total_kbd_on_time-1)/2))/l1s.total_kbd_on_time);
-
-
-	    // Fix to change the Debounce Time value to 16 ms during Initial FB search
-    if ((l1a_l1s_com.mode == CS_MODE0)||(l1a_l1s_com.mode == CS_MODE))
-	{
-        l1s.correction_ratio = 4;
-        kpd_timer_modify(l1s.correction_ratio, l1s.actual_time.fn_mod42432);
-
-        #if (TRACE_TYPE == 1) || (TRACE_TYPE == 4)
-           l1_trace_correction_ratio(l1s.correction_ratio);
-        #endif
-	    prev_correction_ratio=4;
-    }
-    else
-	{
-        if(prev_correction_ratio != l1s.correction_ratio)
-		{
-  	       kpd_timer_modify(l1s.correction_ratio, l1s.actual_time.fn_mod42432);
-
-           #if (TRACE_TYPE == 1) || (TRACE_TYPE == 4)
-	       l1_trace_correction_ratio(l1s.correction_ratio);
-           #endif
-           prev_correction_ratio = l1s.correction_ratio;
-		}
-        else
-		{
-	       kpd_state_probe(l1s.actual_time.fn_mod42432);
-		}
-	}
-    l1s.total_kbd_on_time = FRAME_DURATION;
-	#endif
-
    #if (CODE_VERSION==SIMULATION)
       // increment time counter used for debug and by L3 scenario...
       l1s.debug_time ++;
@@ -638,7 +566,7 @@
          l1a_l1s_com.time_to_next_l1s_task < MAX_FN)
         l1a_l1s_com.time_to_next_l1s_task--;
    #endif
-        l1s.tcr_prog_done=0;
+        /* l1s.tcr_prog_done=0; */
 #if (FF_L1_FAST_DECODING == 1)
       /* If a fast decoding IT is expected AND a deferred control is scheduled */
       /* then it means that a fast decoding IT is still awaited from previous  */
@@ -653,7 +581,7 @@
 #endif /* #if (FF_L1_FAST_DECODING == 1) */
 
   #if L1_GPRS
-      l1s.tcr_prog_done=0;
+      /* l1s.tcr_prog_done=0; */
     // Increment TOA period counter used in packet tranfer mode
     if (l1a_l1s_com.mode == PACKET_TRANSFER_MODE)
     {
@@ -751,6 +679,15 @@
   {
     BOOL l1s_task_allowed = TRUE;
 
+    /*
+     * FreeCalypso TCS211 reconstruction: the following code
+     * fails to compile because the wakeup_time structure member
+     * is not present in TCS211 headers.  Let's try omitting it
+     * so we can get a successful compile and start diffing the
+     * compilation results.
+     */
+#if 0
+
     /* This is not required in Locosto after merge of deep-sleep
      * initialization and control frame */
  #if (CHIPSET != 15)
@@ -778,6 +715,7 @@
     l1s.pw_mgr.sleep_performed = DO_NOT_SLEEP; // In case l1s is executed, initialize sleep performed in order to avoid reentry in part above 42432 frames later
     l1s_task_allowed = TRUE;
 #endif
+#endif
 
     if (l1s_task_allowed == TRUE)
     {
@@ -1138,7 +1076,7 @@
           l1s_sleep_manager();
         }
     }
-	#if (CODE_VERSION!= SIMULATION)
+    #if 0	/* FreeCalypso TCS211 reconstruction */
     else{
       l1_trace_fail_sleep(FAIL_SLEEP_L1SYNCH,0,0);
     }
@@ -1231,7 +1169,8 @@
 /*-------------------------------------------------------*/
 void l1s_task_scheduler_process()
 {
-  WORD32 pending_task = NO_NEW_TASK;
+  WORD32 pending_task;
+
   // Call routine: SCHEDULE_TASKS.
   l1s_schedule_tasks(&pending_task);
 
@@ -1345,7 +1284,7 @@
   // ADC task is ENABLED in CS_MODE0.
   //--------------------------------
   {
-    UWORD32  time_to_adc = 0 ; //omaps00090550
+    UWORD32  time_to_adc;
 
     if (l1a_l1s_com.adc_mode & ADC_NEXT_CS_MODE0)
     {
@@ -1514,7 +1453,7 @@
         if(time_to_nbcchs >= modulus_times_51)
           time_to_nbcchs -= modulus_times_51;
 
-      if(time_to_nbcchs < (WORD32)min_time_to_nbcchs)
+      if(time_to_nbcchs < min_time_to_nbcchs)
         min_time_to_nbcchs = time_to_nbcchs;
     }
 
@@ -1676,7 +1615,7 @@
                              MAX_FN -
                              l1s.actual_time.fn;
 
-        if(time_to_smscb_info >= (WORD32)MAX_FN) time_to_smscb_info -= MAX_FN;
+        if(time_to_smscb_info >= MAX_FN) time_to_smscb_info -= MAX_FN;
 
         // Check if passing 1 schedule position.
         if(time_to_smscb_info == 0)
@@ -1701,7 +1640,7 @@
                                  MAX_FN -
                                  l1s.actual_time.fn;
 
-            if(time_to_norm_smscb >= (WORD32)MAX_FN) time_to_norm_smscb -= MAX_FN;
+            if(time_to_norm_smscb >= MAX_FN) time_to_norm_smscb -= MAX_FN;
 
             // Check if passing 1 schedule position.
             if(time_to_norm_smscb == 0)
@@ -1725,7 +1664,7 @@
                                  MAX_FN -
                                  l1s.actual_time.fn;
 
-            if(time_to_norm_smscb >= (WORD32)MAX_FN) time_to_norm_smscb -= MAX_FN;
+            if(time_to_norm_smscb >= MAX_FN) time_to_norm_smscb -= MAX_FN;
 
             // Check for "CBCH continuous reading" starting frame number.
             if(time_to_norm_smscb == 0)
@@ -1765,7 +1704,7 @@
                                  MAX_FN -
                                  l1s.actual_time.fn;
 
-            if(time_to_ext_smscb >= (WORD32)MAX_FN) time_to_ext_smscb -= MAX_FN;
+            if(time_to_ext_smscb >= MAX_FN) time_to_ext_smscb -= MAX_FN;
 
             // Check if passing 1 schedule position.
             if(time_to_ext_smscb == 0)
@@ -1789,7 +1728,7 @@
                                  MAX_FN -
                                  l1s.actual_time.fn;
 
-            if(time_to_ext_smscb >= (WORD32 )MAX_FN) time_to_ext_smscb -= MAX_FN;
+            if(time_to_ext_smscb >= MAX_FN) time_to_ext_smscb -= MAX_FN;
 
             // Check for "CBCH continuous reading" starting frame number.
             if(time_to_ext_smscb == 0)
@@ -1820,7 +1759,7 @@
       else
         min_time_to_smscb = time_to_ext_smscb;
 
-      if(time_to_smscb_info <(WORD32) min_time_to_smscb)
+      if(time_to_smscb_info < min_time_to_smscb)
         min_time_to_smscb = time_to_smscb_info;
 
       // Save scheduling result.
@@ -1970,7 +1909,7 @@
             // memorize the next BCCHN according to its priority
             // (TOP_PRIORITY or HIGH_PRIORITY or NORMAL_PRIORITY )
             bcchn_priority = l1a_l1s_com.bcchn.list[i].gprs_priority ;
-            if(time_to_bcchn <(WORD32 ) min_time_to_bcchn[bcchn_priority])
+            if(time_to_bcchn < min_time_to_bcchn[bcchn_priority])
             {
               min_time_to_bcchn[bcchn_priority] = time_to_bcchn;
 
@@ -2037,7 +1976,7 @@
             // memorize the next BCCHN according to its priority
             // (TOP_PRIORITY or HIGH_PRIORITY or NORMAL_PRIORITY )
             bcchn_priority = l1a_l1s_com.bcchn.list[i].gprs_priority;
-            if(time_to_bcchn < (WORD32)min_time_to_bcchn[bcchn_priority])
+            if(time_to_bcchn < min_time_to_bcchn[bcchn_priority])
             {
               min_time_to_bcchn[bcchn_priority] = time_to_bcchn;
 
@@ -2283,13 +2222,10 @@
           // then PEP scheduling has to be computed with "m_for_pep = m_index - 1"
           if(l1a_l1s_com.task_param[PEP] == SEMAPHORE_SET)
           {
-           UWORD16 u16Temp;
             // PAGING GROUP computation:
 
-           u16Temp = (l1pa_l1ps_com.pccch.pg_offset + (((m_for_pep) * l1pa_l1ps_com.pccch.pg_blks_avail)
-                                / l1pa_l1ps_com.pccch.split_pg_value)) % l1pa_l1ps_com.pccch.pg_blks_avail;
-
-            paging_group    = u16Temp;
+            paging_group = (l1pa_l1ps_com.pccch.pg_offset + (((UWORD32)(m_for_pep) * (UWORD32)l1pa_l1ps_com.pccch.pg_blks_avail)
+                                / (UWORD32)l1pa_l1ps_com.pccch.split_pg_value)) % l1pa_l1ps_com.pccch.pg_blks_avail;
 
             // Computation of the MF52 for MS Packet Extented Paging
             mf52_for_ms_epg = ((paging_group + 3) / l1pa_l1ps_com.pccch.nb_ppch_per_mf52) % 64;
@@ -2426,7 +2362,7 @@
             time_to_pbcchs += psi_period;
 
           // Save Min time to next PBCCHS block.
-          if(time_to_pbcchs < (WORD16)min_time_to_pbcchs)
+          if(time_to_pbcchs < min_time_to_pbcchs)
           {
             min_time_to_pbcchs = time_to_pbcchs;
             psi_index          = i;
@@ -3316,10 +3252,10 @@
     #define MF26       2
 
     UWORD8                channel = 255;
-    UWORD8                start_time =0; //omaps00090550
+    UWORD8                start_time;
     UWORD8                fn_in_report_mod51 = l1s.next_time.fn_in_report % 51;
-    T_CHANNEL_DESCRIPTION *desc_ptr= NULL;
-    T_SDCCH_DESC          *sdcch_desc = NULL;//OMAPS00090550
+    T_CHANNEL_DESCRIPTION *desc_ptr;
+    T_SDCCH_DESC          *sdcch_desc;
 
     if(l1a_l1s_com.l1s_en_task[DEDIC] == TASK_ENABLED)
     //---------------------------------------------
@@ -3615,7 +3551,7 @@
         } // End of "if / current_status"
       } // End of "if / NSYNC"
 
-      if((l1a_l1s_com.l1s_en_task[DDL] == TASK_ENABLED) && (sdcch_desc != NULL))
+      if (l1a_l1s_com.l1s_en_task[DDL] == TASK_ENABLED)
       //-------------------------
       // SDCCH DL task is ENABLED.
       //-------------------------
@@ -3631,7 +3567,7 @@
         l1s.task_status[DDL].time_to_exec = time_to_ddl;
       }
 
-      if((l1a_l1s_com.l1s_en_task[DUL] == TASK_ENABLED) && (sdcch_desc != NULL))
+      if (l1a_l1s_com.l1s_en_task[DUL] == TASK_ENABLED)
       //-------------------------
       // SDCCH DUL task is ENABLED.
       //-------------------------
@@ -3647,7 +3583,7 @@
         l1s.task_status[DUL].time_to_exec = time_to_dul;
       }
 
-      if((l1a_l1s_com.l1s_en_task[ADL] == TASK_ENABLED) && (sdcch_desc != NULL))
+      if (l1a_l1s_com.l1s_en_task[ADL] == TASK_ENABLED)
       //----------------------------------
       // SACCH DL (SDCCH) task is ENABLED.
       //----------------------------------
@@ -3663,7 +3599,7 @@
         l1s.task_status[ADL].time_to_exec = time_to_adl;
       }
 
-      if((l1a_l1s_com.l1s_en_task[AUL] == TASK_ENABLED) && (sdcch_desc != NULL))
+      if (l1a_l1s_com.l1s_en_task[AUL] == TASK_ENABLED)
       //----------------------------------
       // SACCH UL (SDCCH) task is ENABLED.
       //----------------------------------
@@ -3700,7 +3636,7 @@
       // Neigbour Cell Synchro task enabled for DEDIC TCH or PACKET
       //-----------------------------------------------------------
       {
-        T_CHANNEL_DESCRIPTION *desc_ptr = NULL; //OMAPS00090550
+        T_CHANNEL_DESCRIPTION *desc_ptr;
 
         if (l1a_l1s_com.l1s_en_task[DEDIC] == TASK_ENABLED)
         {
@@ -3762,7 +3698,7 @@
                 {
                   UWORD32  min_time_to_fb = MAX_FN;
 
-                  if((l1a_l1s_com.l1s_en_task[DEDIC] == TASK_ENABLED) && (desc_ptr != NULL))
+                  if (l1a_l1s_com.l1s_en_task[DEDIC] == TASK_ENABLED)
                   //---------------------------------------------
                   // Dedicated mode tasks are enabled.
                   //---------------------------------------------
@@ -3819,7 +3755,7 @@
                   BOOL check_fbcnf26 = 0;
                   UWORD32 min_time_to_fbconf = MAX_FN;
 
-                  if((l1a_l1s_com.l1s_en_task[DEDIC] == TASK_ENABLED) && (desc_ptr != NULL))
+                  if (l1a_l1s_com.l1s_en_task[DEDIC] == TASK_ENABLED)
                   //---------------------------------------------
                   // Dedicated mode tasks are enabled.
                   //---------------------------------------------
@@ -3987,7 +3923,7 @@
                   BOOL check_sbcnf26 = 0;
                   UWORD32 min_time_to_sbconf = MAX_FN;
 
-                  if((l1a_l1s_com.l1s_en_task[DEDIC] == TASK_ENABLED) && (desc_ptr != NULL))
+                  if (l1a_l1s_com.l1s_en_task[DEDIC] == TASK_ENABLED)
                   //---------------------------------------------
                   // Dedicated mode tasks are enabled.
                   //---------------------------------------------
@@ -4695,7 +4631,7 @@
     // ITMEAS task is ENABLED.
     //-------------------------
     {
-      UWORD8 time_to_itmeas =0 ; //omaps00090550
+      UWORD8 time_to_itmeas;
 
       // time to ITMEAS processing
       // ITMEAS must be scheduled 2 frames in advance (C W W R scheme)
@@ -4853,11 +4789,14 @@
            (l1s.task_status[SMSCB].current_status == INACTIVE)       &&
            (((l1a_l1s_com.mode != PACKET_TRANSFER_MODE) ||
                ((l1s.task_status[NBCCHS].current_status == INACTIVE) &&
-               (l1s.task_status[EBCCHS].current_status == INACTIVE) &&
-	       (l1s.task_status[PNP].current_status == INACTIVE) &&
-               (l1s.task_status[PEP].current_status == INACTIVE) &&
-               (l1s.task_status[NP].current_status == INACTIVE) &&
-               (l1s.task_status[EP].current_status == INACTIVE)))))
+               (l1s.task_status[EBCCHS].current_status == INACTIVE)
+           #if 0	/* FreeCalypso TCS211 reconstruction */
+	       && (l1s.task_status[PNP].current_status == INACTIVE)
+               && (l1s.task_status[PEP].current_status == INACTIVE)
+               && (l1s.task_status[NP].current_status == INACTIVE)
+               && (l1s.task_status[EP].current_status == INACTIVE)
+           #endif
+           ))))
 
        #else
          if (l1s.task_status[SMSCB].current_status == INACTIVE)
@@ -5292,7 +5231,7 @@
 /*-------------------------------------------------------*/
 void l1s_meas_manager(void)
 {
-  static static_s_rxlev_cntr = 0;
+  /* static static_s_rxlev_cntr = 0; */
   UWORD32  i;
   UWORD8   IL_for_rxlev;
   UWORD8   adc_active = INACTIVE;
@@ -5427,9 +5366,9 @@
   if((l1a_l1s_com.l1s_en_meas & FSMS_MEAS) && !(l1a_l1s_com.meas_param & FSMS_MEAS))
   {
     #if L1_GPRS
-      UWORD16   pm_read[NB_MEAS_MAX_GPRS]={0}; //omaps00090550
+      UWORD8   pm_read[NB_MEAS_MAX_GPRS];
     #else
-      UWORD16   pm_read[NB_MEAS_MAX];
+      UWORD8   pm_read[NB_MEAS_MAX];
     #endif
 
     UWORD8    nbmeas, max_nbmeas;
@@ -5503,7 +5442,6 @@
       #endif
 
       l1_check_pm_error(pm_read[i], FULL_LIST_MEAS_ID);
-      pm_read[i] = (pm_read[i] >> 5);
 
       #if (TRACE_TYPE==3)
         stats_samples_pm(pm_read[i]);
@@ -5955,7 +5893,8 @@
      * as the measurement can end in potentially 2 TDMA frames itself and an IBA_R message
      * when comes in certail TDMA frames of paging task, both static ctrl index and static
      * read index will be zero */
-    if((static_ctrl_index != 0) || (static_read_index != 0) || (pch_msg != NULL))
+    /* FreeCalypso TCS211 reconstruction: above change reverted */
+    if((static_ctrl_index != 0) || (static_read_index != 0))
     {
    
       // Paging process has been interrupted by a L3 message
@@ -5991,11 +5930,14 @@
     static UWORD8 static_nbmeas_to_report = 8;
     static UWORD8 static_nbmeas_ctrl_d  = 0;
     static UWORD8 static_nbmeas_ctrl_dd = 0;
+
+#if 0	/* FreeCalypso TCS211 reconstruction */
     static UWORD8 num_pm[4]={0,0,0,0};
 #if (FF_L1_FAST_DECODING == 1)
     static UWORD8 num_pm_fp[2]={0,0};
 #endif
     static UWORD8 num_pm_frames = 0; /* number of frames over which measurement is scheduled */
+#endif
 
     UWORD8   nbmeas_ctrl = 0;
 #if (FF_L1_FAST_DECODING == 1)
@@ -6025,9 +5967,8 @@
         #endif
 
         // Read power measurement result from DSP.
-        pm = (l1s_dsp_com.dsp_db_r_ptr->a_pm[i] & 0xffff);
+        pm = (l1s_dsp_com.dsp_db_r_ptr->a_pm[i] & 0xffff) >> 5;
         l1_check_pm_error(pm, I_BA_MEAS_ID);
-        pm = pm >> 5;
 
         #if (TRACE_TYPE==3)
           stats_samples_pm(pm);
@@ -6045,26 +5986,21 @@
         #endif
 
 
-        #if (GSM_IDLE_RAM != 1)
-
-			  //Check if the message is not empty, else allocate memory
-		if (pch_msg == NULL)
+#if 0	/* FreeCalypso TCS211 reconstruction */
+	//Check if the message is not empty, else allocate memory
+	if (pch_msg == NULL)
         {
           pch_msg = os_alloc_sig(sizeof(T_L1C_RXLEV_PERIODIC_DONE));
           DEBUGMSG(status,NU_ALLOC_ERR)
           pch_msg->SignalCode = L1C_RXLEV_PERIODIC_DONE;
         }
-          // Fill reporting message.
-
-          ((T_L1C_RXLEV_PERIODIC_DONE*)(pch_msg->SigP))->
-            A[static_read_index].radio_freq_no = radio_freq_read;
-          ((T_L1C_RXLEV_PERIODIC_DONE*)(pch_msg->SigP))->
-            A[static_read_index].rxlev = l1s_encode_rxlev(IL_for_rxlev);
-        #elif (GSM_IDLE_RAM == 1)             // In this case the msg is not allocated yet -> save into internal variable
-          // Fill reporting message.
-          l1s.A[static_read_index].radio_freq_no = radio_freq_read;
-          l1s.A[static_read_index].rxlev = l1s_encode_rxlev(IL_for_rxlev);
-        #endif
+#endif
+
+        // Fill reporting message.
+        ((T_L1C_RXLEV_PERIODIC_DONE*)(pch_msg->SigP))->
+          A[static_read_index].radio_freq_no = radio_freq_read;
+        ((T_L1C_RXLEV_PERIODIC_DONE*)(pch_msg->SigP))->
+          A[static_read_index].rxlev = l1s_encode_rxlev(IL_for_rxlev);
 
         // Increment the number of neighbor meas read.
         static_read_index ++;
@@ -6079,7 +6015,7 @@
       // Accumulate the new measurement with the partial result.
       // Compensate AGC for current measurement value.
       l1a_l1s_com.Scell_info.meas.acc += l1a_l1s_com.Scell_IL_for_rxlev;
-      static_s_rxlev_cntr++;
+      /* static_s_rxlev_cntr++; */
 
       // **********
       // Reporting
@@ -6121,7 +6057,7 @@
 //          ((T_L1C_RXLEV_PERIODIC_DONE*)(pch_msg->SigP))->s_rxlev = l1s_encode_rxlev(l1a_l1s_com.Scell_info.meas.acc/4);
 //#endif  /* #if (FF_L1_FAST_DECODING == 1) #else */
 
-((T_L1C_RXLEV_PERIODIC_DONE*)(pch_msg->SigP))->s_rxlev = l1s_encode_rxlev(l1a_l1s_com.Scell_info.meas.acc/(static_s_rxlev_cntr));
+((T_L1C_RXLEV_PERIODIC_DONE*)(pch_msg->SigP))->s_rxlev = l1s_encode_rxlev(l1a_l1s_com.Scell_info.meas.acc/4);
         // Fill "nbr_of_carriers" field, it is 7 when a RACH coincides with paging block, 8 otherwise.
         ((T_L1C_RXLEV_PERIODIC_DONE*)(pch_msg->SigP))->nbr_of_carriers = static_nbmeas_to_report;
 
@@ -6129,21 +6065,25 @@
         ((T_L1C_RXLEV_PERIODIC_DONE*)(pch_msg->SigP))->ba_id = l1a_l1s_com.ba_list.ba_id;
 // Enhanced RSSI
 
+	#if 0	/* FreeCalypso TCS211 reconstruction */
          ((T_L1C_RXLEV_PERIODIC_DONE*)(pch_msg->SigP))->qual_acc_idle =qual_acc_idle1[0] ;
 
          ((T_L1C_RXLEV_PERIODIC_DONE*)(pch_msg->SigP))->qual_nbr_meas_idle =qual_acc_idle1[1]* TOTAL_NO_OF_BITS_IDLE_MEAS;
+	#endif
 
         // send L1C_RXLEV_PERIODIC_IND message...
         os_send_sig(pch_msg, L1C1_QUEUE);
         DEBUGMSG(status,NU_SEND_QUEUE_ERR)
 
+	#if 0	/* FreeCalypso TCS211 reconstruction */
        // Reseting the value
        qual_acc_idle1[0]= 0;
        qual_acc_idle1[1] =0;
+	#endif
 
         // Reset pointer for debugg.
         pch_msg = NULL;
-	static_s_rxlev_cntr = 0;
+	/* static_s_rxlev_cntr = 0; */
       }
 
     }// end of READ
@@ -6160,7 +6100,7 @@
           pch_msg = os_alloc_sig(sizeof(T_L1C_RXLEV_PERIODIC_DONE));
           DEBUGMSG(status,NU_ALLOC_ERR)
           pch_msg->SignalCode = L1C_RXLEV_PERIODIC_DONE;
-	  static_s_rxlev_cntr = 0;
+	  /* static_s_rxlev_cntr = 0; */
         }
       #endif
       // Reset accumalator for serving measurements.
@@ -6173,136 +6113,14 @@
       l1a_l1s_com.ba_list.first_index = l1a_l1s_com.ba_list.next_to_ctrl;
 
       // Reset static variables for control of nbmeas per frame
-      static_nbmeas_to_report = calc_num_pm_to_report();
+      static_nbmeas_to_report = 8;
       static_nbmeas_ctrl_d  = 0;
       static_nbmeas_ctrl_dd = 0;
-
-            	switch(static_nbmeas_to_report)
-	        	{
-	  			case 1:     num_pm[0]=1;
-	        				num_pm[1]=0;
-	        				num_pm[2]=0;
-	        				num_pm[3]=0;
-                  num_pm_frames = 1;
-	        				break;
-	  			case 2:	    num_pm[0]=1;
-	        				num_pm[1]=1;
-	        				num_pm[2]=0;
-	        				num_pm[3]=0;
-                  num_pm_frames = 2;
-	        				break;
-	  			case 3:     num_pm[0]=1;
-	        			 	num_pm[1]=1;
-	        				num_pm[2]=1;
-	        				num_pm[3]=0;
-                  num_pm_frames = 3;
-	        				break;
-	  			case 4:     num_pm[0]=1;
-	        				num_pm[1]=1;
-	        				num_pm[2]=1;
-	        				num_pm[3]=1;
-                  num_pm_frames = 4;
-	        				break;
-	  			case 5:     num_pm[0]=2;
-	        				num_pm[1]=1;
-	        				num_pm[2]=1;
-	        				num_pm[3]=1;
-                  num_pm_frames = 4;
-	        				break;
-	  			case 6:     num_pm[0]=2;
-	        				num_pm[1]=2;
-	        				num_pm[2]=1;
-	        				num_pm[3]=1;
-                  num_pm_frames = 4;
-	        				break;
-	  			case 7:     num_pm[0]=2;
-	        				num_pm[1]=2;
-	        				num_pm[2]=2;
-	        				num_pm[3]=1;
-                  num_pm_frames = 4;
-	        				break;
-	  		}
-	  	#if (FF_L1_FAST_DECODING == 1)
-	        	switch(static_nbmeas_to_report)
-	        	{
-	  			case 1:     num_pm_fp[0]=1;
-	        				num_pm_fp[1]=0;
-                  num_pm_frames = 1;
-	        				break;
-	  			case 2:     num_pm_fp[0]=1;
-	        				num_pm_fp[1]=1;
-                  num_pm_frames = 2;
-	        				break;
-	  			case 3:     num_pm_fp[0]=2;
-	        				num_pm_fp[1]=1;
-                  num_pm_frames = 2;
-	        				break;
-	  			case 4:     num_pm_fp[0]=3;
-	        				num_pm_fp[1]=1;
-                  num_pm_frames = 2;
-	        				break;
-	  			case 5:     num_pm_fp[0]=4;
-	        				num_pm_fp[1]=1;
-                  num_pm_frames = 2;
-	        				break;
-	  			case 6:     num_pm_fp[0]=4;
-	        				num_pm_fp[1]=2;
-                  num_pm_frames = 2;
-	        				break;
-	  			case 7:     num_pm_fp[0]=4;
-	        				num_pm_fp[1]=3;
-                  num_pm_frames = 2;
-	        				break;
-	  		}
-	  	#endif
-
-
     }
 
     // A PCH burst has been controled, we must make the control of 1 or 2 new measurements.
-   #if (FF_L1_FAST_DECODING == 1)
-    schedule_measures = FALSE;
-
-    if ( (fast_decoding == TRUE)
-         &&
-         ( (l1a_l1s_com.ba_list.np_ctrl == 1) ||
-           (l1a_l1s_com.ba_list.np_ctrl == 2) )
-       )
-    {
-      /* Fast decoding enabled, current NP control on bursts 1 or 2 */
-      #if (GSM_IDLE_RAM!=1)
-      if (pch_msg != NULL)
-      #endif
-      {
-     
-      schedule_measures = TRUE;
-    }
-    }
-    else
-    if ( (fast_decoding == FALSE)
-         &&
-         ( (num_pm[l1a_l1s_com.ba_list.np_ctrl-1]!=0) && ((l1a_l1s_com.ba_list.np_ctrl >=1) && (l1a_l1s_com.ba_list.np_ctrl<=4)))
-       )
-    {
-      /* Fast decoding disabled, use legacy condition to schedule up to
-         2 power measurements */
-      #if (GSM_IDLE_RAM!=1)
-      if (pch_msg != NULL)
-      #endif
-      {
-
-      schedule_measures = TRUE;
-    }
-    }
-
-    if (schedule_measures == TRUE)
-#else /* #if (FF_L1_FAST_DECODING == 1) */
-    #if (GSM_IDLE_RAM!=1)      
-      if ((num_pm[l1a_l1s_com.ba_list.np_ctrl-1]!=0) && (pch_msg != NULL) && ((l1a_l1s_com.ba_list.np_ctrl >=1) && (l1a_l1s_com.ba_list.np_ctrl<=4)))
-    #else    
-    if( (num_pm[l1a_l1s_com.ba_list.np_ctrl-1]!=0) && ((l1a_l1s_com.ba_list.np_ctrl >=1) && (l1a_l1s_com.ba_list.np_ctrl<=4)))
-    #endif    
-#endif /* #if (FF_L1_FAST_DECODING == 1) #else*/
+    if ((static_ctrl_index == (l1a_l1s_com.ba_list.np_ctrl-1)*2) ||
+        (static_ctrl_index == (l1a_l1s_com.ba_list.np_ctrl-1)*2 - 1))
     {
       UWORD16  radio_freq_ctrl;
       UWORD8   ba_index_ctrl;
@@ -6311,44 +6129,12 @@
       // if YES only one PW measurement will be controlled and the number of meas to report is decremented by 1
       if (l1s.tpu_win >= (3 * BP_SPLIT + l1_config.params.tx_ra_load_split + l1_config.params.rx_synth_load_split))
       {
+        static_nbmeas_to_report--;
         nbmeas_ctrl = 1;
-        #if (FF_L1_FAST_DECODING == 1)
-        if (fast_decoding == TRUE)
-        {
-	       if(static_nbmeas_to_report > 5)
-	       static_nbmeas_to_report = 5;
-
-			if(l1a_l1s_com.ba_list.np_ctrl == 1)
-		  {
-		      	update_num_pm_fp_table_for_rach(static_nbmeas_to_report,num_pm_fp);
-		  }
-	   	}
-	   	else
-	   	{
-
-			    update_num_pm_table_for_rach(static_nbmeas_to_report,num_pm);
-
-		}
-		#else
-
-				update_num_pm_table_for_rach(static_nbmeas_to_report,num_pm);
-
-		#endif
       }
       else
       {
-       #if (FF_L1_FAST_DECODING == 1)
-        if (fast_decoding)
-        {
-        nbmeas_ctrl = num_pm_fp[l1a_l1s_com.ba_list.np_ctrl-1];
-        }
-        else
-        {
-          nbmeas_ctrl = num_pm[l1a_l1s_com.ba_list.np_ctrl-1];
-        }
-#else /* #if (FF_L1_FAST_DECODING == 1) */
-        nbmeas_ctrl = num_pm[l1a_l1s_com.ba_list.np_ctrl-1];
-#endif /* #if (FF_L1_FAST_DECODING == 1) #else */
+        nbmeas_ctrl = 2;
       }  /* end else no RACH */
 
       for(i=0; i<nbmeas_ctrl; i++)
@@ -6364,9 +6150,9 @@
 
 #if (L1_FF_MULTIBAND == 0)
 
+        // Get AGC according to the last known IL.
+        agc     = Cust_get_agc_from_IL(radio_freq_ctrl, l1a_l1s_com.last_input_level[radio_freq_ctrl - l1_config.std.radio_freq_index_offset].input_level >> 1, PWR_ID);
         lna_off = l1a_l1s_com.last_input_level[radio_freq_ctrl - l1_config.std.radio_freq_index_offset].lna_off;
-        // Get AGC according to the last known IL.
-        agc     = Cust_get_agc_from_IL(radio_freq_ctrl, l1a_l1s_com.last_input_level[radio_freq_ctrl - l1_config.std.radio_freq_index_offset].input_level >> 1, PWR_ID,lna_off);
 
         // Memorize the IL used for AGC setting.
         l1a_l1s_com.ba_list.used_il[i]  = l1a_l1s_com.last_input_level[radio_freq_ctrl - l1_config.std.radio_freq_index_offset].input_level;
@@ -6380,7 +6166,7 @@
        lna_off = l1a_l1s_com.last_input_level[operative_radio_freq].lna_off;
         // Get AGC according to the last known IL.
         agc     = 
-            Cust_get_agc_from_IL(radio_freq_ctrl, l1a_l1s_com.last_input_level[operative_radio_freq].input_level >> 1, PWR_ID,lna_off);
+            Cust_get_agc_from_IL(radio_freq_ctrl, l1a_l1s_com.last_input_level[operative_radio_freq].input_level >> 1, PWR_ID);
 
         // Memorize the IL used for AGC setting.
         l1a_l1s_com.ba_list.used_il[i]  = 
@@ -6546,9 +6332,8 @@
       #endif
 
       // Read power measurement result from DSP.
-      pm = (l1s_dsp_com.dsp_db_r_ptr->a_pm[0] & 0xffff);
+      pm = (l1s_dsp_com.dsp_db_r_ptr->a_pm[0] & 0xffff) >> 5;
       l1_check_pm_error(pm, D_BA_MEAS_ID);
-      pm = pm >> 5;
 
       #if (TRACE_TYPE==3)
         stats_samples_pm(pm);
@@ -6601,8 +6386,8 @@
 
 #if (L1_FF_MULTIBAND == 0)  
 
+          agc     = Cust_get_agc_from_IL(radio_freq_ctrl, l1a_l1s_com.last_input_level[radio_freq_ctrl - l1_config.std.radio_freq_index_offset].input_level >> 1, PWR_ID);
           lna_off = l1a_l1s_com.last_input_level[radio_freq_ctrl - l1_config.std.radio_freq_index_offset].lna_off;
-          agc     = Cust_get_agc_from_IL(radio_freq_ctrl, l1a_l1s_com.last_input_level[radio_freq_ctrl - l1_config.std.radio_freq_index_offset].input_level >> 1, PWR_ID, lna_off);
 
 
           // Store IL used for current CTRL in order to be able to build IL from pm
@@ -6618,7 +6403,7 @@
           lna_off = 
             l1a_l1s_com.last_input_level[operative_radio_freq].lna_off;
           agc     = 
-            Cust_get_agc_from_IL(radio_freq_ctrl, l1a_l1s_com.last_input_level[operative_radio_freq].input_level >> 1, PWR_ID, lna_off);
+            Cust_get_agc_from_IL(radio_freq_ctrl, l1a_l1s_com.last_input_level[operative_radio_freq].input_level >> 1, PWR_ID);
 
 
           // Store IL used for current CTRL in order to be able to build IL from pm
@@ -6721,8 +6506,8 @@
 
 #if (L1_FF_MULTIBAND == 0)
           
+          agc     = Cust_get_agc_from_IL(radio_freq_ctrl, l1a_l1s_com.last_input_level[radio_freq_ctrl - l1_config.std.radio_freq_index_offset].input_level >> 1, PWR_ID);
           lna_off = l1a_l1s_com.last_input_level[radio_freq_ctrl - l1_config.std.radio_freq_index_offset].lna_off;
-          agc     = Cust_get_agc_from_IL(radio_freq_ctrl, l1a_l1s_com.last_input_level[radio_freq_ctrl - l1_config.std.radio_freq_index_offset].input_level >> 1, PWR_ID,lna_off);
 
           // Store IL used for current CTRL in order to be able to build IL from pm
           // in READ phase.
@@ -6736,7 +6521,7 @@
           lna_off = 
             l1a_l1s_com.last_input_level[operative_radio_freq].lna_off;
           agc     = 
-            Cust_get_agc_from_IL(radio_freq_ctrl, l1a_l1s_com.last_input_level[operative_radio_freq].input_level >> 1, PWR_ID,lna_off);
+            Cust_get_agc_from_IL(radio_freq_ctrl, l1a_l1s_com.last_input_level[operative_radio_freq].input_level >> 1, PWR_ID);
 
           // Store IL used for current CTRL in order to be able to build IL from pm
           // in READ phase.
@@ -7391,10 +7176,12 @@
       || (  l1a_l1s_com.dedic_set.SignalCode == MPHC_CHANGE_FREQUENCY)  )
   // A new channel is given in fset...
   {
-    // Reset DTX AMR status
-#if (AMR == 1)
-    l1s.dtx_amr_dl_on=FALSE;
-#endif
+    #if 0	/* FreeCalypso TCS211 reconstruction */
+      // Reset DTX AMR status
+      #if (AMR == 1)
+        l1s.dtx_amr_dl_on=FALSE;
+      #endif
+    #endif
     // When a Dedicated mode request is pending, L1S must be ran every frame
     // to be able to cope with STI.
     l1a_l1s_com.time_to_next_l1s_task = 0;
@@ -7520,11 +7307,10 @@
         l1a_l1s_com.dedic_set.stop_tch = TRUE;
 
 	/*
-	 * FreeCalypso change: this module was failing to compile without
-	 * AUDIO_TASK enabled because of the following code;
-	 * conditional has been added.
+	 * FreeCalypso TCS211 reconstruction: the following code
+	 * appears to be a LoCosto-ism, so let's take it out.
 	 */
-      #if AUDIO_TASK
+      #if 0
         // If audio enabling was forced by L1S because of a HO failure, do not force it anymore.
         // Restore it in the state required by the MMI if the feature is compiled.
         if (l1a_l1s_com.audio_forced_by_l1s == TRUE)
@@ -7633,14 +7419,14 @@
             // AMR NSYNC bit: set to 0 by load_amr_param, set to 1 if HO from AMR cell to AMR cell, reset by DSP
             if ( (current_channel_mode == TCH_AFS_MODE) || (current_channel_mode == TCH_AHS_MODE) )
             {
-#if (FF_L1_TCH_VOCODER_CONTROL == 1)
+            #if (FF_L1_TCH_VOCODER_CONTROL == 1)
               if(l1a_l1s_com.dedic_set.vocoder_on == TRUE)
               {
                 l1s_dsp_com.dsp_ndb_ptr->a_amr_config[NSYNC_INDEX] |= (1 << NSYNC_SHIFT);
               }
-#else
+            #else
               l1s_dsp_com.dsp_ndb_ptr->a_amr_config[NSYNC_INDEX] |= (1 << NSYNC_SHIFT);
-#endif
+            #endif
             }
           #endif
 
@@ -7816,67 +7602,25 @@
   // All channel must be aborted...
   {
     // Perform the functions below if there is active dedicated set.
-	// This check is to take care of race condition which can happen
-	// if MPHC_STOP_DEDICATED_REQ is receivedm before MPHC_HANDOVER_FAIL_REQ
-	if (l1a_l1s_com.dedic_set.aset!=NULL)
-	{
-
-    // Stop TCH/F and TCH/H (stop Omega) (used in SYNCHRO task).
-    UWORD8 channel_type = l1a_l1s_com.dedic_set.aset->chan1.desc.channel_type;
-    if((channel_type == TCH_F) || (channel_type == TCH_H))
+    // This check is to take care of race condition which can happen
+    // if MPHC_STOP_DEDICATED_REQ is receivedm before MPHC_HANDOVER_FAIL_REQ
+#if 0	/* FreeCalypso TCS211 reconstruction */
+    if (l1a_l1s_com.dedic_set.aset!=NULL)
     {
-      l1a_l1s_com.dedic_set.stop_tch = TRUE;
-
-      /* FreeCalypso change: same situation as earlier in this function */
-    #if AUDIO_TASK
-      // If audio enabling was forced by L1S because of a HO failure, do not force it anymore.
-      // Restore it in the state required by the MMI if the feature is compiled.
-      if (l1a_l1s_com.audio_forced_by_l1s == TRUE)
-      {
-      #if (L1_EXTERNAL_AUDIO_VOICE_ONOFF == 1)
-        if (l1a_l1s_com.audio_onoff_task.parameters.onoff_value == FALSE)
+#endif
+
+      // Stop TCH/F and TCH/H (stop Omega) (used in SYNCHRO task).
+      UWORD8 channel_type = l1a_l1s_com.dedic_set.aset->chan1.desc.channel_type;
+      if((channel_type == TCH_F) || (channel_type == TCH_H))
+      {
+        l1a_l1s_com.dedic_set.stop_tch = TRUE;
+
+        /* FreeCalypso change: same situation as earlier in this function */
+      #if 0
+        // If audio enabling was forced by L1S because of a HO failure, do not force it anymore.
+        // Restore it in the state required by the MMI if the feature is compiled.
+        if (l1a_l1s_com.audio_forced_by_l1s == TRUE)
         {
-          l1s_dsp_com.dsp_ndb_ptr->d_toneskb_init |= (API) B_AUDIO_OFF_STOP;
-        }
-      #else // L1_EXTERNAL_AUDIO_VOICE_ONOFF
-        l1s_dsp_com.dsp_ndb_ptr->d_toneskb_init |= (API) B_AUDIO_OFF_STOP;
-      #endif // L1_EXTERNAL_AUDIO_VOICE_ONOFF
-        l1a_l1s_com.audio_forced_by_l1s = FALSE;
-      }
-    #endif
-
-   #if (AMR == 1)
-      // Reset DTX AMR status
-      l1s.dtx_amr_dl_on=FALSE;
-   #endif
-
-    }
-
-    // Clear ciphering setting in MCU-DSP com.
-    l1ddsp_load_ciph_param(0, &(l1a_l1s_com.dedic_set.aset->ciph_key));
-
-    // Reset the global dedicated enable flag.
-    l1a_l1s_com.l1s_en_task[DEDIC] = TASK_DISABLED;
-    l1a_l1s_com.l1s_en_task[DDL]   = TASK_DISABLED;
-    l1a_l1s_com.l1s_en_task[DUL]   = TASK_DISABLED;
-    l1a_l1s_com.l1s_en_task[ADL]   = TASK_DISABLED;
-    l1a_l1s_com.l1s_en_task[AUL]   = TASK_DISABLED;
-    l1a_l1s_com.l1s_en_task[TCHTH] = TASK_DISABLED;
-    l1a_l1s_com.l1s_en_task[TCHD]  = TASK_DISABLED;
-    l1a_l1s_com.l1s_en_task[TCHTF] = TASK_DISABLED;
-    l1a_l1s_com.l1s_en_task[TCHA]  = TASK_DISABLED;
-
-
-    // Reset active dedicated set.
-    l1a_l1s_com.dedic_set.aset = NULL;
-
-  }
-  else
-  {
-    /* FreeCalypso change: same AUDIO_TASK situation as earlier */
-    #if AUDIO_TASK
-      if (l1a_l1s_com.audio_forced_by_l1s == TRUE)
-      {
         #if (L1_EXTERNAL_AUDIO_VOICE_ONOFF == 1)
           if (l1a_l1s_com.audio_onoff_task.parameters.onoff_value == FALSE)
           {
@@ -7885,32 +7629,77 @@
         #else // L1_EXTERNAL_AUDIO_VOICE_ONOFF
           l1s_dsp_com.dsp_ndb_ptr->d_toneskb_init |= (API) B_AUDIO_OFF_STOP;
         #endif // L1_EXTERNAL_AUDIO_VOICE_ONOFF
-        l1a_l1s_com.audio_forced_by_l1s = FALSE;
-      }
-    #endif
-    #if (AMR == 1)
-      // Reset DTX AMR status
-      l1s.dtx_amr_dl_on=FALSE;
-    #endif
-  }
-
-  // Clear d_ra_conf => default value
-  l1s_dsp_com.dsp_ndb_ptr->d_ra_conf = 0;
-
-  // Reset input msg.
-  l1a_l1s_com.dedic_set.SignalCode = NULL;
- #if ((REL99 == 1) && (FF_BHO == 1))
-    // this is required in BHO as you need to retain the previous channel info.
-    //This is checked in HO_REQ to L1S.....In normal handover this does not happen
-    if(l1a_l1s_com.dedic_set.handover_type == NORMAL_HANDOVER)
+          l1a_l1s_com.audio_forced_by_l1s = FALSE;
+        }
+      #endif
+
+      #if (AMR == 1)
+        // Reset DTX AMR status
+        l1s.dtx_amr_dl_on=FALSE;
+      #endif
+
+      }
+
+      // Clear d_ra_conf => default value
+      l1s_dsp_com.dsp_ndb_ptr->d_ra_conf = 0;
+
+      // Clear ciphering setting in MCU-DSP com.
+      l1ddsp_load_ciph_param(0, &(l1a_l1s_com.dedic_set.aset->ciph_key));
+
+      // Reset the global dedicated enable flag.
+      l1a_l1s_com.l1s_en_task[DEDIC] = TASK_DISABLED;
+      l1a_l1s_com.l1s_en_task[DDL]   = TASK_DISABLED;
+      l1a_l1s_com.l1s_en_task[DUL]   = TASK_DISABLED;
+      l1a_l1s_com.l1s_en_task[ADL]   = TASK_DISABLED;
+      l1a_l1s_com.l1s_en_task[AUL]   = TASK_DISABLED;
+      l1a_l1s_com.l1s_en_task[TCHTH] = TASK_DISABLED;
+      l1a_l1s_com.l1s_en_task[TCHD]  = TASK_DISABLED;
+      l1a_l1s_com.l1s_en_task[TCHTF] = TASK_DISABLED;
+      l1a_l1s_com.l1s_en_task[TCHA]  = TASK_DISABLED;
+
+#if 0	/* FreeCalypso TCS211 reconstruction */
+    }
+    else
     {
+      /* FreeCalypso change: same AUDIO_TASK situation as earlier */
+      #if 0
+        if (l1a_l1s_com.audio_forced_by_l1s == TRUE)
+        {
+          #if (L1_EXTERNAL_AUDIO_VOICE_ONOFF == 1)
+            if (l1a_l1s_com.audio_onoff_task.parameters.onoff_value == FALSE)
+            {
+              l1s_dsp_com.dsp_ndb_ptr->d_toneskb_init |= (API) B_AUDIO_OFF_STOP;
+            }
+          #else // L1_EXTERNAL_AUDIO_VOICE_ONOFF
+            l1s_dsp_com.dsp_ndb_ptr->d_toneskb_init |= (API) B_AUDIO_OFF_STOP;
+          #endif // L1_EXTERNAL_AUDIO_VOICE_ONOFF
+          l1a_l1s_com.audio_forced_by_l1s = FALSE;
+        }
+      #endif
+      #if (AMR == 1)
+        // Reset DTX AMR status
+        l1s.dtx_amr_dl_on=FALSE;
+      #endif
+
+      // Clear d_ra_conf => default value
+      l1s_dsp_com.dsp_ndb_ptr->d_ra_conf = 0;
+    }
+#endif	/* FreeCalypso TCS211 reconstruction */
+
+    // Reset input msg.
+    l1a_l1s_com.dedic_set.SignalCode = NULL;
+    #if ((REL99 == 1) && (FF_BHO == 1))
+      // this is required in BHO as you need to retain the previous channel info.
+      //This is checked in HO_REQ to L1S.....In normal handover this does not happen
+      if(l1a_l1s_com.dedic_set.handover_type == NORMAL_HANDOVER)
+      {
+        // Reset active dedicated set.
+        l1a_l1s_com.dedic_set.aset = NULL;
+      }
+    #else
       // Reset active dedicated set.
       l1a_l1s_com.dedic_set.aset = NULL;
-    }
-  #else
-      // Reset active dedicated set.
-      l1a_l1s_com.dedic_set.aset = NULL;
-  #endif
+    #endif
 
     // SYNCHRO task and its associated parameters (tn_difference, dl_tn and
     // dsp_scheduler_mode) are not Enabled/Updated if we are in the specific case:
@@ -8195,7 +7984,7 @@
 	/*
 	 * FreeCalypso change: same AUDIO_TASK conditional issue as earlier.
 	 */
-	#if AUDIO_TASK
+	#if 0
           // CQ: Force the Audio ON to avoid having the DSP reseting the VDLON and producing a pop noise
           // on single ended outputs.
           l1s_dsp_com.dsp_ndb_ptr->d_toneskb_init |= (API) B_AUDIO_ON_START;
@@ -8204,6 +7993,19 @@
 	#endif
         }
 
+	/*
+	 * FreeCalypso: the following code has been reconstructed from the
+	 * TCS211 binary object; it appears neither in the LoCosto nor
+	 * in the TSM30 source.
+	 */
+        #if (AEC)
+	  if((l1s.aec.aec_control & 0x0002) || (l1s.aec.aec_control & 0x0004)) {
+	    l1s.aec.aec_control = l1a_l1s_com.aec_task.parameters.aec_control
+				  | 0x0001;
+	    l1s_dsp_com.dsp_ndb_ptr->d_aec_ctrl = l1s.aec.aec_control;
+	  }
+        #endif
+
         // Clear ciphering setting in MCU-DSP com.
         l1ddsp_load_ciph_param(0, &(l1a_l1s_com.dedic_set.aset->ciph_key));
 
@@ -8537,233 +8339,3 @@
 //#pragma DUPLICATE_FOR_INTERNAL_RAM_END
 #endif // MOVE_IN_INTERNAL_RAM
 
-
-/* Added temporirly for RF_KEypad build */
-#if (L1_RF_KBD_FIX == 1)
-
-#if(OP_L1_STANDALONE == 1)
-
-/* Modify the KPD timer values */
-void kpd_timer_modify(UWORD8 ratio,UWORD32 frameNumber)
-{
-  UWORD32 debounce_time, long_key_time, timeout_time, temp_count, local_ratio;
-  WORD32 ptv_value;
-  UWORD16 keypad_state;
-
-  keypad_state = ((*(volatile UINT16*) KBR_STATE_MACHINE_STATUS) & 0x0f);
-
-  debounce_time = (*(volatile UINT16*) KBR_DEBOUNCING_TIME) & 0x3f;
-  local_ratio = KPD_DEBOUNCING_TIME / debounce_time;
-
-  if( keypad_state == 2 || keypad_state == 3 || keypad_state == 4)
-  {
-	ptv_value = KPD_CLOCK_DIVIDER;
-
-	if( ratio > 1)
-	{
-	    if( ratio % 2)
-     	    {
-         	ratio += 1;
-     	    }
-     	    if( !ratio )
-		ratio = 2;
-
-     	    for(temp_count = 0; ratio > 1 && temp_count < 7; temp_count++)
-     	    {
-		ratio /= 2;
-     	    }
-
-	    ptv_value -= temp_count;
-	}
-
-	if( local_ratio > 1)
-	{
-		if( ratio % 2)
-     		{
-         		ratio += 1;
-     		}
-     		if( !ratio )
-			ratio = 2;
-
-     		for(temp_count = 0; ratio > 1 && temp_count < 7; temp_count++)
-     		{
-			ratio /= 2;
-     		}
-
-		ptv_value += temp_count;
-	}
-
-	if( ptv_value < 0)
-		ptv_value = 0;
-
-	/* Change the PTV value */
-     	SetGroupBits16(*(volatile unsigned short *)(KBR_CTRL_REG), 2, 3, ptv_value);
-  }
-  else
-  {
-
-	debounce_time = ((*(volatile UINT16*) KBR_DEBOUNCING_TIME) & 0x3f) * local_ratio;
-  	long_key_time = ((*(volatile UINT16*)KBR_LONG_KEY_TIME) & 0xfff) * local_ratio;
-  	timeout_time = (*(volatile UINT16*) KBR_TIME_OUT) * local_ratio;
-//	kpd_env_ctrl_blk->long_time *= local_ratio;
-//        kpd_env_ctrl_blk->repeat_time *= local_ratio;
-        ptv_value = ((*(volatile UINT16*) KBR_CTRL_REG) &  0x1c) >> 2;
-
-	if( ptv_value != KPD_CLOCK_DIVIDER)
-	{
-		/* Change the PTV value */
-     		SetGroupBits16(*(volatile unsigned short *)(KBR_CTRL_REG), 2, 3, KPD_CLOCK_DIVIDER);
-	}
-
-	if( ratio > 0 )
-	{
-		(*(volatile UINT16*) KBR_DEBOUNCING_TIME) = debounce_time / ratio;
-		(*(volatile UINT16*) KBR_LONG_KEY_TIME) = long_key_time / ratio;
-		(*(volatile UINT16*)KBR_TIME_OUT) = timeout_time / ratio;
-//		kpd_env_ctrl_blk->long_time /= ratio;
-//		kpd_env_ctrl_blk->repeat_time /= ratio;
-	}
-  }
-
-}
-
-
-void kpd_state_probe(UWORD32 frameNumber)
-{
-	// not used in stand alone
-}
-
-#endif
-
-#endif/* #if (L1_RF_KBD_FIX == 1) */
-
-/* Added temporirly for RF_KEypad build */
-
-
-
-//This function calculates and returns the number of PM to scheduled during page block monitor
-UWORD8 calc_num_pm_to_report()
-{
-	UWORD8 time_for_balist_meas;
-	UWORD8 num_pms_drx;
-
-	time_for_balist_meas = ((((((5*l1a_l1s_com.ba_list.nbr_carrier)+6)/7)*l1a_l1s_com.bs_pa_mfrms /4)+1) > 5)?(((((5*l1a_l1s_com.ba_list.nbr_carrier)+6)/7)*l1a_l1s_com.bs_pa_mfrms /4)+1):5;
-
-	if(time_for_balist_meas == 5)
-	{
-		num_pms_drx = ((5*l1a_l1s_com.ba_list.nbr_carrier*l1a_l1s_com.bs_pa_mfrms*51*577*8)/(time_for_balist_meas*1000*1000))+1;
-	}
-	else
-	{
-		num_pms_drx = ((5*l1a_l1s_com.ba_list.nbr_carrier*28*51*577*8)/(((5*l1a_l1s_com.ba_list.nbr_carrier)+6)*1000*1000))+1;
-    }
-
-    return(num_pms_drx);
-}
-
-
-
-void update_num_pm_fp_table_for_rach(UWORD8 nbmeas,UWORD8 *p)
-{
-
-	switch(nbmeas)
-	{
-		case 1:
-		case 2: break;
-		case 3: p[0]=1;
-	      		p[1]=2;
-	      		break;
-		case 4: p[0]=1;
-	      		p[1]=3;
-	      		break;
-		case 5: p[0]=1;
-	      		p[1]=4;
-	      		break;
-		case 6: p[0]=1;
-	      		p[1]=4;
-	      		break;
-		case 7: p[0]=1;
-	      		p[1]=4;
-	      		break;
-	 }
-
-}
-
-
-
-void update_num_pm_table_for_rach(UWORD8 nbmeas,UWORD8 *p)
-{
-	  switch(nbmeas)
-	  {
-		case 1:
-		case 2:
-		case 3:
-		case 4: break;
-		case 5: if(l1a_l1s_com.ba_list.np_ctrl == 1)
-		        {
-		        	p[0]=1;
-					p[1]=2;
-					p[2]=1;
-					p[3]=1;
-				}
-				else if(l1a_l1s_com.ba_list.np_ctrl == 2)
-				{
-					p[0]=2;
-					p[1]=1;
-					p[2]=1;
-				    p[3]=1;
-				}
-				else if(l1a_l1s_com.ba_list.np_ctrl == 3)
-				{
-					p[0]=2;
-					p[1]=1;
-					p[2]=1;
-				    p[3]=1;
-				}
-				break;
-		case 6: if(l1a_l1s_com.ba_list.np_ctrl == 1)
-		        {
-		        	p[0]=1;
-					p[1]=2;
-					p[2]=2;
-					p[3]=1;
-				}
-				else if(l1a_l1s_com.ba_list.np_ctrl == 2)
-				{
-					p[0]=2;
-					p[1]=1;
-					p[2]=2;
-				    p[3]=1;
-				}
-				else if(l1a_l1s_com.ba_list.np_ctrl == 3)
-				{
-					p[0]=2;
-					p[1]=2;
-					p[2]=1;
-				    p[3]=1;
-				}
-				break;
-		case 7: if(l1a_l1s_com.ba_list.np_ctrl == 1)
-				{
-					p[0]=1;
-					p[1]=2;
-					p[2]=2;
-					p[3]=2;
-				}
-				else if(l1a_l1s_com.ba_list.np_ctrl == 2)
-				{
-					p[0]=2;
-					p[1]=1;
-					p[2]=2;
-				    p[3]=2;
-				}
-				else if(l1a_l1s_com.ba_list.np_ctrl == 3)
-				{
-					p[0]=2;
-					p[1]=2;
-					p[2]=1;
-				    p[3]=2;
-				}
-				break;
-	  }
-}
--- a/L1/cfile/l1_trace.c	Thu Jun 09 05:38:18 2016 +0000
+++ b/L1/cfile/l1_trace.c	Thu Jun 09 05:45:03 2016 +0000
@@ -10,11 +10,13 @@
 #define  L1_TRACE_C
 
 //#pragma DUPLICATE_FOR_INTERNAL_RAM_START
-
-#include "config.h"
-
+#include "l1sw.cfg"
+#if (OP_L1_STANDALONE == 0)
+  #include "debug.cfg"
+#endif
+
+#include "l1_macro.h"
 #include "l1_confg.h"
-#include "l1_macro.h"
 
 #include <string.h>
 #include "l1_types.h"
@@ -64,14 +66,14 @@
 #endif
 
 #include "l1_defty.h"
-#include "../../gpf/inc/cust_os.h"
+#include "cust_os.h"
 #include "l1_msgty.h"
 #include "l1_varex.h"
 #include "l1_proto.h"
 #include "l1_mftab.h"
 #include "l1_tabs.h"
 #include "l1_ver.h"
-#include "../../bsp/ulpd.h"
+#include "ulpd.h"
 
 #if TESTMODE
   #include "l1tm_msgty.h"
@@ -79,12 +81,12 @@
   #include "l1tm_varex.h"
 #endif
 
-#include "../../bsp/mem.h"
+#include "mem.h"
 #if ( CHIPSET == 12 ) || (CHIPSET == 15)
    #include "sys_inth.h"
 #else
-   #include "../../bsp/iq.h"
-   #include "../../bsp/inth.h"
+   #include "iq.h"
+   #include "inth.h"
 #endif
 
 #if L1_GPRS
@@ -104,16 +106,21 @@
 #include <string.h>
 #include <stdio.h>
 
-#include "../../serial/serialswitch.h"
-#include "../../riviera/rv/rv_trace.h"
-#include "../../riviera/rvf/rvf_api.h"
+#if (OP_L1_STANDALONE == 1)
+  #include "serialswitch_core.h"
+#else
+  #include "uart/serialswitch.h"
+#endif
 
 //void dt_trace_event(UWORD16 id, char *fmt_string, ...);
 #if (TRACE_TYPE==7)
-  #include "../../bsp/timer2.h"
-#endif
-
+  #include "timer2.h"
+#endif
+
+#if 0	/* FreeCalypso: LoCosto junk removed */
 unsigned int x,y,fer_sacch ,dl_good_norep;
+#endif
+
 extern UWORD16 toa_tab[4];
 
 #if (TRACE_TYPE == 1) || (TRACE_TYPE == 4)  || (TRACE_TYPE == 7)
@@ -121,7 +128,7 @@
 #endif
 #if FF_TBF
   #if ((TRACE_TYPE==1) || (TRACE_TYPE == 4))
-    #include "../../bsp/armio.h" // for GPIO toggle
+    #include "armio.h" // for GPIO toggle
   #endif
 #endif
 
@@ -147,7 +154,9 @@
     extern T_TRACE_INFO_STRUCT trace_info;
   void l1_trace_configuration(T_RVT_BUFFER trace_msg, UINT16 trace_msg_size);
   void l1_send_trace_version();
-  void l1_trace_full_dsp_buffer( void );
+  #if 0	/* FreeCalypso TCS211 reconstruction */
+    void l1_trace_full_dsp_buffer( void );
+  #endif
 
   #if L1_BINARY_TRACE
     #define L1_send_trace_cpy(s,length)    rvt_send_trace_cpy       ((T_RVT_BUFFER) s, trace_info.l1_trace_user_id, (T_RVT_MSG_LG)length, RVT_BINARY_FORMAT)
@@ -165,20 +174,22 @@
   #include "l1_trace.h"
 
     extern T_TRACE_INFO_STRUCT trace_info;
-#endif //(TRACE_TYPE == 5)
+  #endif //(TRACE_TYPE == 5)
 
 #if (TRACE_TYPE == 1)
-  #include "../../bsp/timer2.h"
+  #include "timer2.h"
 
   // Variables for L1S CPU load measurement
   extern unsigned long        max_cpu, fn_max_cpu;
   extern unsigned short       layer_1_sync_end_time;
   extern unsigned short       max_cpu_flag;
 
-  // Variables for DSP CPU load measurement
-  extern unsigned short       l1_dsp_cpu_load_trace_flag;
-  extern UWORD32              dsp_max_cpu_load_trace_array[4];
-  extern UWORD32              dsp_max_cpu_load_idle_frame;
+  #if 0	/* FreeCalypso */
+    // Variables for DSP CPU load measurement
+    extern unsigned short       l1_dsp_cpu_load_trace_flag;
+    extern UWORD32              dsp_max_cpu_load_trace_array[4];
+    extern UWORD32              dsp_max_cpu_load_idle_frame;
+  #endif
 #endif // (TRACE_TYPE == 1)
 
 
@@ -186,8 +197,7 @@
 // External variables for internal RAM download trace
 //---------------------------------------------------
 
-/* not applicable to FreeCalypso */
-#if 0 //(( ((CHIPSET !=2 ) ) && ((LONG_JUMP != 0))) || (CHIPSET == 12) || (CHIPSET == 15))
+#if (( ((CHIPSET !=2 ) ) && ((LONG_JUMP != 0))) || (CHIPSET == 12) || (CHIPSET == 15))
   extern UWORD16 d_checksum1;
   extern UWORD16 d_checksum2;
 #endif //(( ((CHIPSET !=2 ) ) && ((LONG_JUMP != 0))) || (CHIPSET == 12))
@@ -200,10 +210,13 @@
   extern UWORD16 layer_1_sync_end_time;
   extern UWORD16 max_cpu_flag;
 
-  // Variables for DSP CPU load measurement
-  extern unsigned short l1_dsp_cpu_load_trace_flag;
-  extern UWORD32        dsp_max_cpu_load_trace_array[4];
-  extern UWORD32        dsp_max_cpu_load_idle_frame;
+  #if 0	/* FreeCalypso */
+    // Variables for DSP CPU load measurement
+    extern unsigned short l1_dsp_cpu_load_trace_flag;
+    extern UWORD32        dsp_max_cpu_load_trace_array[4];
+    extern UWORD32        dsp_max_cpu_load_idle_frame;
+  #endif
+
 //  extern BOOL           l1_trace_enabled;
 #endif //(TRACE_TYPE==4)
 
@@ -293,10 +306,12 @@
    unsigned short       layer_1_sync_end_time;
    unsigned short       max_cpu_flag = 0;
 
-   // Variables for DSP CPU load measurement
-   UWORD32              dsp_max_cpu_load_trace_array[4] = {0L, 0L, 0L, 0L};
-   UWORD32              dsp_max_cpu_load_idle_frame = 0L;
-   unsigned short       l1_dsp_cpu_load_trace_flag = 0;
+   #if 0	/* FreeCalypso */
+     // Variables for DSP CPU load measurement
+     UWORD32              dsp_max_cpu_load_trace_array[4] = {0L, 0L, 0L, 0L};
+     UWORD32              dsp_max_cpu_load_idle_frame = 0L;
+     unsigned short       l1_dsp_cpu_load_trace_flag = 0;
+   #endif
   #endif //(TRACE_TYPE == 1)
 
 //#pragma GSM_IDLE_DUPLICATE_FOR_INTERNAL_RAM_END
@@ -374,13 +389,10 @@
 
 #endif
 
-#if (CODE_VERSION!= SIMULATION)
-#include "l1_pwmgr.h"
-#endif //NOT SIMULATION
-
 
 #if (TRACE_TYPE==1) || (TRACE_TYPE==4) || (TRACE_TYPE==5)
 
+UWORD16 int_id = 0;
 UWORD32 pgoset = 0;
 
 
@@ -408,17 +420,17 @@
   trace_info.facch_dl_count            = 0;
   trace_info.facch_dl_fail_count       = 0;
   trace_info.facch_dl_fail_count_trace = 0;
-#if ( FF_REPEATED_DL_FACCH == 1)
-  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)*/
+  #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.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;
@@ -481,6 +493,7 @@
     intram_trace_size = 0;
   #endif
 
+#if 0	/* FreeCalypso TCS211 reconstruction */
 #if ((TRACE_TYPE==1) || (TRACE_TYPE == 4))
 #if (MELODY_E2 || L1_MP3 || L1_AAC || L1_DYN_DSP_DWNLD)
   trace_info.dsptrace_handler_globals.nested_disable_count = 0;
@@ -488,6 +501,7 @@
   trace_info.dsptrace_handler_globals.dsp_trace_level_copy = 0x0000;
 #endif
 #endif // ((TRACE_TYPE==1) || (TRACE_TYPE == 4))
+#endif
 
   #if (BURST_PARAM_LOG_ENABLE == 1)
     burst_param_log_index = 0;
@@ -505,7 +519,7 @@
 trace_info.prev_saic_flag_val = 2;
 trace_info.prev_swh_flag_val = 2;
 #endif
-#if (CODE_VERSION!=SIMULATION)
+#if 0	/* FreeCalypso TCS211 reconstruction */
   trace_info.pwmgt_trace_var.fail_step  = 0xFF;
   trace_info.pwmgt_trace_var.fail_id    = 0xFF;
   trace_info.pwmgt_trace_var.fail_cause = 0xFF;
@@ -621,5530 +635,11 @@
 
 #if L1_BINARY_TRACE
 
-/*************************************************************************/
-/* Classic trace output                                                  */
-/*************************************************************************/
-
-/*-------------------------------------------------------*/
-/* l1_trace_message()                                    */
-/*-------------------------------------------------------*/
-/* Parameters :                                          */
-/* Return     :                                          */
-/* Description: L1 Trace formatting.                     */
-/*-------------------------------------------------------*/
-void l1_trace_message(xSignalHeaderRec *msg)
-{
-
-  /***********************************************************************/
-  /* Trace configuration                                                 */
-  /***********************************************************************/
-
-  if (msg->SignalCode == TRACE_CONFIG)
-  {
-    char *ptr;
-    T_TRACE_CONFIG *save;
-
-
-    // Download values
-    //----------------
-
-    // Note: RTT values are used in L1S but partial download of these values have no
-    //       negative influence on L1 or Trace behavior
-
-    // First UWORD32 is the classic L1 dynamic trace
-    trace_info.pending_config->l1_dyn_trace = ((T_TRACE_CONFIG_CHANGE *)(msg->SigP))->trace_config;
-
-    // The eight following UWORD32 define the RTT cell configuration
-    trace_info.pending_config->rttl1_cell_enable[0] = ((T_TRACE_CONFIG_CHANGE *)(msg->SigP))->rtt_cell_enable[0];
-    trace_info.pending_config->rttl1_cell_enable[1] = ((T_TRACE_CONFIG_CHANGE *)(msg->SigP))->rtt_cell_enable[1];
-    trace_info.pending_config->rttl1_cell_enable[2] = ((T_TRACE_CONFIG_CHANGE *)(msg->SigP))->rtt_cell_enable[2];
-    trace_info.pending_config->rttl1_cell_enable[3] = ((T_TRACE_CONFIG_CHANGE *)(msg->SigP))->rtt_cell_enable[3];
-    trace_info.pending_config->rttl1_cell_enable[4] = ((T_TRACE_CONFIG_CHANGE *)(msg->SigP))->rtt_cell_enable[4];
-    trace_info.pending_config->rttl1_cell_enable[5] = ((T_TRACE_CONFIG_CHANGE *)(msg->SigP))->rtt_cell_enable[5];
-    trace_info.pending_config->rttl1_cell_enable[6] = ((T_TRACE_CONFIG_CHANGE *)(msg->SigP))->rtt_cell_enable[6];
-    trace_info.pending_config->rttl1_cell_enable[7] = ((T_TRACE_CONFIG_CHANGE *)(msg->SigP))->rtt_cell_enable[7];
-
-    // Last UWORD32 define the RTT event
-    trace_info.pending_config->rttl1_event_enable = ((T_TRACE_CONFIG_CHANGE *)(msg->SigP))->rtt_event;
-
-    // Re-initialize global variables
-    l1_init_trace_var();
-
-    // Switch pointers
-    save = trace_info.current_config;
-    trace_info.current_config = trace_info.pending_config;
-    trace_info.pending_config = save;
-
-    // Trace the configuration change
-    //-------------------------------
-
-    if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_TRACE_CONFIG_CHANGE), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-    {
-
-      ((T_TR_TRACE_CONFIG_CHANGE *)(ptr))->header             = TRL1_TRACE_CONFIG_CHANGE | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-      ((T_TR_TRACE_CONFIG_CHANGE *)(ptr))->trace_config       = trace_info.current_config->l1_dyn_trace ;
-      ((T_TR_TRACE_CONFIG_CHANGE *)(ptr))->rtt_cell_enable[0] = trace_info.current_config->rttl1_cell_enable[0];
-      ((T_TR_TRACE_CONFIG_CHANGE *)(ptr))->rtt_cell_enable[1] = trace_info.current_config->rttl1_cell_enable[1];
-      ((T_TR_TRACE_CONFIG_CHANGE *)(ptr))->rtt_cell_enable[2] = trace_info.current_config->rttl1_cell_enable[2];
-      ((T_TR_TRACE_CONFIG_CHANGE *)(ptr))->rtt_cell_enable[3] = trace_info.current_config->rttl1_cell_enable[3];
-      ((T_TR_TRACE_CONFIG_CHANGE *)(ptr))->rtt_cell_enable[4] = trace_info.current_config->rttl1_cell_enable[4];
-      ((T_TR_TRACE_CONFIG_CHANGE *)(ptr))->rtt_cell_enable[5] = trace_info.current_config->rttl1_cell_enable[5];
-      ((T_TR_TRACE_CONFIG_CHANGE *)(ptr))->rtt_cell_enable[6] = trace_info.current_config->rttl1_cell_enable[6];
-      ((T_TR_TRACE_CONFIG_CHANGE *)(ptr))->rtt_cell_enable[7] = trace_info.current_config->rttl1_cell_enable[7];
-      ((T_TR_TRACE_CONFIG_CHANGE *)(ptr))->rtt_event          = trace_info.current_config->rttl1_event_enable;
-
-      L1_send_trace_no_cpy(ptr,sizeof(T_TR_TRACE_CONFIG_CHANGE));
-
-      return;
-    }
-
-  }
-
-  /***********************************************************************/
-  /* Traces coming from L1S                                              */
-  /***********************************************************************/
-
-  switch(msg->SignalCode)
-  {
-  #if (DSP_DEBUG_TRACE_ENABLE == 1)
-
-    //////////////////////
-    // DSP debug buffer //
-    //////////////////////
-
-    case TRACE_DSP_DEBUG:
-    {
-      WORD16  size  = ((T_DSP_DEBUG_INFO *)(msg->SigP))->size;
-      char *ptr;
-      UWORD8 index = 0;
-
-      // DSP debug header trace: L1 indication to associate with the buffer
-      if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_DSP_DEBUG_HEADER), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-      {
-          ((T_TR_DSP_DEBUG_HEADER *)(ptr))->header         = TRL1_DSP_DEBUG_HEADER | (((T_DSP_DEBUG_INFO *)(msg->SigP))->fn << TR_HEADER_FN_DELAY);
-          ((T_TR_DSP_DEBUG_HEADER *)(ptr))->debug_time     = ((T_DSP_DEBUG_INFO *)(msg->SigP))->debug_time;
-          ((T_TR_DSP_DEBUG_HEADER *)(ptr))->patch_version  = ((T_DSP_DEBUG_INFO *)(msg->SigP))->patch_version;
-          ((T_TR_DSP_DEBUG_HEADER *)(ptr))->trace_level    = ((T_DSP_DEBUG_INFO *)(msg->SigP))->trace_level;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_DSP_DEBUG_HEADER));
-      }
-
-      // DSP debug buffer trace
-      while (size > 0)
-      {
-        UWORD8 item_size = size;
-
-        // Split buffer in several buffers with size inferior to 240 (RVT limitation to 255)
-        // Header not included (+8b)
-        if (item_size > 240) item_size = 240;
-
-        // Buffer size -> add header
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, item_size + sizeof(T_TR_DSP_DEBUG_BUFFER) - sizeof(UWORD16), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-          UWORD8 i;
-
-          ((T_TR_DSP_DEBUG_BUFFER *)(ptr))->header       = TRL1_DSP_DEBUG_BUFFER | (((T_DSP_DEBUG_INFO *)(msg->SigP))->fn << TR_HEADER_FN_DELAY);
-          ((T_TR_DSP_DEBUG_BUFFER *)(ptr))->size         = (item_size >> 1);
-          // First element tells if it's the last msg
-          ((T_TR_DSP_DEBUG_BUFFER *)(ptr))->content[0]   = 0;
-
-          for (i = 1; i < (item_size >> 1); i++)
-          {
-            ((T_TR_DSP_DEBUG_BUFFER *)(ptr))->content[i]   = ((T_DSP_DEBUG_INFO *)(msg->SigP))->buffer[index++];
-          }
-
-          size -= (item_size - 2); // (item_size - 2) bytes of the buffer transmitted
-                                   // -2 because of the first word used for status
-
-          // Indicates it's the last buffer
-          if (size <= 0)
-            ((T_TR_DSP_DEBUG_BUFFER *)(ptr))->content[0]     = 1;
-
-          L1_send_trace_no_cpy(ptr,item_size + sizeof(T_TR_DSP_DEBUG_BUFFER) - sizeof(UWORD16));
-        }
-
-        // No trace buffer available -> cancel trace !
-        else
-        {
-          break;
-        }
-      }
-    }
-    break;
-
-  #endif // DSP_DEBUG_TRACE_ENABLE
-
-  #if (L1_GPRS)
-
-    ///////////////////////////
-    // PDTCH condensed trace //
-    ///////////////////////////
-
-    case TRACE_CONDENSED_PDTCH:
-    {
-      char *ptr;
-
-      if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_CONDENSED_PDTCH), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-      {
-        UWORD8 i,j;
-
-        ((T_TR_CONDENSED_PDTCH *)(ptr))->header             = TRL1_CONDENSED_PDTCH | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-        ((T_TR_CONDENSED_PDTCH *)(ptr))->rx_allocation      = ((T_CONDENSED_PDTCH_INFO *)(msg->SigP))->rx_allocation;
-        ((T_TR_CONDENSED_PDTCH *)(ptr))->tx_allocation      = ((T_CONDENSED_PDTCH_INFO *)(msg->SigP))->tx_allocation;
-        ((T_TR_CONDENSED_PDTCH *)(ptr))->blk_status         = ((T_CONDENSED_PDTCH_INFO *)(msg->SigP))->blk_status;
-        ((T_TR_CONDENSED_PDTCH *)(ptr))->dl_cs_type         = ((T_CONDENSED_PDTCH_INFO *)(msg->SigP))->dl_cs_type;
-        ((T_TR_CONDENSED_PDTCH *)(ptr))->dl_status[0]       = ((T_CONDENSED_PDTCH_INFO *)(msg->SigP))->dl_status[0];
-        ((T_TR_CONDENSED_PDTCH *)(ptr))->dl_status[1]       = ((T_CONDENSED_PDTCH_INFO *)(msg->SigP))->dl_status[1];
-        ((T_TR_CONDENSED_PDTCH *)(ptr))->dl_status[2]       = ((T_CONDENSED_PDTCH_INFO *)(msg->SigP))->dl_status[2];
-        ((T_TR_CONDENSED_PDTCH *)(ptr))->dl_status[3]       = ((T_CONDENSED_PDTCH_INFO *)(msg->SigP))->dl_status[3];
-
-        for (i=0, j=0; (i<8)&&(j<4); i++)
-          if (((T_CONDENSED_PDTCH_INFO *)(msg->SigP))->ul_status[i] != 0)
-          {
-            ((T_TR_CONDENSED_PDTCH *)(ptr))->ul_status[j++] = ((T_CONDENSED_PDTCH_INFO *)(msg->SigP))->ul_status[i];
-          }
-
-        L1_send_trace_no_cpy(ptr,sizeof(T_TR_CONDENSED_PDTCH));
-      }
-    }
-    break;
-
-  #endif // L1_GPRS
-
-    /////////////////
-    // Quick trace //
-    /////////////////
-
-    case QUICK_TRACE:
-    {
-      UWORD8   debug_code = ((T_QUICK_TRACE *)(msg->SigP))->debug_code;
-      char     ptr[200];
-      char    *str   = ((T_TR_ASCII *)(ptr))->str;
-      UWORD32 *param = ((T_QUICK_TRACE *)(msg->SigP))->tab;
-
-      // Fill string in 'str' variable
-      // Parameters included in param[n]
-      switch (debug_code)
-      {
-        case 0:
-        {
-          sprintf(str, "Quick trace example %d", param[0]);
-        }
-        break;
-
-      }
-
-      // Send trace
-      ((T_TR_ASCII *)(ptr))->header = TRL1_ASCII | (((T_QUICK_TRACE *)(msg->SigP))->fn << TR_HEADER_FN_DELAY);
-      ((T_TR_ASCII *)(ptr))->size = strlen(((T_TR_ASCII *)(ptr))->str);
-      L1_send_trace_cpy(ptr,((T_TR_ASCII *)(ptr))->size + 8);
-    }
-    break;
-
-    ////////////////
-    // Debug info //
-    ////////////////
-
-    case TRACE_INFO:
-    {
-      // Read cell ID in the header (first UWORD32)
-      UWORD16 trace_id = *((UWORD32 *)(msg->SigP)) & TR_HEADER_ID_MASK;
-
-      switch(trace_id)
-      {
-        case TRL1_PM_EQUAL_0:
-        {
-          L1_send_trace_cpy(msg->SigP,sizeof(T_TR_PM_EQUAL_0));
-        }
-        break;
-
-        case TRL1_MCU_DSP_MISMATCH:
-        {
-          L1_send_trace_cpy(msg->SigP,sizeof(T_TR_MCU_DSP_MISMATCH));
-        }
-        break;
-
-        case TRL1_L1S_ABORT:
-        {
-          L1_send_trace_cpy(msg->SigP,sizeof(T_TR_L1S_ABORT));
-        }
-        break;
-
-       #if (D_ERROR_STATUS_TRACE_ENABLE)
-        case TRL1_D_ERROR_STATUS:
-        {
-          L1_send_trace_cpy(msg->SigP,sizeof(T_TR_D_ERROR_STATUS));
-        }
-        break;
-      #endif
-
-      #if L1_GPRS
-
-        case TRL1_RLC_UL_PARAM:
-        {
-          L1_send_trace_cpy(msg->SigP,sizeof(T_TR_RLC_UL_PARAM));
-        }
-        break;
-
-        case TRL1_RLC_DL_PARAM:
-        {
-          L1_send_trace_cpy(msg->SigP,sizeof(T_TR_RLC_DL_PARAM));
-        }
-        break;
-
-        case TRL1_FORBIDDEN_UPLINK:
-        {
-          L1_send_trace_cpy(msg->SigP,sizeof(T_TR_FORBIDDEN_UPLINK));
-        }
-        break;
-
-        case TRL1_DL_PTCCH:
-        {
-          L1_send_trace_cpy(msg->SigP,sizeof(T_TR_DL_PTCCH));
-        }
-        break;
-
-        case TRL1_IT_DSP_ERROR:
-        {
-          L1_send_trace_cpy(msg->SigP,sizeof(T_TR_IT_DSP_ERROR));
-        }
-        break;
-
-      #endif // L1_GPRS
-
-        case TRL1_ADC:
-        {
-          L1_send_trace_cpy(msg->SigP,sizeof(T_TR_ADC));
-        }
-        break;
-
-        case TRL1_NEW_TOA:
-        {
-          L1_send_trace_cpy(msg->SigP,sizeof(T_TR_NEW_TOA));
-        }
-        break;
-
-        case TRL1_SAIC_DEBUG:
-        {
-          L1_send_trace_cpy(msg->SigP,sizeof(T_TR_SAIC_DEBUG));
-        }
-        break;
-
-        case TRL1_BURST_PARAM:
-        {
-          L1_send_trace_cpy(msg->SigP,sizeof(T_TR_BURST_PARAM));
-        }
-        break;
-
-        case TRL1_SLEEP:
-        {
-          L1_send_trace_cpy(msg->SigP,sizeof(T_TR_SLEEP));
-        }
-        break;
-
-        case TRL1_GAUGING:
-        {
-          L1_send_trace_cpy(msg->SigP,sizeof(T_TR_GAUGING));
-        }
-        break;
-
-        case TRL1_PTCCH_DISABLE:
-        {
-          L1_send_trace_cpy(msg->SigP,sizeof(T_TR_PTCCH_DISABLE));
-        }
-        break;
-
-        default:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_UNKNOWN_L1S_TRACE), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_UNKNOWN_L1S_TRACE *)(ptr))->header   = TRL1_UNKNOWN_L1S_TRACE | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-            ((T_TR_UNKNOWN_L1S_TRACE *)(ptr))->id       = trace_id;
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_UNKNOWN_L1S_TRACE));
-          }
-        }
-      }  // End switch
-    }  // End case "TRACE_INFO"
-  }
-
-  /***********************************************************************/
-  /* L1S CPU load                                                        */
-  /***********************************************************************/
-
-  if (trace_info.current_config->l1_dyn_trace & 1<<L1_DYN_TRACE_L1S_CPU_LOAD)
-  {
-    if(max_cpu_flag)
-    {
-      char *ptr;
-
-      max_cpu_flag = 0;
-
-      if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1S_CPU_PEAK), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-      {
-
-        ((T_TR_L1S_CPU_PEAK *)(ptr))->header       = TRL1_L1S_CPU_PEAK | (fn_max_cpu << TR_HEADER_FN_DELAY);
-        ((T_TR_L1S_CPU_PEAK *)(ptr))->max_cpu      = (UWORD8)max_cpu;
-
-        L1_send_trace_no_cpy(ptr, sizeof(T_TR_L1S_CPU_PEAK));
-      }
-    }
-  }
-
-  /***********************************************************************/
-  /* L1A messages                                                        */
-  /***********************************************************************/
-
-  if (trace_info.current_config->l1_dyn_trace & 1<<L1_DYN_TRACE_L1A_MESSAGES)
-  {
-
-    switch(msg->SignalCode)
-    {
-
-      /********************************************************************************/
-      /* CIRCUIT SWITCHED                                                             */
-      /********************************************************************************/
-
-      /////////////////////////////////////////
-      // Message to set the right radio band //
-      /////////////////////////////////////////
-      case MPHC_INIT_L1_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_INIT_L1_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHC_INIT_L1_REQ *)(ptr))->header              = TRL1_MPHC_INIT_L1_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHC_INIT_L1_REQ *)(ptr))->radio_band_config   = ((T_MPHC_INIT_L1_REQ *)(msg->SigP))->radio_band_config;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_NEW_SCELL_REQ));
-        }
-      }
-      break;
-
-      case MPHC_INIT_L1_CON:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_INIT_L1_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-          ((T_TR_MPHC_INIT_L1_CON *)(ptr))->header              = TRL1_MPHC_INIT_L1_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_NEW_SCELL_REQ));
-        }
-      }
-      break;
-
-      ////////////////////////////
-      // Serving Cell selection //
-      ////////////////////////////
-
-      case MPHC_NEW_SCELL_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_NEW_SCELL_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHC_NEW_SCELL_REQ *)(ptr))->header       = TRL1_MPHC_NEW_SCELL_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHC_NEW_SCELL_REQ *)(ptr))->radio_freq   = ((T_MPHC_NEW_SCELL_REQ *)(msg->SigP))->radio_freq;
-          ((T_TR_MPHC_NEW_SCELL_REQ *)(ptr))->fn_offset    = ((T_MPHC_NEW_SCELL_REQ *)(msg->SigP))->fn_offset;
-          ((T_TR_MPHC_NEW_SCELL_REQ *)(ptr))->time_alignmt = ((T_MPHC_NEW_SCELL_REQ *)(msg->SigP))->time_alignmt;
-          ((T_TR_MPHC_NEW_SCELL_REQ *)(ptr))->bsic         = ((T_MPHC_NEW_SCELL_REQ *)(msg->SigP))->bsic;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_NEW_SCELL_REQ));
-        }
-      }
-      break;
-
-      //////////////////////////////
-      // Neighbor cell monitoring //
-      //////////////////////////////
-
-      case MPHC_NETWORK_LOST_IND:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_NETWORK_LOST_IND), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHC_NETWORK_LOST_IND *)(ptr))->header       = TRL1_MPHC_NETWORK_LOST_IND | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_NETWORK_LOST_IND));
-        }
-      }
-      break;
-
-      // Idle mode neighbor cell synchronization
-
-      case MPHC_NETWORK_SYNC_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_NETWORK_SYNC_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHC_NETWORK_SYNC_REQ *)(ptr))->header          = TRL1_MPHC_NETWORK_SYNC_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHC_NETWORK_SYNC_REQ *)(ptr))->radio_freq      = ((T_MPHC_NETWORK_SYNC_REQ *)(msg->SigP))->radio_freq;
-          ((T_TR_MPHC_NETWORK_SYNC_REQ *)(ptr))->fn_offset       = ((T_MPHC_NETWORK_SYNC_REQ *)(msg->SigP))->fn_offset;
-          ((T_TR_MPHC_NETWORK_SYNC_REQ *)(ptr))->time_alignmt    = ((T_MPHC_NETWORK_SYNC_REQ *)(msg->SigP))->time_alignmt;
-          ((T_TR_MPHC_NETWORK_SYNC_REQ *)(ptr))->timing_validity = ((T_MPHC_NETWORK_SYNC_REQ *)(msg->SigP))->timing_validity;
-          ((T_TR_MPHC_NETWORK_SYNC_REQ *)(ptr))->search_mode     = ((T_MPHC_NETWORK_SYNC_REQ *)(msg->SigP))->search_mode;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_NETWORK_SYNC_REQ));
-        }
-      }
-      break;
-
-      case MPHC_STOP_NETWORK_SYNC_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_STOP_NETWORK_SYNC_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHC_STOP_NETWORK_SYNC_REQ *)(ptr))->header       = TRL1_MPHC_STOP_NETWORK_SYNC_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_STOP_NETWORK_SYNC_REQ));
-        }
-      }
-      break;
-
-      case MPHC_NCELL_SYNC_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_NCELL_SYNC_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHC_NCELL_SYNC_REQ *)(ptr))->header          = TRL1_MPHC_NCELL_SYNC_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHC_NCELL_SYNC_REQ *)(ptr))->radio_freq      = ((T_MPHC_NCELL_SYNC_REQ *)(msg->SigP))->radio_freq;
-          ((T_TR_MPHC_NCELL_SYNC_REQ *)(ptr))->fn_offset       = ((T_MPHC_NCELL_SYNC_REQ *)(msg->SigP))->fn_offset;
-          ((T_TR_MPHC_NCELL_SYNC_REQ *)(ptr))->time_alignmt    = ((T_MPHC_NCELL_SYNC_REQ *)(msg->SigP))->time_alignmt;
-          ((T_TR_MPHC_NCELL_SYNC_REQ *)(ptr))->timing_validity = ((T_MPHC_NCELL_SYNC_REQ *)(msg->SigP))->timing_validity;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_NCELL_SYNC_REQ));
-        }
-      }
-      break;
-
-      case MPHC_NCELL_LIST_SYNC_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_NCELL_LIST_SYNC_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-          UWORD8 i;
-
-          ((T_TR_MPHC_NCELL_LIST_SYNC_REQ *)(ptr))->header      = TRL1_MPHC_NCELL_LIST_SYNC_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHC_NCELL_LIST_SYNC_REQ *)(ptr))->eotd        = ((T_MPHC_NCELL_LIST_SYNC_REQ *)(msg->SigP))->eotd;
-          ((T_TR_MPHC_NCELL_LIST_SYNC_REQ *)(ptr))->list_size   = ((T_MPHC_NCELL_LIST_SYNC_REQ *)(msg->SigP))->list_size;
-
-
-          for (i=0; i<((T_MPHC_NCELL_LIST_SYNC_REQ *)(msg->SigP))->list_size; i++)
-          {
-            ((T_TR_MPHC_NCELL_LIST_SYNC_REQ *)(ptr))->radio_freq[i]      = ((T_MPHC_NCELL_LIST_SYNC_REQ *)(msg->SigP))->ncell_list[i].timing_validity;
-            ((T_TR_MPHC_NCELL_LIST_SYNC_REQ *)(ptr))->fn_offset[i]       = ((T_MPHC_NCELL_LIST_SYNC_REQ *)(msg->SigP))->ncell_list[i].time_alignmt;
-            ((T_TR_MPHC_NCELL_LIST_SYNC_REQ *)(ptr))->time_alignmt[i]    = ((T_MPHC_NCELL_LIST_SYNC_REQ *)(msg->SigP))->ncell_list[i].fn_offset;
-            ((T_TR_MPHC_NCELL_LIST_SYNC_REQ *)(ptr))->timing_validity[i] = ((T_MPHC_NCELL_LIST_SYNC_REQ *)(msg->SigP))->ncell_list[i].radio_freq;
-          }
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_NCELL_LIST_SYNC_REQ));
-        }
-      }
-      break;
-
-      case MPHC_STOP_NCELL_SYNC_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_STOP_NCELL_SYNC_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHC_STOP_NCELL_SYNC_REQ *)(ptr))->header                = TRL1_MPHC_STOP_NCELL_SYNC_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHC_STOP_NCELL_SYNC_REQ *)(ptr))->radio_freq_array_size = ((T_MPHC_STOP_NCELL_SYNC_REQ *)(msg->SigP))->radio_freq_array_size;
-          ((T_TR_MPHC_STOP_NCELL_SYNC_REQ *)(ptr))->radio_freq_array[0]   = ((T_MPHC_STOP_NCELL_SYNC_REQ *)(msg->SigP))->radio_freq_array[0];
-          ((T_TR_MPHC_STOP_NCELL_SYNC_REQ *)(ptr))->radio_freq_array[1]   = ((T_MPHC_STOP_NCELL_SYNC_REQ *)(msg->SigP))->radio_freq_array[1];
-          ((T_TR_MPHC_STOP_NCELL_SYNC_REQ *)(ptr))->radio_freq_array[2]   = ((T_MPHC_STOP_NCELL_SYNC_REQ *)(msg->SigP))->radio_freq_array[2];
-          ((T_TR_MPHC_STOP_NCELL_SYNC_REQ *)(ptr))->radio_freq_array[3]   = ((T_MPHC_STOP_NCELL_SYNC_REQ *)(msg->SigP))->radio_freq_array[3];
-          ((T_TR_MPHC_STOP_NCELL_SYNC_REQ *)(ptr))->radio_freq_array[4]   = ((T_MPHC_STOP_NCELL_SYNC_REQ *)(msg->SigP))->radio_freq_array[4];
-          ((T_TR_MPHC_STOP_NCELL_SYNC_REQ *)(ptr))->radio_freq_array[5]   = ((T_MPHC_STOP_NCELL_SYNC_REQ *)(msg->SigP))->radio_freq_array[5];
-          ((T_TR_MPHC_STOP_NCELL_SYNC_REQ *)(ptr))->radio_freq_array[6]   = ((T_MPHC_STOP_NCELL_SYNC_REQ *)(msg->SigP))->radio_freq_array[0];
-          ((T_TR_MPHC_STOP_NCELL_SYNC_REQ *)(ptr))->radio_freq_array[7]   = ((T_MPHC_STOP_NCELL_SYNC_REQ *)(msg->SigP))->radio_freq_array[1];
-          ((T_TR_MPHC_STOP_NCELL_SYNC_REQ *)(ptr))->radio_freq_array[8]   = ((T_MPHC_STOP_NCELL_SYNC_REQ *)(msg->SigP))->radio_freq_array[2];
-          ((T_TR_MPHC_STOP_NCELL_SYNC_REQ *)(ptr))->radio_freq_array[9]   = ((T_MPHC_STOP_NCELL_SYNC_REQ *)(msg->SigP))->radio_freq_array[3];
-          ((T_TR_MPHC_STOP_NCELL_SYNC_REQ *)(ptr))->radio_freq_array[10]   = ((T_MPHC_STOP_NCELL_SYNC_REQ *)(msg->SigP))->radio_freq_array[4];
-          ((T_TR_MPHC_STOP_NCELL_SYNC_REQ *)(ptr))->radio_freq_array[11]   = ((T_MPHC_STOP_NCELL_SYNC_REQ *)(msg->SigP))->radio_freq_array[5];
-
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_STOP_NCELL_SYNC_REQ));
-        }
-      }
-      break;
-
-      // Dedicated mode neigbor cell synchronization
-
-      case MPHC_NCELL_FB_SB_READ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_NCELL_FB_SB_READ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHC_NCELL_FB_SB_READ *)(ptr))->header       = TRL1_MPHC_NCELL_FB_SB_READ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHC_NCELL_FB_SB_READ *)(ptr))->radio_freq   = ((T_MPHC_NCELL_FB_SB_READ *)(msg->SigP))->radio_freq;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_NCELL_FB_SB_READ));
-        }
-      }
-      break;
-
-      case MPHC_NCELL_SB_READ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_NCELL_SB_READ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHC_NCELL_SB_READ *)(ptr))->header       = TRL1_MPHC_NCELL_SB_READ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHC_NCELL_SB_READ *)(ptr))->radio_freq   = ((T_MPHC_NCELL_SB_READ *)(msg->SigP))->radio_freq;
-          ((T_TR_MPHC_NCELL_SB_READ *)(ptr))->fn_offset    = ((T_MPHC_NCELL_SB_READ *)(msg->SigP))->fn_offset;
-          ((T_TR_MPHC_NCELL_SB_READ *)(ptr))->time_alignmt = ((T_MPHC_NCELL_SB_READ *)(msg->SigP))->time_alignmt;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_NCELL_SB_READ));
-        }
-      }
-      break;
-
-      case L1C_FB_INFO:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1C_FB_INFO), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_L1C_FB_INFO *)(ptr))->header       = TRL1_L1C_FB_INFO | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_L1C_FB_INFO *)(ptr))->fb_flag      = ((T_L1C_FB_INFO*)(msg->SigP))->fb_flag;
-          ((T_TR_L1C_FB_INFO *)(ptr))->radio_freq   = ((T_L1C_FB_INFO*)(msg->SigP))->radio_freq;
-          ((T_TR_L1C_FB_INFO *)(ptr))->pm           = ((T_L1C_FB_INFO*)(msg->SigP))->pm;
-          ((T_TR_L1C_FB_INFO *)(ptr))->toa          = ((T_L1C_FB_INFO*)(msg->SigP))->toa;
-          ((T_TR_L1C_FB_INFO *)(ptr))->angle        = ((T_L1C_FB_INFO*)(msg->SigP))->angle;
-          ((T_TR_L1C_FB_INFO *)(ptr))->snr          = ((T_L1C_FB_INFO*)(msg->SigP))->snr;
-          ((T_TR_L1C_FB_INFO *)(ptr))->input_level  = l1a_l1s_com.last_input_level[((T_L1C_FB_INFO*)(msg->SigP))->radio_freq -
-                                                        l1_config.std.radio_freq_index_offset].input_level;
-          ((T_TR_L1C_FB_INFO *)(ptr))->tpu_offset   = l1s.tpu_offset;
-          ((T_TR_L1C_FB_INFO *)(ptr))->afc          = l1s.afc;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1C_FB_INFO));
-        }
-      }
-      break;
-
-      case L1C_SB_INFO:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1C_SB_INFO), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_L1C_SB_INFO *)(ptr))->header       = TRL1_L1C_SB_INFO | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_L1C_SB_INFO *)(ptr))->radio_freq   = ((T_L1C_SB_INFO *)(msg->SigP))->radio_freq;
-          ((T_TR_L1C_SB_INFO *)(ptr))->sb_flag      = ((T_L1C_SB_INFO *)(msg->SigP))->sb_flag;
-          ((T_TR_L1C_SB_INFO *)(ptr))->fn_offset    = ((T_L1C_SB_INFO *)(msg->SigP))->fn_offset;
-          ((T_TR_L1C_SB_INFO *)(ptr))->time_alignmt = ((T_L1C_SB_INFO *)(msg->SigP))->time_alignmt;
-          ((T_TR_L1C_SB_INFO *)(ptr))->bsic         = ((T_L1C_SB_INFO *)(msg->SigP))->bsic;
-          ((T_TR_L1C_SB_INFO *)(ptr))->pm           = ((T_L1C_SB_INFO *)(msg->SigP))->pm;
-          ((T_TR_L1C_SB_INFO *)(ptr))->toa          = ((T_L1C_SB_INFO *)(msg->SigP))->toa;
-          ((T_TR_L1C_SB_INFO *)(ptr))->angle        = ((T_L1C_SB_INFO *)(msg->SigP))->angle;
-          ((T_TR_L1C_SB_INFO *)(ptr))->snr          = ((T_L1C_SB_INFO *)(msg->SigP))->snr;
-          ((T_TR_L1C_SB_INFO *)(ptr))->input_level  = l1a_l1s_com.last_input_level[((T_L1C_SB_INFO *)(msg->SigP))->radio_freq - l1_config.std.radio_freq_index_offset].input_level;
-          ((T_TR_L1C_SB_INFO *)(ptr))->tpu_offset   = l1s.tpu_offset;
-          ((T_TR_L1C_SB_INFO *)(ptr))->afc          = l1s.afc;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1C_SB_INFO));
-        }
-      }
-      break;
-
-      case L1C_SBCONF_INFO:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1C_SBCONF_INFO), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_L1C_SBCONF_INFO *)(ptr))->header       = TRL1_L1C_SBCONF_INFO | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_L1C_SBCONF_INFO *)(ptr))->radio_freq   = ((T_L1C_SBCONF_INFO *)(msg->SigP))->radio_freq;
-          ((T_TR_L1C_SBCONF_INFO *)(ptr))->sb_flag      = ((T_L1C_SBCONF_INFO *)(msg->SigP))->sb_flag;
-          ((T_TR_L1C_SBCONF_INFO *)(ptr))->fn_offset    = ((T_L1C_SBCONF_INFO *)(msg->SigP))->fn_offset;
-          ((T_TR_L1C_SBCONF_INFO *)(ptr))->time_alignmt = ((T_L1C_SBCONF_INFO *)(msg->SigP))->time_alignmt;
-          ((T_TR_L1C_SBCONF_INFO *)(ptr))->bsic         = ((T_L1C_SBCONF_INFO *)(msg->SigP))->bsic;
-          ((T_TR_L1C_SBCONF_INFO *)(ptr))->pm           = ((T_L1C_SBCONF_INFO *)(msg->SigP))->pm;
-          ((T_TR_L1C_SBCONF_INFO *)(ptr))->toa          = ((T_L1C_SBCONF_INFO *)(msg->SigP))->toa;
-          ((T_TR_L1C_SBCONF_INFO *)(ptr))->angle        = ((T_L1C_SBCONF_INFO *)(msg->SigP))->angle;
-          ((T_TR_L1C_SBCONF_INFO *)(ptr))->snr          = ((T_L1C_SBCONF_INFO *)(msg->SigP))->snr;
-          ((T_TR_L1C_SBCONF_INFO *)(ptr))->input_level  = l1a_l1s_com.last_input_level[((T_L1C_SBCONF_INFO *)(msg->SigP))->radio_freq - l1_config.std.radio_freq_index_offset].input_level;
-          ((T_TR_L1C_SBCONF_INFO *)(ptr))->tpu_offset   = l1s.tpu_offset;
-          ((T_TR_L1C_SBCONF_INFO *)(ptr))->afc          = l1s.afc;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1C_SBCONF_INFO));
-        }
-      }
-      break;
-
-      case MPHC_NETWORK_SYNC_IND:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_NETWORK_SYNC_IND), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHC_NETWORK_SYNC_IND *)(ptr))->header       = TRL1_MPHC_NETWORK_SYNC_IND | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHC_NETWORK_SYNC_IND *)(ptr))->sb_flag      = ((T_MPHC_NETWORK_SYNC_IND*)(msg->SigP))->sb_flag;
-          ((T_TR_MPHC_NETWORK_SYNC_IND *)(ptr))->radio_freq   = ((T_MPHC_NETWORK_SYNC_IND*)(msg->SigP))->radio_freq;
-          ((T_TR_MPHC_NETWORK_SYNC_IND *)(ptr))->fn_offset    = ((T_MPHC_NETWORK_SYNC_IND*)(msg->SigP))->fn_offset;
-          ((T_TR_MPHC_NETWORK_SYNC_IND *)(ptr))->time_alignmt = ((T_MPHC_NETWORK_SYNC_IND*)(msg->SigP))->time_alignmt;
-          ((T_TR_MPHC_NETWORK_SYNC_IND *)(ptr))->bsic         = ((T_MPHC_NETWORK_SYNC_IND*)(msg->SigP))->bsic;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_NETWORK_SYNC_IND));
-        }
-      }
-      break;
-
-      case MPHC_NCELL_SYNC_IND:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_NCELL_SYNC_IND), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHC_NCELL_SYNC_IND *)(ptr))->header       = TRL1_MPHC_NCELL_SYNC_IND | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHC_NCELL_SYNC_IND *)(ptr))->radio_freq   = ((T_MPHC_NCELL_SYNC_IND*)(msg->SigP))->radio_freq;
-          ((T_TR_MPHC_NCELL_SYNC_IND *)(ptr))->sb_flag      = ((T_MPHC_NCELL_SYNC_IND*)(msg->SigP))->sb_flag;
-          ((T_TR_MPHC_NCELL_SYNC_IND *)(ptr))->fn_offset    = ((T_MPHC_NCELL_SYNC_IND*)(msg->SigP))->fn_offset;
-          ((T_TR_MPHC_NCELL_SYNC_IND *)(ptr))->time_alignmt = ((T_MPHC_NCELL_SYNC_IND*)(msg->SigP))->time_alignmt;
-          ((T_TR_MPHC_NCELL_SYNC_IND *)(ptr))->bsic         = ((T_MPHC_NCELL_SYNC_IND*)(msg->SigP))->bsic;
-          ((T_TR_MPHC_NCELL_SYNC_IND *)(ptr))->neigh_id     = ((T_MPHC_NCELL_SYNC_IND*)(msg->SigP))->neigh_id;
-          ((T_TR_MPHC_NCELL_SYNC_IND *)(ptr))->list_size    = l1a_l1s_com.nsync.current_list_size;
-         #if (L1_EOTD)
-          ((T_TR_MPHC_NCELL_SYNC_IND *)(ptr))->eotd_data_valid = ((T_MPHC_NCELL_SYNC_IND*)(msg->SigP))->eotd_data_valid;
-          ((T_TR_MPHC_NCELL_SYNC_IND *)(ptr))->mode            = ((T_MPHC_NCELL_SYNC_IND*)(msg->SigP))->mode;
-          ((T_TR_MPHC_NCELL_SYNC_IND *)(ptr))->fn_sb_neigh     = ((T_MPHC_NCELL_SYNC_IND*)(msg->SigP))->fn_sb_neigh;
-          ((T_TR_MPHC_NCELL_SYNC_IND *)(ptr))->fn_in_SB        = ((T_MPHC_NCELL_SYNC_IND*)(msg->SigP))->fn_in_SB;
-          ((T_TR_MPHC_NCELL_SYNC_IND *)(ptr))->toa_correction  = ((T_MPHC_NCELL_SYNC_IND*)(msg->SigP))->toa_correction;
-          ((T_TR_MPHC_NCELL_SYNC_IND *)(ptr))->delta_fn        = ((T_MPHC_NCELL_SYNC_IND*)(msg->SigP))->delta_fn;
-          ((T_TR_MPHC_NCELL_SYNC_IND *)(ptr))->delta_qbit      = ((T_MPHC_NCELL_SYNC_IND*)(msg->SigP))->delta_qbit;
-         #endif
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_NCELL_SYNC_IND));
-        }
-      }
-      break;
-
-      // Neighbor cell BCCH reading
-
-      case MPHC_NCELL_BCCH_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_NCELL_BCCH_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHC_NCELL_BCCH_REQ *)(ptr))->header        = TRL1_MPHC_NCELL_BCCH_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHC_NCELL_BCCH_REQ *)(ptr))->radio_freq    = ((T_MPHC_NCELL_BCCH_REQ *)(msg->SigP))->radio_freq;
-          ((T_TR_MPHC_NCELL_BCCH_REQ *)(ptr))->fn_offset     = ((T_MPHC_NCELL_BCCH_REQ *)(msg->SigP))->fn_offset;
-          ((T_TR_MPHC_NCELL_BCCH_REQ *)(ptr))->time_alignmt  = ((T_MPHC_NCELL_BCCH_REQ *)(msg->SigP))->time_alignmt;
-          ((T_TR_MPHC_NCELL_BCCH_REQ *)(ptr))->tsc           = ((T_MPHC_NCELL_BCCH_REQ *)(msg->SigP))->tsc;
-          ((T_TR_MPHC_NCELL_BCCH_REQ *)(ptr))->bcch_blks_req = ((T_MPHC_NCELL_BCCH_REQ *)(msg->SigP))->bcch_blks_req;
-          #if L1_GPRS
-          ((T_TR_MPHC_NCELL_BCCH_REQ *)(ptr))->gprs_priority = ((T_MPHC_NCELL_BCCH_REQ *)(msg->SigP))->gprs_priority;
-          #endif
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_NCELL_BCCH_REQ));
-        }
-      }
-      break;
-
-      case MPHC_STOP_NCELL_BCCH_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_STOP_NCELL_BCCH_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHC_STOP_NCELL_BCCH_REQ *)(ptr))->header                = TRL1_MPHC_STOP_NCELL_BCCH_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHC_STOP_NCELL_BCCH_REQ *)(ptr))->radio_freq_array_size = ((T_MPHC_STOP_NCELL_BCCH_REQ *)(msg->SigP))->radio_freq_array_size;
-          ((T_TR_MPHC_STOP_NCELL_BCCH_REQ *)(ptr))->radio_freq_array[0]   = ((T_MPHC_STOP_NCELL_BCCH_REQ *)(msg->SigP))->radio_freq_array[0];
-          ((T_TR_MPHC_STOP_NCELL_BCCH_REQ *)(ptr))->radio_freq_array[1]   = ((T_MPHC_STOP_NCELL_BCCH_REQ *)(msg->SigP))->radio_freq_array[1];
-          ((T_TR_MPHC_STOP_NCELL_BCCH_REQ *)(ptr))->radio_freq_array[2]   = ((T_MPHC_STOP_NCELL_BCCH_REQ *)(msg->SigP))->radio_freq_array[2];
-          ((T_TR_MPHC_STOP_NCELL_BCCH_REQ *)(ptr))->radio_freq_array[3]   = ((T_MPHC_STOP_NCELL_BCCH_REQ *)(msg->SigP))->radio_freq_array[3];
-          ((T_TR_MPHC_STOP_NCELL_BCCH_REQ *)(ptr))->radio_freq_array[4]   = ((T_MPHC_STOP_NCELL_BCCH_REQ *)(msg->SigP))->radio_freq_array[4];
-          ((T_TR_MPHC_STOP_NCELL_BCCH_REQ *)(ptr))->radio_freq_array[5]   = ((T_MPHC_STOP_NCELL_BCCH_REQ *)(msg->SigP))->radio_freq_array[5];
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_STOP_NCELL_BCCH_REQ));
-        }
-      }
-      break;
-
-      case L1C_BCCHN_INFO:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1C_BCCHN_INFO), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_L1C_BCCHN_INFO *)(ptr))->header       = TRL1_L1C_BCCHN_INFO | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_L1C_BCCHN_INFO *)(ptr))->error_flag   = ((T_MPHC_DATA_IND *)(msg->SigP))->error_flag;
-          ((T_TR_L1C_BCCHN_INFO *)(ptr))->radio_freq   = ((T_MPHC_DATA_IND *)(msg->SigP))->radio_freq;
-          ((T_TR_L1C_BCCHN_INFO *)(ptr))->input_level  = l1a_l1s_com.last_input_level[((T_MPHC_DATA_IND *)(msg->SigP))->radio_freq -
-                                                                                     l1_config.std.radio_freq_index_offset].input_level;
-          ((T_TR_L1C_BCCHN_INFO *)(ptr))->tpu_offset   = l1s.tpu_offset;
-          ((T_TR_L1C_BCCHN_INFO *)(ptr))->afc          = l1s.afc;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1C_BCCHN_INFO));
-        }
-      }
-      break;
-
-      ///////////////////////////////////////
-      // Serving cell normal burst reading //
-      ///////////////////////////////////////
-
-      // CCCH reading
-
-      case MPHC_START_CCCH_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_START_CCCH_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHC_START_CCCH_REQ *)(ptr))->header           = TRL1_MPHC_START_CCCH_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHC_START_CCCH_REQ *)(ptr))->bs_pa_mfrms      = ((T_MPHC_START_CCCH_REQ *)(msg->SigP))->bs_pa_mfrms;
-          ((T_TR_MPHC_START_CCCH_REQ *)(ptr))->bs_ag_blks_res   = ((T_MPHC_START_CCCH_REQ *)(msg->SigP))->bs_ag_blks_res;
-          ((T_TR_MPHC_START_CCCH_REQ *)(ptr))->bcch_combined    = ((T_MPHC_START_CCCH_REQ *)(msg->SigP))->bcch_combined;
-          ((T_TR_MPHC_START_CCCH_REQ *)(ptr))->ccch_group       = ((T_MPHC_START_CCCH_REQ *)(msg->SigP))->ccch_group;
-          ((T_TR_MPHC_START_CCCH_REQ *)(ptr))->page_group       = ((T_MPHC_START_CCCH_REQ *)(msg->SigP))->page_group;
-          ((T_TR_MPHC_START_CCCH_REQ *)(ptr))->page_block_index = ((T_MPHC_START_CCCH_REQ *)(msg->SigP))->page_block_index;
-          ((T_TR_MPHC_START_CCCH_REQ *)(ptr))->page_mode        = ((T_MPHC_START_CCCH_REQ *)(msg->SigP))->page_mode;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_START_CCCH_REQ));
-        }
-      }
-      break;
-
-      case MPHC_STOP_CCCH_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_STOP_CCCH_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHC_STOP_CCCH_REQ *)(ptr))->header       = TRL1_MPHC_STOP_CCCH_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_STOP_CCCH_REQ));
-        }
-      }
-      break;
-
-      case L1C_NP_INFO:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1C_NP_INFO), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_L1C_NP_INFO *)(ptr))->header       = TRL1_L1C_NP_INFO | (((T_MPHC_DATA_IND *)(msg->SigP))->fn << TR_HEADER_FN_DELAY);
-          ((T_TR_L1C_NP_INFO *)(ptr))->error_flag   = ((T_MPHC_DATA_IND *)(msg->SigP))->error_flag;
-          ((T_TR_L1C_NP_INFO *)(ptr))->radio_freq   = ((T_MPHC_DATA_IND *)(msg->SigP))->radio_freq;
-          ((T_TR_L1C_NP_INFO *)(ptr))->input_level  = l1a_l1s_com.Scell_IL_for_rxlev;
-          ((T_TR_L1C_NP_INFO *)(ptr))->tpu_offset   = l1s.tpu_offset;
-          ((T_TR_L1C_NP_INFO *)(ptr))->afc          = l1s.afc;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1C_NP_INFO));
-        }
-      }
-      break;
-
-      case L1C_EP_INFO:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1C_EP_INFO), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_L1C_EP_INFO *)(ptr))->header       = TRL1_L1C_EP_INFO | (((T_MPHC_DATA_IND *)(msg->SigP))->fn << TR_HEADER_FN_DELAY);
-          ((T_TR_L1C_EP_INFO *)(ptr))->error_flag   = ((T_MPHC_DATA_IND *)(msg->SigP))->error_flag;
-          ((T_TR_L1C_EP_INFO *)(ptr))->radio_freq   = ((T_MPHC_DATA_IND *)(msg->SigP))->radio_freq;
-          ((T_TR_L1C_EP_INFO *)(ptr))->input_level  = l1a_l1s_com.Scell_IL_for_rxlev;
-          ((T_TR_L1C_EP_INFO *)(ptr))->tpu_offset   = l1s.tpu_offset;
-          ((T_TR_L1C_EP_INFO *)(ptr))->afc          = l1s.afc;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1C_EP_INFO));
-        }
-      }
-      break;
-
-      case L1C_ALLC_INFO:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1C_ALLC_INFO), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_L1C_ALLC_INFO *)(ptr))->header       = TRL1_L1C_ALLC_INFO | (((T_MPHC_DATA_IND *)(msg->SigP))->fn << TR_HEADER_FN_DELAY);
-          ((T_TR_L1C_ALLC_INFO *)(ptr))->error_flag   = ((T_MPHC_DATA_IND *)(msg->SigP))->error_flag;
-          ((T_TR_L1C_ALLC_INFO *)(ptr))->radio_freq   = ((T_MPHC_DATA_IND *)(msg->SigP))->radio_freq;
-          ((T_TR_L1C_ALLC_INFO *)(ptr))->input_level  = l1a_l1s_com.Scell_IL_for_rxlev;
-          ((T_TR_L1C_ALLC_INFO *)(ptr))->tpu_offset   = l1s.tpu_offset;
-          ((T_TR_L1C_ALLC_INFO *)(ptr))->afc          = l1s.afc;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1C_ALLC_INFO));
-        }
-      }
-      break;
-
-      // BCCH reading
-
-      case MPHC_SCELL_NBCCH_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_SCELL_NBCCH_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHC_SCELL_NBCCH_REQ *)(ptr))->header                = TRL1_MPHC_SCELL_NBCCH_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHC_SCELL_NBCCH_REQ *)(ptr))->schedule_array_size   = ((T_MPHC_SCELL_NBCCH_REQ *)(msg->SigP))->schedule_array_size;
-          ((T_TR_MPHC_SCELL_NBCCH_REQ *)(ptr))->modulus[0]            = ((T_MPHC_SCELL_NBCCH_REQ *)(msg->SigP))->schedule_array[0].modulus;
-          ((T_TR_MPHC_SCELL_NBCCH_REQ *)(ptr))->modulus[1]            = ((T_MPHC_SCELL_NBCCH_REQ *)(msg->SigP))->schedule_array[1].modulus;
-          ((T_TR_MPHC_SCELL_NBCCH_REQ *)(ptr))->modulus[2]            = ((T_MPHC_SCELL_NBCCH_REQ *)(msg->SigP))->schedule_array[2].modulus;
-          ((T_TR_MPHC_SCELL_NBCCH_REQ *)(ptr))->modulus[3]            = ((T_MPHC_SCELL_NBCCH_REQ *)(msg->SigP))->schedule_array[3].modulus;
-          ((T_TR_MPHC_SCELL_NBCCH_REQ *)(ptr))->modulus[4]            = ((T_MPHC_SCELL_NBCCH_REQ *)(msg->SigP))->schedule_array[4].modulus;
-          ((T_TR_MPHC_SCELL_NBCCH_REQ *)(ptr))->modulus[5]            = ((T_MPHC_SCELL_NBCCH_REQ *)(msg->SigP))->schedule_array[5].modulus;
-          ((T_TR_MPHC_SCELL_NBCCH_REQ *)(ptr))->modulus[6]            = ((T_MPHC_SCELL_NBCCH_REQ *)(msg->SigP))->schedule_array[6].modulus;
-          ((T_TR_MPHC_SCELL_NBCCH_REQ *)(ptr))->modulus[7]            = ((T_MPHC_SCELL_NBCCH_REQ *)(msg->SigP))->schedule_array[7].modulus;
-          ((T_TR_MPHC_SCELL_NBCCH_REQ *)(ptr))->modulus[8]            = ((T_MPHC_SCELL_NBCCH_REQ *)(msg->SigP))->schedule_array[8].modulus;
-          ((T_TR_MPHC_SCELL_NBCCH_REQ *)(ptr))->modulus[9]            = ((T_MPHC_SCELL_NBCCH_REQ *)(msg->SigP))->schedule_array[9].modulus;
-          ((T_TR_MPHC_SCELL_NBCCH_REQ *)(ptr))->relative_position[0]  = ((T_MPHC_SCELL_NBCCH_REQ *)(msg->SigP))->schedule_array[0].relative_position;
-          ((T_TR_MPHC_SCELL_NBCCH_REQ *)(ptr))->relative_position[1]  = ((T_MPHC_SCELL_NBCCH_REQ *)(msg->SigP))->schedule_array[1].relative_position;
-          ((T_TR_MPHC_SCELL_NBCCH_REQ *)(ptr))->relative_position[2]  = ((T_MPHC_SCELL_NBCCH_REQ *)(msg->SigP))->schedule_array[2].relative_position;
-          ((T_TR_MPHC_SCELL_NBCCH_REQ *)(ptr))->relative_position[3]  = ((T_MPHC_SCELL_NBCCH_REQ *)(msg->SigP))->schedule_array[3].relative_position;
-          ((T_TR_MPHC_SCELL_NBCCH_REQ *)(ptr))->relative_position[4]  = ((T_MPHC_SCELL_NBCCH_REQ *)(msg->SigP))->schedule_array[4].relative_position;
-          ((T_TR_MPHC_SCELL_NBCCH_REQ *)(ptr))->relative_position[5]  = ((T_MPHC_SCELL_NBCCH_REQ *)(msg->SigP))->schedule_array[5].relative_position;
-          ((T_TR_MPHC_SCELL_NBCCH_REQ *)(ptr))->relative_position[6]  = ((T_MPHC_SCELL_NBCCH_REQ *)(msg->SigP))->schedule_array[6].relative_position;
-          ((T_TR_MPHC_SCELL_NBCCH_REQ *)(ptr))->relative_position[7]  = ((T_MPHC_SCELL_NBCCH_REQ *)(msg->SigP))->schedule_array[7].relative_position;
-          ((T_TR_MPHC_SCELL_NBCCH_REQ *)(ptr))->relative_position[8]  = ((T_MPHC_SCELL_NBCCH_REQ *)(msg->SigP))->schedule_array[8].relative_position;
-          ((T_TR_MPHC_SCELL_NBCCH_REQ *)(ptr))->relative_position[9]  = ((T_MPHC_SCELL_NBCCH_REQ *)(msg->SigP))->schedule_array[9].relative_position;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_SCELL_NBCCH_REQ));
-        }
-      }
-      break;
-
-      case MPHC_SCELL_EBCCH_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_SCELL_EBCCH_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHC_SCELL_EBCCH_REQ *)(ptr))->header                = TRL1_MPHC_SCELL_EBCCH_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHC_SCELL_EBCCH_REQ *)(ptr))->schedule_array_size   = ((T_MPHC_SCELL_EBCCH_REQ *)(msg->SigP))->schedule_array_size;
-          ((T_TR_MPHC_SCELL_EBCCH_REQ *)(ptr))->modulus[0]            = ((T_MPHC_SCELL_EBCCH_REQ *)(msg->SigP))->schedule_array[0].modulus;
-          ((T_TR_MPHC_SCELL_EBCCH_REQ *)(ptr))->modulus[1]            = ((T_MPHC_SCELL_EBCCH_REQ *)(msg->SigP))->schedule_array[1].modulus;
-          ((T_TR_MPHC_SCELL_EBCCH_REQ *)(ptr))->modulus[2]            = ((T_MPHC_SCELL_EBCCH_REQ *)(msg->SigP))->schedule_array[2].modulus;
-          ((T_TR_MPHC_SCELL_EBCCH_REQ *)(ptr))->modulus[3]            = ((T_MPHC_SCELL_EBCCH_REQ *)(msg->SigP))->schedule_array[3].modulus;
-          ((T_TR_MPHC_SCELL_EBCCH_REQ *)(ptr))->modulus[4]            = ((T_MPHC_SCELL_EBCCH_REQ *)(msg->SigP))->schedule_array[4].modulus;
-          ((T_TR_MPHC_SCELL_EBCCH_REQ *)(ptr))->modulus[5]            = ((T_MPHC_SCELL_EBCCH_REQ *)(msg->SigP))->schedule_array[5].modulus;
-          ((T_TR_MPHC_SCELL_EBCCH_REQ *)(ptr))->modulus[6]            = ((T_MPHC_SCELL_EBCCH_REQ *)(msg->SigP))->schedule_array[6].modulus;
-          ((T_TR_MPHC_SCELL_EBCCH_REQ *)(ptr))->modulus[7]            = ((T_MPHC_SCELL_EBCCH_REQ *)(msg->SigP))->schedule_array[7].modulus;
-          ((T_TR_MPHC_SCELL_EBCCH_REQ *)(ptr))->modulus[8]            = ((T_MPHC_SCELL_EBCCH_REQ *)(msg->SigP))->schedule_array[8].modulus;
-          ((T_TR_MPHC_SCELL_EBCCH_REQ *)(ptr))->modulus[9]            = ((T_MPHC_SCELL_EBCCH_REQ *)(msg->SigP))->schedule_array[9].modulus;
-          ((T_TR_MPHC_SCELL_EBCCH_REQ *)(ptr))->relative_position[0]  = ((T_MPHC_SCELL_EBCCH_REQ *)(msg->SigP))->schedule_array[0].relative_position;
-          ((T_TR_MPHC_SCELL_EBCCH_REQ *)(ptr))->relative_position[1]  = ((T_MPHC_SCELL_EBCCH_REQ *)(msg->SigP))->schedule_array[1].relative_position;
-          ((T_TR_MPHC_SCELL_EBCCH_REQ *)(ptr))->relative_position[2]  = ((T_MPHC_SCELL_EBCCH_REQ *)(msg->SigP))->schedule_array[2].relative_position;
-          ((T_TR_MPHC_SCELL_EBCCH_REQ *)(ptr))->relative_position[3]  = ((T_MPHC_SCELL_EBCCH_REQ *)(msg->SigP))->schedule_array[3].relative_position;
-          ((T_TR_MPHC_SCELL_EBCCH_REQ *)(ptr))->relative_position[4]  = ((T_MPHC_SCELL_EBCCH_REQ *)(msg->SigP))->schedule_array[4].relative_position;
-          ((T_TR_MPHC_SCELL_EBCCH_REQ *)(ptr))->relative_position[5]  = ((T_MPHC_SCELL_EBCCH_REQ *)(msg->SigP))->schedule_array[5].relative_position;
-          ((T_TR_MPHC_SCELL_EBCCH_REQ *)(ptr))->relative_position[6]  = ((T_MPHC_SCELL_EBCCH_REQ *)(msg->SigP))->schedule_array[6].relative_position;
-          ((T_TR_MPHC_SCELL_EBCCH_REQ *)(ptr))->relative_position[7]  = ((T_MPHC_SCELL_EBCCH_REQ *)(msg->SigP))->schedule_array[7].relative_position;
-          ((T_TR_MPHC_SCELL_EBCCH_REQ *)(ptr))->relative_position[8]  = ((T_MPHC_SCELL_EBCCH_REQ *)(msg->SigP))->schedule_array[8].relative_position;
-          ((T_TR_MPHC_SCELL_EBCCH_REQ *)(ptr))->relative_position[9]  = ((T_MPHC_SCELL_EBCCH_REQ *)(msg->SigP))->schedule_array[9].relative_position;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_SCELL_EBCCH_REQ));
-        }
-      }
-      break;
-
-      case MPHC_STOP_SCELL_BCCH_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_STOP_SCELL_BCCH_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHC_STOP_SCELL_BCCH_REQ *)(ptr))->header       = TRL1_MPHC_STOP_SCELL_BCCH_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_STOP_SCELL_BCCH_REQ));
-        }
-      }
-      break;
-
-      case L1C_BCCHS_INFO:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1C_BCCHS_INFO), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_L1C_BCCHS_INFO *)(ptr))->header       = TRL1_L1C_BCCHS_INFO | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_L1C_BCCHS_INFO *)(ptr))->error_flag   = ((T_MPHC_DATA_IND *)(msg->SigP))->error_flag;
-          ((T_TR_L1C_BCCHS_INFO *)(ptr))->radio_freq   = ((T_MPHC_DATA_IND *)(msg->SigP))->radio_freq;
-          ((T_TR_L1C_BCCHS_INFO *)(ptr))->input_level  = l1a_l1s_com.Scell_IL_for_rxlev;
-          ((T_TR_L1C_BCCHS_INFO *)(ptr))->tpu_offset   = l1s.tpu_offset;
-          ((T_TR_L1C_BCCHS_INFO *)(ptr))->afc          = l1s.afc;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1C_BCCHS_INFO));
-        }
-      }
-      break;
-
-      //////////
-      // CBCH //
-      //////////
-
-      case MPHC_CONFIG_CBCH_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_CONFIG_CBCH_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHC_CONFIG_CBCH_REQ *)(ptr))->header       = TRL1_MPHC_CONFIG_CBCH_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHC_CONFIG_CBCH_REQ *)(ptr))->h            = ((T_MPHC_CONFIG_CBCH_REQ *)(msg->SigP))->cbch_desc.chan_sel.h;
-          ((T_TR_MPHC_CONFIG_CBCH_REQ *)(ptr))->radio_freq   = ((T_MPHC_CONFIG_CBCH_REQ *)(msg->SigP))->cbch_desc.chan_sel.rf_channel.single_rf.radio_freq;
-          ((T_TR_MPHC_CONFIG_CBCH_REQ *)(ptr))->timeslot_no  = ((T_MPHC_CONFIG_CBCH_REQ *)(msg->SigP))->cbch_desc.timeslot_no;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_CONFIG_CBCH_REQ));
-        }
-      }
-      break;
-
-      case MPHC_CBCH_SCHEDULE_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_CBCH_SCHEDULE_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHC_CBCH_SCHEDULE_REQ *)(ptr))->header          = TRL1_MPHC_CBCH_SCHEDULE_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHC_CBCH_SCHEDULE_REQ *)(ptr))->extended_cbch   = ((T_MPHC_CBCH_SCHEDULE_REQ *)(msg->SigP))->extended_cbch;
-          ((T_TR_MPHC_CBCH_SCHEDULE_REQ *)(ptr))->schedule_length = ((T_MPHC_CBCH_SCHEDULE_REQ *)(msg->SigP))->schedule_length;
-          ((T_TR_MPHC_CBCH_SCHEDULE_REQ *)(ptr))->first_block_0   = ((T_MPHC_CBCH_SCHEDULE_REQ *)(msg->SigP))->first_block_0;
-          ((T_TR_MPHC_CBCH_SCHEDULE_REQ *)(ptr))->first_block_1   = ((T_MPHC_CBCH_SCHEDULE_REQ *)(msg->SigP))->first_block_1;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_CBCH_SCHEDULE_REQ));
-        }
-      }
-      break;
-
-      case MPHC_CBCH_INFO_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_CBCH_INFO_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHC_CBCH_INFO_REQ *)(ptr))->header       = TRL1_MPHC_CBCH_INFO_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHC_CBCH_INFO_REQ *)(ptr))->tb_bitmap    = ((T_MPHC_CBCH_INFO_REQ *)(msg->SigP))->tb_bitmap;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_CBCH_INFO_REQ));
-        }
-      }
-      break;
-
-      case MPHC_CBCH_UPDATE_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_CBCH_UPDATE_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHC_CBCH_UPDATE_REQ *)(ptr))->header        = TRL1_MPHC_CBCH_UPDATE_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHC_CBCH_UPDATE_REQ *)(ptr))->extended_cbch = ((T_MPHC_CBCH_UPDATE_REQ*)(msg->SigP))->extended_cbch;
-          ((T_TR_MPHC_CBCH_UPDATE_REQ *)(ptr))->first_block_0 = ((T_MPHC_CBCH_UPDATE_REQ*)(msg->SigP))->first_block_0;
-          ((T_TR_MPHC_CBCH_UPDATE_REQ *)(ptr))->first_block_1 = ((T_MPHC_CBCH_UPDATE_REQ*)(msg->SigP))->first_block_1;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_CBCH_UPDATE_REQ));
-        }
-      }
-      break;
-
-      case L1C_CB_INFO:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1C_CB_INFO), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_L1C_CB_INFO *)(ptr))->header          = TRL1_L1C_CB_INFO | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_L1C_CB_INFO *)(ptr))->error_flag      = ((T_MPHC_DATA_IND *)(msg->SigP))->error_flag;
-          ((T_TR_L1C_CB_INFO *)(ptr))->radio_freq      = ((T_MPHC_DATA_IND *)(msg->SigP))->radio_freq;
-          ((T_TR_L1C_CB_INFO *)(ptr))->input_level     = l1a_l1s_com.Scell_IL_for_rxlev;
-          ((T_TR_L1C_CB_INFO *)(ptr))->tpu_offset      = l1s.tpu_offset;
-          ((T_TR_L1C_CB_INFO *)(ptr))->afc             = l1s.afc;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1C_CB_INFO));
-        }
-      }
-      break;
-
-      // Stop CBCH
-
-      case MPHC_STOP_CBCH_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_STOP_CBCH_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHC_STOP_CBCH_REQ *)(ptr))->header        = TRL1_MPHC_STOP_CBCH_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHC_STOP_CBCH_REQ *)(ptr))->normal_cbch   = ((T_MPHC_STOP_CBCH_REQ *)(msg->SigP))->normal_cbch;
-          ((T_TR_MPHC_STOP_CBCH_REQ *)(ptr))->extended_cbch = ((T_MPHC_STOP_CBCH_REQ *)(msg->SigP))->extended_cbch;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_STOP_CBCH_REQ));
-        }
-      }
-      break;
-
-      case MPHC_STOP_CBCH_CON:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_STOP_CBCH_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHC_STOP_CBCH_CON *)(ptr))->header       = TRL1_MPHC_STOP_CBCH_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_STOP_CBCH_CON));
-        }
-      }
-      break;
-
-      ///////////////////
-      // Random Access //
-      ///////////////////
-
-      case MPHC_RA_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_RA_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHC_RA_REQ *)(ptr))->header            = TRL1_MPHC_RA_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHC_RA_REQ *)(ptr))->txpwr             = ((T_MPHC_RA_REQ *)(msg->SigP))->txpwr;
-          ((T_TR_MPHC_RA_REQ *)(ptr))->rand              = ((T_MPHC_RA_REQ *)(msg->SigP))->rand;
-          ((T_TR_MPHC_RA_REQ *)(ptr))->channel_request   = ((T_MPHC_RA_REQ *)(msg->SigP))->channel_request;
-          ((T_TR_MPHC_RA_REQ *)(ptr))->powerclass_band1  = ((T_MPHC_RA_REQ *)(msg->SigP))->powerclass_band1;
-          ((T_TR_MPHC_RA_REQ *)(ptr))->powerclass_band2  = ((T_MPHC_RA_REQ *)(msg->SigP))->powerclass_band2;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_RA_REQ));
-        }
-      }
-      break;
-
-      case MPHC_STOP_RA_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_STOP_RA_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHC_STOP_RA_REQ *)(ptr))->header       = TRL1_MPHC_STOP_RA_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_STOP_RA_REQ));
-        }
-      }
-      break;
-
-      case L1C_RA_DONE:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1C_RA_DONE), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_L1C_RA_DONE *)(ptr))->header       = TRL1_L1C_RA_DONE | (((T_MPHC_RA_CON *)(msg->SigP))->fn << TR_HEADER_FN_DELAY);
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1C_RA_DONE));
-        }
-      }
-      break;
-
-      /////////////////////////////
-      // Dedicated mode channels //
-      /////////////////////////////
-
-      // Immediate assignment
-
-      case MPHC_IMMED_ASSIGN_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_IMMED_ASSIGN_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHC_IMMED_ASSIGN_REQ *)(ptr))->header                = TRL1_MPHC_IMMED_ASSIGN_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHC_IMMED_ASSIGN_REQ *)(ptr))->h                     = ((T_MPHC_IMMED_ASSIGN_REQ *)(msg->SigP))->channel_desc.chan_sel.h;
-          ((T_TR_MPHC_IMMED_ASSIGN_REQ *)(ptr))->radio_freq            = ((T_MPHC_IMMED_ASSIGN_REQ *)(msg->SigP))->channel_desc.chan_sel.rf_channel.single_rf.radio_freq;
-          ((T_TR_MPHC_IMMED_ASSIGN_REQ *)(ptr))->channel_type          = ((T_MPHC_IMMED_ASSIGN_REQ *)(msg->SigP))->channel_desc.channel_type;
-          ((T_TR_MPHC_IMMED_ASSIGN_REQ *)(ptr))->subchannel            = ((T_MPHC_IMMED_ASSIGN_REQ *)(msg->SigP))->channel_desc.subchannel;
-          ((T_TR_MPHC_IMMED_ASSIGN_REQ *)(ptr))->timeslot_no           = ((T_MPHC_IMMED_ASSIGN_REQ *)(msg->SigP))->channel_desc.timeslot_no;
-          ((T_TR_MPHC_IMMED_ASSIGN_REQ *)(ptr))->tsc                   = ((T_MPHC_IMMED_ASSIGN_REQ *)(msg->SigP))->channel_desc.tsc;
-          ((T_TR_MPHC_IMMED_ASSIGN_REQ *)(ptr))->timing_advance        = ((T_MPHC_IMMED_ASSIGN_REQ *)(msg->SigP))->timing_advance;
-          ((T_TR_MPHC_IMMED_ASSIGN_REQ *)(ptr))->rf_chan_cnt           = ((T_MPHC_IMMED_ASSIGN_REQ *)(msg->SigP))->frequency_list.rf_chan_cnt;
-          ((T_TR_MPHC_IMMED_ASSIGN_REQ *)(ptr))->starting_time_present = ((T_MPHC_IMMED_ASSIGN_REQ *)(msg->SigP))->starting_time.start_time_present;
-          ((T_TR_MPHC_IMMED_ASSIGN_REQ *)(ptr))->n32                   = ((T_MPHC_IMMED_ASSIGN_REQ *)(msg->SigP))->starting_time.start_time.n32;
-          ((T_TR_MPHC_IMMED_ASSIGN_REQ *)(ptr))->n51                   = ((T_MPHC_IMMED_ASSIGN_REQ *)(msg->SigP))->starting_time.start_time.n51;
-          ((T_TR_MPHC_IMMED_ASSIGN_REQ *)(ptr))->n26                   = ((T_MPHC_IMMED_ASSIGN_REQ *)(msg->SigP))->starting_time.start_time.n26;
-          ((T_TR_MPHC_IMMED_ASSIGN_REQ *)(ptr))->bef_sti_rf_chan_cnt   = ((T_MPHC_IMMED_ASSIGN_REQ *)(msg->SigP))->frequency_list_bef_sti.rf_chan_cnt;
-          ((T_TR_MPHC_IMMED_ASSIGN_REQ *)(ptr))->dtx_allowed           = ((T_MPHC_IMMED_ASSIGN_REQ *)(msg->SigP))->dtx_allowed;
-          ((T_TR_MPHC_IMMED_ASSIGN_REQ *)(ptr))->pwrc                  = ((T_MPHC_IMMED_ASSIGN_REQ *)(msg->SigP))->pwrc;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_IMMED_ASSIGN_REQ));
-        }
-      }
-      break;
-
-      case MPHC_IMMED_ASSIGN_CON:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_IMMED_ASSIGN_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHC_IMMED_ASSIGN_CON *)(ptr))->header       = TRL1_MPHC_IMMED_ASSIGN_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_IMMED_ASSIGN_CON));
-        }
-      }
-      break;
-
-      // Channel assignment
-
-      case MPHC_CHANNEL_ASSIGN_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_CHANNEL_ASSIGN_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-            ((T_TR_MPHC_CHANNEL_ASSIGN_REQ *)(ptr))->header                = TRL1_MPHC_CHANNEL_ASSIGN_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-            ((T_TR_MPHC_CHANNEL_ASSIGN_REQ *)(ptr))->h                     = ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->channel_desc_1.chan_sel.h;
-            ((T_TR_MPHC_CHANNEL_ASSIGN_REQ *)(ptr))->radio_freq            = ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->channel_desc_1.chan_sel.rf_channel.single_rf.radio_freq;
-            ((T_TR_MPHC_CHANNEL_ASSIGN_REQ *)(ptr))->channel_type          = ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->channel_desc_1.channel_type;
-            ((T_TR_MPHC_CHANNEL_ASSIGN_REQ *)(ptr))->subchannel            = ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->channel_desc_1.subchannel;
-            ((T_TR_MPHC_CHANNEL_ASSIGN_REQ *)(ptr))->timeslot_no           = ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->channel_desc_1.timeslot_no;
-            ((T_TR_MPHC_CHANNEL_ASSIGN_REQ *)(ptr))->tsc                   = ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->channel_desc_1.tsc;
-            ((T_TR_MPHC_CHANNEL_ASSIGN_REQ *)(ptr))->channel_mode_1        = ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->channel_mode_1;
-            ((T_TR_MPHC_CHANNEL_ASSIGN_REQ *)(ptr))->txpwr                 = ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->txpwr;
-            ((T_TR_MPHC_CHANNEL_ASSIGN_REQ *)(ptr))->rf_chan_cnt           = ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->frequency_list.rf_chan_cnt;
-            ((T_TR_MPHC_CHANNEL_ASSIGN_REQ *)(ptr))->starting_time_present = ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->starting_time.start_time_present;
-            ((T_TR_MPHC_CHANNEL_ASSIGN_REQ *)(ptr))->n32                   = ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->starting_time.start_time.n32;
-            ((T_TR_MPHC_CHANNEL_ASSIGN_REQ *)(ptr))->n51                   = ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->starting_time.start_time.n51;
-            ((T_TR_MPHC_CHANNEL_ASSIGN_REQ *)(ptr))->n26                   = ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->starting_time.start_time.n26;
-            ((T_TR_MPHC_CHANNEL_ASSIGN_REQ *)(ptr))->bef_sti_rf_chan_cnt   = ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->frequency_list_bef_sti.rf_chan_cnt;
-            ((T_TR_MPHC_CHANNEL_ASSIGN_REQ *)(ptr))->cipher_mode           = ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->cipher_mode;
-            ((T_TR_MPHC_CHANNEL_ASSIGN_REQ *)(ptr))->a5_algorithm          = ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->a5_algorithm;
-            ((T_TR_MPHC_CHANNEL_ASSIGN_REQ *)(ptr))->dtx_allowed           = ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->dtx_allowed;
-
-          #if (AMR == 1)
-            ((T_TR_MPHC_CHANNEL_ASSIGN_REQ *)(ptr))->noise_suppression_bit        = ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->amr_configuration.noise_suppression_bit;
-            ((T_TR_MPHC_CHANNEL_ASSIGN_REQ *)(ptr))->initial_codec_mode_indicator = ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->amr_configuration.initial_codec_mode_indicator;
-            ((T_TR_MPHC_CHANNEL_ASSIGN_REQ *)(ptr))->initial_codec_mode           = ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->amr_configuration.initial_codec_mode;
-            ((T_TR_MPHC_CHANNEL_ASSIGN_REQ *)(ptr))->active_codec_set             = ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->amr_configuration.active_codec_set;
-            ((T_TR_MPHC_CHANNEL_ASSIGN_REQ *)(ptr))->threshold[0]                 = ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->amr_configuration.threshold[0];
-            ((T_TR_MPHC_CHANNEL_ASSIGN_REQ *)(ptr))->threshold[1]                 = ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->amr_configuration.threshold[1];
-            ((T_TR_MPHC_CHANNEL_ASSIGN_REQ *)(ptr))->threshold[2]                 = ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->amr_configuration.threshold[2];
-            ((T_TR_MPHC_CHANNEL_ASSIGN_REQ *)(ptr))->hysteresis[0]                = ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->amr_configuration.hysteresis[0];
-            ((T_TR_MPHC_CHANNEL_ASSIGN_REQ *)(ptr))->hysteresis[1]                = ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->amr_configuration.hysteresis[1];
-            ((T_TR_MPHC_CHANNEL_ASSIGN_REQ *)(ptr))->hysteresis[2]                = ((T_MPHC_CHANNEL_ASSIGN_REQ *)(msg->SigP))->amr_configuration.hysteresis[2];
-          #endif
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_CHANNEL_ASSIGN_REQ));
-        }
-      }
-      break;
-
-      case MPHC_CHANNEL_ASSIGN_CON:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_CHANNEL_ASSIGN_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHC_CHANNEL_ASSIGN_CON *)(ptr))->header       = TRL1_MPHC_CHANNEL_ASSIGN_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_CHANNEL_ASSIGN_CON));
-        }
-      }
-      break;
-
-      // SACCH reception
-
-      case L1C_SACCH_INFO:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1C_SACCH_INFO), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_L1C_SACCH_INFO *)(ptr))->header             = TRL1_L1C_SACCH_INFO | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_L1C_SACCH_INFO *)(ptr))->error_cause        = ((T_PH_DATA_IND *)(msg->SigP))->error_cause;
-          ((T_TR_L1C_SACCH_INFO *)(ptr))->rf_chan_num        = ((T_PH_DATA_IND *)(msg->SigP))->rf_chan_num;
-          ((T_TR_L1C_SACCH_INFO *)(ptr))->beacon_input_level = l1a_l1s_com.Scell_info.traffic_meas_beacon.input_level;
-          ((T_TR_L1C_SACCH_INFO *)(ptr))->input_level        = l1a_l1s_com.Scell_info.traffic_meas.input_level;
-          ((T_TR_L1C_SACCH_INFO *)(ptr))->tpu_offset         = l1s.tpu_offset;
-          ((T_TR_L1C_SACCH_INFO *)(ptr))->afc                = l1s.afc;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1C_SACCH_INFO));
-        }
-      }
-      break;
-
-      // Channel modification
-
-      case MPHC_CHANGE_FREQUENCY:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_CHANGE_FREQUENCY), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHC_CHANGE_FREQUENCY *)(ptr))->header             = TRL1_MPHC_CHANGE_FREQUENCY | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHC_CHANGE_FREQUENCY *)(ptr))->h                  = ((T_MPHC_CHANGE_FREQUENCY *)(msg->SigP))->channel_desc.chan_sel.h;
-          ((T_TR_MPHC_CHANGE_FREQUENCY *)(ptr))->radio_freq         = ((T_MPHC_CHANGE_FREQUENCY *)(msg->SigP))->channel_desc.chan_sel.rf_channel.single_rf.radio_freq;
-          ((T_TR_MPHC_CHANGE_FREQUENCY *)(ptr))->channel_type       = ((T_MPHC_CHANGE_FREQUENCY *)(msg->SigP))->channel_desc.channel_type;
-          ((T_TR_MPHC_CHANGE_FREQUENCY *)(ptr))->subchannel         = ((T_MPHC_CHANGE_FREQUENCY *)(msg->SigP))->channel_desc.subchannel;
-          ((T_TR_MPHC_CHANGE_FREQUENCY *)(ptr))->timeslot_no        = ((T_MPHC_CHANGE_FREQUENCY *)(msg->SigP))->channel_desc.timeslot_no;
-          ((T_TR_MPHC_CHANGE_FREQUENCY *)(ptr))->tsc                = ((T_MPHC_CHANGE_FREQUENCY *)(msg->SigP))->channel_desc.tsc;
-          ((T_TR_MPHC_CHANGE_FREQUENCY *)(ptr))->rf_chan_cnt        = ((T_MPHC_CHANGE_FREQUENCY *)(msg->SigP))->frequency_list.rf_chan_cnt;
-          ((T_TR_MPHC_CHANGE_FREQUENCY *)(ptr))->start_time_present = ((T_MPHC_CHANGE_FREQUENCY *)(msg->SigP))->starting_time.start_time_present;
-          ((T_TR_MPHC_CHANGE_FREQUENCY *)(ptr))->n32                = ((T_MPHC_CHANGE_FREQUENCY *)(msg->SigP))->starting_time.start_time.n32;
-          ((T_TR_MPHC_CHANGE_FREQUENCY *)(ptr))->n51                = ((T_MPHC_CHANGE_FREQUENCY *)(msg->SigP))->starting_time.start_time.n51;
-          ((T_TR_MPHC_CHANGE_FREQUENCY *)(ptr))->n26                = ((T_MPHC_CHANGE_FREQUENCY *)(msg->SigP))->starting_time.start_time.n26;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_CHANGE_FREQUENCY));
-        }
-      }
-      break;
-
-      case L1C_REDEF_DONE:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1C_REDEF_DONE), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_L1C_REDEF_DONE *)(ptr))->header       = TRL1_L1C_REDEF_DONE | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1C_REDEF_DONE));
-        }
-      }
-      break;
-
-      case MPHC_CHANNEL_MODE_MODIFY_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_CHANNEL_MODE_MODIFY_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-            ((T_TR_MPHC_CHANNEL_MODE_MODIFY_REQ *)(ptr))->header       = TRL1_MPHC_CHANNEL_MODE_MODIFY_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-            ((T_TR_MPHC_CHANNEL_MODE_MODIFY_REQ *)(ptr))->subchannel   = ((T_MPHC_CHANNEL_MODE_MODIFY_REQ *)(msg->SigP))->subchannel;
-            ((T_TR_MPHC_CHANNEL_MODE_MODIFY_REQ *)(ptr))->channel_mode = ((T_MPHC_CHANNEL_MODE_MODIFY_REQ *)(msg->SigP))->channel_mode;
-
-          #if (AMR == 1)
-            ((T_TR_MPHC_CHANNEL_MODE_MODIFY_REQ *)(ptr))->noise_suppression_bit        = ((T_MPHC_CHANNEL_MODE_MODIFY_REQ *)(msg->SigP))->amr_configuration.noise_suppression_bit;
-            ((T_TR_MPHC_CHANNEL_MODE_MODIFY_REQ *)(ptr))->initial_codec_mode_indicator = ((T_MPHC_CHANNEL_MODE_MODIFY_REQ *)(msg->SigP))->amr_configuration.initial_codec_mode_indicator;
-            ((T_TR_MPHC_CHANNEL_MODE_MODIFY_REQ *)(ptr))->initial_codec_mode           = ((T_MPHC_CHANNEL_MODE_MODIFY_REQ *)(msg->SigP))->amr_configuration.initial_codec_mode;
-            ((T_TR_MPHC_CHANNEL_MODE_MODIFY_REQ *)(ptr))->active_codec_set             = ((T_MPHC_CHANNEL_MODE_MODIFY_REQ *)(msg->SigP))->amr_configuration.active_codec_set;
-            ((T_TR_MPHC_CHANNEL_MODE_MODIFY_REQ *)(ptr))->threshold[0]                 = ((T_MPHC_CHANNEL_MODE_MODIFY_REQ *)(msg->SigP))->amr_configuration.threshold[0];
-            ((T_TR_MPHC_CHANNEL_MODE_MODIFY_REQ *)(ptr))->threshold[1]                 = ((T_MPHC_CHANNEL_MODE_MODIFY_REQ *)(msg->SigP))->amr_configuration.threshold[1];
-            ((T_TR_MPHC_CHANNEL_MODE_MODIFY_REQ *)(ptr))->threshold[2]                 = ((T_MPHC_CHANNEL_MODE_MODIFY_REQ *)(msg->SigP))->amr_configuration.threshold[2];
-            ((T_TR_MPHC_CHANNEL_MODE_MODIFY_REQ *)(ptr))->hysteresis[0]                = ((T_MPHC_CHANNEL_MODE_MODIFY_REQ *)(msg->SigP))->amr_configuration.hysteresis[0];
-            ((T_TR_MPHC_CHANNEL_MODE_MODIFY_REQ *)(ptr))->hysteresis[1]                = ((T_MPHC_CHANNEL_MODE_MODIFY_REQ *)(msg->SigP))->amr_configuration.hysteresis[1];
-            ((T_TR_MPHC_CHANNEL_MODE_MODIFY_REQ *)(ptr))->hysteresis[2]                = ((T_MPHC_CHANNEL_MODE_MODIFY_REQ *)(msg->SigP))->amr_configuration.hysteresis[2];
-          #endif
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_CHANNEL_MODE_MODIFY_REQ));
-        }
-      }
-      break;
-
-      // Ciphering
-
-      case MPHC_SET_CIPHERING_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_SET_CIPHERING_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHC_SET_CIPHERING_REQ *)(ptr))->header       = TRL1_MPHC_SET_CIPHERING_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHC_SET_CIPHERING_REQ *)(ptr))->cipher_mode  = ((T_MPHC_SET_CIPHERING_REQ *)(msg->SigP))->cipher_mode;
-          ((T_TR_MPHC_SET_CIPHERING_REQ *)(ptr))->a5_algorithm = ((T_MPHC_SET_CIPHERING_REQ *)(msg->SigP))->a5_algorithm;
-          ((T_TR_MPHC_SET_CIPHERING_REQ *)(ptr))->A[0]         = ((T_MPHC_SET_CIPHERING_REQ *)(msg->SigP))->new_ciph_param.A[0];
-          ((T_TR_MPHC_SET_CIPHERING_REQ *)(ptr))->A[1]         = ((T_MPHC_SET_CIPHERING_REQ *)(msg->SigP))->new_ciph_param.A[1];
-          ((T_TR_MPHC_SET_CIPHERING_REQ *)(ptr))->A[2]         = ((T_MPHC_SET_CIPHERING_REQ *)(msg->SigP))->new_ciph_param.A[2];
-          ((T_TR_MPHC_SET_CIPHERING_REQ *)(ptr))->A[3]         = ((T_MPHC_SET_CIPHERING_REQ *)(msg->SigP))->new_ciph_param.A[3];
-          ((T_TR_MPHC_SET_CIPHERING_REQ *)(ptr))->A[4]         = ((T_MPHC_SET_CIPHERING_REQ *)(msg->SigP))->new_ciph_param.A[4];
-          ((T_TR_MPHC_SET_CIPHERING_REQ *)(ptr))->A[5]         = ((T_MPHC_SET_CIPHERING_REQ *)(msg->SigP))->new_ciph_param.A[5];
-          ((T_TR_MPHC_SET_CIPHERING_REQ *)(ptr))->A[6]         = ((T_MPHC_SET_CIPHERING_REQ *)(msg->SigP))->new_ciph_param.A[6];
-          ((T_TR_MPHC_SET_CIPHERING_REQ *)(ptr))->A[7]         = ((T_MPHC_SET_CIPHERING_REQ *)(msg->SigP))->new_ciph_param.A[7];
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_SET_CIPHERING_REQ));
-        }
-      }
-      break;
-
-      // Generic stop
-
-      case MPHC_STOP_DEDICATED_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_STOP_DEDICATED_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHC_STOP_DEDICATED_REQ *)(ptr))->header       = TRL1_MPHC_STOP_DEDICATED_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_STOP_DEDICATED_REQ));
-        }
-      }
-      break;
-
-      case MPHC_STOP_DEDICATED_CON:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_STOP_DEDICATED_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHC_STOP_DEDICATED_CON *)(ptr))->header       = TRL1_MPHC_STOP_DEDICATED_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_STOP_DEDICATED_CON));
-        }
-      }
-      break;
-
-      case L1C_STOP_DEDICATED_DONE:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1C_STOP_DEDICATED_DONE), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_L1C_STOP_DEDICATED_DONE *)(ptr))->header       = TRL1_L1C_STOP_DEDICATED_DONE | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1C_STOP_DEDICATED_DONE));
-        }
-      }
-      break;
-
-      //////////////
-      // HANDOVER //
-      //////////////
-
-      // Asynchronous handover request
-
-      case MPHC_ASYNC_HO_REQ:
-      {
-        #define msg_aho ((T_MPHC_ASYNC_HO_REQ *)(msg->SigP))
-
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_ASYNC_HO_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-            ((T_TR_MPHC_ASYNC_HO_REQ *)(ptr))->header                = TRL1_MPHC_ASYNC_HO_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-            ((T_TR_MPHC_ASYNC_HO_REQ *)(ptr))->ncc                   = msg_aho->handover_command.cell_description.ncc;
-            ((T_TR_MPHC_ASYNC_HO_REQ *)(ptr))->bcc                   = msg_aho->handover_command.cell_description.bcc;
-            ((T_TR_MPHC_ASYNC_HO_REQ *)(ptr))->bcch_carrier          = msg_aho->handover_command.cell_description.bcch_carrier;
-            ((T_TR_MPHC_ASYNC_HO_REQ *)(ptr))->h                     = msg_aho->handover_command.channel_desc_1.chan_sel.h;
-            ((T_TR_MPHC_ASYNC_HO_REQ *)(ptr))->radio_freq            = msg_aho->handover_command.channel_desc_1.chan_sel.rf_channel.single_rf.radio_freq;
-            ((T_TR_MPHC_ASYNC_HO_REQ *)(ptr))->channel_type          = msg_aho->handover_command.channel_desc_1.channel_type;
-            ((T_TR_MPHC_ASYNC_HO_REQ *)(ptr))->subchannel            = msg_aho->handover_command.channel_desc_1.subchannel;
-            ((T_TR_MPHC_ASYNC_HO_REQ *)(ptr))->timeslot_no           = msg_aho->handover_command.channel_desc_1.timeslot_no;
-            ((T_TR_MPHC_ASYNC_HO_REQ *)(ptr))->tsc                   = msg_aho->handover_command.channel_desc_1.tsc;
-            ((T_TR_MPHC_ASYNC_HO_REQ *)(ptr))->channel_mode_1        = msg_aho->handover_command.channel_mode_1;
-            ((T_TR_MPHC_ASYNC_HO_REQ *)(ptr))->txpwr                 = msg_aho->handover_command.txpwr;
-            ((T_TR_MPHC_ASYNC_HO_REQ *)(ptr))->rf_chan_cnt           = msg_aho->handover_command.frequency_list.rf_chan_cnt;
-            ((T_TR_MPHC_ASYNC_HO_REQ *)(ptr))->starting_time_present = msg_aho->handover_command.starting_time.start_time_present;
-            ((T_TR_MPHC_ASYNC_HO_REQ *)(ptr))->n32                   = msg_aho->handover_command.starting_time.start_time.n32;
-            ((T_TR_MPHC_ASYNC_HO_REQ *)(ptr))->n51                   = msg_aho->handover_command.starting_time.start_time.n51;
-            ((T_TR_MPHC_ASYNC_HO_REQ *)(ptr))->n26                   = msg_aho->handover_command.starting_time.start_time.n26;
-            ((T_TR_MPHC_ASYNC_HO_REQ *)(ptr))->ho_acc                = msg_aho->handover_command.ho_acc;
-            ((T_TR_MPHC_ASYNC_HO_REQ *)(ptr))->report_time_diff      = msg_aho->handover_command.report_time_diff;
-            ((T_TR_MPHC_ASYNC_HO_REQ *)(ptr))->bef_sti_rf_chan_cnt   = msg_aho->handover_command.frequency_list_bef_sti.rf_chan_cnt;
-            ((T_TR_MPHC_ASYNC_HO_REQ *)(ptr))->cipher_mode           = msg_aho->handover_command.cipher_mode;
-            ((T_TR_MPHC_ASYNC_HO_REQ *)(ptr))->a5_algorithm          = msg_aho->handover_command.a5_algorithm;
-            ((T_TR_MPHC_ASYNC_HO_REQ *)(ptr))->fn_offset             = msg_aho->fn_offset;
-            ((T_TR_MPHC_ASYNC_HO_REQ *)(ptr))->time_alignmt          = msg_aho->time_alignmt;
-
-          #if (AMR == 1)
-            ((T_TR_MPHC_ASYNC_HO_REQ *)(ptr))->noise_suppression_bit        = msg_aho->amr_configuration.noise_suppression_bit;
-            ((T_TR_MPHC_ASYNC_HO_REQ *)(ptr))->initial_codec_mode_indicator = msg_aho->amr_configuration.initial_codec_mode_indicator;
-            ((T_TR_MPHC_ASYNC_HO_REQ *)(ptr))->initial_codec_mode           = msg_aho->amr_configuration.initial_codec_mode;
-            ((T_TR_MPHC_ASYNC_HO_REQ *)(ptr))->active_codec_set             = msg_aho->amr_configuration.active_codec_set;
-            ((T_TR_MPHC_ASYNC_HO_REQ *)(ptr))->threshold[0]                 = msg_aho->amr_configuration.threshold[0];
-            ((T_TR_MPHC_ASYNC_HO_REQ *)(ptr))->threshold[1]                 = msg_aho->amr_configuration.threshold[1];
-            ((T_TR_MPHC_ASYNC_HO_REQ *)(ptr))->threshold[2]                 = msg_aho->amr_configuration.threshold[2];
-            ((T_TR_MPHC_ASYNC_HO_REQ *)(ptr))->hysteresis[0]                = msg_aho->amr_configuration.hysteresis[0];
-            ((T_TR_MPHC_ASYNC_HO_REQ *)(ptr))->hysteresis[1]                = msg_aho->amr_configuration.hysteresis[1];
-            ((T_TR_MPHC_ASYNC_HO_REQ *)(ptr))->hysteresis[2]                = msg_aho->amr_configuration.hysteresis[2];
-          #endif
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_ASYNC_HO_REQ));
-        }
-      }
-      break;
-
-      case MPHC_ASYNC_HO_CON:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_ASYNC_HO_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHC_ASYNC_HO_CON *)(ptr))->header       = TRL1_MPHC_ASYNC_HO_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_ASYNC_HO_CON));
-        }
-      }
-      break;
-
-      // Synchronous handover request
-
-      case MPHC_SYNC_HO_REQ:
-      case MPHC_PRE_SYNC_HO_REQ:
-      case MPHC_PSEUDO_SYNC_HO_REQ:
-      {
-        #define msg_sho ((T_MPHC_SYNC_HO_REQ *)(msg->SigP))
-
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_SYNC_HO_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-            ((T_TR_MPHC_SYNC_HO_REQ *)(ptr))->header                = TRL1_MPHC_SYNC_HO_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-            ((T_TR_MPHC_SYNC_HO_REQ *)(ptr))->ncc                   = msg_sho->handover_command.cell_description.ncc;
-            ((T_TR_MPHC_SYNC_HO_REQ *)(ptr))->bcc                   = msg_sho->handover_command.cell_description.bcc;
-            ((T_TR_MPHC_SYNC_HO_REQ *)(ptr))->bcch_carrier          = msg_sho->handover_command.cell_description.bcch_carrier;
-            ((T_TR_MPHC_SYNC_HO_REQ *)(ptr))->h                     = msg_sho->handover_command.channel_desc_1.chan_sel.h;
-            ((T_TR_MPHC_SYNC_HO_REQ *)(ptr))->radio_freq            = msg_sho->handover_command.channel_desc_1.chan_sel.rf_channel.single_rf.radio_freq;
-            ((T_TR_MPHC_SYNC_HO_REQ *)(ptr))->channel_type          = msg_sho->handover_command.channel_desc_1.channel_type;
-            ((T_TR_MPHC_SYNC_HO_REQ *)(ptr))->subchannel            = msg_sho->handover_command.channel_desc_1.subchannel;
-            ((T_TR_MPHC_SYNC_HO_REQ *)(ptr))->timeslot_no           = msg_sho->handover_command.channel_desc_1.timeslot_no;
-            ((T_TR_MPHC_SYNC_HO_REQ *)(ptr))->tsc                   = msg_sho->handover_command.channel_desc_1.tsc;
-            ((T_TR_MPHC_SYNC_HO_REQ *)(ptr))->channel_mode_1        = msg_sho->handover_command.channel_mode_1;
-            ((T_TR_MPHC_SYNC_HO_REQ *)(ptr))->txpwr                 = msg_sho->handover_command.txpwr;
-            ((T_TR_MPHC_SYNC_HO_REQ *)(ptr))->rf_chan_cnt           = msg_sho->handover_command.frequency_list.rf_chan_cnt;
-            ((T_TR_MPHC_SYNC_HO_REQ *)(ptr))->starting_time_present = msg_sho->handover_command.starting_time.start_time_present;
-            ((T_TR_MPHC_SYNC_HO_REQ *)(ptr))->n32                   = msg_sho->handover_command.starting_time.start_time.n32;
-            ((T_TR_MPHC_SYNC_HO_REQ *)(ptr))->n51                   = msg_sho->handover_command.starting_time.start_time.n51;
-            ((T_TR_MPHC_SYNC_HO_REQ *)(ptr))->n26                   = msg_sho->handover_command.starting_time.start_time.n26;
-            ((T_TR_MPHC_SYNC_HO_REQ *)(ptr))->ho_acc                = msg_sho->handover_command.ho_acc;
-            ((T_TR_MPHC_SYNC_HO_REQ *)(ptr))->report_time_diff      = msg_sho->handover_command.report_time_diff;
-            ((T_TR_MPHC_SYNC_HO_REQ *)(ptr))->bef_sti_rf_chan_cnt   = msg_sho->handover_command.frequency_list_bef_sti.rf_chan_cnt;
-            ((T_TR_MPHC_SYNC_HO_REQ *)(ptr))->cipher_mode           = msg_sho->handover_command.cipher_mode;
-            ((T_TR_MPHC_SYNC_HO_REQ *)(ptr))->a5_algorithm          = msg_sho->handover_command.a5_algorithm;
-            ((T_TR_MPHC_SYNC_HO_REQ *)(ptr))->fn_offset             = msg_sho->fn_offset;
-            ((T_TR_MPHC_SYNC_HO_REQ *)(ptr))->time_alignmt          = msg_sho->time_alignmt;
-
-          #if (AMR == 1)
-            ((T_TR_MPHC_SYNC_HO_REQ *)(ptr))->noise_suppression_bit        = msg_sho->amr_configuration.noise_suppression_bit;
-            ((T_TR_MPHC_SYNC_HO_REQ *)(ptr))->initial_codec_mode_indicator = msg_sho->amr_configuration.initial_codec_mode_indicator;
-            ((T_TR_MPHC_SYNC_HO_REQ *)(ptr))->initial_codec_mode           = msg_sho->amr_configuration.initial_codec_mode;
-            ((T_TR_MPHC_SYNC_HO_REQ *)(ptr))->active_codec_set             = msg_sho->amr_configuration.active_codec_set;
-            ((T_TR_MPHC_SYNC_HO_REQ *)(ptr))->threshold[0]                 = msg_sho->amr_configuration.threshold[0];
-            ((T_TR_MPHC_SYNC_HO_REQ *)(ptr))->threshold[1]                 = msg_sho->amr_configuration.threshold[1];
-            ((T_TR_MPHC_SYNC_HO_REQ *)(ptr))->threshold[2]                 = msg_sho->amr_configuration.threshold[2];
-            ((T_TR_MPHC_SYNC_HO_REQ *)(ptr))->hysteresis[0]                = msg_sho->amr_configuration.hysteresis[0];
-            ((T_TR_MPHC_SYNC_HO_REQ *)(ptr))->hysteresis[1]                = msg_sho->amr_configuration.hysteresis[1];
-            ((T_TR_MPHC_SYNC_HO_REQ *)(ptr))->hysteresis[2]                = msg_sho->amr_configuration.hysteresis[2];
-          #endif
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_SYNC_HO_REQ));
-        }
-      }
-      break;
-
-      case MPHC_SYNC_HO_CON:
-      case MPHC_PRE_SYNC_HO_CON:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_SYNC_HO_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHC_SYNC_HO_CON *)(ptr))->header       = TRL1_MPHC_SYNC_HO_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_SYNC_HO_CON));
-        }
-      }
-      break;
-
-      case L1C_HANDOVER_FINISHED:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1C_HANDOVER_FINISHED), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_L1C_HANDOVER_FINISHED *)(ptr))->header       = TRL1_L1C_HANDOVER_FINISHED | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_L1C_HANDOVER_FINISHED *)(ptr))->cause        = ((T_MPHC_HANDOVER_FINISHED *)(msg->SigP))->cause;
-#if ((REL99 == 1) && (FF_BHO == 1))
-          ((T_TR_L1C_HANDOVER_FINISHED *)(ptr))->fn_offset      = ((T_MPHC_HANDOVER_FINISHED *)(msg->SigP))->fn_offset;
-          ((T_TR_L1C_HANDOVER_FINISHED *)(ptr))->time_alignment = ((T_MPHC_HANDOVER_FINISHED *)(msg->SigP))->time_alignment;
-#endif
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1C_HANDOVER_FINISHED));
-        }
-      }
-      break;
-
-      case MPHC_TA_FAIL_IND:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_TA_FAIL_IND), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHC_TA_FAIL_IND *)(ptr))->header       = TRL1_MPHC_TA_FAIL_IND | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_TA_FAIL_IND));
-        }
-      }
-      break;
-
-      // Handover failure
-
-      case MPHC_HANDOVER_FAIL_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_HANDOVER_FAIL_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHC_HANDOVER_FAIL_REQ *)(ptr))->header       = TRL1_MPHC_HANDOVER_FAIL_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_HANDOVER_FAIL_REQ));
-        }
-      }
-      break;
-
-      case MPHC_HANDOVER_FAIL_CON:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_HANDOVER_FAIL_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHC_HANDOVER_FAIL_CON *)(ptr))->header       = TRL1_MPHC_HANDOVER_FAIL_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_HANDOVER_FAIL_CON));
-        }
-      }
-      break;
-
-      //////////////////
-      // Measurements //
-      //////////////////
-
-      // Cell selection / PLMN selection / Extended measurements
-
-      case MPHC_RXLEV_REQ:
-      {
-        char *ptr;
-
-        trace_info.rxlev_req_count ++;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_RXLEV_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHC_RXLEV_REQ *)(ptr))->header           = TRL1_MPHC_RXLEV_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHC_RXLEV_REQ *)(ptr))->power_array_size = ((T_MPHC_RXLEV_REQ *)(msg->SigP))->power_array_size;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_RXLEV_REQ));
-        }
-      }
-      break;
-
-      case MPHC_STOP_RXLEV_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_STOP_RXLEV_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHC_STOP_RXLEV_REQ *)(ptr))->header       = TRL1_MPHC_STOP_RXLEV_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_STOP_RXLEV_REQ));
-        }
-      }
-      break;
-
-      case L1C_VALID_MEAS_INFO:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1C_VALID_MEAS_INFO), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-          ((T_TR_L1C_VALID_MEAS_INFO *)(ptr))->header            = TRL1_L1C_VALID_MEAS_INFO | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_L1C_VALID_MEAS_INFO *)(ptr))->power_array_size  = l1a_l1s_com.full_list_ptr->power_array_size;
-          ((T_TR_L1C_VALID_MEAS_INFO *)(ptr))->rxlev_req_count   = trace_info.rxlev_req_count;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1C_VALID_MEAS_INFO));
-        }
-
-        if (trace_info.rxlev_req_count == 5)
-        {
-          trace_info.rxlev_req_count = 0;
-
-          if (trace_info.current_config->l1_dyn_trace & 1<<L1_DYN_TRACE_FULL_LIST_REPORT)
-          {
-            UWORD16 index = 0;
-            UWORD16 size = l1a_l1s_com.full_list_ptr->power_array_size * 4;
-            UWORD8  i;
-
-            while (size > 0)
-            {
-              UWORD16 item_size = size;
-
-              // Split buffer in several buffers with size inferior to 240 (RVT limitation to 255)
-              // Header not inluded (+8b)
-              if (item_size > 240) item_size = 240;
-
-              if (rvt_mem_alloc(trace_info.l1_trace_user_id, item_size + sizeof(T_TR_FULL_LIST_REPORT) - sizeof(UWORD32), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-              {
-                ((T_TR_FULL_LIST_REPORT *)(ptr))->header            = TRL1_FULL_LIST_REPORT | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-                ((T_TR_FULL_LIST_REPORT *)(ptr))->size              = (item_size >> 2);
-
-                for (i=0; i<(item_size >> 2); i++)
-                {
-                   ((T_TR_FULL_LIST_REPORT *)(ptr))->content[i]  = l1a_l1s_com.full_list_ptr->power_array[index].radio_freq;
-                   ((T_TR_FULL_LIST_REPORT *)(ptr))->content[i] |= l1a_l1s_com.full_list_ptr->power_array[index].accum_power_result << 16;
-                   index++;
-                }
-
-                size -= item_size;
-
-                L1_send_trace_no_cpy(ptr,item_size + sizeof(T_TR_FULL_LIST_REPORT) - sizeof(UWORD32));
-              }
-              else
-                break;
-            }
-          }
-        } // 5th attempt
-      }
-      break;
-
-      // Idle mode BA list
-
-      case MPHC_RXLEV_PERIODIC_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_RXLEV_PERIODIC_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHC_RXLEV_PERIODIC_REQ *)(ptr))->header                   = TRL1_MPHC_RXLEV_PERIODIC_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHC_RXLEV_PERIODIC_REQ *)(ptr))->num_of_chans             = ((T_MPHC_RXLEV_PERIODIC_REQ *)(msg->SigP))->num_of_chans;
-          ((T_TR_MPHC_RXLEV_PERIODIC_REQ *)(ptr))->ba_id                    = ((T_MPHC_RXLEV_PERIODIC_REQ *)(msg->SigP))->ba_id;
-          ((T_TR_MPHC_RXLEV_PERIODIC_REQ *)(ptr))->next_radio_freq_measured = ((T_MPHC_RXLEV_PERIODIC_REQ *)(msg->SigP))->next_radio_freq_measured;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_RXLEV_PERIODIC_REQ));
-        }
-      }
-      break;
-
-      case MPHC_STOP_RXLEV_PERIODIC_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_STOP_RXLEV_PERIODIC_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHC_STOP_RXLEV_PERIODIC_REQ *)(ptr))->header       = TRL1_MPHC_STOP_RXLEV_PERIODIC_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_STOP_RXLEV_PERIODIC_REQ));
-        }
-      }
-      break;
-
-      case L1C_RXLEV_PERIODIC_DONE:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1C_RXLEV_PERIODIC_DONE), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_L1C_RXLEV_PERIODIC_DONE *)(ptr))->header           = TRL1_L1C_RXLEV_PERIODIC_DONE | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_L1C_RXLEV_PERIODIC_DONE *)(ptr))->ba_id            = ((T_MPHC_RXLEV_PERIODIC_IND *)(msg->SigP))->ba_id;
-          ((T_TR_L1C_RXLEV_PERIODIC_DONE *)(ptr))->s_rxlev          = ((T_MPHC_RXLEV_PERIODIC_IND *)(msg->SigP))->s_rxlev;
-          ((T_TR_L1C_RXLEV_PERIODIC_DONE *)(ptr))->radio_freq_no[0] = ((T_MPHC_RXLEV_PERIODIC_IND *)(msg->SigP))->A[0].radio_freq_no;
-          ((T_TR_L1C_RXLEV_PERIODIC_DONE *)(ptr))->radio_freq_no[1] = ((T_MPHC_RXLEV_PERIODIC_IND *)(msg->SigP))->A[1].radio_freq_no;
-          ((T_TR_L1C_RXLEV_PERIODIC_DONE *)(ptr))->radio_freq_no[2] = ((T_MPHC_RXLEV_PERIODIC_IND *)(msg->SigP))->A[2].radio_freq_no;
-          ((T_TR_L1C_RXLEV_PERIODIC_DONE *)(ptr))->radio_freq_no[3] = ((T_MPHC_RXLEV_PERIODIC_IND *)(msg->SigP))->A[3].radio_freq_no;
-          ((T_TR_L1C_RXLEV_PERIODIC_DONE *)(ptr))->radio_freq_no[4] = ((T_MPHC_RXLEV_PERIODIC_IND *)(msg->SigP))->A[4].radio_freq_no;
-          ((T_TR_L1C_RXLEV_PERIODIC_DONE *)(ptr))->radio_freq_no[5] = ((T_MPHC_RXLEV_PERIODIC_IND *)(msg->SigP))->A[5].radio_freq_no;
-          ((T_TR_L1C_RXLEV_PERIODIC_DONE *)(ptr))->radio_freq_no[6] = ((T_MPHC_RXLEV_PERIODIC_IND *)(msg->SigP))->A[6].radio_freq_no;
-          ((T_TR_L1C_RXLEV_PERIODIC_DONE *)(ptr))->radio_freq_no[7] = ((T_MPHC_RXLEV_PERIODIC_IND *)(msg->SigP))->A[7].radio_freq_no;
-          ((T_TR_L1C_RXLEV_PERIODIC_DONE *)(ptr))->rxlev[0]         = ((T_MPHC_RXLEV_PERIODIC_IND *)(msg->SigP))->A[0].rxlev;
-          ((T_TR_L1C_RXLEV_PERIODIC_DONE *)(ptr))->rxlev[1]         = ((T_MPHC_RXLEV_PERIODIC_IND *)(msg->SigP))->A[1].rxlev;
-          ((T_TR_L1C_RXLEV_PERIODIC_DONE *)(ptr))->rxlev[2]         = ((T_MPHC_RXLEV_PERIODIC_IND *)(msg->SigP))->A[2].rxlev;
-          ((T_TR_L1C_RXLEV_PERIODIC_DONE *)(ptr))->rxlev[3]         = ((T_MPHC_RXLEV_PERIODIC_IND *)(msg->SigP))->A[3].rxlev;
-          ((T_TR_L1C_RXLEV_PERIODIC_DONE *)(ptr))->rxlev[4]         = ((T_MPHC_RXLEV_PERIODIC_IND *)(msg->SigP))->A[4].rxlev;
-          ((T_TR_L1C_RXLEV_PERIODIC_DONE *)(ptr))->rxlev[5]         = ((T_MPHC_RXLEV_PERIODIC_IND *)(msg->SigP))->A[5].rxlev;
-          ((T_TR_L1C_RXLEV_PERIODIC_DONE *)(ptr))->rxlev[6]         = ((T_MPHC_RXLEV_PERIODIC_IND *)(msg->SigP))->A[6].rxlev;
-          ((T_TR_L1C_RXLEV_PERIODIC_DONE *)(ptr))->rxlev[7]         = ((T_MPHC_RXLEV_PERIODIC_IND *)(msg->SigP))->A[7].rxlev;
-((T_TR_L1C_RXLEV_PERIODIC_DONE *)(ptr))->qual_acc_idle            = ((T_MPHC_RXLEV_PERIODIC_IND *)(msg->SigP))->qual_acc_idle;
-          ((T_TR_L1C_RXLEV_PERIODIC_DONE *)(ptr))->qual_nbr_meas_idle           = ((T_MPHC_RXLEV_PERIODIC_IND *)(msg->SigP))->qual_nbr_meas_idle;
-
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1C_RXLEV_PERIODIC_DONE));
-        }
-      }
-      break;
-
-
-      // Dedicated mode BA list
-
-      case MPHC_MEAS_REPORT:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1C_MEAS_DONE), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_L1C_MEAS_DONE *)(ptr))->header                   = TRL1_L1C_MEAS_DONE | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_L1C_MEAS_DONE *)(ptr))->meas_valid               = ((T_MPHC_MEAS_REPORT *)(msg->SigP))->meas_valid;
-          ((T_TR_L1C_MEAS_DONE *)(ptr))->txpwr_used               = ((T_MPHC_MEAS_REPORT *)(msg->SigP))->txpwr_used;
-          ((T_TR_L1C_MEAS_DONE *)(ptr))->timing_advance           = ((T_MPHC_MEAS_REPORT *)(msg->SigP))->timing_advance;
-          ((T_TR_L1C_MEAS_DONE *)(ptr))->rxlev_full_acc           = ((T_MPHC_MEAS_REPORT *)(msg->SigP))->rxlev_full_acc;
-          ((T_TR_L1C_MEAS_DONE *)(ptr))->rxlev_full_nbr_meas      = ((T_MPHC_MEAS_REPORT *)(msg->SigP))->rxlev_full_nbr_meas;
-          ((T_TR_L1C_MEAS_DONE *)(ptr))->rxlev_sub_acc            = ((T_MPHC_MEAS_REPORT *)(msg->SigP))->rxlev_sub_acc;
-          ((T_TR_L1C_MEAS_DONE *)(ptr))->rxlev_sub_nbr_meas       = ((T_MPHC_MEAS_REPORT *)(msg->SigP))->rxlev_sub_nbr_meas;
-          ((T_TR_L1C_MEAS_DONE *)(ptr))->rxqual_full_acc_errors   = ((T_MPHC_MEAS_REPORT *)(msg->SigP))->rxqual_full_acc_errors;
-          ((T_TR_L1C_MEAS_DONE *)(ptr))->rxqual_full_nbr_bits     = ((T_MPHC_MEAS_REPORT *)(msg->SigP))->rxqual_full_nbr_bits;
-          ((T_TR_L1C_MEAS_DONE *)(ptr))->rxqual_sub_acc_errors    = ((T_MPHC_MEAS_REPORT *)(msg->SigP))->rxqual_sub_acc_errors;
-          ((T_TR_L1C_MEAS_DONE *)(ptr))->rxqual_sub_nbr_bits      = ((T_MPHC_MEAS_REPORT *)(msg->SigP))->rxqual_sub_nbr_bits;
-          #if(REL99)
-          #if(FF_EMR)
-            ((T_TR_L1C_MEAS_DONE *)(ptr))->rxlev_val_acc;         = ((T_MPHC_MEAS_REPORT *)(msg->SigP))->rxlev_val_acc;
-            ((T_TR_L1C_MEAS_DONE *)(ptr))->rxlev_val_nbr_meas;    = ((T_MPHC_MEAS_REPORT *)(msg->SigP))->rxlev_val_nbr_meas;
-            ((T_TR_L1C_MEAS_DONE *)(ptr))->mean_bep_block_acc;    = ((T_MPHC_MEAS_REPORT *)(msg->SigP))->mean_bep_block_acc;
-            ((T_TR_L1C_MEAS_DONE *)(ptr))->cv_bep_block_acc;      = ((T_MPHC_MEAS_REPORT *)(msg->SigP))->cv_bep_block_acc;
-            ((T_TR_L1C_MEAS_DONE *)(ptr))->mean_bep_block_num;    = ((T_MPHC_MEAS_REPORT *)(msg->SigP))->mean_bep_block_num;
-            ((T_TR_L1C_MEAS_DONE *)(ptr))->cv_bep_block_num;      = ((T_MPHC_MEAS_REPORT *)(msg->SigP))->cv_bep_block_num;
-            ((T_TR_L1C_MEAS_DONE *)(ptr))->nbr_rcvd_blocks;       = ((T_MPHC_MEAS_REPORT *)(msg->SigP))->nbr_rcvd_blocks;
-          #endif
-          #endif
-          ((T_TR_L1C_MEAS_DONE *)(ptr))->facch_ul_count           = ((T_MPHC_MEAS_REPORT *)(msg->SigP))->facch_ul_count;
-          ((T_TR_L1C_MEAS_DONE *)(ptr))->facch_dl_count           = ((T_MPHC_MEAS_REPORT *)(msg->SigP))->facch_dl_count;
-          ((T_TR_L1C_MEAS_DONE *)(ptr))->bcch_freq[0]             = ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[0].bcch_freq;
-          ((T_TR_L1C_MEAS_DONE *)(ptr))->bcch_freq[1]             = ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[1].bcch_freq;
-          ((T_TR_L1C_MEAS_DONE *)(ptr))->bcch_freq[2]             = ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[2].bcch_freq;
-          ((T_TR_L1C_MEAS_DONE *)(ptr))->bcch_freq[3]             = ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[3].bcch_freq;
-          ((T_TR_L1C_MEAS_DONE *)(ptr))->bcch_freq[4]             = ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[4].bcch_freq;
-          ((T_TR_L1C_MEAS_DONE *)(ptr))->bcch_freq[5]             = ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[5].bcch_freq;
-          ((T_TR_L1C_MEAS_DONE *)(ptr))->rxlev_acc[0]             = ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[0].rxlev_acc;
-          ((T_TR_L1C_MEAS_DONE *)(ptr))->rxlev_acc[1]             = ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[1].rxlev_acc;
-          ((T_TR_L1C_MEAS_DONE *)(ptr))->rxlev_acc[2]             = ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[2].rxlev_acc;
-          ((T_TR_L1C_MEAS_DONE *)(ptr))->rxlev_acc[3]             = ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[3].rxlev_acc;
-          ((T_TR_L1C_MEAS_DONE *)(ptr))->rxlev_acc[4]             = ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[4].rxlev_acc;
-          ((T_TR_L1C_MEAS_DONE *)(ptr))->rxlev_acc[5]             = ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[5].rxlev_acc;
-          ((T_TR_L1C_MEAS_DONE *)(ptr))->rxlev_nbr_meas[0]        = ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[0].rxlev_nbr_meas;
-          ((T_TR_L1C_MEAS_DONE *)(ptr))->rxlev_nbr_meas[1]        = ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[1].rxlev_nbr_meas;
-          ((T_TR_L1C_MEAS_DONE *)(ptr))->rxlev_nbr_meas[2]        = ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[2].rxlev_nbr_meas;
-          ((T_TR_L1C_MEAS_DONE *)(ptr))->rxlev_nbr_meas[3]        = ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[3].rxlev_nbr_meas;
-          ((T_TR_L1C_MEAS_DONE *)(ptr))->rxlev_nbr_meas[4]        = ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[4].rxlev_nbr_meas;
-          ((T_TR_L1C_MEAS_DONE *)(ptr))->rxlev_nbr_meas[5]        = ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[5].rxlev_nbr_meas;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1C_MEAS_DONE));
-        }
-      }
-      break;
-
-      // Update BA list
-
-      case MPHC_UPDATE_BA_LIST:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHC_UPDATE_BA_LIST), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHC_UPDATE_BA_LIST *)(ptr))->header       = TRL1_MPHC_UPDATE_BA_LIST | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHC_UPDATE_BA_LIST *)(ptr))->num_of_chans = ((T_MPHC_UPDATE_BA_LIST *)(msg->SigP))->num_of_chans;
-          ((T_TR_MPHC_UPDATE_BA_LIST *)(ptr))->pwrc         = ((T_MPHC_UPDATE_BA_LIST *)(msg->SigP))->pwrc;
-          ((T_TR_MPHC_UPDATE_BA_LIST *)(ptr))->dtx_allowed  = ((T_MPHC_UPDATE_BA_LIST *)(msg->SigP))->dtx_allowed;
-          ((T_TR_MPHC_UPDATE_BA_LIST *)(ptr))->ba_id        = ((T_MPHC_UPDATE_BA_LIST *)(msg->SigP))->ba_id;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHC_UPDATE_BA_LIST));
-        }
-      }
-      break;
-
-    #if L1_GPRS
-
-      /********************************************************************************/
-      /* PACKET SWITCHED                                                              */
-      /********************************************************************************/
-
-      //////////////////////////////
-      // Neighbor cell monitoring //
-      //////////////////////////////
-
-      // Neighbor PBCCH reading
-
-      case MPHP_NCELL_PBCCH_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHP_NCELL_PBCCH_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHP_NCELL_PBCCH_REQ *)(ptr))->header             = TRL1_MPHP_NCELL_PBCCH_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHP_NCELL_PBCCH_REQ *)(ptr))->bs_pbcch_blks      = ((T_MPHP_NCELL_PBCCH_REQ *)(msg->SigP))->bs_pbcch_blks;
-          ((T_TR_MPHP_NCELL_PBCCH_REQ *)(ptr))->pb                 = ((T_MPHP_NCELL_PBCCH_REQ *)(msg->SigP))->pb;
-          ((T_TR_MPHP_NCELL_PBCCH_REQ *)(ptr))->psi1_repeat_period = ((T_MPHP_NCELL_PBCCH_REQ *)(msg->SigP))->psi1_repeat_period;
-          ((T_TR_MPHP_NCELL_PBCCH_REQ *)(ptr))->relative_position  = ((T_MPHP_NCELL_PBCCH_REQ *)(msg->SigP))->relative_position;
-          ((T_TR_MPHP_NCELL_PBCCH_REQ *)(ptr))->h                  = ((T_MPHP_NCELL_PBCCH_REQ *)(msg->SigP))->packet_chn_desc.chan_sel.h;
-          ((T_TR_MPHP_NCELL_PBCCH_REQ *)(ptr))->radio_freq         = ((T_MPHP_NCELL_PBCCH_REQ *)(msg->SigP))->packet_chn_desc.chan_sel.rf_channel.single_rf.radio_freq;
-          ((T_TR_MPHP_NCELL_PBCCH_REQ *)(ptr))->timeslot_no        = ((T_MPHP_NCELL_PBCCH_REQ *)(msg->SigP))->packet_chn_desc.timeslot_no;
-          ((T_TR_MPHP_NCELL_PBCCH_REQ *)(ptr))->tsc                = ((T_MPHP_NCELL_PBCCH_REQ *)(msg->SigP))->packet_chn_desc.tsc;
-          ((T_TR_MPHP_NCELL_PBCCH_REQ *)(ptr))->rf_chan_cnt        = ((T_MPHP_NCELL_PBCCH_REQ *)(msg->SigP))->frequency_list.rf_chan_cnt;
-          ((T_TR_MPHP_NCELL_PBCCH_REQ *)(ptr))->bcch_carrier       = ((T_MPHP_NCELL_PBCCH_REQ *)(msg->SigP))->bcch_carrier;
-          ((T_TR_MPHP_NCELL_PBCCH_REQ *)(ptr))->fn_offset          = ((T_MPHP_NCELL_PBCCH_REQ *)(msg->SigP))->fn_offset;
-          ((T_TR_MPHP_NCELL_PBCCH_REQ *)(ptr))->time_alignment     = ((T_MPHP_NCELL_PBCCH_REQ *)(msg->SigP))->time_alignment;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHP_NCELL_PBCCH_REQ));
-        }
-      }
-      break;
-
-      case MPHP_NCELL_PBCCH_STOP_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHP_NCELL_PBCCH_STOP_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHP_NCELL_PBCCH_STOP_REQ *)(ptr))->header       = TRL1_MPHP_NCELL_PBCCH_STOP_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHP_NCELL_PBCCH_STOP_REQ));
-        }
-      }
-      break;
-
-      case L1P_PBCCHN_INFO:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1P_PBCCHN_INFO), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_L1P_PBCCHN_INFO *)(ptr))->header            = TRL1_L1P_PBCCHN_INFO | (((T_MPHP_DATA_IND *)(msg->SigP))->fn << TR_HEADER_FN_DELAY);
-          ((T_TR_L1P_PBCCHN_INFO *)(ptr))->error_flag        = ((T_MPHP_DATA_IND *)(msg->SigP))->error_flag;
-          ((T_TR_L1P_PBCCHN_INFO *)(ptr))->radio_freq        = ((T_MPHP_DATA_IND *)(msg->SigP))->radio_freq;
-          ((T_TR_L1P_PBCCHN_INFO *)(ptr))->relative_position = ((T_MPHP_DATA_IND *)(msg->SigP))->relative_position;
-          ((T_TR_L1P_PBCCHN_INFO *)(ptr))->input_level       = l1a_l1s_com.last_input_level[l1pa_l1ps_com.pbcchn.bcch_carrier -
-                                                                                           l1_config.std.radio_freq_index_offset].input_level;
-          ((T_TR_L1P_PBCCHN_INFO *)(ptr))->tpu_offset        = l1s.tpu_offset;
-          ((T_TR_L1P_PBCCHN_INFO *)(ptr))->afc               = l1s.afc;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1P_PBCCHN_INFO));
-        }
-      }
-      break;
-
-      //////////////////////////////////////////////////////
-      // Serving cell normal burst reading in packet idle //
-      //////////////////////////////////////////////////////
-
-      // PCCCH reading
-
-      case MPHP_START_PCCCH_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHP_START_PCCCH_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHP_START_PCCCH_REQ *)(ptr))->header          = TRL1_MPHP_START_PCCCH_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHP_START_PCCCH_REQ *)(ptr))->imsimod         = ((T_MPHP_START_PCCCH_REQ *)(msg->SigP))->imsimod;
-          ((T_TR_MPHP_START_PCCCH_REQ *)(ptr))->kcn             = ((T_MPHP_START_PCCCH_REQ *)(msg->SigP))->kcn;
-          ((T_TR_MPHP_START_PCCCH_REQ *)(ptr))->split_pg_cycle  = ((T_MPHP_START_PCCCH_REQ *)(msg->SigP))->split_pg_cycle;
-          ((T_TR_MPHP_START_PCCCH_REQ *)(ptr))->bs_pag_blks_res = ((T_MPHP_START_PCCCH_REQ *)(msg->SigP))->bs_pag_blks_res;
-          ((T_TR_MPHP_START_PCCCH_REQ *)(ptr))->bs_pbcch_blks   = ((T_MPHP_START_PCCCH_REQ *)(msg->SigP))->bs_pbcch_blks;
-          ((T_TR_MPHP_START_PCCCH_REQ *)(ptr))->pb              = ((T_MPHP_START_PCCCH_REQ *)(msg->SigP))->pb;
-          ((T_TR_MPHP_START_PCCCH_REQ *)(ptr))->page_mode       = ((T_MPHP_START_PCCCH_REQ *)(msg->SigP))->page_mode;
-          ((T_TR_MPHP_START_PCCCH_REQ *)(ptr))->h               = ((T_MPHP_START_PCCCH_REQ *)(msg->SigP))->packet_chn_desc.chan_sel.h;
-          ((T_TR_MPHP_START_PCCCH_REQ *)(ptr))->radio_freq      = ((T_MPHP_START_PCCCH_REQ *)(msg->SigP))->packet_chn_desc.chan_sel.rf_channel.single_rf.radio_freq;
-          ((T_TR_MPHP_START_PCCCH_REQ *)(ptr))->timeslot_no     = ((T_MPHP_START_PCCCH_REQ *)(msg->SigP))->packet_chn_desc.timeslot_no;
-          ((T_TR_MPHP_START_PCCCH_REQ *)(ptr))->tsc             = ((T_MPHP_START_PCCCH_REQ *)(msg->SigP))->packet_chn_desc.tsc;
-          ((T_TR_MPHP_START_PCCCH_REQ *)(ptr))->rf_chan_cnt     = ((T_MPHP_START_PCCCH_REQ *)(msg->SigP))->frequency_list.rf_chan_cnt;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHP_START_PCCCH_REQ));
-        }
-      }
-      break;
-
-      case MPHP_STOP_PCCCH_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHP_STOP_PCCCH_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHP_STOP_PCCCH_REQ *)(ptr))->header       = TRL1_MPHP_STOP_PCCCH_REQ;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHP_STOP_PCCCH_REQ));
-        }
-      }
-      break;
-
-      case L1P_PNP_INFO:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1P_PNP_INFO), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_L1P_PNP_INFO *)(ptr))->header            = TRL1_L1P_PNP_INFO | (((T_MPHP_DATA_IND *)(msg->SigP))->fn << TR_HEADER_FN_DELAY);
-          ((T_TR_L1P_PNP_INFO *)(ptr))->error_flag        = ((T_MPHP_DATA_IND *)(msg->SigP))->error_flag;
-          ((T_TR_L1P_PNP_INFO *)(ptr))->radio_freq        = ((T_MPHP_DATA_IND *)(msg->SigP))->radio_freq;
-          ((T_TR_L1P_PNP_INFO *)(ptr))->relative_position = ((T_MPHP_DATA_IND *)(msg->SigP))->relative_position;
-          ((T_TR_L1P_PNP_INFO *)(ptr))->input_level       = l1a_l1s_com.Scell_IL_for_rxlev;
-          ((T_TR_L1P_PNP_INFO *)(ptr))->tpu_offset        = l1s.tpu_offset;
-          ((T_TR_L1P_PNP_INFO *)(ptr))->afc               = l1s.afc;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1P_PNP_INFO));
-        }
-      }
-      break;
-
-      case L1P_PEP_INFO:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1P_PEP_INFO), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_L1P_PEP_INFO *)(ptr))->header            = TRL1_L1P_PEP_INFO | (((T_MPHP_DATA_IND *)(msg->SigP))->fn << TR_HEADER_FN_DELAY);
-          ((T_TR_L1P_PEP_INFO *)(ptr))->error_flag        = ((T_MPHP_DATA_IND *)(msg->SigP))->error_flag;
-          ((T_TR_L1P_PEP_INFO *)(ptr))->radio_freq        = ((T_MPHP_DATA_IND *)(msg->SigP))->radio_freq;
-          ((T_TR_L1P_PEP_INFO *)(ptr))->relative_position = ((T_MPHP_DATA_IND *)(msg->SigP))->relative_position;
-          ((T_TR_L1P_PEP_INFO *)(ptr))->input_level       = l1a_l1s_com.Scell_IL_for_rxlev;
-          ((T_TR_L1P_PEP_INFO *)(ptr))->tpu_offset        = l1s.tpu_offset;
-          ((T_TR_L1P_PEP_INFO *)(ptr))->afc               = l1s.afc;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1P_PEP_INFO));
-        }
-      }
-      break;
-
-      case L1P_PALLC_INFO:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1P_PALLC_INFO), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_L1P_PALLC_INFO *)(ptr))->header            = TRL1_L1P_PALLC_INFO | (((T_MPHP_DATA_IND *)(msg->SigP))->fn << TR_HEADER_FN_DELAY);
-          ((T_TR_L1P_PALLC_INFO *)(ptr))->error_flag        = ((T_MPHP_DATA_IND *)(msg->SigP))->error_flag;
-          ((T_TR_L1P_PALLC_INFO *)(ptr))->radio_freq        = ((T_MPHP_DATA_IND *)(msg->SigP))->radio_freq;
-          ((T_TR_L1P_PALLC_INFO *)(ptr))->relative_position = ((T_MPHP_DATA_IND *)(msg->SigP))->relative_position;
-          ((T_TR_L1P_PALLC_INFO *)(ptr))->input_level       = l1a_l1s_com.Scell_IL_for_rxlev;
-          ((T_TR_L1P_PALLC_INFO *)(ptr))->tpu_offset        = l1s.tpu_offset;
-          ((T_TR_L1P_PALLC_INFO *)(ptr))->afc               = l1s.afc;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1P_PALLC_INFO));
-        }
-      }
-      break;
-
-      // PBCCH reading
-
-      case MPHP_SCELL_PBCCH_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHP_SCELL_PBCCH_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHP_SCELL_PBCCH_REQ *)(ptr))->header                      = TRL1_MPHP_SCELL_PBCCH_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHP_SCELL_PBCCH_REQ *)(ptr))->nbr_psi                     = ((T_MPHP_SCELL_PBCCH_REQ *)(msg->SigP))->nbr_psi;
-          ((T_TR_MPHP_SCELL_PBCCH_REQ *)(ptr))->bs_pbcch_blks               = ((T_MPHP_SCELL_PBCCH_REQ *)(msg->SigP))->bs_pbcch_blks;
-          ((T_TR_MPHP_SCELL_PBCCH_REQ *)(ptr))->pb                          = ((T_MPHP_SCELL_PBCCH_REQ *)(msg->SigP))->pb;
-          ((T_TR_MPHP_SCELL_PBCCH_REQ *)(ptr))->psi1_repeat_period          = ((T_MPHP_SCELL_PBCCH_REQ *)(msg->SigP))->psi1_repeat_period;
-          ((T_TR_MPHP_SCELL_PBCCH_REQ *)(ptr))->h                           = ((T_MPHP_SCELL_PBCCH_REQ *)(msg->SigP))->packet_chn_desc.chan_sel.h;
-          ((T_TR_MPHP_SCELL_PBCCH_REQ *)(ptr))->radio_freq                  = ((T_MPHP_SCELL_PBCCH_REQ *)(msg->SigP))->packet_chn_desc.chan_sel.rf_channel.single_rf.radio_freq;
-          ((T_TR_MPHP_SCELL_PBCCH_REQ *)(ptr))->timeslot_no                 = ((T_MPHP_SCELL_PBCCH_REQ *)(msg->SigP))->packet_chn_desc.timeslot_no;
-          ((T_TR_MPHP_SCELL_PBCCH_REQ *)(ptr))->tsc                         = ((T_MPHP_SCELL_PBCCH_REQ *)(msg->SigP))->packet_chn_desc.tsc;
-          ((T_TR_MPHP_SCELL_PBCCH_REQ *)(ptr))->rf_chan_cnt                 = ((T_MPHP_SCELL_PBCCH_REQ *)(msg->SigP))->frequency_list.rf_chan_cnt;
-          ((T_TR_MPHP_SCELL_PBCCH_REQ *)(ptr))->relative_position_array[0]  = ((T_MPHP_SCELL_PBCCH_REQ *)(msg->SigP))->relative_position_array[0];
-          ((T_TR_MPHP_SCELL_PBCCH_REQ *)(ptr))->relative_position_array[1]  = ((T_MPHP_SCELL_PBCCH_REQ *)(msg->SigP))->relative_position_array[1];
-          ((T_TR_MPHP_SCELL_PBCCH_REQ *)(ptr))->relative_position_array[2]  = ((T_MPHP_SCELL_PBCCH_REQ *)(msg->SigP))->relative_position_array[2];
-          ((T_TR_MPHP_SCELL_PBCCH_REQ *)(ptr))->relative_position_array[3]  = ((T_MPHP_SCELL_PBCCH_REQ *)(msg->SigP))->relative_position_array[3];
-          ((T_TR_MPHP_SCELL_PBCCH_REQ *)(ptr))->relative_position_array[4]  = ((T_MPHP_SCELL_PBCCH_REQ *)(msg->SigP))->relative_position_array[4];
-          ((T_TR_MPHP_SCELL_PBCCH_REQ *)(ptr))->relative_position_array[5]  = ((T_MPHP_SCELL_PBCCH_REQ *)(msg->SigP))->relative_position_array[5];
-          ((T_TR_MPHP_SCELL_PBCCH_REQ *)(ptr))->relative_position_array[6]  = ((T_MPHP_SCELL_PBCCH_REQ *)(msg->SigP))->relative_position_array[6];
-          ((T_TR_MPHP_SCELL_PBCCH_REQ *)(ptr))->relative_position_array[7]  = ((T_MPHP_SCELL_PBCCH_REQ *)(msg->SigP))->relative_position_array[7];
-          ((T_TR_MPHP_SCELL_PBCCH_REQ *)(ptr))->relative_position_array[8]  = ((T_MPHP_SCELL_PBCCH_REQ *)(msg->SigP))->relative_position_array[8];
-          ((T_TR_MPHP_SCELL_PBCCH_REQ *)(ptr))->relative_position_array[9]  = ((T_MPHP_SCELL_PBCCH_REQ *)(msg->SigP))->relative_position_array[9];
-          ((T_TR_MPHP_SCELL_PBCCH_REQ *)(ptr))->relative_position_array[10] = ((T_MPHP_SCELL_PBCCH_REQ *)(msg->SigP))->relative_position_array[10];
-          ((T_TR_MPHP_SCELL_PBCCH_REQ *)(ptr))->relative_position_array[11] = ((T_MPHP_SCELL_PBCCH_REQ *)(msg->SigP))->relative_position_array[11];
-          ((T_TR_MPHP_SCELL_PBCCH_REQ *)(ptr))->relative_position_array[12] = ((T_MPHP_SCELL_PBCCH_REQ *)(msg->SigP))->relative_position_array[12];
-          ((T_TR_MPHP_SCELL_PBCCH_REQ *)(ptr))->relative_position_array[13] = ((T_MPHP_SCELL_PBCCH_REQ *)(msg->SigP))->relative_position_array[13];
-          ((T_TR_MPHP_SCELL_PBCCH_REQ *)(ptr))->relative_position_array[14] = ((T_MPHP_SCELL_PBCCH_REQ *)(msg->SigP))->relative_position_array[14];
-          ((T_TR_MPHP_SCELL_PBCCH_REQ *)(ptr))->relative_position_array[15] = ((T_MPHP_SCELL_PBCCH_REQ *)(msg->SigP))->relative_position_array[15];
-          ((T_TR_MPHP_SCELL_PBCCH_REQ *)(ptr))->relative_position_array[16] = ((T_MPHP_SCELL_PBCCH_REQ *)(msg->SigP))->relative_position_array[16];
-          ((T_TR_MPHP_SCELL_PBCCH_REQ *)(ptr))->relative_position_array[17] = ((T_MPHP_SCELL_PBCCH_REQ *)(msg->SigP))->relative_position_array[17];
-          ((T_TR_MPHP_SCELL_PBCCH_REQ *)(ptr))->relative_position_array[18] = ((T_MPHP_SCELL_PBCCH_REQ *)(msg->SigP))->relative_position_array[18];
-          ((T_TR_MPHP_SCELL_PBCCH_REQ *)(ptr))->relative_position_array[19] = ((T_MPHP_SCELL_PBCCH_REQ *)(msg->SigP))->relative_position_array[19];
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHP_SCELL_PBCCH_REQ));
-        }
-      }
-      break;
-
-      case MPHP_SCELL_PBCCH_STOP_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHP_SCELL_PBCCH_STOP_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHP_SCELL_PBCCH_STOP_REQ *)(ptr))->header       = TRL1_MPHP_SCELL_PBCCH_STOP_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHP_SCELL_PBCCH_STOP_REQ));
-        }
-      }
-      break;
-
-      case L1P_PBCCHS_INFO:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1P_PBCCHS_INFO), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_L1P_PBCCHS_INFO *)(ptr))->header            = TRL1_L1P_PBCCHS_INFO | (((T_MPHP_DATA_IND *)(msg->SigP))->fn << TR_HEADER_FN_DELAY);
-          ((T_TR_L1P_PBCCHS_INFO *)(ptr))->error_flag        = ((T_MPHP_DATA_IND *)(msg->SigP))->error_flag;
-          ((T_TR_L1P_PBCCHS_INFO *)(ptr))->radio_freq        = ((T_MPHP_DATA_IND *)(msg->SigP))->radio_freq;
-          ((T_TR_L1P_PBCCHS_INFO *)(ptr))->relative_position = ((T_MPHP_DATA_IND *)(msg->SigP))->relative_position;
-          ((T_TR_L1P_PBCCHS_INFO *)(ptr))->input_level       = l1a_l1s_com.Scell_IL_for_rxlev;
-          ((T_TR_L1P_PBCCHS_INFO *)(ptr))->tpu_offset        = l1s.tpu_offset;
-          ((T_TR_L1P_PBCCHS_INFO *)(ptr))->afc               = l1s.afc;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1P_PBCCHS_INFO));
-        }
-      }
-      break;
-
-      ///////////////////
-      // Packet Access //
-      ///////////////////
-
-      // Random access
-
-      case MPHP_RA_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHP_RA_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHP_RA_REQ *)(ptr))->header               = TRL1_MPHP_RA_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHP_RA_REQ *)(ptr))->txpwr                = ((T_MPHP_RA_REQ *)(msg->SigP))->txpwr;
-          ((T_TR_MPHP_RA_REQ *)(ptr))->rand                 = ((T_MPHP_RA_REQ *)(msg->SigP))->rand;
-          ((T_TR_MPHP_RA_REQ *)(ptr))->channel_request_data = ((T_MPHP_RA_REQ *)(msg->SigP))->channel_request_data;
-          ((T_TR_MPHP_RA_REQ *)(ptr))->bs_prach_blks        = ((T_MPHP_RA_REQ *)(msg->SigP))->bs_prach_blks;
-          ((T_TR_MPHP_RA_REQ *)(ptr))->access_burst_type    = ((T_MPHP_RA_REQ *)(msg->SigP))->access_burst_type;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHP_RA_REQ));
-        }
-      }
-      break;
-
-      case MPHP_RA_STOP_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHP_RA_STOP_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHP_RA_STOP_REQ *)(ptr))->header       = TRL1_MPHP_RA_STOP_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHP_RA_STOP_REQ));
-        }
-      }
-      break;
-
-      case L1P_RA_DONE:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1P_RA_DONE), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_L1P_RA_DONE *)(ptr))->header               = TRL1_L1P_RA_DONE | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_L1P_RA_DONE *)(ptr))->channel_request_data = ((T_MPHP_RA_CON *)(msg->SigP))->channel_request_data;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1P_RA_DONE));
-        }
-      }
-      break;
-
-      // Single block
-
-      case MPHP_SINGLE_BLOCK_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHP_SINGLE_BLOCK_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-          WORD32 sti;
-
-          if (((T_MPHP_SINGLE_BLOCK_REQ *)(msg->SigP))->tbf_sti.present == 0)
-            sti = -1;
-          else
-            sti = (WORD32) ((T_MPHP_SINGLE_BLOCK_REQ *)(msg->SigP))->tbf_sti.absolute_fn;
-
-
-          ((T_TR_MPHP_SINGLE_BLOCK_REQ *)(ptr))->header            = TRL1_MPHP_SINGLE_BLOCK_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHP_SINGLE_BLOCK_REQ *)(ptr))->assignment_id     = ((T_MPHP_SINGLE_BLOCK_REQ *)(msg->SigP))->assignment_id;
-          ((T_TR_MPHP_SINGLE_BLOCK_REQ *)(ptr))->purpose           = ((T_MPHP_SINGLE_BLOCK_REQ *)(msg->SigP))->purpose;
-          ((T_TR_MPHP_SINGLE_BLOCK_REQ *)(ptr))->pc_meas_chan      = ((T_MPHP_SINGLE_BLOCK_REQ *)(msg->SigP))->pc_meas_chan;
-          ((T_TR_MPHP_SINGLE_BLOCK_REQ *)(ptr))->access_burst_type = ((T_MPHP_SINGLE_BLOCK_REQ *)(msg->SigP))->access_burst_type;
-          ((T_TR_MPHP_SINGLE_BLOCK_REQ *)(ptr))->ta                = ((T_MPHP_SINGLE_BLOCK_REQ *)(msg->SigP))->packet_ta.ta;
-          ((T_TR_MPHP_SINGLE_BLOCK_REQ *)(ptr))->p0                = ((T_MPHP_SINGLE_BLOCK_REQ *)(msg->SigP))->dl_pwr_ctl.p0;
-          ((T_TR_MPHP_SINGLE_BLOCK_REQ *)(ptr))->bts_pwr_ctl_mode  = ((T_MPHP_SINGLE_BLOCK_REQ *)(msg->SigP))->dl_pwr_ctl.bts_pwr_ctl_mode;
-          ((T_TR_MPHP_SINGLE_BLOCK_REQ *)(ptr))->pr_mode           = ((T_MPHP_SINGLE_BLOCK_REQ *)(msg->SigP))->dl_pwr_ctl.pr_mode;
-          ((T_TR_MPHP_SINGLE_BLOCK_REQ *)(ptr))->tsc               = ((T_MPHP_SINGLE_BLOCK_REQ *)(msg->SigP))->tsc;
-          ((T_TR_MPHP_SINGLE_BLOCK_REQ *)(ptr))->h                 = ((T_MPHP_SINGLE_BLOCK_REQ *)(msg->SigP))->freq_param.chan_sel.h;
-          ((T_TR_MPHP_SINGLE_BLOCK_REQ *)(ptr))->radio_freq        = ((T_MPHP_SINGLE_BLOCK_REQ *)(msg->SigP))->freq_param.chan_sel.rf_channel.single_rf.radio_freq;
-          ((T_TR_MPHP_SINGLE_BLOCK_REQ *)(ptr))->rf_chan_cnt       = ((T_MPHP_SINGLE_BLOCK_REQ *)(msg->SigP))->freq_param.freq_list.rf_chan_cnt;
-          ((T_TR_MPHP_SINGLE_BLOCK_REQ *)(ptr))->tbf_sti           = sti;
-          ((T_TR_MPHP_SINGLE_BLOCK_REQ *)(ptr))->timeslot_number   = ((T_MPHP_SINGLE_BLOCK_REQ *)(msg->SigP))->timeslot_number;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHP_SINGLE_BLOCK_REQ));
-        }
-      }
-      break;
-
-      case MPHP_STOP_SINGLE_BLOCK_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHP_STOP_SINGLE_BLOCK_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHP_STOP_SINGLE_BLOCK_REQ *)(ptr))->header       = TRL1_MPHP_STOP_SINGLE_BLOCK_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHP_STOP_SINGLE_BLOCK_REQ));
-        }
-      }
-      break;
-
-      case L1P_PACCH_INFO:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1P_PACCH_INFO), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_L1P_PACCH_INFO *)(ptr))->header            = TRL1_L1P_PACCH_INFO | (((T_MPHP_DATA_IND *)(msg->SigP))->fn << TR_HEADER_FN_DELAY);
-          ((T_TR_L1P_PACCH_INFO *)(ptr))->error_flag        = ((T_MPHP_DATA_IND *)(msg->SigP))->error_flag;
-          ((T_TR_L1P_PACCH_INFO *)(ptr))->radio_freq        = ((T_MPHP_DATA_IND *)(msg->SigP))->radio_freq;
-          ((T_TR_L1P_PACCH_INFO *)(ptr))->relative_position = ((T_MPHP_DATA_IND *)(msg->SigP))->relative_position;
-          ((T_TR_L1P_PACCH_INFO *)(ptr))->input_level       = l1a_l1s_com.Scell_IL_for_rxlev;
-          ((T_TR_L1P_PACCH_INFO *)(ptr))->tpu_offset        = l1s.tpu_offset;
-          ((T_TR_L1P_PACCH_INFO *)(ptr))->afc               = l1s.afc;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1P_PACCH_INFO));
-        }
-      }
-      break;
-
-      case L1P_SINGLE_BLOCK_CON:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1P_SINGLE_BLOCK_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_L1P_SINGLE_BLOCK_CON *)(ptr))->header        = TRL1_L1P_SINGLE_BLOCK_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_L1P_SINGLE_BLOCK_CON *)(ptr))->assignment_id = ((T_MPHP_SINGLE_BLOCK_CON *)(msg->SigP))->assignment_id;
-          ((T_TR_L1P_SINGLE_BLOCK_CON *)(ptr))->purpose       = ((T_MPHP_SINGLE_BLOCK_CON *)(msg->SigP))->purpose;
-          ((T_TR_L1P_SINGLE_BLOCK_CON *)(ptr))->status        = ((T_MPHP_SINGLE_BLOCK_CON *)(msg->SigP))->status;
-          ((T_TR_L1P_SINGLE_BLOCK_CON *)(ptr))->dl_error_flag = ((T_MPHP_SINGLE_BLOCK_CON *)(msg->SigP))->dl_error_flag;
-          ((T_TR_L1P_SINGLE_BLOCK_CON *)(ptr))->txpwr[0]      = l1pa_l1ps_com.transfer.dl_pwr_ctrl.txpwr[0];
-          ((T_TR_L1P_SINGLE_BLOCK_CON *)(ptr))->txpwr[1]      = l1pa_l1ps_com.transfer.dl_pwr_ctrl.txpwr[1];
-          ((T_TR_L1P_SINGLE_BLOCK_CON *)(ptr))->txpwr[2]      = l1pa_l1ps_com.transfer.dl_pwr_ctrl.txpwr[2];
-          ((T_TR_L1P_SINGLE_BLOCK_CON *)(ptr))->txpwr[3]      = l1pa_l1ps_com.transfer.dl_pwr_ctrl.txpwr[3];
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1P_SINGLE_BLOCK_CON));
-        }
-      }
-      break;
-
-      // Idle mode polling
-
-      case MPHP_POLLING_RESPONSE_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHP_POLLING_RESPONSE_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHP_POLLING_RESPONSE_REQ *)(ptr))->header         = TRL1_MPHP_POLLING_RESPONSE_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHP_POLLING_RESPONSE_REQ *)(ptr))->pol_resp_type  = ((T_MPHP_POLLING_RESPONSE_REQ *)(msg->SigP))->pol_resp_type;
-          ((T_TR_MPHP_POLLING_RESPONSE_REQ *)(ptr))->fn_req         = ((T_MPHP_POLLING_RESPONSE_REQ *)(msg->SigP))->fn;
-          ((T_TR_MPHP_POLLING_RESPONSE_REQ *)(ptr))->timing_advance = ((T_MPHP_POLLING_RESPONSE_REQ *)(msg->SigP))->timing_advance;
-          ((T_TR_MPHP_POLLING_RESPONSE_REQ *)(ptr))->txpwr          = ((T_MPHP_POLLING_RESPONSE_REQ *)(msg->SigP))->txpwr;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHP_POLLING_RESPONSE_REQ));
-        }
-      }
-      break;
-
-      case L1P_POLL_DONE:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1P_POLL_DONE), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_L1P_POLL_DONE *)(ptr))->header       = TRL1_L1P_POLL_DONE | (((T_MPHP_POLLING_IND *)(msg->SigP))->fn << TR_HEADER_FN_DELAY);
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1P_POLL_DONE));
-        }
-      }
-      break;
-
-      //////////////////////////
-      // Packet transfer mode //
-      //////////////////////////
-
-      // Temporary block flow assignment
-
-      case MPHP_ASSIGNMENT_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHP_ASSIGNMENT_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-          WORD32 sti;
-
-          if (((T_MPHP_ASSIGNMENT_REQ *)(msg->SigP))->tbf_sti.present == 0)
-            sti = -1;
-          else
-            sti = (WORD32) ((T_MPHP_ASSIGNMENT_REQ *)(msg->SigP))->tbf_sti.absolute_fn;
-
-
-          ((T_TR_MPHP_ASSIGNMENT_REQ *)(ptr))->header             = TRL1_MPHP_ASSIGNMENT_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHP_ASSIGNMENT_REQ *)(ptr))->assignment_id      = ((T_MPHP_ASSIGNMENT_REQ *)(msg->SigP))->assignment_id;
-          ((T_TR_MPHP_ASSIGNMENT_REQ *)(ptr))->assignment_command = ((T_MPHP_ASSIGNMENT_REQ *)(msg->SigP))->assignment_command;
-          ((T_TR_MPHP_ASSIGNMENT_REQ *)(ptr))->multislot_class    = ((T_MPHP_ASSIGNMENT_REQ *)(msg->SigP))->multislot_class;
-          ((T_TR_MPHP_ASSIGNMENT_REQ *)(ptr))->interf_meas_enable = ((T_MPHP_ASSIGNMENT_REQ *)(msg->SigP))->interf_meas_enable;
-          ((T_TR_MPHP_ASSIGNMENT_REQ *)(ptr))->pc_meas_chan       = ((T_MPHP_ASSIGNMENT_REQ *)(msg->SigP))->pc_meas_chan;
-          ((T_TR_MPHP_ASSIGNMENT_REQ *)(ptr))->access_burst_type  = ((T_MPHP_ASSIGNMENT_REQ *)(msg->SigP))->access_burst_type;
-          ((T_TR_MPHP_ASSIGNMENT_REQ *)(ptr))->ta                 = ((T_MPHP_ASSIGNMENT_REQ *)(msg->SigP))->packet_ta.ta;
-          ((T_TR_MPHP_ASSIGNMENT_REQ *)(ptr))->ta_index           = ((T_MPHP_ASSIGNMENT_REQ *)(msg->SigP))->packet_ta.ta_index;
-          ((T_TR_MPHP_ASSIGNMENT_REQ *)(ptr))->ta_tn              = ((T_MPHP_ASSIGNMENT_REQ *)(msg->SigP))->packet_ta.ta_tn;
-          ((T_TR_MPHP_ASSIGNMENT_REQ *)(ptr))->p0                 = ((T_MPHP_ASSIGNMENT_REQ *)(msg->SigP))->dl_pwr_ctl.p0;
-          ((T_TR_MPHP_ASSIGNMENT_REQ *)(ptr))->bts_pwr_ctl_mode   = ((T_MPHP_ASSIGNMENT_REQ *)(msg->SigP))->dl_pwr_ctl.bts_pwr_ctl_mode;
-          ((T_TR_MPHP_ASSIGNMENT_REQ *)(ptr))->pr_mode            = ((T_MPHP_ASSIGNMENT_REQ *)(msg->SigP))->dl_pwr_ctl.pr_mode;
-          ((T_TR_MPHP_ASSIGNMENT_REQ *)(ptr))->tsc                = ((T_MPHP_ASSIGNMENT_REQ *)(msg->SigP))->tsc;
-          ((T_TR_MPHP_ASSIGNMENT_REQ *)(ptr))->h                  = ((T_MPHP_ASSIGNMENT_REQ *)(msg->SigP))->freq_param.chan_sel.h;
-          ((T_TR_MPHP_ASSIGNMENT_REQ *)(ptr))->radio_freq         = ((T_MPHP_ASSIGNMENT_REQ *)(msg->SigP))->freq_param.chan_sel.rf_channel.single_rf.radio_freq;
-          ((T_TR_MPHP_ASSIGNMENT_REQ *)(ptr))->rf_chan_cnt        = ((T_MPHP_ASSIGNMENT_REQ *)(msg->SigP))->freq_param.freq_list.rf_chan_cnt;
-          ((T_TR_MPHP_ASSIGNMENT_REQ *)(ptr))->tbf_sti            = sti;
-          ((T_TR_MPHP_ASSIGNMENT_REQ *)(ptr))->mac_mode           = ((T_MPHP_ASSIGNMENT_REQ *)(msg->SigP))->mac_mode;
-          ((T_TR_MPHP_ASSIGNMENT_REQ *)(ptr))->dl_ressource_alloc = ((T_MPHP_ASSIGNMENT_REQ *)(msg->SigP))->dl_ressource_alloc.timeslot_alloc;
-          ((T_TR_MPHP_ASSIGNMENT_REQ *)(ptr))->ul_ressource_alloc = ((T_MPHP_ASSIGNMENT_REQ *)(msg->SigP))->ul_ressource_alloc.timeslot_alloc;
-          ((T_TR_MPHP_ASSIGNMENT_REQ *)(ptr))->usf_granularity    = ((T_MPHP_ASSIGNMENT_REQ *)(msg->SigP))->ul_ressource_alloc.dynamic_alloc.usf_granularity;
-          ((T_TR_MPHP_ASSIGNMENT_REQ *)(ptr))->ctrl_timeslot      = ((T_MPHP_ASSIGNMENT_REQ *)(msg->SigP))->ul_ressource_alloc.fixed_alloc.ctrl_timeslot;
-          ((T_TR_MPHP_ASSIGNMENT_REQ *)(ptr))->bitmap_length      = ((T_MPHP_ASSIGNMENT_REQ *)(msg->SigP))->ul_ressource_alloc.fixed_alloc.bitmap_length;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHP_ASSIGNMENT_REQ));
-        }
-      }
-      break;
-
-      case MPHP_ASSIGNMENT_CON:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHP_ASSIGNMENT_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHP_ASSIGNMENT_CON *)(ptr))->header       = TRL1_MPHP_ASSIGNMENT_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHP_ASSIGNMENT_CON *)(ptr))->dl_tn        = l1a_l1s_com.dl_tn;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHP_ASSIGNMENT_CON));
-        }
-      }
-      break;
-
-      case MPHP_TBF_RELEASE_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHP_TBF_RELEASE_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHP_TBF_RELEASE_REQ *)(ptr))->header       = TRL1_MPHP_TBF_RELEASE_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHP_TBF_RELEASE_REQ *)(ptr))->tbf_type     = ((T_MPHP_TBF_RELEASE_REQ *)(msg->SigP))->tbf_type;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHP_TBF_RELEASE_REQ));
-        }
-      }
-      break;
-
-      case L1P_TBF_RELEASED:
-      {
-        char *ptr;
-
-        if (((T_L1P_TBF_RELEASED *)(msg->SigP))->released_all == 1)
-          trace_info.new_tcr_list = 0;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1P_TBF_RELEASED), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_L1P_TBF_RELEASED *)(ptr))->header       = TRL1_L1P_TBF_RELEASED | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_L1P_TBF_RELEASED *)(ptr))->released_all = ((T_L1P_TBF_RELEASED *)(msg->SigP))->released_all;
-          ((T_TR_L1P_TBF_RELEASED *)(ptr))->dl_tn        = l1a_l1s_com.dl_tn;
-          ((T_TR_L1P_TBF_RELEASED *)(ptr))->tbf_type     = ((T_L1P_TBF_RELEASED *)(msg->SigP))->tbf_type;
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1P_TBF_RELEASED));
-        }
-      }
-      break;
-
-      // PDCH release
-
-      case MPHP_PDCH_RELEASE_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHP_PDCH_RELEASE_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHP_PDCH_RELEASE_REQ *)(ptr))->header             = TRL1_MPHP_PDCH_RELEASE_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHP_PDCH_RELEASE_REQ *)(ptr))->assignment_id      = ((T_MPHP_PDCH_RELEASE_REQ *)(msg->SigP))->assignment_id;
-          ((T_TR_MPHP_PDCH_RELEASE_REQ *)(ptr))->timeslot_available = ((T_MPHP_PDCH_RELEASE_REQ *)(msg->SigP))->timeslot_available;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHP_PDCH_RELEASE_REQ));
-        }
-      }
-      break;
-
-      case L1P_PDCH_RELEASED:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1P_PDCH_RELEASED), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_L1P_PDCH_RELEASED *)(ptr))->header        = TRL1_L1P_PDCH_RELEASED | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_L1P_PDCH_RELEASED *)(ptr))->assignment_id = ((T_MPHP_PDCH_RELEASE_CON *)(msg->SigP))->assignment_id;
-          ((T_TR_L1P_PDCH_RELEASED *)(ptr))->dl_tn         = l1a_l1s_com.dl_tn;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1P_PDCH_RELEASED));
-        }
-      }
-      break;
-
-      // Timing advance update
-
-      case MPHP_TIMING_ADVANCE_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHP_TIMING_ADVANCE_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHP_TIMING_ADVANCE_REQ *)(ptr))->header        = TRL1_MPHP_TIMING_ADVANCE_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHP_TIMING_ADVANCE_REQ *)(ptr))->assignment_id = ((T_MPHP_TIMING_ADVANCE_REQ *)(msg->SigP))->assignment_id;
-          ((T_TR_MPHP_TIMING_ADVANCE_REQ *)(ptr))->ta            = ((T_MPHP_TIMING_ADVANCE_REQ *)(msg->SigP))->packet_ta.ta;
-          ((T_TR_MPHP_TIMING_ADVANCE_REQ *)(ptr))->ta_index      = ((T_MPHP_TIMING_ADVANCE_REQ *)(msg->SigP))->packet_ta.ta_index;
-          ((T_TR_MPHP_TIMING_ADVANCE_REQ *)(ptr))->ta_tn         = ((T_MPHP_TIMING_ADVANCE_REQ *)(msg->SigP))->packet_ta.ta_tn;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHP_TIMING_ADVANCE_REQ));
-        }
-      }
-      break;
-
-      case L1P_TA_CONFIG_DONE:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1P_TA_CONFIG_DONE), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_L1P_TA_CONFIG_DONE *)(ptr))->header       = TRL1_L1P_TA_CONFIG_DONE | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1P_TA_CONFIG_DONE));
-        }
-      }
-      break;
-
-      // Update PSI parameters
-
-      case MPHP_UPDATE_PSI_PARAM_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHP_UPDATE_PSI_PARAM_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHP_UPDATE_PSI_PARAM_REQ *)(ptr))->header            = TRL1_MPHP_UPDATE_PSI_PARAM_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHP_UPDATE_PSI_PARAM_REQ *)(ptr))->pb                = ((T_MPHP_UPDATE_PSI_PARAM_REQ *)(msg->SigP))->pb;
-          ((T_TR_MPHP_UPDATE_PSI_PARAM_REQ *)(ptr))->access_burst_type = ((T_MPHP_UPDATE_PSI_PARAM_REQ *)(msg->SigP))->access_burst_type;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHP_UPDATE_PSI_PARAM_REQ));
-        }
-      }
-      break;
-
-      // Fixed mode repeat allocation
-
-      case MPHP_REPEAT_UL_FIXED_ALLOC_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHP_REPEAT_UL_FIXED_ALLOC_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-          WORD32 sti;
-
-          if (((T_MPHP_REPEAT_UL_FIXED_ALLOC_REQ *)(msg->SigP))->tbf_sti.present == 0)
-            sti = -1;
-          else
-            sti = (WORD32) ((T_MPHP_REPEAT_UL_FIXED_ALLOC_REQ *)(msg->SigP))->tbf_sti.absolute_fn;
-
-
-          ((T_TR_MPHP_REPEAT_UL_FIXED_ALLOC_REQ *)(ptr))->header            = TRL1_MPHP_REPEAT_UL_FIXED_ALLOC_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHP_REPEAT_UL_FIXED_ALLOC_REQ *)(ptr))->repeat_allocation = ((T_MPHP_REPEAT_UL_FIXED_ALLOC_REQ *)(msg->SigP))->repeat_allocation;
-          ((T_TR_MPHP_REPEAT_UL_FIXED_ALLOC_REQ *)(ptr))->ts_override       = ((T_MPHP_REPEAT_UL_FIXED_ALLOC_REQ *)(msg->SigP))->ts_override;
-          ((T_TR_MPHP_REPEAT_UL_FIXED_ALLOC_REQ *)(ptr))->tbf_sti           = sti;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHP_REPEAT_UL_FIXED_ALLOC_REQ));
-        }
-      }
-      break;
-
-      case L1P_REPEAT_ALLOC_DONE:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1P_REPEAT_ALLOC_DONE), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_L1P_REPEAT_ALLOC_DONE *)(ptr))->header       = TRL1_L1P_REPEAT_ALLOC_DONE | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_L1P_REPEAT_ALLOC_DONE *)(ptr))->dl_tn        = l1a_l1s_com.dl_tn;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1P_REPEAT_ALLOC_DONE));
-        }
-      }
-      break;
-
-      // Fixed mode allocation exhaustion
-
-      case L1P_ALLOC_EXHAUST_DONE:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1P_ALLOC_EXHAUST_DONE), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_L1P_ALLOC_EXHAUST_DONE *)(ptr))->header       = TRL1_L1P_ALLOC_EXHAUST_DONE | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_L1P_ALLOC_EXHAUST_DONE *)(ptr))->dl_tn        = l1a_l1s_com.dl_tn;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1P_ALLOC_EXHAUST_DONE));
-        }
-      }
-      break;
-
-      //////////////////////////////
-      // Packet mode measurements //
-      //////////////////////////////
-
-      // BA list measurements in packet idle
-
-      case MPHP_CR_MEAS_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHP_CR_MEAS_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHP_CR_MEAS_REQ *)(ptr))->header       = TRL1_MPHP_CR_MEAS_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHP_CR_MEAS_REQ *)(ptr))->nb_carrier   = ((T_MPHP_CR_MEAS_REQ *)(msg->SigP))->nb_carrier;
-          ((T_TR_MPHP_CR_MEAS_REQ *)(ptr))->list_id      = ((T_MPHP_CR_MEAS_REQ *)(msg->SigP))->list_id;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHP_CR_MEAS_REQ));
-        }
-      }
-      break;
-
-      case MPHP_CR_MEAS_STOP_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHP_CR_MEAS_STOP_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHP_CR_MEAS_STOP_REQ *)(ptr))->header       = TRL1_MPHP_CR_MEAS_STOP_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHP_CR_MEAS_STOP_REQ));
-        }
-      }
-      break;
-
-      case L1P_CR_MEAS_DONE:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1P_CR_MEAS_DONE), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-          UWORD8 i,nmeas;
-
-
-          ((T_TR_L1P_CR_MEAS_DONE *)(ptr))->header           = TRL1_L1P_CR_MEAS_DONE | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_L1P_CR_MEAS_DONE *)(ptr))->nmeas            = ((T_L1P_CR_MEAS_DONE *)(msg->SigP))->nmeas;
-          ((T_TR_L1P_CR_MEAS_DONE *)(ptr))->list_id          = ((T_L1P_CR_MEAS_DONE *)(msg->SigP))->list_id;
-          ((T_TR_L1P_CR_MEAS_DONE *)(ptr))->reporting_period = ((T_L1P_CR_MEAS_DONE *)(msg->SigP))->reporting_period;
-
-          nmeas = ((T_L1P_CR_MEAS_DONE *)(msg->SigP))->nmeas;
-          if (nmeas > MAX_CR) nmeas = MAX_CR;
-
-          for (i=0;i<nmeas;i++)
-          {
-            ((T_TR_L1P_CR_MEAS_DONE *)(ptr))->freq[i]        = l1pa_l1ps_com.cres_freq_list.alist->freq_list[i];
-            ((T_TR_L1P_CR_MEAS_DONE *)(ptr))->rxlev[i]       = ((T_L1P_CR_MEAS_DONE *)(msg->SigP))->ncell_meas[i].rxlev;
-          }
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1P_CR_MEAS_DONE));
-        }
-      }
-      break;
-
-      // BA list measurements in packet transfer
-
-      case MPHP_TCR_MEAS_REQ:
-      {
-        char *ptr;
-
-        trace_info.new_tcr_list = 1;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHP_TCR_MEAS_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHP_TCR_MEAS_REQ *)(ptr))->header       = TRL1_MPHP_TCR_MEAS_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHP_TCR_MEAS_REQ *)(ptr))->nb_carrier   = ((T_MPHP_TCR_MEAS_REQ *)(msg->SigP))->nb_carrier;
-          ((T_TR_MPHP_TCR_MEAS_REQ *)(ptr))->list_id      = ((T_MPHP_TCR_MEAS_REQ *)(msg->SigP))->list_id;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHP_TCR_MEAS_REQ));
-        }
-      }
-      break;
-
-      case MPHP_TCR_MEAS_STOP_REQ:
-      {
-        char *ptr;
-
-        trace_info.new_tcr_list = 0;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHP_TCR_MEAS_STOP_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHP_TCR_MEAS_STOP_REQ *)(ptr))->header       = TRL1_MPHP_TCR_MEAS_STOP_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHP_TCR_MEAS_STOP_REQ));
-        }
-      }
-      break;
-
-      case L1P_TCR_MEAS_DONE:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1P_TCR_MEAS_DONE), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-          UWORD8            i, nmeas;
-          T_CRES_LIST_PARAM *list_ptr;
-
-          if (trace_info.new_tcr_list == 0)
-            // No TCR list update: keep the alist pointer
-            list_ptr = l1pa_l1ps_com.cres_freq_list.alist;
-          else
-          {
-            // In case of TCR list updating, the alist pointer has changed
-            if(l1pa_l1ps_com.cres_freq_list.alist == &(l1pa_l1ps_com.cres_freq_list.list[0]))
-              list_ptr = &(l1pa_l1ps_com.cres_freq_list.list[1]);
-            else
-              list_ptr = &(l1pa_l1ps_com.cres_freq_list.list[0]);
-            //Reset the variable new_tcr_list so that next time onwards the new list of
-            //frequencies will get printed.
-            trace_info.new_tcr_list = 0;
-          }
-
-
-          ((T_TR_L1P_TCR_MEAS_DONE *)(ptr))->header       = TRL1_L1P_TCR_MEAS_DONE | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_L1P_TCR_MEAS_DONE *)(ptr))->list_id      = ((T_L1P_TCR_MEAS_DONE *)(msg->SigP))->list_id;
-          ((T_TR_L1P_TCR_MEAS_DONE *)(ptr))->nb_carrier   = list_ptr->nb_carrier;
-
-          nmeas = list_ptr->nb_carrier;
-          if (nmeas > MAX_TCR) nmeas = MAX_TCR;
-
-          for (i=0;i<nmeas;i++)
-          {
-            ((T_TR_L1P_TCR_MEAS_DONE *)(ptr))->radio_freq[i] = list_ptr->freq_list[i];
-            ((T_TR_L1P_TCR_MEAS_DONE *)(ptr))->acc_level[i]  = ((T_L1P_TCR_MEAS_DONE *)(msg->SigP))->acc_level[i];
-            ((T_TR_L1P_TCR_MEAS_DONE *)(ptr))->acc_nbmeas[i] = ((T_L1P_TCR_MEAS_DONE *)(msg->SigP))->acc_nbmeas[i];
-          }
-
-          ((T_TR_L1P_TCR_MEAS_DONE *)(ptr))->tpu_offset = l1s.tpu_offset;
-
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1P_TCR_MEAS_DONE));
-        }
-      }
-      break;
-
-      ///////////////////////////////
-      // Interference measurements //
-      ///////////////////////////////
-
-      // Interference measurements in packet idle
-
-      case MPHP_INT_MEAS_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHP_INT_MEAS_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHP_INT_MEAS_REQ *)(ptr))->header          = TRL1_MPHP_INT_MEAS_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHP_INT_MEAS_REQ *)(ptr))->h               = ((T_MPHP_INT_MEAS_REQ *)(msg->SigP))->packet_intm_freq_param.chan_sel.h;
-          ((T_TR_MPHP_INT_MEAS_REQ *)(ptr))->radio_freq      = ((T_MPHP_INT_MEAS_REQ *)(msg->SigP))->packet_intm_freq_param.chan_sel.rf_channel.single_rf.radio_freq;
-          ((T_TR_MPHP_INT_MEAS_REQ *)(ptr))->rf_chan_cnt     = ((T_MPHP_INT_MEAS_REQ *)(msg->SigP))->packet_intm_freq_param.freq_list.rf_chan_cnt;
-          ((T_TR_MPHP_INT_MEAS_REQ *)(ptr))->tn              = ((T_MPHP_INT_MEAS_REQ *)(msg->SigP))->tn;
-          ((T_TR_MPHP_INT_MEAS_REQ *)(ptr))->multislot_class = ((T_MPHP_INT_MEAS_REQ *)(msg->SigP))->multislot_class;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHP_INT_MEAS_REQ));
-        }
-      }
-      break;
-
-      case MPHP_INT_MEAS_STOP_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHP_INT_MEAS_STOP_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHP_INT_MEAS_STOP_REQ *)(ptr))->header       = TRL1_MPHP_INT_MEAS_STOP_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHP_INT_MEAS_STOP_REQ));
-        }
-      }
-      break;
-
-      case L1P_ITMEAS_IND:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1P_ITMEAS_IND), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_L1P_ITMEAS_IND *)(ptr))->header       = TRL1_L1P_ITMEAS_IND | (((T_L1P_ITMEAS_IND *)(msg->SigP))->fn << TR_HEADER_FN_DELAY);
-          ((T_TR_L1P_ITMEAS_IND *)(ptr))->position     = ((T_L1P_ITMEAS_IND *)(msg->SigP))->position;
-          ((T_TR_L1P_ITMEAS_IND *)(ptr))->meas_bitmap  = ((T_L1P_ITMEAS_IND *)(msg->SigP))->meas_bitmap;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1P_ITMEAS_IND));
-        }
-      }
-      break;
-
-      case MPHP_INT_MEAS_IND:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHP_INT_MEAS_IND), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHP_INT_MEAS_IND *)(ptr))->header       = TRL1_MPHP_INT_MEAS_IND | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHP_INT_MEAS_IND *)(ptr))->rxlev_0[0]   = ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[0].rxlev[0];
-          ((T_TR_MPHP_INT_MEAS_IND *)(ptr))->rxlev_0[1]   = ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[1].rxlev[0];
-          ((T_TR_MPHP_INT_MEAS_IND *)(ptr))->rxlev_0[2]   = ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[2].rxlev[0];
-          ((T_TR_MPHP_INT_MEAS_IND *)(ptr))->rxlev_0[3]   = ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[3].rxlev[0];
-          ((T_TR_MPHP_INT_MEAS_IND *)(ptr))->rxlev_0[4]   = ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[4].rxlev[0];
-          ((T_TR_MPHP_INT_MEAS_IND *)(ptr))->rxlev_0[5]   = ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[5].rxlev[0];
-          ((T_TR_MPHP_INT_MEAS_IND *)(ptr))->rxlev_0[6]   = ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[6].rxlev[0];
-          ((T_TR_MPHP_INT_MEAS_IND *)(ptr))->rxlev_0[7]   = ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[7].rxlev[0];
-          ((T_TR_MPHP_INT_MEAS_IND *)(ptr))->rxlev_1[0]   = ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[0].rxlev[1];
-          ((T_TR_MPHP_INT_MEAS_IND *)(ptr))->rxlev_1[1]   = ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[1].rxlev[1];
-          ((T_TR_MPHP_INT_MEAS_IND *)(ptr))->rxlev_1[2]   = ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[2].rxlev[1];
-          ((T_TR_MPHP_INT_MEAS_IND *)(ptr))->rxlev_1[3]   = ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[3].rxlev[1];
-          ((T_TR_MPHP_INT_MEAS_IND *)(ptr))->rxlev_1[4]   = ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[4].rxlev[1];
-          ((T_TR_MPHP_INT_MEAS_IND *)(ptr))->rxlev_1[5]   = ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[5].rxlev[1];
-          ((T_TR_MPHP_INT_MEAS_IND *)(ptr))->rxlev_1[6]   = ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[6].rxlev[1];
-          ((T_TR_MPHP_INT_MEAS_IND *)(ptr))->rxlev_1[7]   = ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[7].rxlev[1];
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHP_INT_MEAS_IND));
-        }
-      }
-      break;
-
-      // Interference measurements in packet transfer
-
-      case MPHP_TINT_MEAS_IND:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MPHP_TINT_MEAS_IND), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MPHP_TINT_MEAS_IND *)(ptr))->header       = TRL1_MPHP_TINT_MEAS_IND | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_MPHP_TINT_MEAS_IND *)(ptr))->rxlev_0[0]   = ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[0].rxlev[0];
-          ((T_TR_MPHP_TINT_MEAS_IND *)(ptr))->rxlev_0[1]   = ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[1].rxlev[0];
-          ((T_TR_MPHP_TINT_MEAS_IND *)(ptr))->rxlev_0[2]   = ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[2].rxlev[0];
-          ((T_TR_MPHP_TINT_MEAS_IND *)(ptr))->rxlev_0[3]   = ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[3].rxlev[0];
-          ((T_TR_MPHP_TINT_MEAS_IND *)(ptr))->rxlev_0[4]   = ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[4].rxlev[0];
-          ((T_TR_MPHP_TINT_MEAS_IND *)(ptr))->rxlev_0[5]   = ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[5].rxlev[0];
-          ((T_TR_MPHP_TINT_MEAS_IND *)(ptr))->rxlev_0[6]   = ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[6].rxlev[0];
-          ((T_TR_MPHP_TINT_MEAS_IND *)(ptr))->rxlev_0[7]   = ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[7].rxlev[0];
-          ((T_TR_MPHP_TINT_MEAS_IND *)(ptr))->rxlev_1[0]   = ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[0].rxlev[1];
-          ((T_TR_MPHP_TINT_MEAS_IND *)(ptr))->rxlev_1[1]   = ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[1].rxlev[1];
-          ((T_TR_MPHP_TINT_MEAS_IND *)(ptr))->rxlev_1[2]   = ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[2].rxlev[1];
-          ((T_TR_MPHP_TINT_MEAS_IND *)(ptr))->rxlev_1[3]   = ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[3].rxlev[1];
-          ((T_TR_MPHP_TINT_MEAS_IND *)(ptr))->rxlev_1[4]   = ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[4].rxlev[1];
-          ((T_TR_MPHP_TINT_MEAS_IND *)(ptr))->rxlev_1[5]   = ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[5].rxlev[1];
-          ((T_TR_MPHP_TINT_MEAS_IND *)(ptr))->rxlev_1[6]   = ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[6].rxlev[1];
-          ((T_TR_MPHP_TINT_MEAS_IND *)(ptr))->rxlev_1[7]   = ((T_MPHP_INT_MEAS_IND *)(msg->SigP))->int_meas[7].rxlev[1];
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MPHP_TINT_MEAS_IND));
-        }
-      }
-      break;
-
-    #endif
-
-    #if (AUDIO_TASK == 1)
-
-      /********************************************************************************/
-      /* BACKGROUND TASKS                                                             */
-      /********************************************************************************/
-
-      //////////////////
-      // MMI messages //
-      //////////////////
-
-      #if (KEYBEEP)
-        // Keybeep
-        case MMI_KEYBEEP_START_REQ:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_KEYBEEP_START_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_KEYBEEP_START_REQ *)(ptr))->header       = TRL1_MMI_KEYBEEP_START_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-            ((T_TR_MMI_KEYBEEP_START_REQ *)(ptr))->d_k_x1_kt0   = ((T_MMI_KEYBEEP_REQ *)(msg->SigP))->d_k_x1_kt0;
-            ((T_TR_MMI_KEYBEEP_START_REQ *)(ptr))->d_k_x1_kt1   = ((T_MMI_KEYBEEP_REQ *)(msg->SigP))->d_k_x1_kt1;
-            ((T_TR_MMI_KEYBEEP_START_REQ *)(ptr))->d_dur_kb     = ((T_MMI_KEYBEEP_REQ *)(msg->SigP))->d_dur_kb;
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_KEYBEEP_START_REQ));
-          }
-        }
-        break;
-
-        case MMI_KEYBEEP_START_CON:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_KEYBEEP_START_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_KEYBEEP_START_CON *)(ptr))->header       = TRL1_MMI_KEYBEEP_START_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_KEYBEEP_START_CON));
-          }
-        }
-        break;
-
-        case MMI_KEYBEEP_STOP_REQ:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_KEYBEEP_STOP_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_KEYBEEP_STOP_REQ *)(ptr))->header       = TRL1_MMI_KEYBEEP_STOP_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_KEYBEEP_STOP_REQ));
-          }
-        }
-        break;
-
-        case MMI_KEYBEEP_STOP_CON:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_KEYBEEP_STOP_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_KEYBEEP_STOP_CON *)(ptr))->header       = TRL1_MMI_KEYBEEP_STOP_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_KEYBEEP_STOP_CON));
-          }
-        }
-        break;
-      #endif // KEYBEEP
-
-      #if (TONE)
-        // Tone
-        case MMI_TONE_START_REQ:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_TONE_START_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_TONE_START_REQ *)(ptr))->header       = TRL1_MMI_TONE_START_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-            ((T_TR_MMI_TONE_START_REQ *)(ptr))->d_k_x1_t0    = ((T_MMI_TONE_REQ *)(msg->SigP))->d_k_x1_t0;
-            ((T_TR_MMI_TONE_START_REQ *)(ptr))->d_k_x1_t1    = ((T_MMI_TONE_REQ *)(msg->SigP))->d_k_x1_t1;
-            ((T_TR_MMI_TONE_START_REQ *)(ptr))->d_k_x1_t2    = ((T_MMI_TONE_REQ *)(msg->SigP))->d_k_x1_t2;
-            ((T_TR_MMI_TONE_START_REQ *)(ptr))->d_pe_rep     = ((T_MMI_TONE_REQ *)(msg->SigP))->d_pe_rep;
-            ((T_TR_MMI_TONE_START_REQ *)(ptr))->d_pe_off     = ((T_MMI_TONE_REQ *)(msg->SigP))->d_pe_off;
-            ((T_TR_MMI_TONE_START_REQ *)(ptr))->d_se_off     = ((T_MMI_TONE_REQ *)(msg->SigP))->d_se_off;
-            ((T_TR_MMI_TONE_START_REQ *)(ptr))->d_bu_off     = ((T_MMI_TONE_REQ *)(msg->SigP))->d_bu_off;
-            ((T_TR_MMI_TONE_START_REQ *)(ptr))->d_t0_on      = ((T_MMI_TONE_REQ *)(msg->SigP))->d_t0_on;
-            ((T_TR_MMI_TONE_START_REQ *)(ptr))->d_t0_off     = ((T_MMI_TONE_REQ *)(msg->SigP))->d_t0_off;
-            ((T_TR_MMI_TONE_START_REQ *)(ptr))->d_t1_on      = ((T_MMI_TONE_REQ *)(msg->SigP))->d_t1_on;
-            ((T_TR_MMI_TONE_START_REQ *)(ptr))->d_t1_off     = ((T_MMI_TONE_REQ *)(msg->SigP))->d_t1_off;
-            ((T_TR_MMI_TONE_START_REQ *)(ptr))->d_t2_on      = ((T_MMI_TONE_REQ *)(msg->SigP))->d_t2_on;
-            ((T_TR_MMI_TONE_START_REQ *)(ptr))->d_t2_off     = ((T_MMI_TONE_REQ *)(msg->SigP))->d_t2_off;
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_TONE_START_REQ));
-          }
-        }
-        break;
-
-        case MMI_TONE_START_CON:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_TONE_START_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_TONE_START_CON *)(ptr))->header       = TRL1_MMI_TONE_START_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_TONE_START_CON));
-          }
-        }
-       break;
-
-        case MMI_TONE_STOP_REQ:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_TONE_STOP_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_TONE_STOP_REQ *)(ptr))->header       = TRL1_MMI_TONE_STOP_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_TONE_STOP_REQ));
-          }
-        }
-        break;
-
-        case MMI_TONE_STOP_CON:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_TONE_STOP_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_TONE_STOP_CON *)(ptr))->header       = TRL1_MMI_TONE_STOP_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_TONE_STOP_CON));
-          }
-        }
-        break;
-      #endif // TONE
-
-      #if (MELODY_E1)
-        // Melody 0
-        case MMI_MELODY0_START_REQ:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_MELODY0_START_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_MELODY0_START_REQ *)(ptr))->header                 = TRL1_MMI_MELODY0_START_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-            ((T_TR_MMI_MELODY0_START_REQ *)(ptr))->session_id             = ((T_MMI_MELODY_REQ *)(msg->SigP))->session_id;
-            ((T_TR_MMI_MELODY0_START_REQ *)(ptr))->loopback               = ((T_MMI_MELODY_REQ *)(msg->SigP))->loopback;
-            ((T_TR_MMI_MELODY0_START_REQ *)(ptr))->oscillator_used_bitmap = ((T_MMI_MELODY_REQ *)(msg->SigP))->oscillator_used_bitmap;
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_MELODY0_START_REQ));
-          }
-        }
-        break;
-
-        case MMI_MELODY0_START_CON:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_MELODY0_START_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_MELODY0_START_CON *)(ptr))->header       = TRL1_MMI_MELODY0_START_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_MELODY0_START_CON));
-          }
-        }
-        break;
-
-        case MMI_MELODY0_STOP_REQ:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_MELODY0_STOP_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_MELODY0_STOP_REQ *)(ptr))->header       = TRL1_MMI_MELODY0_STOP_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_MELODY0_STOP_REQ));
-          }
-        }
-        break;
-
-        case MMI_MELODY0_STOP_CON:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_MELODY0_STOP_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_MELODY0_STOP_CON *)(ptr))->header       = TRL1_MMI_MELODY0_STOP_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_MELODY0_STOP_CON));
-          }
-        }
-        break;
-
-              // Melody 1
-        case MMI_MELODY1_START_REQ:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_MELODY1_START_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_MELODY1_START_REQ *)(ptr))->header                 = TRL1_MMI_MELODY1_START_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-            ((T_TR_MMI_MELODY1_START_REQ *)(ptr))->session_id             = ((T_MMI_MELODY_REQ *)(msg->SigP))->session_id;
-            ((T_TR_MMI_MELODY1_START_REQ *)(ptr))->loopback               = ((T_MMI_MELODY_REQ *)(msg->SigP))->loopback;
-            ((T_TR_MMI_MELODY1_START_REQ *)(ptr))->oscillator_used_bitmap = ((T_MMI_MELODY_REQ *)(msg->SigP))->oscillator_used_bitmap;
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_MELODY1_START_REQ));
-          }
-        }
-        break;
-
-        case MMI_MELODY1_START_CON:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_MELODY1_START_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_MELODY1_START_CON *)(ptr))->header       = TRL1_MMI_MELODY1_START_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_MELODY1_START_CON));
-          }
-        }
-        break;
-
-        case MMI_MELODY1_STOP_REQ:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_MELODY1_STOP_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_MELODY1_STOP_REQ *)(ptr))->header       = TRL1_MMI_MELODY1_STOP_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_MELODY1_STOP_REQ));
-          }
-        }
-        break;
-
-        case MMI_MELODY1_STOP_CON:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_MELODY1_STOP_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_MELODY1_STOP_CON *)(ptr))->header       = TRL1_MMI_MELODY1_STOP_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_MELODY1_STOP_CON));
-          }
-        }
-        break;
-      #endif // MELODY_E1
-
-      #if (VOICE_MEMO)
-        // Voice memo recording
-        case MMI_VM_RECORD_START_REQ:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_VM_RECORD_START_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_VM_RECORD_START_REQ *)(ptr))->header          = TRL1_MMI_VM_RECORD_START_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-            ((T_TR_MMI_VM_RECORD_START_REQ *)(ptr))->session_id      = ((T_MMI_VM_RECORD_REQ *)(msg->SigP))->session_id;
-            ((T_TR_MMI_VM_RECORD_START_REQ *)(ptr))->maximum_size    = ((T_MMI_VM_RECORD_REQ *)(msg->SigP))->maximum_size;
-            ((T_TR_MMI_VM_RECORD_START_REQ *)(ptr))->dtx_used        = ((T_MMI_VM_RECORD_REQ *)(msg->SigP))->dtx_used;
-            ((T_TR_MMI_VM_RECORD_START_REQ *)(ptr))->record_coeff_dl = ((T_MMI_VM_RECORD_REQ *)(msg->SigP))->record_coeff_dl;
-            ((T_TR_MMI_VM_RECORD_START_REQ *)(ptr))->record_coeff_ul = ((T_MMI_VM_RECORD_REQ *)(msg->SigP))->record_coeff_ul;
-            ((T_TR_MMI_VM_RECORD_START_REQ *)(ptr))->d_k_x1_t0       = ((T_MMI_VM_RECORD_REQ *)(msg->SigP))->d_k_x1_t0;
-            ((T_TR_MMI_VM_RECORD_START_REQ *)(ptr))->d_k_x1_t1       = ((T_MMI_VM_RECORD_REQ *)(msg->SigP))->d_k_x1_t1;
-            ((T_TR_MMI_VM_RECORD_START_REQ *)(ptr))->d_k_x1_t2       = ((T_MMI_VM_RECORD_REQ *)(msg->SigP))->d_k_x1_t2;
-            ((T_TR_MMI_VM_RECORD_START_REQ *)(ptr))->d_pe_rep        = ((T_MMI_VM_RECORD_REQ *)(msg->SigP))->d_pe_rep;
-            ((T_TR_MMI_VM_RECORD_START_REQ *)(ptr))->d_pe_off        = ((T_MMI_VM_RECORD_REQ *)(msg->SigP))->d_pe_off;
-            ((T_TR_MMI_VM_RECORD_START_REQ *)(ptr))->d_se_off        = ((T_MMI_VM_RECORD_REQ *)(msg->SigP))->d_se_off;
-            ((T_TR_MMI_VM_RECORD_START_REQ *)(ptr))->d_bu_off        = ((T_MMI_VM_RECORD_REQ *)(msg->SigP))->d_bu_off;
-            ((T_TR_MMI_VM_RECORD_START_REQ *)(ptr))->d_t0_on         = ((T_MMI_VM_RECORD_REQ *)(msg->SigP))->d_t0_on;
-            ((T_TR_MMI_VM_RECORD_START_REQ *)(ptr))->d_t0_off        = ((T_MMI_VM_RECORD_REQ *)(msg->SigP))->d_t0_off;
-            ((T_TR_MMI_VM_RECORD_START_REQ *)(ptr))->d_t1_on         = ((T_MMI_VM_RECORD_REQ *)(msg->SigP))->d_t1_on;
-            ((T_TR_MMI_VM_RECORD_START_REQ *)(ptr))->d_t1_off        = ((T_MMI_VM_RECORD_REQ *)(msg->SigP))->d_t1_off;
-            ((T_TR_MMI_VM_RECORD_START_REQ *)(ptr))->d_t2_on         = ((T_MMI_VM_RECORD_REQ *)(msg->SigP))->d_t2_on;
-            ((T_TR_MMI_VM_RECORD_START_REQ *)(ptr))->d_t2_off        = ((T_MMI_VM_RECORD_REQ *)(msg->SigP))->d_t2_off;
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_VM_RECORD_START_REQ));
-          }
-        }
-        break;
-
-        case MMI_VM_RECORD_START_CON:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_VM_RECORD_START_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_VM_RECORD_START_CON *)(ptr))->header       = TRL1_MMI_VM_RECORD_START_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_VM_RECORD_START_CON));
-          }
-        }
-        break;
-
-        case MMI_VM_RECORD_STOP_REQ:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_VM_RECORD_STOP_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_VM_RECORD_STOP_REQ *)(ptr))->header       = TRL1_MMI_VM_RECORD_STOP_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_VM_RECORD_STOP_REQ));
-          }
-        }
-        break;
-
-        case MMI_VM_RECORD_STOP_CON:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_VM_RECORD_STOP_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_VM_RECORD_STOP_CON *)(ptr))->header       = TRL1_MMI_VM_RECORD_STOP_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_VM_RECORD_STOP_CON));
-          }
-        }
-        break;
-
-        // Voice memo playing
-        case MMI_VM_PLAY_START_REQ:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_VM_PLAY_START_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_VM_PLAY_START_REQ *)(ptr))->header       = TRL1_MMI_VM_PLAY_START_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-            ((T_TR_MMI_VM_PLAY_START_REQ *)(ptr))->session_id   = ((T_MMI_VM_PLAY_REQ *)(msg->SigP))->session_id;
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_VM_PLAY_START_REQ));
-          }
-        }
-        break;
-
-        case MMI_VM_PLAY_START_CON:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_VM_PLAY_START_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_VM_PLAY_START_CON *)(ptr))->header       = TRL1_MMI_VM_PLAY_START_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_VM_PLAY_START_CON));
-          }
-        }
-        break;
-
-        case MMI_VM_PLAY_STOP_REQ:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_VM_PLAY_STOP_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_VM_PLAY_STOP_REQ *)(ptr))->header       = TRL1_MMI_VM_PLAY_STOP_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_VM_PLAY_STOP_REQ));
-          }
-        }
-        break;
-
-        case MMI_VM_PLAY_STOP_CON:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_VM_PLAY_STOP_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_VM_PLAY_STOP_CON *)(ptr))->header       = TRL1_MMI_VM_PLAY_STOP_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_VM_PLAY_STOP_CON));
-          }
-        }
-        break;
-      #endif // VOICE_MEMO
-
-      #if (L1_VOICE_MEMO_AMR)
-        // Voice memo recording
-        case MMI_VM_AMR_RECORD_START_REQ:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_VM_AMR_RECORD_START_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_VM_AMR_RECORD_START_REQ *)(ptr))->header          = TRL1_MMI_VM_AMR_RECORD_START_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-            ((T_TR_MMI_VM_AMR_RECORD_START_REQ *)(ptr))->session_id      = ((T_MMI_VM_AMR_RECORD_REQ *)(msg->SigP))->session_id;
-            ((T_TR_MMI_VM_AMR_RECORD_START_REQ *)(ptr))->maximum_size    = ((T_MMI_VM_AMR_RECORD_REQ *)(msg->SigP))->maximum_size;
-            ((T_TR_MMI_VM_AMR_RECORD_START_REQ *)(ptr))->dtx_used        = ((T_MMI_VM_AMR_RECORD_REQ *)(msg->SigP))->dtx_used;
-            ((T_TR_MMI_VM_RECORD_START_REQ *)(ptr))->record_coeff_ul     = ((T_MMI_VM_AMR_RECORD_REQ *)(msg->SigP))->record_coeff_ul;
-            ((T_TR_MMI_VM_AMR_RECORD_START_REQ *)(ptr))->amr_vocoder     = ((T_MMI_VM_AMR_RECORD_REQ *)(msg->SigP))->amr_vocoder;
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_VM_AMR_RECORD_START_REQ));
-          }
-        }
-        break;
-
-        case MMI_VM_AMR_RECORD_START_CON:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_VM_AMR_RECORD_START_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_VM_AMR_RECORD_START_CON *)(ptr))->header       = TRL1_MMI_VM_AMR_RECORD_START_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_VM_AMR_RECORD_START_CON));
-          }
-        }
-        break;
-
-        case MMI_VM_AMR_RECORD_STOP_REQ:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_VM_AMR_RECORD_STOP_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_VM_AMR_RECORD_STOP_REQ *)(ptr))->header       = TRL1_MMI_VM_AMR_RECORD_STOP_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_VM_AMR_RECORD_STOP_REQ));
-          }
-        }
-        break;
-
-        case MMI_VM_AMR_RECORD_STOP_CON:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_VM_AMR_RECORD_STOP_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_VM_AMR_RECORD_STOP_CON *)(ptr))->header       = TRL1_MMI_VM_AMR_RECORD_STOP_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_VM_AMR_RECORD_STOP_CON));
-          }
-        }
-        break;
-
-        // Voice memo playing
-        case MMI_VM_AMR_PLAY_START_REQ:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_VM_AMR_PLAY_START_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_VM_AMR_PLAY_START_REQ *)(ptr))->header       = TRL1_MMI_VM_AMR_PLAY_START_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-            ((T_TR_MMI_VM_AMR_PLAY_START_REQ *)(ptr))->session_id   = ((T_MMI_VM_AMR_PLAY_REQ *)(msg->SigP))->session_id;
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_VM_AMR_PLAY_START_REQ));
-          }
-        }
-        break;
-
-        case MMI_VM_AMR_PLAY_START_CON:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_VM_AMR_PLAY_START_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_VM_AMR_PLAY_START_CON *)(ptr))->header       = TRL1_MMI_VM_AMR_PLAY_START_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_VM_AMR_PLAY_START_CON));
-          }
-        }
-        break;
-
-        case MMI_VM_AMR_PLAY_STOP_REQ:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_VM_AMR_PLAY_STOP_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_VM_AMR_PLAY_STOP_REQ *)(ptr))->header       = TRL1_MMI_VM_AMR_PLAY_STOP_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_VM_AMR_PLAY_STOP_REQ));
-          }
-        }
-        break;
-
-        case MMI_VM_AMR_PLAY_STOP_CON:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_VM_AMR_PLAY_STOP_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_VM_AMR_PLAY_STOP_CON *)(ptr))->header       = TRL1_MMI_VM_AMR_PLAY_STOP_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_VM_AMR_PLAY_STOP_CON));
-          }
-        }
-        break;
-        case MMI_VM_AMR_PAUSE_REQ:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_VM_AMR_PAUSE_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_VM_AMR_PAUSE_REQ *)(ptr))->header  = TRL1_MMI_VM_AMR_PAUSE_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_VM_AMR_PAUSE_REQ));
-          }
-        }
-        break;
-        case MMI_VM_AMR_RESUME_REQ:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_VM_AMR_RESUME_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_VM_AMR_RESUME_REQ *)(ptr))->header       = TRL1_MMI_VM_AMR_RESUME_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-         //  ((T_TR_MMI_VM_AMR_RESUME_REQ *)(ptr))->session_id   = ((T_MMI_VM_AMR_RESUME_REQ *)(msg->SigP))->session_id;
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_VM_AMR_RESUME_REQ));
-          }
-        }
-        break;
-
- case MMI_VM_AMR_PAUSE_CON:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_VM_AMR_PAUSE_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_VM_AMR_PAUSE_CON *)(ptr))->header       = TRL1_MMI_VM_AMR_PAUSE_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_VM_AMR_PAUSE_CON));
-          }
-        }
-        break;
- case MMI_VM_AMR_RESUME_CON:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_VM_AMR_RESUME_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_VM_AMR_RESUME_CON *)(ptr))->header       = TRL1_MMI_VM_AMR_RESUME_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_VM_AMR_RESUME_CON));
-          }
-        }
-        break;
-
-
-
-
-      #endif // L1_VOICE_MEMO_AMR
-
-      #if (SPEECH_RECO)
-        case MMI_SR_ENROLL_START_REQ:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_SR_ENROLL_START_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_SR_ENROLL_START_REQ *)(ptr))->header          = TRL1_MMI_SR_ENROLL_START_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-            ((T_TR_MMI_SR_ENROLL_START_REQ *)(ptr))->database_id     = ((T_MMI_SR_ENROLL_REQ *)(msg->SigP))->database_id;
-            ((T_TR_MMI_SR_ENROLL_START_REQ *)(ptr))->word_index      = ((T_MMI_SR_ENROLL_REQ *)(msg->SigP))->word_index;
-            ((T_TR_MMI_SR_ENROLL_START_REQ *)(ptr))->speech          = ((T_MMI_SR_ENROLL_REQ *)(msg->SigP))->speech;
-            ((T_TR_MMI_SR_ENROLL_START_REQ *)(ptr))->speech_address  = (UWORD32) ((T_MMI_SR_ENROLL_REQ *)(msg->SigP))->speech_address;
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_SR_ENROLL_START_REQ));
-          }
-        }
-        break;
-
-        case MMI_SR_ENROLL_STOP_REQ:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_SR_ENROLL_STOP_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_SR_ENROLL_STOP_REQ *)(ptr))->header       = TRL1_MMI_SR_ENROLL_STOP_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_SR_ENROLL_STOP_REQ));
-          }
-        }
-        break;
-
-        case MMI_SR_ENROLL_START_CON:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_SR_ENROLL_START_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_SR_ENROLL_START_CON *)(ptr))->header       = TRL1_MMI_SR_ENROLL_START_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_SR_ENROLL_START_CON));
-          }
-        }
-        break;
-
-        case MMI_SR_ENROLL_STOP_CON:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_SR_ENROLL_STOP_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_SR_ENROLL_STOP_CON *)(ptr))->header       = TRL1_MMI_SR_ENROLL_STOP_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-            ((T_TR_MMI_SR_ENROLL_STOP_CON *)(ptr))->error_id     = ((T_MMI_SR_ENROLL_STOP_CON *)(msg->SigP))->error_id;
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_SR_ENROLL_STOP_CON));
-          }
-        }
-        break;
-
-        case MMI_SR_UPDATE_START_REQ:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_SR_UPDATE_START_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_SR_UPDATE_START_REQ *)(ptr))->header         = TRL1_MMI_SR_UPDATE_START_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-            ((T_TR_MMI_SR_UPDATE_START_REQ *)(ptr))->database_id    = ((T_MMI_SR_UPDATE_REQ *)(msg->SigP))->database_id;
-            ((T_TR_MMI_SR_UPDATE_START_REQ *)(ptr))->word_index     = ((T_MMI_SR_UPDATE_REQ *)(msg->SigP))->word_index;
-            ((T_TR_MMI_SR_UPDATE_START_REQ *)(ptr))->speech         = ((T_MMI_SR_UPDATE_REQ *)(msg->SigP))->speech;
-            ((T_TR_MMI_SR_UPDATE_START_REQ *)(ptr))->speech_address = ((T_MMI_SR_UPDATE_REQ *)(msg->SigP))->speech_address;
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_SR_UPDATE_START_REQ));
-          }
-        }
-        break;
-
-        case MMI_SR_UPDATE_STOP_REQ:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_SR_UPDATE_STOP_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_SR_UPDATE_STOP_REQ *)(ptr))->header       = TRL1_MMI_SR_UPDATE_STOP_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_SR_UPDATE_STOP_REQ));
-          }
-        }
-        break;
-
-        case MMI_SR_UPDATE_START_CON:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_SR_UPDATE_START_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_SR_UPDATE_START_CON *)(ptr))->header       = TRL1_MMI_SR_UPDATE_START_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_SR_UPDATE_START_CON));
-          }
-        }
-        break;
-
-        case MMI_SR_UPDATE_STOP_CON:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_SR_UPDATE_STOP_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_SR_UPDATE_STOP_CON *)(ptr))->header       = TRL1_MMI_SR_UPDATE_STOP_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-            ((T_TR_MMI_SR_UPDATE_STOP_CON *)(ptr))->error_id     = ((T_MMI_SR_UPDATE_STOP_CON *)(msg->SigP))->error_id;
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_SR_UPDATE_STOP_CON));
-          }
-        }
-        break;
-
-        case MMI_SR_RECO_START_REQ:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_SR_RECO_START_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_SR_RECO_START_REQ *)(ptr))->header          = TRL1_MMI_SR_RECO_START_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-            ((T_TR_MMI_SR_RECO_START_REQ *)(ptr))->database_id     = ((T_MMI_SR_RECO_REQ *)(msg->SigP))->database_id;
-            ((T_TR_MMI_SR_RECO_START_REQ *)(ptr))->vocabulary_size = ((T_MMI_SR_RECO_REQ *)(msg->SigP))->vocabulary_size;
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_SR_RECO_START_REQ));
-          }
-        }
-        break;
-
-        case MMI_SR_RECO_STOP_REQ:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_SR_RECO_STOP_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_SR_RECO_STOP_REQ *)(ptr))->header       = TRL1_MMI_SR_RECO_STOP_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_SR_RECO_STOP_REQ));
-          }
-        }
-        break;
-
-        case MMI_SR_RECO_START_CON:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_SR_RECO_START_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_SR_RECO_START_CON *)(ptr))->header       = TRL1_MMI_SR_RECO_START_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_SR_RECO_START_CON));
-          }
-        }
-        break;
-
-        case MMI_SR_RECO_STOP_CON:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_SR_RECO_STOP_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_SR_RECO_STOP_CON *)(ptr))->header                 = TRL1_MMI_SR_RECO_STOP_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-            ((T_TR_MMI_SR_RECO_STOP_CON *)(ptr))->error_id               = ((T_MMI_SR_RECO_STOP_CON *)(msg->SigP))->error_id;
-            ((T_TR_MMI_SR_RECO_STOP_CON *)(ptr))->best_word_index        = ((T_MMI_SR_RECO_STOP_CON *)(msg->SigP))->best_word_index;
-            ((T_TR_MMI_SR_RECO_STOP_CON *)(ptr))->best_word_score        = ((T_MMI_SR_RECO_STOP_CON *)(msg->SigP))->best_word_score;
-            ((T_TR_MMI_SR_RECO_STOP_CON *)(ptr))->second_best_word_index = ((T_MMI_SR_RECO_STOP_CON *)(msg->SigP))->second_best_word_index;
-            ((T_TR_MMI_SR_RECO_STOP_CON *)(ptr))->second_best_word_score = ((T_MMI_SR_RECO_STOP_CON *)(msg->SigP))->second_best_word_score;
-            ((T_TR_MMI_SR_RECO_STOP_CON *)(ptr))->third_best_word_index  = ((T_MMI_SR_RECO_STOP_CON *)(msg->SigP))->third_best_word_index;
-            ((T_TR_MMI_SR_RECO_STOP_CON *)(ptr))->third_best_word_score  = ((T_MMI_SR_RECO_STOP_CON *)(msg->SigP))->third_best_word_score;
-            ((T_TR_MMI_SR_RECO_STOP_CON *)(ptr))->fourth_best_word_index = ((T_MMI_SR_RECO_STOP_CON *)(msg->SigP))->fourth_best_word_index;
-            ((T_TR_MMI_SR_RECO_STOP_CON *)(ptr))->fourth_best_word_score = ((T_MMI_SR_RECO_STOP_CON *)(msg->SigP))->fourth_best_word_score;
-            ((T_TR_MMI_SR_RECO_STOP_CON *)(ptr))->d_sr_db_level          = ((T_MMI_SR_RECO_STOP_CON *)(msg->SigP))->d_sr_db_level;
-            ((T_TR_MMI_SR_RECO_STOP_CON *)(ptr))->d_sr_db_noise          = ((T_MMI_SR_RECO_STOP_CON *)(msg->SigP))->d_sr_db_noise;
-            ((T_TR_MMI_SR_RECO_STOP_CON *)(ptr))->d_sr_model_size        = ((T_MMI_SR_RECO_STOP_CON *)(msg->SigP))->d_sr_model_size;
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_SR_RECO_STOP_CON));
-          }
-        }
-        break;
-
-        case MMI_SR_UPDATE_CHECK_START_REQ:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_SR_UPDATE_CHECK_START_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_SR_UPDATE_CHECK_START_REQ *)(ptr))->header          = TRL1_MMI_SR_UPDATE_CHECK_START_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-            ((T_TR_MMI_SR_UPDATE_CHECK_START_REQ *)(ptr))->database_id     = ((T_MMI_SR_UPDATE_CHECK_REQ *)(msg->SigP))->database_id;
-            ((T_TR_MMI_SR_UPDATE_CHECK_START_REQ *)(ptr))->word_index      = ((T_MMI_SR_UPDATE_CHECK_REQ *)(msg->SigP))->word_index;
-            ((T_TR_MMI_SR_UPDATE_CHECK_START_REQ *)(ptr))->model_address   = (UWORD32) ((T_MMI_SR_UPDATE_CHECK_REQ *)(msg->SigP))->model_address;
-            ((T_TR_MMI_SR_UPDATE_CHECK_START_REQ *)(ptr))->speech          = ((T_MMI_SR_UPDATE_CHECK_REQ *)(msg->SigP))->speech;
-            ((T_TR_MMI_SR_UPDATE_CHECK_START_REQ *)(ptr))->speech_address  = (UWORD32) ((T_MMI_SR_UPDATE_CHECK_REQ *)(msg->SigP))->speech_address;
-            ((T_TR_MMI_SR_UPDATE_CHECK_START_REQ *)(ptr))->vocabulary_size = ((T_MMI_SR_UPDATE_CHECK_REQ *)(msg->SigP))->vocabulary_size;
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_SR_UPDATE_CHECK_START_REQ));
-          }
-        }
-        break;
-
-        case MMI_SR_UPDATE_CHECK_STOP_REQ:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_SR_UPDATE_CHECK_STOP_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_SR_UPDATE_CHECK_STOP_REQ *)(ptr))->header       = TRL1_MMI_SR_UPDATE_CHECK_STOP_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_SR_UPDATE_CHECK_STOP_REQ));
-          }
-        }
-        break;
-
-        case MMI_SR_UPDATE_CHECK_START_CON:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_SR_UPDATE_CHECK_START_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_SR_UPDATE_CHECK_START_CON *)(ptr))->header       = TRL1_MMI_SR_UPDATE_CHECK_START_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_SR_UPDATE_CHECK_START_CON));
-          }
-        }
-        break;
-
-        case MMI_SR_UPDATE_CHECK_STOP_CON:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_SR_UPDATE_CHECK_STOP_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_SR_UPDATE_CHECK_STOP_CON *)(ptr))->header                 = TRL1_MMI_SR_UPDATE_CHECK_STOP_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-            ((T_TR_MMI_SR_UPDATE_CHECK_STOP_CON *)(ptr))->error_id               = ((T_MMI_SR_UPDATE_CHECK_STOP_CON *)(msg->SigP))->error_id;
-            ((T_TR_MMI_SR_UPDATE_CHECK_STOP_CON *)(ptr))->best_word_index        = ((T_MMI_SR_UPDATE_CHECK_STOP_CON *)(msg->SigP))->best_word_index;
-            ((T_TR_MMI_SR_UPDATE_CHECK_STOP_CON *)(ptr))->best_word_score        = ((T_MMI_SR_UPDATE_CHECK_STOP_CON *)(msg->SigP))->best_word_score;
-            ((T_TR_MMI_SR_UPDATE_CHECK_STOP_CON *)(ptr))->second_best_word_index = ((T_MMI_SR_UPDATE_CHECK_STOP_CON *)(msg->SigP))->second_best_word_index;
-            ((T_TR_MMI_SR_UPDATE_CHECK_STOP_CON *)(ptr))->second_best_word_score = ((T_MMI_SR_UPDATE_CHECK_STOP_CON *)(msg->SigP))->second_best_word_score;
-            ((T_TR_MMI_SR_UPDATE_CHECK_STOP_CON *)(ptr))->third_best_word_index  = ((T_MMI_SR_UPDATE_CHECK_STOP_CON *)(msg->SigP))->third_best_word_index;
-            ((T_TR_MMI_SR_UPDATE_CHECK_STOP_CON *)(ptr))->third_best_word_score  = ((T_MMI_SR_UPDATE_CHECK_STOP_CON *)(msg->SigP))->third_best_word_score;
-            ((T_TR_MMI_SR_UPDATE_CHECK_STOP_CON *)(ptr))->fourth_best_word_index = ((T_MMI_SR_UPDATE_CHECK_STOP_CON *)(msg->SigP))->fourth_best_word_index;
-            ((T_TR_MMI_SR_UPDATE_CHECK_STOP_CON *)(ptr))->fourth_best_word_score = ((T_MMI_SR_UPDATE_CHECK_STOP_CON *)(msg->SigP))->fourth_best_word_score;
-            ((T_TR_MMI_SR_UPDATE_CHECK_STOP_CON *)(ptr))->d_sr_db_level          = ((T_MMI_SR_UPDATE_CHECK_STOP_CON *)(msg->SigP))->d_sr_db_level;
-            ((T_TR_MMI_SR_UPDATE_CHECK_STOP_CON *)(ptr))->d_sr_db_noise          = ((T_MMI_SR_UPDATE_CHECK_STOP_CON *)(msg->SigP))->d_sr_db_noise;
-            ((T_TR_MMI_SR_UPDATE_CHECK_STOP_CON *)(ptr))->d_sr_model_size        = ((T_MMI_SR_UPDATE_CHECK_STOP_CON *)(msg->SigP))->d_sr_model_size;
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_SR_UPDATE_CHECK_STOP_CON));
-          }
-        }
-        break;
-
-        case L1_SRBACK_SAVE_DATA_REQ:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1_SRBACK_SAVE_DATA_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_L1_SRBACK_SAVE_DATA_REQ *)(ptr))->header            = TRL1_L1_SRBACK_SAVE_DATA_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-            ((T_TR_L1_SRBACK_SAVE_DATA_REQ *)(ptr))->database_id       = ((T_L1_SRBACK_SAVE_DATA_REQ *)(msg->SigP))->database_id;
-            ((T_TR_L1_SRBACK_SAVE_DATA_REQ *)(ptr))->model_index       = ((T_L1_SRBACK_SAVE_DATA_REQ *)(msg->SigP))->model_index;
-            ((T_TR_L1_SRBACK_SAVE_DATA_REQ *)(ptr))->model_RAM_address = (UWORD32) ((T_L1_SRBACK_SAVE_DATA_REQ *)(msg->SigP))->model_RAM_address;
-            ((T_TR_L1_SRBACK_SAVE_DATA_REQ *)(ptr))->speech            = ((T_L1_SRBACK_SAVE_DATA_REQ *)(msg->SigP))->speech;
-            ((T_TR_L1_SRBACK_SAVE_DATA_REQ *)(ptr))->start_buffer      = (UWORD32) ((T_L1_SRBACK_SAVE_DATA_REQ *)(msg->SigP))->start_buffer;
-            ((T_TR_L1_SRBACK_SAVE_DATA_REQ *)(ptr))->stop_buffer       = (UWORD32) ((T_L1_SRBACK_SAVE_DATA_REQ *)(msg->SigP))->stop_buffer;
-            ((T_TR_L1_SRBACK_SAVE_DATA_REQ *)(ptr))->start_address     = (UWORD32) ((T_L1_SRBACK_SAVE_DATA_REQ *)(msg->SigP))->start_address;
-            ((T_TR_L1_SRBACK_SAVE_DATA_REQ *)(ptr))->stop_address      = (UWORD32) ((T_L1_SRBACK_SAVE_DATA_REQ *)(msg->SigP))->stop_address;
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1_SRBACK_SAVE_DATA_REQ));
-          }
-        }
-        break;
-
-        case L1_SRBACK_SAVE_DATA_CON:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1_SRBACK_SAVE_DATA_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_L1_SRBACK_SAVE_DATA_CON *)(ptr))->header       = TRL1_L1_SRBACK_SAVE_DATA_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1_SRBACK_SAVE_DATA_CON));
-          }
-        }
-        break;
-
-        case L1_SRBACK_LOAD_MODEL_REQ:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1_SRBACK_LOAD_MODEL_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_L1_SRBACK_LOAD_MODEL_REQ *)(ptr))->header            = TRL1_L1_SRBACK_LOAD_MODEL_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-            ((T_TR_L1_SRBACK_LOAD_MODEL_REQ *)(ptr))->database_id       = ((T_L1_SRBACK_LOAD_MODEL_REQ *)(msg->SigP))->database_id;
-            ((T_TR_L1_SRBACK_LOAD_MODEL_REQ *)(ptr))->model_index       = ((T_L1_SRBACK_LOAD_MODEL_REQ *)(msg->SigP))->model_index;
-            ((T_TR_L1_SRBACK_LOAD_MODEL_REQ *)(ptr))->model_RAM_address = (UWORD32) ((T_L1_SRBACK_LOAD_MODEL_REQ *)(msg->SigP))->model_RAM_address;
-            ((T_TR_L1_SRBACK_LOAD_MODEL_REQ *)(ptr))->CTO_enable        = ((T_L1_SRBACK_LOAD_MODEL_REQ *)(msg->SigP))->CTO_enable;
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1_SRBACK_LOAD_MODEL_REQ));
-          }
-        }
-        break;
-
-        case L1_SRBACK_LOAD_MODEL_CON:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1_SRBACK_LOAD_MODEL_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_L1_SRBACK_LOAD_MODEL_CON *)(ptr))->header       = TRL1_L1_SRBACK_LOAD_MODEL_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1_SRBACK_LOAD_MODEL_CON));
-          }
-        }
-        break;
-
-        case L1_SRBACK_TEMP_SAVE_DATA_REQ:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1_SRBACK_TEMP_SAVE_DATA_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_L1_SRBACK_TEMP_SAVE_DATA_REQ *)(ptr))->header                   = TRL1_L1_SRBACK_TEMP_SAVE_DATA_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-            ((T_TR_L1_SRBACK_TEMP_SAVE_DATA_REQ *)(ptr))->model_RAM_address_input  = (UWORD32) ((T_L1_SRBACK_TEMP_SAVE_DATA_REQ *)(msg->SigP))->model_RAM_address_input;
-            ((T_TR_L1_SRBACK_TEMP_SAVE_DATA_REQ *)(ptr))->model_RAM_address_output = (UWORD32) ((T_L1_SRBACK_TEMP_SAVE_DATA_REQ *)(msg->SigP))->model_RAM_address_output;
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1_SRBACK_TEMP_SAVE_DATA_REQ));
-          }
-        }
-        break;
-
-        case L1_SRBACK_TEMP_SAVE_DATA_CON:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1_SRBACK_TEMP_SAVE_DATA_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_L1_SRBACK_TEMP_SAVE_DATA_CON *)(ptr))->header       = TRL1_L1_SRBACK_TEMP_SAVE_DATA_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1_SRBACK_TEMP_SAVE_DATA_CON));
-          }
-        }
-        break;
-      #endif  // SPEECH_RECO
-      #if (FIR)
-        case MMI_AUDIO_FIR_REQ:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_AUDIO_FIR_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_AUDIO_FIR_REQ *)(ptr))->header             = TRL1_MMI_AUDIO_FIR_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-            ((T_TR_MMI_AUDIO_FIR_REQ *)(ptr))->fir_loop           = ((T_MMI_AUDIO_FIR_REQ *)(msg->SigP))->fir_loop;
-            ((T_TR_MMI_AUDIO_FIR_REQ *)(ptr))->update_fir         = ((T_MMI_AUDIO_FIR_REQ *)(msg->SigP))->update_fir;
-            ((T_TR_MMI_AUDIO_FIR_REQ *)(ptr))->fir_ul_coefficient = (UWORD32) ((T_MMI_AUDIO_FIR_REQ *)(msg->SigP))->fir_ul_coefficient;
-            ((T_TR_MMI_AUDIO_FIR_REQ *)(ptr))->fir_dl_coefficient = (UWORD32) ((T_MMI_AUDIO_FIR_REQ *)(msg->SigP))->fir_dl_coefficient;
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_AUDIO_FIR_REQ));
-          }
-        }
-        break;
-
-        case MMI_AUDIO_FIR_CON:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_AUDIO_FIR_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_AUDIO_FIR_CON *)(ptr))->header       = TRL1_MMI_AUDIO_FIR_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_AUDIO_FIR_CON));
-          }
-        }
-        break;
-      #endif //FIR
-      #if (L1_AEC == 1)
-        case MMI_AEC_REQ:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_AEC_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_AEC_REQ *)(ptr))->header          = TRL1_MMI_AEC_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-            ((T_TR_MMI_AEC_REQ *)(ptr))->aec_control     = ((T_MMI_AEC_REQ *)(msg->SigP))->aec_control;
-
-          #if (L1_NEW_AEC)
-            ((T_TR_MMI_AEC_REQ *)(ptr))->cont_filter     = ((T_MMI_AEC_REQ *)(msg->SigP))->cont_filter;
-            ((T_TR_MMI_AEC_REQ *)(ptr))->granularity_att = ((T_MMI_AEC_REQ *)(msg->SigP))->granularity_att;
-            ((T_TR_MMI_AEC_REQ *)(ptr))->coef_smooth     = ((T_MMI_AEC_REQ *)(msg->SigP))->coef_smooth;
-            ((T_TR_MMI_AEC_REQ *)(ptr))->es_level_max    = ((T_MMI_AEC_REQ *)(msg->SigP))->es_level_max;
-            ((T_TR_MMI_AEC_REQ *)(ptr))->fact_vad        = ((T_MMI_AEC_REQ *)(msg->SigP))->fact_vad;
-            ((T_TR_MMI_AEC_REQ *)(ptr))->thrs_abs        = ((T_MMI_AEC_REQ *)(msg->SigP))->thrs_abs;
-            ((T_TR_MMI_AEC_REQ *)(ptr))->fact_asd_fil    = ((T_MMI_AEC_REQ *)(msg->SigP))->fact_asd_fil;
-            ((T_TR_MMI_AEC_REQ *)(ptr))->fact_asd_mut    = ((T_MMI_AEC_REQ *)(msg->SigP))->fact_asd_mut;
-          #else
-            ((T_TR_MMI_AEC_REQ *)(ptr))->cont_filter     = 0;
-            ((T_TR_MMI_AEC_REQ *)(ptr))->granularity_att = 0;
-            ((T_TR_MMI_AEC_REQ *)(ptr))->coef_smooth     = 0;
-            ((T_TR_MMI_AEC_REQ *)(ptr))->es_level_max    = 0;
-            ((T_TR_MMI_AEC_REQ *)(ptr))->fact_vad        = 0;
-            ((T_TR_MMI_AEC_REQ *)(ptr))->thrs_abs        = 0;
-            ((T_TR_MMI_AEC_REQ *)(ptr))->fact_asd_fil    = 0;
-            ((T_TR_MMI_AEC_REQ *)(ptr))->fact_asd_mut    = 0;
-          #endif
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_AEC_REQ));
-          }
-        }
-        break;
-
-        #if (L1_NEW_AEC)
-          case L1_AEC_IND:
-          {
-            char *ptr;
-
-            if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1_AEC_IND), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-            {
-
-              ((T_TR_L1_AEC_IND *)(ptr))->header             = TRL1_L1_AEC_IND | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-              ((T_TR_L1_AEC_IND *)(ptr))->far_end_pow        = ((T_L1_AEC_IND *)(msg->SigP))->far_end_pow;
-              ((T_TR_L1_AEC_IND *)(ptr))->far_end_noise      = ((T_L1_AEC_IND *)(msg->SigP))->far_end_noise;
-              ((T_TR_L1_AEC_IND *)(ptr))->es_level           = ((T_L1_AEC_IND *)(msg->SigP))->es_level;
-
-              L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1_AEC_IND));
-            }
-          }
-        #endif
-
-        case MMI_AEC_CON:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_AEC_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_AEC_CON *)(ptr))->header       = TRL1_MMI_AEC_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_AEC_CON));
-          }
-        }
-        break;
-      #endif //AEC
-
-      #if (AUDIO_MODE)
-        case MMI_AUDIO_MODE_REQ:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_AUDIO_MODE_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_AUDIO_MODE_REQ *)(ptr))->header       = TRL1_MMI_AUDIO_MODE_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-            ((T_TR_MMI_AUDIO_MODE_REQ *)(ptr))->audio_mode   = ((T_MMI_AUDIO_MODE *)(msg->SigP))->audio_mode;
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_AUDIO_MODE_REQ));
-          }
-        }
-        break;
-
-        case MMI_AUDIO_MODE_CON:
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_AUDIO_MODE_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_AUDIO_MODE_CON *)(ptr))->header       = TRL1_MMI_AUDIO_MODE_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_AUDIO_MODE_CON));
-          }
-        }
-        break;
-
-      #endif // AUDIO_MODE
-
-      #if (MELODY_E2)
-        // MMI command and request
-        case MMI_MELODY0_E2_START_REQ :
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_MELODY0_E2_START_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_MELODY0_E2_START_REQ *)(ptr))->header       = TRL1_MMI_MELODY0_E2_START_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-            ((T_TR_MMI_MELODY0_E2_START_REQ *)(ptr))->session_id   = ((T_MMI_MELODY_E2_REQ *)(msg->SigP))->session_id,
-            ((T_TR_MMI_MELODY0_E2_START_REQ *)(ptr))->loopback     = ((T_MMI_MELODY_E2_REQ *)(msg->SigP))->loopback;
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_MELODY0_E2_START_REQ));
-          }
-        }
-        break;
-
-        case MMI_MELODY0_E2_STOP_REQ :
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_MELODY0_E2_STOP_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_MELODY0_E2_STOP_REQ *)(ptr))->header       = TRL1_MMI_MELODY0_E2_STOP_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_MELODY0_E2_STOP_REQ));
-          }
-        }
-        break;
-
-        case MMI_MELODY0_E2_START_CON :
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_MELODY0_E2_START_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_MELODY0_E2_START_CON *)(ptr))->header       = TRL1_MMI_MELODY0_E2_START_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_MELODY0_E2_START_CON));
-          }
-        }
-        break;
-
-        case MMI_MELODY0_E2_STOP_CON :
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_MELODY0_E2_STOP_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_MELODY0_E2_STOP_CON *)(ptr))->header       = TRL1_MMI_MELODY0_E2_STOP_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_MELODY0_E2_STOP_CON));
-          }
-        }
-        break;
-
-        case MMI_MELODY1_E2_START_REQ :
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_MELODY0_E2_START_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_MELODY1_E2_START_REQ *)(ptr))->header       = TRL1_MMI_MELODY1_E2_START_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-            ((T_TR_MMI_MELODY1_E2_START_REQ *)(ptr))->session_id   = ((T_MMI_MELODY_E2_REQ *)(msg->SigP))->session_id,
-            ((T_TR_MMI_MELODY1_E2_START_REQ *)(ptr))->loopback     = ((T_MMI_MELODY_E2_REQ *)(msg->SigP))->loopback;
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_MELODY1_E2_START_REQ));
-          }
-        }
-        break;
-
-        case MMI_MELODY1_E2_STOP_REQ :
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_MELODY1_E2_STOP_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_MELODY1_E2_STOP_REQ *)(ptr))->header       = TRL1_MMI_MELODY1_E2_STOP_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_MELODY1_E2_STOP_REQ));
-          }
-        }
-        break;
-
-        case MMI_MELODY1_E2_START_CON :
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_MELODY1_E2_START_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_MELODY1_E2_START_CON *)(ptr))->header       = TRL1_MMI_MELODY1_E2_START_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_MELODY1_E2_START_CON));
-          }
-        }
-        break;
-
-        case MMI_MELODY1_E2_STOP_CON :
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_MELODY1_E2_STOP_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_MMI_MELODY1_E2_STOP_CON *)(ptr))->header       = TRL1_MMI_MELODY1_E2_STOP_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_MELODY1_E2_STOP_CON));
-          }
-        }
-        break;
-
-        // Audio download instrument message
-        case L1_BACK_MELODY_E2_LOAD_INSTRUMENT_REQ :
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_REQ *)(ptr))->header                 = TRL1_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-            ((T_TR_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_REQ *)(ptr))->melody_id              = ((T_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_REQ *)(msg->SigP))->melody_id;
-            ((T_TR_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_REQ *)(ptr))->number_of_instrument   = ((T_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_REQ *)(msg->SigP))->number_of_instrument;
-            ((T_TR_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_REQ *)(ptr))->waves_table_id[0]      = ((T_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_REQ *)(msg->SigP))->waves_table_id[0];
-            ((T_TR_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_REQ *)(ptr))->waves_table_id[1]      = ((T_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_REQ *)(msg->SigP))->waves_table_id[1];
-            ((T_TR_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_REQ *)(ptr))->waves_table_id[2]      = ((T_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_REQ *)(msg->SigP))->waves_table_id[2];
-            ((T_TR_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_REQ *)(ptr))->waves_table_id[3]      = ((T_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_REQ *)(msg->SigP))->waves_table_id[3];
-            ((T_TR_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_REQ *)(ptr))->waves_table_id[4]      = ((T_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_REQ *)(msg->SigP))->waves_table_id[4];
-            ((T_TR_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_REQ *)(ptr))->waves_table_id[5]      = ((T_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_REQ *)(msg->SigP))->waves_table_id[5];
-            ((T_TR_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_REQ *)(ptr))->waves_table_id[6]      = ((T_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_REQ *)(msg->SigP))->waves_table_id[6];
-            ((T_TR_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_REQ *)(ptr))->waves_table_id[7]      = ((T_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_REQ *)(msg->SigP))->waves_table_id[7];
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_REQ));
-          }
-        }
-        break;
-
-        case L1_BACK_MELODY_E2_LOAD_INSTRUMENT_CON :
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_CON *)(ptr))->header                 = TRL1_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-            ((T_TR_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_CON *)(ptr))->melody_id              = ((T_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_CON *)(msg->SigP))->melody_id;
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1_BACK_MELODY_E2_LOAD_INSTRUMENT_CON));
-          }
-        }
-        break;
-
-        case L1_BACK_MELODY_E2_UNLOAD_INSTRUMENT_REQ :
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1_BACK_MELODY_E2_UNLOAD_INSTRUMENT_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_L1_BACK_MELODY_E2_UNLOAD_INSTRUMENT_REQ *)(ptr))->header                 = TRL1_L1_BACK_MELODY_E2_UNLOAD_INSTRUMENT_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-            ((T_TR_L1_BACK_MELODY_E2_UNLOAD_INSTRUMENT_REQ *)(ptr))->melody_id              = ((T_L1_BACK_MELODY_E2_UNLOAD_INSTRUMENT_REQ *)(msg->SigP))->melody_id;
-            ((T_TR_L1_BACK_MELODY_E2_UNLOAD_INSTRUMENT_REQ *)(ptr))->number_of_instrument   = ((T_L1_BACK_MELODY_E2_UNLOAD_INSTRUMENT_REQ *)(msg->SigP))->number_of_instrument;
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1_BACK_MELODY_E2_UNLOAD_INSTRUMENT_REQ));
-          }
-        }
-        break;
-
-        case L1_BACK_MELODY_E2_UNLOAD_INSTRUMENT_CON :
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1_BACK_MELODY_E2_UNLOAD_INSTRUMENT_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_L1_BACK_MELODY_E2_UNLOAD_INSTRUMENT_CON *)(ptr))->header                 = TRL1_L1_BACK_MELODY_E2_UNLOAD_INSTRUMENT_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-            ((T_TR_L1_BACK_MELODY_E2_UNLOAD_INSTRUMENT_CON *)(ptr))->melody_id              = ((T_L1_BACK_MELODY_E2_UNLOAD_INSTRUMENT_CON *)(msg->SigP))->melody_id;
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1_BACK_MELODY_E2_UNLOAD_INSTRUMENT_REQ));
-          }
-        }
-        break;
-
-        // L1S stop confirmation
-        case L1_MELODY0_E2_STOP_CON :
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1_MELODY0_E2_STOP_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_L1_MELODY0_E2_STOP_CON *)(ptr))->header                 = TRL1_L1_MELODY0_E2_STOP_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1_MELODY0_E2_STOP_CON));
-          }
-        }
-        break;
-
-        case L1_MELODY1_E2_STOP_CON :
-        {
-          char *ptr;
-
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1_MELODY1_E2_STOP_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-
-            ((T_TR_L1_MELODY1_E2_STOP_CON *)(ptr))->header                 = TRL1_L1_MELODY1_E2_STOP_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1_MELODY1_E2_STOP_CON));
-          }
-        }
-        break;
-
-        // Instrument download
-      #endif // MELODY_E2
-#if (L1_VOCODER_IF_CHANGE == 1)
-        case MMI_TCH_VOCODER_CFG_REQ:
-        {
-          char *ptr;
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_TCH_VOCODER_CFG_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-            ((T_TR_MMI_TCH_VOCODER_CFG_REQ *)(ptr))->header       = TRL1_MMI_TCH_VOCODER_CFG_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_TCH_VOCODER_CFG_REQ));
-          }
-        }
-        break;
-        case MMI_TCH_VOCODER_CFG_CON:
-        {
-          char *ptr;
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_TCH_VOCODER_CFG_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-            ((T_TR_MMI_TCH_VOCODER_CFG_CON *)(ptr))->header       = TRL1_MMI_TCH_VOCODER_CFG_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_TCH_VOCODER_CFG_CON));
-          }
-        }
-        break;
-        case L1_VOCODER_CFG_ENABLE_CON:
-        {
-          char *ptr;
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1_VOCODER_CFG_ENABLE_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-            ((T_TR_L1_VOCODER_CFG_ENABLE_CON *)(ptr))->header       = TRL1_L1_VOCODER_CFG_ENABLE_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1_VOCODER_CFG_ENABLE_CON));
-          }
-        }
-        break;
-        case L1_VOCODER_CFG_DISABLE_CON:
-        {
-          char *ptr;
-          if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1_VOCODER_CFG_DISABLE_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-          {
-            ((T_TR_L1_VOCODER_CFG_DISABLE_CON *)(ptr))->header       = TRL1_L1_VOCODER_CFG_DISABLE_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-            L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1_VOCODER_CFG_DISABLE_CON));
-          }
-        }
-        break;
-
-#endif // L1_VOCODER_IF_CHANGE
-    #endif  // AUDIO_TASK
-
-      ///////////////////
-      // OML1 messages //
-      ///////////////////
-
-      case OML1_CLOSE_TCH_LOOP_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_OML1_CLOSE_TCH_LOOP_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_OML1_CLOSE_TCH_LOOP_REQ *)(ptr))->header        = TRL1_OML1_CLOSE_TCH_LOOP_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_OML1_CLOSE_TCH_LOOP_REQ *)(ptr))->sub_channel   = ((T_OML1_CLOSE_TCH_LOOP_REQ *)(msg->SigP))->sub_channel;
-          ((T_TR_OML1_CLOSE_TCH_LOOP_REQ *)(ptr))->frame_erasure = ((T_OML1_CLOSE_TCH_LOOP_REQ *)(msg->SigP))->frame_erasure;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_OML1_CLOSE_TCH_LOOP_REQ));
-        }
-      }
-      break;
-
-      case OML1_OPEN_TCH_LOOP_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_OML1_OPEN_TCH_LOOP_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_OML1_OPEN_TCH_LOOP_REQ *)(ptr))->header       = TRL1_OML1_OPEN_TCH_LOOP_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_OML1_OPEN_TCH_LOOP_REQ));
-        }
-      }
-      break;
-
-      case OML1_START_DAI_TEST_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_OML1_START_DAI_TEST_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_OML1_START_DAI_TEST_REQ *)(ptr))->header        = TRL1_OML1_START_DAI_TEST_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_OML1_START_DAI_TEST_REQ *)(ptr))->tested_device = ((T_OML1_START_DAI_TEST_REQ *)(msg->SigP))->tested_device;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_OML1_START_DAI_TEST_REQ));
-        }
-      }
-      break;
-
-      case OML1_STOP_DAI_TEST_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_OML1_STOP_DAI_TEST_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_OML1_STOP_DAI_TEST_REQ *)(ptr))->header       = TRL1_OML1_STOP_DAI_TEST_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_OML1_STOP_DAI_TEST_REQ));
-        }
-      }
-      break;
-
-      ///////////////////
-      // Test messages //
-      ///////////////////
-
-      case TST_TEST_HW_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_TST_TEST_HW_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_TST_TEST_HW_REQ *)(ptr))->header       = TRL1_TST_TEST_HW_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_TST_TEST_HW_REQ));
-        }
-      }
-      break;
-
-      case L1_TEST_HW_INFO:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_L1_TEST_HW_INFO), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_L1_TEST_HW_INFO *)(ptr))->header            = TRL1_L1_TEST_HW_INFO | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_L1_TEST_HW_INFO *)(ptr))->dsp_code_version  = ((T_TST_TEST_HW_CON*)(msg->SigP))->dsp_code_version;
-          ((T_TR_L1_TEST_HW_INFO *)(ptr))->dsp_checksum      = ((T_TST_TEST_HW_CON*)(msg->SigP))->dsp_checksum;
-          ((T_TR_L1_TEST_HW_INFO *)(ptr))->dsp_patch_version = ((T_TST_TEST_HW_CON*)(msg->SigP))->dsp_patch_version;
-          ((T_TR_L1_TEST_HW_INFO *)(ptr))->mcu_alr_version   = ((T_TST_TEST_HW_CON*)(msg->SigP))->mcu_alr_version;
-          ((T_TR_L1_TEST_HW_INFO *)(ptr))->mcu_tm_version    = ((T_TST_TEST_HW_CON*)(msg->SigP))->mcu_tm_version;
-        #if L1_GPRS
-          ((T_TR_L1_TEST_HW_INFO *)(ptr))->mcu_gprs_version  = ((T_TST_TEST_HW_CON*)(msg->SigP))->mcu_gprs_version;
-        #else
-          ((T_TR_L1_TEST_HW_INFO *)(ptr))->mcu_gprs_version  = 0;
-        #endif
-        #if 0 //((((CHIPSET !=2 )) && ((LONG_JUMP != 0))) || (CHIPSET == 12) || (CHIPSET == 15))
-          ((T_TR_L1_TEST_HW_INFO *)(ptr))->d_checksum1       = d_checksum1;
-          ((T_TR_L1_TEST_HW_INFO *)(ptr))->d_checksum2       = d_checksum2;
-        #else
-          ((T_TR_L1_TEST_HW_INFO *)(ptr))->d_checksum1       = 0;
-          ((T_TR_L1_TEST_HW_INFO *)(ptr))->d_checksum2       = 0;
-        #endif
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_L1_TEST_HW_INFO));
-        }
-      }
-      break;
-
-      case TST_SLEEP_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_TST_SLEEP_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_TST_SLEEP_REQ *)(ptr))->header       = TRL1_TST_SLEEP_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-          ((T_TR_TST_SLEEP_REQ *)(ptr))->sleep_mode   = ((T_TST_SLEEP_REQ*)(msg->SigP))->sleep_mode;
-          ((T_TR_TST_SLEEP_REQ *)(ptr))->clocks       = ((T_TST_SLEEP_REQ*)(msg->SigP))->clocks;
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_TST_SLEEP_REQ));
-        }
-      }
-      break;
-
-      /////////
-      // ADC //
-      /////////
-
-      case MMI_ADC_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_ADC_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MMI_ADC_REQ *)(ptr))->header       = TRL1_MMI_ADC_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_ADC_REQ));
-        }
-      }
-      break;
-
-      case MMI_STOP_ADC_REQ:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_STOP_ADC_REQ), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MMI_STOP_ADC_REQ *)(ptr))->header       = TRL1_MMI_STOP_ADC_REQ | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_STOP_ADC_REQ));
-        }
-      }
-      break;
-
-      case MMI_STOP_ADC_CON:
-      {
-        char *ptr;
-
-        if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_MMI_STOP_ADC_CON), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-        {
-
-          ((T_TR_MMI_STOP_ADC_CON *)(ptr))->header       = TRL1_MMI_STOP_ADC_CON | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-          L1_send_trace_no_cpy(ptr,sizeof(T_TR_MMI_STOP_ADC_CON));
-        }
-      }
-      break;
-
-    } // ...End of switch
-  } // End if L1A message trace enabled
-}
-
-#if L1_RECOVERY
-
-/*********************************/
-/* Trace in case of system crash */
-/*********************************/
-
-void l1_trace_recovery(void)
-{
-  char *ptr;
-
-  if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TR_RECOVERY), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-  {
-
-    ((T_TR_RECOVERY *)(ptr))->header       = TRL1_RECOVERY | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-    L1_send_trace_no_cpy(ptr,sizeof(T_TR_RECOVERY));
-  }
-}
-#endif
-
-/*************************************************************************/
-/* L1 Dynamic traces                                                     */
-/*************************************************************************/
-
-/* WARNING : Following functions are called by L1S */
-/***************************************************/
-
-#if (DSP_DEBUG_TRACE_ENABLE == 1)
-  #define DSP_DEBUG_ENABLE \
-          if (trace_info.dsp_debug_buf_start[l1s_dsp_com.dsp_r_page] == 0) \
-          { \
-            trace_info.dsp_debug_buf_start[l1s_dsp_com.dsp_r_page] = l1s_dsp_com.dsp_db2_current_r_ptr->d_debug_ptr_begin; \
-            trace_info.dsp_debug_fn[l1s_dsp_com.dsp_r_page]        = l1s.actual_time.fn;                                   \
-            trace_info.dsp_debug_time[l1s_dsp_com.dsp_r_page]      = (UWORD16)l1s.debug_time;                              \
-          }
-#endif
-
-//////////////////////
-// L1S Debug Traces //
-//////////////////////
-
-/*-------------------------------------------------------*/
-/* Trace_L1s_Abort()                                     */
-/*-------------------------------------------------------*/
-/* Parameters :                                          */
-/* Return     :                                          */
-/*                                                       */
-/*-------------------------------------------------------*/
-void Trace_L1s_Abort(UWORD8 task)
-{
-  xSignalHeaderRec *msg;
-
-  // Allocate DEBUG message.
-  msg = os_alloc_sig(sizeof(T_TR_L1S_ABORT));
-  DEBUGMSG(status,NU_ALLOC_ERR)
-  msg->SignalCode = TRACE_INFO;
-
-  ((T_TR_L1S_ABORT *)(msg->SigP))->header        = TRL1_L1S_ABORT | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-  ((T_TR_L1S_ABORT *)(msg->SigP))->tpu_offset    = l1s.tpu_offset;
-  ((T_TR_L1S_ABORT *)(msg->SigP))->tpu_offset_hw = l1s.tpu_offset_hw;
-  ((T_TR_L1S_ABORT *)(msg->SigP))->d_debug       = l1s_dsp_com.dsp_db_r_ptr->d_debug & 0xffff;
-  ((T_TR_L1S_ABORT *)(msg->SigP))->debug_time    = (UWORD16) l1s.debug_time & 0xffff;
-  ((T_TR_L1S_ABORT *)(msg->SigP))->adc_mode      = l1a_l1s_com.adc_mode; // ADC enabled
-  ((T_TR_L1S_ABORT *)(msg->SigP))->task          = task;
-
-  // send message...
-  os_send_sig(msg, L1C1_QUEUE);
-  DEBUGMSG(status,NU_SEND_QUEUE_ERR)
-
-}
-
-/*-------------------------------------------------------*/
-/* Trace_MCU_DSP_Com_Mismatch()                          */
-/*-------------------------------------------------------*/
-/* Parameters :                                          */
-/* Return     :                                          */
-/*                                                       */
-/*-------------------------------------------------------*/
-void Trace_MCU_DSP_Com_Mismatch(UWORD8 task)
-{
-  if (trace_info.current_config->l1_dyn_trace &  1 << L1_DYN_TRACE_L1S_DEBUG)
-  {
-    xSignalHeaderRec *msg;
-
-    if((l1s_dsp_com.dsp_db_r_ptr->d_debug & 0xffff ) != (l1s.debug_time & 0xffff ))
-    // Debug number is different than the one expected...
-    {
-      if(!trace_info.DSP_misaligned)
-      // MCU/DSP com. is misaligned.
-      {
-        #if (DSP_DEBUG_TRACE_ENABLE == 1)
-          if (trace_info.current_config->l1_dyn_trace & 1<<L1_DYN_TRACE_DSP_DEBUG)
-          {
-            // Flag DSP error for DSP trace and memorize address of start of DSP trace
-#if(MELODY_E2 || L1_MP3 || L1_AAC || L1_DYN_DSP_DWNLD )
-            // DSP Trace is output ONLY if melody e2, mp3 or dynamic download are not currently running
-            if(trace_info.dsptrace_handler_globals.trace_flag_blocked == FALSE)
-#endif
-            DSP_DEBUG_ENABLE
-          }
-        #endif
-
-        RTTL1_EVENT(RTTL1_EVENT_ERROR, RTTL1_EVENT_SIZE_ERROR)
-
-        trace_info.DSP_misaligned = TRUE;
-      }
-      else
-        return;
-    }
-    else
-    {
-      if(trace_info.DSP_misaligned)
-      // MCU/DSP com. is now realigned.
-      {
-        trace_info.DSP_misaligned = FALSE;
-      }
-      else
-        return;
-    }
-
-    // Allocate DEBUG message.
-    msg = os_alloc_sig(sizeof(T_TR_MCU_DSP_MISMATCH));
-    DEBUGMSG(status,NU_ALLOC_ERR)
-    msg->SignalCode = TRACE_INFO;
-
-    ((T_TR_MCU_DSP_MISMATCH *)(msg->SigP))->header        = TRL1_MCU_DSP_MISMATCH | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-    ((T_TR_MCU_DSP_MISMATCH *)(msg->SigP))->tpu_offset    = l1s.tpu_offset;
-    ((T_TR_MCU_DSP_MISMATCH *)(msg->SigP))->tpu_offset_hw = l1s.tpu_offset_hw;
-    ((T_TR_MCU_DSP_MISMATCH *)(msg->SigP))->d_debug       = l1s_dsp_com.dsp_db_r_ptr->d_debug & 0xffff;
-    ((T_TR_MCU_DSP_MISMATCH *)(msg->SigP))->debug_time    = (UWORD16) l1s.debug_time & 0xffff;
-    ((T_TR_MCU_DSP_MISMATCH *)(msg->SigP))->adc_mode      = l1a_l1s_com.adc_mode; // ADC enabled
-    ((T_TR_MCU_DSP_MISMATCH *)(msg->SigP))->task          = task;
-    ((T_TR_MCU_DSP_MISMATCH *)(msg->SigP))->error         = trace_info.DSP_misaligned;
-
-    // send message...
-    os_send_sig(msg, L1C1_QUEUE);
-    DEBUGMSG(status,NU_SEND_QUEUE_ERR)
-  }
-}
-
-/*-------------------------------------------------------*/
-/* Trace_PM_Equal_0()                                    */
-/*-------------------------------------------------------*/
-/* Parameters :                                          */
-/* Return     :                                          */
-/*                                                       */
-/*-------------------------------------------------------*/
-void Trace_PM_Equal_0(UWORD32 pm, UWORD8 task)
-{
-  if(pm==0) // PM error in the frame
-  {
-    if (trace_info.PM_Task == 255) // 1st PM error in the frame: This PM is memorized
-      trace_info.PM_Task  = task;  // memorize the Task of this 1st PM error
-
-    #if ( ((TRACE_TYPE==1) || (TRACE_TYPE == 4)))
-     if (trace_info.current_config->l1_dyn_trace & 1 <<  L1_DSP_TRACE_FULL_DUMP)
-     {
-#if(MELODY_E2 || L1_MP3 || L1_AAC || L1_DYN_DSP_DWNLD )
- 	     // DSP Trace is output ONLY if melody e2, mp3 or dynamic download are not currently running
-       if(trace_info.dsptrace_handler_globals.trace_flag_blocked == FALSE)
-#endif
-         l1_trace_full_dsp_buffer();  // trace DSP trace buffer in case a PM error occurs
-      }                             // used only for debug mode,
-    #endif
-
-  }
-  else // no error in the frame :is it a PM recovery ?
-  {
-    if (trace_info.Not_PM_Task == 255) // 1st PM recovery case: task of recovery needs to be memorized
-      trace_info.Not_PM_Task = task;
-  }
-}
-
-/*-------------------------------------------------------*/
-/* Trace_PM_Equal_0_balance()                            */
-/*-------------------------------------------------------*/
-/* Parameters :                                          */
-/* Return     :                                          */
-/*                                                       */
-/*-------------------------------------------------------*/
-void Trace_PM_Equal_0_balance(void)
-{
-  // Here below we handle the case where we have lot of PM occuring during next frames
-  // The PM traces are filtered in order to trace:
-  //   => the first PM
-  //   => the latest PM when we have no more PM
-  BOOL trace_pm = FALSE;
-
-
-  if(trace_info.PM_Task != 255) // at least one PM occured in the current frame
-  {
-    if(!trace_info.PM_equal_0)  // We are not in a phase of PM: We trace only the 1st PM
-    {
-      if (trace_info.current_config->l1_dyn_trace & 1 <<  L1_DYN_TRACE_L1S_DEBUG)
-      {
-        trace_pm              = TRUE;
-
-        #if (DSP_DEBUG_TRACE_ENABLE == 1)
-          if (trace_info.current_config->l1_dyn_trace & 1<<L1_DYN_TRACE_DSP_DEBUG)
-          // Flag DSP error for DSP trace and memorize address of start of DSP trace
-          {
-#if(MELODY_E2 || L1_MP3 || L1_AAC || L1_DYN_DSP_DWNLD )
-            // DSP Trace is output ONLY if melody e2, mp3 or dynamic download are not currently running
-            if(trace_info.dsptrace_handler_globals.trace_flag_blocked == FALSE)
-#endif
-
-            DSP_DEBUG_ENABLE
-          }
-        #endif
-
-        RTTL1_EVENT(RTTL1_EVENT_ERROR, RTTL1_EVENT_SIZE_ERROR)
-      }
-
-      trace_info.PM_equal_0 = TRUE;  // We enter in a phase of a lot of PM
-    }
-  }
-  else // no PM in the current frame
-  {
-    if(trace_info.PM_equal_0) // this is the end of the PM phase: we trace the latest PM
-    {
-      if (trace_info.current_config->l1_dyn_trace & 1 << L1_DYN_TRACE_L1S_DEBUG)
-      {
-        trace_pm              = TRUE;
-      }
-
-      trace_info.PM_equal_0 = FALSE;
-    }
-  }
-
-  if (trace_pm)
-  {
-    xSignalHeaderRec *msg;
-
-    // Allocate DEBUG message.
-    msg = os_alloc_sig(sizeof(T_TR_PM_EQUAL_0));
-    DEBUGMSG(status,NU_ALLOC_ERR)
-    msg->SignalCode = TRACE_INFO;
-
-    ((T_TR_PM_EQUAL_0 *)(msg->SigP))->header        = TRL1_PM_EQUAL_0 | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-    ((T_TR_PM_EQUAL_0 *)(msg->SigP))->tpu_offset    = l1s.tpu_offset;
-    ((T_TR_PM_EQUAL_0 *)(msg->SigP))->tpu_offset_hw = l1s.tpu_offset_hw;
-    ((T_TR_PM_EQUAL_0 *)(msg->SigP))->d_debug       = l1s_dsp_com.dsp_db_r_ptr->d_debug & 0xffff;
-    ((T_TR_PM_EQUAL_0 *)(msg->SigP))->debug_time    = (UWORD16) l1s.debug_time & 0xffff;
-    ((T_TR_PM_EQUAL_0 *)(msg->SigP))->adc_mode      = l1a_l1s_com.adc_mode; // ADC enabled
-    ((T_TR_PM_EQUAL_0 *)(msg->SigP))->task          = trace_info.PM_Task;
-    ((T_TR_PM_EQUAL_0 *)(msg->SigP))->no_pm_task    = trace_info.Not_PM_Task;
-    ((T_TR_PM_EQUAL_0 *)(msg->SigP))->error         = trace_info.PM_equal_0;
-
-    // send message...
-    os_send_sig(msg, L1C1_QUEUE);
-    DEBUGMSG(status,NU_SEND_QUEUE_ERR)
-  }
-
-  trace_info.PM_Task     = 255;
-  trace_info.Not_PM_Task = 255;
-}
-
-/*-------------------------------------------------------*/
-/* l1_trace_IT_DSP_error()                               */
-/*-------------------------------------------------------*/
-/* Parameters :                                          */
-/* Return     :                                          */
-/*                                                       */
-/*-------------------------------------------------------*/
-void l1_trace_IT_DSP_error(UWORD8 cause)
-{
-  #if (TRACE_TYPE==1) || (TRACE_TYPE==4)
-     if (trace_info.current_config->l1_dyn_trace & 1<<L1_DYN_TRACE_L1S_DEBUG)
-     {
-       xSignalHeaderRec *msg;
-
-       // Allocate DEBUG message.
-       msg = os_alloc_sig(sizeof(T_TR_IT_DSP_ERROR));
-       DEBUGMSG(status,NU_ALLOC_ERR)
-       msg->SignalCode = TRACE_INFO;
-
-       ((T_TR_IT_DSP_ERROR *)(msg->SigP))->header = TRL1_IT_DSP_ERROR | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-       // send message...
-       os_send_sig(msg, L1C1_QUEUE);
-       DEBUGMSG(status,NU_SEND_QUEUE_ERR)
-     }
-  #endif
-}
-
-///////////////////////
-// P.Transfer traces //
-///////////////////////
-
-#if L1_GPRS
-
-/*-------------------------------------------------------*/
-/* Trace_dl_ptcch()                                      */
-/*-------------------------------------------------------*/
-/* Parameters :                                          */
-/* Return     :                                          */
-/*                                                       */
-/*-------------------------------------------------------*/
-void  Trace_dl_ptcch(UWORD8  ordered_ta,
-                     UWORD8  crc)   // Current TX allocation for Polling
-{
-  xSignalHeaderRec *msg;
-
-  // Allocate DEBUG message.
-  msg = os_alloc_sig(sizeof(T_TR_DL_PTCCH));
-  DEBUGMSG(status,NU_ALLOC_ERR)
-  msg->SignalCode = TRACE_INFO;
-
-  ((T_TR_DL_PTCCH *)(msg->SigP))->header     = TRL1_DL_PTCCH | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-  ((T_TR_DL_PTCCH *)(msg->SigP))->crc_error  = crc;
-  ((T_TR_DL_PTCCH *)(msg->SigP))->ordered_ta = ordered_ta;
-
-  // send message...
-  os_send_sig(msg, L1C1_QUEUE);
-  DEBUGMSG(status,NU_SEND_QUEUE_ERR)
-
-} // End Trace_ptcch_error
-
-/*-------------------------------------------------------*/
-/* Trace_rlc_ul_param()                                  */
-/*-------------------------------------------------------*/
-/* Parameters :                                          */
-/* Return     :                                          */
-/*                                                       */
-/*-------------------------------------------------------*/
-void Trace_rlc_ul_param(UWORD8  assignment_id,
-                        UWORD8  tx_no,
-                        UWORD32 fn,
-                        UWORD8  ta,
-                        UWORD32 a_pu_gprs,
-                        UWORD32 a_du_gprs,
-                        BOOL    fix_alloc_exhaust)
-{
-  xSignalHeaderRec *msg;
-
-  // Allocate DEBUG message.
-  msg = os_alloc_sig(sizeof(T_TR_RLC_UL_PARAM));
-  DEBUGMSG(status,NU_ALLOC_ERR)
-  msg->SignalCode = TRACE_INFO;
-
-  ((T_TR_RLC_UL_PARAM *)(msg->SigP))->header            = TRL1_RLC_UL_PARAM | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-  ((T_TR_RLC_UL_PARAM *)(msg->SigP))->a_pu_gprs         = a_pu_gprs;
-  ((T_TR_RLC_UL_PARAM *)(msg->SigP))->a_du_gprs         = a_du_gprs;
-  ((T_TR_RLC_UL_PARAM *)(msg->SigP))->assignment_id     = assignment_id;
-  ((T_TR_RLC_UL_PARAM *)(msg->SigP))->tx_no             = tx_no;
-  ((T_TR_RLC_UL_PARAM *)(msg->SigP))->fn_param          = fn;
-  ((T_TR_RLC_UL_PARAM *)(msg->SigP))->ta                = ta;
-  ((T_TR_RLC_UL_PARAM *)(msg->SigP))->fix_alloc_exhaust = fix_alloc_exhaust;
-
-  // send message...
-  os_send_sig(msg, L1C1_QUEUE);
-  DEBUGMSG(status,NU_SEND_QUEUE_ERR)
-}
-
-/*-------------------------------------------------------*/
-/* Trace_rlc_dl_param()                                  */
-/*-------------------------------------------------------*/
-/* Parameters :                                          */
-/* Return     :                                          */
-/*                                                       */
-/*-------------------------------------------------------*/
-void Trace_rlc_dl_param( UWORD8  assignment_id,
-                         UWORD32 fn,
-                         UWORD32 d_rlcmac_rx_no_gprs,
-                         UWORD8  rx_no,
-                         UWORD8  rlc_blocks_sent,
-                         UWORD8  last_poll_response)
-{
-  xSignalHeaderRec *msg;
-
-  // Allocate DEBUG message.
-  msg = os_alloc_sig(sizeof(T_TR_RLC_DL_PARAM));
-  DEBUGMSG(status,NU_ALLOC_ERR)
-  msg->SignalCode = TRACE_INFO;
-
-
-  ((T_TR_RLC_DL_PARAM *)(msg->SigP))->header              = TRL1_RLC_DL_PARAM | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-  ((T_TR_RLC_DL_PARAM *)(msg->SigP))->fn_param            = fn;
-  ((T_TR_RLC_DL_PARAM *)(msg->SigP))->d_rlcmac_rx_no_gprs = d_rlcmac_rx_no_gprs;
-  ((T_TR_RLC_DL_PARAM *)(msg->SigP))->assignment_id       = assignment_id;
-  ((T_TR_RLC_DL_PARAM *)(msg->SigP))->rx_no               = rx_no;
-  ((T_TR_RLC_DL_PARAM *)(msg->SigP))->rlc_blocks_sent     = rlc_blocks_sent;
-  ((T_TR_RLC_DL_PARAM *)(msg->SigP))->last_poll_response  = last_poll_response;
-
-  // send message...
-  os_send_sig(msg, L1C1_QUEUE);
-  DEBUGMSG(status,NU_SEND_QUEUE_ERR)
-}
-
-/*-------------------------------------------------------*/
-/* Trace_uplink_no_TA()                                  */
-/*-------------------------------------------------------*/
-/* Parameters :                                          */
-/* Return     :                                          */
-/*                                                       */
-/*-------------------------------------------------------*/
-void Trace_uplink_no_TA()
-{
-  xSignalHeaderRec *msg;
-
-  // Allocate DEBUG message.
-  msg = os_alloc_sig(sizeof(T_TR_FORBIDDEN_UPLINK));
-  DEBUGMSG(status,NU_ALLOC_ERR)
-  msg->SignalCode = TRACE_INFO;
-
-  ((T_TR_FORBIDDEN_UPLINK *)(msg->SigP))->header         = TRL1_FORBIDDEN_UPLINK | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-  // send message...
-  os_send_sig(msg, L1C1_QUEUE);
-  DEBUGMSG(status,NU_SEND_QUEUE_ERR)
-}
-
-/*-------------------------------------------------------*/
-/* l1_trace_ptcch_disable()                              */
-/*-------------------------------------------------------*/
-/* Parameters :                                          */
-/* Return     :                                          */
-/* Trace the gauging is running                          */
-/*-------------------------------------------------------*/
-void l1_trace_ptcch_disable(void)
-{
-  #if (TRACE_TYPE==1) || (TRACE_TYPE==4)
-
-    xSignalHeaderRec *msg;
-
-    if (trace_info.current_config->l1_dyn_trace & 1<<L1_DYN_TRACE_L1S_DEBUG)
-    {
-      // Allocate DEBUG message.
-      msg = os_alloc_sig(sizeof(T_TR_PTCCH_DISABLE));
-      DEBUGMSG(status,NU_ALLOC_ERR)
-      msg->SignalCode = TRACE_INFO;
-
-      ((T_TR_TOA_NOT_UPDATED *)(msg->SigP))->header    = TRL1_PTCCH_DISABLE | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-
-      // send message...
-      os_send_sig(msg, L1C1_QUEUE);
-      DEBUGMSG(status,NU_SEND_QUEUE_ERR)
-    }
-  #endif
-}
-
-/*-------------------------------------------------------*/
-/* Trace_pdtch()                                         */
-/*-------------------------------------------------------*/
-/* Parameters :                                          */
-/* Return     :                                          */
-/*                                                       */
-/*-------------------------------------------------------*/
-void  Trace_condensed_pdtch(UWORD8 rx_allocation, UWORD8 tx_allocation)
-{
-  xSignalHeaderRec *msg;
-
-  // Allocate DEBUG message.
-  msg = os_alloc_sig(sizeof(T_CONDENSED_PDTCH_INFO));
-  DEBUGMSG(status,NU_ALLOC_ERR)
-  msg->SignalCode = TRACE_CONDENSED_PDTCH;
-
-  ((T_CONDENSED_PDTCH_INFO *)(msg->SigP))->fn            = l1s.actual_time.fn;
-  ((T_CONDENSED_PDTCH_INFO *)(msg->SigP))->rx_allocation = rx_allocation;
-  ((T_CONDENSED_PDTCH_INFO *)(msg->SigP))->tx_allocation = tx_allocation;
-  ((T_CONDENSED_PDTCH_INFO *)(msg->SigP))->blk_status    = trace_info.pdtch_trace.blk_status;
-  ((T_CONDENSED_PDTCH_INFO *)(msg->SigP))->dl_cs_type    = trace_info.pdtch_trace.dl_cs_type;
-  ((T_CONDENSED_PDTCH_INFO *)(msg->SigP))->dl_status[0]  = trace_info.pdtch_trace.dl_status[0];
-  ((T_CONDENSED_PDTCH_INFO *)(msg->SigP))->dl_status[1]  = trace_info.pdtch_trace.dl_status[1];
-  ((T_CONDENSED_PDTCH_INFO *)(msg->SigP))->dl_status[2]  = trace_info.pdtch_trace.dl_status[2];
-  ((T_CONDENSED_PDTCH_INFO *)(msg->SigP))->dl_status[3]  = trace_info.pdtch_trace.dl_status[3];
-  ((T_CONDENSED_PDTCH_INFO *)(msg->SigP))->ul_status[0]  = trace_info.pdtch_trace.ul_status[0];
-  ((T_CONDENSED_PDTCH_INFO *)(msg->SigP))->ul_status[1]  = trace_info.pdtch_trace.ul_status[1];
-  ((T_CONDENSED_PDTCH_INFO *)(msg->SigP))->ul_status[2]  = trace_info.pdtch_trace.ul_status[2];
-  ((T_CONDENSED_PDTCH_INFO *)(msg->SigP))->ul_status[3]  = trace_info.pdtch_trace.ul_status[3];
-  ((T_CONDENSED_PDTCH_INFO *)(msg->SigP))->ul_status[4]  = trace_info.pdtch_trace.ul_status[4];
-  ((T_CONDENSED_PDTCH_INFO *)(msg->SigP))->ul_status[5]  = trace_info.pdtch_trace.ul_status[5];
-  ((T_CONDENSED_PDTCH_INFO *)(msg->SigP))->ul_status[6]  = trace_info.pdtch_trace.ul_status[6];
-  ((T_CONDENSED_PDTCH_INFO *)(msg->SigP))->ul_status[7]  = trace_info.pdtch_trace.ul_status[7];
-
-  // send message...
-  os_send_sig(msg, L1C1_QUEUE);
-  DEBUGMSG(status,NU_SEND_QUEUE_ERR)
-}
-
-/*-------------------------------------------------------*/
-/* Quick_Trace()                                         */
-/*-------------------------------------------------------*/
-/* Parameters :                                          */
-/* Return     :                                          */
-/* Description: This function can be used to quickly add */
-/*              a trace                                  */
-/*              NOT TO USE FOR PERMANENT TRACES !!!      */
-/*-------------------------------------------------------*/
-void  Quick_Trace(UWORD8   debug_code,
-                  UWORD32  param0,
-                  UWORD32  param1,
-                  UWORD32  param2,
-                  UWORD32  param3,
-                  UWORD32  param4,
-                  UWORD32  param5,
-                  UWORD32  param6)
-{
-  xSignalHeaderRec *msg;
-
-  // Allocate DEBUG message.
-  msg = os_alloc_sig(sizeof(T_QUICK_TRACE));
-  DEBUGMSG(status,NU_ALLOC_ERR)
-  msg->SignalCode = QUICK_TRACE;
-
-  ((T_QUICK_TRACE *)(msg->SigP))->debug_code = debug_code;
-  ((T_QUICK_TRACE *)(msg->SigP))->fn         = l1s.actual_time.fn;
-
-  ((T_QUICK_TRACE *)(msg->SigP))->tab[0] = param0;
-  ((T_QUICK_TRACE *)(msg->SigP))->tab[1] = param1;
-  ((T_QUICK_TRACE *)(msg->SigP))->tab[2] = param2;
-  ((T_QUICK_TRACE *)(msg->SigP))->tab[3] = param3;
-  ((T_QUICK_TRACE *)(msg->SigP))->tab[4] = param4;
-  ((T_QUICK_TRACE *)(msg->SigP))->tab[5] = param5;
-  ((T_QUICK_TRACE *)(msg->SigP))->tab[6] = param6;
-
-  // send message...
-  os_send_sig(msg, L1C1_QUEUE);
-  DEBUGMSG(status,NU_SEND_QUEUE_ERR)
-}
-
-#endif // L1_GPRS
-
-///////////////////////
-// DSP error traces  //
-///////////////////////
-
-#if (D_ERROR_STATUS_TRACE_ENABLE)
-
-/*-------------------------------------------------------*/
-/* Trace_d_error_status()                                */
-/*-------------------------------------------------------*/
-/* Parameters :                                          */
-/* Return     :                                          */
-/*                                                       */
-/*-------------------------------------------------------*/
-void Trace_d_error_status()
-{
-  #if L1_GPRS
-    UWORD16           d_error_status_masked =
-          (l1s_dsp_com.dsp_ndb_ptr->d_error_status) &
-          (trace_info.d_error_status_masks[l1a_l1s_com.dsp_scheduler_mode - 1]); // depends on the scheduler mode
-  #else
-    UWORD16           d_error_status_masked =
-          (l1s_dsp_com.dsp_ndb_ptr->d_error_status) &
-          (trace_info.d_error_status_masks[GSM_SCHEDULER - 1]);
-  #endif
-  UWORD16 changed_bits = d_error_status_masked ^ trace_info.d_error_status_old;
-
-  // trace in case of change of status (field is reseted on change of scheduler)
-  if (changed_bits)
-  {
-    xSignalHeaderRec *msg;
-
-    // Allocate DEBUG message.
-    msg = os_alloc_sig(sizeof(T_TR_D_ERROR_STATUS));
-    DEBUGMSG(status,NU_ALLOC_ERR)
-    msg->SignalCode = TRACE_INFO;
-
-    ((T_TR_D_ERROR_STATUS *)(msg->SigP))->header         = TRL1_D_ERROR_STATUS | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-    ((T_TR_D_ERROR_STATUS *)(msg->SigP))->debug_time     = (UWORD16)l1s.debug_time;
-    ((T_TR_D_ERROR_STATUS *)(msg->SigP))->d_error_status = d_error_status_masked;
-    ((T_TR_D_ERROR_STATUS *)(msg->SigP))->d_debug        = l1s_dsp_com.dsp_db_r_ptr->d_debug & 0xffff;
-
-    // send message...
-    os_send_sig(msg, L1C1_QUEUE);
-    DEBUGMSG(status,NU_SEND_QUEUE_ERR)
-
-    #if (DSP_DEBUG_TRACE_ENABLE == 1)
-      if (trace_info.current_config->l1_dyn_trace & 1<<L1_DYN_TRACE_DSP_DEBUG)
-      {
-        // DSP debug buffer trace only if an ERROR is detected (not for a End of error detection)
-        if ((changed_bits & d_error_status_masked) & ~trace_info.d_error_status_old)
-        {
-          // Flag DSP error for DSP trace and memorize address of start of DSP trace
-
-#if(MELODY_E2 || L1_MP3 || L1_AAC || L1_DYN_DSP_DWNLD)
-            // DSP Trace is output ONLY if melody e2, mp3 or dynamic download are not currently running
-            if(trace_info.dsptrace_handler_globals.trace_flag_blocked == FALSE)
-#endif
-
-          DSP_DEBUG_ENABLE
-        }
-      }
-    #endif
-
-    RTTL1_EVENT(RTTL1_EVENT_ERROR, RTTL1_EVENT_SIZE_ERROR)
-
-    trace_info.d_error_status_old = d_error_status_masked;
-  }
-
-  // Clear bits that have been set by the DSP
-  l1s_dsp_com.dsp_ndb_ptr->d_error_status &= ~d_error_status_masked;
-}
-
-#endif // (D_ERROR_STATUS_TRACE_ENABLE)
-
-#if (DSP_DEBUG_TRACE_ENABLE == 1)
-
-/*-------------------------------------------------------*/
-/* Trace_dsp_debug()                                     */
-/*-------------------------------------------------------*/
-/* Parameters :                                          */
-/* Return     :                                          */
-/*                                                       */
-/*-------------------------------------------------------*/
-void Trace_dsp_debug()
-{
-  // WARNING: l1s_dsp_com.dsp_r_page changed in l1s_end_manager() but DSP DB pointers haven't been
-  // updated !!!
-  UWORD32           start_address = trace_info.dsp_debug_buf_start[l1s_dsp_com.dsp_r_page];
-  UWORD32           end_address, stop_address;
-  UWORD16           size;
-  API              *i;
-  UWORD8            j = 0;
-  xSignalHeaderRec *msg;
-
-  // DSP DEBUG trace only works when GSM activity is enabled
-  if (l1s_dsp_com.dsp_r_page_used == FALSE)
-  {
-    trace_info.dsp_debug_buf_start[0] = trace_info.dsp_debug_buf_start[1] = 0;
-  }
-
-  // If a DSP error occured...
-  if (start_address)
-  {
-    WORD32 diff = l1s.debug_time - trace_info.fn_last_dsp_debug;
-
-    if (diff < 0) diff += 0xFFFFFFFF;
-
-    if (diff >= 104)
-    {
-
-      // Take the DB_R pointers on the start/end of last TDMA trace
-      start_address = 0xFFD00000 + (start_address - 0x800) * 2;
-      end_address   = 0xFFD00000 + (l1s_dsp_com.dsp_db2_other_r_ptr->d_debug_ptr_end - 0x800) * 2;
-
-      // Process size of block
-      if (end_address >= start_address)
-      {
-        size = end_address - start_address;
-        stop_address = end_address;
-      }
-      else
-      {
-        size = end_address - start_address + C_DEBUG_BUFFER_SIZE * 2;
-        stop_address = (0xFFD00000 + (C_DEBUG_BUFFER_ADD + 1 + C_DEBUG_BUFFER_SIZE - 0x800) * 2);
-      }
-
-      if ((size > 0) && (size < 1000) && (size < C_DEBUG_BUFFER_SIZE))
-      {
-        // Allocate memory pool
-        msg = os_alloc_sig(size + sizeof(T_DSP_DEBUG_INFO) - 2*sizeof(API));
-        DEBUGMSG(status,NU_ALLOC_ERR)
-
-        msg->SignalCode                                  = TRACE_DSP_DEBUG;
-        ((T_DSP_DEBUG_INFO *)(msg->SigP))->size          = size;
-        ((T_DSP_DEBUG_INFO *)(msg->SigP))->fn            = trace_info.dsp_debug_fn[l1s_dsp_com.dsp_r_page];
-        ((T_DSP_DEBUG_INFO *)(msg->SigP))->debug_time    = trace_info.dsp_debug_time[l1s_dsp_com.dsp_r_page];
-        ((T_DSP_DEBUG_INFO *)(msg->SigP))->patch_version = l1s_dsp_com.dsp_ndb_ptr->d_version_number2;
-        ((T_DSP_DEBUG_INFO *)(msg->SigP))->trace_level   = l1s_dsp_com.dsp_ndb_ptr->d_debug_trace_type;
-
-        // Copy data into message
-        for (i = (API*)start_address; i < (API*)stop_address; i++)
-        {
-          ((T_DSP_DEBUG_INFO *)(msg->SigP))->buffer[j++] = *i;
-        }
-
-        // Circular buffer management
-        if (i != (API*)end_address)
-        {
-          for (i = (API*) (0xFFD00000 + (C_DEBUG_BUFFER_ADD + 1 - 0x800)*2); i < (API*)end_address; i++)
-          {
-            ((T_DSP_DEBUG_INFO *)(msg->SigP))->buffer[j++] = *i;
-          }
-        }
-
-        // Send sig to L1A
-        os_send_sig(msg, L1C1_QUEUE);
-        DEBUGMSG(status,NU_SEND_QUEUE_ERR)
-
-        // Set FN to avoid another DSP debug trace in the next 104 frames.
-        trace_info.fn_last_dsp_debug = l1s.debug_time;
-      }
-    } // Enf if diff >= 104
-
-    // Clear flag
-    trace_info.dsp_debug_buf_start[l1s_dsp_com.dsp_r_page] = 0;
-  } // End if "DSP error occured"
-}
-
-#if (AMR == 1)
-
-/*-------------------------------------------------------*/
-/* Trace_dsp_amr_debug()                                 */
-/*-------------------------------------------------------*/
-/* Parameters :                                          */
-/* Return     :                                          */
-/*                                                       */
-/*-------------------------------------------------------*/
-void Trace_dsp_amr_debug()
-{
-  UWORD32           start_address;
-  UWORD32           end_address, stop_address;
-  UWORD16           size;
-  API              *i;
-  UWORD8            j = 0;
-  xSignalHeaderRec *msg;
-
-  // Start address of the AMR trace in the DSP trace buffer
-  start_address = l1s_dsp_com.dsp_ndb_ptr->xxx;
-
-  // Clear the pointer
-  l1s_dsp_com.dsp_ndb_ptr->xxx = 0;
-
-  // If start address different of 0 -> trace to be performed
-  if (start_address != 0)
-  {
-    // Process MCU start address
-    start_address = 0xFFD00000 + (start_address - 0x800) * 2;
-
-    // Check ID and read size
-    if ((((API*)start_adress & 0xFE00) >> 9) == C_AMR_TRACE_ID)
-    {
-      // Read size
-      size = ((((API*)start_address) & 0x1FF) * 2);
-      start_address += sizeof(API); // Do not dump header
-
-      // Process stop address
-      end_address = start_address + size;
-
-      // Circular buffer...
-      if (end_address <= (0xFFD00000 + (C_DEBUG_BUFFER_ADD + 1 + C_DEBUG_BUFFER_SIZE - 0x800) * 2))
-      {
-        stop_address = end_address;
-      }
-      else
-      {
-        stop_address = (0xFFD00000 + (C_DEBUG_BUFFER_ADD + 1 + C_DEBUG_BUFFER_SIZE - 0x800) * 2);
-        end_address -= C_DEBUG_BUFFER_SIZE * 2;
-      }
-
-      // Create L1S->L1A message and dump buffer
-
-      // Allocate memory pool
-      msg = os_alloc_sig(size+sizeof(T_DSP_AMR_DEBUG_INFO)-2*sizeof(API));
-      DEBUGMSG(status,NU_ALLOC_ERR)
-
-      msg->SignalCode                                = TRACE_DSP_AMR_DEBUG;
-      ((T_DSP_AMR_DEBUG_INFO *)(msg->SigP))->size    = size;
-      ((T_DSP_AMR_DEBUG_INFO *)(msg->SigP))->fn      = l1s.actual_time.fn;
-
-      // Copy data into message
-      for (i = (API*)start_address; i < (API*)stop_address; i++)
-      {
-        ((T_DSP_AMR_DEBUG_INFO *)(msg->SigP))->buffer[j++] = *i;
-      }
-
-      // Circular buffer management
-      if (i != (API*)end_address)
-      {
-        for (i = (API*) (0xFFD00000 + (C_DEBUG_BUFFER_ADD + 1 - 0x800)*2); i < (API*)end_address; i++)
-        {
-          ((T_DSP_AMR_DEBUG_INFO *)(msg->SigP))->buffer[j++] = *i;
-        }
-      }
-
-      // Send sig to L1A
-      os_send_sig(msg, L1C1_QUEUE);
-      DEBUGMSG(status,NU_SEND_QUEUE_ERR)
-    }
-  }
-}
-
-#endif // #if (AMR == 1)
-
-#endif // #if (DSP_DEBUG_TRACE_ENABLE)
-
-///////////////////////////
-// Trace type 1 CPU load //
-///////////////////////////
-
-#if ((TRACE_TYPE == 1) || (TRACE_TYPE == 4)) && (CODE_VERSION != SIMULATION)
-
-/*-------------------------------------------------------*/
-/* L1S_CPU_load_process()                                */
-/*-------------------------------------------------------*/
-/* Parameters :                                          */
-/* Return     :                                          */
-/*                                                       */
-/*-------------------------------------------------------*/
-void Trace_L1S_CPU_load()
-{
-  #define TIMER_RESET_VALUE (0xFFFF)
-  #define TICKS_PER_TDMA    (1875)
-
-  unsigned long cpu;
-
-  //Dtimer2_Start(0);
-  layer_1_sync_end_time = TIMER_RESET_VALUE - Dtimer2_ReadValue();
-
-  // Trace
-  cpu = (100 * layer_1_sync_end_time) / TICKS_PER_TDMA;
-
-  if (cpu > max_cpu)
-  {
-    max_cpu=cpu;
-    fn_max_cpu=l1s.actual_time.fn;
-    max_cpu_flag = 1;
-  }
-
-  if (((l1s.actual_time.fn%1326) == 0) && (max_cpu_flag == 0))
-    max_cpu = 0;
-} /* end of Trace_L1S_CPU_load() */
-
-/********** DSP CPU load measurement *************/
-#if (DSP >= 38)
-void l1_dsp_cpu_load_read()
-{
-
-  #define DSP_TIMER_PRESCALER_VALUE (9)
-
-  T_DB_MCU_TO_DSP_CPU_LOAD *mcu_dsp_cpu_load_r_ptr;   // DSP CPU load measurement
-  UWORD32     dsp_fgd_tsk_cycles = 0L;
-  UWORD16     dsp_tdma_fn;
-  UWORD16     d_dsp_page_read;
-  UWORD32     d_dsp_work_period;
-  UWORD32     d_dsp_fgd_tsk_cycles_per_tdma;
-  UWORD16     d_tdma_fnmod4;
-  UWORD16     d_tdma_fnmod13;
-
-  // **** 1. Read the DSP FGD task cycles from API ****
-
-  // Check if DSP CPU load has been written in first buffer
-  mcu_dsp_cpu_load_r_ptr = (T_DB_MCU_TO_DSP_CPU_LOAD *)DSP_CPU_LOAD_DB_W_PAGE_0;
-  if ((API)mcu_dsp_cpu_load_r_ptr->d_dsp_fgd_tsk_tim0 & 0x8000)
-  {
-     mcu_dsp_cpu_load_r_ptr->d_dsp_fgd_tsk_tim0 &= ~(0x8000); // reset the bit
-     dsp_fgd_tsk_cycles = (UWORD32)(((UWORD32)mcu_dsp_cpu_load_r_ptr->d_dsp_fgd_tsk_tim0 << 16)
-                                   + ((UWORD32)mcu_dsp_cpu_load_r_ptr->d_dsp_fgd_tsk_tim1));
-     dsp_fgd_tsk_cycles = (dsp_fgd_tsk_cycles * DSP_TIMER_PRESCALER_VALUE);
-
-     dsp_tdma_fn        = (API)mcu_dsp_cpu_load_r_ptr->d_tdma_dsp_fn;
-
-     d_dsp_page_read    = 0;
-  }
-  else
-  {
-    // Check if DSP CPU load has been written in second buffer
-    mcu_dsp_cpu_load_r_ptr = (T_DB_MCU_TO_DSP_CPU_LOAD *)DSP_CPU_LOAD_DB_W_PAGE_1;
-    if ((API)mcu_dsp_cpu_load_r_ptr->d_dsp_fgd_tsk_tim0 & 0x8000)
-    {
-       mcu_dsp_cpu_load_r_ptr->d_dsp_fgd_tsk_tim0 &= ~(0x8000); // reset the bit
-       dsp_fgd_tsk_cycles = (UWORD32)(((UWORD32)mcu_dsp_cpu_load_r_ptr->d_dsp_fgd_tsk_tim0 << 16)
-                                   + ((UWORD32)mcu_dsp_cpu_load_r_ptr->d_dsp_fgd_tsk_tim1));
-       dsp_fgd_tsk_cycles = (dsp_fgd_tsk_cycles * DSP_TIMER_PRESCALER_VALUE);
-
-       dsp_tdma_fn        = (API)mcu_dsp_cpu_load_r_ptr->d_tdma_dsp_fn;
-
-       d_dsp_page_read    = 1;
-
-    }
-  }
-
-  // **** 2. Get the number of DSP cycles per TDMA (based on DSP work period) ****
-  if (dsp_fgd_tsk_cycles != 0L)
-  {
-    /* Take care of TDMA FN overflow */
-    d_dsp_work_period = (l1s.actual_time.fn_mod42432 - dsp_tdma_fn - 2 + 42432) % 42432;
-
-    d_dsp_fgd_tsk_cycles_per_tdma = dsp_fgd_tsk_cycles/(d_dsp_work_period + 1); // to avoid divide by 0, just in case
-
-    // **** 3. For DSP work-period, update max cycles count ****
-    d_tdma_fnmod13 = (l1s.actual_time.fn_mod13 - 1 + 13) % 13;
-    d_tdma_fnmod4 = (l1s.actual_time.fn_mod13_mod4 - 1 + 4) % 4;
-
-    if (d_tdma_fnmod13 == 12) //Idle/SACCH/PTCCH frames
-    {
-      if (dsp_max_cpu_load_idle_frame <= d_dsp_fgd_tsk_cycles_per_tdma)
-        dsp_max_cpu_load_idle_frame = d_dsp_fgd_tsk_cycles_per_tdma;
-    }
-    else // for TDMA frames 0/1/2/3 (mod 4)
-    {
-      if (dsp_max_cpu_load_trace_array[d_tdma_fnmod4] <= d_dsp_fgd_tsk_cycles_per_tdma)
-        dsp_max_cpu_load_trace_array[d_tdma_fnmod4] = d_dsp_fgd_tsk_cycles_per_tdma;
-    }
-
-    // **** 4. If 104 TDMA frames have elapsed, print out the DSP CPU cycles ****
-    if ((l1s.actual_time.fn_mod42432 % 104) == 0)
-    {
-      l1_dsp_cpu_load_trace_flag = 1;
-    }
-  }
-} /* end of l1_dsp_cpu_load_read() */
-#endif	// DSP >= 38
-
-#endif
-
-///////////////////////////
-// Additional L1S traces //
-///////////////////////////
-
-/*-------------------------------------------------------*/
-/* l1_trace_ADC()                                        */
-/*-------------------------------------------------------*/
-/* Parameters :                                          */
-/* Return     :                                          */
-/*                                                       */
-/*-------------------------------------------------------*/
-void l1_trace_ADC(UWORD8 type)
-{
-  #if (TRACE_TYPE==1) || (TRACE_TYPE==4)
-
-     xSignalHeaderRec *msg;
-
-     if (trace_info.current_config->l1_dyn_trace & 1<<L1_DYN_TRACE_L1A_MESSAGES)
-     {
-       // Allocate DEBUG message.
-       msg = os_alloc_sig(sizeof(T_TR_ADC));
-       DEBUGMSG(status,NU_ALLOC_ERR)
-       msg->SignalCode = TRACE_INFO;
-
-       ((T_TR_ADC *)(msg->SigP))->header   = TRL1_ADC | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-       ((T_TR_ADC *)(msg->SigP))->type     = type;
-
-       // send message...
-       os_send_sig(msg, L1C1_QUEUE);
-       DEBUGMSG(status,NU_SEND_QUEUE_ERR)
-     }
-  #endif
-}
-
-/*-------------------------------------------------------*/
-/* l1_trace_burst_param()                                */
-/*-------------------------------------------------------*/
-/* Parameters :                                          */
-/* Return     :                                          */
-/*                                                       */
-/*-------------------------------------------------------*/
-void l1_trace_burst_param (UWORD32 angle, UWORD32 snr, UWORD32 afc, UWORD32 task,
-                           UWORD32 pm, UWORD32 toa_val, UWORD32 IL_for_rxlev)
-{
-  #if (TRACE_TYPE==1) || (TRACE_TYPE==4)
-
-     xSignalHeaderRec *msg;
-
-     if (trace_info.current_config->l1_dyn_trace & 1<<L1_DYN_TRACE_BURST_PARAM)
-     {
-       // Allocate DEBUG message.
-       msg = os_alloc_sig(sizeof(T_TR_BURST_PARAM));
-       DEBUGMSG(status,NU_ALLOC_ERR)
-       msg->SignalCode = TRACE_INFO;
-
-       ((T_TR_BURST_PARAM *)(msg->SigP))->header  = TRL1_BURST_PARAM | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-       ((T_TR_BURST_PARAM *)(msg->SigP))->angle   = angle;
-       ((T_TR_BURST_PARAM *)(msg->SigP))->snr     = snr;
-       ((T_TR_BURST_PARAM *)(msg->SigP))->afc     = afc;
-       ((T_TR_BURST_PARAM *)(msg->SigP))->task    = task;
-       ((T_TR_BURST_PARAM *)(msg->SigP))->pm      = pm;
-       ((T_TR_BURST_PARAM *)(msg->SigP))->toa     = toa_val;
-       ((T_TR_BURST_PARAM *)(msg->SigP))->input_level = IL_for_rxlev;
-
-       // send message...
-       os_send_sig(msg, L1C1_QUEUE);
-       DEBUGMSG(status,NU_SEND_QUEUE_ERR)
-     }
-  #endif
-}
-
-
-/*-------------------------------------------------------*/
-/* l1_trace_saic()                                       */
-/*-------------------------------------------------------*/
-/* Parameters :                                          */
-/* Return     :                                          */
-/*                                                       */
-/*-------------------------------------------------------*/
-void l1_trace_saic(UWORD32 SWH_flag, UWORD32 SAIC_flag)
-{
-  #if (TRACE_TYPE==1) || (TRACE_TYPE==4)
-
-     xSignalHeaderRec *msg;
-
-     if (trace_info.current_config->l1_dyn_trace & 1<<L1_DYN_TRACE_SAIC_DEBUG)
-     {
-       // Allocate DEBUG message.
-       msg = os_alloc_sig(sizeof(T_TR_SAIC_DEBUG));
-       DEBUGMSG(status,NU_ALLOC_ERR)
-       msg->SignalCode = TRACE_INFO;
-
-       ((T_TR_SAIC_DEBUG *)(msg->SigP))->header    = TRL1_SAIC_DEBUG | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-       ((T_TR_SAIC_DEBUG *)(msg->SigP))->SWH_flag  = SWH_flag;
-       ((T_TR_SAIC_DEBUG *)(msg->SigP))->SAIC_flag  = SAIC_flag;
-
-       // send message...
-       os_send_sig(msg, L1C1_QUEUE);
-       DEBUGMSG(status,NU_SEND_QUEUE_ERR)
-     }
-  #endif
-}
-
-
-/*-------------------------------------------------------*/
-/* l1_trace_new_toa()                                    */
-/*-------------------------------------------------------*/
-/* Parameters :                                          */
-/* Return     :                                          */
-/*                                                       */
-/*-------------------------------------------------------*/
-void l1_trace_new_toa(void)
-{
-  #if (TRACE_TYPE==1) || (TRACE_TYPE==4)
-
-     xSignalHeaderRec *msg;
-
-     if (trace_info.current_config->l1_dyn_trace & 1<<L1_DYN_TRACE_L1A_MESSAGES)
-     {
-       // Allocate DEBUG message.
-       msg = os_alloc_sig(sizeof(T_TR_NEW_TOA));
-       DEBUGMSG(status,NU_ALLOC_ERR)
-       msg->SignalCode = TRACE_INFO;
-
-       ((T_TR_NEW_TOA *)(msg->SigP))->header    = TRL1_NEW_TOA | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-       #if (TOA_ALGO == 2)
-        ((T_TR_NEW_TOA *)(msg->SigP))->toa_shift = l1s.toa_var.toa_shift;
-       #else
-        ((T_TR_NEW_TOA *)(msg->SigP))->toa_shift = l1s.toa_shift;
-       #endif
-
-       #if(TOA_ALGO == 2)
-         ((T_TR_NEW_TOA *)(msg->SigP))->toa_frames_counter  = trace_info.toa_trace_var.toa_frames_counter;
-         ((T_TR_NEW_TOA *)(msg->SigP))->toa_accumul_counter = trace_info.toa_trace_var.toa_accumul_counter;
-         ((T_TR_NEW_TOA *)(msg->SigP))->toa_accumul_value   = trace_info.toa_trace_var.toa_accumul_value;
-       #endif
-
-       // send message...
-       os_send_sig(msg, L1C1_QUEUE);
-       DEBUGMSG(status,NU_SEND_QUEUE_ERR)
-     }
-  #endif
-}
-
-/*-------------------------------------------------------*/
-/* l1_trace_toa_not_updated()                            */
-/*-------------------------------------------------------*/
-/* Parameters :                                          */
-/* Return     :                                          */
-/* TOA ERROR: TOA not updated                            */
-/*-------------------------------------------------------*/
-void l1_trace_toa_not_updated(void)
-{
-  #if (TRACE_TYPE==1) || (TRACE_TYPE==4)
-
-    // !!!!!!!!!!!!!!!!!!!!!!!!
-    // !!! should not occur !!!
-    // !!!!!!!!!!!!!!!!!!!!!!!!
-
-    xSignalHeaderRec *msg;
-
-    if (trace_info.current_config->l1_dyn_trace & 1<<L1_DYN_TRACE_L1S_DEBUG)
-    {
-      // Allocate DEBUG message.
-      msg = os_alloc_sig(sizeof(T_TR_TOA_NOT_UPDATED));
-      DEBUGMSG(status,NU_ALLOC_ERR)
-      msg->SignalCode = TRACE_INFO;
-
-      ((T_TR_TOA_NOT_UPDATED *)(msg->SigP))->header    = TRL1_TOA_NOT_UPDATED | (l1s.actual_time.fn << TR_HEADER_FN_DELAY);
-      #if (TOA_ALGO == 2)
-       ((T_TR_TOA_NOT_UPDATED *)(msg->SigP))->toa_shift = l1s.toa_var.toa_shift;
-      #else
-       ((T_TR_TOA_NOT_UPDATED *)(msg->SigP))->toa_shift = l1s.toa_shift;
-      #endif
-      // send message...
-      os_send_sig(msg, L1C1_QUEUE);
-      DEBUGMSG(status,NU_SEND_QUEUE_ERR)
-    }
-  #endif
-}
-
-////////////////////////////////////////
-// Dynamic trace configuration change //
-////////////////////////////////////////
-
-/*-------------------------------------------------------*/
-/* l1_send_trace_version()                               */
-/*-------------------------------------------------------*/
-/* Parameters :                                          */
-/* Return     :                                          */
-/*                                                       */
-/*-------------------------------------------------------*/
-void l1_send_trace_version()
-{
-  #if (TRACE_TYPE == 1)
-    char ptr[11];
-    char nb_bytes_sent = 0;
-
-    ptr[0]  = trace_info.l1_trace_user_id;
-    ptr[1]  = TRACE_CHECK_RESULT_OPCODE & 0xff;
-    ptr[2]  = (TRACE_CHECK_RESULT_OPCODE >>  8) & 0xff;
-    ptr[3]  = (TRACE_CHECK_RESULT_OPCODE >> 16) & 0xff;
-    ptr[4]  = (TRACE_CHECK_RESULT_OPCODE >> 24) & 0xff;
-    ptr[5]  = sizeof(T_TRACE_CELLS) & 0xff;
-    ptr[6]  = (sizeof(T_TRACE_CELLS) >>  8) & 0xff;
-    ptr[7]  = (sizeof(T_TRACE_CELLS) >> 16) & 0xff;
-    ptr[8]  = (sizeof(T_TRACE_CELLS) >> 24) & 0xff;
-    ptr[9]  = L1_TRACE_VERSION & 0xff;
-    ptr[10] = (L1_TRACE_VERSION >> 8) & 0xff;
-
-    while( nb_bytes_sent < 11)
-      nb_bytes_sent += SER_tr_WriteNBytes(SER_LAYER_1, (SYS_UWORD8 *)ptr + nb_bytes_sent, 11 - nb_bytes_sent );
-
-  #elif (TRACE_TYPE == 4)
-    char *ptr;
-
-    if (rvt_mem_alloc(trace_info.l1_trace_user_id, sizeof(T_TRACE_VERSION), (T_RVT_BUFFER *) &ptr) == RVT_OK)
-    {
-      ((T_TRACE_VERSION *)ptr)->Opcode   = TRACE_CHECK_RESULT_OPCODE;
-      ((T_TRACE_VERSION *)ptr)->checksum = sizeof(T_TRACE_CELLS);
-      ((T_TRACE_VERSION *)ptr)->version  = L1_TRACE_VERSION;
-
-      L1_send_trace_no_cpy(ptr,sizeof(T_TRACE_VERSION));
-    }
-  #endif
-}
-
-/*-------------------------------------------------------*/
-/* l1_trace_configuration()                              */
-/*-------------------------------------------------------*/
-/* Parameters :                                          */
-/* Return     :                                          */
-/*                                                       */
-/*-------------------------------------------------------*/
-void l1_trace_configuration(T_RVT_BUFFER trace_msg, UINT16 trace_msg_size)
-{
-    UWORD8 Opcode = trace_msg[0];
-
-    switch (Opcode)
-    {
-      case TRACE_CONFIG_OPCODE:
-      {
-        // Send message to L1A
-        xSignalHeaderRec *msg;
-
-        // Allocate DEBUG message.
-        msg = os_alloc_sig(sizeof(T_TRACE_CONFIG_CHANGE));
-        DEBUGMSG(status,NU_ALLOC_ERR)
-        msg->SignalCode = TRACE_CONFIG;
-
-        // NOTE: trace_msg isnt necessary 32-bit aligned !!!
-
-        // First UWORD32 is the classic L1 dynamic trace
-        ((T_TRACE_CONFIG_CHANGE *)(msg->SigP))->trace_config = (trace_msg[1]) | (trace_msg[2] << 8) | (trace_msg[3] << 16) | (trace_msg[4] << 24);
-
-        // The eight following UWORD32 define the RTT cell configuration
-        ((T_TRACE_CONFIG_CHANGE *)(msg->SigP))->rtt_cell_enable[0] = (trace_msg[5]) | (trace_msg[6] << 8) | (trace_msg[7] << 16) | (trace_msg[8] << 24);
-        ((T_TRACE_CONFIG_CHANGE *)(msg->SigP))->rtt_cell_enable[1] = (trace_msg[9]) | (trace_msg[10] << 8) | (trace_msg[11] << 16) | (trace_msg[12] << 24);
-        ((T_TRACE_CONFIG_CHANGE *)(msg->SigP))->rtt_cell_enable[2] = (trace_msg[13]) | (trace_msg[14] << 8) | (trace_msg[15] << 16) | (trace_msg[16] << 24);
-        ((T_TRACE_CONFIG_CHANGE *)(msg->SigP))->rtt_cell_enable[3] = (trace_msg[17]) | (trace_msg[18] << 8) | (trace_msg[19] << 16) | (trace_msg[20] << 24);
-        ((T_TRACE_CONFIG_CHANGE *)(msg->SigP))->rtt_cell_enable[4] = (trace_msg[21]) | (trace_msg[22] << 8) | (trace_msg[23] << 16) | (trace_msg[24] << 24);
-        ((T_TRACE_CONFIG_CHANGE *)(msg->SigP))->rtt_cell_enable[5] = (trace_msg[25]) | (trace_msg[26] << 8) | (trace_msg[27] << 16) | (trace_msg[28] << 24);
-        ((T_TRACE_CONFIG_CHANGE *)(msg->SigP))->rtt_cell_enable[6] = (trace_msg[29]) | (trace_msg[30] << 8) | (trace_msg[31] << 16) | (trace_msg[32] << 24);
-        ((T_TRACE_CONFIG_CHANGE *)(msg->SigP))->rtt_cell_enable[7] = (trace_msg[33]) | (trace_msg[34] << 8) | (trace_msg[35] << 16) | (trace_msg[36] << 24);
-
-        // Last UWORD32 define the RTT event
-        ((T_TRACE_CONFIG_CHANGE *)(msg->SigP))->rtt_event = (trace_msg[37]) | (trace_msg[38] << 8) | (trace_msg[39] << 16) | (trace_msg[40]);
-
-        // send message...
-        os_send_sig(msg, L1C1_QUEUE);
-        DEBUGMSG(status,NU_SEND_QUEUE_ERR)
-      }
-      break;
-
-      case TRACE_CHECKING_OPCODE:
-      {
-        l1_send_trace_version();
-      }
-      break;
-    }
-}
+/*
+ * FreeCalypso: the binary trace code has been excised
+ * because we have no way of reconstructing what it was
+ * in the TCS211 version before LoCosto changes.
+ */
 
 /************************************ ASCII trace *********************************************************/
 
@@ -6215,7 +710,7 @@
 /* Return     :                                          */
 /*                                                       */
 /*-------------------------------------------------------*/
-void l1_trace_IT_DSP_error(UWORD8 cause)
+void l1_trace_IT_DSP_error()
 {
   #if (TRACE_TYPE==1) || (TRACE_TYPE==4)
 
@@ -6231,9 +726,7 @@
        msg->SignalCode = TRACE_INFO;
 
        ((T_TRACE_INFO *)(msg->SigP))->debug_code = IT_DSP_ERROR;
-
        ((T_TRACE_INFO *)(msg->SigP))->tab[0] = l1s.actual_time.fn_mod42432;
-       ((T_TRACE_INFO *)(msg->SigP))->tab[1] = cause; // cause
 
        // send message...
        os_send_sig(msg, L1C1_QUEUE);
@@ -6278,6 +771,7 @@
 } /* end function l1_trace_PCM_DSP_error */
 #endif /* L1_PCM_EXTRACTION */
 
+#if 0	/* LoCosto function not present in TCS211 */
 /*-------------------------------------------------------*/
 /* l1_trace_burst_param()                                */
 /*-------------------------------------------------------*/
@@ -6316,10 +810,8 @@
      }
 
   #endif
-
-
 }
-
+#endif
 
 #if (L1_SAIC !=0)
 /*-------------------------------------------------------*/
@@ -6530,7 +1022,7 @@
 void l1_trace_message(xSignalHeaderRec *msg)
 {
 
-  char      str[240]={0}; // Max 240 bytes with current RVT //omaps00090550
+  char      str[240]; // Max 240 bytes with current RVT
   char      str2[30];
 
 
@@ -6780,45 +1272,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;
 
@@ -6834,26 +1309,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],
@@ -6867,72 +1324,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],
@@ -6943,37 +1367,27 @@
                      ((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;
 
           case IT_DSP_ERROR:
           {
+#if 0	/* FreeCalypso TCS211 reconstruction */
             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)
@@ -6992,25 +1406,21 @@
               sprintf (str,">  ERROR: Unknown IT_DSP_ERROR! %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
             L1_send_trace_cpy(str);
           } /* end case IT_DSP_ERROR */
           break;
 
           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
+	  #if 1	/* TCS211 bogus format string */
+            sprintf (str,">  PM %ld %ld %ld %ld %ld %ld %ld %d %ld %d\n\r",
+	  #else	/* LoCosto correction */
             sprintf (str,">  PM %ld %ld %ld %ld %ld %ld %ld %d %ld\n\r",
+	  #endif
                      ((T_TRACE_INFO *)(msg->SigP))->tab[0],
                      ((T_TRACE_INFO *)(msg->SigP))->tab[1],
                      ((T_TRACE_INFO *)(msg->SigP))->tab[2],
@@ -7021,7 +1431,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
@@ -7033,17 +1442,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],
@@ -7054,23 +1452,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],
@@ -7081,7 +1467,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)
             {
@@ -7094,17 +1479,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],
@@ -7115,23 +1489,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],
@@ -7142,38 +1504,36 @@
                        ((T_TRACE_INFO *)(msg->SigP))->tab[6],
                        ((T_TRACE_INFO *)(msg->SigP))->tab[7] & 0xffff);
             L1_send_trace_cpy(str);
-#endif
           }
           break;
 
-#if (MELODY_E2 || L1_MP3 || L1_AAC || L1_DYN_DSP_DWNLD)
+/*
+ * FreeCalypso TCS211 reconstruction: removing the following
+ * DSP trace enable/disable traces in order to pass compilation.
+ */
+#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
 
+/*
+ * FreeCalypso TCS211 reconstruction: removing the following stanza
+ * in order to pass compilation.
+ */
+#if 0
           case PWMGT_FAIL_SLEEP:
           {
       #if (CODE_VERSION!= SIMULATION)
@@ -7217,6 +1577,8 @@
       #endif //NO SIMULATION
           }
           break;
+#endif
+
           case TRACE_SLEEP:
           {
             // trace special events -> usefulf for debug
@@ -7236,21 +1598,22 @@
                        ((T_TRACE_INFO *)(msg->SigP))->tab[0],
                        ((T_TRACE_INFO *)(msg->SigP))->tab[1],
                        ((T_TRACE_INFO *)(msg->SigP))->tab[3],
-                       ((T_TRACE_INFO *)(msg->SigP))->tab[5],
+                       int_id,
                        array_special_cases[index]);
             }
             else
             // big sleep
             {
-              char *array_string[]={"undefined","ligth on","uart","sim","gauging","sleep mode","DSP","BT","camera","??"};
+              char *array_string[]={"undefined","ligth on","uart","sim","gauging","sleep mode","DSP","BT","??"};
               sprintf (str,"      big sleep: %ld %ld %d %d (cause:%s) %s\n\r",
                        ((T_TRACE_INFO *)(msg->SigP))->tab[0],
                        ((T_TRACE_INFO *)(msg->SigP))->tab[1],
                        ((T_TRACE_INFO *)(msg->SigP))->tab[3],
-                       ((T_TRACE_INFO *)(msg->SigP))->tab[5],
+                       int_id,
                        array_string[((T_TRACE_INFO *)(msg->SigP))->tab[4]],
                        array_special_cases[index]);
             }
+            int_id = 0;
             L1_send_trace_cpy(str);
           }
           break;
@@ -7259,30 +1622,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)
@@ -7296,28 +1640,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)
@@ -7325,31 +1660,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],
@@ -7360,21 +1679,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],
@@ -7384,18 +1693,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;
 
@@ -7403,40 +1707,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])
             {
 
@@ -7471,59 +1741,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;
 
@@ -7535,30 +1784,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
@@ -7580,7 +1805,6 @@
               }
             }
             L1_send_trace_cpy(str);
-#endif
           }
           break;
         #endif // #if (OP_L1_STANDALONE == 0)
@@ -7589,18 +1813,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)
@@ -7612,28 +1829,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],
@@ -7655,42 +1850,24 @@
                       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
-                  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
+
+/* FreeCalypso TCS211 reconstruction: IQ_LOW undefined */
+#if 0
+        case IQ_LOW:
+        {
           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;
-
-
+        }
+        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],
@@ -7702,7 +1879,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)
@@ -7720,38 +1896,24 @@
   {
     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;
     }
   }
 
+#if 0	/* FreeCalypso: feature not present in our chipset */
   /***********************************************************************/
   /* DSP CPU load                                                        */
   /***********************************************************************/
 
-#if (DSP >= 38)
   if (trace_info.current_config->l1_dyn_trace & 1<<L1_DYN_TRACE_DSP_CPU_LOAD)
   {
     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],
@@ -7759,7 +1921,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;
@@ -7770,7 +1931,7 @@
       l1_dsp_cpu_load_trace_flag = 0;
     }
   }
-#endif	// DSP >= 38
+#endif
 
   /***********************************************************************/
   /* L1A messages                                                        */
@@ -7794,28 +1955,20 @@
       /////////////////////////////////////////
       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);
+        sprintf (str, "BAND_R %d\n\r",((T_MPHC_INIT_L1_REQ *)(msg->SigP))-> radio_band_config);
 #else
         sprintf(str,"BAND_R");
 #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");
+        sprintf (str, "BAND_C \n\r");
 #else
         UWORD16 n = 0;
         UWORD8 i = 0;
@@ -7830,7 +1983,6 @@
 #endif
 
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -7840,14 +1992,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,
@@ -7855,7 +1999,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;
 
@@ -7865,14 +2008,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;
 
@@ -7880,15 +2018,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,
@@ -7897,33 +2026,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,
@@ -7931,7 +2046,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;
 
@@ -7991,35 +2105,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;
 
@@ -8030,26 +2130,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,
@@ -8070,7 +2150,6 @@
                 l1s.tpu_offset,
                 l1s.afc);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -8081,27 +2160,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,
@@ -8122,26 +2180,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,
@@ -8155,10 +2199,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)
@@ -8166,27 +2210,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,
@@ -8207,21 +2230,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,
@@ -8230,45 +2243,18 @@
                 ((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)
+    /*
+     * Bug in TCS211, fixed in LoCosto, has to be restored for
+     * binary-matching source reconstruction: TCS211 version always
+     * printed all fields even without L1_EOTD.
+     */
+    #if 1 //(L1_EOTD)
         sprintf(str,"NSY_I %ld %d %d %ld %ld %d %d %ld %ld %ld %ld %ld %ld %ld %ld\n\r",
     #else
         sprintf(str,"NSY_I %ld %d %d %ld %ld %d %d\n\r",
@@ -8293,8 +2279,6 @@
               );
 
         L1_send_trace_cpy(str);
-#endif
-
       }
       break;
 
@@ -8302,27 +2286,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,
@@ -8343,7 +2306,6 @@
 
         #endif //L1_GPRS
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -8372,21 +2334,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,
@@ -8401,7 +2348,6 @@
                 l1s.tpu_offset,
                 l1s.afc);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -8415,17 +2361,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,
@@ -8436,45 +2371,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
@@ -8490,21 +2401,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,
@@ -8513,21 +2414,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,
@@ -8536,7 +2427,6 @@
                 l1s.tpu_offset,
                 l1s.afc);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -8584,36 +2474,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
@@ -8630,7 +2498,6 @@
 #endif
                 );
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -8640,33 +2507,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,
@@ -8674,55 +2525,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,
@@ -8731,7 +2558,6 @@
                 l1s.tpu_offset,
                 l1s.afc);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -8739,31 +2565,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;
 
@@ -8773,18 +2587,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,
@@ -8796,33 +2598,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;
 
@@ -8834,22 +2625,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,
@@ -8865,26 +2640,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;
 
@@ -8892,54 +2659,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,
@@ -8986,20 +2705,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;
 
@@ -9007,17 +2720,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
@@ -9041,7 +2743,6 @@
 
                 );
         L1_send_trace_cpy(str);
-#endif
 #if (AUDIO_DEBUG == 1)
         {
 
@@ -9049,20 +2750,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],
@@ -9076,7 +2763,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
@@ -9087,18 +2773,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,
@@ -9110,48 +2784,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,
@@ -9175,7 +2820,6 @@
         #endif //(AMR == 1)
 
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -9183,20 +2827,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,
@@ -9210,7 +2840,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;
 
@@ -9243,10 +2872,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",
@@ -9264,20 +2889,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;
 
@@ -9290,65 +2909,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,
@@ -9382,11 +2942,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,
@@ -9411,20 +2971,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;
 
@@ -9435,66 +2989,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,
@@ -9528,11 +3022,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,
@@ -9558,31 +3052,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,
@@ -9593,22 +3076,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;
 
@@ -9616,28 +3093,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;
 
@@ -9651,17 +3117,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;
 
@@ -9669,15 +3128,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;
 
@@ -9685,20 +3138,10 @@
       {
         #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
-
 
         // If it's the 5th MPHC_RXLEV_REQ message received from L3, trace accum_power_result
         if (trace_info.rxlev_req_count == 5)
@@ -9743,7 +3186,7 @@
 
           strcat(str,"\n\r");
 
-      } // End if "rxlev_req_count = 5"
+        } // End if "rxlev_req_count = 5"
 
         L1_send_trace_cpy(str);
       }
@@ -9753,71 +3196,29 @@
 
       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)",
+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,
                 ((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 %d)(%d %d)\n\r",
-                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,
@@ -9835,102 +3236,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 )
@@ -10029,7 +3341,6 @@
                 ((T_MPHC_MEAS_REPORT *)(msg->SigP))->ncell_meas.A[5].rxlev_nbr_meas);
       #endif
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -10037,14 +3348,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,
@@ -10052,7 +3355,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;
 
@@ -10070,22 +3372,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,
@@ -10101,20 +3387,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;
 
@@ -10125,22 +3405,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,
@@ -10156,7 +3420,6 @@
                 l1s.tpu_offset,
                 l1s.afc);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -10168,22 +3431,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,
@@ -10199,43 +3446,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
@@ -10253,22 +3476,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,
@@ -10278,22 +3490,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,
@@ -10303,7 +3504,6 @@
                 l1s.tpu_offset,
                 l1s.afc);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -10339,29 +3539,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,
@@ -10371,7 +3556,6 @@
                 l1s.tpu_offset,
                 l1s.afc);
         L1_send_trace_cpy(str);
-#endif
       }
       break;
 
@@ -10383,15 +3567,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,
@@ -10400,35 +3575,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;
 
@@ -10443,24 +3606,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,
@@ -10477,36 +3622,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,
@@ -10516,24 +3645,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,
@@ -10545,7 +3661,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;
 
@@ -10553,14 +3668,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,
@@ -10568,20 +3675,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;
 
@@ -10641,31 +3742,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;
 
@@ -10674,20 +3763,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;
 
@@ -10695,35 +3776,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;
 
@@ -10731,14 +3798,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,
@@ -10746,20 +3805,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;
 
@@ -10767,18 +3820,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;
 
@@ -10792,35 +3838,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;
 
@@ -10828,16 +3860,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;
 
@@ -10849,32 +3875,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;
 
@@ -10912,18 +3925,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;
 
@@ -10931,14 +3938,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;
 
@@ -10961,7 +3963,9 @@
             list_ptr = &(l1pa_l1ps_com.cres_freq_list.list[0]);
           //Reset the variable new_tcr_list so that next time onwards the new list of
           //frequencies will get printed.
-          trace_info.new_tcr_list = 0;
+          #if 0	/* FreeCalypso TCS211 reconstruction */
+            trace_info.new_tcr_list = 0;
+          #endif
         }
 
         sprintf(str,"TCR_I %ld %d %d %ld\n\r",
@@ -10996,15 +4000,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,
@@ -11013,62 +4008,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],
@@ -11088,7 +4050,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;
 
@@ -11096,30 +4057,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],
@@ -11139,7 +4076,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;
 
@@ -11161,59 +4097,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
@@ -11222,23 +4135,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,
@@ -11255,46 +4151,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
@@ -11303,118 +4183,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
@@ -11423,28 +4257,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,
@@ -11466,101 +4278,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
@@ -11641,15 +4416,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,
@@ -11658,165 +4424,109 @@
                   ((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;
-
-
+        }
+        break;
+
+/*
+ * FreeCalypso TCS211 reconstruction: PAUSE/RESUME of AMR VM playback
+ * appears to be a LoCosto addition.
+ */
+#if 0
 // 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;
-
+        }
+        break;
+#endif	/* FreeCalypso */
 
       #endif // L1_VOICE_MEMO_AMR
 
@@ -11824,20 +4534,11 @@
         #if (L1_AUDIO_DRIVER == 1)
           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;
         #endif //(L1_AUDIO_DRIVER == 1)
@@ -11846,14 +4547,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,
@@ -11861,61 +4554,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,
@@ -11923,114 +4591,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,
@@ -12046,22 +4662,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,
@@ -12071,54 +4676,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,
@@ -12134,24 +4712,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,
@@ -12163,33 +4728,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,
@@ -12197,64 +4748,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,
@@ -12263,45 +4789,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)
+
+      #if (AEC)
         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,
@@ -12320,40 +4822,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)
@@ -12362,29 +4850,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
@@ -12393,133 +4870,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,
@@ -12533,83 +4952,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;
 
@@ -12620,231 +5007,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
@@ -12853,14 +5150,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,
@@ -12868,154 +5157,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,
@@ -13023,122 +5251,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,
@@ -13152,24 +5329,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;
 
@@ -13179,18 +5348,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,
@@ -13203,50 +5360,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
@@ -13255,20 +5395,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,
@@ -13282,47 +5408,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,
@@ -13331,7 +5437,6 @@
                     l1tm.stereopath.stereopath_half_block,
                     l1tm.stereopath.stereopath_block);
             L1_send_trace_cpy(str);
-#endif
           }
           break;
 
@@ -13343,16 +5448,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,
@@ -13360,23 +5455,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;
 
@@ -13386,16 +5472,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,
@@ -13404,52 +5480,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,
@@ -13471,45 +5519,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,
@@ -13524,20 +5550,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;
 
@@ -13547,16 +5567,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,
@@ -13566,22 +5576,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;
 
@@ -13592,22 +5595,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,
@@ -13623,22 +5610,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;
 
@@ -13648,22 +5628,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,
@@ -13679,47 +5643,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,
@@ -13733,46 +5675,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,
@@ -13787,44 +5707,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,
@@ -13854,22 +5743,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;
 
@@ -13878,50 +5760,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,
@@ -13948,217 +5798,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
@@ -14173,58 +5944,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;
 
@@ -14233,96 +5984,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
@@ -14333,59 +6052,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;
 
@@ -14395,14 +6091,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;
 
@@ -14413,7 +6104,7 @@
       tcs_program_release = ((T_TST_TEST_HW_CON*)(msg->SigP))->mcu_tcs_program_release;
 
       if (((tcs_program_release & 0xFFF0) == 0x2110) || ((tcs_program_release & 0xFFF0) == 0x2120))
-        sprintf(str, "TST_C %ld TCS_%x.%x.%x.%x_L1_%x_%x PLUS_N5x DSP:%xh DYN:%xh CHECKSUM:%xh\n\r",
+        sprintf(str, "TST_C %ld TCS_%d.%d.%d.%d_L1_%x_%x DSP:%xh DYN:%xh CHECKSUM:%xh\n\r",
                 l1s.actual_time.fn_mod42432,
                 (tcs_program_release & 0xF000) >> 12,
                 (tcs_program_release & 0x0F00) >> 8 ,
@@ -14425,7 +6116,7 @@
                 ((T_TST_TEST_HW_CON*)(msg->SigP))->dsp_patch_version,
               ((T_TST_TEST_HW_CON*)(msg->SigP))->dsp_checksum);
       else
-        sprintf(str, "TST_C %ld TCS_%x.%x.%x_L1_%x_%x PLUS_N5x DSP:%xh DYN:%xh CHECKSUM:%xh\n\r",
+        sprintf(str, "TST_C %ld TCS_%x.%x.%x_L1_%x_%x DSP:%xh DYN:%xh CHECKSUM:%xh\n\r",
                 l1s.actual_time.fn_mod42432,
                 (tcs_program_release & 0xF000) >> 12,
                 (tcs_program_release & 0x0F00) >> 8 ,
@@ -14436,7 +6127,7 @@
                 ((T_TST_TEST_HW_CON*)(msg->SigP))->dsp_patch_version,
                 ((T_TST_TEST_HW_CON*)(msg->SigP))->dsp_checksum);
 
-      #if 0 //((((CHIPSET !=2 )) && ((LONG_JUMP != 0))) || (CHIPSET == 12) || (CHIPSET == 15))
+      #if ((((CHIPSET !=2 )) && ((LONG_JUMP != 0))) || (CHIPSET == 12) || (CHIPSET == 15))
       {
         sprintf(str2,"CHECKSUM before DWNL:%04x\n\r",d_checksum1);
         strcat(str,str2);
@@ -14460,18 +6151,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;
 
@@ -14481,40 +6165,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;
 
@@ -14528,17 +6197,11 @@
 /*********************************/
 void l1_trace_recovery(void)
 {
-char *s={"L1 Recovery performed"};
   trace_info.l1_memorize_error = '.'; // memorize an error in the L1
   L1_send_trace_cpy("> RECOVERY \n\r");
   l1_trace_L1_tasks(); // trace L1 tasks status
   // inform Riviera DAR system about the Recovery performed.
-  #if (OP_L1_STANDALONE == 1)
-  rvf_send_trace1  (s, (T_RVT_MSG_LG)strlen(s),(UWORD32)0,0, (UWORD32)trace_info.l1_trace_user_id) ;// omaps00090550
-  #else
-  rvf_send_trace1  (s, (T_RVT_MSG_LG)strlen(s),(UWORD32)0,RV_TRACE_LEVEL_WARNING, (UWORD32)trace_info.l1_trace_user_id) ;// omaps00090550
-  #endif
-//  L1_send_trace_cpy_DAR("L1 Recovery performed"); //omaps00090550
+  L1_send_trace_cpy_DAR("L1 Recovery performed");
 }
 #endif //L1_RECOVERY
 
@@ -14643,7 +6306,11 @@
     if (trace_info.PM_Task == 255) // 1st PM error in the frame: This PM is memorized
       trace_info.PM_Task  = task;  // memorize the Task of this 1st PM error
 
-#if ( ((TRACE_TYPE==1) || (TRACE_TYPE == 4)))
+/*
+ * FreeCalypso TCS211 reconstruction: the following logic
+ * appears to be a LoCosto addition.
+ */
+#if 0 //( ((TRACE_TYPE==1) || (TRACE_TYPE == 4)))
      if (trace_info.current_config->l1_dyn_trace & 1 <<  L1_DSP_TRACE_FULL_DUMP)
      {
 #if(MELODY_E2 || L1_MP3 || L1_AAC || L1_DYN_DSP_DWNLD )
@@ -14659,6 +6326,12 @@
     if (trace_info.Not_PM_Task == 255) // 1st PM recovery case: task of recovery needs to be memorized
       trace_info.Not_PM_Task = task;
   }
+
+/*
+ * FreeCalypso TCS211 reconstruction: the following logic
+ * appears to be a LoCosto addition.
+ */
+#if 0
 if (pm< 0x00C0) //sajal made changed it from- if (pm<= 0x00C0)
 
   {
@@ -14670,7 +6343,7 @@
       #endif
 
    }
-
+#endif
 }
 
 /*-------------------------------------------------------*/
@@ -14763,93 +6436,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)
@@ -14937,7 +6523,6 @@
                 }
 
                 l1_intram_put_trace(str);
-  #endif // L1_COMPRESSED_TRACING
 
             #endif // (GSM_IDLE_RAM == 0)
           }
@@ -14987,7 +6572,7 @@
 
   ((T_TRACE_INFO *)(msg->SigP))->debug_code = L1S_PACKET_TRANSFER;
 
-  switch(l1s.actual_time.fn_mod52)
+  switch(l1s.actual_time.fn % 52)
   {
     case 4: ((T_TRACE_INFO *)(msg->SigP))->tab[0]  = 0;  break;
     case 8: ((T_TRACE_INFO *)(msg->SigP))->tab[0]  = 1;  break;
@@ -15670,29 +7255,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",
@@ -15716,14 +7278,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)
@@ -15732,31 +7286,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];
@@ -15777,7 +7308,6 @@
 
     i = (i + 1) % TRACE_FCT_BUFF_SIZE;
   }
-#endif
   trace_info.trace_buff_stop = FALSE; // start buffer trace
 }
 
@@ -15793,6 +7323,7 @@
 /* Parameters :                                          */
 /* Return     :                                          */
 
+#if 0	/* FreeCalypso: function not present in TCS211 */
 void Trace_L1S_CPU_load()
 {
   #define TIMER_RESET_VALUE (0xFFFF)
@@ -15815,9 +7346,10 @@
   if (((l1s.actual_time.fn%1326) == 0) && (max_cpu_flag == 0))
     max_cpu = 0;
 } /* end of Trace_L1S_CPU_load() */
-
+#endif
+
+#if 0	/* FreeCalypso: feature not present in our chipset */
 /********** DSP CPU load measurement *************/
-#if (DSP >= 38)
 void l1_dsp_cpu_load_read()
 {
 
@@ -15895,7 +7427,7 @@
     }
   }
 } /* end of l1_dsp_cpu_load_read() */
-#endif	// DSP >= 38
+#endif
 
     #endif //((TRACE_TYPE == 1) && (CODE_VERSION != SIMULATION))
   #endif // (TRACE_TYPE == 1) // (TRACE_TYPE == 4)
@@ -16036,17 +7568,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],
@@ -16057,7 +7578,6 @@
                      ((T_TRACE_INFO *)(msg->SigP))->tab[6],
                      ((T_TRACE_INFO *)(msg->SigP))->tab[7]);
             L1_send_trace_no_cpy(str);
-#endif
           }
           break;
 
@@ -16213,12 +7733,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
@@ -16415,12 +7931,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
   }
@@ -16514,32 +8026,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
          {
@@ -16553,7 +8039,7 @@
          else
          // big sleep
          {
-           char *array_string[]={"undefined","ligth on","uart","sim","gauging","sleep mode","DSP","BT","camera","??"};
+           char *array_string[]={"undefined","ligth on","uart","sim","gauging","sleep mode","DSP","BT","??"};
            sprintf (str,"      big sleep: %ld %ld %d %d (cause:%s) %s\n\r",
                     start_fn,
                     end_fn,
@@ -16563,7 +8049,6 @@
                     array_special_cases[index]);
          }
          l1_intram_put_trace(str);
-#endif
       }
 
       #endif
@@ -16610,23 +8095,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
@@ -16646,18 +8121,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
   }
@@ -16672,25 +8139,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)
@@ -16708,7 +8156,6 @@
 
          l1_intram_put_trace(str);
        }
-#endif
     #endif
   }
 
@@ -16743,21 +8190,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)
         {
@@ -16811,6 +8249,7 @@
 }
 #endif    // AMR
 
+#if 0	/* FreeCalypso: function not present in TCS211 */
 void l1_trace_fail_sleep(UWORD8 pwmgr_fail_step, UWORD8 pwmgr_fail_id, UWORD8 pwmgr_fail_cause)
 {
   #if (TRACE_TYPE==1) || (TRACE_TYPE==4)
@@ -16845,16 +8284,14 @@
        }
      }
   #endif
-
-
 }
-
+#endif
 
 /* l1_trace_sleep()                                      */
 /* Parameters :                                          */
 /* Return     :                                          */
 
-void l1_trace_sleep(UWORD32 start_fn, UWORD32 end_fn, UWORD8 type_sleep,UWORD8 wakeup_type,UWORD8 big_sleep_type, UWORD16 int_id)
+void l1_trace_sleep(UWORD32 start_fn, UWORD32 end_fn, UWORD8 type_sleep,UWORD8 wakeup_type,UWORD8 big_sleep_type)
 {
   #if (CODE_VERSION == SIMULATION)
 
@@ -16897,7 +8334,6 @@
         ((T_TR_SLEEP *)(msg->SigP))->type_sleep     = type_sleep;
         ((T_TR_SLEEP *)(msg->SigP))->wakeup_type    = wakeup_type;
         ((T_TR_SLEEP *)(msg->SigP))->big_sleep_type = big_sleep_type;
-        ((T_TR_SLEEP *)(msg->SigP))->int_id         = int_id;
 
         // send message...
         os_send_sig(msg, L1C1_QUEUE);
@@ -16922,7 +8358,6 @@
         ((T_TRACE_INFO *)(msg->SigP))->tab[2] = type_sleep;
         ((T_TRACE_INFO *)(msg->SigP))->tab[3] = wakeup_type;
         ((T_TRACE_INFO *)(msg->SigP))->tab[4] = big_sleep_type;
-        ((T_TRACE_INFO *)(msg->SigP))->tab[5] = int_id;
 
         // send message...
         os_send_sig(msg, L1C1_QUEUE);
@@ -17026,15 +8461,17 @@
 
         ((T_TRACE_INFO *)(msg->SigP))->tab[0] = l1s.actual_time.fn_mod42432;
 
-        if (trace_info.current_config->l1_dyn_trace & 1<<L1_DYN_TRACE_GAUGING)
-        {
-          // dynamic trace for all gauging parameters
-          ((T_TRACE_INFO *)(msg->SigP))->tab[1] = l1s.pw_mgr.state;
-          ((T_TRACE_INFO *)(msg->SigP))->tab[2] = l1s.pw_mgr.lf;
-          ((T_TRACE_INFO *)(msg->SigP))->tab[3] = l1s.pw_mgr.hf;
-          ((T_TRACE_INFO *)(msg->SigP))->tab[4] = l1s.pw_mgr.root;
-          ((T_TRACE_INFO *)(msg->SigP))->tab[5] = l1s.pw_mgr.frac;
-        }
+	#if 0	/* FreeCalypso: code not present in TCS211 binary object */
+          if (trace_info.current_config->l1_dyn_trace & 1<<L1_DYN_TRACE_GAUGING)
+          {
+            // dynamic trace for all gauging parameters
+            ((T_TRACE_INFO *)(msg->SigP))->tab[1] = l1s.pw_mgr.state;
+            ((T_TRACE_INFO *)(msg->SigP))->tab[2] = l1s.pw_mgr.lf;
+            ((T_TRACE_INFO *)(msg->SigP))->tab[3] = l1s.pw_mgr.hf;
+            ((T_TRACE_INFO *)(msg->SigP))->tab[4] = l1s.pw_mgr.root;
+            ((T_TRACE_INFO *)(msg->SigP))->tab[5] = l1s.pw_mgr.frac;
+          }
+	#endif
 
         // send message...
         os_send_sig(msg, L1C1_QUEUE);
@@ -17053,7 +8490,7 @@
 /* Return     :                                          */
 /* Functionality :                                       */
 
-void trace_fct(UWORD8 fct_id, UWORD32 radio_freq)
+void trace_fct(UWORD8 fct_id, WORD32 radio_freq)
 {
 #if (TRACE_TYPE==1) || (TRACE_TYPE==4)
 
@@ -17083,7 +8520,8 @@
 #endif
 
 
-#if (((TRACE_TYPE==1) || (TRACE_TYPE == 4)))
+/* FreeCalypso: the following function appears to be a LoCosto addition */
+#if 0 //(((TRACE_TYPE==1) || (TRACE_TYPE == 4)))
   UWORD16 reentry = 0;
 
   void l1_trace_full_dsp_buffer( void )
@@ -17143,180 +8581,6 @@
 #endif  // C_DEBUG_TRACE_TYPE
 
 
-#if ((TRACE_TYPE==1) || (TRACE_TYPE == 4))
-#if (MELODY_E2 || L1_MP3 ||  L1_AAC || L1_DYN_DSP_DWNLD )
-
-
-/* l1_disable_dsp_trace                                  */
-/* Parameters :  none                                    */
-/* Return     :  none                                    */
-/* Description :  Disables DSP trace                     */
-
-
-void l1_disable_dsp_trace()
-{
-#if (CODE_VERSION != SIMULATION)
-  T_NDB_MCU_DSP* dsp_ndb_ptr = (T_NDB_MCU_DSP *) NDB_ADR;
-#else
-  T_NDB_MCU_DSP* dsp_ndb_ptr = l1s_dsp_com.dsp_ndb_ptr;
-#endif
-
-  xSignalHeaderRec *msg;
-
-  // Only lower nested level disable triggers Disable DSP Trace message to DSP
-  if (trace_info.dsptrace_handler_globals.nested_disable_count == 0)
-  {
-    trace_info.dsptrace_handler_globals.trace_flag_blocked = TRUE;
-
-    if (dsp_ndb_ptr->d_debug_trace_type != 0x0000)
-    {
-      trace_info.dsptrace_handler_globals.nested_disable_count++;
-
-      // save trace type configuration, set re-init buffer (0x1000) and enable DSP trace (0x8000)
-      trace_info.dsptrace_handler_globals.dsp_trace_level_copy = dsp_ndb_ptr->d_debug_trace_type;
-      dsp_ndb_ptr->d_debug_trace_type = (API)0x8000; // 0x8000 Disable DSP Trace and 0x1000 Re-init Trace buffer
-
-       /*
-	* FreeCalypso note: the LoCosto version of L1 was writing 0x9000 into
-	* dsp_ndb_ptr->d_debug_trace_type.  When we got l1_dyn_dwl code
-	* integrated, we started getting DSP erratic behaviour when trying
-	* to make a voice call (probably when going into TCH).  TCS211 version
-	* of l1_disable_DSP_trace() writes 0x8000 here instead.  Changing
-	* the code here to write 0x8000 instead of 0x9000 fixed that erratic
-	* behaviour.  Evidently this "re-init buffer" 0x1000 bit must be a
-	* LoCosto-ism that does not apply correctly to the Calypso.
-	*/
-
-      // Allocate DEBUG message.
-      msg = os_alloc_sig(sizeof(T_TRACE_INFO));
-      DEBUGMSG(status,NU_ALLOC_ERR)
-      msg->SignalCode = TRACE_INFO;
-
-      ((T_TRACE_INFO *)(msg->SigP))->debug_code = DSP_TRACE_DISABLE;
-      dsp_ndb_ptr->d_debug_buffer_size = 0;
-
-      // send message...
-      os_send_sig(msg, L1C1_QUEUE);
-      DEBUGMSG(status,NU_SEND_QUEUE_ERR)
-
-#if (DSP_DEBUG_TRACE_ENABLE)
-      trace_info.dsp_debug_buf_start[0] = NULL;
-      trace_info.dsp_debug_buf_start[1] = NULL;
-#endif
-    }
-  }
-  // In case higher nested levels disable, increment nested counter
-  else if (trace_info.dsptrace_handler_globals.nested_disable_count > 0)
-  {
-    trace_info.dsptrace_handler_globals.nested_disable_count++;
-  }
-}
-
-
-/* l1_enable_dsp_trace                                   */
-/*-------------------------------------------------------*/
-/*                                                       */
-/* Parameters :  none                                    */
-/* Return     :  none                                    */
-/*                                                       */
-/* Description :  Enables DSP trace                      */
-
-
-void l1_enable_dsp_trace()
-{
-#if (CODE_VERSION != SIMULATION)
-  T_NDB_MCU_DSP* dsp_ndb_ptr = (T_NDB_MCU_DSP *) NDB_ADR;
-#else
-  T_NDB_MCU_DSP* dsp_ndb_ptr = l1s_dsp_com.dsp_ndb_ptr;
-#endif
-
-  xSignalHeaderRec *msg;
-
-  if ((trace_info.dsptrace_handler_globals.trace_flag_blocked == TRUE) && (dsp_ndb_ptr->d_debug_trace_type == 0x0000))
-  {
-    // Only lower nested level disable triggers Enable DSP Trace message to DSP
-    if (trace_info.dsptrace_handler_globals.nested_disable_count == 1)
-    {
-      trace_info.dsptrace_handler_globals.trace_flag_blocked = FALSE;
-      trace_info.dsptrace_handler_globals.nested_disable_count--;
-
-      // restore trace type configuration, set re-init buffer (0x1000) and enable DSP trace (0x8000)
-      dsp_ndb_ptr->d_debug_buffer_size = C_DEBUG_BUFFER_SIZE;
-      dsp_ndb_ptr->d_debug_trace_type = (API)trace_info.dsptrace_handler_globals.dsp_trace_level_copy | 0x8000;
-      trace_info.dsptrace_handler_globals.dsp_trace_level_copy = 0x0000;
-
-       /*
-	* FreeCalypso note: same change from 0x9000 to 0x8000 above
-	* as in l1_disable_dsp_trace().
-	*/
-
-      // Allocate DEBUG message.
-      msg = os_alloc_sig(sizeof(T_TRACE_INFO));
-      DEBUGMSG(status,NU_ALLOC_ERR)
-      msg->SignalCode = TRACE_INFO;
-
-      ((T_TRACE_INFO *)(msg->SigP))->debug_code = DSP_TRACE_ENABLE;
-
-      // send message...
-      os_send_sig(msg, L1C1_QUEUE);
-      DEBUGMSG(status,NU_SEND_QUEUE_ERR);
-    }
-    // In case higher nested levels enable, decrement nested counter
-    else if (trace_info.dsptrace_handler_globals.nested_disable_count > 1)
-    {
-      trace_info.dsptrace_handler_globals.nested_disable_count--;
-    }
-  }
-}
-
-
-/* l1_get_dsp_trace_mask                                 */
-/* Parameters :  none                                    */
-/* Return     :  dsp trace mask                          */
-/* Description :  Returns DSP Trace Mask copy beyond     */
-/*                potential trace disabling due to       */
-/*                DSP Trace Handler behavior             */
-
-
-UWORD16 l1_get_dsp_trace_mask ()
-{
-#if (CODE_VERSION != SIMULATION)
-  T_NDB_MCU_DSP* dsp_ndb_ptr = (T_NDB_MCU_DSP *) NDB_ADR;
-#else
-  T_NDB_MCU_DSP* dsp_ndb_ptr = l1s_dsp_com.dsp_ndb_ptr;
-#endif
-
-  if (trace_info.dsptrace_handler_globals.trace_flag_blocked == TRUE)
-    return trace_info.dsptrace_handler_globals.dsp_trace_level_copy;
-  else
-    return dsp_ndb_ptr->d_debug_trace_type;
-}
-
-/* l1_set_dsp_trace_mask                                 */
-/* Parameters :  new dsp trace mask                      */
-/* Return     :  none                                    */
-/* Description :  Sets DSP Trace Mask safely regarding   */
-/*                DSP Trace Handler behavior             */
-
-
-void l1_set_dsp_trace_mask (UWORD16 mask)
-{
-#if (CODE_VERSION != SIMULATION)
-  T_NDB_MCU_DSP* dsp_ndb_ptr = (T_NDB_MCU_DSP *) NDB_ADR;
-#else
-  T_NDB_MCU_DSP* dsp_ndb_ptr = l1s_dsp_com.dsp_ndb_ptr;
-#endif
-
-  if (trace_info.dsptrace_handler_globals.trace_flag_blocked == TRUE)
-    trace_info.dsptrace_handler_globals.dsp_trace_level_copy = mask;
-  else
-    dsp_ndb_ptr->d_debug_trace_type = (API)(mask | 0x8000);
-}
-
-#endif
-#endif // (TRACE_TYPE==1) || (TRACE_TYPE == 4)
-
-
 #if (L1_AUDIO_MCU_ONOFF == 1)
 
 /* l1_trace_audio_onoff()                               */
@@ -17704,7 +8968,7 @@
 
 
     // Analog Based Band - removed in ROM 38
-    #if (ANALOG == 11)
+    #if (ANLG_FAM == 11)
       sprintf (str,"d_afcctladd_hole:0x%4.4x \n\r",api_dump_cnvt_mcu_to_dsp(((UWORD32) &(l1s_dsp_com.dsp_ndb_ptr->d_afcctladd_hole))));      // 0x08ED
       L1_send_low_level_trace(str)
       wait_ARM_cycles(convert_nanosec_to_cycles(API_DUMP_DELAY_NS));
@@ -17716,7 +8980,7 @@
 
     #endif
 
-    #if (ANALOG == 11)
+    #if (ANLG_FAM == 11)
       sprintf (str,"d_vbuctrl_hole:0x%4.4x \n\r",api_dump_cnvt_mcu_to_dsp(((UWORD32) &(l1s_dsp_com.dsp_ndb_ptr->d_vbuctrl_hole))));        // 0x08EE - removed in ROM38
       L1_send_low_level_trace(str)
       wait_ARM_cycles(convert_nanosec_to_cycles(API_DUMP_DELAY_NS));
@@ -17761,35 +9025,35 @@
     wait_ARM_cycles(convert_nanosec_to_cycles(API_DUMP_DELAY_NS));
 
 
-    //#if (ANALOG == 1)
+    //#if (ANLG_FAM == 1)
     //  sprintf (str,"d_vbctrl:0x%4.4x \n\r",api_dump_cnvt_mcu_to_dsp(((UWORD32) &(l1s_dsp_com.dsp_ndb_ptr->d_vbctrl))));
     //  L1_send_low_level_trace(str)
     //  wait_ARM_cycles(convert_nanosec_to_cycles(API_DUMP_DELAY_NS));
 
-    //#elif ((ANALOG == 2) || (ANALOG == 3))
+    //#elif ((ANLG_FAM == 2) || (ANLG_FAM == 3))
     //  sprintf (str,"d_vbctrl1:0x%4.4x \n\r",api_dump_cnvt_mcu_to_dsp(((UWORD32) &(l1s_dsp_com.dsp_ndb_ptr->d_vbctrl1))));
     //  L1_send_low_level_trace(str)
     //  wait_ARM_cycles(convert_nanosec_to_cycles(API_DUMP_DELAY_NS));
 
     //#endif
 
-    #if (ANALOG == 1)
+    #if (ANLG_FAM == 1)
       sprintf (str,"d_vbctrl:0x%4.4x \n\r",api_dump_cnvt_mcu_to_dsp(((UWORD32) &(l1s_dsp_com.dsp_ndb_ptr->d_vbctrl))));
       L1_send_low_level_trace(str)
       wait_ARM_cycles(convert_nanosec_to_cycles(API_DUMP_DELAY_NS));
 
-    #elif ((ANALOG == 2) || (ANALOG == 3))
+    #elif ((ANLG_FAM == 2) || (ANLG_FAM == 3))
       sprintf (str,"d_vbctrl1:0x%4.4x \n\r",api_dump_cnvt_mcu_to_dsp(((UWORD32) &(l1s_dsp_com.dsp_ndb_ptr->d_vbctrl1))));
       L1_send_low_level_trace(str)
       wait_ARM_cycles(convert_nanosec_to_cycles(API_DUMP_DELAY_NS));
 
-    #elif (ANALOG == 11)
+    #elif (ANLG_FAM == 11)
       sprintf (str,"d_vbctrl_hole:0x%4.4x \n\r",api_dump_cnvt_mcu_to_dsp(((UWORD32) &(l1s_dsp_com.dsp_ndb_ptr->d_vbctrl_hole))));         // 0x08F6 - removed in ROM38
       L1_send_low_level_trace(str)
       wait_ARM_cycles(convert_nanosec_to_cycles(API_DUMP_DELAY_NS));
 
     #endif
-    #if (ANALOG == 11)
+    #if (ANLG_FAM == 11)
       sprintf (str,"d_bbctrl_hole:0x%4.4x \n\r",api_dump_cnvt_mcu_to_dsp(((UWORD32) &(l1s_dsp_com.dsp_ndb_ptr->d_bbctrl_hole))));         // 0x08F7 - removed in ROM38
       L1_send_low_level_trace(str)
       wait_ARM_cycles(convert_nanosec_to_cycles(API_DUMP_DELAY_NS));
@@ -18083,7 +9347,7 @@
     wait_ARM_cycles(convert_nanosec_to_cycles(API_DUMP_DELAY_NS));
 
 
-#if (ANALOG == 3)
+#if (ANLG_FAM == 3)
     // SYREN specific registers
     sprintf (str,"d_vbpop:0x%4.4x \n\r",api_dump_cnvt_mcu_to_dsp(((UWORD32) &(l1s_dsp_com.dsp_ndb_ptr->d_vbpop))));
     L1_send_low_level_trace(str)
@@ -18113,7 +9377,7 @@
     L1_send_low_level_trace(str)
     wait_ARM_cycles(convert_nanosec_to_cycles(API_DUMP_DELAY_NS));
 
-#elif ((ANALOG == 1) || (ANALOG == 2) || (ANALOG == 11))
+#elif ((ANLG_FAM == 1) || (ANLG_FAM == 2) || (ANLG_FAM == 11))
     sprintf (str,"d_hole3_ndb[0]:0x%4.4x \n\r",api_dump_cnvt_mcu_to_dsp(((UWORD32) &(l1s_dsp_com.dsp_ndb_ptr->d_hole3_ndb[0]))));
     L1_send_low_level_trace(str)
     wait_ARM_cycles(convert_nanosec_to_cycles(API_DUMP_DELAY_NS));
@@ -19910,15 +11174,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],
@@ -19927,7 +11182,6 @@
             audio_regs_cpy[8], audio_regs_cpy[9],
             audio_regs_cpy[10]);
     L1_send_trace_cpy(str2);
-#endif
     audio_reg_read_status=0;
   }
 }