--- a/chipsetsw/layer1/cfile/l1_trace.c	Sun Jun 05 19:36:56 2016 +0000
+++ b/chipsetsw/layer1/cfile/l1_trace.c	Mon Jun 06 20:54:47 2016 +0000
@@ -1406,18 +1406,25 @@
             }
 #endif    /* end FF_L1_FAST_DECODING */
             else
-#endif
             {
               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 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],
@@ -1610,6 +1617,7 @@
                        array_string[((T_TRACE_INFO *)(msg->SigP))->tab[4]],
                        array_special_cases[index]);
             }
+            int_id = 0;
             L1_send_trace_cpy(str);
           }
           break;
@@ -1952,7 +1960,7 @@
       case MPHC_INIT_L1_REQ:
       {
 #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)*/
@@ -1964,7 +1972,7 @@
       case MPHC_INIT_L1_CON:
       {
 #if (L1_FF_MULTIBAND == 0)
-        sprintf (str, "BAND_C");
+        sprintf (str, "BAND_C \n\r");
 #else
         UWORD16 n = 0;
         UWORD8 i = 0;
@@ -2245,7 +2253,12 @@
       case MPHC_NCELL_SYNC_IND:
       {
 
-    #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",
@@ -3133,7 +3146,6 @@
                 l1s.actual_time.fn_mod42432,
                 l1a_l1s_com.full_list_ptr->power_array_size,
                 trace_info.rxlev_req_count);
-        L1_send_trace_cpy(str);
 
         // If it's the 5th MPHC_RXLEV_REQ message received from L3, trace accum_power_result
         if (trace_info.rxlev_req_count == 5)
@@ -3955,7 +3967,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",
@@ -4524,13 +4538,11 @@
         #if (L1_AUDIO_DRIVER == 1)
           case L1_AUDIO_DRIVER_IND:
           {
-		  	#if 0
             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  //endof aud_i
           }
           break;
         #endif //(L1_AUDIO_DRIVER == 1)