--- a/src/cs/services/etm/etm_api.c	Wed Oct 05 22:46:22 2016 +0000
+++ b/src/cs/services/etm/etm_api.c	Wed Oct 05 23:44:54 2016 +0000
@@ -1,22 +1,22 @@
-/********************************************************************************
+/*******************************************************************************
  * Enhanced TestMode (ETM)
- * @file	etm_api.c
+ * @file    etm_api.c
  *
  * API for ETM SWE.
  *
- * @author	Kim T. Peteren (ktp@ti.com)
+ * @author  Kim T. Peteren (ktp@ti.com)
  * @version 0.1
  *
 
  *
  * History:
  *
- * 	Date       	Modification
+ *  Date        Modification
  *  ------------------------------------
- *  11/06/2003	Creation
+ *  11/06/2003  Creation
  *
  * (C) Copyright 2003 by Texas Instruments Incorporated, All Rights Reserved
- *********************************************************************************/
+ ******************************************************************************/
 
 
 #include "etm/etm.h"
@@ -33,23 +33,23 @@
 extern T_ETM_ENV_CTRL_BLK *etm_env_ctrl_blk;
 
 
-/********************************************************************************
+/*******************************************************************************
  * Registers the SWE to the ETM instance.
  *
  * This is a bridge function. It sends the T_ETM_REGISTRATION_REQ
  * message to the ETM SWE.
  * It is the first function that should be called.
  *
- * @return	ETM_NOMEM in case of a memory error,
- *			the return value of rvf_send_msg otherwise.
- *********************************************************************************/
+ * @return  ETM_NOMEM in case of a memory error,
+ *          the return value of rvf_send_msg otherwise.
+ ******************************************************************************/
 
 int etm_register(char name[], int mid, int task_id, T_RVF_ADDR_ID addr_id, ETM_CALLBACK_FUNC callback)
 {
-	/* Type for a registration event. */
-	T_ETM_REGISTER_REQ *etm_registration_p;
+    /* Type for a registration event. */
+    T_ETM_REGISTER_REQ *etm_registration_p;
 
-	tr_etm(TgTrEtmLow, "ETM API: _register bridge function(%s)", name);
+    tr_etm(TgTrEtmLow, "ETM API: _register bridge function(%s)", name);
 
     /* Allocate the memory for the message to send */
     if ((etm_registration_p = (T_ETM_REGISTER_REQ*) etm_malloc(sizeof(T_ETM_REGISTER_REQ))) == NULL)
@@ -65,18 +65,18 @@
 
     /* Fill the message parameters */
     memcpy(etm_registration_p->name, name, strlen(name));
-	etm_registration_p->mid              = mid;
-	etm_registration_p->task_id          = task_id;
-	etm_registration_p->addr_id          = addr_id;
-	etm_registration_p->rx_callback_func = callback; 
+    etm_registration_p->mid              = mid;
+    etm_registration_p->task_id          = task_id;
+    etm_registration_p->addr_id          = addr_id;
+    etm_registration_p->rx_callback_func = callback; 
 
-	/* Send the message using mailbox. */
-	return rvf_send_msg(etm_env_ctrl_blk->addr_id,
-						(void*) etm_registration_p);
+    /* Send the message using mailbox. */
+    return rvf_send_msg(etm_env_ctrl_blk->addr_id,
+                        (void*) etm_registration_p);
 }
 
 
-/********************************************************************************
+/*******************************************************************************
  * Cleans ETM register tables, i.e. set/clean the variable at their initialization
  * state for a specific entity.
  * This function can be used to reinitialize ETM register database without having to
@@ -84,16 +84,16 @@
  *
  * This is a bridge function. It sends ETM_UNREGISTER message to ETM.
  *
- * @return	ETM_NOMEM in case of a memory error,
- *			the return value of rvf_send_msg otherwise.
- *********************************************************************************/
+ * @return  ETM_NOMEM in case of a memory error,
+ *          the return value of rvf_send_msg otherwise.
+ ******************************************************************************/
 
 int etm_unregister(char name[], int mid, int task_id, T_RVF_ADDR_ID addr_id, ETM_CALLBACK_FUNC callback)
 {
-	/* Type for a start input event. */
-	T_ETM_UNREGISTER *etm_unregister_p;
+    /* Type for a start input event. */
+    T_ETM_UNREGISTER *etm_unregister_p;
     
-	tr_etm(TgTrEtmLow, "ETM API: _unregister bridge function");
+    tr_etm(TgTrEtmLow, "ETM API: _unregister bridge function");
     
     /* Allocate the memory for the message to send */
     if ((etm_unregister_p = (T_ETM_UNREGISTER*) etm_malloc(sizeof(T_ETM_UNREGISTER))) == NULL)
@@ -109,25 +109,25 @@
 
     /* Fill the message parameters */
     memcpy(etm_unregister_p->name, name, strlen(name));
-	etm_unregister_p->mid              = mid;
-	etm_unregister_p->task_id          = task_id;
-	etm_unregister_p->addr_id          = addr_id;
-	etm_unregister_p->rx_callback_func = callback;
+    etm_unregister_p->mid              = mid;
+    etm_unregister_p->task_id          = task_id;
+    etm_unregister_p->addr_id          = addr_id;
+    etm_unregister_p->rx_callback_func = callback;
 
-	/* Send the message using mailbox. */
-	return rvf_send_msg(etm_env_ctrl_blk->addr_id,
-						(void*) etm_unregister_p);
+    /* Send the message using mailbox. */
+    return rvf_send_msg(etm_env_ctrl_blk->addr_id,
+                        (void*) etm_unregister_p);
 }
 
 
-/********************************************************************************
+/*******************************************************************************
  * Get data from a ETM packet structur. Get either 8, 16 or 32 value
  * Used to unpack data 
  * 
  * This is helpers
  *
- * @return	the return value of the point of the ETM packet.
- *********************************************************************************/
+ * @return  the return value of the point of the ETM packet.
+ ******************************************************************************/
 
 int etm_get8(void *buf)
 {
@@ -171,14 +171,14 @@
 }
 
 
-/********************************************************************************
+/*******************************************************************************
  * Put data into a ETM packet structur. Put either 8, 16 or 32 value
  * Used to pack data 
  * 
  * This is helpers
  *
- * @return	Return ETM_PACKET of ETM_OK.
- *********************************************************************************/
+ * @return  Return ETM_PACKET of ETM_OK.
+ ******************************************************************************/
 
 #define max_ul_data_size 240
 
@@ -242,13 +242,13 @@
 }
 
 
-/********************************************************************************
+/*******************************************************************************
  * This function is used to send an ETM Packet to the PC
  *
  * This is helpers
  *
- * @return	Return value of rvf_send_trace_cpy.
- *********************************************************************************/
+ * @return  Return value of rvf_send_trace_cpy.
+ ******************************************************************************/
 
 int etm_pkt_send(T_ETM_PKT *pkt)
 {