From 2585f887563c41b5734813251b4897f45e56727d Mon Sep 17 00:00:00 2001
From: Myles Watson <mylesgw@google.com>
Date: Wed, 9 Nov 2016 10:40:23 -0800
Subject: [PATCH] bta: Remove double asterisks in comments

Double asterisks at the beginning of the line
  sed -i s,"^[*][*]"," *", bta/*/*

Double asterisks after a space
  sed -i s,"^ [*][*]\([^*]\)"," *\1", bta/*/*
  sed -i s,"^ [*][*]$"," *", bta/*/*

Test: mma -j32
Change-Id: Ib83b802c7000176683b4e7f24d1255b3c2c6c01c
---
 system/bta/ag/bta_ag_act.cc                |  382 ++--
 system/bta/ag/bta_ag_api.cc                |  210 +-
 system/bta/ag/bta_ag_at.cc                 |   88 +-
 system/bta/ag/bta_ag_at.h                  |   74 +-
 system/bta/ag/bta_ag_ci.cc                 |   40 +-
 system/bta/ag/bta_ag_cmd.cc                |  424 ++--
 system/bta/ag/bta_ag_int.h                 |   16 +-
 system/bta/ag/bta_ag_main.cc               |  332 ++--
 system/bta/ag/bta_ag_rfc.cc                |  204 +-
 system/bta/ag/bta_ag_sco.cc                |  418 ++--
 system/bta/ag/bta_ag_sdp.cc                |  156 +-
 system/bta/ar/bta_ar.cc                    |  166 +-
 system/bta/ar/bta_ar_int.h                 |    4 +-
 system/bta/av/bta_av_aact.cc               | 1088 +++++------
 system/bta/av/bta_av_act.cc                |  640 +++----
 system/bta/av/bta_av_api.cc                |  428 ++---
 system/bta/av/bta_av_cfg.cc                |    8 +-
 system/bta/av/bta_av_ci.cc                 |   44 +-
 system/bta/av/bta_av_int.h                 |   16 +-
 system/bta/av/bta_av_main.cc               |  402 ++--
 system/bta/av/bta_av_ssm.cc                |  150 +-
 system/bta/dm/bta_dm_act.cc                | 2022 ++++++++++----------
 system/bta/dm/bta_dm_api.cc                | 1270 ++++++------
 system/bta/dm/bta_dm_cfg.cc                |   30 +-
 system/bta/dm/bta_dm_ci.cc                 |   68 +-
 system/bta/dm/bta_dm_int.h                 |    4 +-
 system/bta/dm/bta_dm_main.cc               |   76 +-
 system/bta/dm/bta_dm_pm.cc                 |  436 ++---
 system/bta/dm/bta_dm_sco.cc                |   72 +-
 system/bta/gatt/bta_gattc_act.cc           |  818 ++++----
 system/bta/gatt/bta_gattc_api.cc           |  540 +++---
 system/bta/gatt/bta_gattc_cache.cc         |  534 +++---
 system/bta/gatt/bta_gattc_int.h            |   12 +-
 system/bta/gatt/bta_gattc_main.cc          |   82 +-
 system/bta/gatt/bta_gattc_utils.cc         |  412 ++--
 system/bta/gatt/bta_gatts_act.cc           |  276 +--
 system/bta/gatt/bta_gatts_api.cc           |  264 +--
 system/bta/gatt/bta_gatts_int.h            |   12 +-
 system/bta/gatt/bta_gatts_main.cc          |   18 +-
 system/bta/gatt/bta_gatts_utils.cc         |  112 +-
 system/bta/hf_client/bta_hf_client_act.cc  |  458 ++---
 system/bta/hf_client/bta_hf_client_api.cc  |  188 +-
 system/bta/hf_client/bta_hf_client_at.cc   |   46 +-
 system/bta/hf_client/bta_hf_client_at.h    |    8 +-
 system/bta/hf_client/bta_hf_client_int.h   |   16 +-
 system/bta/hf_client/bta_hf_client_main.cc |  180 +-
 system/bta/hf_client/bta_hf_client_rfc.cc  |  126 +-
 system/bta/hf_client/bta_hf_client_sco.cc  |  252 +--
 system/bta/hf_client/bta_hf_client_sdp.cc  |  132 +-
 system/bta/hh/bta_hh_act.cc                |  378 ++--
 system/bta/hh/bta_hh_api.cc                |  318 +--
 system/bta/hh/bta_hh_int.h                 |    8 +-
 system/bta/hh/bta_hh_le.cc                 |  808 ++++----
 system/bta/hh/bta_hh_main.cc               |   84 +-
 system/bta/hh/bta_hh_utils.cc              |  188 +-
 system/bta/hl/bta_hl_act.cc                |  860 ++++-----
 system/bta/hl/bta_hl_api.cc                |  380 ++--
 system/bta/hl/bta_hl_ci.cc                 |  112 +-
 system/bta/hl/bta_hl_int.h                 |   16 +-
 system/bta/hl/bta_hl_main.cc               |  376 ++--
 system/bta/hl/bta_hl_sdp.cc                |  130 +-
 system/bta/hl/bta_hl_utils.cc              | 1242 ++++++------
 system/bta/include/bta_ag_api.h            |  214 +--
 system/bta/include/bta_ag_ci.h             |   62 +-
 system/bta/include/bta_ag_co.h             |  122 +-
 system/bta/include/bta_api.h               | 1352 ++++++-------
 system/bta/include/bta_ar_api.h            |  140 +-
 system/bta/include/bta_av_api.h            |  440 ++---
 system/bta/include/bta_av_ci.h             |   48 +-
 system/bta/include/bta_av_co.h             |  244 +--
 system/bta/include/bta_dm_ci.h             |   62 +-
 system/bta/include/bta_dm_co.h             |  316 +--
 system/bta/include/bta_gatt_api.h          |  832 ++++----
 system/bta/include/bta_gatts_co.h          |   78 +-
 system/bta/include/bta_hf_client_api.h     |  188 +-
 system/bta/include/bta_hh_api.h            |  314 +--
 system/bta/include/bta_hh_co.h             |  136 +-
 system/bta/include/bta_hl_api.h            |  394 ++--
 system/bta/include/bta_hl_ci.h             |  128 +-
 system/bta/include/bta_hl_co.h             |  312 +--
 system/bta/include/bta_jv_api.h            |  632 +++---
 system/bta/include/bta_jv_co.h             |   22 +-
 system/bta/include/bta_mce_api.h           |   58 +-
 system/bta/include/bta_op_api.h            |    4 +-
 system/bta/include/bta_pan_api.h           |  104 +-
 system/bta/include/bta_pan_ci.h            |  166 +-
 system/bta/include/bta_pan_co.h            |  230 +--
 system/bta/include/bta_sdp_api.h           |   92 +-
 system/bta/include/utl.h                   |  174 +-
 system/bta/jv/bta_jv_act.cc                |  794 ++++----
 system/bta/jv/bta_jv_api.cc                |  636 +++---
 system/bta/jv/bta_jv_int.h                 |    4 +-
 system/bta/jv/bta_jv_main.cc               |   22 +-
 system/bta/mce/bta_mce_act.cc              |   52 +-
 system/bta/mce/bta_mce_api.cc              |   54 +-
 system/bta/mce/bta_mce_int.h               |    4 +-
 system/bta/mce/bta_mce_main.cc             |   22 +-
 system/bta/pan/bta_pan_act.cc              |  366 ++--
 system/bta/pan/bta_pan_api.cc              |   98 +-
 system/bta/pan/bta_pan_ci.cc               |  178 +-
 system/bta/pan/bta_pan_int.h               |   16 +-
 system/bta/pan/bta_pan_main.cc             |  170 +-
 system/bta/pb/bta_pbs_int.h                |    4 +-
 system/bta/sdp/bta_sdp.cc                  |   16 +-
 system/bta/sdp/bta_sdp_act.cc              |   84 +-
 system/bta/sdp/bta_sdp_api.cc              |   98 +-
 system/bta/sdp/bta_sdp_int.h               |    4 +-
 system/bta/sys/bta_sys.h                   |   20 +-
 system/bta/sys/bta_sys_conn.cc             |  492 ++---
 system/bta/sys/bta_sys_int.h               |   12 +-
 system/bta/sys/bta_sys_main.cc             |  328 ++--
 system/bta/sys/utl.cc                      |  164 +-
 112 files changed, 14578 insertions(+), 14578 deletions(-)

diff --git a/system/bta/ag/bta_ag_act.cc b/system/bta/ag/bta_ag_act.cc
index 83284945434..cffe4c1c69f 100644
--- a/system/bta/ag/bta_ag_act.cc
+++ b/system/bta/ag/bta_ag_act.cc
@@ -35,8 +35,8 @@
 #include "l2c_api.h"
 
 /*****************************************************************************
-**  Constants
-*****************************************************************************/
+ *  Constants
+ ****************************************************************************/
 
 /* maximum length of data to read from RFCOMM */
 #define BTA_AG_RFC_READ_MAX     512
@@ -78,15 +78,15 @@ const tBTA_AG_ATCMD_CBACK bta_ag_at_cback_tbl[BTA_AG_NUM_IDX] =
 };
 
 /*******************************************************************************
-**
-** Function         bta_ag_cback_open
-**
-** Description      Send open callback event to application.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_cback_open
+ *
+ * Description      Send open callback event to application.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_ag_cback_open(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data, tBTA_AG_STATUS status)
 {
     tBTA_AG_OPEN    open;
@@ -110,16 +110,16 @@ static void bta_ag_cback_open(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data, tBTA_AG_
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_register
-**
-** Description      This function initializes values of the AG cb and sets up
-**                  the SDP record for the services.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_register
+ *
+ * Description      This function initializes values of the AG cb and sets up
+ *                  the SDP record for the services.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_register(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
 {
     tBTA_AG_REGISTER reg;
@@ -144,16 +144,16 @@ void bta_ag_register(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_deregister
-**
-** Description      This function removes the sdp records, closes the RFCOMM
-**                  servers, and deallocates the service control block.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_deregister
+ *
+ * Description      This function removes the sdp records, closes the RFCOMM
+ *                  servers, and deallocates the service control block.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_deregister(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
 {
     /* set dealloc */
@@ -170,15 +170,15 @@ void bta_ag_deregister(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_start_dereg
-**
-** Description      Start a deregister event.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_start_dereg
+ *
+ * Description      Start a deregister event.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_start_dereg(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
 {
     /* set dealloc */
@@ -189,15 +189,15 @@ void bta_ag_start_dereg(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_start_open
-**
-** Description      This starts an AG open.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_start_open
+ *
+ * Description      This starts an AG open.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_start_open(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
 {
     BD_ADDR pending_bd_addr;
@@ -231,15 +231,15 @@ void bta_ag_start_open(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_disc_int_res
-**
-** Description      This function handles a discovery result when initiator.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_disc_int_res
+ *
+ * Description      This function handles a discovery result when initiator.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_disc_int_res(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
 {
     uint16_t event = BTA_AG_DISC_FAIL_EVT;
@@ -299,15 +299,15 @@ void bta_ag_disc_int_res(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_disc_acp_res
-**
-** Description      This function handles a discovery result when acceptor.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_disc_acp_res
+ *
+ * Description      This function handles a discovery result when acceptor.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_disc_acp_res(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
 {
     /* if found service */
@@ -323,15 +323,15 @@ void bta_ag_disc_acp_res(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_disc_fail
-**
-** Description      This function handles a discovery failure.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_disc_fail
+ *
+ * Description      This function handles a discovery failure.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_disc_fail(tBTA_AG_SCB *p_scb,
                       UNUSED_ATTR tBTA_AG_DATA *p_data)
 {
@@ -348,15 +348,15 @@ void bta_ag_disc_fail(tBTA_AG_SCB *p_scb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_open_fail
-**
-** Description      open connection failed.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_open_fail
+ *
+ * Description      open connection failed.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_open_fail(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
 {
     /* call open cback w. failure */
@@ -364,15 +364,15 @@ void bta_ag_open_fail(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_rfc_fail
-**
-** Description      RFCOMM connection failed.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_rfc_fail
+ *
+ * Description      RFCOMM connection failed.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_rfc_fail(tBTA_AG_SCB *p_scb, UNUSED_ATTR tBTA_AG_DATA *p_data)
 {
     /* reinitialize stuff */
@@ -397,15 +397,15 @@ void bta_ag_rfc_fail(tBTA_AG_SCB *p_scb, UNUSED_ATTR tBTA_AG_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_rfc_close
-**
-** Description      RFCOMM connection closed.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_rfc_close
+ *
+ * Description      RFCOMM connection closed.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_rfc_close(tBTA_AG_SCB *p_scb,
                       UNUSED_ATTR tBTA_AG_DATA *p_data)
 {
@@ -493,15 +493,15 @@ void bta_ag_rfc_close(tBTA_AG_SCB *p_scb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_rfc_open
-**
-** Description      Handle RFCOMM channel open.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_rfc_open
+ *
+ * Description      Handle RFCOMM channel open.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_rfc_open(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
 {
     /* initialize AT feature variables */
@@ -537,15 +537,15 @@ void bta_ag_rfc_open(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_rfc_acp_open
-**
-** Description      Handle RFCOMM channel open when accepting connection.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_rfc_acp_open
+ *
+ * Description      Handle RFCOMM channel open when accepting connection.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_rfc_acp_open(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
 {
     uint16_t        lcid;
@@ -629,15 +629,15 @@ void bta_ag_rfc_acp_open(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_rfc_data
-**
-** Description      Read and process data from RFCOMM.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_rfc_data
+ *
+ * Description      Read and process data from RFCOMM.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_rfc_data(tBTA_AG_SCB *p_scb,
                      UNUSED_ATTR tBTA_AG_DATA *p_data)
 {
@@ -683,15 +683,15 @@ void bta_ag_rfc_data(tBTA_AG_SCB *p_scb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_start_close
-**
-** Description      Start the process of closing SCO and RFCOMM connection.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_start_close
+ *
+ * Description      Start the process of closing SCO and RFCOMM connection.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_start_close(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
 {
     /* Take the link out of sniff and set L2C idle time to 0 */
@@ -714,15 +714,15 @@ void bta_ag_start_close(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_post_sco_open
-**
-** Description      Perform post-SCO open action, if any
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_post_sco_open
+ *
+ * Description      Perform post-SCO open action, if any
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_post_sco_open(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
 {
     switch (p_scb->post_sco)
@@ -743,15 +743,15 @@ void bta_ag_post_sco_open(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_post_sco_close
-**
-** Description      Perform post-SCO close action, if any
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_post_sco_close
+ *
+ * Description      Perform post-SCO close action, if any
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_post_sco_close(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
 {
     switch (p_scb->post_sco)
@@ -800,15 +800,15 @@ void bta_ag_post_sco_close(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_svc_conn_open
-**
-** Description      Service level connection opened
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_svc_conn_open
+ *
+ * Description      Service level connection opened
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_svc_conn_open(tBTA_AG_SCB *p_scb,
                           UNUSED_ATTR tBTA_AG_DATA *p_data)
 {
@@ -844,14 +844,14 @@ void bta_ag_svc_conn_open(tBTA_AG_SCB *p_scb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_ci_rx_data
-**
-** Description      Send result code
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_ci_rx_data
+ *
+ * Description      Send result code
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_ci_rx_data(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
 {
     uint16_t len;
@@ -874,14 +874,14 @@ void bta_ag_ci_rx_data(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_rcvd_slc_ready
-**
-** Description      Handles SLC ready call-in in case of pass-through mode.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_rcvd_slc_ready
+ *
+ * Description      Handles SLC ready call-in in case of pass-through mode.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_rcvd_slc_ready(tBTA_AG_SCB *p_scb,
                            UNUSED_ATTR tBTA_AG_DATA *p_data)
 {
@@ -895,15 +895,15 @@ void bta_ag_rcvd_slc_ready(tBTA_AG_SCB *p_scb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_setcodec
-**
-** Description      Handle API SetCodec
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_setcodec
+ *
+ * Description      Handle API SetCodec
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_setcodec(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
 {
 #if (BTM_WBS_INCLUDED == TRUE)
diff --git a/system/bta/ag/bta_ag_api.cc b/system/bta/ag/bta_ag_api.cc
index 83a92c31f70..a0f39ac06aa 100644
--- a/system/bta/ag/bta_ag_api.cc
+++ b/system/bta/ag/bta_ag_api.cc
@@ -32,8 +32,8 @@
 #include <string.h>
 
 /*****************************************************************************
-**  Constants
-*****************************************************************************/
+ *  Constants
+ ****************************************************************************/
 
 static const tBTA_SYS_REG bta_ag_reg =
 {
@@ -42,18 +42,18 @@ static const tBTA_SYS_REG bta_ag_reg =
 };
 
 /*******************************************************************************
-**
-** Function         BTA_AgEnable
-**
-** Description      Enable the audio gateway service. When the enable
-**                  operation is complete the callback function will be
-**                  called with a BTA_AG_ENABLE_EVT. This function must
-**                  be called before other function in the AG API are
-**                  called.
-**
-** Returns          BTA_SUCCESS if OK, BTA_FAILURE otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AgEnable
+ *
+ * Description      Enable the audio gateway service. When the enable
+ *                  operation is complete the callback function will be
+ *                  called with a BTA_AG_ENABLE_EVT. This function must
+ *                  be called before other function in the AG API are
+ *                  called.
+ *
+ * Returns          BTA_SUCCESS if OK, BTA_FAILURE otherwise.
+ *
+ ******************************************************************************/
 tBTA_STATUS BTA_AgEnable(tBTA_AG_PARSE_MODE parse_mode, tBTA_AG_CBACK *p_cback)
 {
     /* Error if AG is already enabled, or AG is in the middle of disabling. */
@@ -79,15 +79,15 @@ tBTA_STATUS BTA_AgEnable(tBTA_AG_PARSE_MODE parse_mode, tBTA_AG_CBACK *p_cback)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_AgDisable
-**
-** Description      Disable the audio gateway service
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AgDisable
+ *
+ * Description      Disable the audio gateway service
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AgDisable(void)
 {
     BT_HDR *p_buf = (BT_HDR *)osi_malloc(sizeof(BT_HDR));
@@ -98,15 +98,15 @@ void BTA_AgDisable(void)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_AgRegister
-**
-** Description      Register an Audio Gateway service.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AgRegister
+ *
+ * Description      Register an Audio Gateway service.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AgRegister(tBTA_SERVICE_MASK services, tBTA_SEC sec_mask,tBTA_AG_FEAT features,
                   const char * p_service_names[], uint8_t app_id)
 {
@@ -129,15 +129,15 @@ void BTA_AgRegister(tBTA_SERVICE_MASK services, tBTA_SEC sec_mask,tBTA_AG_FEAT f
 }
 
 /*******************************************************************************
-**
-** Function         BTA_AgDeregister
-**
-** Description      Deregister an audio gateway service.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AgDeregister
+ *
+ * Description      Deregister an audio gateway service.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AgDeregister(uint16_t handle)
 {
     BT_HDR *p_buf = (BT_HDR *)osi_malloc(sizeof(BT_HDR));
@@ -149,18 +149,18 @@ void BTA_AgDeregister(uint16_t handle)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_AgOpen
-**
-** Description      Opens a connection to a headset or hands-free device.
-**                  When connection is open callback function is called
-**                  with a BTA_AG_OPEN_EVT. Only the data connection is
-**                  opened. The audio connection is not opened.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AgOpen
+ *
+ * Description      Opens a connection to a headset or hands-free device.
+ *                  When connection is open callback function is called
+ *                  with a BTA_AG_OPEN_EVT. Only the data connection is
+ *                  opened. The audio connection is not opened.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AgOpen(uint16_t handle, BD_ADDR bd_addr, tBTA_SEC sec_mask, tBTA_SERVICE_MASK services)
 {
     tBTA_AG_API_OPEN *p_buf =
@@ -176,16 +176,16 @@ void BTA_AgOpen(uint16_t handle, BD_ADDR bd_addr, tBTA_SEC sec_mask, tBTA_SERVIC
 }
 
 /*******************************************************************************
-**
-** Function         BTA_AgClose
-**
-** Description      Close the current connection to a headset or a handsfree
-**                  Any current audio connection will also be closed.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AgClose
+ *
+ * Description      Close the current connection to a headset or a handsfree
+ *                  Any current audio connection will also be closed.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AgClose(uint16_t handle)
 {
     BT_HDR *p_buf = (BT_HDR *)osi_malloc(sizeof(BT_HDR));
@@ -197,16 +197,16 @@ void BTA_AgClose(uint16_t handle)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_AgAudioOpen
-**
-** Description      Opens an audio connection to the currently connected
-**                  headset or hnadsfree.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AgAudioOpen
+ *
+ * Description      Opens an audio connection to the currently connected
+ *                  headset or hnadsfree.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AgAudioOpen(uint16_t handle)
 {
     BT_HDR *p_buf = (BT_HDR *)osi_malloc(sizeof(BT_HDR));
@@ -218,16 +218,16 @@ void BTA_AgAudioOpen(uint16_t handle)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_AgAudioClose
-**
-** Description      Close the currently active audio connection to a headset
-**                  or hnadsfree. The data connection remains open
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AgAudioClose
+ *
+ * Description      Close the currently active audio connection to a headset
+ *                  or hnadsfree. The data connection remains open
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AgAudioClose(uint16_t handle)
 {
     BT_HDR  *p_buf = (BT_HDR *)osi_malloc(sizeof(BT_HDR));
@@ -239,17 +239,17 @@ void BTA_AgAudioClose(uint16_t handle)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_AgResult
-**
-** Description      Send an AT result code to a headset or hands-free device.
-**                  This function is only used when the AG parse mode is set
-**                  to BTA_AG_PARSE.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AgResult
+ *
+ * Description      Send an AT result code to a headset or hands-free device.
+ *                  This function is only used when the AG parse mode is set
+ *                  to BTA_AG_PARSE.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AgResult(uint16_t handle, tBTA_AG_RES result, tBTA_AG_RES_DATA *p_data)
 {
     tBTA_AG_API_RESULT *p_buf =
@@ -265,17 +265,17 @@ void BTA_AgResult(uint16_t handle, tBTA_AG_RES result, tBTA_AG_RES_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_AgSetCodec
-**
-** Description      Specify the codec type to be used for the subsequent
-**                  audio connection.
-**
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AgSetCodec
+ *
+ * Description      Specify the codec type to be used for the subsequent
+ *                  audio connection.
+ *
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AgSetCodec(uint16_t handle, tBTA_AG_PEER_CODEC codec)
 {
     tBTA_AG_API_SETCODEC *p_buf =
diff --git a/system/bta/ag/bta_ag_at.cc b/system/bta/ag/bta_ag_at.cc
index 69889a75d2f..904c4195c91 100644
--- a/system/bta/ag/bta_ag_at.cc
+++ b/system/bta/ag/bta_ag_at.cc
@@ -28,19 +28,19 @@
 #include "utl.h"
 
 /*****************************************************************************
-**  Constants
-*****************************************************************************/
+ *  Constants
+ ****************************************************************************/
 
 /******************************************************************************
-**
-** Function         bta_ag_at_init
-**
-** Description      Initialize the AT command parser control block.
-**
-**
-** Returns          void
-**
-******************************************************************************/
+ *
+ * Function         bta_ag_at_init
+ *
+ * Description      Initialize the AT command parser control block.
+ *
+ *
+ * Returns          void
+ *
+ *****************************************************************************/
 void bta_ag_at_init(tBTA_AG_AT_CB *p_cb)
 {
     p_cb->p_cmd_buf = NULL;
@@ -48,17 +48,17 @@ void bta_ag_at_init(tBTA_AG_AT_CB *p_cb)
 }
 
 /******************************************************************************
-**
-** Function         bta_ag_at_reinit
-**
-** Description      Re-initialize the AT command parser control block.  This
-**                  function resets the AT command parser state and frees
-**                  any GKI buffer.
-**
-**
-** Returns          void
-**
-******************************************************************************/
+ *
+ * Function         bta_ag_at_reinit
+ *
+ * Description      Re-initialize the AT command parser control block.  This
+ *                  function resets the AT command parser state and frees
+ *                  any GKI buffer.
+ *
+ *
+ * Returns          void
+ *
+ *****************************************************************************/
 void bta_ag_at_reinit(tBTA_AG_AT_CB *p_cb)
 {
     osi_free_and_reset((void **)&p_cb->p_cmd_buf);
@@ -66,17 +66,17 @@ void bta_ag_at_reinit(tBTA_AG_AT_CB *p_cb)
 }
 
 /******************************************************************************
-**
-** Function         bta_ag_process_at
-**
-** Description      Parse AT commands.  This function will take the input
-**                  character string and parse it for AT commands according to
-**                  the AT command table passed in the control block.
-**
-**
-** Returns          void
-**
-******************************************************************************/
+ *
+ * Function         bta_ag_process_at
+ *
+ * Description      Parse AT commands.  This function will take the input
+ *                  character string and parse it for AT commands according to
+ *                  the AT command table passed in the control block.
+ *
+ *
+ * Returns          void
+ *
+ *****************************************************************************/
 void bta_ag_process_at(tBTA_AG_AT_CB *p_cb)
 {
     uint16_t    idx;
@@ -175,17 +175,17 @@ void bta_ag_process_at(tBTA_AG_AT_CB *p_cb)
 }
 
 /******************************************************************************
-**
-** Function         bta_ag_at_parse
-**
-** Description      Parse AT commands.  This function will take the input
-**                  character string and parse it for AT commands according to
-**                  the AT command table passed in the control block.
-**
-**
-** Returns          void
-**
-******************************************************************************/
+ *
+ * Function         bta_ag_at_parse
+ *
+ * Description      Parse AT commands.  This function will take the input
+ *                  character string and parse it for AT commands according to
+ *                  the AT command table passed in the control block.
+ *
+ *
+ * Returns          void
+ *
+ *****************************************************************************/
 void bta_ag_at_parse(tBTA_AG_AT_CB *p_cb, char *p_buf, uint16_t len)
 {
     int i = 0;
diff --git a/system/bta/ag/bta_ag_at.h b/system/bta/ag/bta_ag_at.h
index 6e451d4e5b4..c75a9663159 100644
--- a/system/bta/ag/bta_ag_at.h
+++ b/system/bta/ag/bta_ag_at.h
@@ -29,8 +29,8 @@ extern "C" {
 #endif
 
 /*****************************************************************************
-**  Constants
-*****************************************************************************/
+ *  Constants
+ ****************************************************************************/
 
 /* AT command argument capabilities */
 #define BTA_AG_AT_NONE          0x01        /* no argument */
@@ -44,8 +44,8 @@ extern "C" {
 #define BTA_AG_AT_INT           1           /* integer */
 
 /*****************************************************************************
-**  Data types
-*****************************************************************************/
+ *  Data types
+ ****************************************************************************/
 
 /* AT command table element */
 typedef struct
@@ -79,47 +79,47 @@ typedef struct
 } tBTA_AG_AT_CB;
 
 /*****************************************************************************
-**  Function prototypes
-*****************************************************************************/
+ *  Function prototypes
+ ****************************************************************************/
 
 /*****************************************************************************
-**
-** Function         bta_ag_at_init
-**
-** Description      Initialize the AT command parser control block.
-**
-**
-** Returns          void
-**
-*****************************************************************************/
+ *
+ * Function         bta_ag_at_init
+ *
+ * Description      Initialize the AT command parser control block.
+ *
+ *
+ * Returns          void
+ *
+ ****************************************************************************/
 extern void bta_ag_at_init(tBTA_AG_AT_CB *p_cb);
 
 /*****************************************************************************
-**
-** Function         bta_ag_at_reinit
-**
-** Description      Re-initialize the AT command parser control block.  This
-**                  function resets the AT command parser state and frees
-**                  any GKI buffer.
-**
-**
-** Returns          void
-**
-*****************************************************************************/
+ *
+ * Function         bta_ag_at_reinit
+ *
+ * Description      Re-initialize the AT command parser control block.  This
+ *                  function resets the AT command parser state and frees
+ *                  any GKI buffer.
+ *
+ *
+ * Returns          void
+ *
+ ****************************************************************************/
 extern void bta_ag_at_reinit(tBTA_AG_AT_CB *p_cb);
 
 /*****************************************************************************
-**
-** Function         bta_ag_at_parse
-**
-** Description      Parse AT commands.  This function will take the input
-**                  character string and parse it for AT commands according to
-**                  the AT command table passed in the control block.
-**
-**
-** Returns          void
-**
-*****************************************************************************/
+ *
+ * Function         bta_ag_at_parse
+ *
+ * Description      Parse AT commands.  This function will take the input
+ *                  character string and parse it for AT commands according to
+ *                  the AT command table passed in the control block.
+ *
+ *
+ * Returns          void
+ *
+ ****************************************************************************/
 extern void bta_ag_at_parse(tBTA_AG_AT_CB *p_cb, char *p_buf, uint16_t len);
 
 #ifdef __cplusplus
diff --git a/system/bta/ag/bta_ag_ci.cc b/system/bta/ag/bta_ag_ci.cc
index 37986154dc6..d1b802e21cb 100644
--- a/system/bta/ag/bta_ag_ci.cc
+++ b/system/bta/ag/bta_ag_ci.cc
@@ -30,16 +30,16 @@
 #include "bt_common.h"
 
 /******************************************************************************
-**
-** Function         bta_ag_ci_rx_write
-**
-** Description      This function is called to send data to the AG when the AG
-**                  is configured for AT command pass-through.  The function
-**                  copies data to an event buffer and sends it.
-**
-** Returns          void
-**
-******************************************************************************/
+ *
+ * Function         bta_ag_ci_rx_write
+ *
+ * Description      This function is called to send data to the AG when the AG
+ *                  is configured for AT command pass-through.  The function
+ *                  copies data to an event buffer and sends it.
+ *
+ * Returns          void
+ *
+ *****************************************************************************/
 void bta_ag_ci_rx_write(uint16_t handle, char *p_data, uint16_t len)
 {
     uint16_t len_remaining = len;
@@ -69,16 +69,16 @@ void bta_ag_ci_rx_write(uint16_t handle, char *p_data, uint16_t len)
 }
 
 /******************************************************************************
-**
-** Function         bta_ag_ci_slc_ready
-**
-** Description      This function is called to notify AG that SLC is up at
-**                  the application. This funcion is only used when the app
-**                  is running in pass-through mode.
-**
-** Returns          void
-**
-******************************************************************************/
+ *
+ * Function         bta_ag_ci_slc_ready
+ *
+ * Description      This function is called to notify AG that SLC is up at
+ *                  the application. This funcion is only used when the app
+ *                  is running in pass-through mode.
+ *
+ * Returns          void
+ *
+ *****************************************************************************/
 void bta_ag_ci_slc_ready(uint16_t handle)
 {
     tBTA_AG_DATA *p_buf = (tBTA_AG_DATA *)osi_malloc(sizeof(tBTA_AG_DATA));
diff --git a/system/bta/ag/bta_ag_cmd.cc b/system/bta/ag/bta_ag_cmd.cc
index a9f8c1c95e0..5a78cb03aa4 100644
--- a/system/bta/ag/bta_ag_cmd.cc
+++ b/system/bta/ag/bta_ag_cmd.cc
@@ -37,8 +37,8 @@
 
 
 /*****************************************************************************
-**  Constants
-*****************************************************************************/
+ *  Constants
+ ****************************************************************************/
 
 /* Ring timeout */
 #define BTA_AG_RING_TIMEOUT_MS  (5 * 1000)      /* 5 seconds */
@@ -215,15 +215,15 @@ static size_t bta_ag_indicator_by_result_code(size_t code)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_send_result
-**
-** Description      Send an AT result code.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_send_result
+ *
+ * Description      Send an AT result code.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_ag_send_result(tBTA_AG_SCB *p_scb, size_t code, const char *p_arg,
                                int16_t int_arg)
 {
@@ -283,31 +283,31 @@ static void bta_ag_send_result(tBTA_AG_SCB *p_scb, size_t code, const char *p_ar
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_send_ok
-**
-** Description      Send an OK result code.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_send_ok
+ *
+ * Description      Send an OK result code.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_ag_send_ok(tBTA_AG_SCB *p_scb)
 {
     bta_ag_send_result(p_scb, BTA_AG_LOCAL_RES_OK, NULL, 0);
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_send_error
-**
-** Description      Send an ERROR result code.
-**                      errcode - used to send verbose errocode
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_send_error
+ *
+ * Description      Send an ERROR result code.
+ *                      errcode - used to send verbose errocode
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_ag_send_error(tBTA_AG_SCB *p_scb, int16_t errcode)
 {
     /* If HFP and extended audio gateway error codes are enabled */
@@ -318,15 +318,15 @@ static void bta_ag_send_error(tBTA_AG_SCB *p_scb, int16_t errcode)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_send_ind
-**
-** Description      Send an indicator CIEV result code.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_send_ind
+ *
+ * Description      Send an indicator CIEV result code.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_ag_send_ind(tBTA_AG_SCB *p_scb, uint16_t id, uint16_t value, bool on_demand)
 {
     char    str[12];
@@ -404,15 +404,15 @@ static void bta_ag_send_ind(tBTA_AG_SCB *p_scb, uint16_t id, uint16_t value, boo
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_parse_cmer
-**
-** Description      Parse AT+CMER parameter string.
-**
-**
-** Returns          true if parsed ok, false otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_parse_cmer
+ *
+ * Description      Parse AT+CMER parameter string.
+ *
+ *
+ * Returns          true if parsed ok, false otherwise.
+ *
+ ******************************************************************************/
 static bool bta_ag_parse_cmer(char *p_s, bool *p_enabled)
 {
     int16_t n[4] = {-1, -1, -1, -1};
@@ -449,16 +449,16 @@ static bool bta_ag_parse_cmer(char *p_s, bool *p_enabled)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_parse_chld
-**
-** Description      Parse AT+CHLD parameter string.
-**
-**
-** Returns          Returns idx (1-7), 0 if ECC not enabled or BTA_AG_INVALID_CHLD
+ *
+ * Function         bta_ag_parse_chld
+ *
+ * Description      Parse AT+CHLD parameter string.
+ *
+ *
+ * Returns          Returns idx (1-7), 0 if ECC not enabled or BTA_AG_INVALID_CHLD
                     if idx doesn't exist/1st character of argument is not a digit
-**
-*******************************************************************************/
+ *
+ ******************************************************************************/
 static uint8_t bta_ag_parse_chld(UNUSED_ATTR tBTA_AG_SCB *p_scb, char *p_s)
 {
     uint8_t retval = 0;
@@ -488,14 +488,14 @@ static uint8_t bta_ag_parse_chld(UNUSED_ATTR tBTA_AG_SCB *p_scb, char *p_s)
 
 #if (BTM_WBS_INCLUDED == TRUE)
 /*******************************************************************************
-**
-** Function         bta_ag_parse_bac
-**
-** Description      Parse AT+BAC parameter string.
-**
-** Returns          Returns bitmap of supported codecs.
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_parse_bac
+ *
+ * Description      Parse AT+BAC parameter string.
+ *
+ * Returns          Returns bitmap of supported codecs.
+ *
+ ******************************************************************************/
 static tBTA_AG_PEER_CODEC bta_ag_parse_bac(tBTA_AG_SCB *p_scb, char *p_s)
 {
     tBTA_AG_PEER_CODEC  retval = BTA_AG_CODEC_NONE;
@@ -538,16 +538,16 @@ static tBTA_AG_PEER_CODEC bta_ag_parse_bac(tBTA_AG_SCB *p_scb, char *p_s)
 #endif
 
 /*******************************************************************************
-**
-** Function         bta_ag_process_unat_res
-**
-** Description      Process the unat response data and remove extra carriage return
-**                  and line feed
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_process_unat_res
+ *
+ * Description      Process the unat response data and remove extra carriage return
+ *                  and line feed
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 
 static void bta_ag_process_unat_res(char *unat_result)
 {
@@ -591,15 +591,15 @@ static void bta_ag_process_unat_res(char *unat_result)
 
 
 /*******************************************************************************
-**
-** Function         bta_ag_inband_enabled
-**
-** Description      Determine whether in-band ring can be used.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_inband_enabled
+ *
+ * Description      Determine whether in-band ring can be used.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 bool bta_ag_inband_enabled(tBTA_AG_SCB *p_scb)
 {
     /* if feature is enabled and no other scbs connected */
@@ -614,15 +614,15 @@ bool bta_ag_inband_enabled(tBTA_AG_SCB *p_scb)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_send_call_inds
-**
-** Description      Send call and callsetup indicators.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_send_call_inds
+ *
+ * Description      Send call and callsetup indicators.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_send_call_inds(tBTA_AG_SCB *p_scb, tBTA_AG_RES result)
 {
     uint8_t call = p_scb->call_ind;
@@ -650,15 +650,15 @@ void bta_ag_send_call_inds(tBTA_AG_SCB *p_scb, tBTA_AG_RES result)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_at_hsp_cback
-**
-** Description      AT command processing callback for HSP.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_at_hsp_cback
+ *
+ * Description      AT command processing callback for HSP.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_at_hsp_cback(tBTA_AG_SCB *p_scb, uint16_t command_id, uint8_t arg_type,
                                 char *p_arg, int16_t int_arg)
 {
@@ -678,17 +678,17 @@ void bta_ag_at_hsp_cback(tBTA_AG_SCB *p_scb, uint16_t command_id, uint8_t arg_ty
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_find_empty_hf_ind)
-**
-** Description      This function returns the index of an empty HF indicator
-**                  structure.
-**
-** Returns          int : index of the empty HF indicator structure or
-**                            -1 if no empty indicator
-**                            is available.
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_find_empty_hf_ind)
+ *
+ * Description      This function returns the index of an empty HF indicator
+ *                  structure.
+ *
+ * Returns          int : index of the empty HF indicator structure or
+ *                            -1 if no empty indicator
+ *                            is available.
+ *
+ ******************************************************************************/
 static int bta_ag_find_empty_hf_ind(tBTA_AG_SCB *p_scb)
 {
     for (int index = 0; index < BTA_AG_MAX_NUM_PEER_HF_IND; index++)
@@ -702,17 +702,17 @@ static int bta_ag_find_empty_hf_ind(tBTA_AG_SCB *p_scb)
 
 
 /*******************************************************************************
-**
-** Function         bta_ag_find_hf_ind_by_id
-**
-** Description      This function returns the index of the HF indicator
-**                  structure by the indicator id
-**
-** Returns          int : index of the HF indicator structure
-**                            -1 if the indicator
-**                            was not found.
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_find_hf_ind_by_id
+ *
+ * Description      This function returns the index of the HF indicator
+ *                  structure by the indicator id
+ *
+ * Returns          int : index of the HF indicator structure
+ *                            -1 if the indicator
+ *                            was not found.
+ *
+ ******************************************************************************/
 static int bta_ag_find_hf_ind_by_id(tBTA_AG_HF_IND *p_hf_ind, int size, uint32_t ind_id)
 {
     for (int index = 0; index < size; index++)
@@ -725,14 +725,14 @@ static int bta_ag_find_hf_ind_by_id(tBTA_AG_HF_IND *p_hf_ind, int size, uint32_t
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_parse_bind_set
-**
-** Description      Parse AT+BIND set command and save the indicators
-**
-** Returns          true if successful
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_parse_bind_set
+ *
+ * Description      Parse AT+BIND set command and save the indicators
+ *
+ * Returns          true if successful
+ *
+ ******************************************************************************/
 static bool bta_ag_parse_bind_set(tBTA_AG_SCB *p_scb, tBTA_AG_VAL val)
 {
     char *p_token = strtok(val.str, ",");
@@ -759,15 +759,15 @@ static bool bta_ag_parse_bind_set(tBTA_AG_SCB *p_scb, tBTA_AG_VAL val)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_bind_response
-**
-** Description      Send response for the AT+BIND command (HFP 1.7) received
-**                  from the headset based on the argument types.
-**
-** Returns          Void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_bind_response
+ *
+ * Description      Send response for the AT+BIND command (HFP 1.7) received
+ *                  from the headset based on the argument types.
+ *
+ * Returns          Void
+ *
+ ******************************************************************************/
 static void bta_ag_bind_response(tBTA_AG_SCB *p_scb, uint8_t arg_type)
 {
     char buffer[BTA_AG_AT_MAX_LEN];
@@ -842,15 +842,15 @@ static void bta_ag_bind_response(tBTA_AG_SCB *p_scb, uint8_t arg_type)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_parse_biev_response
-**
-** Description      Send response for AT+BIEV command (HFP 1.7) received from
-**                  the headset based on the argument types.
-**
-** Returns          true if the response was parsed successfully
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_parse_biev_response
+ *
+ * Description      Send response for AT+BIEV command (HFP 1.7) received from
+ *                  the headset based on the argument types.
+ *
+ * Returns          true if the response was parsed successfully
+ *
+ ******************************************************************************/
 static bool bta_ag_parse_biev_response(tBTA_AG_SCB *p_scb, tBTA_AG_VAL *val)
 {
     char *p_token = strtok(val->str, ",");
@@ -894,15 +894,15 @@ static bool bta_ag_parse_biev_response(tBTA_AG_SCB *p_scb, tBTA_AG_VAL *val)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_at_hfp_cback
-**
-** Description      AT command processing callback for HFP.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_at_hfp_cback
+ *
+ * Description      AT command processing callback for HFP.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_at_hfp_cback(tBTA_AG_SCB *p_scb, uint16_t cmd, uint8_t arg_type,
                                 char *p_arg, int16_t int_arg)
 {
@@ -1381,15 +1381,15 @@ void bta_ag_at_hfp_cback(tBTA_AG_SCB *p_scb, uint16_t cmd, uint8_t arg_type,
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_at_err_cback
-**
-** Description      AT command parser error callback.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_at_err_cback
+ *
+ * Description      AT command parser error callback.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_at_err_cback(tBTA_AG_SCB *p_scb, bool unknown, char *p_arg)
 {
     tBTA_AG_VAL     val;
@@ -1418,15 +1418,15 @@ void bta_ag_at_err_cback(tBTA_AG_SCB *p_scb, bool unknown, char *p_arg)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_hsp_result
-**
-** Description      Handle API result for HSP connections.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_hsp_result
+ *
+ * Description      Handle API result for HSP connections.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_hsp_result(tBTA_AG_SCB *p_scb, tBTA_AG_API_RESULT *p_result)
 {
     APPL_TRACE_DEBUG("bta_ag_hsp_result : res = %d", p_result->result);
@@ -1528,15 +1528,15 @@ void bta_ag_hsp_result(tBTA_AG_SCB *p_scb, tBTA_AG_API_RESULT *p_result)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_hfp_result
-**
-** Description      Handle API result for HFP connections.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_hfp_result
+ *
+ * Description      Handle API result for HFP connections.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_hfp_result(tBTA_AG_SCB *p_scb, tBTA_AG_API_RESULT *p_result)
 {
     APPL_TRACE_DEBUG("bta_ag_hfp_result : res = %d", p_result->result);
@@ -1843,15 +1843,15 @@ void bta_ag_hfp_result(tBTA_AG_SCB *p_scb, tBTA_AG_API_RESULT *p_result)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_result
-**
-** Description      Handle API result.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_result
+ *
+ * Description      Handle API result.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_result(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
 {
     if (p_scb->conn_service == BTA_AG_HSP)
@@ -1866,14 +1866,14 @@ void bta_ag_result(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
 
 #if (BTM_WBS_INCLUDED == TRUE)
 /*******************************************************************************
-**
-** Function         bta_ag_send_bcs
-**
-** Description      Send +BCS AT command to peer.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_send_bcs
+ *
+ * Description      Send +BCS AT command to peer.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_send_bcs(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
 {
     uint16_t codec_uuid;
@@ -1904,15 +1904,15 @@ void bta_ag_send_bcs(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
 #endif
 
 /*******************************************************************************
-**
-** Function         bta_ag_send_ring
-**
-** Description      Send RING result code to peer.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_send_ring
+ *
+ * Description      Send RING result code to peer.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_send_ring(tBTA_AG_SCB *p_scb, UNUSED_ATTR tBTA_AG_DATA *p_data)
 {
     /* send RING */
diff --git a/system/bta/ag/bta_ag_int.h b/system/bta/ag/bta_ag_int.h
index a17c78c42bd..870d9feca66 100644
--- a/system/bta/ag/bta_ag_int.h
+++ b/system/bta/ag/bta_ag_int.h
@@ -34,8 +34,8 @@ extern "C" {
 #endif
 
 /*****************************************************************************
-**  Constants
-*****************************************************************************/
+ *  Constants
+ ****************************************************************************/
 /* Number of SCBs (AG service instances that can be registered) */
 #ifndef BTA_AG_NUM_SCB
 #define BTA_AG_NUM_SCB          2
@@ -139,8 +139,8 @@ enum
 };
 
 /*****************************************************************************
-**  Data types
-*****************************************************************************/
+ *  Data types
+ ****************************************************************************/
 
 /* data type for BTA_AG_API_ENABLE_EVT */
 typedef struct
@@ -320,8 +320,8 @@ typedef struct
 } tBTA_AG_CB;
 
 /*****************************************************************************
-**  Global data
-*****************************************************************************/
+ *  Global data
+ ****************************************************************************/
 
 /* constant lookup tables */
 extern const uint16_t bta_ag_uuid[BTA_AG_NUM_IDX];
@@ -336,8 +336,8 @@ extern tBTA_AG_CFG *p_bta_ag_cfg;
 extern const tBTA_AG_HF_IND bta_ag_local_hf_ind_cfg[];
 
 /*****************************************************************************
-**  Function prototypes
-*****************************************************************************/
+ *  Function prototypes
+ ****************************************************************************/
 
 /* main functions */
 extern void bta_ag_scb_dealloc(tBTA_AG_SCB *p_scb);
diff --git a/system/bta/ag/bta_ag_main.cc b/system/bta/ag/bta_ag_main.cc
index dc723f6f912..28810c5e566 100644
--- a/system/bta/ag/bta_ag_main.cc
+++ b/system/bta/ag/bta_ag_main.cc
@@ -31,8 +31,8 @@
 #include "utl.h"
 
 /*****************************************************************************
-** Constants and types
-*****************************************************************************/
+ * Constants and types
+ ****************************************************************************/
 #ifndef BTA_AG_DEBUG
 #define BTA_AG_DEBUG FALSE
 #endif
@@ -267,22 +267,22 @@ const tBTA_AG_ST_TBL bta_ag_st_tbl[] =
 };
 
 /*****************************************************************************
-** Global data
-*****************************************************************************/
+ * Global data
+ ****************************************************************************/
 
 /* AG control block */
 tBTA_AG_CB  bta_ag_cb;
 
 /*******************************************************************************
-**
-** Function         bta_ag_scb_alloc
-**
-** Description      Allocate an AG service control block.
-**
-**
-** Returns          pointer to the scb, or NULL if none could be allocated.
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_scb_alloc
+ *
+ * Description      Allocate an AG service control block.
+ *
+ *
+ * Returns          pointer to the scb, or NULL if none could be allocated.
+ *
+ ******************************************************************************/
 static tBTA_AG_SCB *bta_ag_scb_alloc(void)
 {
     tBTA_AG_SCB     *p_scb = &bta_ag_cb.scb[0];
@@ -324,15 +324,15 @@ static tBTA_AG_SCB *bta_ag_scb_alloc(void)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_scb_dealloc
-**
-** Description      Deallocate a service control block.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_scb_dealloc
+ *
+ * Description      Deallocate a service control block.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_scb_dealloc(tBTA_AG_SCB *p_scb)
 {
     uint8_t   idx;
@@ -372,15 +372,15 @@ void bta_ag_scb_dealloc(tBTA_AG_SCB *p_scb)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_scb_to_idx
-**
-** Description      Given a pointer to an scb, return its index.
-**
-**
-** Returns          Index of scb.
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_scb_to_idx
+ *
+ * Description      Given a pointer to an scb, return its index.
+ *
+ *
+ * Returns          Index of scb.
+ *
+ ******************************************************************************/
 uint16_t bta_ag_scb_to_idx(tBTA_AG_SCB *p_scb)
 {
     /* use array arithmetic to determine index */
@@ -388,15 +388,15 @@ uint16_t bta_ag_scb_to_idx(tBTA_AG_SCB *p_scb)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_scb_by_idx
-**
-** Description      Given an scb index return pointer to scb.
-**
-**
-** Returns          Pointer to scb or NULL if not allocated.
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_scb_by_idx
+ *
+ * Description      Given an scb index return pointer to scb.
+ *
+ *
+ * Returns          Pointer to scb or NULL if not allocated.
+ *
+ ******************************************************************************/
 tBTA_AG_SCB *bta_ag_scb_by_idx(uint16_t idx)
 {
     tBTA_AG_SCB     *p_scb;
@@ -420,15 +420,15 @@ tBTA_AG_SCB *bta_ag_scb_by_idx(uint16_t idx)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_service_to_idx
-**
-** Description      Given a BTA service mask convert to profile index.
-**
-**
-** Returns          Profile ndex of scb.
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_service_to_idx
+ *
+ * Description      Given a BTA service mask convert to profile index.
+ *
+ *
+ * Returns          Profile ndex of scb.
+ *
+ ******************************************************************************/
 uint8_t bta_ag_service_to_idx(tBTA_SERVICE_MASK services)
 {
     if (services & BTA_HFP_SERVICE_MASK)
@@ -442,15 +442,15 @@ uint8_t bta_ag_service_to_idx(tBTA_SERVICE_MASK services)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_idx_by_bdaddr
-**
-** Description      Find SCB associated with peer BD address.
-**
-**
-** Returns          Index of SCB or zero if none found.
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_idx_by_bdaddr
+ *
+ * Description      Find SCB associated with peer BD address.
+ *
+ *
+ * Returns          Index of SCB or zero if none found.
+ *
+ ******************************************************************************/
 uint16_t bta_ag_idx_by_bdaddr(BD_ADDR peer_addr)
 {
     tBTA_AG_SCB     *p_scb = &bta_ag_cb.scb[0];
@@ -473,15 +473,15 @@ uint16_t bta_ag_idx_by_bdaddr(BD_ADDR peer_addr)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_other_scb_open
-**
-** Description      Check whether any other scb is in open state.
-**
-**
-** Returns          true if another scb is in open state, false otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_other_scb_open
+ *
+ * Description      Check whether any other scb is in open state.
+ *
+ *
+ * Returns          true if another scb is in open state, false otherwise.
+ *
+ ******************************************************************************/
 bool bta_ag_other_scb_open(tBTA_AG_SCB *p_curr_scb)
 {
     tBTA_AG_SCB     *p_scb = &bta_ag_cb.scb[0];
@@ -501,15 +501,15 @@ bool bta_ag_other_scb_open(tBTA_AG_SCB *p_curr_scb)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_scb_open
-**
-** Description      Check whether given scb is in open state.
-**
-**
-** Returns          true if scb is in open state, false otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_scb_open
+ *
+ * Description      Check whether given scb is in open state.
+ *
+ *
+ * Returns          true if scb is in open state, false otherwise.
+ *
+ ******************************************************************************/
 bool bta_ag_scb_open(tBTA_AG_SCB *p_curr_scb)
 {
     if (p_curr_scb && p_curr_scb->in_use && p_curr_scb->state == BTA_AG_OPEN_ST)
@@ -521,15 +521,15 @@ bool bta_ag_scb_open(tBTA_AG_SCB *p_curr_scb)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_get_other_idle_scb
-**
-** Description      Return other scb if it is in INIT st.
-**
-**
-** Returns          Pointer to other scb if INIT st, NULL otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_get_other_idle_scb
+ *
+ * Description      Return other scb if it is in INIT st.
+ *
+ *
+ * Returns          Pointer to other scb if INIT st, NULL otherwise.
+ *
+ ******************************************************************************/
 tBTA_AG_SCB *bta_ag_get_other_idle_scb (tBTA_AG_SCB *p_curr_scb)
 {
     tBTA_AG_SCB     *p_scb = &bta_ag_cb.scb[0];
@@ -549,15 +549,15 @@ tBTA_AG_SCB *bta_ag_get_other_idle_scb (tBTA_AG_SCB *p_curr_scb)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_collision_timer_cback
-**
-** Description      AG connection collision timer callback
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_collision_timer_cback
+ *
+ * Description      AG connection collision timer callback
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_ag_collision_timer_cback(void *data)
 {
     tBTA_AG_SCB *p_scb = (tBTA_AG_SCB *)data;
@@ -570,15 +570,15 @@ static void bta_ag_collision_timer_cback(void *data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_collision_cback
-**
-** Description      Get notified about collision.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_collision_cback
+ *
+ * Description      Get notified about collision.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_collision_cback (UNUSED_ATTR tBTA_SYS_CONN_STATUS status, uint8_t id,
                                     UNUSED_ATTR uint8_t app_id, BD_ADDR peer_addr)
 {
@@ -626,15 +626,15 @@ void bta_ag_collision_cback (UNUSED_ATTR tBTA_SYS_CONN_STATUS status, uint8_t id
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_resume_open
-**
-** Description      Resume opening process.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_resume_open
+ *
+ * Description      Resume opening process.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_resume_open (tBTA_AG_SCB *p_scb)
 {
     if (p_scb)
@@ -655,15 +655,15 @@ void bta_ag_resume_open (tBTA_AG_SCB *p_scb)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_api_enable
-**
-** Description      Handle an API enable event.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_api_enable
+ *
+ * Description      Handle an API enable event.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_ag_api_enable(tBTA_AG_DATA *p_data)
 {
     /* initialize control block */
@@ -690,15 +690,15 @@ static void bta_ag_api_enable(tBTA_AG_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_api_disable
-**
-** Description      Handle an API disable event.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_api_disable
+ *
+ * Description      Handle an API disable event.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_ag_api_disable(tBTA_AG_DATA *p_data)
 {
     /* deregister all scbs in use */
@@ -734,15 +734,15 @@ static void bta_ag_api_disable(tBTA_AG_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_api_register
-**
-** Description      Handle an API event registers a new service.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_api_register
+ *
+ * Description      Handle an API event registers a new service.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_ag_api_register(tBTA_AG_DATA *p_data)
 {
     tBTA_AG_SCB     *p_scb;
@@ -762,15 +762,15 @@ static void bta_ag_api_register(tBTA_AG_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_api_result
-**
-** Description      Handle an API result event.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_api_result
+ *
+ * Description      Handle an API result event.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_ag_api_result(tBTA_AG_DATA *p_data)
 {
     tBTA_AG_SCB     *p_scb;
@@ -798,15 +798,15 @@ static void bta_ag_api_result(tBTA_AG_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_sm_execute
-**
-** Description      State machine event handling function for AG
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_sm_execute
+ *
+ * Description      State machine event handling function for AG
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_sm_execute(tBTA_AG_SCB *p_scb, uint16_t event, tBTA_AG_DATA *p_data)
 {
     tBTA_AG_ST_TBL      state_table;
@@ -867,15 +867,15 @@ void bta_ag_sm_execute(tBTA_AG_SCB *p_scb, uint16_t event, tBTA_AG_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_hdl_event
-**
-** Description      Data gateway main event handling function.
-**
-**
-** Returns          bool
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_hdl_event
+ *
+ * Description      Data gateway main event handling function.
+ *
+ *
+ * Returns          bool
+ *
+ ******************************************************************************/
 bool bta_ag_hdl_event(BT_HDR *p_msg)
 {
     tBTA_AG_SCB *p_scb;
diff --git a/system/bta/ag/bta_ag_rfc.cc b/system/bta/ag/bta_ag_rfc.cc
index a7aa306ea2a..f4a299feecd 100644
--- a/system/bta/ag/bta_ag_rfc.cc
+++ b/system/bta/ag/bta_ag_rfc.cc
@@ -77,15 +77,15 @@ const tBTA_AG_DATA_CBACK bta_ag_data_cback_tbl[] =
 };
 
 /*******************************************************************************
-**
-** Function         bta_ag_port_cback
-**
-** Description      RFCOMM Port callback
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_port_cback
+ *
+ * Description      RFCOMM Port callback
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_ag_port_cback(UNUSED_ATTR uint32_t code, uint16_t port_handle,
                               uint16_t handle)
 {
@@ -109,15 +109,15 @@ static void bta_ag_port_cback(UNUSED_ATTR uint32_t code, uint16_t port_handle,
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_mgmt_cback
-**
-** Description      RFCOMM management callback
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_mgmt_cback
+ *
+ * Description      RFCOMM management callback
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_ag_mgmt_cback(uint32_t code, uint16_t port_handle, uint16_t handle)
 {
     tBTA_AG_SCB  *p_scb;
@@ -180,15 +180,15 @@ static void bta_ag_mgmt_cback(uint32_t code, uint16_t port_handle, uint16_t hand
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_data_cback
-**
-** Description      RFCOMM data callback
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_data_cback
+ *
+ * Description      RFCOMM data callback
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static int bta_ag_data_cback(UNUSED_ATTR uint16_t port_handle, void *p_data,
                              uint16_t len, uint16_t handle)
 {
@@ -198,17 +198,17 @@ static int bta_ag_data_cback(UNUSED_ATTR uint16_t port_handle, void *p_data,
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_port_cback_1 to 3
-**                  bta_ag_mgmt_cback_1 to 3
-**
-** Description      RFCOMM callback functions.  This is an easy way to
-**                  distinguish scb from the callback.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_port_cback_1 to 3
+ *                  bta_ag_mgmt_cback_1 to 3
+ *
+ * Description      RFCOMM callback functions.  This is an easy way to
+ *                  distinguish scb from the callback.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_mgmt_cback_1(uint32_t code, uint16_t handle) {bta_ag_mgmt_cback(code, handle, 1);}
 void bta_ag_mgmt_cback_2(uint32_t code, uint16_t handle) {bta_ag_mgmt_cback(code, handle, 2);}
 void bta_ag_mgmt_cback_3(uint32_t code, uint16_t handle) {bta_ag_mgmt_cback(code, handle, 3);}
@@ -217,16 +217,16 @@ void bta_ag_port_cback_2(uint32_t code, uint16_t handle) {bta_ag_port_cback(code
 void bta_ag_port_cback_3(uint32_t code, uint16_t handle) {bta_ag_port_cback(code, handle, 3);}
 
 /*******************************************************************************
-**
-** Function         bta_ag_data_cback_1 to 3
-**
-** Description      RFCOMM data callback functions.  This is an easy way to
-**                  distinguish scb from the callback.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_data_cback_1 to 3
+ *
+ * Description      RFCOMM data callback functions.  This is an easy way to
+ *                  distinguish scb from the callback.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 int bta_ag_data_cback_1(uint16_t port_handle, void *p_data, uint16_t len)
 {
     return bta_ag_data_cback(port_handle, p_data, len, 1);
@@ -241,15 +241,15 @@ int bta_ag_data_cback_3(uint16_t port_handle, void *p_data, uint16_t len)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_setup_port
-**
-** Description      Setup RFCOMM port for use by AG.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_setup_port
+ *
+ * Description      Setup RFCOMM port for use by AG.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_setup_port(tBTA_AG_SCB *p_scb, uint16_t handle)
 {
     uint16_t i = bta_ag_scb_to_idx(p_scb) - 1;
@@ -265,15 +265,15 @@ void bta_ag_setup_port(tBTA_AG_SCB *p_scb, uint16_t handle)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_start_servers
-**
-** Description      Setup RFCOMM servers for use by AG.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_start_servers
+ *
+ * Description      Setup RFCOMM servers for use by AG.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_start_servers(tBTA_AG_SCB *p_scb, tBTA_SERVICE_MASK services)
 {
     int i;
@@ -306,15 +306,15 @@ void bta_ag_start_servers(tBTA_AG_SCB *p_scb, tBTA_SERVICE_MASK services)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_close_servers
-**
-** Description      Close RFCOMM servers port for use by AG.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_close_servers
+ *
+ * Description      Close RFCOMM servers port for use by AG.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_close_servers(tBTA_AG_SCB *p_scb, tBTA_SERVICE_MASK services)
 {
     int i;
@@ -332,15 +332,15 @@ void bta_ag_close_servers(tBTA_AG_SCB *p_scb, tBTA_SERVICE_MASK services)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_is_server_closed
-**
-** Description      Returns true if all servers are closed.
-**
-**
-** Returns          true if all servers are closed, false otherwise
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_is_server_closed
+ *
+ * Description      Returns true if all servers are closed.
+ *
+ *
+ * Returns          true if all servers are closed, false otherwise
+ *
+ ******************************************************************************/
 bool bta_ag_is_server_closed (tBTA_AG_SCB *p_scb)
 {
     uint8_t xx;
@@ -356,15 +356,15 @@ bool bta_ag_is_server_closed (tBTA_AG_SCB *p_scb)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_rfc_do_open
-**
-** Description      Open an RFCOMM connection to the peer device.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_rfc_do_open
+ *
+ * Description      Open an RFCOMM connection to the peer device.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_rfc_do_open(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
 {
     BTM_SetSecurityLevel(true, "", bta_ag_sec_id[p_scb->conn_service],
@@ -385,15 +385,15 @@ void bta_ag_rfc_do_open(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_rfc_do_close
-**
-** Description      Close RFCOMM connection.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_rfc_do_close
+ *
+ * Description      Close RFCOMM connection.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_rfc_do_close(tBTA_AG_SCB *p_scb,
                          UNUSED_ATTR tBTA_AG_DATA *p_data)
 {
diff --git a/system/bta/ag/bta_ag_sco.cc b/system/bta/ag/bta_ag_sco.cc
index 59b6ab583b0..6f955e35d97 100644
--- a/system/bta/ag/bta_ag_sco.cc
+++ b/system/bta/ag/bta_ag_sco.cc
@@ -144,15 +144,15 @@ static const tBTM_ESCO_PARAMS bta_ag_esco_params =
 #endif
 
 /*******************************************************************************
-**
-** Function         bta_ag_sco_conn_cback
-**
-** Description      BTM SCO connection callback.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_sco_conn_cback
+ *
+ * Description      BTM SCO connection callback.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_ag_sco_conn_cback(uint16_t sco_idx)
 {
     uint16_t  handle;
@@ -187,15 +187,15 @@ static void bta_ag_sco_conn_cback(uint16_t sco_idx)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_sco_disc_cback
-**
-** Description      BTM SCO disconnection callback.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_sco_disc_cback
+ *
+ * Description      BTM SCO disconnection callback.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_ag_sco_disc_cback(uint16_t sco_idx)
 {
     uint16_t  handle = 0;
@@ -274,15 +274,15 @@ static void bta_ag_sco_disc_cback(uint16_t sco_idx)
 }
 #if (BTM_SCO_HCI_INCLUDED == TRUE)
 /*******************************************************************************
-**
-** Function         bta_ag_sco_read_cback
-**
-** Description      Callback function is the callback function for incoming
-**                  SCO data over HCI.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_sco_read_cback
+ *
+ * Description      Callback function is the callback function for incoming
+ *                  SCO data over HCI.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_ag_sco_read_cback (uint16_t sco_inx, BT_HDR *p_data, tBTM_SCO_DATA_FLAG status)
 {
     if (status != BTM_SCO_DATA_CORRECT)
@@ -295,15 +295,15 @@ static void bta_ag_sco_read_cback (uint16_t sco_inx, BT_HDR *p_data, tBTM_SCO_DA
 }
 #endif
 /*******************************************************************************
-**
-** Function         bta_ag_remove_sco
-**
-** Description      Removes the specified SCO from the system.
-**                  If only_active is true, then SCO is only removed if connected
-**
-** Returns          bool   - true if Sco removal was started
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_remove_sco
+ *
+ * Description      Removes the specified SCO from the system.
+ *                  If only_active is true, then SCO is only removed if connected
+ *
+ * Returns          bool   - true if Sco removal was started
+ *
+ ******************************************************************************/
 static bool bta_ag_remove_sco(tBTA_AG_SCB *p_scb, bool only_active)
 {
     bool        removed_started = false;
@@ -336,15 +336,15 @@ static bool bta_ag_remove_sco(tBTA_AG_SCB *p_scb, bool only_active)
 
 
 /*******************************************************************************
-**
-** Function         bta_ag_esco_connreq_cback
-**
-** Description      BTM eSCO connection requests and eSCO change requests
-**                  Only the connection requests are processed by BTA.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_esco_connreq_cback
+ *
+ * Description      BTM eSCO connection requests and eSCO change requests
+ *                  Only the connection requests are processed by BTA.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_ag_esco_connreq_cback(tBTM_ESCO_EVT event, tBTM_ESCO_EVT_DATA *p_data)
 {
     tBTA_AG_SCB         *p_scb;
@@ -404,15 +404,15 @@ static void bta_ag_esco_connreq_cback(tBTM_ESCO_EVT event, tBTM_ESCO_EVT_DATA *p
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_cback_sco
-**
-** Description      Call application callback function with SCO event.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_cback_sco
+ *
+ * Description      Call application callback function with SCO event.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_ag_cback_sco(tBTA_AG_SCB *p_scb, uint8_t event)
 {
     tBTA_AG_HDR    sco;
@@ -425,15 +425,15 @@ static void bta_ag_cback_sco(tBTA_AG_SCB *p_scb, uint8_t event)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_create_sco
-**
-** Description
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_create_sco
+ *
+ * Description
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_ag_create_sco(tBTA_AG_SCB *p_scb, bool is_orig)
 {
     tBTM_STATUS       status;
@@ -613,15 +613,15 @@ static void bta_ag_create_sco(tBTA_AG_SCB *p_scb, bool is_orig)
 
 #if (BTM_WBS_INCLUDED == TRUE)
 /*******************************************************************************
-**
-** Function         bta_ag_attempt_msbc_safe_settings
-**
-** Description    Checks if ESCO connection needs to be attempted using mSBC T1(safe) settings
-**
-**
-** Returns          true if T1 settings has to be used, false otherwise
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_attempt_msbc_safe_settings
+ *
+ * Description    Checks if ESCO connection needs to be attempted using mSBC T1(safe) settings
+ *
+ *
+ * Returns          true if T1 settings has to be used, false otherwise
+ *
+ ******************************************************************************/
 bool bta_ag_attempt_msbc_safe_settings(tBTA_AG_SCB *p_scb)
 {
     if (p_scb->svc_conn && p_scb->sco_codec == BTM_SCO_CODEC_MSBC &&
@@ -632,15 +632,15 @@ bool bta_ag_attempt_msbc_safe_settings(tBTA_AG_SCB *p_scb)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_codec_negotiation_timer_cback
-**
-** Description
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_codec_negotiation_timer_cback
+ *
+ * Description
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_ag_codec_negotiation_timer_cback(void *data)
 {
     tBTA_AG_SCB *p_scb = (tBTA_AG_SCB *)data;
@@ -653,15 +653,15 @@ static void bta_ag_codec_negotiation_timer_cback(void *data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_codec_negotiate
-**
-** Description      Initiate codec negotiation by sending AT command.
-**                  If not necessary, skip negotiation.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_codec_negotiate
+ *
+ * Description      Initiate codec negotiation by sending AT command.
+ *                  If not necessary, skip negotiation.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_codec_negotiate(tBTA_AG_SCB *p_scb)
 {
     bta_ag_cb.sco.p_curr_scb = p_scb;
@@ -693,15 +693,15 @@ void bta_ag_codec_negotiate(tBTA_AG_SCB *p_scb)
 #endif /* (BTM_WBS_INCLUDED == TRUE) */
 
 /*******************************************************************************
-**
-** Function         bta_ag_sco_event
-**
-** Description
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_sco_event
+ *
+ * Description
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_ag_sco_event(tBTA_AG_SCB *p_scb, uint8_t event)
 {
     tBTA_AG_SCO_CB *p_sco = &bta_ag_cb.sco;
@@ -1281,15 +1281,15 @@ static void bta_ag_sco_event(tBTA_AG_SCB *p_scb, uint8_t event)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_sco_is_open
-**
-** Description      Check if sco is open for this scb.
-**
-**
-** Returns          true if sco open for this scb, false otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_sco_is_open
+ *
+ * Description      Check if sco is open for this scb.
+ *
+ *
+ * Returns          true if sco open for this scb, false otherwise.
+ *
+ ******************************************************************************/
 bool bta_ag_sco_is_open(tBTA_AG_SCB *p_scb)
 {
     return ((bta_ag_cb.sco.state == BTA_AG_SCO_OPEN_ST) &&
@@ -1297,15 +1297,15 @@ bool bta_ag_sco_is_open(tBTA_AG_SCB *p_scb)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_sco_is_opening
-**
-** Description      Check if sco is in Opening state.
-**
-**
-** Returns          true if sco is in Opening state for this scb, false otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_sco_is_opening
+ *
+ * Description      Check if sco is in Opening state.
+ *
+ *
+ * Returns          true if sco is in Opening state for this scb, false otherwise.
+ *
+ ******************************************************************************/
 bool bta_ag_sco_is_opening(tBTA_AG_SCB *p_scb)
 {
     return ((bta_ag_cb.sco.state == BTA_AG_SCO_OPENING_ST) &&
@@ -1313,15 +1313,15 @@ bool bta_ag_sco_is_opening(tBTA_AG_SCB *p_scb)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_sco_listen
-**
-** Description
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_sco_listen
+ *
+ * Description
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_sco_listen(tBTA_AG_SCB *p_scb,
                        UNUSED_ATTR tBTA_AG_DATA *p_data)
 {
@@ -1329,15 +1329,15 @@ void bta_ag_sco_listen(tBTA_AG_SCB *p_scb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_sco_open
-**
-** Description
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_sco_open
+ *
+ * Description
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_sco_open(tBTA_AG_SCB *p_scb,
                      UNUSED_ATTR tBTA_AG_DATA *p_data)
 {
@@ -1358,15 +1358,15 @@ void bta_ag_sco_open(tBTA_AG_SCB *p_scb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_sco_close
-**
-** Description
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_sco_close
+ *
+ * Description
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_sco_close(tBTA_AG_SCB *p_scb,
                       UNUSED_ATTR tBTA_AG_DATA *p_data)
 {
@@ -1386,15 +1386,15 @@ void bta_ag_sco_close(tBTA_AG_SCB *p_scb,
 #if (BTM_WBS_INCLUDED == TRUE)
 
 /*******************************************************************************
-**
-** Function         bta_ag_sco_codec_nego
-**
-** Description
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_sco_codec_nego
+ *
+ * Description
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_sco_codec_nego(tBTA_AG_SCB *p_scb, bool result)
 {
     if(result == true)
@@ -1410,15 +1410,15 @@ void bta_ag_sco_codec_nego(tBTA_AG_SCB *p_scb, bool result)
 #endif
 
 /*******************************************************************************
-**
-** Function         bta_ag_sco_shutdown
-**
-** Description
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_sco_shutdown
+ *
+ * Description
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_sco_shutdown(tBTA_AG_SCB *p_scb,
                          UNUSED_ATTR tBTA_AG_DATA *p_data)
 {
@@ -1426,15 +1426,15 @@ void bta_ag_sco_shutdown(tBTA_AG_SCB *p_scb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_sco_conn_open
-**
-** Description
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_sco_conn_open
+ *
+ * Description
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_sco_conn_open(tBTA_AG_SCB *p_scb,
                           UNUSED_ATTR tBTA_AG_DATA *p_data)
 {
@@ -1465,15 +1465,15 @@ void bta_ag_sco_conn_open(tBTA_AG_SCB *p_scb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_sco_conn_close
-**
-** Description
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_sco_conn_close
+ *
+ * Description
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_sco_conn_close(tBTA_AG_SCB *p_scb,
                            UNUSED_ATTR tBTA_AG_DATA *p_data)
 {
@@ -1536,15 +1536,15 @@ void bta_ag_sco_conn_close(tBTA_AG_SCB *p_scb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_sco_conn_rsp
-**
-** Description      Process the SCO connection request
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_sco_conn_rsp
+ *
+ * Description      Process the SCO connection request
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_sco_conn_rsp(tBTA_AG_SCB *p_scb, tBTM_ESCO_CONN_REQ_EVT_DATA *p_data)
 {
     tBTM_ESCO_PARAMS    resp;
@@ -1620,15 +1620,15 @@ void bta_ag_sco_conn_rsp(tBTA_AG_SCB *p_scb, tBTM_ESCO_CONN_REQ_EVT_DATA *p_data
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_ci_sco_data
-**
-** Description      Process the SCO data ready callin event
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_ci_sco_data
+ *
+ * Description      Process the SCO data ready callin event
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_ci_sco_data(UNUSED_ATTR tBTA_AG_SCB *p_scb,
                         UNUSED_ATTR tBTA_AG_DATA *p_data)
 {
@@ -1638,15 +1638,15 @@ void bta_ag_ci_sco_data(UNUSED_ATTR tBTA_AG_SCB *p_scb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_set_esco_param
-**
-** Description      Update esco parameters from script wrapper.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_set_esco_param
+ *
+ * Description      Update esco parameters from script wrapper.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_set_esco_param(bool set_reset, tBTM_ESCO_PARAMS *param)
 {
     if(set_reset == false)    /* reset the parameters to default */
@@ -1663,8 +1663,8 @@ void bta_ag_set_esco_param(bool set_reset, tBTM_ESCO_PARAMS *param)
 }
 
 /*******************************************************************************
-**  Debugging functions
-*******************************************************************************/
+ *  Debugging functions
+ ******************************************************************************/
 
 #if (BTA_AG_SCO_DEBUG == TRUE)
 static char *bta_ag_sco_evt_str(uint8_t event)
diff --git a/system/bta/ag/bta_ag_sdp.cc b/system/bta/ag/bta_ag_sdp.cc
index 64a0ec02d35..6716e72e710 100644
--- a/system/bta/ag/bta_ag_sdp.cc
+++ b/system/bta/ag/bta_ag_sdp.cc
@@ -60,15 +60,15 @@ const tBTA_AG_SDP_CBACK bta_ag_sdp_cback_tbl[] =
 };
 
 /*******************************************************************************
-**
-** Function         bta_ag_sdp_cback
-**
-** Description      SDP callback function.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_sdp_cback
+ *
+ * Description      SDP callback function.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_ag_sdp_cback(uint16_t status, uint8_t idx)
 {
     uint16_t             event;
@@ -98,34 +98,34 @@ static void bta_ag_sdp_cback(uint16_t status, uint8_t idx)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_sdp_cback_1 to 3
-**
-** Description      SDP callback functions.  Since there is no way to
-**                  distinguish scb from the callback we need separate
-**                  callbacks for each scb.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_sdp_cback_1 to 3
+ *
+ * Description      SDP callback functions.  Since there is no way to
+ *                  distinguish scb from the callback we need separate
+ *                  callbacks for each scb.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_sdp_cback_1(uint16_t status) {bta_ag_sdp_cback(status, 1);}
 void bta_ag_sdp_cback_2(uint16_t status) {bta_ag_sdp_cback(status, 2);}
 void bta_ag_sdp_cback_3(uint16_t status) {bta_ag_sdp_cback(status, 3);}
 
 /******************************************************************************
-**
-** Function         bta_ag_add_record
-**
-** Description      This function is called by a server application to add
-**                  HSP or HFP information to an SDP record.  Prior to
-**                  calling this function the application must call
-**                  SDP_CreateRecord() to create an SDP record.
-**
-** Returns          true if function execution succeeded,
-**                  false if function execution failed.
-**
-******************************************************************************/
+ *
+ * Function         bta_ag_add_record
+ *
+ * Description      This function is called by a server application to add
+ *                  HSP or HFP information to an SDP record.  Prior to
+ *                  calling this function the application must call
+ *                  SDP_CreateRecord() to create an SDP record.
+ *
+ * Returns          true if function execution succeeded,
+ *                  false if function execution failed.
+ *
+ *****************************************************************************/
 bool bta_ag_add_record(uint16_t service_uuid, char *p_service_name, uint8_t scn,
                           tBTA_AG_FEAT features, uint32_t sdp_handle)
 {
@@ -203,15 +203,15 @@ bool bta_ag_add_record(uint16_t service_uuid, char *p_service_name, uint8_t scn,
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_create_records
-**
-** Description      Create SDP records for registered services.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_create_records
+ *
+ * Description      Create SDP records for registered services.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_create_records(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
 {
     int                 i;
@@ -241,15 +241,15 @@ void bta_ag_create_records(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_del_records
-**
-** Description      Delete SDP records for any registered services.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_del_records
+ *
+ * Description      Delete SDP records for any registered services.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_del_records(tBTA_AG_SCB *p_scb,
                         UNUSED_ATTR tBTA_AG_DATA *p_data)
 {
@@ -293,16 +293,16 @@ void bta_ag_del_records(tBTA_AG_SCB *p_scb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_sdp_find_attr
-**
-** Description      Process SDP discovery results to find requested attributes
-**                  for requested service.
-**
-**
-** Returns          true if results found, false otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_sdp_find_attr
+ *
+ * Description      Process SDP discovery results to find requested attributes
+ *                  for requested service.
+ *
+ *
+ * Returns          true if results found, false otherwise.
+ *
+ ******************************************************************************/
 bool bta_ag_sdp_find_attr(tBTA_AG_SCB *p_scb, tBTA_SERVICE_MASK service)
 {
     tSDP_DISC_REC       *p_rec = NULL;
@@ -394,15 +394,15 @@ bool bta_ag_sdp_find_attr(tBTA_AG_SCB *p_scb, tBTA_SERVICE_MASK service)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_do_disc
-**
-** Description      Do service discovery.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_do_disc
+ *
+ * Description      Do service discovery.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_do_disc(tBTA_AG_SCB *p_scb, tBTA_SERVICE_MASK service)
 {
     tSDP_UUID       uuid_list[2];
@@ -478,15 +478,15 @@ void bta_ag_do_disc(tBTA_AG_SCB *p_scb, tBTA_SERVICE_MASK service)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_free_db
-**
-** Description      Free discovery database.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_free_db
+ *
+ * Description      Free discovery database.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ag_free_db(tBTA_AG_SCB *p_scb,
                     UNUSED_ATTR tBTA_AG_DATA *p_data)
 {
diff --git a/system/bta/ar/bta_ar.cc b/system/bta/ar/bta_ar.cc
index 1cfc3e307e7..2bd644b5c96 100644
--- a/system/bta/ar/bta_ar.cc
+++ b/system/bta/ar/bta_ar.cc
@@ -31,14 +31,14 @@
 tBTA_AR_CB  bta_ar_cb;
 
 /*******************************************************************************
-**
-** Function         bta_ar_id
-**
-** Description      This function maps sys_id to ar id mask.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ar_id
+ *
+ * Description      This function maps sys_id to ar id mask.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static uint8_t bta_ar_id(tBTA_SYS_ID sys_id)
 {
     uint8_t   mask = 0;
@@ -55,14 +55,14 @@ static uint8_t bta_ar_id(tBTA_SYS_ID sys_id)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ar_init
-**
-** Description      This function is called to register to AVDTP.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ar_init
+ *
+ * Description      This function is called to register to AVDTP.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ar_init(void)
 {
     /* initialize control block */
@@ -70,14 +70,14 @@ void bta_ar_init(void)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ar_reg_avdt
-**
-** Description      This function is called to register to AVDTP.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ar_reg_avdt
+ *
+ * Description      This function is called to register to AVDTP.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_ar_avdt_cback(uint8_t handle, BD_ADDR bd_addr, uint8_t event, tAVDT_CTRL *p_data)
 {
     /* route the AVDT registration callback to av or avk */
@@ -88,14 +88,14 @@ static void bta_ar_avdt_cback(uint8_t handle, BD_ADDR bd_addr, uint8_t event, tA
 }
 
 /*******************************************************************************
-**
-** Function         bta_ar_reg_avdt
-**
-** Description      AR module registration to AVDT.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ar_reg_avdt
+ *
+ * Description      AR module registration to AVDT.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ar_reg_avdt(tAVDT_REG *p_reg, tAVDT_CTRL_CBACK *p_cback, tBTA_SYS_ID sys_id)
 {
     uint8_t   mask = 0;
@@ -128,14 +128,14 @@ void bta_ar_reg_avdt(tAVDT_REG *p_reg, tAVDT_CTRL_CBACK *p_cback, tBTA_SYS_ID sy
 }
 
 /*******************************************************************************
-**
-** Function         bta_ar_dereg_avdt
-**
-** Description      This function is called to de-register from AVDTP.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ar_dereg_avdt
+ *
+ * Description      This function is called to de-register from AVDTP.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ar_dereg_avdt(tBTA_SYS_ID sys_id)
 {
     uint8_t   mask = 0;
@@ -157,17 +157,17 @@ void bta_ar_dereg_avdt(tBTA_SYS_ID sys_id)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ar_avdt_conn
-**
-** Description      This function is called to let ar know that some AVDTP profile
-**                  is connected for this sys_id.
-**                  If the other sys modules started a timer for PENDING_EVT,
-**                  the timer can be stopped now.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ar_avdt_conn
+ *
+ * Description      This function is called to let ar know that some AVDTP profile
+ *                  is connected for this sys_id.
+ *                  If the other sys modules started a timer for PENDING_EVT,
+ *                  the timer can be stopped now.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ar_avdt_conn(tBTA_SYS_ID sys_id, BD_ADDR bd_addr)
 {
     uint8_t     event = BTA_AR_AVDT_CONN_EVT;
@@ -190,14 +190,14 @@ void bta_ar_avdt_conn(tBTA_SYS_ID sys_id, BD_ADDR bd_addr)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ar_reg_avct
-**
-** Description      This function is called to register to AVCTP.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ar_reg_avct
+ *
+ * Description      This function is called to register to AVCTP.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ar_reg_avct(uint16_t mtu, uint16_t mtu_br, uint8_t sec_mask, tBTA_SYS_ID sys_id)
 {
     uint8_t   mask = bta_ar_id (sys_id);
@@ -213,14 +213,14 @@ void bta_ar_reg_avct(uint16_t mtu, uint16_t mtu_br, uint8_t sec_mask, tBTA_SYS_I
 }
 
 /*******************************************************************************
-**
-** Function         bta_ar_dereg_avct
-**
-** Description      This function is called to deregister from AVCTP.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ar_dereg_avct
+ *
+ * Description      This function is called to deregister from AVCTP.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_ar_dereg_avct(tBTA_SYS_ID sys_id)
 {
     uint8_t   mask = bta_ar_id (sys_id);
@@ -232,14 +232,14 @@ void bta_ar_dereg_avct(tBTA_SYS_ID sys_id)
 }
 
 /******************************************************************************
-**
-** Function         bta_ar_reg_avrc
-**
-** Description      This function is called to register an SDP record for AVRCP.
-**
-** Returns          void
-**
-******************************************************************************/
+ *
+ * Function         bta_ar_reg_avrc
+ *
+ * Description      This function is called to register an SDP record for AVRCP.
+ *
+ * Returns          void
+ *
+ *****************************************************************************/
 void bta_ar_reg_avrc(uint16_t service_uuid, const char *service_name,
                      const char *provider_name, uint16_t categories,
                      tBTA_SYS_ID sys_id, bool browse_supported,
@@ -289,14 +289,14 @@ void bta_ar_reg_avrc(uint16_t service_uuid, const char *service_name,
 }
 
 /******************************************************************************
-**
-** Function         bta_ar_dereg_avrc
-**
-** Description      This function is called to de-register/delete an SDP record for AVRCP.
-**
-** Returns          void
-**
-******************************************************************************/
+ *
+ * Function         bta_ar_dereg_avrc
+ *
+ * Description      This function is called to de-register/delete an SDP record for AVRCP.
+ *
+ * Returns          void
+ *
+ *****************************************************************************/
 void bta_ar_dereg_avrc(uint16_t service_uuid, tBTA_SYS_ID sys_id)
 {
     uint8_t   mask = bta_ar_id (sys_id);
diff --git a/system/bta/ar/bta_ar_int.h b/system/bta/ar/bta_ar_int.h
index d5741c38585..1cab26fd13b 100644
--- a/system/bta/ar/bta_ar_int.h
+++ b/system/bta/ar/bta_ar_int.h
@@ -53,8 +53,8 @@ typedef struct
 } tBTA_AR_CB;
 
 /*****************************************************************************
-**  Global data
-*****************************************************************************/
+ *  Global data
+ ****************************************************************************/
 
 /* control block declaration */
 extern tBTA_AR_CB bta_ar_cb;
diff --git a/system/bta/av/bta_av_aact.cc b/system/bta/av/bta_av_aact.cc
index e7b829fa8b6..38aea6e6b6a 100644
--- a/system/bta/av/bta_av_aact.cc
+++ b/system/bta/av/bta_av_aact.cc
@@ -44,8 +44,8 @@
 #endif
 
 /*****************************************************************************
-**  Constants
-*****************************************************************************/
+ *  Constants
+ ****************************************************************************/
 
 /* the delay time in milliseconds to start service discovery on AVRCP */
 #ifndef BTA_AV_RC_DISC_TIME_VAL
@@ -238,14 +238,14 @@ tAVDT_CTRL_CBACK * const bta_av_dt_cback[] =
 #endif
 };
 /***********************************************
-**
-** Function         bta_get_scb_handle
-**
-** Description      gives the registered AVDT handle.by checking with sep_type.
-**
-**
-** Returns          void
-***********************************************/
+ *
+ * Function         bta_get_scb_handle
+ *
+ * Description      gives the registered AVDT handle.by checking with sep_type.
+ *
+ *
+ * Returns          void
+ **********************************************/
 static uint8_t bta_av_get_scb_handle(tBTA_AV_SCB *p_scb, uint8_t local_sep)
 {
     for (int i = 0; i < A2DP_CODEC_SEP_INDEX_MAX; i++) {
@@ -260,14 +260,14 @@ static uint8_t bta_av_get_scb_handle(tBTA_AV_SCB *p_scb, uint8_t local_sep)
 }
 
 /***********************************************
-**
-** Function         bta_av_get_scb_sep_type
-**
-** Description      gives the sep type by cross-checking with AVDT handle
-**
-**
-** Returns          void
-***********************************************/
+ *
+ * Function         bta_av_get_scb_sep_type
+ *
+ * Description      gives the sep type by cross-checking with AVDT handle
+ *
+ *
+ * Returns          void
+ **********************************************/
 static uint8_t bta_av_get_scb_sep_type(tBTA_AV_SCB *p_scb, uint8_t tavdt_handle)
 {
     for (int i = 0; i < A2DP_CODEC_SEP_INDEX_MAX; i++) {
@@ -279,15 +279,15 @@ static uint8_t bta_av_get_scb_sep_type(tBTA_AV_SCB *p_scb, uint8_t tavdt_handle)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_save_addr
-**
-** Description      copy the bd_addr and maybe reset the supported flags
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_save_addr
+ *
+ * Description      copy the bd_addr and maybe reset the supported flags
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_av_save_addr(tBTA_AV_SCB *p_scb, const BD_ADDR b)
 {
     APPL_TRACE_DEBUG("%s: r:%d, s:%d", __func__,
@@ -306,15 +306,15 @@ static void bta_av_save_addr(tBTA_AV_SCB *p_scb, const BD_ADDR b)
 }
 
 /*******************************************************************************
-**
-** Function         notify_start_failed
-**
-** Description      notify up-layer AV start failed
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         notify_start_failed
+ *
+ * Description      notify up-layer AV start failed
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void notify_start_failed(tBTA_AV_SCB *p_scb)
 {
     tBTA_AV_START   start;
@@ -328,16 +328,16 @@ static void notify_start_failed(tBTA_AV_SCB *p_scb)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_st_rc_timer
-**
-** Description      start the AVRC timer if no RC connection & CT is supported &
-**                  RC is used or
-**                  as ACP (we do not really know if we want AVRC)
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_st_rc_timer
+ *
+ * Description      start the AVRC timer if no RC connection & CT is supported &
+ *                  RC is used or
+ *                  as ACP (we do not really know if we want AVRC)
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_av_st_rc_timer(tBTA_AV_SCB *p_scb,
                                UNUSED_ATTR tBTA_AV_DATA *p_data)
 {
@@ -359,15 +359,15 @@ static void bta_av_st_rc_timer(tBTA_AV_SCB *p_scb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_next_getcap
-**
-** Description      The function gets the capabilities of the next available
-**                  stream found in the discovery results.
-**
-** Returns          true if we sent request to AVDT, false otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_next_getcap
+ *
+ * Description      The function gets the capabilities of the next available
+ *                  stream found in the discovery results.
+ *
+ * Returns          true if we sent request to AVDT, false otherwise.
+ *
+ ******************************************************************************/
 static bool bta_av_next_getcap(tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 {
     int     i;
@@ -420,14 +420,14 @@ static bool bta_av_next_getcap(tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_proc_stream_evt
-**
-** Description      Utility function to compose stream events.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_proc_stream_evt
+ *
+ * Description      Utility function to compose stream events.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_av_proc_stream_evt(uint8_t handle, BD_ADDR bd_addr, uint8_t event, tAVDT_CTRL *p_data, int index)
 {
     uint16_t              sec_len = 0;
@@ -568,14 +568,14 @@ static void bta_av_proc_stream_evt(uint8_t handle, BD_ADDR bd_addr, uint8_t even
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_sink_data_cback
-**
-** Description      This is the AVDTP callback function for sink stream events.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_sink_data_cback
+ *
+ * Description      This is the AVDTP callback function for sink stream events.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_sink_data_cback(uint8_t handle, BT_HDR *p_pkt, uint32_t time_stamp,
                             uint8_t m_pt)
 {
@@ -607,14 +607,14 @@ void bta_av_sink_data_cback(uint8_t handle, BT_HDR *p_pkt, uint32_t time_stamp,
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_stream0_cback
-**
-** Description      This is the AVDTP callback function for stream events.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_stream0_cback
+ *
+ * Description      This is the AVDTP callback function for stream events.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_av_stream0_cback(uint8_t handle, BD_ADDR bd_addr, uint8_t event, tAVDT_CTRL *p_data)
 {
     APPL_TRACE_VERBOSE("%s: avdt_handle: %d event=0x%x",
@@ -623,14 +623,14 @@ static void bta_av_stream0_cback(uint8_t handle, BD_ADDR bd_addr, uint8_t event,
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_stream1_cback
-**
-** Description      This is the AVDTP callback function for stream events.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_stream1_cback
+ *
+ * Description      This is the AVDTP callback function for stream events.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_av_stream1_cback(uint8_t handle, BD_ADDR bd_addr, uint8_t event, tAVDT_CTRL *p_data)
 {
     APPL_TRACE_EVENT("%s: avdt_handle: %d event=0x%x", __func__, handle, event);
@@ -639,14 +639,14 @@ static void bta_av_stream1_cback(uint8_t handle, BD_ADDR bd_addr, uint8_t event,
 
 #if BTA_AV_NUM_STRS > 2
 /*******************************************************************************
-**
-** Function         bta_av_stream2_cback
-**
-** Description      This is the AVDTP callback function for stream events.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_stream2_cback
+ *
+ * Description      This is the AVDTP callback function for stream events.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_av_stream2_cback(uint8_t handle, BD_ADDR bd_addr, uint8_t event, tAVDT_CTRL *p_data)
 {
     APPL_TRACE_EVENT("%s: avdt_handle: %d event=0x%x", __func__, handle, event);
@@ -656,14 +656,14 @@ static void bta_av_stream2_cback(uint8_t handle, BD_ADDR bd_addr, uint8_t event,
 
 #if BTA_AV_NUM_STRS > 3
 /*******************************************************************************
-**
-** Function         bta_av_stream3_cback
-**
-** Description      This is the AVDTP callback function for stream events.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_stream3_cback
+ *
+ * Description      This is the AVDTP callback function for stream events.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_av_stream3_cback(uint8_t handle, BD_ADDR bd_addr, uint8_t event, tAVDT_CTRL *p_data)
 {
     APPL_TRACE_EVENT("%s: avdt_handle: %d event=0x%x", __func__, handle, event);
@@ -672,14 +672,14 @@ static void bta_av_stream3_cback(uint8_t handle, BD_ADDR bd_addr, uint8_t event,
 #endif
 
 /*******************************************************************************
-**
-** Function         bta_av_stream4_cback
-**
-** Description      This is the AVDTP callback function for stream events.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_stream4_cback
+ *
+ * Description      This is the AVDTP callback function for stream events.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 #if BTA_AV_NUM_STRS > 4
 static void bta_av_stream4_cback(uint8_t handle, BD_ADDR bd_addr, uint8_t event, tAVDT_CTRL *p_data)
 {
@@ -689,14 +689,14 @@ static void bta_av_stream4_cback(uint8_t handle, BD_ADDR bd_addr, uint8_t event,
 #endif
 
 /*******************************************************************************
-**
-** Function         bta_av_stream5_cback
-**
-** Description      This is the AVDTP callback function for stream events.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_stream5_cback
+ *
+ * Description      This is the AVDTP callback function for stream events.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 #if BTA_AV_NUM_STRS > 5
 static void bta_av_stream5_cback(uint8_t handle, BD_ADDR bd_addr, uint8_t event, tAVDT_CTRL *p_data)
 {
@@ -706,14 +706,14 @@ static void bta_av_stream5_cback(uint8_t handle, BD_ADDR bd_addr, uint8_t event,
 #endif
 
 /*******************************************************************************
-**
-** Function         bta_av_a2dp_sdp_cback
-**
-** Description      A2DP service discovery callback.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_a2dp_sdp_cback
+ *
+ * Description      A2DP service discovery callback.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_av_a2dp_sdp_cback(bool found, tA2DP_Service *p_service)
 {
     tBTA_AV_SCB *p_scb = bta_av_hndl_to_scb(bta_av_cb.handle);
@@ -738,14 +738,14 @@ static void bta_av_a2dp_sdp_cback(bool found, tA2DP_Service *p_service)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_adjust_seps_idx
-**
-** Description      adjust the sep_idx
-**
-** Returns
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_adjust_seps_idx
+ *
+ * Description      adjust the sep_idx
+ *
+ * Returns
+ *
+ ******************************************************************************/
 static void bta_av_adjust_seps_idx(tBTA_AV_SCB *p_scb, uint8_t avdt_handle)
 {
     APPL_TRACE_DEBUG("%s: codec: %s", __func__,
@@ -766,15 +766,15 @@ static void bta_av_adjust_seps_idx(tBTA_AV_SCB *p_scb, uint8_t avdt_handle)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_switch_role
-**
-** Description      Switch role was not started and a timer was started.
-**                  another attempt to switch role now - still opening.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_switch_role
+ *
+ * Description      Switch role was not started and a timer was started.
+ *                  another attempt to switch role now - still opening.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_switch_role (tBTA_AV_SCB *p_scb,
                          UNUSED_ATTR tBTA_AV_DATA *p_data)
 {
@@ -821,15 +821,15 @@ void bta_av_switch_role (tBTA_AV_SCB *p_scb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_role_res
-**
-** Description      Handle the role changed event
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_role_res
+ *
+ * Description      Handle the role changed event
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_role_res (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 {
     bool           initiator = false;
@@ -904,29 +904,29 @@ void bta_av_role_res (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_delay_co
-**
-** Description      Call the delay call-out function to report the delay report
-**                  from SNK
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_delay_co
+ *
+ * Description      Call the delay call-out function to report the delay report
+ *                  from SNK
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_delay_co (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 {
     p_scb->p_cos->delay(p_scb->hndl, p_data->str_msg.msg.delay_rpt_cmd.delay);
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_do_disc_a2dp
-**
-** Description      Do service discovery for A2DP.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_do_disc_a2dp
+ *
+ * Description      Do service discovery for A2DP.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_do_disc_a2dp(tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 {
     bool        ok_continue = false;
@@ -1053,14 +1053,14 @@ void bta_av_do_disc_a2dp(tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_cleanup
-**
-** Description      cleanup AV stream control block.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_cleanup
+ *
+ * Description      cleanup AV stream control block.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_cleanup(tBTA_AV_SCB *p_scb,
                     UNUSED_ATTR tBTA_AV_DATA *p_data)
 {
@@ -1117,14 +1117,14 @@ void bta_av_cleanup(tBTA_AV_SCB *p_scb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_free_sdb
-**
-** Description      Free service discovery db buffer.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_free_sdb
+ *
+ * Description      Free service discovery db buffer.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_free_sdb(tBTA_AV_SCB *p_scb,
                      UNUSED_ATTR tBTA_AV_DATA *p_data)
 {
@@ -1132,14 +1132,14 @@ void bta_av_free_sdb(tBTA_AV_SCB *p_scb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_config_ind
-**
-** Description      Handle a stream configuration indication from the peer.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_config_ind
+ *
+ * Description      Handle a stream configuration indication from the peer.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_config_ind (tBTA_AV_SCB *p_scb,
                         UNUSED_ATTR tBTA_AV_DATA *p_data)
 {
@@ -1220,14 +1220,14 @@ void bta_av_config_ind (tBTA_AV_SCB *p_scb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_disconnect_req
-**
-** Description      Disconnect AVDTP connection.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_disconnect_req
+ *
+ * Description      Disconnect AVDTP connection.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_disconnect_req (tBTA_AV_SCB *p_scb,
                             UNUSED_ATTR tBTA_AV_DATA *p_data)
 {
@@ -1249,14 +1249,14 @@ void bta_av_disconnect_req (tBTA_AV_SCB *p_scb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_security_req
-**
-** Description      Send an AVDTP security request.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_security_req
+ *
+ * Description      Send an AVDTP security request.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_security_req (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 {
     if (bta_av_cb.features & BTA_AV_FEAT_PROTECT)
@@ -1267,14 +1267,14 @@ void bta_av_security_req (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_security_rsp
-**
-** Description      Send an AVDTP security response.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_security_rsp
+ *
+ * Description      Send an AVDTP security response.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_security_rsp (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 {
     if (bta_av_cb.features & BTA_AV_FEAT_PROTECT)
@@ -1290,14 +1290,14 @@ void bta_av_security_rsp (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_setconfig_rsp
-**
-** Description      setconfig is OK
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_setconfig_rsp
+ *
+ * Description      setconfig is OK
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_setconfig_rsp (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 {
     uint8_t num = p_data->ci_setconfig.num_seid + 1;
@@ -1384,14 +1384,14 @@ void bta_av_setconfig_rsp (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_str_opened
-**
-** Description      Stream opened OK (incoming/outgoing).
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_str_opened
+ *
+ * Description      Stream opened OK (incoming/outgoing).
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_str_opened (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 {
     tBTA_AV_CONN_CHG msg;
@@ -1475,14 +1475,14 @@ void bta_av_str_opened (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_security_ind
-**
-** Description      Handle an AVDTP security indication.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_security_ind
+ *
+ * Description      Handle an AVDTP security indication.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_security_ind (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 {
     tBTA_AV_PROTECT_REQ protect_req;
@@ -1506,14 +1506,14 @@ void bta_av_security_ind (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_security_cfm
-**
-** Description      Handle an AVDTP security confirm.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_security_cfm
+ *
+ * Description      Handle an AVDTP security confirm.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_security_cfm (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 {
     tBTA_AV_PROTECT_RSP protect_rsp;
@@ -1531,14 +1531,14 @@ void bta_av_security_cfm (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_do_close
-**
-** Description      Close stream.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_do_close
+ *
+ * Description      Close stream.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_do_close (tBTA_AV_SCB *p_scb,
 		      UNUSED_ATTR tBTA_AV_DATA *p_data)
 {
@@ -1565,14 +1565,14 @@ void bta_av_do_close (tBTA_AV_SCB *p_scb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_connect_req
-**
-** Description      Connect AVDTP connection.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_connect_req
+ *
+ * Description      Connect AVDTP connection.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_connect_req(tBTA_AV_SCB *p_scb,
                         UNUSED_ATTR tBTA_AV_DATA *p_data)
 {
@@ -1592,14 +1592,14 @@ void bta_av_connect_req(tBTA_AV_SCB *p_scb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_sdp_failed
-**
-** Description      Service discovery failed.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_sdp_failed
+ *
+ * Description      Service discovery failed.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_sdp_failed(tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 {
     if (!p_scb->open_status)
@@ -1610,16 +1610,16 @@ void bta_av_sdp_failed(tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_disc_results
-**
-** Description      Handle the AVDTP discover results.  Search through the
-**                  results and find the first available stream, and get
-**                  its capabilities.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_disc_results
+ *
+ * Description      Handle the AVDTP discover results.  Search through the
+ *                  results and find the first available stream, and get
+ *                  its capabilities.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_disc_results (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 {
     uint8_t num_snks = 0, num_srcs =0, i;
@@ -1669,16 +1669,16 @@ void bta_av_disc_results (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_disc_res_as_acp
-**
-** Description      Handle the AVDTP discover results.  Search through the
-**                  results and find the first available stream, and get
-**                  its capabilities.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_disc_res_as_acp
+ *
+ * Description      Handle the AVDTP discover results.  Search through the
+ *                  results and find the first available stream, and get
+ *                  its capabilities.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_disc_res_as_acp (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 {
     uint8_t num_snks = 0, i;
@@ -1720,14 +1720,14 @@ void bta_av_disc_res_as_acp (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_save_caps
-**
-** Description      report the SNK SEP capabilities to application
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_save_caps
+ *
+ * Description      report the SNK SEP capabilities to application
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_save_caps(tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 {
     tAVDT_CFG cfg;
@@ -1768,14 +1768,14 @@ void bta_av_save_caps(tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_set_use_rc
-**
-** Description      set to use AVRC for this stream control block.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_set_use_rc
+ *
+ * Description      set to use AVRC for this stream control block.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_set_use_rc (tBTA_AV_SCB *p_scb,
                         UNUSED_ATTR tBTA_AV_DATA *p_data)
 {
@@ -1783,14 +1783,14 @@ void bta_av_set_use_rc (tBTA_AV_SCB *p_scb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_cco_close
-**
-** Description      call close call-out function.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_cco_close
+ *
+ * Description      call close call-out function.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_cco_close (tBTA_AV_SCB *p_scb,
                        UNUSED_ATTR tBTA_AV_DATA *p_data)
 {
@@ -1802,14 +1802,14 @@ void bta_av_cco_close (tBTA_AV_SCB *p_scb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_open_failed
-**
-** Description      Failed to open an AVDT stream
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_open_failed
+ *
+ * Description      Failed to open an AVDT stream
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_open_failed (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 {
 
@@ -1860,16 +1860,16 @@ void bta_av_open_failed (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 
 
 /*******************************************************************************
-**
-** Function         bta_av_getcap_results
-**
-** Description      Handle the AVDTP get capabilities results.  Check the codec
-**                  type and see if it matches ours.  If it does not, get the
-**                  capabilities of the next stream, if any.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_getcap_results
+ *
+ * Description      Handle the AVDTP get capabilities results.  Check the codec
+ *                  type and see if it matches ours.  If it does not, get the
+ *                  capabilities of the next stream, if any.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_getcap_results (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 {
     tAVDT_CFG   cfg;
@@ -1946,14 +1946,14 @@ void bta_av_getcap_results (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_setconfig_rej
-**
-** Description      Send AVDTP set config reject.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_setconfig_rej
+ *
+ * Description      Send AVDTP set config reject.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_setconfig_rej (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 {
     tBTA_AV_REJECT reject;
@@ -1969,14 +1969,14 @@ void bta_av_setconfig_rej (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_discover_req
-**
-** Description      Send an AVDTP discover request to the peer.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_discover_req
+ *
+ * Description      Send an AVDTP discover request to the peer.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_discover_req (tBTA_AV_SCB *p_scb,
                           UNUSED_ATTR tBTA_AV_DATA *p_data)
 {
@@ -1986,14 +1986,14 @@ void bta_av_discover_req (tBTA_AV_SCB *p_scb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_conn_failed
-**
-** Description      AVDTP connection failed.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_conn_failed
+ *
+ * Description      AVDTP connection failed.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_conn_failed (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 {
     p_scb->open_status = BTA_AV_FAIL_STREAM;
@@ -2001,14 +2001,14 @@ void bta_av_conn_failed (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_do_start
-**
-** Description      Start stream.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_do_start
+ *
+ * Description      Start stream.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_do_start (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 {
     uint8_t policy = HCI_ENABLE_SNIFF_MODE;
@@ -2056,14 +2056,14 @@ void bta_av_do_start (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_str_stopped
-**
-** Description      Stream stopped.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_str_stopped
+ *
+ * Description      Stream stopped.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_str_stopped (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 {
     tBTA_AV_SUSPEND suspend_rsp;
@@ -2149,16 +2149,16 @@ void bta_av_str_stopped (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_reconfig
-**
-** Description      process the reconfigure request.
-**                  save the parameter in control block and
-**                  suspend, reconfigure or close the stream
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_reconfig
+ *
+ * Description      process the reconfigure request.
+ *                  save the parameter in control block and
+ *                  suspend, reconfigure or close the stream
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_reconfig (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 {
     tAVDT_CFG   *p_cfg;
@@ -2220,14 +2220,14 @@ void bta_av_reconfig (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_data_path
-**
-** Description      Handle stream data path.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_data_path
+ *
+ * Description      Handle stream data path.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_data_path (tBTA_AV_SCB *p_scb,
                        UNUSED_ATTR tBTA_AV_DATA *p_data)
 {
@@ -2314,14 +2314,14 @@ void bta_av_data_path (tBTA_AV_SCB *p_scb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_start_ok
-**
-** Description      Stream started.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_start_ok
+ *
+ * Description      Stream started.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_start_ok (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 {
     tBTA_AV_START    start;
@@ -2495,14 +2495,14 @@ void bta_av_start_ok (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_start_failed
-**
-** Description      Stream start failed.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_start_failed
+ *
+ * Description      Stream start failed.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_start_failed (tBTA_AV_SCB *p_scb,
                           UNUSED_ATTR tBTA_AV_DATA *p_data)
 {
@@ -2517,14 +2517,14 @@ void bta_av_start_failed (tBTA_AV_SCB *p_scb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_str_closed
-**
-** Description      Stream closed.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_str_closed
+ *
+ * Description      Stream closed.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_str_closed (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 {
     tBTA_AV     data;
@@ -2586,14 +2586,14 @@ void bta_av_str_closed (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_clr_cong
-**
-** Description      Clear stream congestion flag.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_clr_cong
+ *
+ * Description      Clear stream congestion flag.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_clr_cong (tBTA_AV_SCB *p_scb,
 		      UNUSED_ATTR tBTA_AV_DATA *p_data)
 {
@@ -2602,14 +2602,14 @@ void bta_av_clr_cong (tBTA_AV_SCB *p_scb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_suspend_cfm
-**
-** Description      process the suspend response
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_suspend_cfm
+ *
+ * Description      process the suspend response
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_suspend_cfm (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 {
     tBTA_AV_SUSPEND suspend_rsp;
@@ -2691,14 +2691,14 @@ void bta_av_suspend_cfm (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_rcfg_str_ok
-**
-** Description      report reconfigure successful
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_rcfg_str_ok
+ *
+ * Description      report reconfigure successful
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_rcfg_str_ok (tBTA_AV_SCB *p_scb,
                          UNUSED_ATTR tBTA_AV_DATA *p_data)
 {
@@ -2726,14 +2726,14 @@ void bta_av_rcfg_str_ok (tBTA_AV_SCB *p_scb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_rcfg_failed
-**
-** Description      process reconfigure failed
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_rcfg_failed
+ *
+ * Description      process reconfigure failed
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_rcfg_failed (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 {
     tBTA_AV_RECONFIG evt;
@@ -2767,14 +2767,14 @@ void bta_av_rcfg_failed (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_rcfg_connect
-**
-** Description      stream closed. reconnect the stream
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_rcfg_connect
+ *
+ * Description      stream closed. reconnect the stream
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_rcfg_connect (tBTA_AV_SCB *p_scb,
                           UNUSED_ATTR tBTA_AV_DATA *p_data)
 {
@@ -2791,14 +2791,14 @@ void bta_av_rcfg_connect (tBTA_AV_SCB *p_scb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_rcfg_discntd
-**
-** Description      AVDT disconnected. reconnect the stream
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_rcfg_discntd
+ *
+ * Description      AVDT disconnected. reconnect the stream
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_rcfg_discntd (tBTA_AV_SCB *p_scb,
                           UNUSED_ATTR tBTA_AV_DATA *p_data)
 {
@@ -2821,15 +2821,15 @@ void bta_av_rcfg_discntd (tBTA_AV_SCB *p_scb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_suspend_cont
-**
-** Description      received the suspend response.
-**                  continue to reconfigure the stream
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_suspend_cont
+ *
+ * Description      received the suspend response.
+ *                  continue to reconfigure the stream
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_suspend_cont (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 {
     uint8_t       err_code = p_data->str_msg.msg.hdr.err_code;
@@ -2871,15 +2871,15 @@ void bta_av_suspend_cont (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_rcfg_cfm
-**
-** Description      if reconfigure is successful, report the event
-**                  otherwise, close the stream.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_rcfg_cfm
+ *
+ * Description      if reconfigure is successful, report the event
+ *                  otherwise, close the stream.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_rcfg_cfm (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 {
     uint8_t   err_code = p_data->str_msg.msg.hdr.err_code;
@@ -2911,14 +2911,14 @@ void bta_av_rcfg_cfm (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_rcfg_open
-**
-** Description      AVDT is connected. open the stream with the new configuration
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_rcfg_open
+ *
+ * Description      AVDT is connected. open the stream with the new configuration
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_rcfg_open (tBTA_AV_SCB *p_scb,
                        UNUSED_ATTR tBTA_AV_DATA *p_data)
 {
@@ -2948,14 +2948,14 @@ void bta_av_rcfg_open (tBTA_AV_SCB *p_scb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_security_rej
-**
-** Description      Send an AVDTP security reject.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_security_rej
+ *
+ * Description      Send an AVDTP security reject.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_security_rej (tBTA_AV_SCB *p_scb,
 			  UNUSED_ATTR tBTA_AV_DATA *p_data)
 {
@@ -2964,15 +2964,15 @@ void bta_av_security_rej (tBTA_AV_SCB *p_scb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_chk_2nd_start
-**
-** Description      check if this is 2nd stream and if it needs to be started.
-**                  This function needs to be kept very similar to bta_av_chk_start
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_chk_2nd_start
+ *
+ * Description      check if this is 2nd stream and if it needs to be started.
+ *                  This function needs to be kept very similar to bta_av_chk_start
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_chk_2nd_start (tBTA_AV_SCB *p_scb,
                            UNUSED_ATTR tBTA_AV_DATA *p_data)
 {
@@ -3011,14 +3011,14 @@ void bta_av_chk_2nd_start (tBTA_AV_SCB *p_scb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_open_rc
-**
-** Description      Send a message to main SM to open RC channel.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_open_rc
+ *
+ * Description      Send a message to main SM to open RC channel.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_open_rc (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 {
     tBTA_AV_START   start;
@@ -3086,15 +3086,15 @@ void bta_av_open_rc (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_open_at_inc
-**
-** Description      This function is called if API open is called by application
-**                  while state-machine is at incoming state.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_open_at_inc
+ *
+ * Description      This function is called if API open is called by application
+ *                  while state-machine is at incoming state.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_open_at_inc (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 {
     memcpy (&(p_scb->open_api), &(p_data->api_open), sizeof(tBTA_AV_API_OPEN));
@@ -3122,15 +3122,15 @@ void bta_av_open_at_inc (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_offload_req
-**
-** Description      This function is called if application requests offload of
-**                  a2dp audio.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_offload_req
+ *
+ * Description      This function is called if application requests offload of
+ *                  a2dp audio.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_offload_req(tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 {
     tBTA_AV_STATUS status = BTA_AV_FAIL_RESOURCES;
@@ -3183,15 +3183,15 @@ void bta_av_offload_req(tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_offload_rsp
-**
-** Description      This function is called when the vendor lib responds to
-**                  BT_VND_OP_A2DP_OFFLOAD_START.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_offload_rsp
+ *
+ * Description      This function is called when the vendor lib responds to
+ *                  BT_VND_OP_A2DP_OFFLOAD_START.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_offload_rsp(tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data)
 {
     tBTA_AV_STATUS status = p_data->api_status_rsp.status;
diff --git a/system/bta/av/bta_av_act.cc b/system/bta/av/bta_av_act.cc
index e4c61357540..02861563cfb 100644
--- a/system/bta/av/bta_av_act.cc
+++ b/system/bta/av/bta_av_act.cc
@@ -44,8 +44,8 @@
 #endif
 
 /*****************************************************************************
-**  Constants
-*****************************************************************************/
+ *  Constants
+ ****************************************************************************/
 /* the timeout to wait for open req after setconfig for incoming connections */
 #ifndef BTA_AV_SIGNALLING_TIMEOUT_MS
 #define BTA_AV_SIGNALLING_TIMEOUT_MS (8 * 1000)         /* 8 seconds */
@@ -66,14 +66,14 @@ static void bta_av_accept_signalling_timer_cback(void *data);
 #endif
 
 /*******************************************************************************
-**
-** Function         bta_av_get_rcb_by_shdl
-**
-** Description      find the RCB associated with the given SCB handle.
-**
-** Returns          tBTA_AV_RCB
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_get_rcb_by_shdl
+ *
+ * Description      find the RCB associated with the given SCB handle.
+ *
+ * Returns          tBTA_AV_RCB
+ *
+ ******************************************************************************/
 tBTA_AV_RCB * bta_av_get_rcb_by_shdl(uint8_t shdl)
 {
     tBTA_AV_RCB *p_rcb = NULL;
@@ -92,14 +92,14 @@ tBTA_AV_RCB * bta_av_get_rcb_by_shdl(uint8_t shdl)
 #define BTA_AV_STS_NO_RSP       0xFF    /* a number not used by tAVRC_STS */
 
 /*******************************************************************************
-**
-** Function         bta_av_del_rc
-**
-** Description      delete the given AVRC handle.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_del_rc
+ *
+ * Description      delete the given AVRC handle.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_del_rc(tBTA_AV_RCB *p_rcb)
 {
     tBTA_AV_SCB  *p_scb;
@@ -148,14 +148,14 @@ void bta_av_del_rc(tBTA_AV_RCB *p_rcb)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_close_all_rc
-**
-** Description      close the all AVRC handle.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_close_all_rc
+ *
+ * Description      close the all AVRC handle.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_av_close_all_rc(tBTA_AV_CB *p_cb)
 {
     int i;
@@ -168,14 +168,14 @@ static void bta_av_close_all_rc(tBTA_AV_CB *p_cb)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_del_sdp_rec
-**
-** Description      delete the given SDP record handle.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_del_sdp_rec
+ *
+ * Description      delete the given SDP record handle.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_av_del_sdp_rec(uint32_t *p_sdp_handle)
 {
     if (*p_sdp_handle != 0)
@@ -186,14 +186,14 @@ static void bta_av_del_sdp_rec(uint32_t *p_sdp_handle)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_avrc_sdp_cback
-**
-** Description      AVRCP service discovery callback.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_avrc_sdp_cback
+ *
+ * Description      AVRCP service discovery callback.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_av_avrc_sdp_cback(UNUSED_ATTR uint16_t status)
 {
     BT_HDR *p_msg = (BT_HDR *)osi_malloc(sizeof(BT_HDR));
@@ -204,14 +204,14 @@ static void bta_av_avrc_sdp_cback(UNUSED_ATTR uint16_t status)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_rc_ctrl_cback
-**
-** Description      AVRCP control callback.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_rc_ctrl_cback
+ *
+ * Description      AVRCP control callback.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_av_rc_ctrl_cback(uint8_t handle, uint8_t event,
                                  UNUSED_ATTR uint16_t result, BD_ADDR peer_addr)
 {
@@ -250,14 +250,14 @@ static void bta_av_rc_ctrl_cback(uint8_t handle, uint8_t event,
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_rc_msg_cback
-**
-** Description      AVRCP message callback.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_rc_msg_cback
+ *
+ * Description      AVRCP message callback.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_av_rc_msg_cback(uint8_t handle, uint8_t label, uint8_t opcode, tAVRC_MSG *p_msg)
 {
     uint8_t           *p_data_src = NULL;
@@ -310,14 +310,14 @@ static void bta_av_rc_msg_cback(uint8_t handle, uint8_t label, uint8_t opcode, t
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_rc_create
-**
-** Description      alloc RCB and call AVRC_Open
-**
-** Returns          the created rc handle
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_rc_create
+ *
+ * Description      alloc RCB and call AVRC_Open
+ *
+ * Returns          the created rc handle
+ *
+ ******************************************************************************/
 uint8_t bta_av_rc_create(tBTA_AV_CB *p_cb, uint8_t role, uint8_t shdl, uint8_t lidx)
 {
     tAVRC_CONN_CB ccb;
@@ -380,14 +380,14 @@ uint8_t bta_av_rc_create(tBTA_AV_CB *p_cb, uint8_t role, uint8_t shdl, uint8_t l
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_valid_group_navi_msg
-**
-** Description      Check if it is Group Navigation Msg for Metadata
-**
-** Returns          BTA_AV_RSP_ACCEPT or BTA_AV_RSP_NOT_IMPL.
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_valid_group_navi_msg
+ *
+ * Description      Check if it is Group Navigation Msg for Metadata
+ *
+ * Returns          BTA_AV_RSP_ACCEPT or BTA_AV_RSP_NOT_IMPL.
+ *
+ ******************************************************************************/
 static tBTA_AV_CODE bta_av_group_navi_supported(uint8_t len, uint8_t *p_data, bool is_inquiry)
 {
     tBTA_AV_CODE ret=BTA_AV_RSP_NOT_IMPL;
@@ -421,14 +421,14 @@ static tBTA_AV_CODE bta_av_group_navi_supported(uint8_t len, uint8_t *p_data, bo
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_op_supported
-**
-** Description      Check if remote control operation is supported.
-**
-** Returns          BTA_AV_RSP_ACCEPT of supported, BTA_AV_RSP_NOT_IMPL if not.
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_op_supported
+ *
+ * Description      Check if remote control operation is supported.
+ *
+ * Returns          BTA_AV_RSP_ACCEPT of supported, BTA_AV_RSP_NOT_IMPL if not.
+ *
+ ******************************************************************************/
 static tBTA_AV_CODE bta_av_op_supported(tBTA_AV_RC rc_id, bool is_inquiry)
 {
     tBTA_AV_CODE ret_code = BTA_AV_RSP_NOT_IMPL;
@@ -462,14 +462,14 @@ static tBTA_AV_CODE bta_av_op_supported(tBTA_AV_RC rc_id, bool is_inquiry)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_find_lcb
-**
-** Description      Given BD_addr, find the associated LCB.
-**
-** Returns          NULL, if not found.
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_find_lcb
+ *
+ * Description      Given BD_addr, find the associated LCB.
+ *
+ * Returns          NULL, if not found.
+ *
+ ******************************************************************************/
 tBTA_AV_LCB * bta_av_find_lcb(BD_ADDR addr, uint8_t op)
 {
     tBTA_AV_CB   *p_cb = &bta_av_cb;
@@ -495,14 +495,14 @@ tBTA_AV_LCB * bta_av_find_lcb(BD_ADDR addr, uint8_t op)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_rc_opened
-**
-** Description      Set AVRCP state to opened.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_rc_opened
+ *
+ * Description      Set AVRCP state to opened.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_rc_opened(tBTA_AV_CB *p_cb, tBTA_AV_DATA *p_data)
 {
     tBTA_AV_RC_OPEN rc_open;
@@ -617,14 +617,14 @@ void bta_av_rc_opened(tBTA_AV_CB *p_cb, tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_rc_remote_cmd
-**
-** Description      Send an AVRCP remote control command.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_rc_remote_cmd
+ *
+ * Description      Send an AVRCP remote control command.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_rc_remote_cmd(tBTA_AV_CB *p_cb, tBTA_AV_DATA *p_data)
 {
     tBTA_AV_RCB    *p_rcb;
@@ -643,14 +643,14 @@ void bta_av_rc_remote_cmd(tBTA_AV_CB *p_cb, tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_rc_vendor_cmd
-**
-** Description      Send an AVRCP vendor specific command.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_rc_vendor_cmd
+ *
+ * Description      Send an AVRCP vendor specific command.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_rc_vendor_cmd(tBTA_AV_CB *p_cb, tBTA_AV_DATA *p_data)
 {
     tBTA_AV_RCB    *p_rcb;
@@ -666,14 +666,14 @@ void bta_av_rc_vendor_cmd(tBTA_AV_CB *p_cb, tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_rc_vendor_rsp
-**
-** Description      Send an AVRCP vendor specific response.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_rc_vendor_rsp
+ *
+ * Description      Send an AVRCP vendor specific response.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_rc_vendor_rsp(tBTA_AV_CB *p_cb, tBTA_AV_DATA *p_data)
 {
     tBTA_AV_RCB    *p_rcb;
@@ -689,14 +689,14 @@ void bta_av_rc_vendor_rsp(tBTA_AV_CB *p_cb, tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_rc_meta_rsp
-**
-** Description      Send an AVRCP metadata/advanced control command/response.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_rc_meta_rsp
+ *
+ * Description      Send an AVRCP metadata/advanced control command/response.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_rc_meta_rsp(tBTA_AV_CB *p_cb, tBTA_AV_DATA *p_data)
 {
     tBTA_AV_RCB *p_rcb;
@@ -722,28 +722,28 @@ void bta_av_rc_meta_rsp(tBTA_AV_CB *p_cb, tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_rc_free_rsp
-**
-** Description      free an AVRCP metadata command buffer.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_rc_free_rsp
+ *
+ * Description      free an AVRCP metadata command buffer.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_rc_free_rsp (UNUSED_ATTR tBTA_AV_CB *p_cb, tBTA_AV_DATA *p_data)
 {
     osi_free_and_reset((void **)&p_data->api_meta_rsp.p_pkt);
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_rc_free_browse_msg
-**
-** Description      free an AVRCP browse message buffer.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_rc_free_browse_msg
+ *
+ * Description      free an AVRCP browse message buffer.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_rc_free_browse_msg (UNUSED_ATTR tBTA_AV_CB *p_cb, tBTA_AV_DATA *p_data)
 {
     if (p_data->rc_msg.opcode == AVRC_OP_BROWSE)
@@ -753,14 +753,14 @@ void bta_av_rc_free_browse_msg (UNUSED_ATTR tBTA_AV_CB *p_cb, tBTA_AV_DATA *p_da
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_chk_notif_evt_id
-**
-** Description      make sure the requested player id is valid.
-**
-** Returns          BTA_AV_STS_NO_RSP, if no error
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_chk_notif_evt_id
+ *
+ * Description      make sure the requested player id is valid.
+ *
+ * Returns          BTA_AV_STS_NO_RSP, if no error
+ *
+ ******************************************************************************/
 static tAVRC_STS bta_av_chk_notif_evt_id(tAVRC_MSG_VENDOR *p_vendor)
 {
     tAVRC_STS   status = BTA_AV_STS_NO_RSP;
@@ -794,14 +794,14 @@ static tAVRC_STS bta_av_chk_notif_evt_id(tAVRC_MSG_VENDOR *p_vendor)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_proc_meta_cmd
-**
-** Description      Process an AVRCP metadata command from the peer.
-**
-** Returns          true to respond immediately
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_proc_meta_cmd
+ *
+ * Description      Process an AVRCP metadata command from the peer.
+ *
+ * Returns          true to respond immediately
+ *
+ ******************************************************************************/
 tBTA_AV_EVT bta_av_proc_meta_cmd(tAVRC_RESPONSE  *p_rc_rsp, tBTA_AV_RC_MSG *p_msg, uint8_t *p_ctype)
 {
     tBTA_AV_EVT evt = BTA_AV_META_MSG_EVT;
@@ -901,14 +901,14 @@ tBTA_AV_EVT bta_av_proc_meta_cmd(tAVRC_RESPONSE  *p_rc_rsp, tBTA_AV_RC_MSG *p_ms
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_rc_msg
-**
-** Description      Process an AVRCP message from the peer.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_rc_msg
+ *
+ * Description      Process an AVRCP message from the peer.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_rc_msg(tBTA_AV_CB *p_cb, tBTA_AV_DATA *p_data)
 {
     tBTA_AV_EVT evt = 0;
@@ -1111,14 +1111,14 @@ void bta_av_rc_msg(tBTA_AV_CB *p_cb, tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_rc_close
-**
-** Description      close the specified AVRC handle.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_rc_close
+ *
+ * Description      close the specified AVRC handle.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_rc_close (tBTA_AV_CB *p_cb, tBTA_AV_DATA *p_data)
 {
     uint16_t handle = p_data->hdr.layer_specific;
@@ -1151,26 +1151,26 @@ void bta_av_rc_close (tBTA_AV_CB *p_cb, tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_rc_browse_close
-**
-** Description      Empty placeholder.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_rc_browse_close
+ *
+ * Description      Empty placeholder.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_rc_browse_close (tBTA_AV_CB *p_cb, tBTA_AV_DATA *p_data)
 {
     APPL_TRACE_WARNING("%s empty placeholder does nothing!", __func__);
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_get_shdl
-**
-** Returns          The index to p_scb[]
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_get_shdl
+ *
+ * Returns          The index to p_scb[]
+ *
+ ******************************************************************************/
 static uint8_t bta_av_get_shdl(tBTA_AV_SCB *p_scb)
 {
     int     i;
@@ -1188,14 +1188,14 @@ static uint8_t bta_av_get_shdl(tBTA_AV_SCB *p_scb)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_stream_chg
-**
-** Description      audio streaming status changed.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_stream_chg
+ *
+ * Description      audio streaming status changed.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_stream_chg(tBTA_AV_SCB *p_scb, bool started)
 {
     uint8_t   started_msk;
@@ -1262,15 +1262,15 @@ void bta_av_stream_chg(tBTA_AV_SCB *p_scb, bool started)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_conn_chg
-**
-** Description      connetion status changed.
-**                  Open an AVRCP acceptor channel, if new conn.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_conn_chg
+ *
+ * Description      connetion status changed.
+ *                  Open an AVRCP acceptor channel, if new conn.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_conn_chg(tBTA_AV_DATA *p_data)
 {
     tBTA_AV_CB   *p_cb = &bta_av_cb;
@@ -1472,14 +1472,14 @@ void bta_av_conn_chg(tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_disable
-**
-** Description      disable AV.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_disable
+ *
+ * Description      disable AV.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_disable(tBTA_AV_CB *p_cb,
                     UNUSED_ATTR tBTA_AV_DATA *p_data)
 {
@@ -1510,14 +1510,14 @@ void bta_av_disable(tBTA_AV_CB *p_cb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_api_disconnect
-**
-** Description      .
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_api_disconnect
+ *
+ * Description      .
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_api_disconnect(tBTA_AV_DATA *p_data)
 {
     AVDT_DisconnectReq(p_data->api_discnt.bd_addr, bta_av_conn_cback);
@@ -1525,14 +1525,14 @@ void bta_av_api_disconnect(tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_sig_chg
-**
-** Description      process AVDT signal channel up/down.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_sig_chg
+ *
+ * Description      process AVDT signal channel up/down.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_sig_chg(tBTA_AV_DATA *p_data)
 {
     uint16_t event = p_data->str_msg.hdr.layer_specific;
@@ -1658,17 +1658,17 @@ void bta_av_sig_chg(tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_signalling_timer
-**
-** Description      process the signal channel timer. This timer is started
-**                  when the AVDTP signal channel is connected. If no profile
-**                  is connected, the timer goes off every
-**                  BTA_AV_SIGNALLING_TIMEOUT_MS.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_signalling_timer
+ *
+ * Description      process the signal channel timer. This timer is started
+ *                  when the AVDTP signal channel is connected. If no profile
+ *                  is connected, the timer goes off every
+ *                  BTA_AV_SIGNALLING_TIMEOUT_MS.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_signalling_timer(UNUSED_ATTR tBTA_AV_DATA *p_data)
 {
     tBTA_AV_CB   *p_cb = &bta_av_cb;
@@ -1697,15 +1697,15 @@ void bta_av_signalling_timer(UNUSED_ATTR tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_accept_signalling_timer_cback
-**
-** Description      Process the timeout when SRC is accepting connection
-**                  and SNK did not start signalling.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_accept_signalling_timer_cback
+ *
+ * Description      Process the timeout when SRC is accepting connection
+ *                  and SNK did not start signalling.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_av_accept_signalling_timer_cback(void *data)
 {
     uint32_t   inx = PTR_TO_UINT(data);
@@ -1766,15 +1766,15 @@ static void bta_av_accept_signalling_timer_cback(void *data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_check_peer_features
-**
-** Description      check supported features on the peer device from the SDP record
-**                  and return the feature mask
-**
-** Returns          tBTA_AV_FEAT peer device feature mask
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_check_peer_features
+ *
+ * Description      check supported features on the peer device from the SDP record
+ *                  and return the feature mask
+ *
+ * Returns          tBTA_AV_FEAT peer device feature mask
+ *
+ ******************************************************************************/
 tBTA_AV_FEAT bta_av_check_peer_features (uint16_t service_uuid)
 {
     tBTA_AV_FEAT peer_features = 0;
@@ -1836,15 +1836,15 @@ tBTA_AV_FEAT bta_av_check_peer_features (uint16_t service_uuid)
 }
 
 /*******************************************************************************
-**
-** Function         bta_avk_check_peer_features
-**
-** Description      check supported features on the peer device from the SDP record
-**                  and return the feature mask
-**
-** Returns          tBTA_AV_FEAT peer device feature mask
-**
-*******************************************************************************/
+ *
+ * Function         bta_avk_check_peer_features
+ *
+ * Description      check supported features on the peer device from the SDP record
+ *                  and return the feature mask
+ *
+ * Returns          tBTA_AV_FEAT peer device feature mask
+ *
+ ******************************************************************************/
 tBTA_AV_FEAT bta_avk_check_peer_features (uint16_t service_uuid)
 {
     tBTA_AV_FEAT peer_features = 0;
@@ -1912,15 +1912,15 @@ tBTA_AV_FEAT bta_avk_check_peer_features (uint16_t service_uuid)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_rc_disc_done
-**
-** Description      Handle AVRCP service discovery results.  If matching
-**                  service found, open AVRCP connection.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_rc_disc_done
+ *
+ * Description      Handle AVRCP service discovery results.  If matching
+ *                  service found, open AVRCP connection.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_rc_disc_done(UNUSED_ATTR tBTA_AV_DATA *p_data)
 {
     tBTA_AV_CB   *p_cb = &bta_av_cb;
@@ -2040,14 +2040,14 @@ void bta_av_rc_disc_done(UNUSED_ATTR tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_rc_closed
-**
-** Description      Set AVRCP state to closed.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_rc_closed
+ *
+ * Description      Set AVRCP state to closed.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_rc_closed(tBTA_AV_DATA *p_data)
 {
     tBTA_AV_CB   *p_cb = &bta_av_cb;
@@ -2139,14 +2139,14 @@ void bta_av_rc_closed(tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_rc_browse_opened
-**
-** Description      AVRC browsing channel is opened
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_rc_browse_opened
+ *
+ * Description      AVRC browsing channel is opened
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_rc_browse_opened(tBTA_AV_DATA *p_data)
 {
     tBTA_AV_CB   *p_cb = &bta_av_cb;
@@ -2167,14 +2167,14 @@ void bta_av_rc_browse_opened(tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_rc_browse_closed
-**
-** Description      AVRC browsing channel is closed
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_rc_browse_closed
+ *
+ * Description      AVRC browsing channel is closed
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_rc_browse_closed(tBTA_AV_DATA *p_data)
 {
     tBTA_AV_CB   *p_cb = &bta_av_cb;
@@ -2194,14 +2194,14 @@ void bta_av_rc_browse_closed(tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_rc_disc
-**
-** Description      start AVRC SDP discovery.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_rc_disc
+ *
+ * Description      start AVRC SDP discovery.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_rc_disc(uint8_t disc)
 {
     tBTA_AV_CB   *p_cb = &bta_av_cb;
@@ -2261,14 +2261,14 @@ void bta_av_rc_disc(uint8_t disc)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_dereg_comp
-**
-** Description      deregister complete. free the stream control block.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_dereg_comp
+ *
+ * Description      deregister complete. free the stream control block.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_dereg_comp(tBTA_AV_DATA *p_data)
 {
     tBTA_AV_CB   *p_cb = &bta_av_cb;
diff --git a/system/bta/av/bta_av_api.cc b/system/bta/av/bta_av_api.cc
index a74ea028c12..9ea32322b6d 100644
--- a/system/bta/av/bta_av_api.cc
+++ b/system/bta/av/bta_av_api.cc
@@ -38,8 +38,8 @@
 #include "osi/include/allocator.h"
 
 /*****************************************************************************
-**  Constants
-*****************************************************************************/
+ *  Constants
+ ****************************************************************************/
 
 static const tBTA_SYS_REG bta_av_reg =
 {
@@ -48,18 +48,18 @@ static const tBTA_SYS_REG bta_av_reg =
 };
 
 /*******************************************************************************
-**
-** Function         BTA_AvEnable
-**
-** Description      Enable the advanced audio/video service. When the enable
-**                  operation is complete the callback function will be
-**                  called with a BTA_AV_ENABLE_EVT. This function must
-**                  be called before other function in the AV API are
-**                  called.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AvEnable
+ *
+ * Description      Enable the advanced audio/video service. When the enable
+ *                  operation is complete the callback function will be
+ *                  called with a BTA_AV_ENABLE_EVT. This function must
+ *                  be called before other function in the AV API are
+ *                  called.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AvEnable(tBTA_SEC sec_mask, tBTA_AV_FEAT features, tBTA_AV_CBACK *p_cback)
 {
     tBTA_AV_API_ENABLE *p_buf =
@@ -77,14 +77,14 @@ void BTA_AvEnable(tBTA_SEC sec_mask, tBTA_AV_FEAT features, tBTA_AV_CBACK *p_cba
 }
 
 /*******************************************************************************
-**
-** Function         BTA_AvDisable
-**
-** Description      Disable the advanced audio/video service.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AvDisable
+ *
+ * Description      Disable the advanced audio/video service.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AvDisable(void)
 {
     BT_HDR *p_buf = (BT_HDR *)osi_malloc(sizeof(BT_HDR));
@@ -96,18 +96,18 @@ void BTA_AvDisable(void)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_AvRegister
-**
-** Description      Register the audio or video service to stack. When the
-**                  operation is complete the callback function will be
-**                  called with a BTA_AV_REGISTER_EVT. This function must
-**                  be called before AVDT stream is open.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AvRegister
+ *
+ * Description      Register the audio or video service to stack. When the
+ *                  operation is complete the callback function will be
+ *                  called with a BTA_AV_REGISTER_EVT. This function must
+ *                  be called before AVDT stream is open.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AvRegister(tBTA_AV_CHNL chnl, const char *p_service_name,
                     uint8_t app_id, tBTA_AV_SINK_DATA_CBACK *p_sink_data_cback,
                     uint16_t service_uuid)
@@ -129,14 +129,14 @@ void BTA_AvRegister(tBTA_AV_CHNL chnl, const char *p_service_name,
 }
 
 /*******************************************************************************
-**
-** Function         BTA_AvDeregister
-**
-** Description      Deregister the audio or video service
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AvDeregister
+ *
+ * Description      Deregister the audio or video service
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AvDeregister(tBTA_AV_HNDL hndl)
 {
     BT_HDR *p_buf = (BT_HDR *)osi_malloc(sizeof(BT_HDR));
@@ -148,16 +148,16 @@ void BTA_AvDeregister(tBTA_AV_HNDL hndl)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_AvOpen
-**
-** Description      Opens an advanced audio/video connection to a peer device.
-**                  When connection is open callback function is called
-**                  with a BTA_AV_OPEN_EVT.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AvOpen
+ *
+ * Description      Opens an advanced audio/video connection to a peer device.
+ *                  When connection is open callback function is called
+ *                  with a BTA_AV_OPEN_EVT.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AvOpen(BD_ADDR bd_addr, tBTA_AV_HNDL handle, bool use_rc, tBTA_SEC sec_mask,
                                                                              uint16_t uuid)
 {
@@ -176,14 +176,14 @@ void BTA_AvOpen(BD_ADDR bd_addr, tBTA_AV_HNDL handle, bool use_rc, tBTA_SEC sec_
 }
 
 /*******************************************************************************
-**
-** Function         BTA_AvClose
-**
-** Description      Close the current streams.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AvClose
+ *
+ * Description      Close the current streams.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AvClose(tBTA_AV_HNDL handle)
 {
     BT_HDR *p_buf = (BT_HDR *)osi_malloc(sizeof(BT_HDR));
@@ -195,14 +195,14 @@ void BTA_AvClose(tBTA_AV_HNDL handle)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_AvDisconnect
-**
-** Description      Close the connection to the address.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AvDisconnect
+ *
+ * Description      Close the connection to the address.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AvDisconnect(BD_ADDR bd_addr)
 {
     tBTA_AV_API_DISCNT *p_buf =
@@ -215,14 +215,14 @@ void BTA_AvDisconnect(BD_ADDR bd_addr)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_AvStart
-**
-** Description      Start audio/video stream data transfer.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AvStart
+ *
+ * Description      Start audio/video stream data transfer.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AvStart(void)
 {
     BT_HDR *p_buf = (BT_HDR *) osi_malloc(sizeof(BT_HDR));
@@ -233,14 +233,14 @@ void BTA_AvStart(void)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_AvOffloadStart
-**
-** Description      Start a2dp audio offloading.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AvOffloadStart
+ *
+ * Description      Start a2dp audio offloading.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AvOffloadStart(tBTA_AV_HNDL hndl)
 {
     BT_HDR *p_buf = (BT_HDR *)osi_malloc(sizeof(BT_HDR));
@@ -252,14 +252,14 @@ void BTA_AvOffloadStart(tBTA_AV_HNDL hndl)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_AvOffloadStartRsp
-**
-** Description      Response from vendor lib for A2DP Offload Start request.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AvOffloadStartRsp
+ *
+ * Description      Response from vendor lib for A2DP Offload Start request.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AvOffloadStartRsp(tBTA_AV_HNDL hndl, tBTA_AV_STATUS status)
 {
     tBTA_AV_API_STATUS_RSP *p_buf =
@@ -273,16 +273,16 @@ void BTA_AvOffloadStartRsp(tBTA_AV_HNDL hndl, tBTA_AV_STATUS status)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_AvStop
-**
-** Description      Stop audio/video stream data transfer.
-**                  If suspend is true, this function sends AVDT suspend signal
-**                  to the connected peer(s).
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AvStop
+ *
+ * Description      Stop audio/video stream data transfer.
+ *                  If suspend is true, this function sends AVDT suspend signal
+ *                  to the connected peer(s).
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AvStop(bool suspend)
 {
     tBTA_AV_API_STOP *p_buf =
@@ -296,18 +296,18 @@ void BTA_AvStop(bool suspend)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_AvReconfig
-**
-** Description      Reconfigure the audio/video stream.
-**                  If suspend is true, this function tries the suspend/reconfigure
-**                  procedure first.
-**                  If suspend is false or when suspend/reconfigure fails,
-**                  this function closes and re-opens the AVDT connection.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AvReconfig
+ *
+ * Description      Reconfigure the audio/video stream.
+ *                  If suspend is true, this function tries the suspend/reconfigure
+ *                  procedure first.
+ *                  If suspend is false or when suspend/reconfigure fails,
+ *                  this function closes and re-opens the AVDT connection.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AvReconfig(tBTA_AV_HNDL hndl, bool suspend, uint8_t sep_info_idx,
                     uint8_t *p_codec_info, uint8_t num_protect,
                     const uint8_t *p_protect_info)
@@ -328,15 +328,15 @@ void BTA_AvReconfig(tBTA_AV_HNDL hndl, bool suspend, uint8_t sep_info_idx,
 }
 
 /*******************************************************************************
-**
-** Function         BTA_AvProtectReq
-**
-** Description      Send a content protection request.  This function can only
-**                  be used if AV is enabled with feature BTA_AV_FEAT_PROTECT.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AvProtectReq
+ *
+ * Description      Send a content protection request.  This function can only
+ *                  be used if AV is enabled with feature BTA_AV_FEAT_PROTECT.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AvProtectReq(tBTA_AV_HNDL hndl, uint8_t *p_data, uint16_t len)
 {
     tBTA_AV_API_PROTECT_REQ *p_buf =
@@ -356,17 +356,17 @@ void BTA_AvProtectReq(tBTA_AV_HNDL hndl, uint8_t *p_data, uint16_t len)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_AvProtectRsp
-**
-** Description      Send a content protection response.  This function must
-**                  be called if a BTA_AV_PROTECT_REQ_EVT is received.
-**                  This function can only be used if AV is enabled with
-**                  feature BTA_AV_FEAT_PROTECT.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AvProtectRsp
+ *
+ * Description      Send a content protection response.  This function must
+ *                  be called if a BTA_AV_PROTECT_REQ_EVT is received.
+ *                  This function can only be used if AV is enabled with
+ *                  feature BTA_AV_FEAT_PROTECT.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AvProtectRsp(tBTA_AV_HNDL hndl, uint8_t error_code, uint8_t *p_data, uint16_t len)
 {
     tBTA_AV_API_PROTECT_RSP *p_buf =
@@ -387,15 +387,15 @@ void BTA_AvProtectRsp(tBTA_AV_HNDL hndl, uint8_t error_code, uint8_t *p_data, ui
 }
 
 /*******************************************************************************
-**
-** Function         BTA_AvRemoteCmd
-**
-** Description      Send a remote control command.  This function can only
-**                  be used if AV is enabled with feature BTA_AV_FEAT_RCCT.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AvRemoteCmd
+ *
+ * Description      Send a remote control command.  This function can only
+ *                  be used if AV is enabled with feature BTA_AV_FEAT_RCCT.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AvRemoteCmd(uint8_t rc_handle, uint8_t label, tBTA_AV_RC rc_id, tBTA_AV_STATE key_state)
 {
     tBTA_AV_API_REMOTE_CMD *p_buf =
@@ -413,16 +413,16 @@ void BTA_AvRemoteCmd(uint8_t rc_handle, uint8_t label, tBTA_AV_RC rc_id, tBTA_AV
 }
 
 /*******************************************************************************
-**
-** Function         BTA_AvRemoteVendorUniqueCmd
-**
-** Description      Send a remote control command with Vendor Unique rc_id.
-**                  This function can only be used if AV is enabled with
-**                  feature BTA_AV_FEAT_RCCT.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AvRemoteVendorUniqueCmd
+ *
+ * Description      Send a remote control command with Vendor Unique rc_id.
+ *                  This function can only be used if AV is enabled with
+ *                  feature BTA_AV_FEAT_RCCT.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AvRemoteVendorUniqueCmd(uint8_t rc_handle, uint8_t label,
                                  tBTA_AV_STATE key_state, uint8_t* p_msg,
                                  uint8_t buf_len)
@@ -447,16 +447,16 @@ void BTA_AvRemoteVendorUniqueCmd(uint8_t rc_handle, uint8_t label,
 }
 
 /*******************************************************************************
-**
-** Function         BTA_AvVendorCmd
-**
-** Description      Send a vendor dependent remote control command.  This
-**                  function can only be used if AV is enabled with feature
-**                  BTA_AV_FEAT_VENDOR.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AvVendorCmd
+ *
+ * Description      Send a vendor dependent remote control command.  This
+ *                  function can only be used if AV is enabled with feature
+ *                  BTA_AV_FEAT_VENDOR.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AvVendorCmd(uint8_t rc_handle, uint8_t label, tBTA_AV_CODE cmd_code, uint8_t *p_data, uint16_t len)
 {
     tBTA_AV_API_VENDOR *p_buf =
@@ -481,17 +481,17 @@ void BTA_AvVendorCmd(uint8_t rc_handle, uint8_t label, tBTA_AV_CODE cmd_code, ui
 }
 
 /*******************************************************************************
-**
-** Function         BTA_AvVendorRsp
-**
-** Description      Send a vendor dependent remote control response.
-**                  This function must be called if a BTA_AV_VENDOR_CMD_EVT
-**                  is received. This function can only be used if AV is
-**                  enabled with feature BTA_AV_FEAT_VENDOR.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AvVendorRsp
+ *
+ * Description      Send a vendor dependent remote control response.
+ *                  This function must be called if a BTA_AV_VENDOR_CMD_EVT
+ *                  is received. This function can only be used if AV is
+ *                  enabled with feature BTA_AV_FEAT_VENDOR.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AvVendorRsp(uint8_t rc_handle, uint8_t label, tBTA_AV_CODE rsp_code, uint8_t *p_data, uint16_t len, uint32_t company_id)
 {
     tBTA_AV_API_VENDOR *p_buf =
@@ -519,15 +519,15 @@ void BTA_AvVendorRsp(uint8_t rc_handle, uint8_t label, tBTA_AV_CODE rsp_code, ui
 }
 
 /*******************************************************************************
-**
-** Function         BTA_AvOpenRc
-**
-** Description      Open an AVRCP connection toward the device with the
-**                  specified handle
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AvOpenRc
+ *
+ * Description      Open an AVRCP connection toward the device with the
+ *                  specified handle
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AvOpenRc(tBTA_AV_HNDL handle)
 {
     tBTA_AV_API_OPEN_RC *p_buf =
@@ -540,14 +540,14 @@ void BTA_AvOpenRc(tBTA_AV_HNDL handle)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_AvCloseRc
-**
-** Description      Close an AVRCP connection
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AvCloseRc
+ *
+ * Description      Close an AVRCP connection
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AvCloseRc(uint8_t rc_handle)
 {
     tBTA_AV_API_CLOSE_RC *p_buf =
@@ -560,17 +560,17 @@ void BTA_AvCloseRc(uint8_t rc_handle)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_AvMetaRsp
-**
-** Description      Send a Metadata/Advanced Control response. The message contained
-**                  in p_pkt can be composed with AVRC utility functions.
-**                  This function can only be used if AV is enabled with feature
-**                  BTA_AV_FEAT_METADATA.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AvMetaRsp
+ *
+ * Description      Send a Metadata/Advanced Control response. The message contained
+ *                  in p_pkt can be composed with AVRC utility functions.
+ *                  This function can only be used if AV is enabled with feature
+ *                  BTA_AV_FEAT_METADATA.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AvMetaRsp(uint8_t rc_handle, uint8_t label, tBTA_AV_CODE rsp_code,
                                BT_HDR *p_pkt)
 {
@@ -588,19 +588,19 @@ void BTA_AvMetaRsp(uint8_t rc_handle, uint8_t label, tBTA_AV_CODE rsp_code,
 }
 
 /*******************************************************************************
-**
-** Function         BTA_AvMetaCmd
-**
-** Description      Send a Metadata/Advanced Control command. The message contained
-**                  in p_pkt can be composed with AVRC utility functions.
-**                  This function can only be used if AV is enabled with feature
-**                  BTA_AV_FEAT_METADATA.
-**                  This message is sent only when the peer supports the TG role.
+ *
+ * Function         BTA_AvMetaCmd
+ *
+ * Description      Send a Metadata/Advanced Control command. The message contained
+ *                  in p_pkt can be composed with AVRC utility functions.
+ *                  This function can only be used if AV is enabled with feature
+ *                  BTA_AV_FEAT_METADATA.
+ *                  This message is sent only when the peer supports the TG role.
 *8                  The only command makes sense right now is the absolute volume command.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AvMetaCmd(uint8_t rc_handle, uint8_t label, tBTA_AV_CMD cmd_code, BT_HDR *p_pkt)
 {
     tBTA_AV_API_META_RSP *p_buf =
diff --git a/system/bta/av/bta_av_cfg.cc b/system/bta/av/bta_av_cfg.cc
index 54a1b6bbd0f..ddb0f492224 100644
--- a/system/bta/av/bta_av_cfg.cc
+++ b/system/bta/av/bta_av_cfg.cc
@@ -60,10 +60,10 @@ const uint32_t  bta_av_meta_caps_co_ids[] = {
 #endif
 
 /* Added to modify
-**	1. flush timeout
-**	2. Remove Group navigation support in SupportedFeatures
-**	3. GetCapabilities supported event_ids list
-**	4. GetCapabilities supported event_ids count
+ *	1. flush timeout
+ *	2. Remove Group navigation support in SupportedFeatures
+ *	3. GetCapabilities supported event_ids list
+ *	4. GetCapabilities supported event_ids count
 */
 /* Flushing partial avdtp packets can cause some headsets to disconnect the link
    if receiving partial a2dp frames */
diff --git a/system/bta/av/bta_av_ci.cc b/system/bta/av/bta_av_ci.cc
index 1e353ea0480..895351a661a 100644
--- a/system/bta/av/bta_av_ci.cc
+++ b/system/bta/av/bta_av_ci.cc
@@ -31,16 +31,16 @@
 #include <string.h>
 
 /*******************************************************************************
-**
-** Function         bta_av_ci_src_data_ready
-**
-** Description      This function sends an event to the AV indicating that
-**                  the phone has audio stream data ready to send and AV
-**                  should call bta_av_co_audio_src_data_path().
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_ci_src_data_ready
+ *
+ * Description      This function sends an event to the AV indicating that
+ *                  the phone has audio stream data ready to send and AV
+ *                  should call bta_av_co_audio_src_data_path().
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_ci_src_data_ready(tBTA_AV_CHNL chnl)
 {
     BT_HDR *p_buf = (BT_HDR *)osi_malloc(sizeof(BT_HDR));
@@ -52,18 +52,18 @@ void bta_av_ci_src_data_ready(tBTA_AV_CHNL chnl)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_ci_setconfig
-**
-** Description      This function must be called in response to function
-**                  bta_av_co_audio_setconfig().
-**                  Parameter err_code is set to an AVDTP status value;
-**                  AVDT_SUCCESS if the codec configuration is ok,
-**                  otherwise error.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_ci_setconfig
+ *
+ * Description      This function must be called in response to function
+ *                  bta_av_co_audio_setconfig().
+ *                  Parameter err_code is set to an AVDTP status value;
+ *                  AVDT_SUCCESS if the codec configuration is ok,
+ *                  otherwise error.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_ci_setconfig(tBTA_AV_HNDL hndl, uint8_t err_code, uint8_t category,
                          uint8_t num_seid, uint8_t *p_seid, bool recfg_needed, uint8_t avdt_handle)
 {
diff --git a/system/bta/av/bta_av_int.h b/system/bta/av/bta_av_int.h
index e452b252f3f..96b3c00b967 100644
--- a/system/bta/av/bta_av_int.h
+++ b/system/bta/av/bta_av_int.h
@@ -34,8 +34,8 @@
 
 #define BTA_AV_DEBUG TRUE
 /*****************************************************************************
-**  Constants
-*****************************************************************************/
+ *  Constants
+ ****************************************************************************/
 
 enum
 {
@@ -149,8 +149,8 @@ enum
 
 
 /*****************************************************************************
-**  Data types
-*****************************************************************************/
+ *  Data types
+ ****************************************************************************/
 
 /* function types for call-out functions */
 typedef bool (*tBTA_AV_CO_INIT) (tA2DP_CODEC_SEP_INDEX codec_sep_index,
@@ -588,8 +588,8 @@ typedef struct
 
 
 /*****************************************************************************
-**  Global data
-*****************************************************************************/
+ *  Global data
+ ****************************************************************************/
 
 /* control block declaration */
 extern tBTA_AV_CB bta_av_cb;
@@ -610,8 +610,8 @@ extern void bta_av_sink_data_cback(uint8_t handle, BT_HDR *p_pkt,
                                    uint32_t time_stamp, uint8_t m_pt);
 
 /*****************************************************************************
-**  Function prototypes
-*****************************************************************************/
+ *  Function prototypes
+ ****************************************************************************/
 /* utility functions */
 extern tBTA_AV_SCB *bta_av_hndl_to_scb(uint16_t handle);
 extern bool bta_av_chk_start(tBTA_AV_SCB *p_scb);
diff --git a/system/bta/av/bta_av_main.cc b/system/bta/av/bta_av_main.cc
index b56e32a9cd3..017511e2bee 100644
--- a/system/bta/av/bta_av_main.cc
+++ b/system/bta/av/bta_av_main.cc
@@ -43,8 +43,8 @@
 #endif
 
 /*****************************************************************************
-** Constants and types
-*****************************************************************************/
+ * Constants and types
+ ****************************************************************************/
 
 #ifndef BTA_AV_RET_TOUT
 #define BTA_AV_RET_TOUT     4
@@ -190,8 +190,8 @@ const tBTA_AV_NSM_ACT bta_av_nsm_act[] =
 };
 
 /*****************************************************************************
-** Global data
-*****************************************************************************/
+ * Global data
+ ****************************************************************************/
 
 /* AV control block */
 tBTA_AV_CB  bta_av_cb;
@@ -201,15 +201,15 @@ static const char *bta_av_st_code(uint8_t state);
 #endif
 
 /*******************************************************************************
-**
-** Function         bta_av_api_enable
-**
-** Description      Handle an API enable event.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_api_enable
+ *
+ * Description      Handle an API enable event.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_av_api_enable(tBTA_AV_DATA *p_data)
 {
     /* initialize control block */
@@ -247,14 +247,14 @@ static void bta_av_api_enable(tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_addr_to_scb
-**
-** Description      find the stream control block by the peer addr
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_addr_to_scb
+ *
+ * Description      find the stream control block by the peer addr
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static tBTA_AV_SCB * bta_av_addr_to_scb(BD_ADDR bd_addr)
 {
     tBTA_AV_SCB * p_scb = NULL;
@@ -275,14 +275,14 @@ static tBTA_AV_SCB * bta_av_addr_to_scb(BD_ADDR bd_addr)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_hndl_to_scb
-**
-** Description      find the stream control block by the handle
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_hndl_to_scb
+ *
+ * Description      find the stream control block by the handle
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 tBTA_AV_SCB * bta_av_hndl_to_scb(uint16_t handle)
 {
     tBTA_AV_HNDL hndl = (tBTA_AV_HNDL)handle;
@@ -297,16 +297,16 @@ tBTA_AV_SCB * bta_av_hndl_to_scb(uint16_t handle)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_alloc_scb
-**
-** Description      allocate stream control block,
-**                  register the service to stack
-**                  create SDP record
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_alloc_scb
+ *
+ * Description      allocate stream control block,
+ *                  register the service to stack
+ *                  create SDP record
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static tBTA_AV_SCB * bta_av_alloc_scb(tBTA_AV_CHNL chnl)
 {
     tBTA_AV_SCB *p_ret = NULL;
@@ -359,7 +359,7 @@ static tBTA_AV_SCB * bta_av_alloc_scb(tBTA_AV_CHNL chnl)
 }
 
 /*******************************************************************************
-*******************************************************************************/
+ ******************************************************************************/
 void bta_av_conn_cback(UNUSED_ATTR uint8_t handle, BD_ADDR bd_addr,
                        uint8_t event, tAVDT_CTRL *p_data)
 {
@@ -404,14 +404,14 @@ void bta_av_conn_cback(UNUSED_ATTR uint8_t handle, BD_ADDR bd_addr,
 
 #if (AVDT_REPORTING == TRUE)
 /*******************************************************************************
-**
-** Function         bta_av_a2dp_report_cback
-**
-** Description      A2DP report callback.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_a2dp_report_cback
+ *
+ * Description      A2DP report callback.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_av_a2dp_report_cback(UNUSED_ATTR uint8_t handle, UNUSED_ATTR AVDT_REPORT_TYPE type,
                                     UNUSED_ATTR tAVDT_REPORT_DATA *p_data)
 {
@@ -421,16 +421,16 @@ static void bta_av_a2dp_report_cback(UNUSED_ATTR uint8_t handle, UNUSED_ATTR AVD
 #endif
 
 /*******************************************************************************
-**
-** Function         bta_av_api_register
-**
-** Description      allocate stream control block,
-**                  register the service to stack
-**                  create SDP record
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_api_register
+ *
+ * Description      allocate stream control block,
+ *                  register the service to stack
+ *                  create SDP record
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_av_api_register(tBTA_AV_DATA *p_data)
 {
     tBTA_AV_REGISTER    registr;
@@ -709,15 +709,15 @@ static void bta_av_api_register(tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_api_deregister
-**
-** Description      de-register a channel
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_api_deregister
+ *
+ * Description      de-register a channel
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_api_deregister(tBTA_AV_DATA *p_data)
 {
     tBTA_AV_SCB *p_scb = bta_av_hndl_to_scb(p_data->hdr.layer_specific);
@@ -734,15 +734,15 @@ void bta_av_api_deregister(tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_ci_data
-**
-** Description      forward the BTA_AV_CI_SRC_DATA_READY_EVT to stream state machine
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_ci_data
+ *
+ * Description      forward the BTA_AV_CI_SRC_DATA_READY_EVT to stream state machine
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_av_ci_data(tBTA_AV_DATA *p_data)
 {
     tBTA_AV_SCB *p_scb;
@@ -761,14 +761,14 @@ static void bta_av_ci_data(tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_rpc_conn
-**
-** Description      report report channel open
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_rpc_conn
+ *
+ * Description      report report channel open
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 #if (AVDT_REPORTING == TRUE)
 static void bta_av_rpc_conn(UNUSED_ATTR tBTA_AV_DATA *p_data)
 {
@@ -776,15 +776,15 @@ static void bta_av_rpc_conn(UNUSED_ATTR tBTA_AV_DATA *p_data)
 #endif
 
 /*******************************************************************************
-**
-** Function         bta_av_api_to_ssm
-**
-** Description      forward the API request to stream state machine
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_api_to_ssm
+ *
+ * Description      forward the API request to stream state machine
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_av_api_to_ssm(tBTA_AV_DATA *p_data)
 {
     int xx;
@@ -797,15 +797,15 @@ static void bta_av_api_to_ssm(tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_chk_start
-**
-** Description      if this is audio channel, check if more than one audio
-**                  channel is connected & already started.
-**
-** Returns          true, if need api_start
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_chk_start
+ *
+ * Description      if this is audio channel, check if more than one audio
+ *                  channel is connected & already started.
+ *
+ * Returns          true, if need api_start
+ *
+ ******************************************************************************/
 bool bta_av_chk_start(tBTA_AV_SCB *p_scb)
 {
     bool start = false;
@@ -840,15 +840,15 @@ bool bta_av_chk_start(tBTA_AV_SCB *p_scb)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_restore_switch
-**
-** Description      assume that the caller of this function already makes
-**                  sure that there's only one ACL connection left
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_restore_switch
+ *
+ * Description      assume that the caller of this function already makes
+ *                  sure that there's only one ACL connection left
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_restore_switch (void)
 {
     tBTA_AV_CB   *p_cb = &bta_av_cb;
@@ -871,14 +871,14 @@ void bta_av_restore_switch (void)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_sys_rs_cback
-**
-** Description      Receives the role change event from dm
-**
-** Returns          (BTA_SYS_ROLE_CHANGE, new_role, hci_status, p_bda)
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_sys_rs_cback
+ *
+ * Description      Receives the role change event from dm
+ *
+ * Returns          (BTA_SYS_ROLE_CHANGE, new_role, hci_status, p_bda)
+ *
+ ******************************************************************************/
 static void bta_av_sys_rs_cback (UNUSED_ATTR tBTA_SYS_CONN_STATUS status,uint8_t id,
                                  uint8_t app_id, BD_ADDR peer_addr)
 {
@@ -948,16 +948,16 @@ static void bta_av_sys_rs_cback (UNUSED_ATTR tBTA_SYS_CONN_STATUS status,uint8_t
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_sco_chg_cback
-**
-** Description      receive & process the SCO connection up/down event from sys.
-**                  call setup also triggers this callback, to suspend av before sco
-**                  activity happens, or to resume av once call ends.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_sco_chg_cback
+ *
+ * Description      receive & process the SCO connection up/down event from sys.
+ *                  call setup also triggers this callback, to suspend av before sco
+ *                  activity happens, or to resume av once call ends.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_av_sco_chg_cback(tBTA_SYS_CONN_STATUS status,
                                  uint8_t id,UNUSED_ATTR uint8_t app_id,
                                  UNUSED_ATTR BD_ADDR peer_addr)
@@ -1005,16 +1005,16 @@ static void bta_av_sco_chg_cback(tBTA_SYS_CONN_STATUS status,
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_switch_if_needed
-**
-** Description      This function checks if there is another existing AV
-**                  channel that is local as slave role.
-**                  If so, role switch and remove it from link policy.
-**
-** Returns          true, if role switch is done
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_switch_if_needed
+ *
+ * Description      This function checks if there is another existing AV
+ *                  channel that is local as slave role.
+ *                  If so, role switch and remove it from link policy.
+ *
+ * Returns          true, if role switch is done
+ *
+ ******************************************************************************/
 bool bta_av_switch_if_needed(tBTA_AV_SCB *p_scb)
 {
     uint8_t role;
@@ -1056,15 +1056,15 @@ bool bta_av_switch_if_needed(tBTA_AV_SCB *p_scb)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_link_role_ok
-**
-** Description      This function checks if the SCB has existing ACL connection
-**                  If so, check if the link role fits the requirements.
-**
-** Returns          true, if role is ok
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_link_role_ok
+ *
+ * Description      This function checks if the SCB has existing ACL connection
+ *                  If so, check if the link role fits the requirements.
+ *
+ * Returns          true, if role is ok
+ *
+ ******************************************************************************/
 bool bta_av_link_role_ok(tBTA_AV_SCB *p_scb, uint8_t bits)
 {
     uint8_t role;
@@ -1095,15 +1095,15 @@ bool bta_av_link_role_ok(tBTA_AV_SCB *p_scb, uint8_t bits)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_chk_mtu
-**
-** Description      if this is audio channel, check if more than one audio
-**                  channel is connected.
-**
-** Returns          The smallest mtu of the connected audio channels
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_chk_mtu
+ *
+ * Description      if this is audio channel, check if more than one audio
+ *                  channel is connected.
+ *
+ * Returns          The smallest mtu of the connected audio channels
+ *
+ ******************************************************************************/
 uint16_t bta_av_chk_mtu(tBTA_AV_SCB *p_scb,
                         UNUSED_ATTR uint16_t mtu)
 {
@@ -1141,14 +1141,14 @@ uint16_t bta_av_chk_mtu(tBTA_AV_SCB *p_scb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_dup_audio_buf
-**
-** Description      dup the audio data to the q_info.a2dp of other audio channels
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_dup_audio_buf
+ *
+ * Description      dup the audio data to the q_info.a2dp of other audio channels
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_dup_audio_buf(tBTA_AV_SCB *p_scb, BT_HDR *p_buf)
 {
     /* Test whether there is more than one audio channel connected */
@@ -1182,15 +1182,15 @@ void bta_av_dup_audio_buf(tBTA_AV_SCB *p_scb, BT_HDR *p_buf)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_sm_execute
-**
-** Description      State machine event handling function for AV
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_sm_execute
+ *
+ * Description      State machine event handling function for AV
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_sm_execute(tBTA_AV_CB *p_cb, uint16_t event, tBTA_AV_DATA *p_data)
 {
     tBTA_AV_ST_TBL      state_table;
@@ -1221,15 +1221,15 @@ void bta_av_sm_execute(tBTA_AV_CB *p_cb, uint16_t event, tBTA_AV_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_hdl_event
-**
-** Description      Advanced audio/video main event handling function.
-**
-**
-** Returns          bool
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_hdl_event
+ *
+ * Description      Advanced audio/video main event handling function.
+ *
+ *
+ * Returns          bool
+ *
+ ******************************************************************************/
 bool bta_av_hdl_event(BT_HDR *p_msg)
 {
     uint16_t event = p_msg->event;
@@ -1271,18 +1271,18 @@ bool bta_av_hdl_event(BT_HDR *p_msg)
 }
 
 /*****************************************************************************
-**  Debug Functions
-*****************************************************************************/
+ *  Debug Functions
+ ****************************************************************************/
 #if (BTA_AV_DEBUG == TRUE)
 /*******************************************************************************
-**
-** Function         bta_av_st_code
-**
-** Description
-**
-** Returns          char *
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_st_code
+ *
+ * Description
+ *
+ * Returns          char *
+ *
+ ******************************************************************************/
 static const char *bta_av_st_code(uint8_t state)
 {
     switch(state)
@@ -1293,14 +1293,14 @@ static const char *bta_av_st_code(uint8_t state)
     }
 }
 /*******************************************************************************
-**
-** Function         bta_av_evt_code
-**
-** Description
-**
-** Returns          char *
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_evt_code
+ *
+ * Description
+ *
+ * Returns          char *
+ *
+ ******************************************************************************/
 const char *bta_av_evt_code(uint16_t evt_code)
 {
     switch(evt_code)
diff --git a/system/bta/av/bta_av_ssm.cc b/system/bta/av/bta_av_ssm.cc
index 75140e79a5a..d433b602068 100644
--- a/system/bta/av/bta_av_ssm.cc
+++ b/system/bta/av/bta_av_ssm.cc
@@ -29,8 +29,8 @@
 #include "bta_av_int.h"
 
 /*****************************************************************************
-** Constants and types
-*****************************************************************************/
+ * Constants and types
+ ****************************************************************************/
 
 /* state machine states */
 enum
@@ -382,15 +382,15 @@ static const char *bta_av_sst_code(uint8_t state);
 #endif
 
 /*******************************************************************************
-**
-** Function         bta_av_is_rcfg_sst
-**
-** Description      Check if stream state machine is in reconfig state.
-**
-**
-** Returns          true if stream state machine is in reconfig state.
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_is_rcfg_sst
+ *
+ * Description      Check if stream state machine is in reconfig state.
+ *
+ *
+ * Returns          true if stream state machine is in reconfig state.
+ *
+ ******************************************************************************/
 bool bta_av_is_rcfg_sst (tBTA_AV_SCB *p_scb)
 {
     bool is_rcfg_sst = false;
@@ -405,15 +405,15 @@ bool bta_av_is_rcfg_sst (tBTA_AV_SCB *p_scb)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_ssm_execute
-**
-** Description      Stream state machine event handling function for AV
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_ssm_execute
+ *
+ * Description      Stream state machine event handling function for AV
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_ssm_execute(tBTA_AV_SCB *p_scb, uint16_t event, tBTA_AV_DATA *p_data)
 {
     tBTA_AV_SST_TBL     state_table;
@@ -477,15 +477,15 @@ void bta_av_ssm_execute(tBTA_AV_SCB *p_scb, uint16_t event, tBTA_AV_DATA *p_data
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_is_scb_opening
-**
-** Description      Returns true is scb is in opening state.
-**
-**
-** Returns          true if scb is in opening state.
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_is_scb_opening
+ *
+ * Description      Returns true is scb is in opening state.
+ *
+ *
+ * Returns          true if scb is in opening state.
+ *
+ ******************************************************************************/
 bool bta_av_is_scb_opening (tBTA_AV_SCB *p_scb)
 {
     bool is_opening = false;
@@ -500,15 +500,15 @@ bool bta_av_is_scb_opening (tBTA_AV_SCB *p_scb)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_is_scb_incoming
-**
-** Description      Returns true is scb is in incoming state.
-**
-**
-** Returns          true if scb is in incoming state.
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_is_scb_incoming
+ *
+ * Description      Returns true is scb is in incoming state.
+ *
+ *
+ * Returns          true if scb is in incoming state.
+ *
+ ******************************************************************************/
 bool bta_av_is_scb_incoming (tBTA_AV_SCB *p_scb)
 {
     bool is_incoming = false;
@@ -523,15 +523,15 @@ bool bta_av_is_scb_incoming (tBTA_AV_SCB *p_scb)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_set_scb_sst_init
-**
-** Description      Set SST state to INIT.
-**                  Use this function to change SST outside of state machine.
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_set_scb_sst_init
+ *
+ * Description      Set SST state to INIT.
+ *                  Use this function to change SST outside of state machine.
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 void bta_av_set_scb_sst_init (tBTA_AV_SCB *p_scb)
 {
     if (p_scb)
@@ -541,15 +541,15 @@ void bta_av_set_scb_sst_init (tBTA_AV_SCB *p_scb)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_is_scb_init
-**
-** Description      Returns true is scb is in init state.
-**
-**
-** Returns          true if scb is in incoming state.
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_is_scb_init
+ *
+ * Description      Returns true is scb is in init state.
+ *
+ *
+ * Returns          true if scb is in incoming state.
+ *
+ ******************************************************************************/
 bool bta_av_is_scb_init (tBTA_AV_SCB *p_scb)
 {
     bool is_init = false;
@@ -564,15 +564,15 @@ bool bta_av_is_scb_init (tBTA_AV_SCB *p_scb)
 }
 
 /*******************************************************************************
-**
-** Function         bta_av_set_scb_sst_incoming
-**
-** Description      Set SST state to incoming.
-**                  Use this function to change SST outside of state machine.
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_set_scb_sst_incoming
+ *
+ * Description      Set SST state to incoming.
+ *                  Use this function to change SST outside of state machine.
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 void bta_av_set_scb_sst_incoming (tBTA_AV_SCB *p_scb)
 {
     if (p_scb)
@@ -582,18 +582,18 @@ void bta_av_set_scb_sst_incoming (tBTA_AV_SCB *p_scb)
 }
 
 /*****************************************************************************
-**  Debug Functions
-*****************************************************************************/
+ *  Debug Functions
+ ****************************************************************************/
 #if (BTA_AV_DEBUG == TRUE)
 /*******************************************************************************
-**
-** Function         bta_av_sst_code
-**
-** Description
-**
-** Returns          char *
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_sst_code
+ *
+ * Description
+ *
+ * Returns          char *
+ *
+ ******************************************************************************/
 static const char *bta_av_sst_code(uint8_t state)
 {
     switch(state)
diff --git a/system/bta/dm/bta_dm_act.cc b/system/bta/dm/bta_dm_act.cc
index 3b5922d1a71..462a4898899 100644
--- a/system/bta/dm/bta_dm_act.cc
+++ b/system/bta/dm/bta_dm_act.cc
@@ -251,15 +251,15 @@ extern DEV_CLASS local_device_default_class;
 extern fixed_queue_t *btu_bta_alarm_queue;
 
 /*******************************************************************************
-**
-** Function         bta_dm_enable
-**
-** Description      Initialises the BT device manager
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_enable
+ *
+ * Description      Initialises the BT device manager
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_enable(tBTA_DM_MSG *p_data)
 {
     tBTA_DM_ENABLE enable_event;
@@ -295,15 +295,15 @@ void bta_dm_enable(tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_init_cb
-**
-** Description      Initializes the bta_dm_cb control block
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_init_cb
+ *
+ * Description      Initializes the bta_dm_cb control block
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_init_cb(void)
 {
     memset(&bta_dm_cb, 0, sizeof(bta_dm_cb));
@@ -317,15 +317,15 @@ void bta_dm_init_cb(void)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_deinit_cb
-**
-** Description      De-initializes the bta_dm_cb control block
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_deinit_cb
+ *
+ * Description      De-initializes the bta_dm_cb control block
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_deinit_cb(void)
 {
     /*
@@ -343,15 +343,15 @@ void bta_dm_deinit_cb(void)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_sys_hw_cback
-**
-** Description     callback register to SYS to get HW status updates
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_sys_hw_cback
+ *
+ * Description     callback register to SYS to get HW status updates
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_dm_sys_hw_cback( tBTA_SYS_HW_EVT status )
 {
     DEV_CLASS   dev_class;
@@ -477,15 +477,15 @@ static void bta_dm_sys_hw_cback( tBTA_SYS_HW_EVT status )
 
 
 /*******************************************************************************
-**
-** Function         bta_dm_disable
-**
-** Description      Disables the BT device manager
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_disable
+ *
+ * Description      Disables the BT device manager
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_disable (UNUSED_ATTR tBTA_DM_MSG *p_data)
 {
     /* Set l2cap idle timeout to 0 (so BTE immediately disconnects ACL link after last channel is closed) */
@@ -530,17 +530,17 @@ void bta_dm_disable (UNUSED_ATTR tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_disable_timer_cback
-**
-** Description      Called if the disable timer expires
-**                  Used to close ACL connections which are still active
-**
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_disable_timer_cback
+ *
+ * Description      Called if the disable timer expires
+ *                  Used to close ACL connections which are still active
+ *
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_dm_disable_timer_cback(void *data)
 {
     uint8_t i;
@@ -584,15 +584,15 @@ static void bta_dm_disable_timer_cback(void *data)
 
 
 /*******************************************************************************
-**
-** Function         bta_dm_set_dev_name
-**
-** Description      Sets local device name
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_set_dev_name
+ *
+ * Description      Sets local device name
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_set_dev_name (tBTA_DM_MSG *p_data)
 {
 
@@ -601,15 +601,15 @@ void bta_dm_set_dev_name (tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_set_visibility
-**
-** Description      Sets discoverability, connectability and pairability
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_set_visibility
+ *
+ * Description      Sets discoverability, connectability and pairability
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_set_visibility(tBTA_DM_MSG *p_data)
 {
     uint16_t window, interval;
@@ -682,12 +682,12 @@ void bta_dm_set_visibility(tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_process_remove_device
-**
-** Description      Removes device, Disconnects ACL link if required.
-****
-*******************************************************************************/
+ *
+ * Function         bta_dm_process_remove_device
+ *
+ * Description      Removes device, Disconnects ACL link if required.
+ ***
+ ******************************************************************************/
 void bta_dm_process_remove_device(BD_ADDR bd_addr)
 {
 #if (BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE)
@@ -713,12 +713,12 @@ void bta_dm_process_remove_device(BD_ADDR bd_addr)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_remove_device
-**
-** Description      Removes device, disconnects ACL link if required.
-****
-*******************************************************************************/
+ *
+ * Function         bta_dm_remove_device
+ *
+ * Description      Removes device, disconnects ACL link if required.
+ ***
+ ******************************************************************************/
 void bta_dm_remove_device(tBTA_DM_MSG *p_data)
 {
     tBTA_DM_API_REMOVE_DEVICE *p_dev = &p_data->remove_dev;
@@ -806,14 +806,14 @@ void bta_dm_remove_device(tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_add_device
-**
-** Description      This function adds a Link Key to an security database entry.
-**                  It is normally called during host startup to restore all required information
-**                  stored in the NVRAM.
-****
-*******************************************************************************/
+ *
+ * Function         bta_dm_add_device
+ *
+ * Description      This function adds a Link Key to an security database entry.
+ *                  It is normally called during host startup to restore all required information
+ *                  stored in the NVRAM.
+ ***
+ ******************************************************************************/
 void bta_dm_add_device (tBTA_DM_MSG *p_data)
 {
     tBTA_DM_API_ADD_DEVICE *p_dev = &p_data->add_dev;
@@ -861,14 +861,14 @@ void bta_dm_add_device (tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_close_acl
-**
-** Description      This function forces to close the connection to a remote device
-**                  and optionaly remove the device from security database if
-**                  required.
-****
-*******************************************************************************/
+ *
+ * Function         bta_dm_close_acl
+ *
+ * Description      This function forces to close the connection to a remote device
+ *                  and optionaly remove the device from security database if
+ *                  required.
+ ***
+ ******************************************************************************/
 void bta_dm_close_acl(tBTA_DM_MSG *p_data)
 {
     tBTA_DM_API_REMOVE_ACL *p_remove_acl = &p_data->remove_acl;
@@ -914,12 +914,12 @@ void bta_dm_close_acl(tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_remove_all_acl
-**
-** Description      This function forces to close all the ACL links specified by link type
-****
-*******************************************************************************/
+ *
+ * Function         bta_dm_remove_all_acl
+ *
+ * Description      This function forces to close all the ACL links specified by link type
+ ***
+ ******************************************************************************/
 void bta_dm_remove_all_acl(tBTA_DM_MSG *p_data)
 {
     const tBTA_DM_LINK_TYPE link_type = p_data->remove_all_acl.link_type;
@@ -946,15 +946,15 @@ void bta_dm_remove_all_acl(tBTA_DM_MSG *p_data)
 
 
 /*******************************************************************************
-**
-** Function         bta_dm_bond
-**
-** Description      Bonds with peer device
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_bond
+ *
+ * Description      Bonds with peer device
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_bond (tBTA_DM_MSG *p_data)
 {
     tBTM_STATUS status;
@@ -999,15 +999,15 @@ void bta_dm_bond (tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_bond_cancel
-**
-** Description      Cancels bonding with a peer device
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_bond_cancel
+ *
+ * Description      Cancels bonding with a peer device
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_bond_cancel (tBTA_DM_MSG *p_data)
 {
     tBTM_STATUS status;
@@ -1026,15 +1026,15 @@ void bta_dm_bond_cancel (tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_pin_reply
-**
-** Description      Send the pin_reply to a request from BTM
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_pin_reply
+ *
+ * Description      Send the pin_reply to a request from BTM
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_pin_reply (tBTA_DM_MSG *p_data)
 {
     uint32_t  trusted_mask[BTM_SEC_SERVICE_ARRAY_SIZE];
@@ -1064,14 +1064,14 @@ void bta_dm_pin_reply (tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_policy_cback
-**
-** Description      process the link policy changes
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_policy_cback
+ *
+ * Description      process the link policy changes
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_dm_policy_cback(tBTA_SYS_CONN_STATUS status, uint8_t id, uint8_t app_id, BD_ADDR peer_addr)
 {
     tBTA_DM_PEER_DEVICE *p_dev = NULL;
@@ -1128,15 +1128,15 @@ static void bta_dm_policy_cback(tBTA_SYS_CONN_STATUS status, uint8_t id, uint8_t
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_confirm
-**
-** Description      Send the user confirm request reply in response to a
-**                  request from BTM
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_confirm
+ *
+ * Description      Send the user confirm request reply in response to a
+ *                  request from BTM
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_confirm(tBTA_DM_MSG *p_data)
 {
     tBTM_STATUS res = BTM_NOT_AUTHORIZED;
@@ -1147,28 +1147,28 @@ void bta_dm_confirm(tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_loc_oob
-**
-** Description      Retrieve the OOB data from the local LM
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_loc_oob
+ *
+ * Description      Retrieve the OOB data from the local LM
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_loc_oob(UNUSED_ATTR tBTA_DM_MSG *p_data)
 {
     BTM_ReadLocalOobData();
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_ci_io_req_act
-**
-** Description      respond to the IO capabilities request from BTM
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_ci_io_req_act
+ *
+ * Description      respond to the IO capabilities request from BTM
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_ci_io_req_act(tBTA_DM_MSG *p_data)
 {
     tBTM_AUTH_REQ   auth_req = BTM_AUTH_AP_NO;
@@ -1179,15 +1179,15 @@ void bta_dm_ci_io_req_act(tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_ci_rmt_oob_act
-**
-** Description      respond to the OOB data request for the remote device from BTM
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_ci_rmt_oob_act
+ *
+ * Description      respond to the OOB data request for the remote device from BTM
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_ci_rmt_oob_act(tBTA_DM_MSG *p_data)
 {
     tBTM_STATUS res = BTM_NOT_AUTHORIZED;
@@ -1199,15 +1199,15 @@ void bta_dm_ci_rmt_oob_act(tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_search_start
-**
-** Description      Starts an inquiry
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_search_start
+ *
+ * Description      Starts an inquiry
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_search_start (tBTA_DM_MSG *p_data)
 {
     tBTM_INQUIRY_CMPL result;
@@ -1253,15 +1253,15 @@ void bta_dm_search_start (tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_search_cancel
-**
-** Description      Cancels an ongoing search for devices
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_search_cancel
+ *
+ * Description      Cancels an ongoing search for devices
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_search_cancel (UNUSED_ATTR tBTA_DM_MSG *p_data)
 {
 
@@ -1306,15 +1306,15 @@ void bta_dm_search_cancel (UNUSED_ATTR tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_discover
-**
-** Description      Discovers services on a remote device
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_discover
+ *
+ * Description      Discovers services on a remote device
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_discover (tBTA_DM_MSG *p_data)
 {
 #if (BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE)
@@ -1353,14 +1353,14 @@ void bta_dm_discover (tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_di_disc_cmpl
-**
-** Description      Sends event to application when DI discovery complete
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_di_disc_cmpl
+ *
+ * Description      Sends event to application when DI discovery complete
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_di_disc_cmpl(tBTA_DM_MSG *p_data)
 {
     tBTA_DM_DI_DISC_CMPL    di_disc;
@@ -1381,15 +1381,15 @@ void bta_dm_di_disc_cmpl(tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_di_disc_callback
-**
-** Description      This function queries a remote device for DI information.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_di_disc_callback
+ *
+ * Description      This function queries a remote device for DI information.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_dm_di_disc_callback(uint16_t result)
 {
     tBTA_DM_MSG *p_msg = (tBTA_DM_MSG *)osi_malloc(sizeof(tBTA_DM_MSG));
@@ -1402,16 +1402,16 @@ static void bta_dm_di_disc_callback(uint16_t result)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_disable_search_and_disc
-**
-** Description      Cancels an ongoing search or discovery for devices in case of
-**                  a Bluetooth disable
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_disable_search_and_disc
+ *
+ * Description      Cancels an ongoing search or discovery for devices in case of
+ *                  a Bluetooth disable
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_dm_disable_search_and_disc (void)
 {
     tBTA_DM_DI_DISC_CMPL    di_disc;
@@ -1431,15 +1431,15 @@ static void bta_dm_disable_search_and_disc (void)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_di_disc
-**
-** Description      This function queries a remote device for DI information.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_di_disc
+ *
+ * Description      This function queries a remote device for DI information.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_di_disc (tBTA_DM_MSG *p_data)
 {
     uint16_t  result = BTA_FAILURE;
@@ -1466,14 +1466,14 @@ void bta_dm_di_disc (tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_read_remote_device_name
-**
-** Description      Initiate to get remote device name
-**
-** Returns          true if started to get remote name
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_read_remote_device_name
+ *
+ * Description      Initiate to get remote device name
+ *
+ * Returns          true if started to get remote name
+ *
+ ******************************************************************************/
 static bool bta_dm_read_remote_device_name (BD_ADDR bd_addr,tBT_TRANSPORT transport)
 {
     tBTM_STATUS  btm_status;
@@ -1512,14 +1512,14 @@ static bool bta_dm_read_remote_device_name (BD_ADDR bd_addr,tBT_TRANSPORT transp
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_inq_cmpl
-**
-** Description      Process the inquiry complete event from BTM
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_inq_cmpl
+ *
+ * Description      Process the inquiry complete event from BTM
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_inq_cmpl (tBTA_DM_MSG *p_data)
 {
     tBTA_DM_SEARCH  data;
@@ -1548,14 +1548,14 @@ void bta_dm_inq_cmpl (tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_rmt_name
-**
-** Description      Process the remote name result from BTM
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_rmt_name
+ *
+ * Description      Process the remote name result from BTM
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_rmt_name (tBTA_DM_MSG *p_data)
 {
     APPL_TRACE_DEBUG("bta_dm_rmt_name");
@@ -1569,15 +1569,15 @@ void bta_dm_rmt_name (tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_disc_rmt_name
-**
-** Description      Process the remote name result from BTM when application
-**                  wants to find the name for a bdaddr
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_disc_rmt_name
+ *
+ * Description      Process the remote name result from BTM when application
+ *                  wants to find the name for a bdaddr
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_disc_rmt_name (tBTA_DM_MSG *p_data)
 {
     tBTM_INQ_INFO *p_btm_inq_info;
@@ -1597,14 +1597,14 @@ void bta_dm_disc_rmt_name (tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_sdp_result
-**
-** Description      Process the discovery result from sdp
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_sdp_result
+ *
+ * Description      Process the discovery result from sdp
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_sdp_result (tBTA_DM_MSG *p_data)
 {
 
@@ -1842,14 +1842,14 @@ void bta_dm_sdp_result (tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_search_cmpl
-**
-** Description      Sends event to application
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_search_cmpl
+ *
+ * Description      Sends event to application
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_search_cmpl(tBTA_DM_MSG *p_data)
 {
     APPL_TRACE_EVENT("%s", __func__);
@@ -1865,14 +1865,14 @@ void bta_dm_search_cmpl(tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_disc_result
-**
-** Description      Service discovery result when discovering services on a device
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_disc_result
+ *
+ * Description      Service discovery result when discovering services on a device
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_disc_result (tBTA_DM_MSG *p_data)
 {
     APPL_TRACE_EVENT("%s", __func__);
@@ -1892,14 +1892,14 @@ void bta_dm_disc_result (tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_search_result
-**
-** Description      Service discovery result while searching for devices
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_search_result
+ *
+ * Description      Service discovery result while searching for devices
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_search_result (tBTA_DM_MSG *p_data)
 {
     APPL_TRACE_DEBUG("%s searching:0x%04x, result:0x%04x", __func__,
@@ -1932,15 +1932,15 @@ void bta_dm_search_result (tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_search_timer_cback
-**
-** Description      Called when ACL disconnect time is over
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_search_timer_cback
+ *
+ * Description      Called when ACL disconnect time is over
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_dm_search_timer_cback(UNUSED_ATTR void *data)
 {
     APPL_TRACE_EVENT("%s", __func__);
@@ -1953,28 +1953,28 @@ static void bta_dm_search_timer_cback(UNUSED_ATTR void *data)
 
 
 /*******************************************************************************
-**
-** Function         bta_dm_free_sdp_db
-**
-** Description      Frees SDP data base
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_free_sdp_db
+ *
+ * Description      Frees SDP data base
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_free_sdp_db (UNUSED_ATTR tBTA_DM_MSG *p_data)
 {
     osi_free_and_reset((void **)&bta_dm_search_cb.p_sdp_db);
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_queue_search
-**
-** Description      Queues search command while search is being cancelled
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_queue_search
+ *
+ * Description      Queues search command while search is being cancelled
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_queue_search(tBTA_DM_MSG *p_data)
 {
     osi_free(bta_dm_search_cb.p_search_queue);
@@ -1985,14 +1985,14 @@ void bta_dm_queue_search(tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_queue_disc
-**
-** Description      Queues discovery command while search is being cancelled
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_queue_disc
+ *
+ * Description      Queues discovery command while search is being cancelled
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_queue_disc(tBTA_DM_MSG *p_data)
 {
     osi_free(bta_dm_search_cb.p_search_queue);
@@ -2003,28 +2003,28 @@ void bta_dm_queue_disc(tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_search_clear_queue
-**
-** Description      Clears the queue if API search cancel is called
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_search_clear_queue
+ *
+ * Description      Clears the queue if API search cancel is called
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_search_clear_queue(UNUSED_ATTR tBTA_DM_MSG *p_data)
 {
     osi_free_and_reset((void **)&bta_dm_search_cb.p_search_queue);
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_search_cancel_cmpl
-**
-** Description      Search cancel is complete
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_search_cancel_cmpl
+ *
+ * Description      Search cancel is complete
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_search_cancel_cmpl (UNUSED_ATTR tBTA_DM_MSG *p_data)
 {
     if(bta_dm_search_cb.p_search_queue)
@@ -2036,15 +2036,15 @@ void bta_dm_search_cancel_cmpl (UNUSED_ATTR tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_search_cancel_transac_cmpl
-**
-** Description      Current Service Discovery or remote name procedure is
-**                  completed after search cancellation
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_search_cancel_transac_cmpl
+ *
+ * Description      Current Service Discovery or remote name procedure is
+ *                  completed after search cancellation
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_search_cancel_transac_cmpl(UNUSED_ATTR tBTA_DM_MSG *p_data)
 {
     osi_free_and_reset((void **)&bta_dm_search_cb.p_sdp_db);
@@ -2053,14 +2053,14 @@ void bta_dm_search_cancel_transac_cmpl(UNUSED_ATTR tBTA_DM_MSG *p_data)
 
 
 /*******************************************************************************
-**
-** Function         bta_dm_search_cancel_notify
-**
-** Description      Notify application that search has been cancelled
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_search_cancel_notify
+ *
+ * Description      Notify application that search has been cancelled
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_search_cancel_notify (UNUSED_ATTR tBTA_DM_MSG *p_data)
 {
     if (bta_dm_search_cb.p_search_cback)
@@ -2081,14 +2081,14 @@ void bta_dm_search_cancel_notify (UNUSED_ATTR tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_find_services
-**
-** Description      Starts discovery on a device
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_find_services
+ *
+ * Description      Starts discovery on a device
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_dm_find_services ( BD_ADDR bd_addr)
 {
 
@@ -2199,14 +2199,14 @@ static void bta_dm_find_services ( BD_ADDR bd_addr)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_discover_next_device
-**
-** Description      Starts discovery on the next device in Inquiry data base
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_discover_next_device
+ *
+ * Description      Starts discovery on the next device in Inquiry data base
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_dm_discover_next_device(void)
 {
     APPL_TRACE_DEBUG("bta_dm_discover_next_device");
@@ -2231,14 +2231,14 @@ static void bta_dm_discover_next_device(void)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_discover_device
-**
-** Description      Starts name and service discovery on the device
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_discover_device
+ *
+ * Description      Starts name and service discovery on the device
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_dm_discover_device(BD_ADDR remote_bd_addr)
 {
     tBT_TRANSPORT transport = BT_TRANSPORT_BR_EDR;
@@ -2381,14 +2381,14 @@ static void bta_dm_discover_device(BD_ADDR remote_bd_addr)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_sdp_callback
-**
-** Description      Callback from sdp with discovery status
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_sdp_callback
+ *
+ * Description      Callback from sdp with discovery status
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_dm_sdp_callback (uint16_t sdp_status)
 {
 
@@ -2402,14 +2402,14 @@ static void bta_dm_sdp_callback (uint16_t sdp_status)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_inq_results_cb
-**
-** Description      Inquiry results callback from BTM
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_inq_results_cb
+ *
+ * Description      Inquiry results callback from BTM
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_dm_inq_results_cb (tBTM_INQ_RESULTS *p_inq, uint8_t *p_eir)
 {
 
@@ -2457,15 +2457,15 @@ static void bta_dm_inq_results_cb (tBTM_INQ_RESULTS *p_inq, uint8_t *p_eir)
 
 
 /*******************************************************************************
-**
-** Function         bta_dm_inq_cmpl_cb
-**
-** Description      Inquiry complete callback from BTM
-**
-** Returns          void
-**
-*******************************************************************************/
-static void bta_dm_inq_cmpl_cb (void * p_result)
+ *
+ * Function         bta_dm_inq_cmpl_cb
+ *
+ * Description      Inquiry complete callback from BTM
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
+static void bta_dm_inq_cmpl_cb (void * p_result)
 {
     tBTA_DM_MSG *p_msg = (tBTA_DM_MSG *)osi_malloc(sizeof(tBTA_DM_MSG));
 
@@ -2485,14 +2485,14 @@ static void bta_dm_inq_cmpl_cb (void * p_result)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_service_search_remname_cback
-**
-** Description      Remote name call back from BTM during service discovery
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_service_search_remname_cback
+ *
+ * Description      Remote name call back from BTM during service discovery
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_dm_service_search_remname_cback (BD_ADDR bd_addr,
                                                  UNUSED_ATTR DEV_CLASS dc, BD_NAME bd_name)
 {
@@ -2541,14 +2541,14 @@ static void bta_dm_service_search_remname_cback (BD_ADDR bd_addr,
 
 
 /*******************************************************************************
-**
-** Function         bta_dm_remname_cback
-**
-** Description      Remote name complete call back from BTM
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_remname_cback
+ *
+ * Description      Remote name complete call back from BTM
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_dm_remname_cback (tBTM_REMOTE_DEV_NAME *p_remote_name)
 {
     APPL_TRACE_DEBUG("bta_dm_remname_cback len = %d name=<%s>", p_remote_name->length,
@@ -2579,14 +2579,14 @@ static void bta_dm_remname_cback (tBTM_REMOTE_DEV_NAME *p_remote_name)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_authorize_cback
-**
-** Description      cback requesting authorization
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_authorize_cback
+ *
+ * Description      cback requesting authorization
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static uint8_t bta_dm_authorize_cback (BD_ADDR bd_addr, DEV_CLASS dev_class, BD_NAME bd_name,
                                      UNUSED_ATTR uint8_t *service_name, uint8_t service_id,
                                        UNUSED_ATTR bool is_originator)
@@ -2636,14 +2636,14 @@ static uint8_t bta_dm_authorize_cback (BD_ADDR bd_addr, DEV_CLASS dev_class, BD_
 
 
 /*******************************************************************************
-**
-** Function         bta_dm_pinname_cback
-**
-** Description      Callback requesting pin_key
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_pinname_cback
+ *
+ * Description      Callback requesting pin_key
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_dm_pinname_cback (void *p_data)
 {
     tBTM_REMOTE_DEV_NAME *p_result = (tBTM_REMOTE_DEV_NAME *)p_data;
@@ -2697,14 +2697,14 @@ static void bta_dm_pinname_cback (void *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_pin_cback
-**
-** Description      Callback requesting pin_key
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_pin_cback
+ *
+ * Description      Callback requesting pin_key
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static uint8_t bta_dm_pin_cback (BD_ADDR bd_addr, DEV_CLASS dev_class, BD_NAME bd_name,
         bool min_16_digit)
 {
@@ -2735,14 +2735,14 @@ static uint8_t bta_dm_pin_cback (BD_ADDR bd_addr, DEV_CLASS dev_class, BD_NAME b
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_new_link_key_cback
-**
-** Description      Callback from BTM to notify new link key
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_new_link_key_cback
+ *
+ * Description      Callback from BTM to notify new link key
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static uint8_t  bta_dm_new_link_key_cback(BD_ADDR bd_addr, UNUSED_ATTR DEV_CLASS dev_class,
                                         BD_NAME bd_name, LINK_KEY key, uint8_t key_type)
 {
@@ -2793,14 +2793,14 @@ static uint8_t  bta_dm_new_link_key_cback(BD_ADDR bd_addr, UNUSED_ATTR DEV_CLASS
 
 
 /*******************************************************************************
-**
-** Function         bta_dm_authentication_complete_cback
-**
-** Description      Authentication complete callback from BTM
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_authentication_complete_cback
+ *
+ * Description      Authentication complete callback from BTM
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static uint8_t bta_dm_authentication_complete_cback(BD_ADDR bd_addr,
                                                     UNUSED_ATTR DEV_CLASS dev_class,BD_NAME bd_name,
                                                     int result)
@@ -2831,14 +2831,14 @@ static uint8_t bta_dm_authentication_complete_cback(BD_ADDR bd_addr,
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_sp_cback
-**
-** Description      simple pairing callback from BTM
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_sp_cback
+ *
+ * Description      simple pairing callback from BTM
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static uint8_t bta_dm_sp_cback (tBTM_SP_EVT event, tBTM_SP_EVT_DATA *p_data)
 {
     tBTM_STATUS status = BTM_CMD_STARTED;
@@ -2986,15 +2986,15 @@ static uint8_t bta_dm_sp_cback (tBTM_SP_EVT event, tBTM_SP_EVT_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_local_name_cback
-**
-** Description      Callback from btm after local name is read
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_local_name_cback
+ *
+ * Description      Callback from btm after local name is read
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_dm_local_name_cback(UNUSED_ATTR uint8_t *p_name)
 {
     tBTA_DM_SEC sec_event;
@@ -3007,15 +3007,15 @@ static void bta_dm_local_name_cback(UNUSED_ATTR uint8_t *p_name)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_bl_change_cback
-**
-** Description      Callback from btm when acl connection goes up or down
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_bl_change_cback
+ *
+ * Description      Callback from btm when acl connection goes up or down
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_dm_bl_change_cback (tBTM_BL_EVENT_DATA *p_data)
 {
     tBTA_DM_ACL_CHANGE *p_msg =
@@ -3059,14 +3059,14 @@ static void bta_dm_bl_change_cback (tBTM_BL_EVENT_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_rs_cback
-**
-** Description      Receives the role switch complete event
-**
-** Returns
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_rs_cback
+ *
+ * Description      Receives the role switch complete event
+ *
+ * Returns
+ *
+ ******************************************************************************/
 static void bta_dm_rs_cback (UNUSED_ATTR tBTM_ROLE_SWITCH_CMPL *p1)
 {
     APPL_TRACE_WARNING("bta_dm_rs_cback:%d", bta_dm_cb.rs_event);
@@ -3079,15 +3079,15 @@ static void bta_dm_rs_cback (UNUSED_ATTR tBTM_ROLE_SWITCH_CMPL *p1)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_check_av
-**
-** Description      This function checks if AV is active
-**                  if yes, make sure the AV link is master
-**
-** Returns          bool - true, if switch is in progress
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_check_av
+ *
+ * Description      This function checks if AV is active
+ *                  if yes, make sure the AV link is master
+ *
+ * Returns          bool - true, if switch is in progress
+ *
+ ******************************************************************************/
 static bool bta_dm_check_av(uint16_t event)
 {
     bool avoid_roleswitch = false;
@@ -3133,15 +3133,15 @@ static bool bta_dm_check_av(uint16_t event)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_acl_change
-**
-** Description      Process BTA_DM_ACL_CHANGE_EVT
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_acl_change
+ *
+ * Description      Process BTA_DM_ACL_CHANGE_EVT
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_acl_change(tBTA_DM_MSG *p_data)
 {
 
@@ -3355,15 +3355,15 @@ void bta_dm_acl_change(tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_disable_conn_down_timer_cback
-**
-** Description      Sends disable event to application
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_disable_conn_down_timer_cback
+ *
+ * Description      Sends disable event to application
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_dm_disable_conn_down_timer_cback(UNUSED_ATTR void *data)
 {
     tBTA_SYS_HW_MSG *sys_enable_event =
@@ -3384,15 +3384,15 @@ static void bta_dm_disable_conn_down_timer_cback(UNUSED_ATTR void *data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_rm_cback
-**
-** Description      Role management callback from sys
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_rm_cback
+ *
+ * Description      Role management callback from sys
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_dm_rm_cback(tBTA_SYS_CONN_STATUS status, uint8_t id, uint8_t app_id, BD_ADDR peer_addr)
 {
     uint8_t j;
@@ -3456,14 +3456,14 @@ static void bta_dm_rm_cback(tBTA_SYS_CONN_STATUS status, uint8_t id, uint8_t app
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_delay_role_switch_cback
-**
-** Description      Callback from btm to delay a role switch
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_delay_role_switch_cback
+ *
+ * Description      Callback from btm to delay a role switch
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_dm_delay_role_switch_cback(UNUSED_ATTR void *data)
 {
     APPL_TRACE_EVENT("%s: initiating Delayed RS", __func__);
@@ -3471,16 +3471,16 @@ static void bta_dm_delay_role_switch_cback(UNUSED_ATTR void *data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_reset_sec_dev_pending
-**
-** Description      Setting the remove device pending status to false from
-**                  security device DB, when the link key notification
-**                  event comes.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_reset_sec_dev_pending
+ *
+ * Description      Setting the remove device pending status to false from
+ *                  security device DB, when the link key notification
+ *                  event comes.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_dm_reset_sec_dev_pending(BD_ADDR remote_bd_addr)
 {
     for (size_t i = 0; i < bta_dm_cb.device_list.count; i++)
@@ -3494,16 +3494,16 @@ static void bta_dm_reset_sec_dev_pending(BD_ADDR remote_bd_addr)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_remove_sec_dev_entry
-**
-** Description      Removes device entry from Security device DB if ACL connection with
-**                  remtoe device does not exist, else schedule for dev entry removal upon
+ *
+ * Function         bta_dm_remove_sec_dev_entry
+ *
+ * Description      Removes device entry from Security device DB if ACL connection with
+ *                  remtoe device does not exist, else schedule for dev entry removal upon
                      ACL close
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_dm_remove_sec_dev_entry(BD_ADDR remote_bd_addr)
 {
     if ( BTM_IsAclConnectionUp(remote_bd_addr, BT_TRANSPORT_LE) ||
@@ -3535,15 +3535,15 @@ static void bta_dm_remove_sec_dev_entry(BD_ADDR remote_bd_addr)
 
 
 /*******************************************************************************
-**
-** Function         bta_dm_adjust_roles
-**
-** Description      Adjust roles
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_adjust_roles
+ *
+ * Description      Adjust roles
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_dm_adjust_roles(bool delay_role_switch)
 {
 
@@ -3628,14 +3628,14 @@ static void bta_dm_adjust_roles(bool delay_role_switch)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_get_remname
-**
-** Description      Returns a pointer to the remote name stored in the DM control
-**                  block if it exists, or from the BTM memory.
-**
-** Returns          char * - Pointer to the remote device name
-*******************************************************************************/
+ *
+ * Function         bta_dm_get_remname
+ *
+ * Description      Returns a pointer to the remote name stored in the DM control
+ *                  block if it exists, or from the BTM memory.
+ *
+ * Returns          char * - Pointer to the remote device name
+ ******************************************************************************/
 static char *bta_dm_get_remname(void)
 {
     char *p_name = (char *)bta_dm_search_cb.peer_name;
@@ -3650,14 +3650,14 @@ static char *bta_dm_get_remname(void)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_bond_cancel_complete_cback
-**
-** Description      Authentication complete callback from BTM
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_bond_cancel_complete_cback
+ *
+ * Description      Authentication complete callback from BTM
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_dm_bond_cancel_complete_cback(tBTM_STATUS result)
 {
 
@@ -3675,16 +3675,16 @@ static void bta_dm_bond_cancel_complete_cback(tBTM_STATUS result)
 }
 
 /*******************************************************************************
-**
-** Function         find_utf8_char_boundary
-**
-** Description      This function checks a UTF8 string |utf8str| starting at
-**                  |offset|, moving backwards and returns the offset of the
-**                  next valid UTF8 character boundary found.
-**
-** Returns          Offset of UTF8 character boundary
-**
-*******************************************************************************/
+ *
+ * Function         find_utf8_char_boundary
+ *
+ * Description      This function checks a UTF8 string |utf8str| starting at
+ *                  |offset|, moving backwards and returns the offset of the
+ *                  next valid UTF8 character boundary found.
+ *
+ * Returns          Offset of UTF8 character boundary
+ *
+ ******************************************************************************/
 static size_t find_utf8_char_boundary(const char *utf8str, size_t offset)
 {
     assert(utf8str);
@@ -3703,14 +3703,14 @@ static size_t find_utf8_char_boundary(const char *utf8str, size_t offset)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_set_eir
-**
-** Description      This function creates EIR tagged data and writes it to controller.
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_set_eir
+ *
+ * Description      This function creates EIR tagged data and writes it to controller.
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 static void bta_dm_set_eir (char *local_name)
 {
     uint8_t    *p;
@@ -3986,14 +3986,14 @@ static void bta_dm_set_eir (char *local_name)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_eir_search_services
-**
-** Description      This function searches services in received EIR
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_eir_search_services
+ *
+ * Description      This function searches services in received EIR
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 static void bta_dm_eir_search_services( tBTM_INQ_RESULTS  *p_result,
                                         tBTA_SERVICE_MASK *p_services_to_search,
                                         tBTA_SERVICE_MASK *p_services_found)
@@ -4061,14 +4061,14 @@ static void bta_dm_eir_search_services( tBTM_INQ_RESULTS  *p_result,
 
 #if (BTA_EIR_CANNED_UUID_LIST != TRUE)
 /*******************************************************************************
-**
-** Function         bta_dm_eir_update_uuid
-**
-** Description      This function adds or removes service UUID in EIR database.
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_eir_update_uuid
+ *
+ * Description      This function adds or removes service UUID in EIR database.
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 void bta_dm_eir_update_uuid(uint16_t uuid16, bool adding)
 {
     /* if this UUID is not advertised in EIR */
@@ -4096,45 +4096,45 @@ void bta_dm_eir_update_uuid(uint16_t uuid16, bool adding)
 #endif
 
 /*******************************************************************************
-**
-** Function         bta_dm_enable_test_mode
-**
-** Description      enable test mode
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_enable_test_mode
+ *
+ * Description      enable test mode
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_enable_test_mode(UNUSED_ATTR tBTA_DM_MSG *p_data)
 {
     BTM_EnableTestMode();
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_disable_test_mode
-**
-** Description      disable test mode
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_disable_test_mode
+ *
+ * Description      disable test mode
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_disable_test_mode(UNUSED_ATTR tBTA_DM_MSG *p_data)
 {
     BTM_DeviceReset(NULL);
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_execute_callback
-**
-** Description      Just execute a generic call back in the context of the BTU/BTA tack
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_execute_callback
+ *
+ * Description      Just execute a generic call back in the context of the BTU/BTA tack
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_execute_callback(tBTA_DM_MSG *p_data)
 {
     /* sanity check */
@@ -4147,14 +4147,14 @@ void bta_dm_execute_callback(tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_encrypt_cback
-**
-** Description      link encryption complete callback.
-**
-** Returns         None
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_encrypt_cback
+ *
+ * Description      link encryption complete callback.
+ *
+ * Returns         None
+ *
+ ******************************************************************************/
 void bta_dm_encrypt_cback(BD_ADDR bd_addr, tBT_TRANSPORT transport,
                           UNUSED_ATTR void *p_ref_data, tBTM_STATUS result)
 {
@@ -4202,14 +4202,14 @@ void bta_dm_encrypt_cback(BD_ADDR bd_addr, tBT_TRANSPORT transport,
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_set_encryption
-**
-** Description      This function to encrypt the link
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_set_encryption
+ *
+ * Description      This function to encrypt the link
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 void bta_dm_set_encryption (tBTA_DM_MSG *p_data)
 {
     uint8_t i ;
@@ -4248,15 +4248,15 @@ void bta_dm_set_encryption (tBTA_DM_MSG *p_data)
 
 #if (BLE_INCLUDED == TRUE)
 /*******************************************************************************
-**
-** Function         bta_dm_observe_results_cb
-**
-** Description      Callback for BLE Observe result
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_observe_results_cb
+ *
+ * Description      Callback for BLE Observe result
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_dm_observe_results_cb (tBTM_INQ_RESULTS *p_inq, uint8_t *p_eir)
 {
 ;
@@ -4293,15 +4293,15 @@ static void bta_dm_observe_results_cb (tBTM_INQ_RESULTS *p_inq, uint8_t *p_eir)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_observe_cmpl_cb
-**
-** Description      Callback for BLE Observe complete
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_observe_cmpl_cb
+ *
+ * Description      Callback for BLE Observe complete
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_dm_observe_cmpl_cb (void * p_result)
 {
     tBTA_DM_SEARCH  data;
@@ -4317,15 +4317,15 @@ static void bta_dm_observe_cmpl_cb (void * p_result)
 
 #if (SMP_INCLUDED == TRUE)
 /*******************************************************************************
-**
-** Function         bta_dm_ble_smp_cback
-**
-** Description      Callback for BLE SMP
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_ble_smp_cback
+ *
+ * Description      Callback for BLE SMP
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static uint8_t bta_dm_ble_smp_cback (tBTM_LE_EVT event, BD_ADDR bda, tBTM_LE_EVT_DATA *p_data)
 {
     tBTM_STATUS status = BTM_SUCCESS;
@@ -4441,15 +4441,15 @@ static uint8_t bta_dm_ble_smp_cback (tBTM_LE_EVT event, BD_ADDR bda, tBTM_LE_EVT
 #endif  /* SMP_INCLUDED == TRUE */
 
 /*******************************************************************************
-**
-** Function         bta_dm_ble_id_key_cback
-**
-** Description      Callback for BLE local ID keys
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_ble_id_key_cback
+ *
+ * Description      Callback for BLE local ID keys
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_dm_ble_id_key_cback (uint8_t key_type, tBTM_BLE_LOCAL_KEYS *p_key)
 {
     uint8_t   evt;
@@ -4478,17 +4478,17 @@ static void bta_dm_ble_id_key_cback (uint8_t key_type, tBTM_BLE_LOCAL_KEYS *p_ke
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_add_blekey
-**
-** Description      This function adds an BLE Key to an security database entry.
-**                  This function shall only be called AFTER BTA_DmAddBleDevice has been called.
-**                  It is normally called during host startup to restore all required information
-**                  stored in the NVRAM.
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_add_blekey
+ *
+ * Description      This function adds an BLE Key to an security database entry.
+ *                  This function shall only be called AFTER BTA_DmAddBleDevice has been called.
+ *                  It is normally called during host startup to restore all required information
+ *                  stored in the NVRAM.
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 void bta_dm_add_blekey (tBTA_DM_MSG *p_data)
 {
     if (!BTM_SecAddBleKey (p_data->add_ble_key.bd_addr,
@@ -4503,16 +4503,16 @@ void bta_dm_add_blekey (tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_add_ble_device
-**
-** Description      This function adds an BLE device to an security database entry.
-**                  It is normally called during host startup to restore all required information
-**                  stored in the NVRAM.
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_add_ble_device
+ *
+ * Description      This function adds an BLE device to an security database entry.
+ *                  It is normally called during host startup to restore all required information
+ *                  stored in the NVRAM.
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 void bta_dm_add_ble_device (tBTA_DM_MSG *p_data)
 {
     if (!BTM_SecAddBleDevice (p_data->add_ble_device.bd_addr, NULL,
@@ -4527,16 +4527,16 @@ void bta_dm_add_ble_device (tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_add_ble_device
-**
-** Description      This function adds an BLE device to an security database entry.
-**                  It is normally called during host startup to restore all required information
-**                  stored in the NVRAM.
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_add_ble_device
+ *
+ * Description      This function adds an BLE device to an security database entry.
+ *                  It is normally called during host startup to restore all required information
+ *                  stored in the NVRAM.
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 void bta_dm_ble_passkey_reply (tBTA_DM_MSG *p_data)
 {
     if (p_data->pin_reply.accept)
@@ -4551,15 +4551,15 @@ void bta_dm_ble_passkey_reply (tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_ble_confirm_reply
-**
-** Description      This is response to SM numeric comparison request submitted
-**                  to application.
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_ble_confirm_reply
+ *
+ * Description      This is response to SM numeric comparison request submitted
+ *                  to application.
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 void bta_dm_ble_confirm_reply (tBTA_DM_MSG *p_data)
 {
     if (p_data->confirm.accept)
@@ -4573,28 +4573,28 @@ void bta_dm_ble_confirm_reply (tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_security_grant
-**
-** Description      This function grant SMP security request access.
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_security_grant
+ *
+ * Description      This function grant SMP security request access.
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 void bta_dm_security_grant (tBTA_DM_MSG *p_data)
 {
     BTM_SecurityGrant(p_data->ble_sec_grant.bd_addr, p_data->ble_sec_grant.res);
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_ble_set_bg_conn_type
-**
-** Description      This function set the BLE background connection type
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_ble_set_bg_conn_type
+ *
+ * Description      This function set the BLE background connection type
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 void bta_dm_ble_set_bg_conn_type (tBTA_DM_MSG *p_data)
 {
     BTM_BleSetBgConnType(p_data->ble_set_bd_conn_type.bg_conn_type,
@@ -4602,14 +4602,14 @@ void bta_dm_ble_set_bg_conn_type (tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_ble_set_conn_params
-**
-** Description      This function set the preferred connection parameters.
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_ble_set_conn_params
+ *
+ * Description      This function set the preferred connection parameters.
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 void bta_dm_ble_set_conn_params (tBTA_DM_MSG *p_data)
 {
     BTM_BleSetPrefConnParams(p_data->ble_set_conn_params.peer_bda,
@@ -4620,14 +4620,14 @@ void bta_dm_ble_set_conn_params (tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_ble_set_conn_scan_params
-**
-** Description      This function sets BLE scan parameters.
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_ble_set_conn_scan_params
+ *
+ * Description      This function sets BLE scan parameters.
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 void bta_dm_ble_set_scan_params(tBTA_DM_MSG *p_data)
 {
     BTM_BleSetScanParams(p_data->ble_set_scan_params.client_if,
@@ -4638,28 +4638,28 @@ void bta_dm_ble_set_scan_params(tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_ble_set_conn_scan_params
-**
-** Description      This function set the preferred connection scan parameters.
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_ble_set_conn_scan_params
+ *
+ * Description      This function set the preferred connection scan parameters.
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 void bta_dm_ble_set_conn_scan_params (tBTA_DM_MSG *p_data)
 {
     BTM_BleSetConnScanParams(p_data->ble_set_conn_scan_params.scan_int,
                              p_data->ble_set_conn_scan_params.scan_window);
 }
 /*******************************************************************************
-**
-** Function         bta_dm_ble_update_conn_params
-**
-** Description      This function update LE connection parameters.
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_ble_update_conn_params
+ *
+ * Description      This function update LE connection parameters.
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 void bta_dm_ble_update_conn_params (tBTA_DM_MSG *p_data)
 {
     if (!L2CA_UpdateBleConnParams(p_data->ble_update_conn_params.bd_addr,
@@ -4674,14 +4674,14 @@ void bta_dm_ble_update_conn_params (tBTA_DM_MSG *p_data)
 
 #if (BLE_PRIVACY_SPT == TRUE)
 /*******************************************************************************
-**
-** Function         bta_dm_ble_config_local_privacy
-**
-** Description      This function set the local device LE privacy settings.
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_ble_config_local_privacy
+ *
+ * Description      This function set the local device LE privacy settings.
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 void bta_dm_ble_config_local_privacy (tBTA_DM_MSG *p_data)
 {
     BTM_BleConfigPrivacy (p_data->ble_local_privacy.privacy_enable);
@@ -4689,14 +4689,14 @@ void bta_dm_ble_config_local_privacy (tBTA_DM_MSG *p_data)
 #endif
 
 /*******************************************************************************
-**
-** Function         bta_dm_ble_observe
-**
-** Description      This function set the preferred connection scan parameters.
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_ble_observe
+ *
+ * Description      This function set the preferred connection scan parameters.
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 void bta_dm_ble_observe (tBTA_DM_MSG *p_data)
 {
     tBTM_STATUS status;
@@ -4723,14 +4723,14 @@ void bta_dm_ble_observe (tBTA_DM_MSG *p_data)
     }
 }
 /*******************************************************************************
-**
-** Function         bta_dm_ble_set_adv_params
-**
-** Description      This function set the adv parameters.
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_ble_set_adv_params
+ *
+ * Description      This function set the adv parameters.
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 void bta_dm_ble_set_adv_params (uint16_t adv_int_min, uint16_t adv_int_max,
                                 tBLE_BD_ADDR *p_dir_bda)
 {
@@ -4738,14 +4738,14 @@ void bta_dm_ble_set_adv_params (uint16_t adv_int_min, uint16_t adv_int_max,
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_ble_set_data_length
-**
-** Description      This function set the maximum transmission packet size
-**
-** Parameters
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_ble_set_data_length
+ *
+ * Description      This function set the maximum transmission packet size
+ *
+ * Parameters
+ *
+ ******************************************************************************/
 void bta_dm_ble_set_data_length(tBTA_DM_MSG *p_data)
 {
     if (BTM_SetBleDataLength(p_data->ble_set_data_length.remote_bda,
@@ -4756,14 +4756,14 @@ void bta_dm_ble_set_data_length(tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_ble_setup_storage
-**
-** Description      This function configures up the storage parameters for ADV batch scanning
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_ble_setup_storage
+ *
+ * Description      This function configures up the storage parameters for ADV batch scanning
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 void bta_dm_ble_setup_storage (tBTA_DM_MSG *p_data)
 {
     tBTM_STATUS btm_status = 0;
@@ -4788,14 +4788,14 @@ void bta_dm_ble_setup_storage (tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_ble_enable_batch_scan
-**
-** Description      This function sets up the parameters and enables batch scan
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_ble_enable_batch_scan
+ *
+ * Description      This function sets up the parameters and enables batch scan
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 void bta_dm_ble_enable_batch_scan (tBTA_DM_MSG *p_data)
 {
     tBTM_STATUS btm_status = 0;
@@ -4819,14 +4819,14 @@ void bta_dm_ble_enable_batch_scan (tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_ble_disable_batch_scan
-**
-** Description      This function disables the batch scan
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_ble_disable_batch_scan
+ *
+ * Description      This function disables the batch scan
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 void bta_dm_ble_disable_batch_scan (UNUSED_ATTR tBTA_DM_MSG *p_data)
 {
 
@@ -4846,14 +4846,14 @@ void bta_dm_ble_disable_batch_scan (UNUSED_ATTR tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_ble_read_scan_reports
-**
-** Description      This function reads the batch scan reports
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_ble_read_scan_reports
+ *
+ * Description      This function reads the batch scan reports
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 void bta_dm_ble_read_scan_reports(tBTA_DM_MSG *p_data)
 {
     tBTM_STATUS btm_status = 0;
@@ -4873,14 +4873,14 @@ void bta_dm_ble_read_scan_reports(tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_ble_track_advertiser
-**
-** Description      This function tracks the specific advertiser
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_ble_track_advertiser
+ *
+ * Description      This function tracks the specific advertiser
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 void bta_dm_ble_track_advertiser(tBTA_DM_MSG *p_data)
 {
     tBTM_STATUS btm_status = 0;
@@ -4908,14 +4908,14 @@ void bta_dm_ble_track_advertiser(tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ble_scan_setup_cb
-**
-** Description      Handle the setup callback from BTM layer and forward it to app layer
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_ble_scan_setup_cb
+ *
+ * Description      Handle the setup callback from BTM layer and forward it to app layer
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 void bta_ble_scan_setup_cb(tBTM_BLE_BATCH_SCAN_EVT evt, tBTM_BLE_REF_VALUE ref_value,
                                   tBTM_STATUS status)
 {
@@ -4949,15 +4949,15 @@ void bta_ble_scan_setup_cb(tBTM_BLE_BATCH_SCAN_EVT evt, tBTM_BLE_REF_VALUE ref_v
 
 #if (BLE_ANDROID_CONTROLLER_SCAN_FILTER == TRUE)
 /*******************************************************************************
-**
-** Function         bta_ble_scan_pf_cmpl
-**
-** Description      ADV payload filtering operation complete callback
-**
-**
-** Returns         true if handled, otherwise false.
-**
-*******************************************************************************/
+ *
+ * Function         bta_ble_scan_pf_cmpl
+ *
+ * Description      ADV payload filtering operation complete callback
+ *
+ *
+ * Returns         true if handled, otherwise false.
+ *
+ ******************************************************************************/
 static void bta_ble_scan_cfg_cmpl(tBTM_BLE_PF_ACTION action, tBTM_BLE_SCAN_COND_OP cfg_op,
                                  tBTM_BLE_PF_AVBL_SPACE avbl_space, tBTM_STATUS status,
                                  tBTM_BLE_REF_VALUE ref_value)
@@ -4971,14 +4971,14 @@ static void bta_ble_scan_cfg_cmpl(tBTM_BLE_PF_ACTION action, tBTM_BLE_SCAN_COND_
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_cfg_filter_cond
-**
-** Description      This function configure adv payload filtering condition
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_cfg_filter_cond
+ *
+ * Description      This function configure adv payload filtering condition
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 void bta_dm_cfg_filter_cond (tBTA_DM_MSG *p_data)
 {
     tBTM_STATUS st = BTM_MODE_UNSUPPORTED;
@@ -5010,14 +5010,14 @@ void bta_dm_cfg_filter_cond (tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_enable_scan_filter
-**
-** Description      This function enable/disable adv payload filtering condition
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_enable_scan_filter
+ *
+ * Description      This function enable/disable adv payload filtering condition
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 void bta_dm_enable_scan_filter(tBTA_DM_MSG *p_data)
 {
     tBTM_STATUS st = BTM_MODE_UNSUPPORTED;
@@ -5043,14 +5043,14 @@ void bta_dm_enable_scan_filter(tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_scan_filter_param_setup
-**
-** Description      This function sets up scan filter params
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_scan_filter_param_setup
+ *
+ * Description      This function sets up scan filter params
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 void bta_dm_scan_filter_param_setup (tBTA_DM_MSG *p_data)
 {
     tBTM_STATUS st = BTM_MODE_UNSUPPORTED;
@@ -5083,15 +5083,15 @@ void bta_dm_scan_filter_param_setup (tBTA_DM_MSG *p_data)
 #endif
 
 /*******************************************************************************
-**
-** Function         bta_ble_enable_scan_cmpl
-**
-** Description      ADV payload filtering enable / disable complete callback
-**
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         bta_ble_enable_scan_cmpl
+ *
+ * Description      ADV payload filtering enable / disable complete callback
+ *
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 static void bta_ble_energy_info_cmpl(tBTM_BLE_TX_TIME_MS tx_time,
                                         tBTM_BLE_RX_TIME_MS rx_time,
                                         tBTM_BLE_IDLE_TIME_MS idle_time,
@@ -5109,14 +5109,14 @@ static void bta_ble_energy_info_cmpl(tBTM_BLE_TX_TIME_MS tx_time,
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_ble_get_energy_info
-**
-** Description      This function obtains the energy info
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_ble_get_energy_info
+ *
+ * Description      This function obtains the energy info
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 void bta_dm_ble_get_energy_info(tBTA_DM_MSG *p_data)
 {
     tBTM_STATUS btm_status = 0;
@@ -5133,15 +5133,15 @@ void bta_dm_ble_get_energy_info(tBTA_DM_MSG *p_data)
 #endif
 
 /*******************************************************************************
-**
-** Function         bta_dm_gattc_register
-**
-** Description      Register with GATTC in DM if BLE is needed.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_gattc_register
+ *
+ * Description      Register with GATTC in DM if BLE is needed.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_dm_gattc_register(void)
 {
     tBT_UUID                app_uuid = {LEN_UUID_128,{0}};
@@ -5154,14 +5154,14 @@ static void bta_dm_gattc_register(void)
 }
 
 /*******************************************************************************
-**
-** Function         btm_dm_start_disc_gatt_services
-**
-** Description      This function starts a GATT service search request.
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         btm_dm_start_disc_gatt_services
+ *
+ * Description      This function starts a GATT service search request.
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 static void btm_dm_start_disc_gatt_services (uint16_t conn_id)
 {
     tBT_UUID    *p_uuid = bta_dm_search_cb.p_srvc_uuid +
@@ -5175,14 +5175,14 @@ static void btm_dm_start_disc_gatt_services (uint16_t conn_id)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_gatt_disc_result
-**
-** Description      This function process the GATT service search result.
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_gatt_disc_result
+ *
+ * Description      This function process the GATT service search result.
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 static void bta_dm_gatt_disc_result(tBTA_GATT_ID service_id)
 {
     tBTA_DM_SEARCH   result;
@@ -5230,14 +5230,14 @@ static void bta_dm_gatt_disc_result(tBTA_GATT_ID service_id)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_gatt_disc_complete
-**
-** Description      This function process the GATT service search complete.
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_gatt_disc_complete
+ *
+ * Description      This function process the GATT service search complete.
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 static void bta_dm_gatt_disc_complete(uint16_t conn_id, tBTA_GATT_STATUS status)
 {
     APPL_TRACE_DEBUG("%s conn_id = %d", __func__, conn_id);
@@ -5297,14 +5297,14 @@ static void bta_dm_gatt_disc_complete(uint16_t conn_id, tBTA_GATT_STATUS status)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_close_gatt_conn
-**
-** Description      This function close the GATT connection after delay timeout.
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_close_gatt_conn
+ *
+ * Description      This function close the GATT connection after delay timeout.
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 void bta_dm_close_gatt_conn(UNUSED_ATTR tBTA_DM_MSG *p_data)
 {
     if (bta_dm_search_cb.conn_id != BTA_GATT_INVALID_CONN_ID)
@@ -5314,15 +5314,15 @@ void bta_dm_close_gatt_conn(UNUSED_ATTR tBTA_DM_MSG *p_data)
     bta_dm_search_cb.conn_id = BTA_GATT_INVALID_CONN_ID;
 }
 /*******************************************************************************
-**
-** Function         btm_dm_start_gatt_discovery
-**
-** Description      This is GATT initiate the service search by open a GATT connection
-**                  first.
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         btm_dm_start_gatt_discovery
+ *
+ * Description      This is GATT initiate the service search by open a GATT connection
+ *                  first.
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 void btm_dm_start_gatt_discovery (BD_ADDR bd_addr)
 {
     bta_dm_search_cb.gatt_disc_active = true;
@@ -5340,14 +5340,14 @@ void btm_dm_start_gatt_discovery (BD_ADDR bd_addr)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_cancel_gatt_discovery
-**
-** Description      This is GATT cancel the GATT service search.
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_cancel_gatt_discovery
+ *
+ * Description      This is GATT cancel the GATT service search.
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 static void bta_dm_cancel_gatt_discovery(BD_ADDR bd_addr)
 {
     if (bta_dm_search_cb.conn_id == BTA_GATT_INVALID_CONN_ID)
@@ -5359,14 +5359,14 @@ static void bta_dm_cancel_gatt_discovery(BD_ADDR bd_addr)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_proc_open_evt
-**
-** Description      process BTA_GATTC_OPEN_EVT in DM.
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_proc_open_evt
+ *
+ * Description      process BTA_GATTC_OPEN_EVT in DM.
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 void bta_dm_proc_open_evt(tBTA_GATTC_OPEN *p_data)
 {
     uint8_t           *p1;
@@ -5400,14 +5400,14 @@ void bta_dm_proc_open_evt(tBTA_GATTC_OPEN *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_gattc_callback
-**
-** Description      This is GATT client callback function used in DM.
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_gattc_callback
+ *
+ * Description      This is GATT client callback function used in DM.
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 static void bta_dm_gattc_callback(tBTA_GATTC_EVT event, tBTA_GATTC *p_data)
 {
     APPL_TRACE_DEBUG("bta_dm_gattc_callback event = %d", event);
@@ -5455,14 +5455,14 @@ static void bta_dm_gattc_callback(tBTA_GATTC_EVT event, tBTA_GATTC *p_data)
 
 #if (BLE_VND_INCLUDED == TRUE)
 /*******************************************************************************
-**
-** Function         bta_dm_ctrl_features_rd_cmpl_cback
-**
-** Description      callback to handle controller feature read complete
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_ctrl_features_rd_cmpl_cback
+ *
+ * Description      callback to handle controller feature read complete
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 static void bta_dm_ctrl_features_rd_cmpl_cback(tBTM_STATUS result)
 {
     APPL_TRACE_DEBUG("%s  status = %d ", __func__, result);
diff --git a/system/bta/dm/bta_dm_api.cc b/system/bta/dm/bta_dm_api.cc
index 4e71c60c055..f41bbfe0867 100644
--- a/system/bta/dm/bta_dm_api.cc
+++ b/system/bta/dm/bta_dm_api.cc
@@ -35,8 +35,8 @@
 #include "utl.h"
 
 /*****************************************************************************
-**  Constants
-*****************************************************************************/
+ *  Constants
+ ****************************************************************************/
 
 static const tBTA_SYS_REG bta_dm_reg =
 {
@@ -51,16 +51,16 @@ static const tBTA_SYS_REG bta_dm_search_reg =
 };
 
 /*******************************************************************************
-**
-** Function         BTA_EnableBluetooth
-**
-** Description      Enables bluetooth service.  This function must be
-**                  called before any other functions in the BTA API are called.
-**
-**
-** Returns          tBTA_STATUS
-**
-*******************************************************************************/
+ *
+ * Function         BTA_EnableBluetooth
+ *
+ * Description      Enables bluetooth service.  This function must be
+ *                  called before any other functions in the BTA API are called.
+ *
+ *
+ * Returns          tBTA_STATUS
+ *
+ ******************************************************************************/
 tBTA_STATUS BTA_EnableBluetooth(tBTA_DM_SEC_CBACK *p_cback)
 {
     /* Bluetooth disabling is in progress */
@@ -84,15 +84,15 @@ tBTA_STATUS BTA_EnableBluetooth(tBTA_DM_SEC_CBACK *p_cback)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_DisableBluetooth
-**
-** Description      Disables bluetooth service.  This function is called when
-**                  the application no longer needs bluetooth service
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DisableBluetooth
+ *
+ * Description      Disables bluetooth service.  This function is called when
+ *                  the application no longer needs bluetooth service
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 tBTA_STATUS BTA_DisableBluetooth(void)
 {
     BT_HDR *p_msg = (BT_HDR *)osi_malloc(sizeof(BT_HDR));
@@ -105,15 +105,15 @@ tBTA_STATUS BTA_DisableBluetooth(void)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_EnableTestMode
-**
-** Description      Enables bluetooth device under test mode
-**
-**
-** Returns          tBTA_STATUS
-**
-*******************************************************************************/
+ *
+ * Function         BTA_EnableTestMode
+ *
+ * Description      Enables bluetooth device under test mode
+ *
+ *
+ * Returns          tBTA_STATUS
+ *
+ ******************************************************************************/
 tBTA_STATUS BTA_EnableTestMode(void)
 {
     BT_HDR *p_msg = (BT_HDR *)osi_malloc(sizeof(BT_HDR));
@@ -127,15 +127,15 @@ tBTA_STATUS BTA_EnableTestMode(void)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_DisableTestMode
-**
-** Description      Disable bluetooth device under test mode
-**
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DisableTestMode
+ *
+ * Description      Disable bluetooth device under test mode
+ *
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 void BTA_DisableTestMode(void)
 {
     BT_HDR *p_msg = (BT_HDR *)osi_malloc(sizeof(BT_HDR));
@@ -147,15 +147,15 @@ void BTA_DisableTestMode(void)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_DmSetDeviceName
-**
-** Description      This function sets the Bluetooth name of local device
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmSetDeviceName
+ *
+ * Description      This function sets the Bluetooth name of local device
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_DmSetDeviceName(char *p_name)
 {
     tBTA_DM_API_SET_NAME *p_msg =
@@ -168,16 +168,16 @@ void BTA_DmSetDeviceName(char *p_name)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_DmSetVisibility
-**
-** Description      This function sets the Bluetooth connectable,
-**                  discoverable, pairable and conn paired only modes of local device
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmSetVisibility
+ *
+ * Description      This function sets the Bluetooth connectable,
+ *                  discoverable, pairable and conn paired only modes of local device
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_DmSetVisibility(tBTA_DM_DISC disc_mode, tBTA_DM_CONN conn_mode, uint8_t pairable_mode, uint8_t conn_filter )
 {
     tBTA_DM_API_SET_VISIBILITY *p_msg =
@@ -193,17 +193,17 @@ void BTA_DmSetVisibility(tBTA_DM_DISC disc_mode, tBTA_DM_CONN conn_mode, uint8_t
 }
 
 /*******************************************************************************
-**
-** Function         BTA_DmSearch
-**
-** Description      This function searches for peer Bluetooth devices. It performs
-**                  an inquiry and gets the remote name for devices. Service
-**                  discovery is done if services is non zero
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmSearch
+ *
+ * Description      This function searches for peer Bluetooth devices. It performs
+ *                  an inquiry and gets the remote name for devices. Service
+ *                  discovery is done if services is non zero
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_DmSearch(tBTA_DM_INQ *p_dm_inq, tBTA_SERVICE_MASK services, tBTA_DM_SEARCH_CBACK *p_cback)
 {
     tBTA_DM_API_SEARCH *p_msg =
@@ -219,15 +219,15 @@ void BTA_DmSearch(tBTA_DM_INQ *p_dm_inq, tBTA_SERVICE_MASK services, tBTA_DM_SEA
 }
 
 /*******************************************************************************
-**
-** Function         BTA_DmSearchCancel
-**
-** Description      This function  cancels a search initiated by BTA_DmSearch
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmSearchCancel
+ *
+ * Description      This function  cancels a search initiated by BTA_DmSearch
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_DmSearchCancel(void)
 {
     BT_HDR *p_msg = (BT_HDR *)osi_malloc(sizeof(BT_HDR));
@@ -237,16 +237,16 @@ void BTA_DmSearchCancel(void)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_DmDiscover
-**
-** Description      This function does service discovery for services of a
-**                  peer device
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmDiscover
+ *
+ * Description      This function does service discovery for services of a
+ *                  peer device
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_DmDiscover(BD_ADDR bd_addr, tBTA_SERVICE_MASK services,
                     tBTA_DM_SEARCH_CBACK *p_cback, bool sdp_search)
 {
@@ -263,16 +263,16 @@ void BTA_DmDiscover(BD_ADDR bd_addr, tBTA_SERVICE_MASK services,
 }
 
 /*******************************************************************************
-**
-** Function         BTA_DmDiscoverUUID
-**
-** Description      This function does service discovery for services of a
-**                  peer device
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmDiscoverUUID
+ *
+ * Description      This function does service discovery for services of a
+ *                  peer device
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_DmDiscoverUUID(BD_ADDR bd_addr, tSDP_UUID *uuid,
                     tBTA_DM_SEARCH_CBACK *p_cback, bool sdp_search)
 {
@@ -295,16 +295,16 @@ void BTA_DmDiscoverUUID(BD_ADDR bd_addr, tSDP_UUID *uuid,
 }
 
 /*******************************************************************************
-**
-** Function         BTA_DmBond
-**
-** Description      This function initiates a bonding procedure with a peer
-**                  device
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmBond
+ *
+ * Description      This function initiates a bonding procedure with a peer
+ *                  device
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_DmBond(BD_ADDR bd_addr)
 {
     tBTA_DM_API_BOND *p_msg =
@@ -318,16 +318,16 @@ void BTA_DmBond(BD_ADDR bd_addr)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_DmBondByTransports
-**
-** Description      This function initiates a bonding procedure with a peer
-**                  device
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmBondByTransports
+ *
+ * Description      This function initiates a bonding procedure with a peer
+ *                  device
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_DmBondByTransport(BD_ADDR bd_addr, tBTA_TRANSPORT transport)
 {
     tBTA_DM_API_BOND *p_msg =
@@ -341,16 +341,16 @@ void BTA_DmBondByTransport(BD_ADDR bd_addr, tBTA_TRANSPORT transport)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_DmBondCancel
-**
-** Description      This function cancels the bonding procedure with a peer
-**                  device
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmBondCancel
+ *
+ * Description      This function cancels the bonding procedure with a peer
+ *                  device
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_DmBondCancel(BD_ADDR bd_addr)
 {
     tBTA_DM_API_BOND_CANCEL *p_msg =
@@ -363,16 +363,16 @@ void BTA_DmBondCancel(BD_ADDR bd_addr)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_DmPinReply
-**
-** Description      This function provides a pincode for a remote device when
-**                  one is requested by DM through BTA_DM_PIN_REQ_EVT
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmPinReply
+ *
+ * Description      This function provides a pincode for a remote device when
+ *                  one is requested by DM through BTA_DM_PIN_REQ_EVT
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_DmPinReply(BD_ADDR bd_addr, bool accept, uint8_t pin_len, uint8_t *p_pin)
 
 {
@@ -391,18 +391,18 @@ void BTA_DmPinReply(BD_ADDR bd_addr, bool accept, uint8_t pin_len, uint8_t *p_pi
 }
 
 /*******************************************************************************
-**
-** Function         BTA_DmLocalOob
-**
-** Description      This function retrieves the OOB data from local controller.
-**                  The result is reported by:
-**                  - bta_dm_co_loc_oob_ext() if device supports secure
-**                    connections (SC)
-**                  - bta_dm_co_loc_oob() if device doesn't support SC
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmLocalOob
+ *
+ * Description      This function retrieves the OOB data from local controller.
+ *                  The result is reported by:
+ *                  - bta_dm_co_loc_oob_ext() if device supports secure
+ *                    connections (SC)
+ *                  - bta_dm_co_loc_oob() if device doesn't support SC
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_DmLocalOob(void)
 {
     tBTA_DM_API_LOC_OOB *p_msg =
@@ -413,15 +413,15 @@ void BTA_DmLocalOob(void)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_DmConfirm
-**
-** Description      This function accepts or rejects the numerical value of the
-**                  Simple Pairing process on BTA_DM_SP_CFM_REQ_EVT
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmConfirm
+ *
+ * Description      This function accepts or rejects the numerical value of the
+ *                  Simple Pairing process on BTA_DM_SP_CFM_REQ_EVT
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_DmConfirm(BD_ADDR bd_addr, bool accept)
 {
     tBTA_DM_API_CONFIRM *p_msg =
@@ -435,16 +435,16 @@ void BTA_DmConfirm(BD_ADDR bd_addr, bool accept)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_DmAddDevice
-**
-** Description      This function adds a device to the security database list of
-**                  peer device
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmAddDevice
+ *
+ * Description      This function adds a device to the security database list of
+ *                  peer device
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_DmAddDevice(BD_ADDR bd_addr, DEV_CLASS dev_class, LINK_KEY link_key,
                      tBTA_SERVICE_MASK trusted_mask, bool is_trusted,
                      uint8_t key_type, tBTA_IO_CAP io_cap, uint8_t pin_length)
@@ -478,16 +478,16 @@ void BTA_DmAddDevice(BD_ADDR bd_addr, DEV_CLASS dev_class, LINK_KEY link_key,
 }
 
 /*******************************************************************************
-**
-** Function         BTA_DmRemoveDevice
-**
-** Description      This function removes a device fromthe security database list of
-**                  peer device. It manages unpairing even while connected.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmRemoveDevice
+ *
+ * Description      This function removes a device fromthe security database list of
+ *                  peer device. It manages unpairing even while connected.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 tBTA_STATUS BTA_DmRemoveDevice(BD_ADDR bd_addr)
 {
     tBTA_DM_API_REMOVE_DEVICE *p_msg =
@@ -502,17 +502,17 @@ tBTA_STATUS BTA_DmRemoveDevice(BD_ADDR bd_addr)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_GetEirService
-**
-** Description      This function is called to get BTA service mask from EIR.
-**
-** Parameters       p_eir - pointer of EIR significant part
-**                  p_services - return the BTA service mask
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GetEirService
+ *
+ * Description      This function is called to get BTA service mask from EIR.
+ *
+ * Parameters       p_eir - pointer of EIR significant part
+ *                  p_services - return the BTA service mask
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 extern const uint16_t bta_service_id_to_uuid_lkup_tbl [];
 void BTA_GetEirService( uint8_t *p_eir, tBTA_SERVICE_MASK *p_services )
 {
@@ -549,14 +549,14 @@ void BTA_GetEirService( uint8_t *p_eir, tBTA_SERVICE_MASK *p_services )
 }
 
 /*******************************************************************************
-**
-** Function         BTA_DmGetConnectionState
-**
-** Description      Returns whether the remote device is currently connected.
-**
-** Returns          0 if the device is NOT connected.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmGetConnectionState
+ *
+ * Description      Returns whether the remote device is currently connected.
+ *
+ * Returns          0 if the device is NOT connected.
+ *
+ ******************************************************************************/
 uint16_t BTA_DmGetConnectionState(const BD_ADDR bd_addr )
 {
     tBTA_DM_PEER_DEVICE * p_dev = bta_dm_find_peer_device(bd_addr);
@@ -565,17 +565,17 @@ uint16_t BTA_DmGetConnectionState(const BD_ADDR bd_addr )
 
 
 /*******************************************************************************
-**                   Device Identification (DI) Server Functions
-*******************************************************************************/
+ *                   Device Identification (DI) Server Functions
+ ******************************************************************************/
 /*******************************************************************************
-**
-** Function         BTA_DmSetLocalDiRecord
-**
-** Description      This function adds a DI record to the local SDP database.
-**
-** Returns          BTA_SUCCESS if record set sucessfully, otherwise error code.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmSetLocalDiRecord
+ *
+ * Description      This function adds a DI record to the local SDP database.
+ *
+ * Returns          BTA_SUCCESS if record set sucessfully, otherwise error code.
+ *
+ ******************************************************************************/
 tBTA_STATUS BTA_DmSetLocalDiRecord( tBTA_DI_RECORD *p_device_info,
                               uint32_t *p_handle )
 {
@@ -600,16 +600,16 @@ tBTA_STATUS BTA_DmSetLocalDiRecord( tBTA_DI_RECORD *p_device_info,
 }
 
 /*******************************************************************************
-**
-** Function         bta_dmexecutecallback
-**
-** Description      This function will request BTA to execute a call back in the context of BTU task
-**                  This API was named in lower case because it is only intended
-**                  for the internal customers(like BTIF).
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dmexecutecallback
+ *
+ * Description      This function will request BTA to execute a call back in the context of BTU task
+ *                  This API was named in lower case because it is only intended
+ *                  for the internal customers(like BTIF).
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dmexecutecallback (tBTA_DM_EXEC_CBACK* p_callback, void * p_param)
 {
     tBTA_DM_API_EXECUTE_CBACK *p_msg =
@@ -623,21 +623,21 @@ void bta_dmexecutecallback (tBTA_DM_EXEC_CBACK* p_callback, void * p_param)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_DmAddBleKey
-**
-** Description      Add/modify LE device information.  This function will be
-**                  normally called during host startup to restore all required
-**                  information stored in the NVRAM.
-**
-** Parameters:      bd_addr          - BD address of the peer
-**                  p_le_key         - LE key values.
-**                  key_type         - LE SMP key type.
-**
-** Returns          BTA_SUCCESS if successful
-**                  BTA_FAIL if operation failed.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmAddBleKey
+ *
+ * Description      Add/modify LE device information.  This function will be
+ *                  normally called during host startup to restore all required
+ *                  information stored in the NVRAM.
+ *
+ * Parameters:      bd_addr          - BD address of the peer
+ *                  p_le_key         - LE key values.
+ *                  key_type         - LE SMP key type.
+ *
+ * Returns          BTA_SUCCESS if successful
+ *                  BTA_FAIL if operation failed.
+ *
+ ******************************************************************************/
 void BTA_DmAddBleKey (BD_ADDR bd_addr, tBTA_LE_KEY_VALUE *p_le_key, tBTA_LE_KEY_TYPE key_type)
 {
 #if (BLE_INCLUDED == TRUE)
@@ -655,20 +655,20 @@ void BTA_DmAddBleKey (BD_ADDR bd_addr, tBTA_LE_KEY_VALUE *p_le_key, tBTA_LE_KEY_
 }
 
 /*******************************************************************************
-**
-** Function         BTA_DmAddBleDevice
-**
-** Description      Add a BLE device.  This function will be normally called
-**                  during host startup to restore all required information
-**                  for a LE device stored in the NVRAM.
-**
-** Parameters:      bd_addr          - BD address of the peer
-**                  dev_type         - Remote device's device type.
-**                  addr_type        - LE device address type.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmAddBleDevice
+ *
+ * Description      Add a BLE device.  This function will be normally called
+ *                  during host startup to restore all required information
+ *                  for a LE device stored in the NVRAM.
+ *
+ * Parameters:      bd_addr          - BD address of the peer
+ *                  dev_type         - Remote device's device type.
+ *                  addr_type        - LE device address type.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_DmAddBleDevice(BD_ADDR bd_addr, tBLE_ADDR_TYPE addr_type, tBT_DEVICE_TYPE dev_type)
 {
 #if (BLE_INCLUDED == TRUE)
@@ -685,19 +685,19 @@ void BTA_DmAddBleDevice(BD_ADDR bd_addr, tBLE_ADDR_TYPE addr_type, tBT_DEVICE_TY
 }
 
 /*******************************************************************************
-**
-** Function         BTA_DmBlePasskeyReply
-**
-** Description      Send BLE SMP passkey reply.
-**
-** Parameters:      bd_addr          - BD address of the peer
-**                  accept           - passkey entry sucessful or declined.
-**                  passkey          - passkey value, must be a 6 digit number,
-**                                     can be lead by 0.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmBlePasskeyReply
+ *
+ * Description      Send BLE SMP passkey reply.
+ *
+ * Parameters:      bd_addr          - BD address of the peer
+ *                  accept           - passkey entry sucessful or declined.
+ *                  passkey          - passkey value, must be a 6 digit number,
+ *                                     can be lead by 0.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_DmBlePasskeyReply(BD_ADDR bd_addr, bool accept, uint32_t passkey)
 {
 #if (BLE_INCLUDED == TRUE)
@@ -716,17 +716,17 @@ void BTA_DmBlePasskeyReply(BD_ADDR bd_addr, bool accept, uint32_t passkey)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_DmBleConfirmReply
-**
-** Description      Send BLE SMP SC user confirmation reply.
-**
-** Parameters:      bd_addr          - BD address of the peer
-**                  accept           - numbers to compare are the same or different.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmBleConfirmReply
+ *
+ * Description      Send BLE SMP SC user confirmation reply.
+ *
+ * Parameters:      bd_addr          - BD address of the peer
+ *                  accept           - numbers to compare are the same or different.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_DmBleConfirmReply(BD_ADDR bd_addr, bool accept)
 {
 #if (BLE_INCLUDED == TRUE)
@@ -742,17 +742,17 @@ void BTA_DmBleConfirmReply(BD_ADDR bd_addr, bool accept)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_DmBleSecurityGrant
-**
-** Description      Grant security request access.
-**
-** Parameters:      bd_addr          - BD address of the peer
-**                  res              - security grant status.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmBleSecurityGrant
+ *
+ * Description      Grant security request access.
+ *
+ * Parameters:      bd_addr          - BD address of the peer
+ *                  res              - security grant status.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_DmBleSecurityGrant(BD_ADDR bd_addr, tBTA_DM_BLE_SEC_GRANT res)
 {
 #if (BLE_INCLUDED == TRUE)
@@ -768,24 +768,24 @@ void BTA_DmBleSecurityGrant(BD_ADDR bd_addr, tBTA_DM_BLE_SEC_GRANT res)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_DmSetBlePrefConnParams
-**
-** Description      This function is called to set the preferred connection
-**                  parameters when default connection parameter is not desired.
-**
-** Parameters:      bd_addr          - BD address of the peripheral
-**                  scan_interval    - scan interval
-**                  scan_window      - scan window
-**                  min_conn_int     - minimum preferred connection interval
-**                  max_conn_int     - maximum preferred connection interval
-**                  slave_latency    - preferred slave latency
-**                  supervision_tout - preferred supervision timeout
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmSetBlePrefConnParams
+ *
+ * Description      This function is called to set the preferred connection
+ *                  parameters when default connection parameter is not desired.
+ *
+ * Parameters:      bd_addr          - BD address of the peripheral
+ *                  scan_interval    - scan interval
+ *                  scan_window      - scan window
+ *                  min_conn_int     - minimum preferred connection interval
+ *                  max_conn_int     - maximum preferred connection interval
+ *                  slave_latency    - preferred slave latency
+ *                  supervision_tout - preferred supervision timeout
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_DmSetBlePrefConnParams(const BD_ADDR bd_addr,
                                uint16_t min_conn_int, uint16_t max_conn_int,
                                uint16_t slave_latency, uint16_t supervision_tout )
@@ -806,18 +806,18 @@ void BTA_DmSetBlePrefConnParams(const BD_ADDR bd_addr,
 }
 
 /*******************************************************************************
-**
-** Function         BTA_DmSetBleConnScanParams
-**
-** Description      This function is called to set scan parameters used in
-**                  BLE connection request
-**
-** Parameters:      scan_interval    - scan interval
-**                  scan_window      - scan window
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmSetBleConnScanParams
+ *
+ * Description      This function is called to set scan parameters used in
+ *                  BLE connection request
+ *
+ * Parameters:      scan_interval    - scan interval
+ *                  scan_window      - scan window
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_DmSetBleConnScanParams(uint32_t scan_interval, uint32_t scan_window)
 {
 #if (BLE_INCLUDED == TRUE)
@@ -833,20 +833,20 @@ void BTA_DmSetBleConnScanParams(uint32_t scan_interval, uint32_t scan_window)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_DmSetBleScanParams
-**
-** Description      This function is called to set scan parameters
-**
-** Parameters:      client_if - Client IF
-**                  scan_interval - scan interval
-**                  scan_window - scan window
-**                  scan_mode - scan mode
-**                  scan_param_setup_status_cback - Set scan param status callback
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmSetBleScanParams
+ *
+ * Description      This function is called to set scan parameters
+ *
+ * Parameters:      client_if - Client IF
+ *                  scan_interval - scan interval
+ *                  scan_window - scan window
+ *                  scan_mode - scan mode
+ *                  scan_param_setup_status_cback - Set scan param status callback
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 
 #if (BLE_INCLUDED == TRUE)
 void BTA_DmSetBleScanParams(tGATT_IF client_if, uint32_t scan_interval,
@@ -868,17 +868,17 @@ void BTA_DmSetBleScanParams(tGATT_IF client_if, uint32_t scan_interval,
 #endif  // BLE_INCLUDED == true
 
 /*******************************************************************************
-**
-** Function         BTA_DmSetBleAdvParams
-**
-** Description      This function sets the advertising parameters BLE functionality.
-**                  It is to be called when device act in peripheral or broadcaster
-**                  role.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmSetBleAdvParams
+ *
+ * Description      This function sets the advertising parameters BLE functionality.
+ *                  It is to be called when device act in peripheral or broadcaster
+ *                  role.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_DmSetBleAdvParams(uint16_t adv_int_min, uint16_t adv_int_max,
                            tBLE_BD_ADDR *p_dir_bda)
 {
@@ -897,27 +897,27 @@ void BTA_DmSetBleAdvParams(uint16_t adv_int_min, uint16_t adv_int_max,
 }
 
 /*******************************************************************************
-**                      BLE ADV data management API
-********************************************************************************/
+ *                      BLE ADV data management API
+ *******************************************************************************/
 
 #if (BLE_INCLUDED == TRUE)
 /*******************************************************************************
-**
-** Function         BTA_DmBleSetStorageParams
-**
-** Description      This function is called to override the BTA scan response.
-**
-** Parameters       batch_scan_full_max -Max storage space (in %) allocated to full scanning
-**                  batch_scan_trunc_max -Max storage space (in %) allocated to truncated scanning
-**                  batch_scan_notify_threshold -Setup notification level based on total space
-**                  p_setup_cback - Setup callback pointer
-**                  p_thres_cback - Threshold callback pointer
-**                  p_rep_cback - Reports callback pointer
-**                  ref_value - Ref value
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmBleSetStorageParams
+ *
+ * Description      This function is called to override the BTA scan response.
+ *
+ * Parameters       batch_scan_full_max -Max storage space (in %) allocated to full scanning
+ *                  batch_scan_trunc_max -Max storage space (in %) allocated to truncated scanning
+ *                  batch_scan_notify_threshold -Setup notification level based on total space
+ *                  p_setup_cback - Setup callback pointer
+ *                  p_thres_cback - Threshold callback pointer
+ *                  p_rep_cback - Reports callback pointer
+ *                  ref_value - Ref value
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 extern void BTA_DmBleSetStorageParams(uint8_t batch_scan_full_max,
                                          uint8_t batch_scan_trunc_max,
                                          uint8_t batch_scan_notify_threshold,
@@ -944,21 +944,21 @@ extern void BTA_DmBleSetStorageParams(uint8_t batch_scan_full_max,
 }
 
 /*******************************************************************************
-**
-** Function         BTA_DmBleEnableBatchScan
-**
-** Description      This function is called to enable the batch scan
-**
-** Parameters       scan_mode -Batch scan mode
-**                  scan_interval - Scan interval
-**                  scan_window - Scan window
-**                  discard_rule -Discard rules
-**                  addr_type - Address type
-**                  ref_value - Reference value
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmBleEnableBatchScan
+ *
+ * Description      This function is called to enable the batch scan
+ *
+ * Parameters       scan_mode -Batch scan mode
+ *                  scan_interval - Scan interval
+ *                  scan_window - Scan window
+ *                  discard_rule -Discard rules
+ *                  addr_type - Address type
+ *                  ref_value - Reference value
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 extern void BTA_DmBleEnableBatchScan(tBTA_BLE_BATCH_SCAN_MODE scan_mode,
                                          uint32_t scan_interval, uint32_t scan_window,
                                          tBTA_BLE_DISCARD_RULE discard_rule,
@@ -980,16 +980,16 @@ extern void BTA_DmBleEnableBatchScan(tBTA_BLE_BATCH_SCAN_MODE scan_mode,
 }
 
 /*******************************************************************************
-**
-** Function         BTA_DmBleDisableBatchScan
-**
-** Description      This function is called to disable the batch scan
-**
-** Parameters       ref_value - Reference value
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmBleDisableBatchScan
+ *
+ * Description      This function is called to disable the batch scan
+ *
+ * Parameters       ref_value - Reference value
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 extern void BTA_DmBleDisableBatchScan(tBTA_DM_BLE_REF_VALUE ref_value)
 {
     tBTA_DM_API_DISABLE_SCAN *p_msg =
@@ -1002,17 +1002,17 @@ extern void BTA_DmBleDisableBatchScan(tBTA_DM_BLE_REF_VALUE ref_value)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_DmBleReadScanReports
-**
-** Description      This function is called to read scan reports
-**
-** Parameters       scan_type -Batch scan mode
-**                  ref_value - Reference value
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmBleReadScanReports
+ *
+ * Description      This function is called to read scan reports
+ *
+ * Parameters       scan_type -Batch scan mode
+ *                  ref_value - Reference value
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 extern void BTA_DmBleReadScanReports(tBTA_BLE_BATCH_SCAN_MODE scan_type,
                                              tBTA_DM_BLE_REF_VALUE ref_value)
 {
@@ -1027,17 +1027,17 @@ extern void BTA_DmBleReadScanReports(tBTA_BLE_BATCH_SCAN_MODE scan_type,
 }
 
 /*******************************************************************************
-**
-** Function         BTA_DmBleTrackAdvertiser
-**
-** Description      This function is called to track advertiser
-**
-** Parameters       ref_value - Reference value
-**                  p_track_adv_cback - Track ADV callback
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmBleTrackAdvertiser
+ *
+ * Description      This function is called to track advertiser
+ *
+ * Parameters       ref_value - Reference value
+ *                  p_track_adv_cback - Track ADV callback
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 extern void BTA_DmBleTrackAdvertiser(tBTA_DM_BLE_REF_VALUE ref_value,
                             tBTA_BLE_TRACK_ADV_CBACK *p_track_adv_cback)
 {
@@ -1054,23 +1054,23 @@ extern void BTA_DmBleTrackAdvertiser(tBTA_DM_BLE_REF_VALUE ref_value,
 #endif
 
 /*******************************************************************************
-**                      BLE ADV data management API
-********************************************************************************/
+ *                      BLE ADV data management API
+ *******************************************************************************/
 
 /*******************************************************************************
-**
-** Function         BTA_DmBleSetBgConnType
-**
-** Description      This function is called to set BLE connectable mode for a
-**                  peripheral device.
-**
-** Parameters       bg_conn_type: it can be auto connection, or selective connection.
-**                  p_select_cback: callback function when selective connection procedure
-**                              is being used.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmBleSetBgConnType
+ *
+ * Description      This function is called to set BLE connectable mode for a
+ *                  peripheral device.
+ *
+ * Parameters       bg_conn_type: it can be auto connection, or selective connection.
+ *                  p_select_cback: callback function when selective connection procedure
+ *                              is being used.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_DmBleSetBgConnType(tBTA_DM_BLE_CONN_TYPE bg_conn_type, tBTA_DM_BLE_SEL_CBACK *p_select_cback)
 {
 #if (BLE_INCLUDED == TRUE)
@@ -1086,14 +1086,14 @@ void BTA_DmBleSetBgConnType(tBTA_DM_BLE_CONN_TYPE bg_conn_type, tBTA_DM_BLE_SEL_
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_discover_send_msg
-**
-** Description      This function send discover message to BTA task.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_discover_send_msg
+ *
+ * Description      This function send discover message to BTA task.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 #if (BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE)
 static void bta_dm_discover_send_msg(BD_ADDR bd_addr, tBTA_SERVICE_MASK_EXT *p_services,
                     tBTA_DM_SEARCH_CBACK *p_cback, bool sdp_search,
@@ -1127,21 +1127,21 @@ static void bta_dm_discover_send_msg(BD_ADDR bd_addr, tBTA_SERVICE_MASK_EXT *p_s
 #endif
 
 /*******************************************************************************
-**
-** Function         BTA_DmDiscoverByTransport
-**
-** Description      This function does service discovery on particular transport
-**                  for services of a
-**                  peer device. When services.num_uuid is 0, it indicates all
-**                  GATT based services are to be searched; otherwise a list of
-**                  UUID of interested services should be provided through
-**                  p_services->p_uuid.
-**
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmDiscoverByTransport
+ *
+ * Description      This function does service discovery on particular transport
+ *                  for services of a
+ *                  peer device. When services.num_uuid is 0, it indicates all
+ *                  GATT based services are to be searched; otherwise a list of
+ *                  UUID of interested services should be provided through
+ *                  p_services->p_uuid.
+ *
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_DmDiscoverByTransport(BD_ADDR bd_addr, tBTA_SERVICE_MASK_EXT *p_services,
                     tBTA_DM_SEARCH_CBACK *p_cback, bool sdp_search,
                     tBTA_TRANSPORT transport)
@@ -1153,20 +1153,20 @@ void BTA_DmDiscoverByTransport(BD_ADDR bd_addr, tBTA_SERVICE_MASK_EXT *p_service
 
 
 /*******************************************************************************
-**
-** Function         BTA_DmDiscoverExt
-**
-** Description      This function does service discovery for services of a
-**                  peer device. When services.num_uuid is 0, it indicates all
-**                  GATT based services are to be searched; other wise a list of
-**                  UUID of interested services should be provided through
-**                  p_services->p_uuid.
-**
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmDiscoverExt
+ *
+ * Description      This function does service discovery for services of a
+ *                  peer device. When services.num_uuid is 0, it indicates all
+ *                  GATT based services are to be searched; other wise a list of
+ *                  UUID of interested services should be provided through
+ *                  p_services->p_uuid.
+ *
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_DmDiscoverExt(BD_ADDR bd_addr, tBTA_SERVICE_MASK_EXT *p_services,
                     tBTA_DM_SEARCH_CBACK *p_cback, bool sdp_search)
 {
@@ -1177,24 +1177,24 @@ void BTA_DmDiscoverExt(BD_ADDR bd_addr, tBTA_SERVICE_MASK_EXT *p_services,
 }
 
 /*******************************************************************************
-**
-** Function         BTA_DmSearchExt
-**
-** Description      This function searches for peer Bluetooth devices. It performs
-**                  an inquiry and gets the remote name for devices. Service
-**                  discovery is done if services is non zero
-**
-** Parameters       p_dm_inq: inquiry conditions
-**                  p_services: if service is not empty, service discovery will be done.
-**                            for all GATT based service condition, put num_uuid, and
-**                            p_uuid is the pointer to the list of UUID values.
-**                  p_cback: callback functino when search is completed.
-**
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmSearchExt
+ *
+ * Description      This function searches for peer Bluetooth devices. It performs
+ *                  an inquiry and gets the remote name for devices. Service
+ *                  discovery is done if services is non zero
+ *
+ * Parameters       p_dm_inq: inquiry conditions
+ *                  p_services: if service is not empty, service discovery will be done.
+ *                            for all GATT based service condition, put num_uuid, and
+ *                            p_uuid is the pointer to the list of UUID values.
+ *                  p_cback: callback functino when search is completed.
+ *
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 #if (BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE)
 void BTA_DmSearchExt(tBTA_DM_INQ *p_dm_inq, tBTA_SERVICE_MASK_EXT *p_services, tBTA_DM_SEARCH_CBACK *p_cback)
 {
@@ -1231,20 +1231,20 @@ void BTA_DmSearchExt(UNUSED_ATTR tBTA_DM_INQ *p_dm_inq,
 }
 #endif
 /*******************************************************************************
-**
-** Function         BTA_DmBleUpdateConnectionParam
-**
-** Description      Update connection parameters, can only be used when connection is up.
-**
-** Parameters:      bd_addr          - BD address of the peer
-**                  min_int   -     minimum connection interval, [0x0004~ 0x4000]
-**                  max_int   -     maximum connection interval, [0x0004~ 0x4000]
-**                  latency   -     slave latency [0 ~ 500]
-**                  timeout   -     supervision timeout [0x000a ~ 0xc80]
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmBleUpdateConnectionParam
+ *
+ * Description      Update connection parameters, can only be used when connection is up.
+ *
+ * Parameters:      bd_addr          - BD address of the peer
+ *                  min_int   -     minimum connection interval, [0x0004~ 0x4000]
+ *                  max_int   -     maximum connection interval, [0x0004~ 0x4000]
+ *                  latency   -     slave latency [0 ~ 500]
+ *                  timeout   -     supervision timeout [0x000a ~ 0xc80]
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_DmBleUpdateConnectionParam(BD_ADDR bd_addr, uint16_t min_int,
                                     uint16_t max_int, uint16_t latency,
                                     uint16_t timeout)
@@ -1265,16 +1265,16 @@ void BTA_DmBleUpdateConnectionParam(BD_ADDR bd_addr, uint16_t min_int,
 }
 
 /*******************************************************************************
-**
-** Function         BTA_DmBleConfigLocalPrivacy
-**
-** Description      Enable/disable privacy on the local device
-**
-** Parameters:      privacy_enable   - enable/disabe privacy on remote device.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmBleConfigLocalPrivacy
+ *
+ * Description      Enable/disable privacy on the local device
+ *
+ * Parameters:      privacy_enable   - enable/disabe privacy on remote device.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_DmBleConfigLocalPrivacy(bool privacy_enable)
 {
 #if (BLE_INCLUDED == TRUE && BLE_PRIVACY_SPT == TRUE)
@@ -1292,22 +1292,22 @@ void BTA_DmBleConfigLocalPrivacy(bool privacy_enable)
 
 #if (BLE_INCLUDED == TRUE)
 /*******************************************************************************
-**
-** Function         BTA_DmBleCfgFilterCondition
-**
-** Description      This function is called to configure the adv data payload filter
-**                  condition.
-**
-** Parameters       action: to read/write/clear
-**                  cond_type: filter condition type
-**                  filt_index - Filter index
-**                  p_cond: filter condition parameter
-**                  p_cmpl_back - Command completed callback
-**                  ref_value - Reference value
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmBleCfgFilterCondition
+ *
+ * Description      This function is called to configure the adv data payload filter
+ *                  condition.
+ *
+ * Parameters       action: to read/write/clear
+ *                  cond_type: filter condition type
+ *                  filt_index - Filter index
+ *                  p_cond: filter condition parameter
+ *                  p_cmpl_back - Command completed callback
+ *                  ref_value - Reference value
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 #if (BLE_ANDROID_CONTROLLER_SCAN_FILTER == TRUE)
 void BTA_DmBleCfgFilterCondition(tBTA_DM_BLE_SCAN_COND_OP action,
                                  tBTA_DM_BLE_PF_COND_TYPE cond_type,
@@ -1420,21 +1420,21 @@ void BTA_DmBleCfgFilterCondition(UNUSED_ATTR tBTA_DM_BLE_SCAN_COND_OP action,
 #endif
 
 /*******************************************************************************
-**
-** Function         BTA_DmBleScanFilterSetup
-**
-** Description      This function is called to setup the adv data payload filter param
-**
-** Parameters       p_target: enable the filter condition on a target device; if NULL
-**                  filt_index - Filter index
-**                  p_filt_params -Filter parameters
-**                  ref_value - Reference value
-**                  action - Add, delete or clear
-**                  p_cmpl_back - Command completed callback
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmBleScanFilterSetup
+ *
+ * Description      This function is called to setup the adv data payload filter param
+ *
+ * Parameters       p_target: enable the filter condition on a target device; if NULL
+ *                  filt_index - Filter index
+ *                  p_filt_params -Filter parameters
+ *                  ref_value - Reference value
+ *                  action - Add, delete or clear
+ *                  p_cmpl_back - Command completed callback
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 #if (BLE_ANDROID_CONTROLLER_SCAN_FILTER == TRUE)
 void BTA_DmBleScanFilterSetup(uint8_t action,
                               tBTA_DM_BLE_PF_FILT_INDEX filt_index,
@@ -1478,16 +1478,16 @@ void BTA_DmBleScanFilterSetup(UNUSED_ATTR uint8_t action,
 #endif
 
 /*******************************************************************************
-**
-** Function         BTA_DmBleGetEnergyInfo
-**
-** Description      This function is called to obtain the energy info
-**
-** Parameters       p_cmpl_cback - Command complete callback
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmBleGetEnergyInfo
+ *
+ * Description      This function is called to obtain the energy info
+ *
+ * Parameters       p_cmpl_cback - Command complete callback
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_DmBleGetEnergyInfo(tBTA_BLE_ENERGY_INFO_CBACK *p_cmpl_cback)
 {
     const size_t len = sizeof(tBTA_DM_API_ENERGY_INFO) + sizeof(tBLE_BD_ADDR);
@@ -1502,18 +1502,18 @@ void BTA_DmBleGetEnergyInfo(tBTA_BLE_ENERGY_INFO_CBACK *p_cmpl_cback)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_DmEnableScanFilter
-**
-** Description      This function is called to enable the adv data payload filter
-**
-** Parameters       action - enable or disable the APCF feature
-**                  p_cmpl_cback - Command completed callback
-**                  ref_value - Reference value
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmEnableScanFilter
+ *
+ * Description      This function is called to enable the adv data payload filter
+ *
+ * Parameters       action - enable or disable the APCF feature
+ *                  p_cmpl_cback - Command completed callback
+ *                  ref_value - Reference value
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 #if (BLE_ANDROID_CONTROLLER_SCAN_FILTER == TRUE)
 void BTA_DmEnableScanFilter(uint8_t action, tBTA_DM_BLE_PF_STATUS_CBACK *p_cmpl_cback,
                                     tBTA_DM_BLE_REF_VALUE ref_value)
@@ -1542,20 +1542,20 @@ void BTA_DmEnableScanFilter(UNUSED_ATTR uint8_t action,
 #endif
 
 /*******************************************************************************
-**
-** Function         BTA_DmBleUpdateConnectionParams
-**
-** Description      Update connection parameters, can only be used when connection is up.
-**
-** Parameters:      bd_addr   - BD address of the peer
-**                  min_int   -     minimum connection interval, [0x0004~ 0x4000]
-**                  max_int   -     maximum connection interval, [0x0004~ 0x4000]
-**                  latency   -     slave latency [0 ~ 500]
-**                  timeout   -     supervision timeout [0x000a ~ 0xc80]
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmBleUpdateConnectionParams
+ *
+ * Description      Update connection parameters, can only be used when connection is up.
+ *
+ * Parameters:      bd_addr   - BD address of the peer
+ *                  min_int   -     minimum connection interval, [0x0004~ 0x4000]
+ *                  max_int   -     maximum connection interval, [0x0004~ 0x4000]
+ *                  latency   -     slave latency [0 ~ 500]
+ *                  timeout   -     supervision timeout [0x000a ~ 0xc80]
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_DmBleUpdateConnectionParams(const BD_ADDR bd_addr, uint16_t min_int, uint16_t max_int,
                                     uint16_t latency, uint16_t timeout)
 {
@@ -1573,15 +1573,15 @@ void BTA_DmBleUpdateConnectionParams(const BD_ADDR bd_addr, uint16_t min_int, ui
 }
 
 /*******************************************************************************
-**
-** Function         BTA_DmBleSetDataLength
-**
-** Description      This function is to set maximum LE data packet size
-**
-** Returns          void
-**
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmBleSetDataLength
+ *
+ * Description      This function is to set maximum LE data packet size
+ *
+ * Returns          void
+ *
+ *
+ ******************************************************************************/
 void BTA_DmBleSetDataLength(BD_ADDR remote_device, uint16_t tx_data_length)
 {
     tBTA_DM_API_BLE_SET_DATA_LENGTH *p_msg =
@@ -1597,27 +1597,27 @@ void BTA_DmBleSetDataLength(BD_ADDR remote_device, uint16_t tx_data_length)
 #endif
 
 /*******************************************************************************
-**
-** Function         BTA_DmSetEncryption
-**
-** Description      This function is called to ensure that connection is
-**                  encrypted.  Should be called only on an open connection.
-**                  Typically only needed for connections that first want to
-**                  bring up unencrypted links, then later encrypt them.
-**
-** Parameters:      bd_addr       - Address of the peer device
-**                  transport     - transport of the link to be encruypted
-**                  p_callback    - Pointer to callback function to indicat the
-**                                  link encryption status
-**                  sec_act       - This is the security action to indicate
-**                                  what knid of BLE security level is required for
-**                                  the BLE link if the BLE is supported
-**                                  Note: This parameter is ignored for the BR/EDR link
-**                                        or the BLE is not supported
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmSetEncryption
+ *
+ * Description      This function is called to ensure that connection is
+ *                  encrypted.  Should be called only on an open connection.
+ *                  Typically only needed for connections that first want to
+ *                  bring up unencrypted links, then later encrypt them.
+ *
+ * Parameters:      bd_addr       - Address of the peer device
+ *                  transport     - transport of the link to be encruypted
+ *                  p_callback    - Pointer to callback function to indicat the
+ *                                  link encryption status
+ *                  sec_act       - This is the security action to indicate
+ *                                  what knid of BLE security level is required for
+ *                                  the BLE link if the BLE is supported
+ *                                  Note: This parameter is ignored for the BR/EDR link
+ *                                        or the BLE is not supported
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_DmSetEncryption(BD_ADDR bd_addr, tBTA_TRANSPORT transport, tBTA_DM_ENCRYPT_CBACK *p_callback,
                             tBTA_DM_BLE_SEC_ACT sec_act)
 {
@@ -1635,18 +1635,18 @@ void BTA_DmSetEncryption(BD_ADDR bd_addr, tBTA_TRANSPORT transport, tBTA_DM_ENCR
 }
 
 /*******************************************************************************
-**
-** Function         BTA_DmCloseACL
-**
-** Description      This function force to close an ACL connection and remove the
-**                  device from the security database list of known devices.
-**
-** Parameters:      bd_addr       - Address of the peer device
-**                  remove_dev    - remove device or not after link down
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmCloseACL
+ *
+ * Description      This function force to close an ACL connection and remove the
+ *                  device from the security database list of known devices.
+ *
+ * Parameters:      bd_addr       - Address of the peer device
+ *                  remove_dev    - remove device or not after link down
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_DmCloseACL(BD_ADDR bd_addr, bool remove_dev, tBTA_TRANSPORT transport)
 {
     tBTA_DM_API_REMOVE_ACL *p_msg =
@@ -1664,20 +1664,20 @@ void BTA_DmCloseACL(BD_ADDR bd_addr, bool remove_dev, tBTA_TRANSPORT transport)
 
 #if (BLE_INCLUDED == TRUE)
 /*******************************************************************************
-**
-** Function         BTA_DmBleObserve
-**
-** Description      This procedure keep the device listening for advertising
-**                  events from a broadcast device.
-**
-** Parameters       start: start or stop observe.
-**
-** Returns          void
-
-**
-** Returns          void.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmBleObserve
+ *
+ * Description      This procedure keep the device listening for advertising
+ *                  events from a broadcast device.
+ *
+ * Parameters       start: start or stop observe.
+ *
+ * Returns          void
+
+ *
+ * Returns          void.
+ *
+ ******************************************************************************/
 extern void BTA_DmBleObserve(bool start, uint8_t duration,
                              tBTA_DM_SEARCH_CBACK *p_results_cb)
 {
@@ -1695,28 +1695,28 @@ extern void BTA_DmBleObserve(bool start, uint8_t duration,
 }
 
 /*******************************************************************************
-**
-** Function         BTA_VendorInit
-**
-** Description      This function initializes vendor specific
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_VendorInit
+ *
+ * Description      This function initializes vendor specific
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_VendorInit (void)
 {
     APPL_TRACE_API("BTA_VendorInit");
 }
 
 /*******************************************************************************
-**
-** Function         BTA_VendorCleanup
-**
-** Description      This function frees up Broadcom specific VS specific dynamic memory
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_VendorCleanup
+ *
+ * Description      This function frees up Broadcom specific VS specific dynamic memory
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_VendorCleanup (void)
 {
     tBTM_BLE_VSC_CB cmn_ble_vsc_cb;
diff --git a/system/bta/dm/bta_dm_cfg.cc b/system/bta/dm/bta_dm_cfg.cc
index 91fd0bb357d..33a0b44ad70 100644
--- a/system/bta/dm/bta_dm_cfg.cc
+++ b/system/bta/dm/bta_dm_cfg.cc
@@ -534,21 +534,21 @@ tBTA_DM_PM_SPEC *p_bta_dm_pm_spec = (tBTA_DM_PM_SPEC *)&bta_dm_pm_spec;
 tBTM_PM_PWR_MD *p_bta_dm_pm_md = (tBTM_PM_PWR_MD *)&bta_dm_pm_md;
 
 /* The performance impact of EIR packet size
-**
-** When BTM_EIR_DEFAULT_FEC_REQUIRED is true,
-** 1 to 17 bytes,    DM1 is used and most robust.
-** 18 to 121 bytes,  DM3 is used but impacts inquiry scan time with large number
-**                    of devices.(almost double with 150 users)
-** 122 to 224 bytes, DM5 is used but cause quite big performance loss even with
-**                    small number of users. so it is not recommended.
-** 225 to 240 bytes, DH5 is used without FEC but it not recommended.
-**                    (same reason of DM5)
-**
-** When BTM_EIR_DEFAULT_FEC_REQUIRED is false,
-** 1 to 27 bytes,    DH1 is used but only robust at short range.
-** 28 to 183 bytes,  DH3 is used but only robust at short range and impacts inquiry
-**                    scan time with large number of devices.
-** 184 to 240 bytes, DH5 is used but it not recommended.
+ *
+ * When BTM_EIR_DEFAULT_FEC_REQUIRED is true,
+ * 1 to 17 bytes,    DM1 is used and most robust.
+ * 18 to 121 bytes,  DM3 is used but impacts inquiry scan time with large number
+ *                    of devices.(almost double with 150 users)
+ * 122 to 224 bytes, DM5 is used but cause quite big performance loss even with
+ *                    small number of users. so it is not recommended.
+ * 225 to 240 bytes, DH5 is used without FEC but it not recommended.
+ *                    (same reason of DM5)
+ *
+ * When BTM_EIR_DEFAULT_FEC_REQUIRED is false,
+ * 1 to 27 bytes,    DH1 is used but only robust at short range.
+ * 28 to 183 bytes,  DH3 is used but only robust at short range and impacts inquiry
+ *                    scan time with large number of devices.
+ * 184 to 240 bytes, DH5 is used but it not recommended.
 */
 
 #if (BTA_EIR_CANNED_UUID_LIST == TRUE)
diff --git a/system/bta/dm/bta_dm_ci.cc b/system/bta/dm/bta_dm_ci.cc
index 87e4b4c9f76..32731426ae3 100644
--- a/system/bta/dm/bta_dm_ci.cc
+++ b/system/bta/dm/bta_dm_ci.cc
@@ -31,16 +31,16 @@
 
 
 /*******************************************************************************
-**
-** Function         bta_dm_ci_io_req
-**
-** Description      This function must be called in response to function
-**                  bta_dm_co_io_req(), if *p_oob_data to BTA_OOB_UNKNOWN
-**                  by bta_dm_co_io_req().
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_ci_io_req
+ *
+ * Description      This function must be called in response to function
+ *                  bta_dm_co_io_req(), if *p_oob_data to BTA_OOB_UNKNOWN
+ *                  by bta_dm_co_io_req().
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_ci_io_req(BD_ADDR bd_addr, tBTA_IO_CAP io_cap, tBTA_OOB_DATA oob_data,
                                      tBTA_AUTH_REQ auth_req)
 
@@ -58,16 +58,16 @@ void bta_dm_ci_io_req(BD_ADDR bd_addr, tBTA_IO_CAP io_cap, tBTA_OOB_DATA oob_dat
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_ci_rmt_oob
-**
-** Description      This function must be called in response to function
-**                  bta_dm_co_rmt_oob() to provide the OOB data associated
-**                  with the remote device.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_ci_rmt_oob
+ *
+ * Description      This function must be called in response to function
+ *                  bta_dm_co_rmt_oob() to provide the OOB data associated
+ *                  with the remote device.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_ci_rmt_oob(bool accept, BD_ADDR bd_addr, BT_OCTET16 c, BT_OCTET16 r)
 {
     tBTA_DM_CI_RMT_OOB *p_msg =
@@ -84,20 +84,20 @@ void bta_dm_ci_rmt_oob(bool accept, BD_ADDR bd_addr, BT_OCTET16 c, BT_OCTET16 r)
 
 #if (BTM_SCO_HCI_INCLUDED == TRUE)
 /*******************************************************************************
-**
-** Function         bta_dm_sco_ci_data_ready
-**
-** Description      This function sends an event to indicating that the phone
-**                  has SCO data ready.
-**
-** Parameters       event: is obtained from bta_dm_sco_co_open() function, which
-**                          is the BTA event we want to send back to BTA module
-**                          when there is encoded data ready.
-**                  sco_handle: is the BTA sco handle which indicate a specific
-**                           SCO connection.
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_sco_ci_data_ready
+ *
+ * Description      This function sends an event to indicating that the phone
+ *                  has SCO data ready.
+ *
+ * Parameters       event: is obtained from bta_dm_sco_co_open() function, which
+ *                          is the BTA event we want to send back to BTA module
+ *                          when there is encoded data ready.
+ *                  sco_handle: is the BTA sco handle which indicate a specific
+ *                           SCO connection.
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_sco_ci_data_ready(uint16_t event, uint16_t sco_handle)
 {
     BT_HDR *p_buf = (BT_HDR *)osi_malloc(sizeof(BT_HDR));
diff --git a/system/bta/dm/bta_dm_int.h b/system/bta/dm/bta_dm_int.h
index 7097ba955ef..90b3c395119 100644
--- a/system/bta/dm/bta_dm_int.h
+++ b/system/bta/dm/bta_dm_int.h
@@ -33,8 +33,8 @@
 
 
 /*****************************************************************************
-**  Constants and data types
-*****************************************************************************/
+ *  Constants and data types
+ ****************************************************************************/
 
 
 #define BTA_COPY_DEVICE_CLASS(coddst, codsrc)   {((uint8_t *)(coddst))[0] = ((uint8_t *)(codsrc))[0]; \
diff --git a/system/bta/dm/bta_dm_main.cc b/system/bta/dm/bta_dm_main.cc
index 49f42f019e2..0852e8dc895 100644
--- a/system/bta/dm/bta_dm_main.cc
+++ b/system/bta/dm/bta_dm_main.cc
@@ -28,8 +28,8 @@
 
 
 /*****************************************************************************
-** Constants and types
-*****************************************************************************/
+ * Constants and types
+ ****************************************************************************/
 
 tBTA_DM_CB  bta_dm_cb;
 tBTA_DM_SEARCH_CB bta_dm_search_cb;
@@ -263,15 +263,15 @@ const tBTA_DM_ST_TBL bta_dm_search_st_tbl[] = {
 
 
 /*******************************************************************************
-**
-** Function         bta_dm_sm_disable
-**
-** Description     unregister BTA DM
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_sm_disable
+ *
+ * Description     unregister BTA DM
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_sm_disable( )
 {
     bta_sys_deregister( BTA_ID_DM );
@@ -279,15 +279,15 @@ void bta_dm_sm_disable( )
 
 
 /*******************************************************************************
-**
-** Function         bta_dm_sm_execute
-**
-** Description      State machine event handling function for DM
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_sm_execute
+ *
+ * Description      State machine event handling function for DM
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 bool bta_dm_sm_execute(BT_HDR *p_msg)
 {
     uint16_t  event = p_msg->event & 0x00ff;
@@ -304,15 +304,15 @@ bool bta_dm_sm_execute(BT_HDR *p_msg)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_sm_search_disable
-**
-** Description     unregister BTA SEARCH DM
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_sm_search_disable
+ *
+ * Description     unregister BTA SEARCH DM
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_search_sm_disable( )
 {
     bta_sys_deregister( BTA_ID_DM_SEARCH );
@@ -321,15 +321,15 @@ void bta_dm_search_sm_disable( )
 
 
 /*******************************************************************************
-**
-** Function         bta_dm_search_sm_execute
-**
-** Description      State machine event handling function for DM
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_search_sm_execute
+ *
+ * Description      State machine event handling function for DM
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 bool bta_dm_search_sm_execute(BT_HDR *p_msg)
 {
     tBTA_DM_ST_TBL      state_table;
diff --git a/system/bta/dm/bta_dm_pm.cc b/system/bta/dm/bta_dm_pm.cc
index 706d7cdc668..c75e4a45b97 100644
--- a/system/bta/dm/bta_dm_pm.cc
+++ b/system/bta/dm/bta_dm_pm.cc
@@ -63,15 +63,15 @@ tBTA_DM_CONNECTED_SRVCS bta_dm_conn_srvcs;
 
 
 /*******************************************************************************
-**
-** Function         bta_dm_init_pm
-**
-** Description      Initializes the BT low power manager
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_init_pm
+ *
+ * Description      Initializes the BT low power manager
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_init_pm(void)
 {
     memset(&bta_dm_conn_srvcs, 0x00, sizeof(bta_dm_conn_srvcs));
@@ -95,15 +95,15 @@ void bta_dm_init_pm(void)
 
 
 /*******************************************************************************
-**
-** Function         bta_dm_disable_pm
-**
-** Description      Disable PM
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_disable_pm
+ *
+ * Description      Disable PM
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_disable_pm(void)
 {
     BTM_PmRegister( BTM_PM_DEREG, &bta_dm_cb.pm_id, NULL);
@@ -126,15 +126,15 @@ void bta_dm_disable_pm(void)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_get_av_count
-**
-** Description      Get the number of connected AV
-**
-**
-** Returns          number of av connections
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_get_av_count
+ *
+ * Description      Get the number of connected AV
+ *
+ *
+ * Returns          number of av connections
+ *
+ ******************************************************************************/
 uint8_t bta_dm_get_av_count(void)
 {
     uint8_t count = 0;
@@ -147,15 +147,15 @@ uint8_t bta_dm_get_av_count(void)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_pm_stop_timer
-**
-** Description      stop a PM timer
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_pm_stop_timer
+ *
+ * Description      stop a PM timer
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_dm_pm_stop_timer(BD_ADDR peer_addr)
 {
     APPL_TRACE_DEBUG("%s: ", __func__);
@@ -184,15 +184,15 @@ static void bta_dm_pm_stop_timer(BD_ADDR peer_addr)
 }
 
 /*******************************************************************************
-**
-** Function         bta_pm_action_to_timer_idx
-**
-** Description      convert power mode into timer index for each connected device
-**
-**
-** Returns          index of the power mode delay timer
-**
-*******************************************************************************/
+ *
+ * Function         bta_pm_action_to_timer_idx
+ *
+ * Description      convert power mode into timer index for each connected device
+ *
+ *
+ * Returns          index of the power mode delay timer
+ *
+ ******************************************************************************/
 static uint8_t bta_pm_action_to_timer_idx(uint8_t pm_action)
 {
     if (pm_action == BTA_DM_PM_SUSPEND)
@@ -207,15 +207,15 @@ static uint8_t bta_pm_action_to_timer_idx(uint8_t pm_action)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_pm_stop_timer_by_mode
-**
-** Description      stop a PM timer
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_pm_stop_timer_by_mode
+ *
+ * Description      stop a PM timer
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_dm_pm_stop_timer_by_mode(BD_ADDR peer_addr, uint8_t power_mode)
 {
     const uint8_t timer_idx = bta_pm_action_to_timer_idx(power_mode);
@@ -243,15 +243,15 @@ static void bta_dm_pm_stop_timer_by_mode(BD_ADDR peer_addr, uint8_t power_mode)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_pm_stop_timer_by_srvc_id
-**
-** Description      stop all timer started by the service ID.
-**
-**
-** Returns          index of the power mode delay timer
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_pm_stop_timer_by_srvc_id
+ *
+ * Description      stop all timer started by the service ID.
+ *
+ *
+ * Returns          index of the power mode delay timer
+ *
+ ******************************************************************************/
 static void bta_dm_pm_stop_timer_by_srvc_id(BD_ADDR peer_addr, uint8_t srvc_id)
 {
     for (int i = 0; i < BTA_DM_NUM_PM_TIMER; i++)
@@ -272,15 +272,15 @@ static void bta_dm_pm_stop_timer_by_srvc_id(BD_ADDR peer_addr, uint8_t srvc_id)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_pm_start_timer
-**
-** Description      start a PM timer
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_pm_start_timer
+ *
+ * Description      start a PM timer
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_dm_pm_start_timer(tBTA_PM_TIMER *p_timer, uint8_t timer_idx,
                                   period_ms_t timeout_ms, uint8_t srvc_id,
                                   uint8_t pm_action)
@@ -301,15 +301,15 @@ static void bta_dm_pm_start_timer(tBTA_PM_TIMER *p_timer, uint8_t timer_idx,
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_pm_stop_timer_by_index
-**
-** Description      stop a PM timer
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_pm_stop_timer_by_index
+ *
+ * Description      stop a PM timer
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_dm_pm_stop_timer_by_index(tBTA_PM_TIMER *p_timer,
                                           uint8_t timer_idx)
 {
@@ -331,15 +331,15 @@ static void bta_dm_pm_stop_timer_by_index(tBTA_PM_TIMER *p_timer,
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_pm_cback
-**
-** Description      Conn change callback from sys for low power management
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_pm_cback
+ *
+ * Description      Conn change callback from sys for low power management
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_dm_pm_cback(tBTA_SYS_CONN_STATUS status, uint8_t id, uint8_t app_id, BD_ADDR peer_addr)
 {
 
@@ -517,15 +517,15 @@ static void bta_dm_pm_cback(tBTA_SYS_CONN_STATUS status, uint8_t id, uint8_t app
 
 
 /*******************************************************************************
-**
-** Function         bta_dm_pm_set_mode
-**
-** Description      Set the power mode for the device
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_pm_set_mode
+ *
+ * Description      Set the power mode for the device
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 
 static void bta_dm_pm_set_mode(BD_ADDR peer_addr, tBTA_DM_PM_ACTION pm_request,
                                tBTA_DM_PM_REQ pm_req )
@@ -721,15 +721,15 @@ static void bta_dm_pm_set_mode(BD_ADDR peer_addr, tBTA_DM_PM_ACTION pm_request,
     }
 }
 /*******************************************************************************
-**
-** Function         bta_ag_pm_park
-**
-** Description      Switch to park mode.
-**
-**
-** Returns          true if park attempted, false otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_pm_park
+ *
+ * Description      Switch to park mode.
+ *
+ *
+ * Returns          true if park attempted, false otherwise.
+ *
+ ******************************************************************************/
 static bool bta_dm_pm_park(BD_ADDR peer_addr)
 {
 
@@ -747,15 +747,15 @@ static bool bta_dm_pm_park(BD_ADDR peer_addr)
 }
 
 /*******************************************************************************
-**
-** Function         bta_ag_pm_sniff
-**
-** Description      Switch to sniff mode.
-**
-**
-** Returns          true if sniff attempted, false otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_pm_sniff
+ *
+ * Description      Switch to sniff mode.
+ *
+ *
+ * Returns          true if sniff attempted, false otherwise.
+ *
+ ******************************************************************************/
 static bool bta_dm_pm_sniff(tBTA_DM_PEER_DEVICE *p_peer_dev, uint8_t index)
 {
     tBTM_PM_MODE    mode = BTM_PM_STS_ACTIVE;
@@ -817,14 +817,14 @@ static bool bta_dm_pm_sniff(tBTA_DM_PEER_DEVICE *p_peer_dev, uint8_t index)
 
 }
 /*******************************************************************************
-**
-** Function         bta_dm_pm_ssr
-**
-** Description      checks and sends SSR parameters
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_pm_ssr
+ *
+ * Description      checks and sends SSR parameters
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 #if (BTM_SSR_INCLUDED == TRUE)
 static void bta_dm_pm_ssr(BD_ADDR peer_addr)
 {
@@ -898,15 +898,15 @@ static void bta_dm_pm_ssr(BD_ADDR peer_addr)
 }
 #endif
 /*******************************************************************************
-**
-** Function         bta_dm_pm_active
-**
-** Description      Brings connection to active mode
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_pm_active
+ *
+ * Description      Brings connection to active mode
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_pm_active(BD_ADDR peer_addr)
 {
     tBTM_PM_PWR_MD  pm;
@@ -922,15 +922,15 @@ void bta_dm_pm_active(BD_ADDR peer_addr)
 
 
 /*******************************************************************************
-**
-** Function         bta_dm_pm_btm_cback
-**
-** Description      BTM power manager callback.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_pm_btm_cback
+ *
+ * Description      BTM power manager callback.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_dm_pm_btm_cback(BD_ADDR bd_addr, tBTM_PM_STATUS status, uint16_t value, uint8_t hci_status)
 {
     tBTA_DM_PM_BTM_STATUS *p_buf =
@@ -946,15 +946,15 @@ static void bta_dm_pm_btm_cback(BD_ADDR bd_addr, tBTM_PM_STATUS status, uint16_t
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_pm_timer_cback
-**
-** Description      Power management timer callback.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_pm_timer_cback
+ *
+ * Description      Power management timer callback.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_dm_pm_timer_cback(void *data)
 {
     uint8_t i, j;
@@ -996,15 +996,15 @@ static void bta_dm_pm_timer_cback(void *data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_pm_btm_status
-**
-** Description      Process pm status event from btm
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_pm_btm_status
+ *
+ * Description      Process pm status event from btm
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_pm_btm_status(tBTA_DM_MSG *p_data)
 {
     APPL_TRACE_DEBUG("%s status: %d", __func__, p_data->pm_status.status);
@@ -1100,15 +1100,15 @@ void bta_dm_pm_btm_status(tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_pm_timer
-**
-** Description      Process pm timer event from btm
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_pm_timer
+ *
+ * Description      Process pm timer event from btm
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_dm_pm_timer(tBTA_DM_MSG *p_data)
 {
     APPL_TRACE_EVENT("%s", __func__);
@@ -1116,14 +1116,14 @@ void bta_dm_pm_timer(tBTA_DM_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_find_peer_device
-**
-** Description      Given an address, find the associated control block.
-**
-** Returns          tBTA_DM_PEER_DEVICE
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_find_peer_device
+ *
+ * Description      Given an address, find the associated control block.
+ *
+ * Returns          tBTA_DM_PEER_DEVICE
+ *
+ ******************************************************************************/
 tBTA_DM_PEER_DEVICE * bta_dm_find_peer_device(const BD_ADDR peer_addr)
 {
     tBTA_DM_PEER_DEVICE *p_dev = NULL;
@@ -1141,14 +1141,14 @@ tBTA_DM_PEER_DEVICE * bta_dm_find_peer_device(const BD_ADDR peer_addr)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_is_sco_active
-**
-** Description      Loop through connected services for HFP+State=SCO
-**
-** Returns          bool. true if SCO active, else false
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_is_sco_active
+ *
+ * Description      Loop through connected services for HFP+State=SCO
+ *
+ * Returns          bool. true if SCO active, else false
+ *
+ ******************************************************************************/
 static bool bta_dm_pm_is_sco_active ()
 {
     int j;
@@ -1170,14 +1170,14 @@ static bool bta_dm_pm_is_sco_active ()
 
 
 /*******************************************************************************
-**
-** Function        bta_dm_get_sco_index
-**
-** Description     Loop through connected services for HFP+State=SCO
-**
-** Returns         index at which SCO is connected, in absence of SCO return -1
-**
-*******************************************************************************/
+ *
+ * Function        bta_dm_get_sco_index
+ *
+ * Description     Loop through connected services for HFP+State=SCO
+ *
+ * Returns         index at which SCO is connected, in absence of SCO return -1
+ *
+ ******************************************************************************/
 static int bta_dm_get_sco_index()
 {
     for(int j = 0; j < bta_dm_conn_srvcs.count; j++)
@@ -1193,14 +1193,14 @@ static int bta_dm_get_sco_index()
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_pm_hid_check
-**
-** Description      Disables/Enables sniff in link policy based on SCO Up/Down
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_pm_hid_check
+ *
+ * Description      Disables/Enables sniff in link policy based on SCO Up/Down
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 static void bta_dm_pm_hid_check(bool bScoActive)
 {
     int j;
@@ -1225,14 +1225,14 @@ static void bta_dm_pm_hid_check(bool bScoActive)
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_pm_set_sniff_policy
-**
-** Description      Disables/Enables sniff in link policy for the give device
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_pm_set_sniff_policy
+ *
+ * Description      Disables/Enables sniff in link policy for the give device
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 static void bta_dm_pm_set_sniff_policy(tBTA_DM_PEER_DEVICE *p_dev, bool bDisable)
 {
     uint16_t policy_setting;
@@ -1266,14 +1266,14 @@ static void bta_dm_pm_set_sniff_policy(tBTA_DM_PEER_DEVICE *p_dev, bool bDisable
 
 #if (BLE_INCLUDED == TRUE)
 /*******************************************************************************
-**
-** Function         bta_dm_pm_obtain_controller_state
-**
-** Description      This function obtains the consolidated controller power state
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_pm_obtain_controller_state
+ *
+ * Description      This function obtains the consolidated controller power state
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 tBTA_DM_CONTRL_STATE bta_dm_pm_obtain_controller_state(void)
 {
     /*   Did not use counts as it is not sure, how accurate the count values are in
diff --git a/system/bta/dm/bta_dm_sco.cc b/system/bta/dm/bta_dm_sco.cc
index b46a365ca81..e470ea8c3e7 100644
--- a/system/bta/dm/bta_dm_sco.cc
+++ b/system/bta/dm/bta_dm_sco.cc
@@ -35,8 +35,8 @@
 #define BTA_DM_SCO_DEBUG    false
 #endif
 /*****************************************************************************
-**  Constants
-*****************************************************************************/
+ *  Constants
+ ****************************************************************************/
 
 #define BTA_DM_PCM_OVERLAP_SIZE			     48
 
@@ -45,8 +45,8 @@
 #define BTA_DM_PCM_SMPL_RATE_11025     11025
 
 /*****************************************************************************
-**  Data types for PCM Resampling utility
-*****************************************************************************/
+ *  Data types for PCM Resampling utility
+ ****************************************************************************/
 
 typedef int32_t   (*PCONVERT_TO_BT_FILTERED)  (uint8_t *pSrc, void *pDst, uint32_t dwSrcSamples,
                              uint32_t dwSrcSps,int32_t *pLastCurPos, uint8_t *pOverlapArea);
@@ -71,8 +71,8 @@ typedef struct
 tBTA_DM_PCM_RESAMPLE_CB bta_dm_pcm_cb;
 
 /*****************************************************************************
-**  Macro Definition
-*****************************************************************************/
+ *  Macro Definition
+ ****************************************************************************/
 
 #define CHECK_SATURATION16(x) \
   do {                        \
@@ -229,8 +229,8 @@ tBTA_DM_PCM_RESAMPLE_CB bta_dm_pcm_cb;
 #define SRC_SAMPLE(x)   ((pS[x]  - 0x80) << 8)
 
 /*****************************************************************************
-**  Local Function
-*****************************************************************************/
+ *  Local Function
+ ****************************************************************************/
 int32_t Convert_8M_ToBT_Filtered (uint8_t *pSrc, void *pDst, uint32_t dwSrcSamples,
                     uint32_t dwSrcSps, int32_t *pLastCurPos, uint8_t *pOverlapArea)
 {
@@ -566,19 +566,19 @@ int32_t Convert_16S_ToBT_NoFilter (void *pSrc, void *pDst, uint32_t dwSrcSamples
 }
 
 /*******************************************************************************
-**
-** Function         BTA_DmPcmInitSamples
-**
-** Description      initialize the down sample converter.
-**
-**                  src_sps: original samples per second (source audio data)
-**                            (ex. 44100, 48000)
-**                  bits: number of bits per pcm sample (16)
-**                  n_channels: number of channels (i.e. mono(1), stereo(2)...)
-**
-** Returns          none
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmPcmInitSamples
+ *
+ * Description      initialize the down sample converter.
+ *
+ *                  src_sps: original samples per second (source audio data)
+ *                            (ex. 44100, 48000)
+ *                  bits: number of bits per pcm sample (16)
+ *                  n_channels: number of channels (i.e. mono(1), stereo(2)...)
+ *
+ * Returns          none
+ *
+ ******************************************************************************/
 void BTA_DmPcmInitSamples (uint32_t src_sps, uint32_t bits, uint32_t n_channels)
 {
     tBTA_DM_PCM_RESAMPLE_CB *p_cb = &bta_dm_pcm_cb;
@@ -645,21 +645,21 @@ void BTA_DmPcmInitSamples (uint32_t src_sps, uint32_t bits, uint32_t n_channels)
 }
 
 /**************************************************************************************
-** Function         BTA_DmPcmResample
-**
-** Description      Down sampling utility to convert higher sampling rate into 8K/16bits
-**                  PCM samples.
-**
-** Parameters       p_src: pointer to the buffer where the original sampling PCM
-**                              are stored.
-**                  in_bytes:  Length of the input PCM sample buffer in byte.
-**                  p_dst:      pointer to the buffer which is to be used to store
-**                              the converted PCM samples.
-**
-**
-** Returns          int32_t: number of samples converted.
-**
-**************************************************************************************/
+ * Function         BTA_DmPcmResample
+ *
+ * Description      Down sampling utility to convert higher sampling rate into 8K/16bits
+ *                  PCM samples.
+ *
+ * Parameters       p_src: pointer to the buffer where the original sampling PCM
+ *                              are stored.
+ *                  in_bytes:  Length of the input PCM sample buffer in byte.
+ *                  p_dst:      pointer to the buffer which is to be used to store
+ *                              the converted PCM samples.
+ *
+ *
+ * Returns          int32_t: number of samples converted.
+ *
+ *************************************************************************************/
 int32_t BTA_DmPcmResample (void *p_src, uint32_t in_bytes, void *p_dst)
 {
     uint32_t out_sample;
diff --git a/system/bta/gatt/bta_gattc_act.cc b/system/bta/gatt/bta_gattc_act.cc
index 1186b015de1..717cbb99e28 100644
--- a/system/bta/gatt/bta_gattc_act.cc
+++ b/system/bta/gatt/bta_gattc_act.cc
@@ -45,8 +45,8 @@
 #if (BTA_GATT_INCLUDED == TRUE && BLE_INCLUDED == TRUE)
 
 /*****************************************************************************
-**  Constants
-*****************************************************************************/
+ *  Constants
+ ****************************************************************************/
 static void bta_gattc_conn_cback(tGATT_IF gattc_if, BD_ADDR bda, uint16_t conn_id,
                                  bool connected, tGATT_DISCONN_REASON reason,
                                  tBT_TRANSPORT transport);
@@ -95,22 +95,22 @@ static const char *bta_gattc_op_code_name[] =
 };
 #endif // BT_TRACE_VERBOSE
 /*****************************************************************************
-**  Action Functions
-*****************************************************************************/
+ *  Action Functions
+ ****************************************************************************/
 
 
 void bta_gattc_reset_discover_st(tBTA_GATTC_SERV *p_srcb, tBTA_GATT_STATUS status);
 
 /*******************************************************************************
-**
-** Function         bta_gattc_enable
-**
-** Description      Enables GATTC module
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_enable
+ *
+ * Description      Enables GATTC module
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_gattc_enable()
 {
     APPL_TRACE_DEBUG("bta_gattc_enable");
@@ -128,15 +128,15 @@ static void bta_gattc_enable()
 }
 
 /*******************************************************************************
-**
-** Function         bta_gattc_disable
-**
-** Description      Disable GATTC module by cleaning up all active connections
-**                  and deregister all application.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_disable
+ *
+ * Description      Disable GATTC module by cleaning up all active connections
+ *                  and deregister all application.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_gattc_disable()
 {
     uint8_t           i;
@@ -175,14 +175,14 @@ void bta_gattc_disable()
 }
 
 /*******************************************************************************
-**
-** Function         bta_gattc_register
-**
-** Description      Register a GATT client application with BTA.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_register
+ *
+ * Description      Register a GATT client application with BTA.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_gattc_register(tBTA_GATTC_DATA *p_data)
 {
     tBTA_GATTC               cb_data;
@@ -241,14 +241,14 @@ void bta_gattc_register(tBTA_GATTC_DATA *p_data)
     }
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_start_if
-**
-** Description      start an application interface.
-**
-** Returns          none.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_start_if
+ *
+ * Description      start an application interface.
+ *
+ * Returns          none.
+ *
+ ******************************************************************************/
 void bta_gattc_start_if(tBTA_GATTC_DATA *p_msg)
 {
     if (bta_gattc_cl_get_regcb(p_msg->int_start_if.client_if) !=NULL )
@@ -261,14 +261,14 @@ void bta_gattc_start_if(tBTA_GATTC_DATA *p_msg)
     }
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_deregister
-**
-** Description      De-Register a GATT client application with BTA.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_deregister
+ *
+ * Description      De-Register a GATT client application with BTA.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_gattc_deregister(tBTA_GATTC_RCB  *p_clreg)
 {
     uint8_t               i;
@@ -313,14 +313,14 @@ void bta_gattc_deregister(tBTA_GATTC_RCB  *p_clreg)
     }
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_process_api_open
-**
-** Description      process connect API request.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_process_api_open
+ *
+ * Description      process connect API request.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_gattc_process_api_open (tBTA_GATTC_DATA * p_msg)
 {
     uint16_t event = ((BT_HDR *)p_msg)->event;
@@ -360,14 +360,14 @@ void bta_gattc_process_api_open (tBTA_GATTC_DATA * p_msg)
     }
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_process_api_open_cancel
-**
-** Description      process connect API request.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_process_api_open_cancel
+ *
+ * Description      process connect API request.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_gattc_process_api_open_cancel (tBTA_GATTC_DATA * p_msg)
 {
     uint16_t event = ((BT_HDR *)p_msg)->event;
@@ -404,14 +404,14 @@ void bta_gattc_process_api_open_cancel (tBTA_GATTC_DATA * p_msg)
 }
 
 /*******************************************************************************
-**
-** Function         bta_gattc_process_enc_cmpl
-**
-** Description      process encryption complete message.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_process_enc_cmpl
+ *
+ * Description      process encryption complete message.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_gattc_process_enc_cmpl(tBTA_GATTC_DATA *p_msg)
 {
     tBTA_GATTC_RCB *p_clreg;
@@ -431,14 +431,14 @@ void bta_gattc_process_enc_cmpl(tBTA_GATTC_DATA *p_msg)
 }
 
 /*******************************************************************************
-**
-** Function         bta_gattc_cancel_open_error
-**
-** Description
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_cancel_open_error
+ *
+ * Description
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_gattc_cancel_open_error(tBTA_GATTC_CLCB *p_clcb,
                                  UNUSED_ATTR tBTA_GATTC_DATA *p_data)
 {
@@ -451,14 +451,14 @@ void bta_gattc_cancel_open_error(tBTA_GATTC_CLCB *p_clcb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_gattc_open_error
-**
-** Description
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_open_error
+ *
+ * Description
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_gattc_open_error(tBTA_GATTC_CLCB *p_clcb,
                           UNUSED_ATTR tBTA_GATTC_DATA *p_data)
 {
@@ -472,14 +472,14 @@ void bta_gattc_open_error(tBTA_GATTC_CLCB *p_clcb,
                               0);
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_open_fail
-**
-** Description
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_open_fail
+ *
+ * Description
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_gattc_open_fail(tBTA_GATTC_CLCB *p_clcb,
                          UNUSED_ATTR tBTA_GATTC_DATA *p_data)
 {
@@ -494,14 +494,14 @@ void bta_gattc_open_fail(tBTA_GATTC_CLCB *p_clcb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_gattc_open
-**
-** Description      Process API connection function.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_open
+ *
+ * Description      Process API connection function.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_gattc_open(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_DATA *p_data)
 {
     tBTA_GATTC_DATA gattc_data;
@@ -530,14 +530,14 @@ void bta_gattc_open(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_DATA *p_data)
     }
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_init_bk_conn
-**
-** Description      Process API Open for a background connection
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_init_bk_conn
+ *
+ * Description      Process API Open for a background connection
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_gattc_init_bk_conn(tBTA_GATTC_API_OPEN *p_data, tBTA_GATTC_RCB *p_clreg)
 {
     tBTA_GATT_STATUS         status = BTA_GATT_NO_RESOURCES;
@@ -587,14 +587,14 @@ void bta_gattc_init_bk_conn(tBTA_GATTC_API_OPEN *p_data, tBTA_GATTC_RCB *p_clreg
     }
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_cancel_bk_conn
-**
-** Description      Process API Cancel Open for a background connection
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_cancel_bk_conn
+ *
+ * Description      Process API Cancel Open for a background connection
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_gattc_cancel_bk_conn(tBTA_GATTC_API_CANCEL_OPEN *p_data)
 {
     tBTA_GATTC_RCB      *p_clreg;
@@ -622,14 +622,14 @@ void bta_gattc_cancel_bk_conn(tBTA_GATTC_API_CANCEL_OPEN *p_data)
 
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_int_cancel_open_ok
-**
-** Description
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_int_cancel_open_ok
+ *
+ * Description
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_gattc_cancel_open_ok(tBTA_GATTC_CLCB *p_clcb,
                               UNUSED_ATTR tBTA_GATTC_DATA *p_data)
 {
@@ -644,14 +644,14 @@ void bta_gattc_cancel_open_ok(tBTA_GATTC_CLCB *p_clcb,
     bta_gattc_clcb_dealloc(p_clcb);
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_cancel_open
-**
-** Description
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_cancel_open
+ *
+ * Description
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_gattc_cancel_open(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_DATA *p_data)
 {
     tBTA_GATTC          cb_data;
@@ -670,14 +670,14 @@ void bta_gattc_cancel_open(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_DATA *p_data)
     }
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_conn
-**
-** Description      receive connection callback from stack
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_conn
+ *
+ * Description      receive connection callback from stack
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_gattc_conn(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_DATA *p_data)
 {
     tBTA_GATTC_IF   gatt_if;
@@ -743,14 +743,14 @@ void bta_gattc_conn(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_DATA *p_data)
         }
     }
 /*******************************************************************************
-**
-** Function         bta_gattc_close_fail
-**
-** Description      close a  connection.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_close_fail
+ *
+ * Description      close a  connection.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_gattc_close_fail(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_DATA *p_data)
 {
     tBTA_GATTC           cb_data;
@@ -768,14 +768,14 @@ void bta_gattc_close_fail(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_DATA *p_data)
     }
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_api_close
-**
-** Description      close a GATTC connection.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_api_close
+ *
+ * Description      close a GATTC connection.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_gattc_close(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_DATA *p_data)
 {
     tBTA_GATTC_CBACK    *p_cback = p_clcb->p_rcb->p_cback;
@@ -814,14 +814,14 @@ void bta_gattc_close(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_DATA *p_data)
     }
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_reset_discover_st
-**
-** Description      when a SRCB finished discovery, tell all related clcb.
-**
-** Returns          None.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_reset_discover_st
+ *
+ * Description      when a SRCB finished discovery, tell all related clcb.
+ *
+ * Returns          None.
+ *
+ ******************************************************************************/
 void bta_gattc_reset_discover_st(tBTA_GATTC_SERV *p_srcb, tBTA_GATT_STATUS status)
 {
     uint8_t i;
@@ -836,14 +836,14 @@ void bta_gattc_reset_discover_st(tBTA_GATTC_SERV *p_srcb, tBTA_GATT_STATUS statu
     }
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_disc_close
-**
-** Description      close a GATTC connection while in discovery state.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_disc_close
+ *
+ * Description      close a GATTC connection while in discovery state.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_gattc_disc_close(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_DATA *p_data)
 {
     APPL_TRACE_DEBUG("%s: Discovery cancel conn_id=%d", __func__,
@@ -865,15 +865,15 @@ void bta_gattc_disc_close(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_DATA *p_data)
     }
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_set_discover_st
-**
-** Description      when a SRCB start discovery, tell all related clcb and set
-**                  the state.
-**
-** Returns          None.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_set_discover_st
+ *
+ * Description      when a SRCB start discovery, tell all related clcb and set
+ *                  the state.
+ *
+ * Returns          None.
+ *
+ ******************************************************************************/
 void bta_gattc_set_discover_st(tBTA_GATTC_SERV *p_srcb)
 {
     uint8_t   i;
@@ -891,16 +891,16 @@ void bta_gattc_set_discover_st(tBTA_GATTC_SERV *p_srcb)
     }
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_restart_discover
-**
-** Description      process service change in discovery state, mark up the auto
-**                  update flag and set status to be discovery cancel for current
-**                  discovery.
-**
-** Returns          None.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_restart_discover
+ *
+ * Description      process service change in discovery state, mark up the auto
+ *                  update flag and set status to be discovery cancel for current
+ *                  discovery.
+ *
+ * Returns          None.
+ *
+ ******************************************************************************/
 void bta_gattc_restart_discover(tBTA_GATTC_CLCB *p_clcb,
                                 UNUSED_ATTR tBTA_GATTC_DATA *p_data)
 {
@@ -909,14 +909,14 @@ void bta_gattc_restart_discover(tBTA_GATTC_CLCB *p_clcb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_gattc_cfg_mtu
-**
-** Description      Configure MTU size on the GATT connection.
-**
-** Returns          None.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_cfg_mtu
+ *
+ * Description      Configure MTU size on the GATT connection.
+ *
+ * Returns          None.
+ *
+ ******************************************************************************/
 void bta_gattc_cfg_mtu(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_DATA *p_data)
 {
     tBTA_GATT_STATUS    status;
@@ -937,14 +937,14 @@ void bta_gattc_cfg_mtu(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_DATA *p_data)
     }
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_start_discover
-**
-** Description      Start a discovery on server.
-**
-** Returns          None.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_start_discover
+ *
+ * Description      Start a discovery on server.
+ *
+ * Returns          None.
+ *
+ ******************************************************************************/
 void bta_gattc_start_discover(tBTA_GATTC_CLCB *p_clcb,
                               UNUSED_ATTR tBTA_GATTC_DATA *p_data)
 {
@@ -1000,14 +1000,14 @@ void bta_gattc_start_discover(tBTA_GATTC_CLCB *p_clcb,
 
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_disc_cmpl
-**
-** Description      discovery on server is finished
-**
-** Returns          None.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_disc_cmpl
+ *
+ * Description      discovery on server is finished
+ *
+ * Returns          None.
+ *
+ ******************************************************************************/
 void bta_gattc_disc_cmpl(tBTA_GATTC_CLCB *p_clcb,
                          UNUSED_ATTR tBTA_GATTC_DATA *p_data)
 {
@@ -1061,14 +1061,14 @@ void bta_gattc_disc_cmpl(tBTA_GATTC_CLCB *p_clcb,
     }
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_read
-**
-** Description      Read an attribute
-**
-** Returns          None.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_read
+ *
+ * Description      Read an attribute
+ *
+ * Returns          None.
+ *
+ ******************************************************************************/
 void bta_gattc_read(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_DATA *p_data)
 {
     if (!bta_gattc_enqueue(p_clcb, p_data))
@@ -1092,13 +1092,13 @@ void bta_gattc_read(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_DATA *p_data)
     }
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_read_multi
-**
-** Description      read multiple
-**
-** Returns          None.
-*********************************************************************************/
+ *
+ * Function         bta_gattc_read_multi
+ *
+ * Description      read multiple
+ *
+ * Returns          None.
+ ********************************************************************************/
 void bta_gattc_read_multi(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_DATA *p_data)
 {
     tBTA_GATT_STATUS    status = BTA_GATT_OK;
@@ -1130,14 +1130,14 @@ void bta_gattc_read_multi(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_DATA *p_data)
     }
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_write
-**
-** Description      Write an attribute
-**
-** Returns          None.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_write
+ *
+ * Description      Write an attribute
+ *
+ * Returns          None.
+ *
+ ******************************************************************************/
 void bta_gattc_write(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_DATA *p_data)
 {
     if (!bta_gattc_enqueue(p_clcb, p_data))
@@ -1168,13 +1168,13 @@ void bta_gattc_write(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_DATA *p_data)
     }
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_execute
-**
-** Description      send execute write
-**
-** Returns          None.
-*********************************************************************************/
+ *
+ * Function         bta_gattc_execute
+ *
+ * Description      send execute write
+ *
+ * Returns          None.
+ ********************************************************************************/
 void bta_gattc_execute(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_DATA *p_data)
 {
     tBTA_GATT_STATUS    status;
@@ -1194,14 +1194,14 @@ void bta_gattc_execute(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_DATA *p_data)
     }
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_confirm
-**
-** Description      send handle value confirmation
-**
-** Returns          None.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_confirm
+ *
+ * Description      send handle value confirmation
+ *
+ * Returns          None.
+ *
+ ******************************************************************************/
 void bta_gattc_confirm(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_DATA *p_data)
 {
     uint16_t handle = p_data->api_confirm.handle;
@@ -1218,14 +1218,14 @@ void bta_gattc_confirm(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_DATA *p_data)
     }
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_read_cmpl
-**
-** Description      read complete
-**
-** Returns          None.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_read_cmpl
+ *
+ * Description      read complete
+ *
+ * Returns          None.
+ *
+ ******************************************************************************/
 void bta_gattc_read_cmpl(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_OP_CMPL *p_data)
 {
     GATT_READ_OP_CB cb = p_clcb->p_q_cmd->api_read.read_cb;
@@ -1240,14 +1240,14 @@ void bta_gattc_read_cmpl(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_OP_CMPL *p_data)
     }
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_write_cmpl
-**
-** Description      write complete
-**
-** Returns          None.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_write_cmpl
+ *
+ * Description      write complete
+ *
+ * Returns          None.
+ *
+ ******************************************************************************/
 void bta_gattc_write_cmpl(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_OP_CMPL *p_data)
 {
     GATT_WRITE_OP_CB cb = p_clcb->p_q_cmd->api_write.write_cb;
@@ -1260,14 +1260,14 @@ void bta_gattc_write_cmpl(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_OP_CMPL *p_data)
     }
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_exec_cmpl
-**
-** Description      execute write complete
-**
-** Returns          None.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_exec_cmpl
+ *
+ * Description      execute write complete
+ *
+ * Returns          None.
+ *
+ ******************************************************************************/
 void bta_gattc_exec_cmpl(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_OP_CMPL *p_data)
 {
     tBTA_GATTC          cb_data;
@@ -1284,14 +1284,14 @@ void bta_gattc_exec_cmpl(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_OP_CMPL *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_gattc_cfg_mtu_cmpl
-**
-** Description      configure MTU operation complete
-**
-** Returns          None.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_cfg_mtu_cmpl
+ *
+ * Description      configure MTU operation complete
+ *
+ * Returns          None.
+ *
+ ******************************************************************************/
 void bta_gattc_cfg_mtu_cmpl(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_OP_CMPL *p_data)
 {
     tBTA_GATTC          cb_data;
@@ -1311,14 +1311,14 @@ void bta_gattc_cfg_mtu_cmpl(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_OP_CMPL *p_data)
 
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_op_cmpl
-**
-** Description      operation completed.
-**
-** Returns          None.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_op_cmpl
+ *
+ * Description      operation completed.
+ *
+ * Returns          None.
+ *
+ ******************************************************************************/
 void  bta_gattc_op_cmpl(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_DATA *p_data)
 {
     uint8_t           op = (uint8_t)p_data->op_cmpl.op_code;
@@ -1381,14 +1381,14 @@ void  bta_gattc_op_cmpl(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_DATA *p_data)
     }
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_op_cmpl
-**
-** Description      operation completed.
-**
-** Returns          None.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_op_cmpl
+ *
+ * Description      operation completed.
+ *
+ * Returns          None.
+ *
+ ******************************************************************************/
 void  bta_gattc_ignore_op_cmpl(UNUSED_ATTR tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_DATA *p_data)
 {
     /* receive op complete when discovery is started, ignore the response,
@@ -1397,14 +1397,14 @@ void  bta_gattc_ignore_op_cmpl(UNUSED_ATTR tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_D
 
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_search
-**
-** Description      start a search in the local server cache
-**
-** Returns          None.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_search
+ *
+ * Description      start a search in the local server cache
+ *
+ * Returns          None.
+ *
+ ******************************************************************************/
 void bta_gattc_search(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_DATA *p_data)
 {
     tBTA_GATT_STATUS    status = GATT_INTERNAL_ERROR;
@@ -1423,29 +1423,29 @@ void bta_gattc_search(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_DATA *p_data)
     ( *p_clcb->p_rcb->p_cback)(BTA_GATTC_SEARCH_CMPL_EVT,  &cb_data);
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_q_cmd
-**
-** Description      enqueue a command into control block, usually because discovery
-**                  operation is busy.
-**
-** Returns          None.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_q_cmd
+ *
+ * Description      enqueue a command into control block, usually because discovery
+ *                  operation is busy.
+ *
+ * Returns          None.
+ *
+ ******************************************************************************/
 void bta_gattc_q_cmd(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_DATA *p_data)
 {
     bta_gattc_enqueue(p_clcb, p_data);
 }
 
 /*******************************************************************************
-**
-** Function         bta_gattc_fail
-**
-** Description      report API call failure back to apps
-**
-** Returns          None.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_fail
+ *
+ * Description      report API call failure back to apps
+ *
+ * Returns          None.
+ *
+ ******************************************************************************/
 void bta_gattc_fail(tBTA_GATTC_CLCB *p_clcb,
                     UNUSED_ATTR tBTA_GATTC_DATA *p_data)
 {
@@ -1456,14 +1456,14 @@ void bta_gattc_fail(tBTA_GATTC_CLCB *p_clcb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_gattc_deregister_cmpl
-**
-** Description      De-Register a GATT client application with BTA completed.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_deregister_cmpl
+ *
+ * Description      De-Register a GATT client application with BTA completed.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_gattc_deregister_cmpl(tBTA_GATTC_RCB *p_clreg)
 {
     tBTA_GATTC_IF       client_if = p_clreg->client_if;
@@ -1488,14 +1488,14 @@ static void bta_gattc_deregister_cmpl(tBTA_GATTC_RCB *p_clreg)
     }
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_conn_cback
-**
-** Description      callback functions to GATT client stack.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_conn_cback
+ *
+ * Description      callback functions to GATT client stack.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_gattc_conn_cback(tGATT_IF gattc_if, BD_ADDR bda, uint16_t conn_id,
                                  bool connected, tGATT_DISCONN_REASON reason,
                                  tBT_TRANSPORT transport)
@@ -1527,14 +1527,14 @@ static void bta_gattc_conn_cback(tGATT_IF gattc_if, BD_ADDR bda, uint16_t conn_i
 }
 
 /*******************************************************************************
-**
-** Function         bta_gattc_enc_cmpl_cback
-**
-** Description      encryption complete callback function to GATT client stack.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_enc_cmpl_cback
+ *
+ * Description      encryption complete callback function to GATT client stack.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_gattc_enc_cmpl_cback(tGATT_IF gattc_if, BD_ADDR bda)
 {
     tBTA_GATTC_CLCB *p_clcb =
@@ -1566,15 +1566,15 @@ static void bta_gattc_enc_cmpl_cback(tGATT_IF gattc_if, BD_ADDR bda)
 }
 
 /*******************************************************************************
-**
-** Function         bta_gattc_process_api_refresh
-**
-** Description      process refresh API to delete cache and start a new discovery
-**                  if currently connected.
-**
-** Returns          None.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_process_api_refresh
+ *
+ * Description      process refresh API to delete cache and start a new discovery
+ *                  if currently connected.
+ *
+ * Returns          None.
+ *
+ ******************************************************************************/
 void bta_gattc_process_api_refresh(tBTA_GATTC_DATA * p_msg)
 {
     tBTA_GATTC_SERV *p_srvc_cb = bta_gattc_find_srvr_cache(p_msg->api_conn.remote_bda);
@@ -1612,14 +1612,14 @@ void bta_gattc_process_api_refresh(tBTA_GATTC_DATA * p_msg)
 
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_process_srvc_chg_ind
-**
-** Description      process service change indication.
-**
-** Returns          None.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_process_srvc_chg_ind
+ *
+ * Description      process service change indication.
+ *
+ * Returns          None.
+ *
+ ******************************************************************************/
 bool bta_gattc_process_srvc_chg_ind(uint16_t conn_id,
                                        tBTA_GATTC_RCB      *p_clrcb,
                                        tBTA_GATTC_SERV     *p_srcb,
@@ -1695,14 +1695,14 @@ bool bta_gattc_process_srvc_chg_ind(uint16_t conn_id,
 
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_proc_other_indication
-**
-** Description      process all non-service change indication/notification.
-**
-** Returns          None.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_proc_other_indication
+ *
+ * Description      process all non-service change indication/notification.
+ *
+ * Returns          None.
+ *
+ ******************************************************************************/
 void bta_gattc_proc_other_indication(tBTA_GATTC_CLCB *p_clcb, uint8_t op,
                                      tGATT_CL_COMPLETE *p_data,
                                      tBTA_GATTC_NOTIFY *p_notify)
@@ -1723,14 +1723,14 @@ void bta_gattc_proc_other_indication(tBTA_GATTC_CLCB *p_clcb, uint8_t op,
 
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_process_indicate
-**
-** Description      process indication/notification.
-**
-** Returns          None.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_process_indicate
+ *
+ * Description      process indication/notification.
+ *
+ * Returns          None.
+ *
+ ******************************************************************************/
 void bta_gattc_process_indicate(uint16_t conn_id, tGATTC_OPTYPE op, tGATT_CL_COMPLETE *p_data)
 {
     uint16_t              handle = p_data->att_value.handle;
@@ -1803,14 +1803,14 @@ void bta_gattc_process_indicate(uint16_t conn_id, tGATTC_OPTYPE op, tGATT_CL_COM
     }
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_cmpl_cback
-**
-** Description      client operation complete callback register with BTE GATT.
-**
-** Returns          None.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_cmpl_cback
+ *
+ * Description      client operation complete callback register with BTE GATT.
+ *
+ * Returns          None.
+ *
+ ******************************************************************************/
 static void  bta_gattc_cmpl_cback(uint16_t conn_id, tGATTC_OPTYPE op, tGATT_STATUS status,
                                   tGATT_CL_COMPLETE *p_data)
 {
@@ -1842,14 +1842,14 @@ static void  bta_gattc_cmpl_cback(uint16_t conn_id, tGATTC_OPTYPE op, tGATT_STAT
 }
 
 /*******************************************************************************
-**
-** Function         bta_gattc_cmpl_sendmsg
-**
-** Description      client operation complete send message
-**
-** Returns          None.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_cmpl_sendmsg
+ *
+ * Description      client operation complete send message
+ *
+ * Returns          None.
+ *
+ ******************************************************************************/
 static void bta_gattc_cmpl_sendmsg(uint16_t conn_id, tGATTC_OPTYPE op,
                                    tBTA_GATT_STATUS status,
                                    tGATT_CL_COMPLETE *p_data)
@@ -1871,14 +1871,14 @@ static void bta_gattc_cmpl_sendmsg(uint16_t conn_id, tGATTC_OPTYPE op,
 }
 
 /*******************************************************************************
-**
-** Function         bta_gattc_cong_cback
-**
-** Description      congestion callback for BTA GATT client.
-**
-** Returns          void
-**
-********************************************************************************/
+ *
+ * Function         bta_gattc_cong_cback
+ *
+ * Description      congestion callback for BTA GATT client.
+ *
+ * Returns          void
+ *
+ *******************************************************************************/
 static void bta_gattc_cong_cback (uint16_t conn_id, bool congested)
 {
     tBTA_GATTC_CLCB *p_clcb;
diff --git a/system/bta/gatt/bta_gattc_api.cc b/system/bta/gatt/bta_gattc_api.cc
index 7654091899c..1e7eaef0887 100644
--- a/system/bta/gatt/bta_gattc_api.cc
+++ b/system/bta/gatt/bta_gattc_api.cc
@@ -34,8 +34,8 @@
 #include "bta_gattc_int.h"
 
 /*****************************************************************************
-**  Constants
-*****************************************************************************/
+ *  Constants
+ ****************************************************************************/
 
 static const tBTA_SYS_REG bta_gattc_reg =
 {
@@ -45,16 +45,16 @@ static const tBTA_SYS_REG bta_gattc_reg =
 
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_Disable
-**
-** Description      This function is called to disable GATTC module
-**
-** Parameters       None.
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_Disable
+ *
+ * Description      This function is called to disable GATTC module
+ *
+ * Parameters       None.
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 void BTA_GATTC_Disable(void)
 {
     if (bta_sys_is_register(BTA_ID_GATTC) == false)
@@ -71,18 +71,18 @@ void BTA_GATTC_Disable(void)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_AppRegister
-**
-** Description      This function is called to register application callbacks
-**                    with BTA GATTC module.
-**
-** Parameters       p_app_uuid - applicaiton UUID
-**                  p_client_cb - pointer to the application callback function.
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_AppRegister
+ *
+ * Description      This function is called to register application callbacks
+ *                    with BTA GATTC module.
+ *
+ * Parameters       p_app_uuid - applicaiton UUID
+ *                  p_client_cb - pointer to the application callback function.
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 void BTA_GATTC_AppRegister(tBT_UUID *p_app_uuid, tBTA_GATTC_CBACK *p_client_cb)
 {
     tBTA_GATTC_API_REG *p_buf =
@@ -100,17 +100,17 @@ void BTA_GATTC_AppRegister(tBT_UUID *p_app_uuid, tBTA_GATTC_CBACK *p_client_cb)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_AppDeregister
-**
-** Description      This function is called to deregister an application
-**                  from BTA GATTC module.
-**
-** Parameters       client_if - client interface identifier.
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_AppDeregister
+ *
+ * Description      This function is called to deregister an application
+ *                  from BTA GATTC module.
+ *
+ * Parameters       client_if - client interface identifier.
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 void BTA_GATTC_AppDeregister(tBTA_GATTC_IF client_if)
 {
     tBTA_GATTC_API_DEREG *p_buf =
@@ -123,20 +123,20 @@ void BTA_GATTC_AppDeregister(tBTA_GATTC_IF client_if)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_Open
-**
-** Description      Open a direct connection or add a background auto connection
-**                  bd address
-**
-** Parameters       client_if: server interface.
-**                  remote_bda: remote device BD address.
-**                  is_direct: direct connection or background auto connection
-**                  transport: Transport to be used for GATT connection (BREDR/LE)
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_Open
+ *
+ * Description      Open a direct connection or add a background auto connection
+ *                  bd address
+ *
+ * Parameters       client_if: server interface.
+ *                  remote_bda: remote device BD address.
+ *                  is_direct: direct connection or background auto connection
+ *                  transport: Transport to be used for GATT connection (BREDR/LE)
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_GATTC_Open(tBTA_GATTC_IF client_if, BD_ADDR remote_bda,
                     bool is_direct, tBTA_GATT_TRANSPORT transport)
 {
@@ -153,19 +153,19 @@ void BTA_GATTC_Open(tBTA_GATTC_IF client_if, BD_ADDR remote_bda,
 }
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_CancelOpen
-**
-** Description      Cancel a direct open connection or remove a background auto connection
-**                  bd address
-**
-** Parameters       client_if: server interface.
-**                  remote_bda: remote device BD address.
-**                  is_direct: direct connection or background auto connection
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_CancelOpen
+ *
+ * Description      Cancel a direct open connection or remove a background auto connection
+ *                  bd address
+ *
+ * Parameters       client_if: server interface.
+ *                  remote_bda: remote device BD address.
+ *                  is_direct: direct connection or background auto connection
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_GATTC_CancelOpen(tBTA_GATTC_IF client_if, BD_ADDR remote_bda, bool is_direct)
 {
     tBTA_GATTC_API_CANCEL_OPEN *p_buf =
@@ -180,16 +180,16 @@ void BTA_GATTC_CancelOpen(tBTA_GATTC_IF client_if, BD_ADDR remote_bda, bool is_d
 }
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_Close
-**
-** Description      Close a connection to a GATT server.
-**
-** Parameters       conn_id: connectino ID to be closed.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_Close
+ *
+ * Description      Close a connection to a GATT server.
+ *
+ * Parameters       conn_id: connectino ID to be closed.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_GATTC_Close(uint16_t conn_id)
 {
     BT_HDR *p_buf = (BT_HDR *)osi_malloc(sizeof(BT_HDR));
@@ -201,18 +201,18 @@ void BTA_GATTC_Close(uint16_t conn_id)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_ConfigureMTU
-**
-** Description      Configure the MTU size in the GATT channel. This can be done
-**                  only once per connection.
-**
-** Parameters       conn_id: connection ID.
-**                  mtu: desired MTU size to use.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_ConfigureMTU
+ *
+ * Description      Configure the MTU size in the GATT channel. This can be done
+ *                  only once per connection.
+ *
+ * Parameters       conn_id: connection ID.
+ *                  mtu: desired MTU size to use.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_GATTC_ConfigureMTU (uint16_t conn_id, uint16_t mtu)
 {
     tBTA_GATTC_API_CFG_MTU *p_buf =
@@ -226,21 +226,21 @@ void BTA_GATTC_ConfigureMTU (uint16_t conn_id, uint16_t mtu)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_ServiceSearchRequest
-**
-** Description      This function is called to request a GATT service discovery
-**                    on a GATT server. This function report service search result
-**                  by a callback event, and followed by a service search complete
-**                  event.
-**
-** Parameters       conn_id: connection ID.
-**                  p_srvc_uuid: a UUID of the service application is interested in.
-**                              If Null, discover for all services.
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_ServiceSearchRequest
+ *
+ * Description      This function is called to request a GATT service discovery
+ *                    on a GATT server. This function report service search result
+ *                  by a callback event, and followed by a service search complete
+ *                  event.
+ *
+ * Parameters       conn_id: connection ID.
+ *                  p_srvc_uuid: a UUID of the service application is interested in.
+ *                              If Null, discover for all services.
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 void BTA_GATTC_ServiceSearchRequest (uint16_t conn_id, tBT_UUID *p_srvc_uuid)
 {
     const size_t len = sizeof(tBTA_GATTC_API_SEARCH) + sizeof(tBT_UUID);
@@ -259,64 +259,64 @@ void BTA_GATTC_ServiceSearchRequest (uint16_t conn_id, tBT_UUID *p_srvc_uuid)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_GetServices
-**
-** Description      This function is called to find the services on the given server.
-**
-** Parameters       conn_id: connection ID which identify the server.
-**
-** Returns          returns list_t of tBTA_GATTC_SERVICE or NULL.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_GetServices
+ *
+ * Description      This function is called to find the services on the given server.
+ *
+ * Parameters       conn_id: connection ID which identify the server.
+ *
+ * Returns          returns list_t of tBTA_GATTC_SERVICE or NULL.
+ *
+ ******************************************************************************/
 const list_t* BTA_GATTC_GetServices(uint16_t conn_id) {
     return bta_gattc_get_services(conn_id);
 }
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_GetCharacteristic
-**
-** Description      This function is called to find the characteristic on the given server.
-**
-** Parameters       conn_id - connection ID which identify the server.
-**                  handle - characteristic handle
-**
-** Returns          returns pointer to tBTA_GATTC_CHARACTERISTIC or NULL.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_GetCharacteristic
+ *
+ * Description      This function is called to find the characteristic on the given server.
+ *
+ * Parameters       conn_id - connection ID which identify the server.
+ *                  handle - characteristic handle
+ *
+ * Returns          returns pointer to tBTA_GATTC_CHARACTERISTIC or NULL.
+ *
+ ******************************************************************************/
 const tBTA_GATTC_CHARACTERISTIC* BTA_GATTC_GetCharacteristic(uint16_t conn_id, uint16_t handle) {
     return bta_gattc_get_characteristic(conn_id, handle);
 }
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_GetDescriptor
-**
-** Description      This function is called to find the characteristic on the given server.
-**
-** Parameters       conn_id - connection ID which identify the server.
-**                  handle - descriptor handle
-**
-** Returns          returns pointer to tBTA_GATTC_DESCRIPTOR or NULL.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_GetDescriptor
+ *
+ * Description      This function is called to find the characteristic on the given server.
+ *
+ * Parameters       conn_id - connection ID which identify the server.
+ *                  handle - descriptor handle
+ *
+ * Returns          returns pointer to tBTA_GATTC_DESCRIPTOR or NULL.
+ *
+ ******************************************************************************/
 const tBTA_GATTC_DESCRIPTOR* BTA_GATTC_GetDescriptor(uint16_t conn_id, uint16_t handle) {
     return bta_gattc_get_descriptor(conn_id, handle);
 }
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_GetGattDb
-**
-** Description      This function is called to get the GATT database.
-**
-** Parameters       conn_id: connection ID which identify the server.
-**                  db: output parameter which will contain the GATT database copy.
-**                      Caller is responsible for freeing it.
-**                  count: number of elements in database.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_GetGattDb
+ *
+ * Description      This function is called to get the GATT database.
+ *
+ * Parameters       conn_id: connection ID which identify the server.
+ *                  db: output parameter which will contain the GATT database copy.
+ *                      Caller is responsible for freeing it.
+ *                  count: number of elements in database.
+ *
+ ******************************************************************************/
 void  BTA_GATTC_GetGattDb(uint16_t conn_id, uint16_t start_handle, uint16_t end_handle,
                           btgatt_db_element_t **db, int *count)
 {
@@ -324,17 +324,17 @@ void  BTA_GATTC_GetGattDb(uint16_t conn_id, uint16_t start_handle, uint16_t end_
 }
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_ReadCharacteristic
-**
-** Description      This function is called to read a characteristics value
-**
-** Parameters       conn_id - connection ID.
-**                  handle - characteritic handle to read.
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_ReadCharacteristic
+ *
+ * Description      This function is called to read a characteristics value
+ *
+ * Parameters       conn_id - connection ID.
+ *                  handle - characteritic handle to read.
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 void BTA_GATTC_ReadCharacteristic(uint16_t conn_id, uint16_t handle, tBTA_GATT_AUTH_REQ auth_req,
                                   GATT_READ_OP_CB callback, void* cb_data)
 {
@@ -352,17 +352,17 @@ void BTA_GATTC_ReadCharacteristic(uint16_t conn_id, uint16_t handle, tBTA_GATT_A
 }
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_ReadCharDescr
-**
-** Description      This function is called to read a descriptor value.
-**
-** Parameters       conn_id - connection ID.
-**                  handle - descriptor handle to read.
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_ReadCharDescr
+ *
+ * Description      This function is called to read a descriptor value.
+ *
+ * Parameters       conn_id - connection ID.
+ *                  handle - descriptor handle to read.
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 void BTA_GATTC_ReadCharDescr(uint16_t conn_id, uint16_t handle, tBTA_GATT_AUTH_REQ auth_req,
                              GATT_READ_OP_CB callback, void* cb_data)
 {
@@ -380,18 +380,18 @@ void BTA_GATTC_ReadCharDescr(uint16_t conn_id, uint16_t handle, tBTA_GATT_AUTH_R
 }
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_ReadMultiple
-**
-** Description      This function is called to read multiple characteristic or
-**                  characteristic descriptors.
-**
-** Parameters       conn_id - connectino ID.
-**                    p_read_multi - pointer to the read multiple parameter.
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_ReadMultiple
+ *
+ * Description      This function is called to read multiple characteristic or
+ *                  characteristic descriptors.
+ *
+ * Parameters       conn_id - connectino ID.
+ *                    p_read_multi - pointer to the read multiple parameter.
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 void BTA_GATTC_ReadMultiple(uint16_t conn_id, tBTA_GATTC_MULTI *p_read_multi,
                             tBTA_GATT_AUTH_REQ auth_req)
 {
@@ -410,19 +410,19 @@ void BTA_GATTC_ReadMultiple(uint16_t conn_id, tBTA_GATTC_MULTI *p_read_multi,
 }
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_WriteCharValue
-**
-** Description      This function is called to write characteristic value.
-**
-** Parameters       conn_id - connection ID.
-**                  handle - characteristic handle to write.
-**                  write_type - type of write.
-**                  value - the value to be written.
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_WriteCharValue
+ *
+ * Description      This function is called to write characteristic value.
+ *
+ * Parameters       conn_id - connection ID.
+ *                  handle - characteristic handle to write.
+ *                  write_type - type of write.
+ *                  value - the value to be written.
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 void BTA_GATTC_WriteCharValue ( uint16_t conn_id,
                                 uint16_t handle,
                                 tBTA_GATTC_WRITE_TYPE  write_type,
@@ -452,18 +452,18 @@ void BTA_GATTC_WriteCharValue ( uint16_t conn_id,
 }
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_WriteCharDescr
-**
-** Description      This function is called to write descriptor value.
-**
-** Parameters       conn_id - connection ID
-**                  handle - descriptor hadle to write.
-**                  value - the value to be written.
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_WriteCharDescr
+ *
+ * Description      This function is called to write descriptor value.
+ *
+ * Parameters       conn_id - connection ID
+ *                  handle - descriptor hadle to write.
+ *                  value - the value to be written.
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 void BTA_GATTC_WriteCharDescr (uint16_t conn_id,
                                uint16_t handle,
                                std::vector<uint8_t> value,
@@ -492,19 +492,19 @@ void BTA_GATTC_WriteCharDescr (uint16_t conn_id,
 }
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_PrepareWrite
-**
-** Description      This function is called to prepare write a characteristic value.
-**
-** Parameters       conn_id - connection ID.
-**                  p_char_id - GATT characteritic ID of the service.
-**                  offset - offset of the write value.
-**                  value - the value to be written.
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_PrepareWrite
+ *
+ * Description      This function is called to prepare write a characteristic value.
+ *
+ * Parameters       conn_id - connection ID.
+ *                  p_char_id - GATT characteritic ID of the service.
+ *                  offset - offset of the write value.
+ *                  value - the value to be written.
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 void BTA_GATTC_PrepareWrite  (uint16_t conn_id, uint16_t handle, uint16_t offset,
                               std::vector<uint8_t> value,
                               tBTA_GATT_AUTH_REQ auth_req,
@@ -533,17 +533,17 @@ void BTA_GATTC_PrepareWrite  (uint16_t conn_id, uint16_t handle, uint16_t offset
 }
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_ExecuteWrite
-**
-** Description      This function is called to execute write a prepare write sequence.
-**
-** Parameters       conn_id - connection ID.
-**                    is_execute - execute or cancel.
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_ExecuteWrite
+ *
+ * Description      This function is called to execute write a prepare write sequence.
+ *
+ * Parameters       conn_id - connection ID.
+ *                    is_execute - execute or cancel.
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 void BTA_GATTC_ExecuteWrite  (uint16_t conn_id, bool is_execute)
 {
     tBTA_GATTC_API_EXEC *p_buf =
@@ -557,17 +557,17 @@ void BTA_GATTC_ExecuteWrite  (uint16_t conn_id, bool is_execute)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_SendIndConfirm
-**
-** Description      This function is called to send handle value confirmation.
-**
-** Parameters       conn_id - connection ID.
-**                    p_char_id - characteristic ID to confirm.
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_SendIndConfirm
+ *
+ * Description      This function is called to send handle value confirmation.
+ *
+ * Parameters       conn_id - connection ID.
+ *                    p_char_id - characteristic ID to confirm.
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 void BTA_GATTC_SendIndConfirm (uint16_t conn_id, uint16_t handle)
 {
     tBTA_GATTC_API_CONFIRM *p_buf =
@@ -583,18 +583,18 @@ void BTA_GATTC_SendIndConfirm (uint16_t conn_id, uint16_t handle)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_RegisterForNotifications
-**
-** Description      This function is called to register for notification of a service.
-**
-** Parameters       client_if - client interface.
-**                  bda - target GATT server.
-**                  handle - GATT characteristic handle.
-**
-** Returns          OK if registration succeed, otherwise failed.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_RegisterForNotifications
+ *
+ * Description      This function is called to register for notification of a service.
+ *
+ * Parameters       client_if - client interface.
+ *                  bda - target GATT server.
+ *                  handle - GATT characteristic handle.
+ *
+ * Returns          OK if registration succeed, otherwise failed.
+ *
+ ******************************************************************************/
 tBTA_GATT_STATUS BTA_GATTC_RegisterForNotifications (tBTA_GATTC_IF client_if,
                                                      const BD_ADDR bda, uint16_t handle)
 {
@@ -653,18 +653,18 @@ tBTA_GATT_STATUS BTA_GATTC_RegisterForNotifications (tBTA_GATTC_IF client_if,
 }
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_DeregisterForNotifications
-**
-** Description      This function is called to de-register for notification of a servbice.
-**
-** Parameters       client_if - client interface.
-**                  remote_bda - target GATT server.
-**                  handle - GATT characteristic handle.
-**
-** Returns          OK if deregistration succeed, otherwise failed.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_DeregisterForNotifications
+ *
+ * Description      This function is called to de-register for notification of a servbice.
+ *
+ * Parameters       client_if - client interface.
+ *                  remote_bda - target GATT server.
+ *                  handle - GATT characteristic handle.
+ *
+ * Returns          OK if deregistration succeed, otherwise failed.
+ *
+ ******************************************************************************/
 tBTA_GATT_STATUS BTA_GATTC_DeregisterForNotifications (tBTA_GATTC_IF client_if,
                                                        const BD_ADDR bda, uint16_t handle)
 {
@@ -697,16 +697,16 @@ tBTA_GATT_STATUS BTA_GATTC_DeregisterForNotifications (tBTA_GATTC_IF client_if,
 }
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_Refresh
-**
-** Description      Refresh the server cache of the remote device
-**
-** Parameters       remote_bda: remote device BD address.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_Refresh
+ *
+ * Description      Refresh the server cache of the remote device
+ *
+ * Parameters       remote_bda: remote device BD address.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_GATTC_Refresh(const BD_ADDR remote_bda)
 {
     tBTA_GATTC_API_OPEN *p_buf =
diff --git a/system/bta/gatt/bta_gattc_cache.cc b/system/bta/gatt/bta_gattc_cache.cc
index 2503f6d3771..b4530bc3d26 100644
--- a/system/bta/gatt/bta_gattc_cache.cc
+++ b/system/bta/gatt/bta_gattc_cache.cc
@@ -67,8 +67,8 @@ static void bta_gattc_generate_cache_file_name(char *buffer,
 }
 
 /*****************************************************************************
-**  Constants and data types
-*****************************************************************************/
+ *  Constants and data types
+ ****************************************************************************/
 
 typedef struct
 {
@@ -109,14 +109,14 @@ bool display_cache_service(void *data, void *context) {
 }
 
 /*******************************************************************************
-**
-** Function         bta_gattc_display_cache_server
-**
-** Description      debug function to display the server cache.
-**
-** Returns          none.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_display_cache_server
+ *
+ * Description      debug function to display the server cache.
+ *
+ * Returns          none.
+ *
+ ******************************************************************************/
 static void bta_gattc_display_cache_server(list_t *p_cache)
 {
     APPL_TRACE_ERROR("<================Start Server Cache =============>");
@@ -126,14 +126,14 @@ static void bta_gattc_display_cache_server(list_t *p_cache)
 }
 
 /*******************************************************************************
-**
-** Function         bta_gattc_display_explore_record
-**
-** Description      debug function to display the exploration list
-**
-** Returns          none.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_display_explore_record
+ *
+ * Description      debug function to display the exploration list
+ *
+ * Returns          none.
+ *
+ ******************************************************************************/
 static void bta_gattc_display_explore_record(tBTA_GATTC_ATTR_REC *p_rec, uint8_t num_rec)
 {
     uint8_t i;
@@ -152,14 +152,14 @@ static void bta_gattc_display_explore_record(tBTA_GATTC_ATTR_REC *p_rec, uint8_t
 #endif  /* BTA_GATT_DEBUG == TRUE */
 
 /*******************************************************************************
-**
-** Function         bta_gattc_init_cache
-**
-** Description      Initialize the database cache and discovery related resources.
-**
-** Returns          status
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_init_cache
+ *
+ * Description      Initialize the database cache and discovery related resources.
+ *
+ * Returns          status
+ *
+ ******************************************************************************/
 tBTA_GATT_STATUS bta_gattc_init_cache(tBTA_GATTC_SERV *p_srvc_cb)
 {
     if (p_srvc_cb->p_srvc_cache != NULL) {
@@ -192,14 +192,14 @@ static void service_free(void *ptr) {
 }
 
 /*******************************************************************************
-**
-** Function         bta_gattc_add_srvc_to_cache
-**
-** Description      Add a service into database cache.
-**
-** Returns          status
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_add_srvc_to_cache
+ *
+ * Description      Add a service into database cache.
+ *
+ * Returns          status
+ *
+ ******************************************************************************/
 static tBTA_GATT_STATUS bta_gattc_add_srvc_to_cache(tBTA_GATTC_SERV *p_srvc_cb,
                                                     uint16_t s_handle, uint16_t e_handle,
                                                     tBT_UUID *p_uuid,
@@ -267,14 +267,14 @@ static tBTA_GATT_STATUS bta_gattc_add_char_to_cache(tBTA_GATTC_SERV *p_srvc_cb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_gattc_add_attr_to_cache
-**
-** Description      Add an attribute into database cache buffer.
-**
-** Returns          status
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_add_attr_to_cache
+ *
+ * Description      Add an attribute into database cache buffer.
+ *
+ * Returns          status
+ *
+ ******************************************************************************/
 static tBTA_GATT_STATUS bta_gattc_add_attr_to_cache(tBTA_GATTC_SERV *p_srvc_cb,
                                                     uint16_t handle,
                                                     tBT_UUID *p_uuid,
@@ -335,14 +335,14 @@ static tBTA_GATT_STATUS bta_gattc_add_attr_to_cache(tBTA_GATTC_SERV *p_srvc_cb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_gattc_get_disc_range
-**
-** Description      get discovery stating and ending handle range.
-**
-** Returns          None.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_get_disc_range
+ *
+ * Description      get discovery stating and ending handle range.
+ *
+ * Returns          None.
+ *
+ ******************************************************************************/
 void bta_gattc_get_disc_range(tBTA_GATTC_SERV *p_srvc_cb, uint16_t *p_s_hdl, uint16_t *p_e_hdl, bool is_srvc)
 {
     tBTA_GATTC_ATTR_REC *p_rec = NULL;
@@ -365,14 +365,14 @@ void bta_gattc_get_disc_range(tBTA_GATTC_SERV *p_srvc_cb, uint16_t *p_s_hdl, uin
     return;
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_discover_pri_service
-**
-** Description      Start primary service discovery
-**
-** Returns          status of the operation.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_discover_pri_service
+ *
+ * Description      Start primary service discovery
+ *
+ * Returns          status of the operation.
+ *
+ ******************************************************************************/
 tBTA_GATT_STATUS bta_gattc_discover_pri_service(uint16_t conn_id, tBTA_GATTC_SERV *p_server_cb,
                                                     uint8_t disc_type)
 {
@@ -390,14 +390,14 @@ tBTA_GATT_STATUS bta_gattc_discover_pri_service(uint16_t conn_id, tBTA_GATTC_SER
     return status;
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_discover_procedure
-**
-** Description      Start a particular type of discovery procedure on server.
-**
-** Returns          status of the operation.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_discover_procedure
+ *
+ * Description      Start a particular type of discovery procedure on server.
+ *
+ * Returns          status of the operation.
+ *
+ ******************************************************************************/
 tBTA_GATT_STATUS bta_gattc_discover_procedure(uint16_t conn_id, tBTA_GATTC_SERV *p_server_cb,
                                                    uint8_t disc_type)
 {
@@ -427,27 +427,27 @@ tBTA_GATT_STATUS bta_gattc_discover_procedure(uint16_t conn_id, tBTA_GATTC_SERV
 
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_start_disc_include_srvc
-**
-** Description      Start discovery for included service
-**
-** Returns          status of the operation.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_start_disc_include_srvc
+ *
+ * Description      Start discovery for included service
+ *
+ * Returns          status of the operation.
+ *
+ ******************************************************************************/
 tBTA_GATT_STATUS bta_gattc_start_disc_include_srvc(uint16_t conn_id, tBTA_GATTC_SERV *p_srvc_cb)
 {
     return bta_gattc_discover_procedure(conn_id, p_srvc_cb, GATT_DISC_INC_SRVC);
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_start_disc_char
-**
-** Description      Start discovery for characteristic
-**
-** Returns          status of the operation.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_start_disc_char
+ *
+ * Description      Start discovery for characteristic
+ *
+ * Returns          status of the operation.
+ *
+ ******************************************************************************/
 tBTA_GATT_STATUS bta_gattc_start_disc_char(uint16_t conn_id, tBTA_GATTC_SERV *p_srvc_cb)
 {
     p_srvc_cb->total_char = 0;
@@ -455,14 +455,14 @@ tBTA_GATT_STATUS bta_gattc_start_disc_char(uint16_t conn_id, tBTA_GATTC_SERV *p_
     return bta_gattc_discover_procedure(conn_id, p_srvc_cb, GATT_DISC_CHAR);
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_start_disc_char_dscp
-**
-** Description      Start discovery for characteristic descriptor
-**
-** Returns          none.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_start_disc_char_dscp
+ *
+ * Description      Start discovery for characteristic descriptor
+ *
+ * Returns          none.
+ *
+ ******************************************************************************/
 void bta_gattc_start_disc_char_dscp(uint16_t conn_id, tBTA_GATTC_SERV *p_srvc_cb)
 {
     APPL_TRACE_DEBUG("starting discover characteristics descriptor");
@@ -472,14 +472,14 @@ void bta_gattc_start_disc_char_dscp(uint16_t conn_id, tBTA_GATTC_SERV *p_srvc_cb
 
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_explore_srvc
-**
-** Description      process the service discovery complete event
-**
-** Returns          status
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_explore_srvc
+ *
+ * Description      process the service discovery complete event
+ *
+ * Returns          status
+ *
+ ******************************************************************************/
 static void bta_gattc_explore_srvc(uint16_t conn_id, tBTA_GATTC_SERV *p_srvc_cb)
 {
     tBTA_GATTC_ATTR_REC *p_rec = p_srvc_cb->p_srvc_list + p_srvc_cb->cur_srvc_idx;
@@ -525,14 +525,14 @@ static void bta_gattc_explore_srvc(uint16_t conn_id, tBTA_GATTC_SERV *p_srvc_cb)
     bta_gattc_reset_discover_st(p_clcb->p_srcb, BTA_GATT_OK);
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_incl_srvc_disc_cmpl
-**
-** Description      process the relationship discovery complete event
-**
-** Returns          status
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_incl_srvc_disc_cmpl
+ *
+ * Description      process the relationship discovery complete event
+ *
+ * Returns          status
+ *
+ ******************************************************************************/
 static void bta_gattc_incl_srvc_disc_cmpl(uint16_t conn_id, tBTA_GATTC_SERV *p_srvc_cb)
 {
     p_srvc_cb->cur_char_idx = p_srvc_cb->total_srvc;
@@ -541,14 +541,14 @@ static void bta_gattc_incl_srvc_disc_cmpl(uint16_t conn_id, tBTA_GATTC_SERV *p_s
     bta_gattc_start_disc_char(conn_id, p_srvc_cb);
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_char_disc_cmpl
-**
-** Description      process the characteristic discovery complete event
-**
-** Returns          status
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_char_disc_cmpl
+ *
+ * Description      process the characteristic discovery complete event
+ *
+ * Returns          status
+ *
+ ******************************************************************************/
 static void bta_gattc_char_disc_cmpl(uint16_t conn_id, tBTA_GATTC_SERV *p_srvc_cb)
 {
     tBTA_GATTC_ATTR_REC *p_rec = p_srvc_cb->p_srvc_list + p_srvc_cb->cur_char_idx;
@@ -574,14 +574,14 @@ static void bta_gattc_char_disc_cmpl(uint16_t conn_id, tBTA_GATTC_SERV *p_srvc_c
     }
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_char_dscpt_disc_cmpl
-**
-** Description      process the char descriptor discovery complete event
-**
-** Returns          status
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_char_dscpt_disc_cmpl
+ *
+ * Description      process the char descriptor discovery complete event
+ *
+ * Returns          status
+ *
+ ******************************************************************************/
 static void bta_gattc_char_dscpt_disc_cmpl(uint16_t conn_id, tBTA_GATTC_SERV *p_srvc_cb)
 {
     tBTA_GATTC_ATTR_REC *p_rec = NULL;
@@ -640,14 +640,14 @@ static bool bta_gattc_srvc_in_list(tBTA_GATTC_SERV *p_srvc_cb, uint16_t s_handle
     return exist_srvc;
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_add_srvc_to_list
-**
-** Description      Add a service into explore pending list
-**
-** Returns          status
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_add_srvc_to_list
+ *
+ * Description      Add a service into explore pending list
+ *
+ * Returns          status
+ *
+ ******************************************************************************/
 static tBTA_GATT_STATUS bta_gattc_add_srvc_to_list(tBTA_GATTC_SERV *p_srvc_cb,
                                                    uint16_t s_handle, uint16_t e_handle,
                                                    tBT_UUID uuid, bool is_primary)
@@ -679,14 +679,14 @@ static tBTA_GATT_STATUS bta_gattc_add_srvc_to_list(tBTA_GATTC_SERV *p_srvc_cb,
     return status;
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_add_char_to_list
-**
-** Description      Add a characteristic into explore pending list
-**
-** Returns          status
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_add_char_to_list
+ *
+ * Description      Add a characteristic into explore pending list
+ *
+ * Returns          status
+ *
+ ******************************************************************************/
 static tBTA_GATT_STATUS bta_gattc_add_char_to_list(tBTA_GATTC_SERV *p_srvc_cb,
                                                    uint16_t decl_handle, uint16_t value_handle,
                                                    tBT_UUID uuid, uint8_t property)
@@ -731,14 +731,14 @@ static tBTA_GATT_STATUS bta_gattc_add_char_to_list(tBTA_GATTC_SERV *p_srvc_cb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_gattc_sdp_callback
-**
-** Description      Process the discovery result from sdp
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_sdp_callback
+ *
+ * Description      Process the discovery result from sdp
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_gattc_sdp_callback(uint16_t sdp_status, void* user_data)
 {
     tSDP_DISC_REC       *p_sdp_rec = NULL;
@@ -807,14 +807,14 @@ void bta_gattc_sdp_callback(uint16_t sdp_status, void* user_data)
     osi_free(cb_data);
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_sdp_service_disc
-**
-** Description      Start DSP Service Discovert
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_sdp_service_disc
+ *
+ * Description      Start DSP Service Discovert
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static tBTA_GATT_STATUS bta_gattc_sdp_service_disc(uint16_t conn_id, tBTA_GATTC_SERV *p_server_cb)
 {
     tSDP_UUID       uuid;
@@ -852,15 +852,15 @@ static tBTA_GATT_STATUS bta_gattc_sdp_service_disc(uint16_t conn_id, tBTA_GATTC_
     return BTA_GATT_OK;
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_disc_res_cback
-**                  bta_gattc_disc_cmpl_cback
-**
-** Description      callback functions to GATT client stack.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_disc_res_cback
+ *                  bta_gattc_disc_cmpl_cback
+ *
+ * Description      callback functions to GATT client stack.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_gattc_disc_res_cback (uint16_t conn_id, tGATT_DISC_TYPE disc_type, tGATT_DISC_RES *p_data)
 {
     tBTA_GATTC_SERV * p_srvc_cb = NULL;
@@ -976,14 +976,14 @@ void bta_gattc_disc_cmpl_cback (uint16_t conn_id, tGATT_DISC_TYPE disc_type, tGA
 }
 
 /*******************************************************************************
-**
-** Function         bta_gattc_search_service
-**
-** Description      search local cache for matching service record.
-**
-** Returns          false if map can not be found.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_search_service
+ *
+ * Description      search local cache for matching service record.
+ *
+ * Returns          false if map can not be found.
+ *
+ ******************************************************************************/
 void bta_gattc_search_service(tBTA_GATTC_CLCB *p_clcb, tBT_UUID *p_uuid)
 {
     tBTA_GATTC          cb_data;
@@ -1120,14 +1120,14 @@ tBTA_GATTC_DESCRIPTOR*  bta_gattc_get_descriptor(uint16_t conn_id, uint16_t hand
 }
 
 /*******************************************************************************
-**
-** Function         bta_gattc_fill_gatt_db_el
-**
-** Description      fill a btgatt_db_element_t value
-**
-** Returns          None.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_fill_gatt_db_el
+ *
+ * Description      fill a btgatt_db_element_t value
+ *
+ * Returns          None.
+ *
+ ******************************************************************************/
 void bta_gattc_fill_gatt_db_el(btgatt_db_element_t *p_attr,
                                bt_gatt_db_attribute_type_t type,
                                uint16_t att_handle,
@@ -1144,8 +1144,8 @@ void bta_gattc_fill_gatt_db_el(btgatt_db_element_t *p_attr,
 }
 
 /*******************************************************************************
-** Returns          number of elements inside db from start_handle to end_handle
-*******************************************************************************/
+ * Returns          number of elements inside db from start_handle to end_handle
+ ******************************************************************************/
 static size_t bta_gattc_get_db_size(list_t *services,
                                  uint16_t start_handle, uint16_t end_handle) {
     if (!services || list_is_empty(services))
@@ -1185,20 +1185,20 @@ static size_t bta_gattc_get_db_size(list_t *services,
 }
 
 /*******************************************************************************
-**
-** Function         bta_gattc_get_gatt_db_impl
-**
-** Description      copy the server GATT database into db parameter.
-**
-** Parameters       p_srvc_cb: server.
-**                  db: output parameter which will contain GATT database copy.
-**                      Caller is responsible for freeing it.
-**                  count: output parameter which will contain number of
-**                  elements in database.
-**
-** Returns          None.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_get_gatt_db_impl
+ *
+ * Description      copy the server GATT database into db parameter.
+ *
+ * Parameters       p_srvc_cb: server.
+ *                  db: output parameter which will contain GATT database copy.
+ *                      Caller is responsible for freeing it.
+ *                  count: output parameter which will contain number of
+ *                  elements in database.
+ *
+ * Returns          None.
+ *
+ ******************************************************************************/
 static void bta_gattc_get_gatt_db_impl(tBTA_GATTC_SERV *p_srvc_cb,
                                        uint16_t start_handle, uint16_t end_handle,
                                        btgatt_db_element_t **db,
@@ -1300,19 +1300,19 @@ static void bta_gattc_get_gatt_db_impl(tBTA_GATTC_SERV *p_srvc_cb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_gattc_get_gatt_db
-**
-** Description      copy the server GATT database into db parameter.
-**
-** Parameters       conn_id: connection ID which identify the server.
-**                  db: output parameter which will contain GATT database copy.
-**                      Caller is responsible for freeing it.
-**                  count: number of elements in database.
-**
-** Returns          None.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_get_gatt_db
+ *
+ * Description      copy the server GATT database into db parameter.
+ *
+ * Parameters       conn_id: connection ID which identify the server.
+ *                  db: output parameter which will contain GATT database copy.
+ *                      Caller is responsible for freeing it.
+ *                  count: number of elements in database.
+ *
+ * Returns          None.
+ *
+ ******************************************************************************/
 void bta_gattc_get_gatt_db(uint16_t conn_id, uint16_t start_handle, uint16_t end_handle, btgatt_db_element_t **db, int *count)
 {
     tBTA_GATTC_CLCB *p_clcb = bta_gattc_find_clcb_by_conn_id(conn_id);
@@ -1339,16 +1339,16 @@ void bta_gattc_get_gatt_db(uint16_t conn_id, uint16_t start_handle, uint16_t end
 }
 
 /*******************************************************************************
-**
-** Function         bta_gattc_rebuild_cache
-**
-** Description      rebuild server cache from NV cache.
-**
-** Parameters
-**
-** Returns          None.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_rebuild_cache
+ *
+ * Description      rebuild server cache from NV cache.
+ *
+ * Parameters
+ *
+ * Returns          None.
+ *
+ ******************************************************************************/
 void bta_gattc_rebuild_cache(tBTA_GATTC_SERV *p_srvc_cb, uint16_t num_attr,
                              tBTA_GATTC_NV_ATTR *p_attr)
 {
@@ -1395,14 +1395,14 @@ void bta_gattc_rebuild_cache(tBTA_GATTC_SERV *p_srvc_cb, uint16_t num_attr,
 }
 
 /*******************************************************************************
-**
-** Function         bta_gattc_fill_nv_attr
-**
-** Description      fill a NV attribute entry value
-**
-** Returns          None.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_fill_nv_attr
+ *
+ * Description      fill a NV attribute entry value
+ *
+ * Returns          None.
+ *
+ ******************************************************************************/
 void bta_gattc_fill_nv_attr(tBTA_GATTC_NV_ATTR *p_attr, uint8_t type, uint16_t s_handle,
                             uint16_t e_handle, tBT_UUID uuid, uint8_t prop, uint16_t incl_srvc_handle,
                             bool is_primary)
@@ -1419,14 +1419,14 @@ void bta_gattc_fill_nv_attr(tBTA_GATTC_NV_ATTR *p_attr, uint8_t type, uint16_t s
 }
 
 /*******************************************************************************
-**
-** Function         bta_gattc_cache_save
-**
-** Description      save the server cache into NV
-**
-** Returns          None.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_cache_save
+ *
+ * Description      save the server cache into NV
+ *
+ * Returns          None.
+ *
+ ******************************************************************************/
 void bta_gattc_cache_save(tBTA_GATTC_SERV *p_srvc_cb, uint16_t conn_id)
 {
     if (!p_srvc_cb->p_srvc_cache || list_is_empty(p_srvc_cb->p_srvc_cache))
@@ -1511,16 +1511,16 @@ void bta_gattc_cache_save(tBTA_GATTC_SERV *p_srvc_cb, uint16_t conn_id)
 }
 
 /*******************************************************************************
-**
-** Function         bta_gattc_cache_load
-**
-** Description      Load GATT cache from storage for server.
-**
-** Parameter        p_clcb: pointer to server clcb, that will
-**                          be filled from storage
-** Returns          true on success, false otherwise
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_cache_load
+ *
+ * Description      Load GATT cache from storage for server.
+ *
+ * Parameter        p_clcb: pointer to server clcb, that will
+ *                          be filled from storage
+ * Returns          true on success, false otherwise
+ *
+ ******************************************************************************/
 bool bta_gattc_cache_load(tBTA_GATTC_CLCB *p_clcb)
 {
     char fname[255] = {0};
@@ -1572,18 +1572,18 @@ done:
 }
 
 /*******************************************************************************
-**
-** Function         bta_gattc_cache_write
-**
-** Description      This callout function is executed by GATT when a server cache
-**                  is available to save.
-**
-** Parameter        server_bda: server bd address of this cache belongs to
-**                  num_attr: number of attribute to be save.
-**                  attr: pointer to the list of attributes to save.
-** Returns
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_cache_write
+ *
+ * Description      This callout function is executed by GATT when a server cache
+ *                  is available to save.
+ *
+ * Parameter        server_bda: server bd address of this cache belongs to
+ *                  num_attr: number of attribute to be save.
+ *                  attr: pointer to the list of attributes to save.
+ * Returns
+ *
+ ******************************************************************************/
 static void bta_gattc_cache_write(BD_ADDR server_bda, uint16_t num_attr,
                            tBTA_GATTC_NV_ATTR *attr)
 {
@@ -1619,17 +1619,17 @@ static void bta_gattc_cache_write(BD_ADDR server_bda, uint16_t num_attr,
 }
 
 /*******************************************************************************
-**
-** Function         bta_gattc_cache_reset
-**
-** Description      This callout function is executed by GATTC to reset cache in
-**                  application
-**
-** Parameter        server_bda: server bd address of this cache belongs to
-**
-** Returns          void.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_cache_reset
+ *
+ * Description      This callout function is executed by GATTC to reset cache in
+ *                  application
+ *
+ * Parameter        server_bda: server bd address of this cache belongs to
+ *
+ * Returns          void.
+ *
+ ******************************************************************************/
 void bta_gattc_cache_reset(BD_ADDR server_bda)
 {
     BTIF_TRACE_DEBUG("%s", __func__);
diff --git a/system/bta/gatt/bta_gattc_int.h b/system/bta/gatt/bta_gattc_int.h
index fcfd977fac1..04ac8dabf44 100644
--- a/system/bta/gatt/bta_gattc_int.h
+++ b/system/bta/gatt/bta_gattc_int.h
@@ -33,8 +33,8 @@
 #include "bt_common.h"
 
 /*****************************************************************************
-**  Constants and data types
-*****************************************************************************/
+ *  Constants and data types
+ ****************************************************************************/
 enum
 {
     BTA_GATTC_API_OPEN_EVT   = BTA_SYS_EVT_START(BTA_ID_GATTC),
@@ -373,15 +373,15 @@ typedef struct
 }tBTA_GATTC_CB;
 
 /*****************************************************************************
-**  Global data
-*****************************************************************************/
+ *  Global data
+ ****************************************************************************/
 
 /* GATTC control block */
 extern tBTA_GATTC_CB  bta_gattc_cb;
 
 /*****************************************************************************
-**  Function prototypes
-*****************************************************************************/
+ *  Function prototypes
+ ****************************************************************************/
 extern bool bta_gattc_hdl_event(BT_HDR *p_msg);
 extern bool bta_gattc_sm_execute(tBTA_GATTC_CLCB *p_clcb, uint16_t event, tBTA_GATTC_DATA *p_data);
 
diff --git a/system/bta/gatt/bta_gattc_main.cc b/system/bta/gatt/bta_gattc_main.cc
index 006c2bf5039..b69cd59fb31 100644
--- a/system/bta/gatt/bta_gattc_main.cc
+++ b/system/bta/gatt/bta_gattc_main.cc
@@ -33,8 +33,8 @@
 
 
 /*****************************************************************************
-** Constants and types
-*****************************************************************************/
+ * Constants and types
+ ****************************************************************************/
 
 
 /* state machine action enumeration list */
@@ -239,8 +239,8 @@ const tBTA_GATTC_ST_TBL bta_gattc_st_tbl[] =
 };
 
 /*****************************************************************************
-** Global data
-*****************************************************************************/
+ * Global data
+ ****************************************************************************/
 
 /* GATTC control block */
 tBTA_GATTC_CB  bta_gattc_cb;
@@ -251,16 +251,16 @@ static char *gattc_state_code(tBTA_GATTC_STATE state_code);
 #endif
 
 /*******************************************************************************
-**
-** Function         bta_gattc_sm_execute
-**
-** Description      State machine event handling function for GATTC
-**
-**
-** Returns          bool  : true if queued client request buffer can be immediately released
-**                                        else false
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_sm_execute
+ *
+ * Description      State machine event handling function for GATTC
+ *
+ *
+ * Returns          bool  : true if queued client request buffer can be immediately released
+ *                                        else false
+ *
+ ******************************************************************************/
 bool bta_gattc_sm_execute(tBTA_GATTC_CLCB *p_clcb, uint16_t event, tBTA_GATTC_DATA *p_data)
 {
     tBTA_GATTC_ST_TBL     state_table;
@@ -317,15 +317,15 @@ bool bta_gattc_sm_execute(tBTA_GATTC_CLCB *p_clcb, uint16_t event, tBTA_GATTC_DA
 }
 
 /*******************************************************************************
-**
-** Function         bta_gattc_hdl_event
-**
-** Description      GATT client main event handling function.
-**
-**
-** Returns          bool
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_hdl_event
+ *
+ * Description      GATT client main event handling function.
+ *
+ *
+ * Returns          bool
+ *
+ ******************************************************************************/
 bool bta_gattc_hdl_event(BT_HDR *p_msg)
 {
     tBTA_GATTC_CLCB *p_clcb = NULL;
@@ -395,19 +395,19 @@ bool bta_gattc_hdl_event(BT_HDR *p_msg)
 
 
 /*****************************************************************************
-**  Debug Functions
-*****************************************************************************/
+ *  Debug Functions
+ ****************************************************************************/
 #if (BTA_GATT_DEBUG == TRUE)
 
 /*******************************************************************************
-**
-** Function         gattc_evt_code
-**
-** Description
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         gattc_evt_code
+ *
+ * Description
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static char *gattc_evt_code(tBTA_GATTC_INT_EVT evt_code)
 {
     switch (evt_code)
@@ -462,14 +462,14 @@ static char *gattc_evt_code(tBTA_GATTC_INT_EVT evt_code)
 }
 
 /*******************************************************************************
-**
-** Function         gattc_state_code
-**
-** Description
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         gattc_state_code
+ *
+ * Description
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static char *gattc_state_code(tBTA_GATTC_STATE state_code)
 {
     switch (state_code)
diff --git a/system/bta/gatt/bta_gattc_utils.cc b/system/bta/gatt/bta_gattc_utils.cc
index ac2f4127ee4..9790228d8e2 100644
--- a/system/bta/gatt/bta_gattc_utils.cc
+++ b/system/bta/gatt/bta_gattc_utils.cc
@@ -38,8 +38,8 @@
 #include "utl.h"
 
 /*****************************************************************************
-**  Constants
-*****************************************************************************/
+ *  Constants
+ ****************************************************************************/
 
 static const uint8_t  base_uuid[LEN_UUID_128] = {0xFB, 0x34, 0x9B, 0x5F, 0x80, 0x00, 0x00, 0x80,
     0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
@@ -47,14 +47,14 @@ static const uint8_t  base_uuid[LEN_UUID_128] = {0xFB, 0x34, 0x9B, 0x5F, 0x80, 0
 static const BD_ADDR dummy_bda = {0,0,0,0,0,0};
 
 /*******************************************************************************
-**
-** Function         bta_gatt_convert_uuid16_to_uuid128
-**
-** Description      Convert a 16 bits UUID to be an standard 128 bits one.
-**
-** Returns          true if two uuid match; false otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gatt_convert_uuid16_to_uuid128
+ *
+ * Description      Convert a 16 bits UUID to be an standard 128 bits one.
+ *
+ * Returns          true if two uuid match; false otherwise.
+ *
+ ******************************************************************************/
 void bta_gatt_convert_uuid16_to_uuid128(uint8_t uuid_128[LEN_UUID_128], uint16_t uuid_16)
 {
     uint8_t   *p = &uuid_128[LEN_UUID_128 - 4];
@@ -64,14 +64,14 @@ void bta_gatt_convert_uuid16_to_uuid128(uint8_t uuid_128[LEN_UUID_128], uint16_t
     UINT16_TO_STREAM(p, uuid_16);
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_uuid_compare
-**
-** Description      Compare two UUID to see if they are the same.
-**
-** Returns          true if two uuid match; false otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_uuid_compare
+ *
+ * Description      Compare two UUID to see if they are the same.
+ *
+ * Returns          true if two uuid match; false otherwise.
+ *
+ ******************************************************************************/
 bool bta_gattc_uuid_compare (const tBT_UUID *p_src, const tBT_UUID *p_tar, bool is_precise)
 {
     uint8_t  su[LEN_UUID_128], tu[LEN_UUID_128];
@@ -115,14 +115,14 @@ bool bta_gattc_uuid_compare (const tBT_UUID *p_src, const tBT_UUID *p_tar, bool
 }
 
 /*******************************************************************************
-**
-** Function         bta_gattc_cl_get_regcb
-**
-** Description      get registration control block by client interface.
-**
-** Returns          pointer to the regcb
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_cl_get_regcb
+ *
+ * Description      get registration control block by client interface.
+ *
+ * Returns          pointer to the regcb
+ *
+ ******************************************************************************/
 tBTA_GATTC_RCB * bta_gattc_cl_get_regcb(uint8_t client_if)
 {
     uint8_t   i = 0;
@@ -137,14 +137,14 @@ tBTA_GATTC_RCB * bta_gattc_cl_get_regcb(uint8_t client_if)
     return NULL;
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_num_reg_app
-**
-** Description      find the number of registered application.
-**
-** Returns          pointer to the regcb
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_num_reg_app
+ *
+ * Description      find the number of registered application.
+ *
+ * Returns          pointer to the regcb
+ *
+ ******************************************************************************/
 uint8_t bta_gattc_num_reg_app(void)
 {
     uint8_t   i = 0, j = 0;
@@ -157,14 +157,14 @@ uint8_t bta_gattc_num_reg_app(void)
     return j;
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_find_clcb_by_cif
-**
-** Description      get clcb by client interface and remote bd adddress
-**
-** Returns          pointer to the clcb
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_find_clcb_by_cif
+ *
+ * Description      get clcb by client interface and remote bd adddress
+ *
+ * Returns          pointer to the clcb
+ *
+ ******************************************************************************/
 tBTA_GATTC_CLCB * bta_gattc_find_clcb_by_cif (uint8_t client_if, BD_ADDR remote_bda,
                                               tBTA_TRANSPORT transport)
 {
@@ -182,14 +182,14 @@ tBTA_GATTC_CLCB * bta_gattc_find_clcb_by_cif (uint8_t client_if, BD_ADDR remote_
     return NULL;
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_find_clcb_by_conn_id
-**
-** Description      get clcb by connection ID
-**
-** Returns          pointer to the clcb
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_find_clcb_by_conn_id
+ *
+ * Description      get clcb by connection ID
+ *
+ * Returns          pointer to the clcb
+ *
+ ******************************************************************************/
 tBTA_GATTC_CLCB * bta_gattc_find_clcb_by_conn_id (uint16_t conn_id)
 {
     tBTA_GATTC_CLCB *p_clcb = &bta_gattc_cb.clcb[0];
@@ -205,14 +205,14 @@ tBTA_GATTC_CLCB * bta_gattc_find_clcb_by_conn_id (uint16_t conn_id)
 }
 
 /*******************************************************************************
-**
-** Function         bta_gattc_clcb_alloc
-**
-** Description      allocate CLCB
-**
-** Returns          pointer to the clcb
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_clcb_alloc
+ *
+ * Description      allocate CLCB
+ *
+ * Returns          pointer to the clcb
+ *
+ ******************************************************************************/
 tBTA_GATTC_CLCB * bta_gattc_clcb_alloc(tBTA_GATTC_IF client_if, BD_ADDR remote_bda,
                                        tBTA_TRANSPORT transport)
 {
@@ -254,14 +254,14 @@ tBTA_GATTC_CLCB * bta_gattc_clcb_alloc(tBTA_GATTC_IF client_if, BD_ADDR remote_b
     return p_clcb;
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_find_alloc_clcb
-**
-** Description      find or allocate CLCB if not found.
-**
-** Returns          pointer to the clcb
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_find_alloc_clcb
+ *
+ * Description      find or allocate CLCB if not found.
+ *
+ * Returns          pointer to the clcb
+ *
+ ******************************************************************************/
 tBTA_GATTC_CLCB *bta_gattc_find_alloc_clcb(tBTA_GATTC_IF client_if, BD_ADDR remote_bda,
                                            tBTA_TRANSPORT transport)
 {
@@ -275,14 +275,14 @@ tBTA_GATTC_CLCB *bta_gattc_find_alloc_clcb(tBTA_GATTC_IF client_if, BD_ADDR remo
 }
 
 /*******************************************************************************
-**
-** Function         bta_gattc_clcb_dealloc
-**
-** Description      Deallocte a clcb
-**
-** Returns          pointer to the clcb
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_clcb_dealloc
+ *
+ * Description      Deallocte a clcb
+ *
+ * Returns          pointer to the clcb
+ *
+ ******************************************************************************/
 void bta_gattc_clcb_dealloc(tBTA_GATTC_CLCB *p_clcb)
 {
     tBTA_GATTC_SERV     *p_srcb = NULL;
@@ -312,14 +312,14 @@ void bta_gattc_clcb_dealloc(tBTA_GATTC_CLCB *p_clcb)
 }
 
 /*******************************************************************************
-**
-** Function         bta_gattc_find_srcb
-**
-** Description      find server cache by remote bd address currently in use
-**
-** Returns          pointer to the server cache.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_find_srcb
+ *
+ * Description      find server cache by remote bd address currently in use
+ *
+ * Returns          pointer to the server cache.
+ *
+ ******************************************************************************/
 tBTA_GATTC_SERV * bta_gattc_find_srcb(BD_ADDR bda)
 {
     tBTA_GATTC_SERV *p_srcb = &bta_gattc_cb.known_server[0];
@@ -334,14 +334,14 @@ tBTA_GATTC_SERV * bta_gattc_find_srcb(BD_ADDR bda)
 }
 
 /*******************************************************************************
-**
-** Function         bta_gattc_find_srvr_cache
-**
-** Description      find server cache by remote bd address
-**
-** Returns          pointer to the server cache.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_find_srvr_cache
+ *
+ * Description      find server cache by remote bd address
+ *
+ * Returns          pointer to the server cache.
+ *
+ ******************************************************************************/
 tBTA_GATTC_SERV * bta_gattc_find_srvr_cache(BD_ADDR bda)
 {
     tBTA_GATTC_SERV *p_srcb = &bta_gattc_cb.known_server[0];
@@ -355,14 +355,14 @@ tBTA_GATTC_SERV * bta_gattc_find_srvr_cache(BD_ADDR bda)
     return NULL;
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_find_scb_by_cid
-**
-** Description      find server control block by connection ID
-**
-** Returns          pointer to the server cache.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_find_scb_by_cid
+ *
+ * Description      find server control block by connection ID
+ *
+ * Returns          pointer to the server cache.
+ *
+ ******************************************************************************/
 tBTA_GATTC_SERV * bta_gattc_find_scb_by_cid (uint16_t conn_id)
 {
     tBTA_GATTC_CLCB *p_clcb = bta_gattc_find_clcb_by_conn_id(conn_id);
@@ -373,14 +373,14 @@ tBTA_GATTC_SERV * bta_gattc_find_scb_by_cid (uint16_t conn_id)
         return NULL;
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_srcb_alloc
-**
-** Description      allocate server cache control block
-**
-** Returns          pointer to the server cache.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_srcb_alloc
+ *
+ * Description      allocate server cache control block
+ *
+ * Returns          pointer to the server cache.
+ *
+ ******************************************************************************/
 tBTA_GATTC_SERV * bta_gattc_srcb_alloc(BD_ADDR bda)
 {
     tBTA_GATTC_SERV *p_tcb = &bta_gattc_cb.known_server[0],
@@ -421,14 +421,14 @@ tBTA_GATTC_SERV * bta_gattc_srcb_alloc(BD_ADDR bda)
     return p_tcb;
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_enqueue
-**
-** Description      enqueue a client request in clcb.
-**
-** Returns          success or failure.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_enqueue
+ *
+ * Description      enqueue a client request in clcb.
+ *
+ * Returns          success or failure.
+ *
+ ******************************************************************************/
 bool bta_gattc_enqueue(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_DATA *p_data)
 {
 
@@ -444,14 +444,14 @@ bool bta_gattc_enqueue(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_gattc_check_notif_registry
-**
-** Description      check if the service notificaition has been registered.
-**
-** Returns
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_check_notif_registry
+ *
+ * Description      check if the service notificaition has been registered.
+ *
+ * Returns
+ *
+ ******************************************************************************/
 bool bta_gattc_check_notif_registry(tBTA_GATTC_RCB  *p_clreg, tBTA_GATTC_SERV *p_srcb,
                                        tBTA_GATTC_NOTIFY  *p_notify)
 {
@@ -471,17 +471,17 @@ bool bta_gattc_check_notif_registry(tBTA_GATTC_RCB  *p_clreg, tBTA_GATTC_SERV *p
 
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_clear_notif_registration
-**
-** Description      Clear up the notification registration information by BD_ADDR.
-**                  Where handle is between start_handle and end_handle, and
-**                  start_handle and end_handle are boundaries of service
-**                  containing characteristic.
-**
-** Returns          None.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_clear_notif_registration
+ *
+ * Description      Clear up the notification registration information by BD_ADDR.
+ *                  Where handle is between start_handle and end_handle, and
+ *                  start_handle and end_handle are boundaries of service
+ *                  containing characteristic.
+ *
+ * Returns          None.
+ *
+ ******************************************************************************/
 void bta_gattc_clear_notif_registration(tBTA_GATTC_SERV *p_srcb, uint16_t conn_id,
                                         uint16_t start_handle, uint16_t end_handle)
 {
@@ -514,15 +514,15 @@ void bta_gattc_clear_notif_registration(tBTA_GATTC_SERV *p_srcb, uint16_t conn_i
 }
 
 /*******************************************************************************
-**
-** Function         bta_gattc_mark_bg_conn
-**
-** Description      mark background connection status when a bg connection is initiated
-**                  or terminated.
-**
-** Returns          true if success; false otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_mark_bg_conn
+ *
+ * Description      mark background connection status when a bg connection is initiated
+ *                  or terminated.
+ *
+ * Returns          true if success; false otherwise.
+ *
+ ******************************************************************************/
 bool bta_gattc_mark_bg_conn (tBTA_GATTC_IF client_if,  BD_ADDR_PTR remote_bda_ptr,
                                 bool add)
 {
@@ -590,14 +590,14 @@ bool bta_gattc_mark_bg_conn (tBTA_GATTC_IF client_if,  BD_ADDR_PTR remote_bda_pt
     }
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_check_bg_conn
-**
-** Description      check if this is a background connection background connection.
-**
-** Returns          true if success; false otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_check_bg_conn
+ *
+ * Description      check if this is a background connection background connection.
+ *
+ * Returns          true if success; false otherwise.
+ *
+ ******************************************************************************/
 bool bta_gattc_check_bg_conn (tBTA_GATTC_IF client_if,  BD_ADDR remote_bda, uint8_t role)
 {
     tBTA_GATTC_BG_TCK   *p_bg_tck = &bta_gattc_cb.bg_track[0];
@@ -618,14 +618,14 @@ bool bta_gattc_check_bg_conn (tBTA_GATTC_IF client_if,  BD_ADDR remote_bda, uint
     return is_bg_conn;
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_send_open_cback
-**
-** Description      send open callback
-**
-** Returns
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_send_open_cback
+ *
+ * Description      send open callback
+ *
+ * Returns
+ *
+ ******************************************************************************/
 void bta_gattc_send_open_cback( tBTA_GATTC_RCB *p_clreg, tBTA_GATT_STATUS status,
                                 BD_ADDR remote_bda, uint16_t conn_id,
                                 tBTA_TRANSPORT transport, uint16_t mtu)
@@ -647,14 +647,14 @@ void bta_gattc_send_open_cback( tBTA_GATTC_RCB *p_clreg, tBTA_GATT_STATUS status
     }
 }
 /*******************************************************************************
-**
-** Function         bta_gattc_conn_alloc
-**
-** Description      allocate connection tracking spot
-**
-** Returns          pointer to the clcb
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_conn_alloc
+ *
+ * Description      allocate connection tracking spot
+ *
+ * Returns          pointer to the clcb
+ *
+ ******************************************************************************/
 tBTA_GATTC_CONN * bta_gattc_conn_alloc(BD_ADDR remote_bda)
 {
     uint8_t               i_conn = 0;
@@ -676,14 +676,14 @@ tBTA_GATTC_CONN * bta_gattc_conn_alloc(BD_ADDR remote_bda)
 }
 
 /*******************************************************************************
-**
-** Function         bta_gattc_conn_find
-**
-** Description      allocate connection tracking spot
-**
-** Returns          pointer to the clcb
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_conn_find
+ *
+ * Description      allocate connection tracking spot
+ *
+ * Returns          pointer to the clcb
+ *
+ ******************************************************************************/
 tBTA_GATTC_CONN * bta_gattc_conn_find(BD_ADDR remote_bda)
 {
     uint8_t               i_conn = 0;
@@ -703,14 +703,14 @@ tBTA_GATTC_CONN * bta_gattc_conn_find(BD_ADDR remote_bda)
 }
 
 /*******************************************************************************
-**
-** Function         bta_gattc_conn_find_alloc
-**
-** Description      find or allocate connection tracking spot
-**
-** Returns          pointer to the clcb
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_conn_find_alloc
+ *
+ * Description      find or allocate connection tracking spot
+ *
+ * Returns          pointer to the clcb
+ *
+ ******************************************************************************/
 tBTA_GATTC_CONN * bta_gattc_conn_find_alloc(BD_ADDR remote_bda)
 {
     tBTA_GATTC_CONN     *p_conn = bta_gattc_conn_find (remote_bda);
@@ -723,14 +723,14 @@ tBTA_GATTC_CONN * bta_gattc_conn_find_alloc(BD_ADDR remote_bda)
 }
 
 /*******************************************************************************
-**
-** Function         bta_gattc_conn_dealloc
-**
-** Description      de-allocate connection tracking spot
-**
-** Returns          pointer to the clcb
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_conn_dealloc
+ *
+ * Description      de-allocate connection tracking spot
+ *
+ * Returns          pointer to the clcb
+ *
+ ******************************************************************************/
 bool bta_gattc_conn_dealloc(BD_ADDR remote_bda)
 {
     tBTA_GATTC_CONN     *p_conn = bta_gattc_conn_find (remote_bda);
@@ -745,14 +745,14 @@ bool bta_gattc_conn_dealloc(BD_ADDR remote_bda)
 }
 
 /*******************************************************************************
-**
-** Function         bta_gattc_find_int_conn_clcb
-**
-** Description      try to locate a clcb when an internal connecion event arrives.
-**
-** Returns          pointer to the clcb
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_find_int_conn_clcb
+ *
+ * Description      try to locate a clcb when an internal connecion event arrives.
+ *
+ * Returns          pointer to the clcb
+ *
+ ******************************************************************************/
 tBTA_GATTC_CLCB * bta_gattc_find_int_conn_clcb(tBTA_GATTC_DATA *p_msg)
 {
     tBTA_GATTC_CLCB *p_clcb = NULL;
@@ -781,14 +781,14 @@ tBTA_GATTC_CLCB * bta_gattc_find_int_conn_clcb(tBTA_GATTC_DATA *p_msg)
 }
 
 /*******************************************************************************
-**
-** Function         bta_gattc_find_int_disconn_clcb
-**
-** Description      try to locate a clcb when an internal disconnect callback arrives.
-**
-** Returns          pointer to the clcb
-**
-*******************************************************************************/
+ *
+ * Function         bta_gattc_find_int_disconn_clcb
+ *
+ * Description      try to locate a clcb when an internal disconnect callback arrives.
+ *
+ * Returns          pointer to the clcb
+ *
+ ******************************************************************************/
 tBTA_GATTC_CLCB * bta_gattc_find_int_disconn_clcb(tBTA_GATTC_DATA *p_msg)
 {
     tBTA_GATTC_CLCB         *p_clcb = NULL;
diff --git a/system/bta/gatt/bta_gatts_act.cc b/system/bta/gatt/bta_gatts_act.cc
index 331e5e0d0b2..768b5a64ca3 100644
--- a/system/bta/gatt/bta_gatts_act.cc
+++ b/system/bta/gatt/bta_gatts_act.cc
@@ -68,15 +68,15 @@ tGATT_APPL_INFO bta_gatts_nv_cback =
 };
 
 /*******************************************************************************
-**
-** Function         bta_gatts_nv_save_cback
-**
-** Description      NV save callback function.
-**
-** Parameter        is_add: true is to add a handle range; otherwise is to delete.
-** Returns          none.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gatts_nv_save_cback
+ *
+ * Description      NV save callback function.
+ *
+ * Parameter        is_add: true is to add a handle range; otherwise is to delete.
+ * Returns          none.
+ *
+ ******************************************************************************/
 static void bta_gatts_nv_save_cback(bool is_add, tGATTS_HNDL_RANGE *p_hndl_range)
 {
     bta_gatts_co_update_handle_range(is_add, (tBTA_GATTS_HNDL_RANGE *)p_hndl_range);
@@ -84,15 +84,15 @@ static void bta_gatts_nv_save_cback(bool is_add, tGATTS_HNDL_RANGE *p_hndl_range
 
 
 /*******************************************************************************
-**
-** Function         bta_gatts_nv_srv_chg_cback
-**
-** Description      NV save callback function.
-**
-** Parameter        is_add: true is to add a handle range; otherwise is to delete.
-** Returns          none.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gatts_nv_srv_chg_cback
+ *
+ * Description      NV save callback function.
+ *
+ * Parameter        is_add: true is to add a handle range; otherwise is to delete.
+ * Returns          none.
+ *
+ ******************************************************************************/
 static bool bta_gatts_nv_srv_chg_cback(tGATTS_SRV_CHG_CMD cmd,
                                               tGATTS_SRV_CHG_REQ *p_req, tGATTS_SRV_CHG_RSP *p_rsp)
 {
@@ -103,14 +103,14 @@ static bool bta_gatts_nv_srv_chg_cback(tGATTS_SRV_CHG_CMD cmd,
 
 
 /*******************************************************************************
-**
-** Function         bta_gatts_enable
-**
-** Description      enable BTA GATTS module.
-**
-** Returns          none.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gatts_enable
+ *
+ * Description      enable BTA GATTS module.
+ *
+ * Returns          none.
+ *
+ ******************************************************************************/
 void bta_gatts_enable(tBTA_GATTS_CB *p_cb)
 {
     uint8_t index=0;
@@ -143,14 +143,14 @@ void bta_gatts_enable(tBTA_GATTS_CB *p_cb)
 }
 
 /*******************************************************************************
-**
-** Function         bta_gatts_api_disable
-**
-** Description      disable BTA GATTS module.
-**
-** Returns          none.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gatts_api_disable
+ *
+ * Description      disable BTA GATTS module.
+ *
+ * Returns          none.
+ *
+ ******************************************************************************/
 void bta_gatts_api_disable(tBTA_GATTS_CB *p_cb)
 {
     uint8_t i;
@@ -173,14 +173,14 @@ void bta_gatts_api_disable(tBTA_GATTS_CB *p_cb)
 }
 
 /*******************************************************************************
-**
-** Function         bta_gatts_register
-**
-** Description      register an application.
-**
-** Returns          none.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gatts_register
+ *
+ * Description      register an application.
+ *
+ * Returns          none.
+ *
+ ******************************************************************************/
 void bta_gatts_register(tBTA_GATTS_CB *p_cb, tBTA_GATTS_DATA *p_msg)
 {
     tBTA_GATTS               cb_data;
@@ -250,14 +250,14 @@ void bta_gatts_register(tBTA_GATTS_CB *p_cb, tBTA_GATTS_DATA *p_msg)
 
 
 /*******************************************************************************
-**
-** Function         bta_gatts_start_if
-**
-** Description      start an application interface.
-**
-** Returns          none.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gatts_start_if
+ *
+ * Description      start an application interface.
+ *
+ * Returns          none.
+ *
+ ******************************************************************************/
 void bta_gatts_start_if(UNUSED_ATTR tBTA_GATTS_CB *p_cb, tBTA_GATTS_DATA *p_msg)
 {
     if (bta_gatts_find_app_rcb_by_app_if(p_msg->int_start_if.server_if))
@@ -271,14 +271,14 @@ void bta_gatts_start_if(UNUSED_ATTR tBTA_GATTS_CB *p_cb, tBTA_GATTS_DATA *p_msg)
     }
 }
 /*******************************************************************************
-**
-** Function         bta_gatts_deregister
-**
-** Description      deregister an application.
-**
-** Returns          none.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gatts_deregister
+ *
+ * Description      deregister an application.
+ *
+ * Returns          none.
+ *
+ ******************************************************************************/
 void bta_gatts_deregister(tBTA_GATTS_CB *p_cb, tBTA_GATTS_DATA *p_msg)
 {
     tBTA_GATT_STATUS    status = BTA_GATT_ERROR;
@@ -317,14 +317,14 @@ void bta_gatts_deregister(tBTA_GATTS_CB *p_cb, tBTA_GATTS_DATA *p_msg)
 }
 
 /*******************************************************************************
-**
-** Function         bta_gatts_delete_service
-**
-** Description      action function to delete a service.
-**
-** Returns          none.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gatts_delete_service
+ *
+ * Description      action function to delete a service.
+ *
+ * Returns          none.
+ *
+ ******************************************************************************/
 void bta_gatts_delete_service(tBTA_GATTS_SRVC_CB *p_srvc_cb, tBTA_GATTS_DATA * p_msg)
 {
     tBTA_GATTS_RCB *p_rcb = &bta_gatts_cb.rcb[p_srvc_cb->rcb_idx];
@@ -351,14 +351,14 @@ void bta_gatts_delete_service(tBTA_GATTS_SRVC_CB *p_srvc_cb, tBTA_GATTS_DATA * p
 }
 
 /*******************************************************************************
-**
-** Function         bta_gatts_stop_service
-**
-** Description      action function to stop a service.
-**
-** Returns          none.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gatts_stop_service
+ *
+ * Description      action function to stop a service.
+ *
+ * Returns          none.
+ *
+ ******************************************************************************/
 void bta_gatts_stop_service(tBTA_GATTS_SRVC_CB *p_srvc_cb,
                             UNUSED_ATTR tBTA_GATTS_DATA *p_msg)
 {
@@ -376,14 +376,14 @@ void bta_gatts_stop_service(tBTA_GATTS_SRVC_CB *p_srvc_cb,
 
 }
 /*******************************************************************************
-**
-** Function         bta_gatts_send_rsp
-**
-** Description      GATTS send response.
-**
-** Returns          none.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gatts_send_rsp
+ *
+ * Description      GATTS send response.
+ *
+ * Returns          none.
+ *
+ ******************************************************************************/
 void bta_gatts_send_rsp (UNUSED_ATTR tBTA_GATTS_CB *p_cb, tBTA_GATTS_DATA * p_msg)
 {
     if (GATTS_SendRsp (p_msg->api_rsp.hdr.layer_specific,
@@ -396,14 +396,14 @@ void bta_gatts_send_rsp (UNUSED_ATTR tBTA_GATTS_CB *p_cb, tBTA_GATTS_DATA * p_ms
 
 }
 /*******************************************************************************
-**
-** Function         bta_gatts_indicate_handle
-**
-** Description      GATTS send handle value indication or notification.
-**
-** Returns          none.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gatts_indicate_handle
+ *
+ * Description      GATTS send handle value indication or notification.
+ *
+ * Returns          none.
+ *
+ ******************************************************************************/
 void bta_gatts_indicate_handle (tBTA_GATTS_CB *p_cb, tBTA_GATTS_DATA * p_msg)
 {
     tBTA_GATTS_SRVC_CB  *p_srvc_cb;
@@ -466,14 +466,14 @@ void bta_gatts_indicate_handle (tBTA_GATTS_CB *p_cb, tBTA_GATTS_DATA * p_msg)
 
 
 /*******************************************************************************
-**
-** Function         bta_gatts_open
-**
-** Description
-**
-** Returns          none.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gatts_open
+ *
+ * Description
+ *
+ * Returns          none.
+ *
+ ******************************************************************************/
 void bta_gatts_open (UNUSED_ATTR tBTA_GATTS_CB *p_cb, tBTA_GATTS_DATA * p_msg)
 {
     tBTA_GATTS_RCB      *p_rcb=NULL;
@@ -505,14 +505,14 @@ void bta_gatts_open (UNUSED_ATTR tBTA_GATTS_CB *p_cb, tBTA_GATTS_DATA * p_msg)
 
 }
 /*******************************************************************************
-**
-** Function         bta_gatts_cancel_open
-**
-** Description
-**
-** Returns          none.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gatts_cancel_open
+ *
+ * Description
+ *
+ * Returns          none.
+ *
+ ******************************************************************************/
 void bta_gatts_cancel_open (UNUSED_ATTR tBTA_GATTS_CB *p_cb, tBTA_GATTS_DATA * p_msg)
 {
     tBTA_GATTS_RCB      *p_rcb;
@@ -539,14 +539,14 @@ void bta_gatts_cancel_open (UNUSED_ATTR tBTA_GATTS_CB *p_cb, tBTA_GATTS_DATA * p
         (*p_rcb->p_cback)(BTA_GATTS_CANCEL_OPEN_EVT,  (tBTA_GATTS *)&status);
 }
 /*******************************************************************************
-**
-** Function         bta_gatts_close
-**
-** Description
-**
-** Returns          none.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gatts_close
+ *
+ * Description
+ *
+ * Returns          none.
+ *
+ ******************************************************************************/
 void bta_gatts_close (UNUSED_ATTR tBTA_GATTS_CB *p_cb, tBTA_GATTS_DATA * p_msg)
 {
     tBTA_GATTS_RCB     *p_rcb;
@@ -584,14 +584,14 @@ void bta_gatts_close (UNUSED_ATTR tBTA_GATTS_CB *p_cb, tBTA_GATTS_DATA * p_msg)
 }
 
 /*******************************************************************************
-**
-** Function         bta_gatts_request_cback
-**
-** Description      GATTS attribute request callback.
-**
-** Returns          none.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gatts_request_cback
+ *
+ * Description      GATTS attribute request callback.
+ *
+ * Returns          none.
+ *
+ ******************************************************************************/
 static void bta_gatts_send_request_cback (uint16_t conn_id,
                                           uint32_t trans_id,
                                           tGATTS_REQ_TYPE req_type, tGATTS_DATA *p_data)
@@ -637,14 +637,14 @@ static void bta_gatts_send_request_cback (uint16_t conn_id,
 }
 
 /*******************************************************************************
-**
-** Function         bta_gatts_conn_cback
-**
-** Description      connection callback.
-**
-** Returns          none.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gatts_conn_cback
+ *
+ * Description      connection callback.
+ *
+ * Returns          none.
+ *
+ ******************************************************************************/
 static void bta_gatts_conn_cback (tGATT_IF gatt_if, BD_ADDR bda, uint16_t conn_id,
                                   bool connected, tGATT_DISCONN_REASON reason,
                                   tGATT_TRANSPORT transport)
@@ -692,14 +692,14 @@ static void bta_gatts_conn_cback (tGATT_IF gatt_if, BD_ADDR bda, uint16_t conn_i
 }
 
 /*******************************************************************************
-**
-** Function         bta_gatts_cong_cback
-**
-** Description      congestion callback.
-**
-** Returns          none.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gatts_cong_cback
+ *
+ * Description      congestion callback.
+ *
+ * Returns          none.
+ *
+ ******************************************************************************/
 static void bta_gatts_cong_cback (uint16_t conn_id, bool congested)
 {
     tBTA_GATTS_RCB *p_rcb;
diff --git a/system/bta/gatt/bta_gatts_api.cc b/system/bta/gatt/bta_gatts_api.cc
index e1b066998e4..3b1cdd264d4 100644
--- a/system/bta/gatt/bta_gatts_api.cc
+++ b/system/bta/gatt/bta_gatts_api.cc
@@ -35,8 +35,8 @@
 void btif_to_bta_uuid(tBT_UUID *p_dest, const bt_uuid_t *p_src);
 
 /*****************************************************************************
-**  Constants
-*****************************************************************************/
+ *  Constants
+ ****************************************************************************/
 
 static const tBTA_SYS_REG bta_gatts_reg =
 {
@@ -45,16 +45,16 @@ static const tBTA_SYS_REG bta_gatts_reg =
 };
 
 /*******************************************************************************
-**
-** Function         BTA_GATTS_Disable
-**
-** Description      This function is called to disable GATTS module
-**
-** Parameters       None.
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTS_Disable
+ *
+ * Description      This function is called to disable GATTS module
+ *
+ * Parameters       None.
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 void BTA_GATTS_Disable(void)
 {
     if (bta_sys_is_register(BTA_ID_GATTS) == false)
@@ -70,18 +70,18 @@ void BTA_GATTS_Disable(void)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_GATTS_AppRegister
-**
-** Description      This function is called to register application callbacks
-**                    with BTA GATTS module.
-**
-** Parameters       p_app_uuid - applicaiton UUID
-**                  p_cback - pointer to the application callback function.
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTS_AppRegister
+ *
+ * Description      This function is called to register application callbacks
+ *                    with BTA GATTS module.
+ *
+ * Parameters       p_app_uuid - applicaiton UUID
+ *                  p_cback - pointer to the application callback function.
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 void BTA_GATTS_AppRegister(tBT_UUID *p_app_uuid, tBTA_GATTS_CBACK *p_cback)
 {
     tBTA_GATTS_API_REG *p_buf =
@@ -102,16 +102,16 @@ void BTA_GATTS_AppRegister(tBT_UUID *p_app_uuid, tBTA_GATTS_CBACK *p_cback)
 
 
 /*******************************************************************************
-**
-** Function         BTA_GATTS_AppDeregister
-**
-** Description      De-register with GATT Server.
-**
-** Parameters       app_id: applicatino ID.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTS_AppDeregister
+ *
+ * Description      De-register with GATT Server.
+ *
+ * Parameters       app_id: applicatino ID.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_GATTS_AppDeregister(tBTA_GATTS_IF server_if)
 {
     tBTA_GATTS_API_DEREG *p_buf =
@@ -124,20 +124,20 @@ void BTA_GATTS_AppDeregister(tBTA_GATTS_IF server_if)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_GATTS_AddService
-**
-** Description      Add the given |service| and all included elements to the
-**                  GATT database. a |BTA_GATTS_ADD_SRVC_EVT| is triggered to
-**                  report the status and attribute handles.
-**
-** Parameters       server_if: server interface.
-**                  service: pointer vector describing service.
-**
-** Returns          Returns |BTA_GATT_OK| on success or |BTA_GATT_ERROR| if the
-**                  service cannot be added.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTS_AddService
+ *
+ * Description      Add the given |service| and all included elements to the
+ *                  GATT database. a |BTA_GATTS_ADD_SRVC_EVT| is triggered to
+ *                  report the status and attribute handles.
+ *
+ * Parameters       server_if: server interface.
+ *                  service: pointer vector describing service.
+ *
+ * Returns          Returns |BTA_GATT_OK| on success or |BTA_GATT_ERROR| if the
+ *                  service cannot be added.
+ *
+ ******************************************************************************/
 extern uint16_t BTA_GATTS_AddService(tBTA_GATTS_IF server_if, vector<btgatt_db_element_t> &service)
 {
     uint8_t rcb_idx = bta_gatts_find_app_rcb_idx_by_app_if(&bta_gatts_cb, server_if);
@@ -169,17 +169,17 @@ extern uint16_t BTA_GATTS_AddService(tBTA_GATTS_IF server_if, vector<btgatt_db_e
 }
 
 /*******************************************************************************
-**
-** Function         BTA_GATTS_DeleteService
-**
-** Description      This function is called to delete a service. When this is done,
-**                  a callback event BTA_GATTS_DELETE_EVT is report with the status.
-**
-** Parameters       service_id: service_id to be deleted.
-**
-** Returns          returns none.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTS_DeleteService
+ *
+ * Description      This function is called to delete a service. When this is done,
+ *                  a callback event BTA_GATTS_DELETE_EVT is report with the status.
+ *
+ * Parameters       service_id: service_id to be deleted.
+ *
+ * Returns          returns none.
+ *
+ ******************************************************************************/
 void BTA_GATTS_DeleteService(uint16_t service_id)
 {
     BT_HDR *p_buf = (BT_HDR *)osi_malloc(sizeof(BT_HDR));
@@ -191,16 +191,16 @@ void BTA_GATTS_DeleteService(uint16_t service_id)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_GATTS_StopService
-**
-** Description      This function is called to stop a service.
-**
-** Parameters       service_id - service to be topped.
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTS_StopService
+ *
+ * Description      This function is called to stop a service.
+ *
+ * Parameters       service_id - service to be topped.
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 void BTA_GATTS_StopService(uint16_t service_id)
 {
     BT_HDR *p_buf = (BT_HDR *)osi_malloc(sizeof(BT_HDR));
@@ -212,19 +212,19 @@ void BTA_GATTS_StopService(uint16_t service_id)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_GATTS_HandleValueIndication
-**
-** Description      This function is called to read a characteristics descriptor.
-**
-** Parameters       bda - remote device bd address to indicate.
-**                  attr_id - attribute ID to indicate.
-**                  value - data to indicate.
-**                  need_confirm - if this indication expects a confirmation or not.
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTS_HandleValueIndication
+ *
+ * Description      This function is called to read a characteristics descriptor.
+ *
+ * Parameters       bda - remote device bd address to indicate.
+ *                  attr_id - attribute ID to indicate.
+ *                  value - data to indicate.
+ *                  need_confirm - if this indication expects a confirmation or not.
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 void BTA_GATTS_HandleValueIndication (uint16_t conn_id, uint16_t attr_id,
                                       std::vector<uint8_t> value, bool need_confirm)
 {
@@ -244,19 +244,19 @@ void BTA_GATTS_HandleValueIndication (uint16_t conn_id, uint16_t attr_id,
 }
 
 /*******************************************************************************
-**
-** Function         BTA_GATTS_SendRsp
-**
-** Description      This function is called to send a response to a request.
-**
-** Parameters       conn_id - connection identifier.
-**                  trans_id - transaction ID.
-**                  status - response status
-**                  p_msg - response data.
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTS_SendRsp
+ *
+ * Description      This function is called to send a response to a request.
+ *
+ * Parameters       conn_id - connection identifier.
+ *                  trans_id - transaction ID.
+ *                  status - response status
+ *                  p_msg - response data.
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 void BTA_GATTS_SendRsp (uint16_t conn_id, uint32_t trans_id,
                         tBTA_GATT_STATUS status, tBTA_GATTS_RSP *p_msg)
 {
@@ -276,20 +276,20 @@ void BTA_GATTS_SendRsp (uint16_t conn_id, uint32_t trans_id,
 }
 
 /*******************************************************************************
-**
-** Function         BTA_GATTS_Open
-**
-** Description      Open a direct open connection or add a background auto connection
-**                  bd address
-**
-** Parameters       server_if: server interface.
-**                  remote_bda: remote device BD address.
-**                  is_direct: direct connection or background auto connection
-**                  transport : Transport on which GATT connection to be opened (BR/EDR or LE)
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTS_Open
+ *
+ * Description      Open a direct open connection or add a background auto connection
+ *                  bd address
+ *
+ * Parameters       server_if: server interface.
+ *                  remote_bda: remote device BD address.
+ *                  is_direct: direct connection or background auto connection
+ *                  transport : Transport on which GATT connection to be opened (BR/EDR or LE)
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_GATTS_Open(tBTA_GATTS_IF server_if, BD_ADDR remote_bda, bool is_direct,
                     tBTA_GATT_TRANSPORT transport)
 {
@@ -306,19 +306,19 @@ void BTA_GATTS_Open(tBTA_GATTS_IF server_if, BD_ADDR remote_bda, bool is_direct,
 }
 
 /*******************************************************************************
-**
-** Function         BTA_GATTS_CancelOpen
-**
-** Description      Cancel a direct open connection or remove a background auto connection
-**                  bd address
-**
-** Parameters       server_if: server interface.
-**                  remote_bda: remote device BD address.
-**                  is_direct: direct connection or background auto connection
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTS_CancelOpen
+ *
+ * Description      Cancel a direct open connection or remove a background auto connection
+ *                  bd address
+ *
+ * Parameters       server_if: server interface.
+ *                  remote_bda: remote device BD address.
+ *                  is_direct: direct connection or background auto connection
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_GATTS_CancelOpen(tBTA_GATTS_IF server_if, BD_ADDR remote_bda, bool is_direct)
 {
     tBTA_GATTS_API_CANCEL_OPEN *p_buf =
@@ -333,16 +333,16 @@ void BTA_GATTS_CancelOpen(tBTA_GATTS_IF server_if, BD_ADDR remote_bda, bool is_d
 }
 
 /*******************************************************************************
-**
-** Function         BTA_GATTS_Close
-**
-** Description      Close a connection  a remote device.
-**
-** Parameters       conn_id: connectino ID to be closed.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTS_Close
+ *
+ * Description      Close a connection  a remote device.
+ *
+ * Parameters       conn_id: connectino ID to be closed.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_GATTS_Close(uint16_t conn_id)
 {
     BT_HDR *p_buf = (BT_HDR *)osi_malloc(sizeof(BT_HDR));
diff --git a/system/bta/gatt/bta_gatts_int.h b/system/bta/gatt/bta_gatts_int.h
index 23f3513c284..b6dfba1778a 100644
--- a/system/bta/gatt/bta_gatts_int.h
+++ b/system/bta/gatt/bta_gatts_int.h
@@ -32,8 +32,8 @@
 #include "bt_common.h"
 
 /*****************************************************************************
-**  Constants and data types
-*****************************************************************************/
+ *  Constants and data types
+ ****************************************************************************/
 enum
 {
     BTA_GATTS_API_REG_EVT  = BTA_SYS_EVT_START(BTA_ID_GATTS),
@@ -162,15 +162,15 @@ typedef struct
 
 
 /*****************************************************************************
-**  Global data
-*****************************************************************************/
+ *  Global data
+ ****************************************************************************/
 
 /* GATTC control block */
 extern tBTA_GATTS_CB  bta_gatts_cb;
 
 /*****************************************************************************
-**  Function prototypes
-*****************************************************************************/
+ *  Function prototypes
+ ****************************************************************************/
 extern bool bta_gatts_hdl_event(BT_HDR *p_msg);
 
 extern void bta_gatts_api_disable(tBTA_GATTS_CB *p_cb);
diff --git a/system/bta/gatt/bta_gatts_main.cc b/system/bta/gatt/bta_gatts_main.cc
index ceff956cbc9..f082267c35a 100644
--- a/system/bta/gatt/bta_gatts_main.cc
+++ b/system/bta/gatt/bta_gatts_main.cc
@@ -35,15 +35,15 @@
 tBTA_GATTS_CB  bta_gatts_cb;
 
 /*******************************************************************************
-**
-** Function         bta_gatts_hdl_event
-**
-** Description      BTA GATT server main event handling function.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_gatts_hdl_event
+ *
+ * Description      BTA GATT server main event handling function.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 bool bta_gatts_hdl_event(BT_HDR *p_msg)
 {
     tBTA_GATTS_CB *p_cb = &bta_gatts_cb;
diff --git a/system/bta/gatt/bta_gatts_utils.cc b/system/bta/gatt/bta_gatts_utils.cc
index 01752b2fd92..ce08f2c5313 100644
--- a/system/bta/gatt/bta_gatts_utils.cc
+++ b/system/bta/gatt/bta_gatts_utils.cc
@@ -36,14 +36,14 @@ static const uint8_t  base_uuid[LEN_UUID_128] = {0xFB, 0x34, 0x9B, 0x5F, 0x80, 0
     0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
 /*******************************************************************************
-**
-** Function         bta_gatt_convert_uuid16_to_uuid128
-**
-** Description      Convert a 16 bits UUID to be an standard 128 bits one.
-**
-** Returns          true if two uuid match; false otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gatt_convert_uuid16_to_uuid128
+ *
+ * Description      Convert a 16 bits UUID to be an standard 128 bits one.
+ *
+ * Returns          true if two uuid match; false otherwise.
+ *
+ ******************************************************************************/
 static void bta_gatt_convert_uuid16_to_uuid128(uint8_t uuid_128[LEN_UUID_128], uint16_t uuid_16)
 {
     uint8_t   *p = &uuid_128[LEN_UUID_128 - 4];
@@ -53,14 +53,14 @@ static void bta_gatt_convert_uuid16_to_uuid128(uint8_t uuid_128[LEN_UUID_128], u
     UINT16_TO_STREAM(p, uuid_16);
 }
 /*******************************************************************************
-**
-** Function         bta_gatts_alloc_srvc_cb
-**
-** Description      allocate a service control block.
-**
-** Returns          pointer to the control block, or otherwise NULL when failed.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gatts_alloc_srvc_cb
+ *
+ * Description      allocate a service control block.
+ *
+ * Returns          pointer to the control block, or otherwise NULL when failed.
+ *
+ ******************************************************************************/
 uint8_t bta_gatts_alloc_srvc_cb(tBTA_GATTS_CB *p_cb, uint8_t rcb_idx)
 {
     uint8_t i;
@@ -78,14 +78,14 @@ uint8_t bta_gatts_alloc_srvc_cb(tBTA_GATTS_CB *p_cb, uint8_t rcb_idx)
 }
 
 /*******************************************************************************
-**
-** Function         bta_gatts_find_app_rcb_by_app_if
-**
-** Description      find the index of the application control block by app ID.
-**
-** Returns          pointer to the control block if success, otherwise NULL
-**
-*******************************************************************************/
+ *
+ * Function         bta_gatts_find_app_rcb_by_app_if
+ *
+ * Description      find the index of the application control block by app ID.
+ *
+ * Returns          pointer to the control block if success, otherwise NULL
+ *
+ ******************************************************************************/
 tBTA_GATTS_RCB *bta_gatts_find_app_rcb_by_app_if(tBTA_GATTS_IF server_if)
 {
     uint8_t i;
@@ -100,14 +100,14 @@ tBTA_GATTS_RCB *bta_gatts_find_app_rcb_by_app_if(tBTA_GATTS_IF server_if)
 }
 
 /*******************************************************************************
-**
-** Function         bta_gatts_find_app_rcb_idx_by_app_if
-**
-** Description      find the index of the application control block by app ID.
-**
-** Returns          index of the control block, or BTA_GATTS_INVALID_APP if failed.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gatts_find_app_rcb_idx_by_app_if
+ *
+ * Description      find the index of the application control block by app ID.
+ *
+ * Returns          index of the control block, or BTA_GATTS_INVALID_APP if failed.
+ *
+ ******************************************************************************/
 
 uint8_t bta_gatts_find_app_rcb_idx_by_app_if(tBTA_GATTS_CB *p_cb, tBTA_GATTS_IF server_if)
 {
@@ -121,14 +121,14 @@ uint8_t bta_gatts_find_app_rcb_idx_by_app_if(tBTA_GATTS_CB *p_cb, tBTA_GATTS_IF
     return BTA_GATTS_INVALID_APP;
 }
 /*******************************************************************************
-**
-** Function         bta_gatts_find_srvc_cb_by_srvc_id
-**
-** Description      find the service control block by service ID.
-**
-** Returns          pointer to the rcb.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gatts_find_srvc_cb_by_srvc_id
+ *
+ * Description      find the service control block by service ID.
+ *
+ * Returns          pointer to the rcb.
+ *
+ ******************************************************************************/
 tBTA_GATTS_SRVC_CB * bta_gatts_find_srvc_cb_by_srvc_id(tBTA_GATTS_CB *p_cb, uint16_t service_id)
 {
     uint8_t i;
@@ -145,14 +145,14 @@ tBTA_GATTS_SRVC_CB * bta_gatts_find_srvc_cb_by_srvc_id(tBTA_GATTS_CB *p_cb, uint
     return NULL;
 }
 /*******************************************************************************
-**
-** Function         bta_gatts_find_srvc_cb_by_attr_id
-**
-** Description      find the service control block by attribute ID.
-**
-** Returns          pointer to the rcb.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gatts_find_srvc_cb_by_attr_id
+ *
+ * Description      find the service control block by attribute ID.
+ *
+ * Returns          pointer to the rcb.
+ *
+ ******************************************************************************/
 tBTA_GATTS_SRVC_CB * bta_gatts_find_srvc_cb_by_attr_id(tBTA_GATTS_CB *p_cb, uint16_t attr_id)
 {
     uint8_t i;
@@ -181,14 +181,14 @@ tBTA_GATTS_SRVC_CB * bta_gatts_find_srvc_cb_by_attr_id(tBTA_GATTS_CB *p_cb, uint
     return NULL;
 }
 /*******************************************************************************
-**
-** Function         bta_gatts_uuid_compare
-**
-** Description      Compare two UUID to see if they are the same.
-**
-** Returns          true if two uuid match; false otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gatts_uuid_compare
+ *
+ * Description      Compare two UUID to see if they are the same.
+ *
+ * Returns          true if two uuid match; false otherwise.
+ *
+ ******************************************************************************/
 bool bta_gatts_uuid_compare(tBT_UUID tar, tBT_UUID src)
 {
     uint8_t  su[LEN_UUID_128], tu[LEN_UUID_128];
diff --git a/system/bta/hf_client/bta_hf_client_act.cc b/system/bta/hf_client/bta_hf_client_act.cc
index 64dfdd324f9..2ef22a5e3e3 100644
--- a/system/bta/hf_client/bta_hf_client_act.cc
+++ b/system/bta/hf_client/bta_hf_client_act.cc
@@ -37,23 +37,23 @@
 #include <string.h>
 
 /*****************************************************************************
-**  Constants
-*****************************************************************************/
+ *  Constants
+ ****************************************************************************/
 
 /* maximum length of data to read from RFCOMM */
 #define BTA_HF_CLIENT_RFC_READ_MAX     512
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_register
-**
-** Description      This function initializes values of the scb and sets up
-**                  the SDP record for the services.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_register
+ *
+ * Description      This function initializes values of the scb and sets up
+ *                  the SDP record for the services.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_register(tBTA_HF_CLIENT_DATA *p_data)
 {
     tBTA_HF_CLIENT evt;
@@ -86,16 +86,16 @@ void bta_hf_client_register(tBTA_HF_CLIENT_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_deregister
-**
-** Description      This function removes the sdp records, closes the RFCOMM
-**                  servers, and deallocates the service control block.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_deregister
+ *
+ * Description      This function removes the sdp records, closes the RFCOMM
+ *                  servers, and deallocates the service control block.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_deregister(tBTA_HF_CLIENT_DATA *p_data)
 {
     bta_hf_client_cb.scb.deregister = true;
@@ -111,15 +111,15 @@ void bta_hf_client_deregister(tBTA_HF_CLIENT_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_start_dereg
-**
-** Description      Start a deregister event.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_start_dereg
+ *
+ * Description      Start a deregister event.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_start_dereg(tBTA_HF_CLIENT_DATA *p_data)
 {
     bta_hf_client_cb.scb.deregister = true;
@@ -129,15 +129,15 @@ void bta_hf_client_start_dereg(tBTA_HF_CLIENT_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_start_close
-**
-** Description      Start the process of closing SCO and RFCOMM connection.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_start_close
+ *
+ * Description      Start the process of closing SCO and RFCOMM connection.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_start_close(tBTA_HF_CLIENT_DATA *p_data)
 {
     /* Take the link out of sniff and set L2C idle time to 0 */
@@ -159,15 +159,15 @@ void bta_hf_client_start_close(tBTA_HF_CLIENT_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_start_open
-**
-** Description      This starts an HF Client open.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_start_open
+ *
+ * Description      This starts an HF Client open.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_start_open(tBTA_HF_CLIENT_DATA *p_data)
 {
     BD_ADDR pending_bd_addr;
@@ -200,15 +200,15 @@ void bta_hf_client_start_open(tBTA_HF_CLIENT_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_cback_open
-**
-** Description      Send open callback event to application.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_cback_open
+ *
+ * Description      Send open callback event to application.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_hf_client_cback_open(tBTA_HF_CLIENT_DATA *p_data, tBTA_HF_CLIENT_STATUS status)
 {
     tBTA_HF_CLIENT evt;
@@ -231,15 +231,15 @@ static void bta_hf_client_cback_open(tBTA_HF_CLIENT_DATA *p_data, tBTA_HF_CLIENT
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_rfc_open
-**
-** Description      Handle RFCOMM channel open.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_rfc_open
+ *
+ * Description      Handle RFCOMM channel open.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_rfc_open(UNUSED_ATTR tBTA_HF_CLIENT_DATA *p_data)
 {
     bta_sys_conn_open(BTA_ID_HS, 1, bta_hf_client_cb.scb.peer_addr);
@@ -251,15 +251,15 @@ void bta_hf_client_rfc_open(UNUSED_ATTR tBTA_HF_CLIENT_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_rfc_acp_open
-**
-** Description      Handle RFCOMM channel open when accepting connection.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_rfc_acp_open
+ *
+ * Description      Handle RFCOMM channel open when accepting connection.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_rfc_acp_open(tBTA_HF_CLIENT_DATA *p_data)
 {
     uint16_t          lcid;
@@ -305,15 +305,15 @@ void bta_hf_client_rfc_acp_open(tBTA_HF_CLIENT_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_rfc_fail
-**
-** Description      RFCOMM connection failed.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_rfc_fail
+ *
+ * Description      RFCOMM connection failed.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_rfc_fail(UNUSED_ATTR tBTA_HF_CLIENT_DATA *p_data)
 {
     /* reinitialize stuff */
@@ -335,15 +335,15 @@ void bta_hf_client_rfc_fail(UNUSED_ATTR tBTA_HF_CLIENT_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_disc_fail
-**
-** Description      This function handles a discovery failure.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_disc_fail
+ *
+ * Description      This function handles a discovery failure.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_disc_fail(UNUSED_ATTR tBTA_HF_CLIENT_DATA *p_data)
 {
     /* reopen server */
@@ -356,15 +356,15 @@ void bta_hf_client_disc_fail(UNUSED_ATTR tBTA_HF_CLIENT_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_open_fail
-**
-** Description      open connection failed.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_open_fail
+ *
+ * Description      open connection failed.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_open_fail(tBTA_HF_CLIENT_DATA *p_data)
 {
     /* call open cback w. failure */
@@ -372,15 +372,15 @@ void bta_hf_client_open_fail(tBTA_HF_CLIENT_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_rfc_close
-**
-** Description      RFCOMM connection closed.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_rfc_close
+ *
+ * Description      RFCOMM connection closed.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_rfc_close(UNUSED_ATTR tBTA_HF_CLIENT_DATA *p_data)
 {
     /* reinitialize stuff */
@@ -423,15 +423,15 @@ void bta_hf_client_rfc_close(UNUSED_ATTR tBTA_HF_CLIENT_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_disc_int_res
-**
-** Description      This function handles a discovery result when initiator.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_disc_int_res
+ *
+ * Description      This function handles a discovery result when initiator.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_disc_int_res(tBTA_HF_CLIENT_DATA *p_data)
 {
     uint16_t event = BTA_HF_CLIENT_DISC_FAIL_EVT;
@@ -457,15 +457,15 @@ void bta_hf_client_disc_int_res(tBTA_HF_CLIENT_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_disc_acp_res
-**
-** Description      This function handles a discovery result when acceptor.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_disc_acp_res
+ *
+ * Description      This function handles a discovery result when acceptor.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_disc_acp_res(tBTA_HF_CLIENT_DATA *p_data)
 {
     /* if found service */
@@ -481,15 +481,15 @@ void bta_hf_client_disc_acp_res(tBTA_HF_CLIENT_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_rfc_data
-**
-** Description      Read and process data from RFCOMM.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_rfc_data
+ *
+ * Description      Read and process data from RFCOMM.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_rfc_data(UNUSED_ATTR tBTA_HF_CLIENT_DATA *p_data)
 {
     uint16_t  len;
@@ -517,15 +517,15 @@ void bta_hf_client_rfc_data(UNUSED_ATTR tBTA_HF_CLIENT_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_svc_conn_open
-**
-** Description      Service level connection opened
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_svc_conn_open
+ *
+ * Description      Service level connection opened
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_svc_conn_open(UNUSED_ATTR tBTA_HF_CLIENT_DATA *p_data)
 {
     tBTA_HF_CLIENT evt;
@@ -546,14 +546,14 @@ void bta_hf_client_svc_conn_open(UNUSED_ATTR tBTA_HF_CLIENT_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_cback_ind
-**
-** Description      Send indicator callback event to application.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_cback_ind
+ *
+ * Description      Send indicator callback event to application.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_ind(tBTA_HF_CLIENT_IND_TYPE type, uint16_t value)
 {
     tBTA_HF_CLIENT evt;
@@ -567,16 +567,16 @@ void bta_hf_client_ind(tBTA_HF_CLIENT_IND_TYPE type, uint16_t value)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_evt_val
-**
-** Description      Send event to application.
-**                  This is a generic helper for events with common data.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_evt_val
+ *
+ * Description      Send event to application.
+ *                  This is a generic helper for events with common data.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_evt_val(tBTA_HF_CLIENT_EVT type, uint16_t value)
 {
     tBTA_HF_CLIENT evt;
@@ -589,15 +589,15 @@ void bta_hf_client_evt_val(tBTA_HF_CLIENT_EVT type, uint16_t value)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_operator_name
-**
-** Description      Send operator name event to application.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_operator_name
+ *
+ * Description      Send operator name event to application.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_operator_name(char *name)
 {
     tBTA_HF_CLIENT evt;
@@ -612,15 +612,15 @@ void bta_hf_client_operator_name(char *name)
 
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_clip
-**
-** Description      Send CLIP event to application.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_clip
+ *
+ * Description      Send CLIP event to application.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_clip(char *number)
 {
     tBTA_HF_CLIENT evt;
@@ -634,15 +634,15 @@ void bta_hf_client_clip(char *number)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_ccwa
-**
-** Description      Send CLIP event to application.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_ccwa
+ *
+ * Description      Send CLIP event to application.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_ccwa(char *number)
 {
     tBTA_HF_CLIENT evt;
@@ -656,15 +656,15 @@ void bta_hf_client_ccwa(char *number)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_at_result
-**
-** Description      Send AT result event to application.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_at_result
+ *
+ * Description      Send AT result event to application.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_at_result(tBTA_HF_CLIENT_AT_RESULT_TYPE type, uint16_t cme)
 {
     tBTA_HF_CLIENT evt;
@@ -678,15 +678,15 @@ void bta_hf_client_at_result(tBTA_HF_CLIENT_AT_RESULT_TYPE type, uint16_t cme)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_clcc
-**
-** Description      Send clcc event to application.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_clcc
+ *
+ * Description      Send clcc event to application.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_clcc(uint32_t idx, bool incoming, uint8_t status, bool mpty, char *number)
 {
     tBTA_HF_CLIENT evt;
@@ -709,15 +709,15 @@ void bta_hf_client_clcc(uint32_t idx, bool incoming, uint8_t status, bool mpty,
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_cnum
-**
-** Description      Send cnum event to application.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_cnum
+ *
+ * Description      Send cnum event to application.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_cnum(char *number, uint16_t service)
 {
     tBTA_HF_CLIENT evt;
@@ -732,15 +732,15 @@ void bta_hf_client_cnum(char *number, uint16_t service)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_binp
-**
-** Description      Send BINP event to application.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_binp
+ *
+ * Description      Send BINP event to application.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_binp(char *number)
 {
     tBTA_HF_CLIENT evt;
diff --git a/system/bta/hf_client/bta_hf_client_api.cc b/system/bta/hf_client/bta_hf_client_api.cc
index 5d7773c0582..cb4396cb3b2 100644
--- a/system/bta/hf_client/bta_hf_client_api.cc
+++ b/system/bta/hf_client/bta_hf_client_api.cc
@@ -30,8 +30,8 @@
 #include "osi/include/compat.h"
 
 /*****************************************************************************
-**  Constants and data types
-*****************************************************************************/
+ *  Constants and data types
+ ****************************************************************************/
 static const tBTA_SYS_REG bta_hf_client_reg =
 {
     bta_hf_client_hdl_event,
@@ -40,22 +40,22 @@ static const tBTA_SYS_REG bta_hf_client_reg =
 
 
 /*****************************************************************************
-**  External Function Declarations
-*****************************************************************************/
+ *  External Function Declarations
+ ****************************************************************************/
 
 /*******************************************************************************
-**
-** Function         BTA_HfClientEnable
-**
-** Description      Enable the HF CLient service. When the enable
-**                  operation is complete the callback function will be
-**                  called with a BTA_HF_CLIENT_ENABLE_EVT. This function must
-**                  be called before other function in the HF CLient API are
-**                  called.
-**
-** Returns          BTA_SUCCESS if OK, BTA_FAILURE otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HfClientEnable
+ *
+ * Description      Enable the HF CLient service. When the enable
+ *                  operation is complete the callback function will be
+ *                  called with a BTA_HF_CLIENT_ENABLE_EVT. This function must
+ *                  be called before other function in the HF CLient API are
+ *                  called.
+ *
+ * Returns          BTA_SUCCESS if OK, BTA_FAILURE otherwise.
+ *
+ ******************************************************************************/
 tBTA_STATUS BTA_HfClientEnable(tBTA_HF_CLIENT_CBACK *p_cback)
 {
     if (bta_sys_is_register (BTA_ID_HS))
@@ -78,15 +78,15 @@ tBTA_STATUS BTA_HfClientEnable(tBTA_HF_CLIENT_CBACK *p_cback)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_HfClientDisable
-**
-** Description      Disable the HF Client service
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HfClientDisable
+ *
+ * Description      Disable the HF Client service
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HfClientDisable(void)
 {
     BT_HDR *p_buf = (BT_HDR *)osi_malloc(sizeof(BT_HDR));
@@ -97,15 +97,15 @@ void BTA_HfClientDisable(void)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_HfClientRegister
-**
-** Description      Register an HF Client service.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HfClientRegister
+ *
+ * Description      Register an HF Client service.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HfClientRegister(tBTA_SEC sec_mask, tBTA_HF_CLIENT_FEAT features,
                           const char *p_service_name)
 {
@@ -124,15 +124,15 @@ void BTA_HfClientRegister(tBTA_SEC sec_mask, tBTA_HF_CLIENT_FEAT features,
 }
 
 /*******************************************************************************
-**
-** Function         BTA_HfClientDeregister
-**
-** Description      Deregister an HF Client service.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HfClientDeregister
+ *
+ * Description      Deregister an HF Client service.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HfClientDeregister(uint16_t handle)
 {
     BT_HDR *p_buf = (BT_HDR *)osi_malloc(sizeof(BT_HDR));
@@ -144,18 +144,18 @@ void BTA_HfClientDeregister(uint16_t handle)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_HfClientOpen
-**
-** Description      Opens a connection to an audio gateway.
-**                  When connection is open callback function is called
-**                  with a BTA_AG_OPEN_EVT. Only the data connection is
-**                  opened. The audio connection is not opened.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HfClientOpen
+ *
+ * Description      Opens a connection to an audio gateway.
+ *                  When connection is open callback function is called
+ *                  with a BTA_AG_OPEN_EVT. Only the data connection is
+ *                  opened. The audio connection is not opened.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HfClientOpen(uint16_t handle, BD_ADDR bd_addr, tBTA_SEC sec_mask)
 {
     tBTA_HF_CLIENT_API_OPEN *p_buf =
@@ -170,16 +170,16 @@ void BTA_HfClientOpen(uint16_t handle, BD_ADDR bd_addr, tBTA_SEC sec_mask)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_HfClientClose
-**
-** Description      Close the current connection to an audio gateway.
-**                  Any current audio connection will also be closed
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HfClientClose
+ *
+ * Description      Close the current connection to an audio gateway.
+ *                  Any current audio connection will also be closed
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HfClientClose(uint16_t handle)
 {
     BT_HDR *p_buf = (BT_HDR *)osi_malloc(sizeof(BT_HDR));
@@ -191,16 +191,16 @@ void BTA_HfClientClose(uint16_t handle)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_HfCllientAudioOpen
-**
-** Description      Opens an audio connection to the currently connected
-**                 audio gateway
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HfCllientAudioOpen
+ *
+ * Description      Opens an audio connection to the currently connected
+ *                 audio gateway
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HfClientAudioOpen(uint16_t handle)
 {
     BT_HDR *p_buf = (BT_HDR *)osi_malloc(sizeof(BT_HDR));
@@ -212,16 +212,16 @@ void BTA_HfClientAudioOpen(uint16_t handle)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_HfClientAudioClose
-**
-** Description      Close the currently active audio connection to an audio
-**                  gateway. The data connection remains open
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HfClientAudioClose
+ *
+ * Description      Close the currently active audio connection to an audio
+ *                  gateway. The data connection remains open
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HfClientAudioClose(uint16_t handle)
 {
     BT_HDR *p_buf = (BT_HDR *)osi_malloc(sizeof(BT_HDR));
@@ -233,15 +233,15 @@ void BTA_HfClientAudioClose(uint16_t handle)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_HfClientSendAT
-**
-** Description      send AT command
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HfClientSendAT
+ *
+ * Description      send AT command
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HfClientSendAT(uint16_t handle, tBTA_HF_CLIENT_AT_CMD_TYPE at, uint32_t val1, uint32_t val2, const char *str)
 {
     tBTA_HF_CLIENT_DATA_VAL *p_buf =
diff --git a/system/bta/hf_client/bta_hf_client_at.cc b/system/bta/hf_client/bta_hf_client_at.cc
index e565a6065f6..03f31d06ef0 100644
--- a/system/bta/hf_client/bta_hf_client_at.cc
+++ b/system/bta/hf_client/bta_hf_client_at.cc
@@ -42,18 +42,18 @@
 #define BTA_HF_CLIENT_AT_HOLD_TIMEOUT 41
 
 /******************************************************************************
-**
-**          DATA TYPES AND CONTAINERS
-**
-*******************************************************************************/
+ *
+ *          DATA TYPES AND CONTAINERS
+ *
+ ******************************************************************************/
 /* BRSF: store received values here */
 extern tBTA_HF_CLIENT_CB  bta_hf_client_cb;
 
 extern fixed_queue_t *btu_bta_alarm_queue;
 
 /******************************************************************************
-**       SUPPORTED EVENT MESSAGES
-*******************************************************************************/
+ *       SUPPORTED EVENT MESSAGES
+ ******************************************************************************/
 
 /* CIND: supported indicator names */
 #define BTA_HF_CLIENT_INDICATOR_BATTERYCHG  "battchg"
@@ -238,12 +238,12 @@ static void bta_hf_client_start_at_hold_timer(void)
 }
 
 /******************************************************************************
-**
-**          COMMON AT EVENT HANDLING funcS
-**
-**   Receives data (strings, ints, etc.) from the parser and processes this data.
-**   No buffer parsing is being done here.
-*******************************************************************************/
+ *
+ *          COMMON AT EVENT HANDLING funcS
+ *
+ *   Receives data (strings, ints, etc.) from the parser and processes this data.
+ *   No buffer parsing is being done here.
+ ******************************************************************************/
 
 static void bta_hf_client_handle_ok()
 {
@@ -577,10 +577,10 @@ static void bta_hf_client_handle_btrh( uint16_t code)
 }
 
 /******************************************************************************
-**
-**          COMMON AT EVENTS PARSING FUNCTIONS
-**
-*******************************************************************************/
+ *
+ *          COMMON AT EVENTS PARSING FUNCTIONS
+ *
+ ******************************************************************************/
 
 /* Check if prefix match and skip spaces if any */
 #define AT_CHECK_EVENT(buf, event) \
@@ -1300,8 +1300,8 @@ static char *bta_hf_client_skip_unknown(char *buffer)
 
 
 /******************************************************************************
-**       SUPPORTED EVENT MESSAGES
-*******************************************************************************/
+ *       SUPPORTED EVENT MESSAGES
+ ******************************************************************************/
 
 /* returned values are as follow:
  * != NULL && != buf  : match and parsed ok
@@ -1453,11 +1453,11 @@ static void bta_hf_client_at_clear_buf(void)
 }
 
 /******************************************************************************
-**
-**          MAIN PARSING FUNCTION
-**
-**
-*******************************************************************************/
+ *
+ *          MAIN PARSING FUNCTION
+ *
+ *
+ ******************************************************************************/
 void bta_hf_client_at_parse(char *buf, unsigned int len)
 {
     APPL_TRACE_DEBUG("%s offset: %u len: %u", __func__, bta_hf_client_cb.scb.at_cb.offset, len);
diff --git a/system/bta/hf_client/bta_hf_client_at.h b/system/bta/hf_client/bta_hf_client_at.h
index ad101359171..a336cc8945a 100644
--- a/system/bta/hf_client/bta_hf_client_at.h
+++ b/system/bta/hf_client/bta_hf_client_at.h
@@ -18,8 +18,8 @@
  ******************************************************************************/
 
 /*****************************************************************************
-**  Data types
-*****************************************************************************/
+ *  Data types
+ ****************************************************************************/
 
 /* ASCII character string of arguments to the AT command */
 #define BTA_HF_CLIENT_AT_MAX_LEN        512
@@ -106,8 +106,8 @@ typedef struct
 } tBTA_HF_CLIENT_AT_CB;
 
 /*****************************************************************************
-**  Functions
-*****************************************************************************/
+ *  Functions
+ ****************************************************************************/
 
 void bta_hf_client_at_init(void);
 void bta_hf_client_at_reset(void);
diff --git a/system/bta/hf_client/bta_hf_client_int.h b/system/bta/hf_client/bta_hf_client_int.h
index cc8c55d1e1b..45ce5f11a89 100644
--- a/system/bta/hf_client/bta_hf_client_int.h
+++ b/system/bta/hf_client/bta_hf_client_int.h
@@ -23,8 +23,8 @@
 #include "bta_hf_client_at.h"
 
 /*****************************************************************************
-**  Constants
-*****************************************************************************/
+ *  Constants
+ ****************************************************************************/
 #define HFP_VERSION_1_1         0x0101
 #define HFP_VERSION_1_5         0x0105
 #define HFP_VERSION_1_6         0x0106
@@ -69,8 +69,8 @@ enum
 };
 
 /*****************************************************************************
-**  Data types
-*****************************************************************************/
+ *  Data types
+ ****************************************************************************/
 
 /* data type for BTA_HF_CLIENT_API_ENABLE_EVT */
 typedef struct
@@ -187,15 +187,15 @@ typedef struct
 } tBTA_HF_CLIENT_CB;
 
 /*****************************************************************************
-**  Global data
-*****************************************************************************/
+ *  Global data
+ ****************************************************************************/
 
 /* control block declaration */
 extern tBTA_HF_CLIENT_CB bta_hf_client_cb;
 
 /*****************************************************************************
-**  Function prototypes
-*****************************************************************************/
+ *  Function prototypes
+ ****************************************************************************/
 
 /* main functions */
 extern void bta_hf_client_scb_init(void);
diff --git a/system/bta/hf_client/bta_hf_client_main.cc b/system/bta/hf_client/bta_hf_client_main.cc
index 7c1b352ade2..af9589a0777 100644
--- a/system/bta/hf_client/bta_hf_client_main.cc
+++ b/system/bta/hf_client/bta_hf_client_main.cc
@@ -230,15 +230,15 @@ const tBTA_HF_CLIENT_ST_TBL bta_hf_client_st_tbl[] =
 tBTA_HF_CLIENT_CB  bta_hf_client_cb;
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_scb_init
-**
-** Description      Initialize an HF_Client service control block.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_scb_init
+ *
+ * Description      Initialize an HF_Client service control block.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_scb_init(void)
 {
     APPL_TRACE_DEBUG("%s", __func__);
@@ -254,15 +254,15 @@ void bta_hf_client_scb_init(void)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_scb_disable
-**
-** Description      Disable a service control block.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_scb_disable
+ *
+ * Description      Disable a service control block.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_scb_disable(void)
 {
     APPL_TRACE_DEBUG("%s", __func__);
@@ -273,15 +273,15 @@ void bta_hf_client_scb_disable(void)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_resume_open
-**
-** Description      Resume opening process.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_resume_open
+ *
+ * Description      Resume opening process.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_resume_open (void)
 {
     APPL_TRACE_DEBUG ("%s", __func__);
@@ -295,15 +295,15 @@ void bta_hf_client_resume_open (void)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_collision_timer_cback
-**
-** Description      HF Client connection collision timer callback
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_collision_timer_cback
+ *
+ * Description      HF Client connection collision timer callback
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_hf_client_collision_timer_cback(UNUSED_ATTR void *data)
 {
     APPL_TRACE_DEBUG("%s", __func__);
@@ -313,15 +313,15 @@ static void bta_hf_client_collision_timer_cback(UNUSED_ATTR void *data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_collision_cback
-**
-** Description      Get notified about collision.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_collision_cback
+ *
+ * Description      Get notified about collision.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_collision_cback (UNUSED_ATTR tBTA_SYS_CONN_STATUS status, uint8_t id,
                                     UNUSED_ATTR uint8_t app_id,
                                     UNUSED_ATTR BD_ADDR peer_addr)
@@ -364,15 +364,15 @@ void bta_hf_client_collision_cback (UNUSED_ATTR tBTA_SYS_CONN_STATUS status, uin
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_api_enable
-**
-** Description      Handle an API enable event.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_api_enable
+ *
+ * Description      Handle an API enable event.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_hf_client_api_enable(tBTA_HF_CLIENT_DATA *p_data)
 {
     char value[PROPERTY_VALUE_MAX];
@@ -402,15 +402,15 @@ static void bta_hf_client_api_enable(tBTA_HF_CLIENT_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_api_disable
-**
-** Description      Handle an API disable event.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_api_disable
+ *
+ * Description      Handle an API disable event.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_hf_client_api_disable(tBTA_HF_CLIENT_DATA *p_data)
 {
     if (!bta_sys_is_register (BTA_ID_HS))
@@ -428,15 +428,15 @@ static void bta_hf_client_api_disable(tBTA_HF_CLIENT_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_hdl_event
-**
-** Description      Data HF Client main event handling function.
-**
-**
-** Returns          bool
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_hdl_event
+ *
+ * Description      Data HF Client main event handling function.
+ *
+ *
+ * Returns          bool
+ *
+ ******************************************************************************/
 bool bta_hf_client_hdl_event(BT_HDR *p_msg)
 {
 #if (BTA_HF_CLIENT_DEBUG == TRUE)
@@ -463,15 +463,15 @@ bool bta_hf_client_hdl_event(BT_HDR *p_msg)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_sm_execute
-**
-** Description      State machine event handling function for HF Client
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_sm_execute
+ *
+ * Description      State machine event handling function for HF Client
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_sm_execute(uint16_t event, tBTA_HF_CLIENT_DATA *p_data)
 {
     tBTA_HF_CLIENT_ST_TBL      state_table;
@@ -542,15 +542,15 @@ static void send_post_slc_cmd(void)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_slc_seq
-**
-** Description      Handles AT commands sequence required for SLC creation
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_slc_seq
+ *
+ * Description      Handles AT commands sequence required for SLC creation
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_slc_seq(bool error)
 {
     APPL_TRACE_DEBUG("bta_hf_client_slc_seq cmd: %u", bta_hf_client_cb.scb.at_cb.current_cmd);
diff --git a/system/bta/hf_client/bta_hf_client_rfc.cc b/system/bta/hf_client/bta_hf_client_rfc.cc
index 4dfb9b8ab4a..864e5d4806d 100644
--- a/system/bta/hf_client/bta_hf_client_rfc.cc
+++ b/system/bta/hf_client/bta_hf_client_rfc.cc
@@ -32,15 +32,15 @@
 #include "bt_utils.h"
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_port_cback
-**
-** Description      RFCOMM Port callback
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_port_cback
+ *
+ * Description      RFCOMM Port callback
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_hf_client_port_cback(UNUSED_ATTR uint32_t code, uint16_t port_handle)
 {
     /* ignore port events for port handles other than connected handle */
@@ -58,15 +58,15 @@ static void bta_hf_client_port_cback(UNUSED_ATTR uint32_t code, uint16_t port_ha
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_mgmt_cback
-**
-** Description      RFCOMM management callback
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_mgmt_cback
+ *
+ * Description      RFCOMM management callback
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_hf_client_mgmt_cback(uint32_t code, uint16_t port_handle)
 {
     uint16_t                  event;
@@ -113,15 +113,15 @@ static void bta_hf_client_mgmt_cback(uint32_t code, uint16_t port_handle)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_setup_port
-**
-** Description      Setup RFCOMM port for use by HF Client.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_setup_port
+ *
+ * Description      Setup RFCOMM port for use by HF Client.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_setup_port(uint16_t handle)
 {
     PORT_SetEventMask(handle, PORT_EV_RXCHAR);
@@ -129,15 +129,15 @@ void bta_hf_client_setup_port(uint16_t handle)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_start_server
-**
-** Description      Setup RFCOMM server for use by HF Client.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_start_server
+ *
+ * Description      Setup RFCOMM server for use by HF Client.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_start_server(void)
 {
     int port_status;
@@ -169,15 +169,15 @@ void bta_hf_client_start_server(void)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_close_server
-**
-** Description      Close RFCOMM server port for use by HF Client.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_close_server
+ *
+ * Description      Close RFCOMM server port for use by HF Client.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_close_server(void)
 {
     APPL_TRACE_DEBUG("%s %d", __func__, bta_hf_client_cb.scb.serv_handle);
@@ -193,15 +193,15 @@ void bta_hf_client_close_server(void)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_rfc_do_open
-**
-** Description      Open an RFCOMM connection to the peer device.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_rfc_do_open
+ *
+ * Description      Open an RFCOMM connection to the peer device.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_rfc_do_open(tBTA_HF_CLIENT_DATA *p_data)
 {
     BTM_SetSecurityLevel(true, "", BTM_SEC_SERVICE_HF_HANDSFREE,
@@ -223,15 +223,15 @@ void bta_hf_client_rfc_do_open(tBTA_HF_CLIENT_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_rfc_do_close
-**
-** Description      Close RFCOMM connection.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_rfc_do_close
+ *
+ * Description      Close RFCOMM connection.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_rfc_do_close(UNUSED_ATTR tBTA_HF_CLIENT_DATA *p_data)
 {
     if (bta_hf_client_cb.scb.conn_handle) {
diff --git a/system/bta/hf_client/bta_hf_client_sco.cc b/system/bta/hf_client/bta_hf_client_sco.cc
index f9b9825808a..567ebfda6d7 100644
--- a/system/bta/hf_client/bta_hf_client_sco.cc
+++ b/system/bta/hf_client/bta_hf_client_sco.cc
@@ -80,15 +80,15 @@ enum
 };
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_remove_sco
-**
-** Description      Removes the specified SCO from the system.
-**                  If only_active is true, then SCO is only removed if connected
-**
-** Returns          bool   - true if Sco removal was started
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_remove_sco
+ *
+ * Description      Removes the specified SCO from the system.
+ *                  If only_active is true, then SCO is only removed if connected
+ *
+ * Returns          bool   - true if Sco removal was started
+ *
+ ******************************************************************************/
 static bool bta_hf_client_sco_remove(bool only_active)
 {
     bool     removed_started = false;
@@ -116,15 +116,15 @@ static bool bta_hf_client_sco_remove(bool only_active)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_cback_sco
-**
-** Description      Call application callback function with SCO event.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_cback_sco
+ *
+ * Description      Call application callback function with SCO event.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_cback_sco(uint8_t event)
 {
     tBTA_HF_CLIENT    evt;
@@ -136,15 +136,15 @@ void bta_hf_client_cback_sco(uint8_t event)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_sco_conn_rsp
-**
-** Description      Process the SCO connection request
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_sco_conn_rsp
+ *
+ * Description      Process the SCO connection request
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_hf_client_sco_conn_rsp(tBTM_ESCO_CONN_REQ_EVT_DATA *p_data)
 {
     tBTM_ESCO_PARAMS    resp;
@@ -175,15 +175,15 @@ static void bta_hf_client_sco_conn_rsp(tBTM_ESCO_CONN_REQ_EVT_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_sco_connreq_cback
-**
-** Description      BTM eSCO connection requests and eSCO change requests
-**                  Only the connection requests are processed by BTA.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_sco_connreq_cback
+ *
+ * Description      BTM eSCO connection requests and eSCO change requests
+ *                  Only the connection requests are processed by BTA.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_hf_client_esco_connreq_cback(tBTM_ESCO_EVT event, tBTM_ESCO_EVT_DATA *p_data)
 {
     APPL_TRACE_DEBUG("%s %d", __func__, event);
@@ -204,15 +204,15 @@ static void bta_hf_client_esco_connreq_cback(tBTM_ESCO_EVT event, tBTM_ESCO_EVT_
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_sco_conn_cback
-**
-** Description      BTM SCO connection callback.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_sco_conn_cback
+ *
+ * Description      BTM SCO connection callback.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_hf_client_sco_conn_cback(uint16_t sco_idx)
 {
     uint8_t *rem_bd;
@@ -238,15 +238,15 @@ static void bta_hf_client_sco_conn_cback(uint16_t sco_idx)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_sco_disc_cback
-**
-** Description      BTM SCO disconnection callback.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_sco_disc_cback
+ *
+ * Description      BTM SCO disconnection callback.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_hf_client_sco_disc_cback(uint16_t sco_idx)
 {
     APPL_TRACE_DEBUG("%s %d", __func__, sco_idx);
@@ -260,15 +260,15 @@ static void bta_hf_client_sco_disc_cback(uint16_t sco_idx)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_create_sco
-**
-** Description
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_create_sco
+ *
+ * Description
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_hf_client_sco_create(bool is_orig)
 {
     tBTM_STATUS       status;
@@ -337,15 +337,15 @@ static void bta_hf_client_sco_create(bool is_orig)
 
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_sco_event
-**
-** Description      Handle SCO events
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_sco_event
+ *
+ * Description      Handle SCO events
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_hf_client_sco_event(uint8_t event)
 {
     APPL_TRACE_DEBUG("%s state: %d event: %d", __func__,
@@ -572,15 +572,15 @@ static void bta_hf_client_sco_event(uint8_t event)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_sco_listen
-**
-** Description      Initialize SCO listener
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_sco_listen
+ *
+ * Description      Initialize SCO listener
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_sco_listen(UNUSED_ATTR tBTA_HF_CLIENT_DATA *p_data)
 {
     APPL_TRACE_DEBUG("%s", __func__);
@@ -589,15 +589,15 @@ void bta_hf_client_sco_listen(UNUSED_ATTR tBTA_HF_CLIENT_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_sco_shutdown
-**
-** Description
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_sco_shutdown
+ *
+ * Description
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_sco_shutdown(UNUSED_ATTR tBTA_HF_CLIENT_DATA *p_data)
 {
     APPL_TRACE_DEBUG("%s", __func__);
@@ -606,15 +606,15 @@ void bta_hf_client_sco_shutdown(UNUSED_ATTR tBTA_HF_CLIENT_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_sco_conn_open
-**
-** Description
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_sco_conn_open
+ *
+ * Description
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_sco_conn_open(UNUSED_ATTR tBTA_HF_CLIENT_DATA *p_data)
 {
     APPL_TRACE_DEBUG("%s", __func__);
@@ -636,15 +636,15 @@ void bta_hf_client_sco_conn_open(UNUSED_ATTR tBTA_HF_CLIENT_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_sco_conn_close
-**
-** Description
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_sco_conn_close
+ *
+ * Description
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_sco_conn_close(tBTA_HF_CLIENT_DATA *p_data)
 {
     APPL_TRACE_DEBUG("%s", __func__);
@@ -679,15 +679,15 @@ void bta_hf_client_sco_conn_close(tBTA_HF_CLIENT_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_sco_open
-**
-** Description
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_sco_open
+ *
+ * Description
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_sco_open(UNUSED_ATTR tBTA_HF_CLIENT_DATA *p_data)
 {
     APPL_TRACE_DEBUG("%s", __func__);
@@ -696,15 +696,15 @@ void bta_hf_client_sco_open(UNUSED_ATTR tBTA_HF_CLIENT_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_sco_close
-**
-** Description
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_sco_close
+ *
+ * Description
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_sco_close(UNUSED_ATTR tBTA_HF_CLIENT_DATA *p_data)
 {
     APPL_TRACE_DEBUG("%s  0x%x", __func__, bta_hf_client_cb.scb.sco_idx);
diff --git a/system/bta/hf_client/bta_hf_client_sdp.cc b/system/bta/hf_client/bta_hf_client_sdp.cc
index d5c3930c4df..c38e9ba2804 100644
--- a/system/bta/hf_client/bta_hf_client_sdp.cc
+++ b/system/bta/hf_client/bta_hf_client_sdp.cc
@@ -39,15 +39,15 @@
 #define BTA_HF_CLIENT_NUM_SVC_ELEMS        2
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_sdp_cback
-**
-** Description      SDP callback function.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_sdp_cback
+ *
+ * Description      SDP callback function.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_hf_client_sdp_cback(uint16_t status)
 {
     uint16_t event;
@@ -69,18 +69,18 @@ static void bta_hf_client_sdp_cback(uint16_t status)
 }
 
 /******************************************************************************
-**
-** Function         bta_hf_client_add_record
-**
-** Description      This function is called by a server application to add
-**                  HFP Client information to an SDP record.  Prior to
-**                  calling this function the application must call
-**                  SDP_CreateRecord() to create an SDP record.
-**
-** Returns          true if function execution succeeded,
-**                  false if function execution failed.
-**
-******************************************************************************/
+ *
+ * Function         bta_hf_client_add_record
+ *
+ * Description      This function is called by a server application to add
+ *                  HFP Client information to an SDP record.  Prior to
+ *                  calling this function the application must call
+ *                  SDP_CreateRecord() to create an SDP record.
+ *
+ * Returns          true if function execution succeeded,
+ *                  false if function execution failed.
+ *
+ *****************************************************************************/
 bool bta_hf_client_add_record(char *p_service_name, uint8_t scn,
                           tBTA_HF_CLIENT_FEAT features, uint32_t sdp_handle)
 {
@@ -153,15 +153,15 @@ bool bta_hf_client_add_record(char *p_service_name, uint8_t scn,
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_create_record
-**
-** Description      Create SDP record for registered service.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_create_record
+ *
+ * Description      Create SDP record for registered service.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_create_record(tBTA_HF_CLIENT_DATA *p_data)
 {
     /* add sdp record if not already registered */
@@ -180,15 +180,15 @@ void bta_hf_client_create_record(tBTA_HF_CLIENT_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_del_record
-**
-** Description      Delete SDP record for registered service.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_del_record
+ *
+ * Description      Delete SDP record for registered service.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_del_record(UNUSED_ATTR tBTA_HF_CLIENT_DATA *p_data)
 {
     APPL_TRACE_DEBUG("bta_hf_client_del_record");
@@ -204,15 +204,15 @@ void bta_hf_client_del_record(UNUSED_ATTR tBTA_HF_CLIENT_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_sdp_find_attr
-**
-** Description      Process SDP discovery results to find requested attribute
-**
-**
-** Returns          true if results found, false otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_sdp_find_attr
+ *
+ * Description      Process SDP discovery results to find requested attribute
+ *
+ *
+ * Returns          true if results found, false otherwise.
+ *
+ ******************************************************************************/
 bool bta_hf_client_sdp_find_attr(void)
 {
     tSDP_DISC_REC       *p_rec = NULL;
@@ -288,15 +288,15 @@ bool bta_hf_client_sdp_find_attr(void)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_do_disc
-**
-** Description      Do service discovery.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_do_disc
+ *
+ * Description      Do service discovery.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_do_disc(void)
 {
     tSDP_UUID       uuid_list[2];
@@ -353,15 +353,15 @@ void bta_hf_client_do_disc(void)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hf_client_free_db
-**
-** Description      Free discovery database.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hf_client_free_db
+ *
+ * Description      Free discovery database.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hf_client_free_db(UNUSED_ATTR tBTA_HF_CLIENT_DATA *p_data)
 {
     osi_free_and_reset((void **)&bta_hf_client_cb.scb.p_disc_db);
diff --git a/system/bta/hh/bta_hh_act.cc b/system/bta/hh/bta_hh_act.cc
index 8e18f42e79c..503f095c725 100644
--- a/system/bta/hh/bta_hh_act.cc
+++ b/system/bta/hh/bta_hh_act.cc
@@ -37,13 +37,13 @@
 #include "utl.h"
 
 /*****************************************************************************
-**  Constants
-*****************************************************************************/
+ *  Constants
+ ****************************************************************************/
 
 
 /*****************************************************************************
-**  Local Function prototypes
-*****************************************************************************/
+ *  Local Function prototypes
+ ****************************************************************************/
 static void bta_hh_cback (uint8_t dev_handle, BD_ADDR addr, uint8_t event,
                             uint32_t data, BT_HDR *pdata);
 static tBTA_HH_STATUS bta_hh_get_trans_status(uint32_t result);
@@ -54,18 +54,18 @@ static const char * bta_hh_hid_event_name(uint16_t event);
 #endif
 
 /*****************************************************************************
-**  Action Functions
-*****************************************************************************/
+ *  Action Functions
+ ****************************************************************************/
 /*******************************************************************************
-**
-** Function         bta_hh_api_enable
-**
-** Description      Perform necessary operations to enable HID host.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_api_enable
+ *
+ * Description      Perform necessary operations to enable HID host.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hh_api_enable(tBTA_HH_DATA *p_data)
 {
     tBTA_HH_STATUS      status = BTA_HH_ERR;
@@ -109,15 +109,15 @@ void bta_hh_api_enable(tBTA_HH_DATA *p_data)
         (* bta_hh_cb.p_cback)(BTA_HH_ENABLE_EVT, (tBTA_HH *)&status);
 }
 /*******************************************************************************
-**
-** Function         bta_hh_api_disable
-**
-** Description      Perform necessary operations to disable HID host.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_api_disable
+ *
+ * Description      Perform necessary operations to disable HID host.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hh_api_disable(void)
 {
     uint8_t xx;
@@ -152,15 +152,15 @@ void bta_hh_api_disable(void)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_disc_cmpl
-**
-** Description      All connections have been closed, disable service.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_disc_cmpl
+ *
+ * Description      All connections have been closed, disable service.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hh_disc_cmpl(void)
 {
 #if (BTA_HH_LE_INCLUDED == TRUE)
@@ -178,14 +178,14 @@ void bta_hh_disc_cmpl(void)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_sdp_cback
-**
-** Description      SDP callback function.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_sdp_cback
+ *
+ * Description      SDP callback function.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_hh_sdp_cback(uint16_t result, uint16_t attr_mask,
                                   tHID_DEV_SDP_INFO *sdp_rec )
 {
@@ -259,14 +259,14 @@ static void bta_hh_sdp_cback(uint16_t result, uint16_t attr_mask,
     return;
 }
 /*******************************************************************************
-**
-** Function         bta_hh_di_sdp_cback
-**
-** Description      SDP DI callback function.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_di_sdp_cback
+ *
+ * Description      SDP DI callback function.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_hh_di_sdp_cback(uint16_t result)
 {
     tBTA_HH_DEV_CB     *p_cb = bta_hh_cb.p_cur;
@@ -325,17 +325,17 @@ static void bta_hh_di_sdp_cback(uint16_t result)
 
 
 /*******************************************************************************
-**
-** Function         bta_hh_start_sdp
-**
-** Description      Start SDP service search, and obtain necessary SDP records.
-**                  Only one SDP service search request is allowed at the same
-**                  time. For every BTA_HhOpen API call, do SDP first unless SDP
-**                  has been done previously.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_start_sdp
+ *
+ * Description      Start SDP service search, and obtain necessary SDP records.
+ *                  Only one SDP service search request is allowed at the same
+ *                  time. For every BTA_HhOpen API call, do SDP first unless SDP
+ *                  has been done previously.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hh_start_sdp(tBTA_HH_DEV_CB *p_cb, tBTA_HH_DATA *p_data)
 {
     tBTA_HH_STATUS          status = BTA_HH_ERR_SDP;
@@ -417,16 +417,16 @@ void bta_hh_start_sdp(tBTA_HH_DEV_CB *p_cb, tBTA_HH_DATA *p_data)
 
 }
 /*******************************************************************************
-**
-** Function         bta_hh_sdp_cmpl
-**
-** Description      When SDP completed, initiate a connection or report error depend
-**                  on SDP result.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_sdp_cmpl
+ *
+ * Description      When SDP completed, initiate a connection or report error depend
+ *                  on SDP result.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hh_sdp_cmpl(tBTA_HH_DEV_CB *p_cb, tBTA_HH_DATA *p_data)
 {
     tBTA_HH_CONN            conn_dat;
@@ -515,15 +515,15 @@ void bta_hh_sdp_cmpl(tBTA_HH_DEV_CB *p_cb, tBTA_HH_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_api_disc_act
-**
-** Description      HID Host initiate a disconnection.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_api_disc_act
+ *
+ * Description      HID Host initiate a disconnection.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hh_api_disc_act(tBTA_HH_DEV_CB *p_cb, tBTA_HH_DATA *p_data)
 {
     tBTA_HH_CBDATA    disc_dat;
@@ -549,15 +549,15 @@ void bta_hh_api_disc_act(tBTA_HH_DEV_CB *p_cb, tBTA_HH_DATA *p_data)
 
 }
 /*******************************************************************************
-**
-** Function         bta_hh_open_cmpl_act
-**
-** Description      HID host connection completed
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_open_cmpl_act
+ *
+ * Description      HID host connection completed
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hh_open_cmpl_act(tBTA_HH_DEV_CB *p_cb, tBTA_HH_DATA *p_data)
 {
     tBTA_HH_CONN        conn ;
@@ -616,15 +616,15 @@ void bta_hh_open_cmpl_act(tBTA_HH_DEV_CB *p_cb, tBTA_HH_DATA *p_data)
 
 }
 /*******************************************************************************
-**
-** Function         bta_hh_open_act
-**
-** Description      HID host receive HID_OPEN_EVT .
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_open_act
+ *
+ * Description      HID host receive HID_OPEN_EVT .
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hh_open_act(tBTA_HH_DEV_CB *p_cb, tBTA_HH_DATA *p_data)
 {
     tBTA_HH_API_CONN    conn_data;
@@ -659,15 +659,15 @@ void bta_hh_open_act(tBTA_HH_DEV_CB *p_cb, tBTA_HH_DATA *p_data)
 
 
 /*******************************************************************************
-**
-** Function         bta_hh_data_act
-**
-** Description      HID Host process a data report
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_data_act
+ *
+ * Description      HID Host process a data report
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hh_data_act(tBTA_HH_DEV_CB *p_cb, tBTA_HH_DATA * p_data)
 {
     BT_HDR  *pdata = p_data->hid_cback.p_data;
@@ -681,15 +681,15 @@ void bta_hh_data_act(tBTA_HH_DEV_CB *p_cb, tBTA_HH_DATA * p_data)
 
 
 /*******************************************************************************
-**
-** Function         bta_hh_handsk_act
-**
-** Description      HID Host process a handshake acknoledgement.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_handsk_act
+ *
+ * Description      HID Host process a handshake acknoledgement.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hh_handsk_act(tBTA_HH_DEV_CB *p_cb, tBTA_HH_DATA * p_data)
 {
     tBTA_HH_CBDATA  cback_data ;
@@ -754,15 +754,15 @@ void bta_hh_handsk_act(tBTA_HH_DEV_CB *p_cb, tBTA_HH_DATA * p_data)
     return;
 }
 /*******************************************************************************
-**
-** Function         bta_hh_ctrl_dat_act
-**
-** Description      HID Host process a data report from control channel.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_ctrl_dat_act
+ *
+ * Description      HID Host process a data report from control channel.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hh_ctrl_dat_act(tBTA_HH_DEV_CB *p_cb, tBTA_HH_DATA * p_data)
 {
     BT_HDR          *pdata = p_data->hid_cback.p_data;
@@ -820,16 +820,16 @@ void bta_hh_ctrl_dat_act(tBTA_HH_DEV_CB *p_cb, tBTA_HH_DATA * p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_open_failure
-**
-** Description      report HID open failure when at wait for connection state and receive
-**                  device close event.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_open_failure
+ *
+ * Description      report HID open failure when at wait for connection state and receive
+ *                  device close event.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hh_open_failure(tBTA_HH_DEV_CB *p_cb, tBTA_HH_DATA *p_data)
 {
     tBTA_HH_CONN            conn_dat ;
@@ -864,15 +864,15 @@ void bta_hh_open_failure(tBTA_HH_DEV_CB *p_cb, tBTA_HH_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_close_act
-**
-** Description      HID Host process a close event
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_close_act
+ *
+ * Description      HID Host process a close event
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hh_close_act (tBTA_HH_DEV_CB *p_cb, tBTA_HH_DATA *p_data)
 {
     tBTA_HH_CONN            conn_dat ;
@@ -945,15 +945,15 @@ void bta_hh_close_act (tBTA_HH_DEV_CB *p_cb, tBTA_HH_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_get_dscp_act
-**
-** Description      Get device report descriptor
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_get_dscp_act
+ *
+ * Description      Get device report descriptor
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hh_get_dscp_act(tBTA_HH_DEV_CB *p_cb,
                          UNUSED_ATTR tBTA_HH_DATA *p_data)
 {
@@ -969,15 +969,15 @@ void bta_hh_get_dscp_act(tBTA_HH_DEV_CB *p_cb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_maint_dev_act
-**
-** Description      HID Host maintain device list.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_maint_dev_act
+ *
+ * Description      HID Host maintain device list.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hh_maint_dev_act(tBTA_HH_DEV_CB *p_cb, tBTA_HH_DATA *p_data)
 {
     tBTA_HH_MAINT_DEV       *p_dev_info = &p_data->api_maintdev;
@@ -1078,14 +1078,14 @@ void bta_hh_maint_dev_act(tBTA_HH_DEV_CB *p_cb, tBTA_HH_DATA *p_data)
     (* bta_hh_cb.p_cback)(p_dev_info->sub_event, (tBTA_HH *)&dev_info);
 }
 /*******************************************************************************
-**
-** Function         bta_hh_write_dev_act
-**
-** Description      Write device action. can be SET/GET/DATA transaction.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_write_dev_act
+ *
+ * Description      Write device action. can be SET/GET/DATA transaction.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hh_write_dev_act(tBTA_HH_DEV_CB *p_cb, tBTA_HH_DATA *p_data)
 {
     tBTA_HH_CBDATA     cbdata = {BTA_HH_OK, 0};
@@ -1181,18 +1181,18 @@ void bta_hh_write_dev_act(tBTA_HH_DEV_CB *p_cb, tBTA_HH_DATA *p_data)
 }
 
 /*****************************************************************************
-**  Static Function
-*****************************************************************************/
+ *  Static Function
+ ****************************************************************************/
 /*******************************************************************************
-**
-** Function         bta_hh_cback
-**
-** Description      BTA HH callback function.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_cback
+ *
+ * Description      BTA HH callback function.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_hh_cback (uint8_t dev_handle, BD_ADDR addr, uint8_t event,
                         uint32_t data, BT_HDR *pdata)
 {
@@ -1254,13 +1254,13 @@ static void bta_hh_cback (uint8_t dev_handle, BD_ADDR addr, uint8_t event,
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_get_trans_status
-**
-** Description      translate a handshake result code into BTA HH
-**                  status code
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_get_trans_status
+ *
+ * Description      translate a handshake result code into BTA HH
+ *                  status code
+ *
+ ******************************************************************************/
 static tBTA_HH_STATUS bta_hh_get_trans_status(uint32_t result)
 {
     switch(result)
@@ -1280,8 +1280,8 @@ static tBTA_HH_STATUS bta_hh_get_trans_status(uint32_t result)
     }
 }
 /*****************************************************************************
-**  Debug Functions
-*****************************************************************************/
+ *  Debug Functions
+ ****************************************************************************/
 
 #if (BTA_HH_DEBUG == TRUE)
 static const char* bta_hh_get_w4_event(uint16_t event)
diff --git a/system/bta/hh/bta_hh_api.cc b/system/bta/hh/bta_hh_api.cc
index 3469c4679d8..a4c5f34bdd8 100644
--- a/system/bta/hh/bta_hh_api.cc
+++ b/system/bta/hh/bta_hh_api.cc
@@ -41,8 +41,8 @@
 #include "utl.h"
 
 /*****************************************************************************
-**  Constants
-*****************************************************************************/
+ *  Constants
+ ****************************************************************************/
 
 static const tBTA_SYS_REG bta_hh_reg =
 {
@@ -51,18 +51,18 @@ static const tBTA_SYS_REG bta_hh_reg =
 };
 
 /*******************************************************************************
-**
-** Function         BTA_HhEnable
-**
-** Description      Enable the HID host.  This function must be called before
-**                  any other functions in the HID host API are called. When the
-**                  enable operation is complete the callback function will be
-**                  called with BTA_HH_ENABLE_EVT.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HhEnable
+ *
+ * Description      Enable the HID host.  This function must be called before
+ *                  any other functions in the HID host API are called. When the
+ *                  enable operation is complete the callback function will be
+ *                  called with BTA_HH_ENABLE_EVT.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HhEnable(tBTA_SEC sec_mask, tBTA_HH_CBACK *p_cback)
 {
     tBTA_HH_API_ENABLE *p_buf =
@@ -82,15 +82,15 @@ void BTA_HhEnable(tBTA_SEC sec_mask, tBTA_HH_CBACK *p_cback)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_HhDisable
-**
-** Description      Disable the HID host. If the server is currently
-**                  connected, the connection will be closed.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HhDisable
+ *
+ * Description      Disable the HID host. If the server is currently
+ *                  connected, the connection will be closed.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HhDisable(void)
 {
     BT_HDR *p_buf = (BT_HDR *)osi_malloc(sizeof(BT_HDR));
@@ -102,14 +102,14 @@ void BTA_HhDisable(void)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_HhClose
-**
-** Description      Disconnect a connection.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HhClose
+ *
+ * Description      Disconnect a connection.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HhClose(uint8_t dev_handle)
 {
     BT_HDR *p_buf = (BT_HDR *)osi_calloc(sizeof(BT_HDR));
@@ -121,15 +121,15 @@ void BTA_HhClose(uint8_t dev_handle)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_HhOpen
-**
-** Description      Connect to a device of specified BD address in specified
-**                  protocol mode and security level.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HhOpen
+ *
+ * Description      Connect to a device of specified BD address in specified
+ *                  protocol mode and security level.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HhOpen(BD_ADDR dev_bda, tBTA_HH_PROTO_MODE mode, tBTA_SEC sec_mask)
 {
     tBTA_HH_API_CONN *p_buf =
@@ -145,10 +145,10 @@ void BTA_HhOpen(BD_ADDR dev_bda, tBTA_HH_PROTO_MODE mode, tBTA_SEC sec_mask)
 }
 
 /*******************************************************************************
-**
-** Function  bta_hh_snd_write_dev
-**
-*******************************************************************************/
+ *
+ * Function  bta_hh_snd_write_dev
+ *
+ ******************************************************************************/
 static void bta_hh_snd_write_dev(uint8_t dev_handle, uint8_t t_type, uint8_t param,
                                  uint16_t data, uint8_t rpt_id, BT_HDR  *p_data)
 {
@@ -167,30 +167,30 @@ static void bta_hh_snd_write_dev(uint8_t dev_handle, uint8_t t_type, uint8_t par
 }
 
 /*******************************************************************************
-**
-** Function         BTA_HhSetReport
-**
-** Description      send SET_REPORT to device.
-**
-** Parameter        dev_handle: device handle
-**                  r_type:     report type, could be BTA_HH_RPTT_OUTPUT or
-**                              BTA_HH_RPTT_FEATURE.
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HhSetReport
+ *
+ * Description      send SET_REPORT to device.
+ *
+ * Parameter        dev_handle: device handle
+ *                  r_type:     report type, could be BTA_HH_RPTT_OUTPUT or
+ *                              BTA_HH_RPTT_FEATURE.
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HhSetReport(uint8_t dev_handle, tBTA_HH_RPT_TYPE r_type, BT_HDR *p_data)
 {
     bta_hh_snd_write_dev(dev_handle, HID_TRANS_SET_REPORT, r_type, 0, 0, p_data);
 }
 /*******************************************************************************
-**
-** Function         BTA_HhGetReport
-**
-** Description      Send a GET_REPORT to HID device.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HhGetReport
+ *
+ * Description      Send a GET_REPORT to HID device.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HhGetReport(uint8_t dev_handle, tBTA_HH_RPT_TYPE r_type, uint8_t rpt_id, uint16_t buf_size)
 {
     uint8_t param = (buf_size) ? (r_type | 0x08) : r_type;
@@ -199,90 +199,90 @@ void BTA_HhGetReport(uint8_t dev_handle, tBTA_HH_RPT_TYPE r_type, uint8_t rpt_id
                         buf_size, rpt_id, NULL);
 }
 /*******************************************************************************
-**
-** Function         BTA_HhSetProtoMode
-**
-** Description      This function set the protocol mode at specified HID handle
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HhSetProtoMode
+ *
+ * Description      This function set the protocol mode at specified HID handle
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HhSetProtoMode(uint8_t dev_handle, tBTA_HH_PROTO_MODE p_type)
 {
     bta_hh_snd_write_dev(dev_handle, HID_TRANS_SET_PROTOCOL, (uint8_t)p_type,
                         0, 0, NULL);
 }
 /*******************************************************************************
-**
-** Function         BTA_HhGetProtoMode
-**
-** Description      This function get protocol mode information.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HhGetProtoMode
+ *
+ * Description      This function get protocol mode information.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HhGetProtoMode(uint8_t dev_handle)
 {
     bta_hh_snd_write_dev(dev_handle, HID_TRANS_GET_PROTOCOL, 0, 0, 0, NULL);
 }
 /*******************************************************************************
-**
-** Function         BTA_HhSetIdle
-**
-** Description      send SET_IDLE to device.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HhSetIdle
+ *
+ * Description      send SET_IDLE to device.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HhSetIdle(uint8_t dev_handle, uint16_t idle_rate)
 {
     bta_hh_snd_write_dev(dev_handle, HID_TRANS_SET_IDLE, 0, idle_rate, 0, NULL);
 }
 
 /*******************************************************************************
-**
-** Function         BTA_HhGetIdle
-**
-** Description      Send a GET_IDLE from HID device.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HhGetIdle
+ *
+ * Description      Send a GET_IDLE from HID device.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HhGetIdle(uint8_t dev_handle)
 {
     bta_hh_snd_write_dev(dev_handle, HID_TRANS_GET_IDLE, 0, 0, 0, NULL);
 }
 /*******************************************************************************
-**
-** Function         BTA_HhSendCtrl
-**
-** Description      Send a control command to HID device.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HhSendCtrl
+ *
+ * Description      Send a control command to HID device.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HhSendCtrl(uint8_t dev_handle, tBTA_HH_TRANS_CTRL_TYPE c_type)
 {
     bta_hh_snd_write_dev(dev_handle, HID_TRANS_CONTROL, (uint8_t)c_type, 0, 0, NULL);
 }
 /*******************************************************************************
-**
-** Function         BTA_HhSendData
-**
-** Description      This function send DATA transaction to HID device.
-**
-** Parameter        dev_handle: device handle
-**                  dev_bda: remote device address
-**                  p_data: data to be sent in the DATA transaction; or
-**                          the data to be write into the Output Report of a LE HID
-**                          device. The report is identified the report ID which is
-**                          the value of the byte (uint8_t *)(p_buf + 1) + p_buf->offset.
-**                          p_data->layer_specific needs to be set to the report type,
-**                          it can be OUTPUT report, or FEATURE report.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HhSendData
+ *
+ * Description      This function send DATA transaction to HID device.
+ *
+ * Parameter        dev_handle: device handle
+ *                  dev_bda: remote device address
+ *                  p_data: data to be sent in the DATA transaction; or
+ *                          the data to be write into the Output Report of a LE HID
+ *                          device. The report is identified the report ID which is
+ *                          the value of the byte (uint8_t *)(p_buf + 1) + p_buf->offset.
+ *                          p_data->layer_specific needs to be set to the report type,
+ *                          it can be OUTPUT report, or FEATURE report.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HhSendData(uint8_t dev_handle,
                     UNUSED_ATTR BD_ADDR dev_bda, BT_HDR  *p_data)
 {
@@ -297,14 +297,14 @@ void BTA_HhSendData(uint8_t dev_handle,
 }
 
 /*******************************************************************************
-**
-** Function         BTA_HhGetDscpInfo
-**
-** Description      Get HID device report descriptor
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HhGetDscpInfo
+ *
+ * Description      Get HID device report descriptor
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HhGetDscpInfo(uint8_t dev_handle)
 {
     BT_HDR *p_buf = (BT_HDR *)osi_calloc(sizeof(BT_HDR));
@@ -316,17 +316,17 @@ void BTA_HhGetDscpInfo(uint8_t dev_handle)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_HhAddDev
-**
-** Description      Add a virtually cabled device into HID-Host device list
-**                  to manage and assign a device handle for future API call,
-**                  host applciation call this API at start-up to initialize its
-**                  virtually cabled devices.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HhAddDev
+ *
+ * Description      Add a virtually cabled device into HID-Host device list
+ *                  to manage and assign a device handle for future API call,
+ *                  host applciation call this API at start-up to initialize its
+ *                  virtually cabled devices.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HhAddDev(BD_ADDR bda, tBTA_HH_ATTR_MASK attr_mask, uint8_t sub_class,
                   uint8_t app_id, tBTA_HH_DEV_DSCP_INFO dscp_info)
 {
@@ -358,14 +358,14 @@ void BTA_HhAddDev(BD_ADDR bda, tBTA_HH_ATTR_MASK attr_mask, uint8_t sub_class,
 }
 
 /*******************************************************************************
-**
-** Function         BTA_HhRemoveDev
-**
-** Description      Remove a device from the HID host devices list.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HhRemoveDev
+ *
+ * Description      Remove a device from the HID host devices list.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HhRemoveDev(uint8_t dev_handle )
 {
     tBTA_HH_MAINT_DEV *p_buf =
@@ -385,18 +385,18 @@ void BTA_HhRemoveDev(uint8_t dev_handle )
 /*******************************************************************************/
 
 /*******************************************************************************
-**
-** Function         BTA_HhParseBootRpt
-**
-** Description      This utility function parse a boot mode report.
-**                  For keyboard report, report data will carry the keycode max
-**                  up to 6 key press in one report. Application need to convert
-**                  the keycode into keypress character according to keyboard
-**                  language.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HhParseBootRpt
+ *
+ * Description      This utility function parse a boot mode report.
+ *                  For keyboard report, report data will carry the keycode max
+ *                  up to 6 key press in one report. Application need to convert
+ *                  the keycode into keypress character according to keyboard
+ *                  language.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HhParseBootRpt(tBTA_HH_BOOT_RPT *p_data, uint8_t *p_report,
                         uint16_t report_len)
 {
diff --git a/system/bta/hh/bta_hh_int.h b/system/bta/hh/bta_hh_int.h
index 51ea856ff23..5f9da6e3702 100644
--- a/system/bta/hh/bta_hh_int.h
+++ b/system/bta/hh/bta_hh_int.h
@@ -282,8 +282,8 @@ typedef struct
 } tBTA_HH_KB_CB;
 
 /******************************************************************************
-** Main Control Block
-*******************************************************************************/
+ * Main Control Block
+ ******************************************************************************/
 typedef struct
 {
     tBTA_HH_KB_CB           kb_cb;                  /* key board control block,
@@ -313,8 +313,8 @@ extern tBTA_HH_CB  bta_hh_cb;
 extern tBTA_HH_CFG *p_bta_hh_cfg;
 
 /*****************************************************************************
-**  Function prototypes
-*****************************************************************************/
+ *  Function prototypes
+ ****************************************************************************/
 extern bool bta_hh_hdl_event(BT_HDR *p_msg);
 extern void bta_hh_sm_execute(tBTA_HH_DEV_CB *p_cb, uint16_t event,
                               tBTA_HH_DATA *p_data);
diff --git a/system/bta/hh/bta_hh_le.cc b/system/bta/hh/bta_hh_le.cc
index 5ff0dd5f006..2b343a49f47 100644
--- a/system/bta/hh/bta_hh_le.cc
+++ b/system/bta/hh/bta_hh_le.cc
@@ -231,15 +231,15 @@ static const char *bta_hh_le_rpt_name[4] =
 };
 
 /*******************************************************************************
-**
-** Function         bta_hh_le_hid_report_dbg
-**
-** Description      debug function to print out all HID report available on remote
-**                  device.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_le_hid_report_dbg
+ *
+ * Description      debug function to print out all HID report available on remote
+ *                  device.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_hh_le_hid_report_dbg(tBTA_HH_DEV_CB *p_cb)
 {
     APPL_TRACE_DEBUG("%s: HID Report DB", __func__);
@@ -277,14 +277,14 @@ static void bta_hh_le_hid_report_dbg(tBTA_HH_DEV_CB *p_cb)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_uuid_to_str
-**
-** Description
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_uuid_to_str
+ *
+ * Description
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static const char *bta_hh_uuid_to_str(uint16_t uuid)
 {
     switch(uuid)
@@ -318,15 +318,15 @@ static const char *bta_hh_uuid_to_str(uint16_t uuid)
 
 #endif
 /*******************************************************************************
-**
-** Function         bta_hh_le_enable
-**
-** Description      initialize LE HID related functionality
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_le_enable
+ *
+ * Description      initialize LE HID related functionality
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hh_le_enable(void)
 {
     char       app_name[LEN_UUID_128 + 1];
@@ -349,14 +349,14 @@ void bta_hh_le_enable(void)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_le_register_cmpl
-**
-** Description      BTA HH register with BTA GATTC completed
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_le_register_cmpl
+ *
+ * Description      BTA HH register with BTA GATTC completed
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 void bta_hh_le_register_cmpl(tBTA_GATTC_REG *p_reg)
 {
     tBTA_HH_STATUS      status = BTA_HH_ERR;
@@ -374,44 +374,44 @@ void bta_hh_le_register_cmpl(tBTA_GATTC_REG *p_reg)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_le_is_hh_gatt_if
-**
-** Description      Check to see if client_if is BTA HH LE GATT interface
-**
-**
-** Returns          whether it is HH GATT IF
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_le_is_hh_gatt_if
+ *
+ * Description      Check to see if client_if is BTA HH LE GATT interface
+ *
+ *
+ * Returns          whether it is HH GATT IF
+ *
+ ******************************************************************************/
 bool bta_hh_le_is_hh_gatt_if(tBTA_GATTC_IF client_if)
 {
     return (bta_hh_cb.gatt_if == client_if);
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_le_deregister
-**
-** Description      De-register BTA HH from BTA GATTC
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_le_deregister
+ *
+ * Description      De-register BTA HH from BTA GATTC
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hh_le_deregister(void)
 {
     BTA_GATTC_AppDeregister(bta_hh_cb.gatt_if);
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_is_le_device
-**
-** Description      Check to see if the remote device is a LE only device
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_is_le_device
+ *
+ * Description      Check to see if the remote device is a LE only device
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 bool bta_hh_is_le_device(tBTA_HH_DEV_CB *p_cb, BD_ADDR remote_bda)
 {
     p_cb->is_le_device = BTM_UseLeLink (remote_bda);
@@ -420,14 +420,14 @@ bool bta_hh_is_le_device(tBTA_HH_DEV_CB *p_cb, BD_ADDR remote_bda)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_le_open_conn
-**
-** Description      open a GATT connection first.
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_le_open_conn
+ *
+ * Description      open a GATT connection first.
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 void bta_hh_le_open_conn(tBTA_HH_DEV_CB *p_cb, BD_ADDR remote_bda)
 {
     /* update cb_index[] map */
@@ -440,12 +440,12 @@ void bta_hh_le_open_conn(tBTA_HH_DEV_CB *p_cb, BD_ADDR remote_bda)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_le_find_dev_cb_by_conn_id
-**
-** Description      Utility function find a device control block by connection ID.
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_le_find_dev_cb_by_conn_id
+ *
+ * Description      Utility function find a device control block by connection ID.
+ *
+ ******************************************************************************/
 tBTA_HH_DEV_CB * bta_hh_le_find_dev_cb_by_conn_id(uint16_t conn_id)
 {
     uint8_t   i;
@@ -460,12 +460,12 @@ tBTA_HH_DEV_CB * bta_hh_le_find_dev_cb_by_conn_id(uint16_t conn_id)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_le_find_dev_cb_by_bda
-**
-** Description      Utility function find a device control block by BD address.
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_le_find_dev_cb_by_bda
+ *
+ * Description      Utility function find a device control block by BD address.
+ *
+ ******************************************************************************/
 tBTA_HH_DEV_CB * bta_hh_le_find_dev_cb_by_bda(BD_ADDR bda)
 {
     uint8_t   i;
@@ -481,12 +481,12 @@ tBTA_HH_DEV_CB * bta_hh_le_find_dev_cb_by_bda(BD_ADDR bda)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_le_find_service_inst_by_battery_inst_id
-**
-** Description      find HID service instance ID by battery service instance ID
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_le_find_service_inst_by_battery_inst_id
+ *
+ * Description      find HID service instance ID by battery service instance ID
+ *
+ ******************************************************************************/
 uint8_t bta_hh_le_find_service_inst_by_battery_inst_id(tBTA_HH_DEV_CB *p_cb, uint8_t ba_inst_id)
 {
     if (p_cb->hid_srvc.in_use &&
@@ -498,13 +498,13 @@ uint8_t bta_hh_le_find_service_inst_by_battery_inst_id(tBTA_HH_DEV_CB *p_cb, uin
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_le_find_report_entry
-**
-** Description      find the report entry by service instance and report UUID and
-**                  instance ID
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_le_find_report_entry
+ *
+ * Description      find the report entry by service instance and report UUID and
+ *                  instance ID
+ *
+ ******************************************************************************/
 tBTA_HH_LE_RPT * bta_hh_le_find_report_entry(tBTA_HH_DEV_CB *p_cb,
                                              uint8_t  srvc_inst_id,  /* service instance ID */
                                              uint16_t rpt_uuid,
@@ -539,14 +539,14 @@ tBTA_HH_LE_RPT * bta_hh_le_find_report_entry(tBTA_HH_DEV_CB *p_cb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_le_find_rpt_by_idtype
-**
-** Description      find a report entry by report ID and protocol mode
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_le_find_rpt_by_idtype
+ *
+ * Description      find a report entry by report ID and protocol mode
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 tBTA_HH_LE_RPT * bta_hh_le_find_rpt_by_idtype(tBTA_HH_LE_RPT*p_head, uint8_t mode,
                                               tBTA_HH_RPT_TYPE r_type, uint8_t rpt_id)
 {
@@ -577,12 +577,12 @@ tBTA_HH_LE_RPT * bta_hh_le_find_rpt_by_idtype(tBTA_HH_LE_RPT*p_head, uint8_t mod
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_le_find_alloc_report_entry
-**
-** Description      find or allocate a report entry in the HID service report list.
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_le_find_alloc_report_entry
+ *
+ * Description      find or allocate a report entry in the HID service report list.
+ *
+ ******************************************************************************/
 tBTA_HH_LE_RPT * bta_hh_le_find_alloc_report_entry(tBTA_HH_DEV_CB *p_cb,
                                                    uint8_t srvc_inst_id,
                                                    uint16_t rpt_uuid,
@@ -665,12 +665,12 @@ static tBTA_GATTC_DESCRIPTOR *find_descriptor_by_short_uuid(uint16_t conn_id,
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_le_read_char_descriptor
-**
-** Description      read characteristic descriptor
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_le_read_char_descriptor
+ *
+ * Description      read characteristic descriptor
+ *
+ ******************************************************************************/
 static tBTA_HH_STATUS bta_hh_le_read_char_descriptor(tBTA_HH_DEV_CB *p_cb, uint16_t char_handle,
                                                      uint16_t short_uuid, GATT_READ_OP_CB cb,
                                                      void* cb_data)
@@ -685,14 +685,14 @@ static tBTA_HH_STATUS bta_hh_le_read_char_descriptor(tBTA_HH_DEV_CB *p_cb, uint1
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_le_save_report_ref
-**
-** Description      save report reference information and move to next one.
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_le_save_report_ref
+ *
+ * Description      save report reference information and move to next one.
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 void bta_hh_le_save_report_ref(tBTA_HH_DEV_CB *p_dev_cb, tBTA_HH_LE_RPT  *p_rpt,
                             tGATT_STATUS status, uint8_t *value, uint16_t len)
 {
@@ -738,15 +738,15 @@ void bta_hh_le_save_report_ref(tBTA_HH_DEV_CB *p_dev_cb, tBTA_HH_LE_RPT  *p_rpt,
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_le_register_input_notif
-**
-** Description      Register for all notifications for the report applicable
-**                  for the protocol mode.
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_le_register_input_notif
+ *
+ * Description      Register for all notifications for the report applicable
+ *                  for the protocol mode.
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 void bta_hh_le_register_input_notif(tBTA_HH_DEV_CB *p_dev_cb, uint8_t proto_mode, bool register_ba)
 {
     tBTA_HH_LE_RPT  *p_rpt = &p_dev_cb->hid_srvc.report[0];
@@ -810,12 +810,12 @@ void bta_hh_le_register_input_notif(tBTA_HH_DEV_CB *p_dev_cb, uint8_t proto_mode
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_le_deregister_input_notif
-**
-** Description      Deregister all notifications
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_le_deregister_input_notif
+ *
+ * Description      Deregister all notifications
+ *
+ ******************************************************************************/
 void bta_hh_le_deregister_input_notif(tBTA_HH_DEV_CB *p_dev_cb)
 {
     tBTA_HH_LE_RPT  *p_rpt = &p_dev_cb->hid_srvc.report[0];
@@ -845,12 +845,12 @@ void bta_hh_le_deregister_input_notif(tBTA_HH_DEV_CB *p_dev_cb)
 
 
 /*******************************************************************************
-**
-** Function         bta_hh_le_open_cmpl
-**
-** Description      HID over GATT connection sucessfully opened
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_le_open_cmpl
+ *
+ * Description      HID over GATT connection sucessfully opened
+ *
+ ******************************************************************************/
 void bta_hh_le_open_cmpl(tBTA_HH_DEV_CB *p_cb)
 {
     if ( p_cb->disc_active == BTA_HH_LE_DISC_NONE)
@@ -871,13 +871,13 @@ void bta_hh_le_open_cmpl(tBTA_HH_DEV_CB *p_cb)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_le_write_ccc
-**
-** Description      Utility function to find and write client configuration of
-**                  a characteristic
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_le_write_ccc
+ *
+ * Description      Utility function to find and write client configuration of
+ *                  a characteristic
+ *
+ ******************************************************************************/
 bool bta_hh_le_write_ccc(tBTA_HH_DEV_CB *p_cb,
                                      uint8_t char_handle,
                                      uint16_t clt_cfg_value,
@@ -930,13 +930,13 @@ static void write_rpt_ctl_cfg_cb(uint16_t conn_id, tGATT_STATUS status, uint16_t
     }
 }
 /*******************************************************************************
-**
-** Function         bta_hh_le_write_rpt_clt_cfg
-**
-** Description      write client configuration. This is only for input report
-**                  enable all input notification upon connection open.
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_le_write_rpt_clt_cfg
+ *
+ * Description      write client configuration. This is only for input report
+ *                  enable all input notification upon connection open.
+ *
+ ******************************************************************************/
 bool bta_hh_le_write_rpt_clt_cfg(tBTA_HH_DEV_CB *p_cb)
 {
     uint8_t           i;
@@ -997,12 +997,12 @@ static void write_proto_mode_cb(uint16_t conn_id, tGATT_STATUS status, uint16_t
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_le_set_protocol_mode
-**
-** Description      Set remote device protocol mode.
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_le_set_protocol_mode
+ *
+ * Description      Set remote device protocol mode.
+ *
+ ******************************************************************************/
 bool bta_hh_le_set_protocol_mode(tBTA_HH_DEV_CB *p_cb, tBTA_HH_PROTO_MODE mode)
 {
     tBTA_HH_CBDATA      cback_data;
@@ -1046,12 +1046,12 @@ bool bta_hh_le_set_protocol_mode(tBTA_HH_DEV_CB *p_cb, tBTA_HH_PROTO_MODE mode)
 }
 
 /*******************************************************************************
-** Function         get_protocol_mode_cb
-**
-** Description      Process the Read protocol mode, send GET_PROTO_EVT to application
-**                  with the protocol mode.
-**
-*******************************************************************************/
+ * Function         get_protocol_mode_cb
+ *
+ * Description      Process the Read protocol mode, send GET_PROTO_EVT to application
+ *                  with the protocol mode.
+ *
+ ******************************************************************************/
 static void get_protocol_mode_cb(uint16_t conn_id, tGATT_STATUS status, uint16_t handle, uint16_t len,
                                  uint8_t *value, void* data) {
     tBTA_HH_DEV_CB *p_dev_cb = (tBTA_HH_DEV_CB *)data;
@@ -1085,12 +1085,12 @@ static void get_protocol_mode_cb(uint16_t conn_id, tGATT_STATUS status, uint16_t
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_le_get_protocol_mode
-**
-** Description      Get remote device protocol mode.
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_le_get_protocol_mode
+ *
+ * Description      Get remote device protocol mode.
+ *
+ ******************************************************************************/
 void bta_hh_le_get_protocol_mode(tBTA_HH_DEV_CB *p_cb)
 {
     tBTA_HH_HSDATA    hs_data;
@@ -1111,14 +1111,14 @@ void bta_hh_le_get_protocol_mode(tBTA_HH_DEV_CB *p_cb)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_le_dis_cback
-**
-** Description      DIS read complete callback
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_le_dis_cback
+ *
+ * Description      DIS read complete callback
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 void bta_hh_le_dis_cback(BD_ADDR addr, tDIS_VALUE *p_dis_value)
 {
     tBTA_HH_DEV_CB *p_cb = bta_hh_le_find_dev_cb_by_bda(addr);
@@ -1148,15 +1148,15 @@ void bta_hh_le_dis_cback(BD_ADDR addr, tDIS_VALUE *p_dis_value)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_le_pri_service_discovery
-**
-** Description      Initialize GATT discovery on the remote LE HID device by opening
-**                  a GATT connection first.
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_le_pri_service_discovery
+ *
+ * Description      Initialize GATT discovery on the remote LE HID device by opening
+ *                  a GATT connection first.
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 void bta_hh_le_pri_service_discovery(tBTA_HH_DEV_CB *p_cb)
 {
     tBT_UUID        pri_srvc;
@@ -1181,14 +1181,14 @@ void bta_hh_le_pri_service_discovery(tBTA_HH_DEV_CB *p_cb)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_le_encrypt_cback
-**
-** Description      link encryption complete callback for bond verification.
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_le_encrypt_cback
+ *
+ * Description      link encryption complete callback for bond verification.
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 void bta_hh_le_encrypt_cback(BD_ADDR bd_addr, UNUSED_ATTR tBTA_GATT_TRANSPORT transport,
                                     UNUSED_ATTR void *p_ref_data, tBTM_STATUS result)
 {
@@ -1209,15 +1209,15 @@ void bta_hh_le_encrypt_cback(BD_ADDR bd_addr, UNUSED_ATTR tBTA_GATT_TRANSPORT tr
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_security_cmpl
-**
-** Description      Security check completed, start the service discovery
-**                  if no cache available, otherwise report connection open completed
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_security_cmpl
+ *
+ * Description      Security check completed, start the service discovery
+ *                  if no cache available, otherwise report connection open completed
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 void bta_hh_security_cmpl(tBTA_HH_DEV_CB *p_cb,
                           UNUSED_ATTR tBTA_HH_DATA *p_buf)
 {
@@ -1264,14 +1264,14 @@ void bta_hh_security_cmpl(tBTA_HH_DEV_CB *p_cb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_le_notify_enc_cmpl
-**
-** Description      process GATT encryption complete event
-**
-** Returns
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_le_notify_enc_cmpl
+ *
+ * Description      process GATT encryption complete event
+ *
+ * Returns
+ *
+ ******************************************************************************/
 void bta_hh_le_notify_enc_cmpl(tBTA_HH_DEV_CB *p_cb, tBTA_HH_DATA *p_buf)
 {
     if (p_cb == NULL || p_cb->security_pending == false ||
@@ -1285,14 +1285,14 @@ void bta_hh_le_notify_enc_cmpl(tBTA_HH_DEV_CB *p_cb, tBTA_HH_DATA *p_buf)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_clear_service_cache
-**
-** Description      clear the service cache
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_clear_service_cache
+ *
+ * Description      clear the service cache
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 void bta_hh_clear_service_cache(tBTA_HH_DEV_CB *p_cb)
 {
     tBTA_HH_LE_HID_SRVC     *p_hid_srvc = &p_cb->hid_srvc;
@@ -1305,14 +1305,14 @@ void bta_hh_clear_service_cache(tBTA_HH_DEV_CB *p_cb)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_start_security
-**
-** Description      start the security check of the established connection
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_start_security
+ *
+ * Description      start the security check of the established connection
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 void bta_hh_start_security(tBTA_HH_DEV_CB *p_cb,
                            UNUSED_ATTR tBTA_HH_DATA *p_buf)
 {
@@ -1364,14 +1364,14 @@ void bta_hh_start_security(tBTA_HH_DEV_CB *p_cb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_gatt_open
-**
-** Description      process GATT open event.
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_gatt_open
+ *
+ * Description      process GATT open event.
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 void bta_hh_gatt_open(tBTA_HH_DEV_CB *p_cb, tBTA_HH_DATA *p_buf)
 {
     tBTA_GATTC_OPEN *p_data = &p_buf->le_open;
@@ -1414,15 +1414,15 @@ void bta_hh_gatt_open(tBTA_HH_DEV_CB *p_cb, tBTA_HH_DATA *p_buf)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_le_close
-**
-** Description      This function process the GATT close event and post it as a
-**                  BTA HH internal event
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_le_close
+ *
+ * Description      This function process the GATT close event and post it as a
+ *                  BTA HH internal event
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 void bta_hh_le_close(tBTA_GATTC_CLOSE * p_data)
 {
     tBTA_HH_DEV_CB *p_dev_cb = bta_hh_le_find_dev_cb_by_bda(p_data->remote_bda);
@@ -1443,14 +1443,14 @@ void bta_hh_le_close(tBTA_GATTC_CLOSE * p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_le_gatt_disc_cmpl
-**
-** Description      Check to see if the remote device is a LE only device
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_le_gatt_disc_cmpl
+ *
+ * Description      Check to see if the remote device is a LE only device
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 void bta_hh_le_gatt_disc_cmpl(tBTA_HH_DEV_CB *p_cb, tBTA_HH_STATUS status)
 {
     APPL_TRACE_DEBUG("bta_hh_le_gatt_disc_cmpl ");
@@ -1595,15 +1595,15 @@ void read_pref_conn_params_cb(uint16_t conn_id, tGATT_STATUS status, uint16_t ha
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_le_search_hid_chars
-**
-** Description      This function discover all characteristics a service and
-**                  all descriptors available.
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_le_search_hid_chars
+ *
+ * Description      This function discover all characteristics a service and
+ *                  all descriptors available.
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 static void bta_hh_le_search_hid_chars(tBTA_HH_DEV_CB *p_dev_cb, tBTA_GATTC_SERVICE *service)
 {
     tBTA_HH_LE_RPT *p_rpt;
@@ -1688,14 +1688,14 @@ static void bta_hh_le_search_hid_chars(tBTA_HH_DEV_CB *p_dev_cb, tBTA_GATTC_SERV
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_le_srvc_search_cmpl
-**
-** Description      This function process the GATT service search complete.
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_le_srvc_search_cmpl
+ *
+ * Description      This function process the GATT service search complete.
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 void bta_hh_le_srvc_search_cmpl(tBTA_GATTC_SEARCH_CMPL *p_data)
 {
     tBTA_HH_DEV_CB *p_dev_cb = bta_hh_le_find_dev_cb_by_conn_id(p_data->conn_id);
@@ -1774,14 +1774,14 @@ void bta_hh_le_srvc_search_cmpl(tBTA_GATTC_SEARCH_CMPL *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_le_input_rpt_notify
-**
-** Description      process the notificaton event, most likely for input report.
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_le_input_rpt_notify
+ *
+ * Description      process the notificaton event, most likely for input report.
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 void bta_hh_le_input_rpt_notify(tBTA_GATTC_NOTIFY *p_data)
 {
     tBTA_HH_DEV_CB       *p_dev_cb = bta_hh_le_find_dev_cb_by_conn_id(p_data->conn_id);
@@ -1851,14 +1851,14 @@ void bta_hh_le_input_rpt_notify(tBTA_GATTC_NOTIFY *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_gatt_open_fail
-**
-** Description      action function to process the open fail
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_gatt_open_fail
+ *
+ * Description      action function to process the open fail
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hh_le_open_fail(tBTA_HH_DEV_CB *p_cb, tBTA_HH_DATA *p_data)
 {
     tBTA_HH_CONN            conn_dat ;
@@ -1887,14 +1887,14 @@ void bta_hh_le_open_fail(tBTA_HH_DEV_CB *p_cb, tBTA_HH_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_gatt_close
-**
-** Description      action function to process the GATT close int he state machine.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_gatt_close
+ *
+ * Description      action function to process the GATT close int he state machine.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hh_gatt_close(tBTA_HH_DEV_CB *p_cb, tBTA_HH_DATA *p_data)
 {
     tBTA_HH_CBDATA          disc_dat = {BTA_HH_OK, 0};
@@ -1931,14 +1931,14 @@ void bta_hh_gatt_close(tBTA_HH_DEV_CB *p_cb, tBTA_HH_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_le_api_disc_act
-**
-** Description      initaite a Close API to a remote HID device
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_le_api_disc_act
+ *
+ * Description      initaite a Close API to a remote HID device
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hh_le_api_disc_act(tBTA_HH_DEV_CB *p_cb)
 {
     if (p_cb->conn_id != BTA_GATT_INVALID_CONN_ID)
@@ -1953,15 +1953,15 @@ void bta_hh_le_api_disc_act(tBTA_HH_DEV_CB *p_cb)
 
 
 /*******************************************************************************
-**
-** Function         read_report_cb
-**
-** Description      Process the Read report complete, send GET_REPORT_EVT to application
-**                  with the report data.
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         read_report_cb
+ *
+ * Description      Process the Read report complete, send GET_REPORT_EVT to application
+ *                  with the report data.
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 static void read_report_cb(uint16_t conn_id, tGATT_STATUS status, uint16_t handle,
                            uint16_t len, uint8_t *value, void* data) {
     const tBTA_GATTC_CHARACTERISTIC *p_char = BTA_GATTC_GetCharacteristic(conn_id, handle);
@@ -2028,14 +2028,14 @@ static void read_report_cb(uint16_t conn_id, tGATT_STATUS status, uint16_t handl
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_le_get_rpt
-**
-** Description      GET_REPORT on a LE HID Report
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_le_get_rpt
+ *
+ * Description      GET_REPORT on a LE HID Report
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hh_le_get_rpt(tBTA_HH_DEV_CB *p_cb, tBTA_HH_RPT_TYPE r_type, uint8_t rpt_id)
 {
     tBTA_HH_LE_RPT  *p_rpt = bta_hh_le_find_rpt_by_idtype(p_cb->hid_srvc.report,
@@ -2079,14 +2079,14 @@ static void write_report_cb(uint16_t conn_id, tGATT_STATUS status, uint16_t hand
     (* bta_hh_cb.p_cback)(cb_evt, (tBTA_HH *)&cback_data);
 }
 /*******************************************************************************
-**
-** Function         bta_hh_le_write_rpt
-**
-** Description      SET_REPORT/or DATA output on a LE HID Report
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_le_write_rpt
+ *
+ * Description      SET_REPORT/or DATA output on a LE HID Report
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hh_le_write_rpt(tBTA_HH_DEV_CB *p_cb,
                          tBTA_HH_RPT_TYPE r_type,
                          BT_HDR *p_buf, uint16_t w4_evt )
@@ -2126,14 +2126,14 @@ void bta_hh_le_write_rpt(tBTA_HH_DEV_CB *p_cb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_le_suspend
-**
-** Description      send LE suspend or exit suspend mode to remote device.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_le_suspend
+ *
+ * Description      send LE suspend or exit suspend mode to remote device.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hh_le_suspend(tBTA_HH_DEV_CB *p_cb, tBTA_HH_TRANS_CTRL_TYPE ctrl_type)
 {
     ctrl_type -= BTA_HH_CTRL_SUSPEND;
@@ -2144,14 +2144,14 @@ void bta_hh_le_suspend(tBTA_HH_DEV_CB *p_cb, tBTA_HH_TRANS_CTRL_TYPE ctrl_type)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_le_write_dev_act
-**
-** Description      Write LE device action. can be SET/GET/DATA transaction.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_le_write_dev_act
+ *
+ * Description      Write LE device action. can be SET/GET/DATA transaction.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hh_le_write_dev_act(tBTA_HH_DEV_CB *p_cb, tBTA_HH_DATA *p_data)
 {
     switch(p_data->api_sndcmd.t_type)
@@ -2204,14 +2204,14 @@ void bta_hh_le_write_dev_act(tBTA_HH_DEV_CB *p_cb, tBTA_HH_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_le_get_dscp_act
-**
-** Description      Send ReportDescriptor to application for all HID services.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_le_get_dscp_act
+ *
+ * Description      Send ReportDescriptor to application for all HID services.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hh_le_get_dscp_act(tBTA_HH_DEV_CB *p_cb)
 {
     if (p_cb->hid_srvc.in_use)
@@ -2224,14 +2224,14 @@ void bta_hh_le_get_dscp_act(tBTA_HH_DEV_CB *p_cb)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_le_add_dev_bg_conn
-**
-** Description      Remove a LE HID device from back ground connection procedure.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_le_add_dev_bg_conn
+ *
+ * Description      Remove a LE HID device from back ground connection procedure.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_hh_le_add_dev_bg_conn(tBTA_HH_DEV_CB *p_cb, bool check_bond)
 {
     uint8_t           sec_flag=0;
@@ -2260,15 +2260,15 @@ static void bta_hh_le_add_dev_bg_conn(tBTA_HH_DEV_CB *p_cb, bool check_bond)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_le_add_device
-**
-** Description      Add a LE HID device as a known device, and also add the address
-**                  into back ground connection WL for incoming connection.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_le_add_device
+ *
+ * Description      Add a LE HID device as a known device, and also add the address
+ *                  into back ground connection WL for incoming connection.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 uint8_t bta_hh_le_add_device(tBTA_HH_DEV_CB *p_cb, tBTA_HH_MAINT_DEV *p_dev_info)
 {
     p_cb->hid_handle = BTA_HH_GET_LE_DEV_HDL(p_cb->index);
@@ -2296,14 +2296,14 @@ uint8_t bta_hh_le_add_device(tBTA_HH_DEV_CB *p_cb, tBTA_HH_MAINT_DEV *p_dev_info
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_le_remove_dev_bg_conn
-**
-** Description      Remove a LE HID device from back ground connection procedure.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_le_remove_dev_bg_conn
+ *
+ * Description      Remove a LE HID device from back ground connection procedure.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hh_le_remove_dev_bg_conn(tBTA_HH_DEV_CB *p_dev_cb)
 {
     if (p_dev_cb->in_bg_conn)
@@ -2318,14 +2318,14 @@ void bta_hh_le_remove_dev_bg_conn(tBTA_HH_DEV_CB *p_dev_cb)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_gattc_callback
-**
-** Description      This is GATT client callback function used in BTA HH.
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_gattc_callback
+ *
+ * Description      This is GATT client callback function used in BTA HH.
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 static void bta_hh_gattc_callback(tBTA_GATTC_EVT event, tBTA_GATTC *p_data)
 {
     tBTA_HH_DEV_CB *p_dev_cb;
@@ -2388,14 +2388,14 @@ static void read_report_descriptor_ccc_cb(uint16_t conn_id, tGATT_STATUS status,
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_le_hid_read_rpt_clt_cfg
-**
-** Description      a test command to read report descriptor client configuration
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_le_hid_read_rpt_clt_cfg
+ *
+ * Description      a test command to read report descriptor client configuration
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hh_le_hid_read_rpt_clt_cfg(BD_ADDR bd_addr, uint8_t rpt_id)
 {
     tBTA_HH_DEV_CB *p_cb = NULL;
@@ -2426,14 +2426,14 @@ void bta_hh_le_hid_read_rpt_clt_cfg(BD_ADDR bd_addr, uint8_t rpt_id)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_process_cache_rpt
-**
-** Description      Process the cached reports
-**
-** Parameters:
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_process_cache_rpt
+ *
+ * Description      Process the cached reports
+ *
+ * Parameters:
+ *
+ ******************************************************************************/
 //TODO(jpawlowski): uncomment when fixed
 // static void bta_hh_process_cache_rpt (tBTA_HH_DEV_CB *p_cb,
 //                                       tBTA_HH_RPT_CACHE_ENTRY *p_rpt_cache,
diff --git a/system/bta/hh/bta_hh_main.cc b/system/bta/hh/bta_hh_main.cc
index e7430c2b4e9..01085486bd8 100644
--- a/system/bta/hh/bta_hh_main.cc
+++ b/system/bta/hh/bta_hh_main.cc
@@ -33,8 +33,8 @@
 #include "bt_common.h"
 
 /*****************************************************************************
-** Constants and types
-*****************************************************************************/
+ * Constants and types
+ ****************************************************************************/
 
 /* state machine action enumeration list */
 enum
@@ -213,28 +213,28 @@ const tBTA_HH_ST_TBL bta_hh_st_tbl[] =
 };
 
 /*****************************************************************************
-** Global data
-*****************************************************************************/
+ * Global data
+ ****************************************************************************/
 tBTA_HH_CB  bta_hh_cb;
 
 /*****************************************************************************
-** Static functions
-*****************************************************************************/
+ * Static functions
+ ****************************************************************************/
 #if (BTA_HH_DEBUG == TRUE)
 static const char *bta_hh_evt_code(tBTA_HH_INT_EVT evt_code);
 static const char *bta_hh_state_code(tBTA_HH_STATE state_code);
 #endif
 
 /*******************************************************************************
-**
-** Function         bta_hh_sm_execute
-**
-** Description      State machine event handling function for HID Host
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_sm_execute
+ *
+ * Description      State machine event handling function for HID Host
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hh_sm_execute(tBTA_HH_DEV_CB *p_cb, uint16_t event, tBTA_HH_DATA * p_data)
 {
     tBTA_HH_ST_TBL  state_table;
@@ -368,15 +368,15 @@ void bta_hh_sm_execute(tBTA_HH_DEV_CB *p_cb, uint16_t event, tBTA_HH_DATA * p_da
     return;
 }
 /*******************************************************************************
-**
-** Function         bta_hh_hdl_event
-**
-** Description      HID host main event handling function.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_hdl_event
+ *
+ * Description      HID host main event handling function.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 bool bta_hh_hdl_event(BT_HDR *p_msg)
 {
     uint8_t           index = BTA_HH_IDX_INVALID;
@@ -444,18 +444,18 @@ bool bta_hh_hdl_event(BT_HDR *p_msg)
 }
 
 /*****************************************************************************
-**  Debug Functions
-*****************************************************************************/
+ *  Debug Functions
+ ****************************************************************************/
 #if (BTA_HH_DEBUG == TRUE)
 /*******************************************************************************
-**
-** Function         bta_hh_evt_code
-**
-** Description
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_evt_code
+ *
+ * Description
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static const char *bta_hh_evt_code(tBTA_HH_INT_EVT evt_code)
 {
   switch(evt_code)
@@ -506,14 +506,14 @@ static const char *bta_hh_evt_code(tBTA_HH_INT_EVT evt_code)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_state_code
-**
-** Description      get string representation of HID host state code.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_state_code
+ *
+ * Description      get string representation of HID host state code.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static const char *bta_hh_state_code(tBTA_HH_STATE state_code)
 {
     switch (state_code)
diff --git a/system/bta/hh/bta_hh_utils.cc b/system/bta/hh/bta_hh_utils.cc
index fd80577f92f..7504db2fa22 100644
--- a/system/bta/hh/bta_hh_utils.cc
+++ b/system/bta/hh/bta_hh_utils.cc
@@ -29,8 +29,8 @@
 #define BTA_HH_GET_DEF_SSR_MAX_LAT(x)   ((x)>> 1)
 
 /*****************************************************************************
-**  Constants
-*****************************************************************************/
+ *  Constants
+ ****************************************************************************/
 #define BTA_HH_KB_CTRL_MASK         0x11
 #define BTA_HH_KB_SHIFT_MASK        0x22
 #define BTA_HH_KB_ALT_MASK          0x44
@@ -52,15 +52,15 @@ static const uint8_t bta_hh_mod_key_mask[BTA_HH_MOD_MAX_KEY] =
 
 
 /*******************************************************************************
-**
-** Function         bta_hh_find_cb
-**
-** Description      Find best available control block according to BD address.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_find_cb
+ *
+ * Description      Find best available control block according to BD address.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 uint8_t  bta_hh_find_cb(BD_ADDR bda)
 {
     uint8_t xx;
@@ -109,15 +109,15 @@ uint8_t  bta_hh_find_cb(BD_ADDR bda)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_clean_up_kdev
-**
-** Description      Clean up device control block when device is removed from
-**                  manitainace list, and update control block index map.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_clean_up_kdev
+ *
+ * Description      Clean up device control block when device is removed from
+ *                  manitainace list, and update control block index map.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hh_clean_up_kdev(tBTA_HH_DEV_CB *p_cb)
 {
     uint8_t index;
@@ -146,14 +146,14 @@ void bta_hh_clean_up_kdev(tBTA_HH_DEV_CB *p_cb)
 
 }
 /*******************************************************************************
-**
-** Function         bta_hh_update_di_info
-**
-** Description      Maintain a known device list for BTA HH.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_update_di_info
+ *
+ * Description      Maintain a known device list for BTA HH.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hh_update_di_info(tBTA_HH_DEV_CB *p_cb, uint16_t vendor_id, uint16_t product_id,
                            uint16_t version,
 #if (BTA_HH_LE_INCLUDED == TRUE)
@@ -174,14 +174,14 @@ void bta_hh_update_di_info(tBTA_HH_DEV_CB *p_cb, uint16_t vendor_id, uint16_t pr
 #endif
 }
 /*******************************************************************************
-**
-** Function         bta_hh_add_device_to_list
-**
-** Description      Maintain a known device list for BTA HH.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_add_device_to_list
+ *
+ * Description      Maintain a known device list for BTA HH.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hh_add_device_to_list(tBTA_HH_DEV_CB *p_cb, uint8_t handle,
                                uint16_t attr_mask,
                                tHID_DEV_DSCP_INFO *p_dscp_info,
@@ -219,14 +219,14 @@ void bta_hh_add_device_to_list(tBTA_HH_DEV_CB *p_cb, uint8_t handle,
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_tod_spt
-**
-** Description      Check to see if this type of device is supported
-**
-** Returns
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_tod_spt
+ *
+ * Description      Check to see if this type of device is supported
+ *
+ * Returns
+ *
+ ******************************************************************************/
 bool bta_hh_tod_spt(tBTA_HH_DEV_CB *p_cb,uint8_t sub_class)
 {
     uint8_t    xx;
@@ -251,14 +251,14 @@ bool bta_hh_tod_spt(tBTA_HH_DEV_CB *p_cb,uint8_t sub_class)
 
 
 /*******************************************************************************
-**
-** Function         bta_hh_parse_keybd_rpt
-**
-** Description      This utility function parse a boot mode keyboard report.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_parse_keybd_rpt
+ *
+ * Description      This utility function parse a boot mode keyboard report.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hh_parse_keybd_rpt(tBTA_HH_BOOT_RPT *p_kb_data, uint8_t *p_report,
                             uint16_t report_len)
 {
@@ -348,14 +348,14 @@ void bta_hh_parse_keybd_rpt(tBTA_HH_BOOT_RPT *p_kb_data, uint8_t *p_report,
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_parse_mice_rpt
-**
-** Description      This utility function parse a boot mode mouse report.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_parse_mice_rpt
+ *
+ * Description      This utility function parse a boot mode mouse report.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hh_parse_mice_rpt(tBTA_HH_BOOT_RPT *p_mice_data, uint8_t *p_report,
                            uint16_t report_len)
 {
@@ -400,14 +400,14 @@ void bta_hh_parse_mice_rpt(tBTA_HH_BOOT_RPT *p_mice_data, uint8_t *p_report,
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_read_ssr_param
-**
-** Description      Read the SSR Parameter for the remote device
-**
-** Returns          tBTA_HH_STATUS  operation status
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_read_ssr_param
+ *
+ * Description      Read the SSR Parameter for the remote device
+ *
+ * Returns          tBTA_HH_STATUS  operation status
+ *
+ ******************************************************************************/
 tBTA_HH_STATUS bta_hh_read_ssr_param(BD_ADDR bd_addr, uint16_t *p_max_ssr_lat, uint16_t *p_min_ssr_tout)
 {
     tBTA_HH_STATUS  status = BTA_HH_ERR;
@@ -453,15 +453,15 @@ tBTA_HH_STATUS bta_hh_read_ssr_param(BD_ADDR bd_addr, uint16_t *p_max_ssr_lat, u
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_cleanup_disable
-**
-** Description      when disable finished, cleanup control block and send callback
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_cleanup_disable
+ *
+ * Description      when disable finished, cleanup control block and send callback
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hh_cleanup_disable(tBTA_HH_STATUS status)
 {
     uint8_t   xx;
@@ -477,15 +477,15 @@ void bta_hh_cleanup_disable(tBTA_HH_STATUS status)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hh_dev_handle_to_cb_idx
-**
-** Description      convert a HID device handle to the device control block index.
-**
-**
-** Returns          uint8_t: index of the device control block.
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_dev_handle_to_cb_idx
+ *
+ * Description      convert a HID device handle to the device control block index.
+ *
+ *
+ * Returns          uint8_t: index of the device control block.
+ *
+ ******************************************************************************/
 uint8_t bta_hh_dev_handle_to_cb_idx(uint8_t dev_handle)
 {
     uint8_t index = BTA_HH_IDX_INVALID;
@@ -510,14 +510,14 @@ uint8_t bta_hh_dev_handle_to_cb_idx(uint8_t dev_handle)
 }
 #if (BTA_HH_DEBUG == TRUE)
 /*******************************************************************************
-**
-** Function         bta_hh_trace_dev_db
-**
-** Description      Check to see if this type of device is supported
-**
-** Returns
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_trace_dev_db
+ *
+ * Description      Check to see if this type of device is supported
+ *
+ * Returns
+ *
+ ******************************************************************************/
 void bta_hh_trace_dev_db(void)
 {
     uint8_t    xx;
diff --git a/system/bta/hl/bta_hl_act.cc b/system/bta/hl/bta_hl_act.cc
index fa35fc383a6..1d6fa6be426 100644
--- a/system/bta/hl/bta_hl_act.cc
+++ b/system/bta/hl/bta_hl_act.cc
@@ -41,8 +41,8 @@
 #include "osi/include/osi.h"
 
 /*****************************************************************************
-**  Local Function prototypes
-*****************************************************************************/
+ *  Local Function prototypes
+ ****************************************************************************/
 #if (BTA_HL_DEBUG == TRUE && BT_TRACE_VERBOSE == TRUE)
 static char *bta_hl_mcap_evt_code(uint8_t evt_code);
 static char *bta_hl_dch_oper_code(tBTA_HL_DCH_OPER oper_code);
@@ -73,14 +73,14 @@ static tSDP_DISC_CMPL_CB * const bta_hl_sdp_cback_arr[] =
 
 
 /*******************************************************************************
-**
-** Function         bta_hl_dch_mca_cong_change
-**
-** Description      Action routine for processing congestion change notification
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_dch_mca_cong_change
+ *
+ * Description      Action routine for processing congestion change notification
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hl_dch_mca_cong_change(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
                                 tBTA_HL_DATA *p_data)
 {
@@ -107,14 +107,14 @@ void bta_hl_dch_mca_cong_change(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_id
 
 
 /*******************************************************************************
-**
-** Function         bta_hl_dch_echo_test
-**
-** Description      Action routine for processing echo test request
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_dch_echo_test
+ *
+ * Description      Action routine for processing echo test request
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hl_dch_echo_test(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
                           UNUSED_ATTR tBTA_HL_DATA *p_data)
 {
@@ -136,14 +136,14 @@ void bta_hl_dch_echo_test(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
 
 }
 /*******************************************************************************
-**
-** Function         bta_hl_dch_sdp_init
-**
-** Description      Action routine for processing DCH SDP initiation
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_dch_sdp_init
+ *
+ * Description      Action routine for processing DCH SDP initiation
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hl_dch_sdp_init(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
                          tBTA_HL_DATA *p_data)
 {
@@ -182,14 +182,14 @@ void bta_hl_dch_sdp_init(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
 
 
 /*******************************************************************************
-**
-** Function         bta_hl_dch_close_echo_test
-**
-** Description      Action routine for processing the closing of echo test
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_dch_close_echo_test
+ *
+ * Description      Action routine for processing the closing of echo test
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hl_dch_close_echo_test(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
                                 tBTA_HL_DATA *p_data)
 {
@@ -221,14 +221,14 @@ void bta_hl_dch_close_echo_test(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_id
 
 
 /*******************************************************************************
-**
-** Function         bta_hl_dch_mca_rcv_data
-**
-** Description      Action routine for processing the received data
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_dch_mca_rcv_data
+ *
+ * Description      Action routine for processing the received data
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hl_dch_mca_rcv_data(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
                              tBTA_HL_DATA *p_data)
 {
@@ -286,15 +286,15 @@ void bta_hl_dch_mca_rcv_data(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
 
 
 /*******************************************************************************
-**
-** Function         bta_hl_dch_ci_put_echo_data
-**
-** Description      Action routine for processing the call-in of the
-**                  put echo data event
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_dch_ci_put_echo_data
+ *
+ * Description      Action routine for processing the call-in of the
+ *                  put echo data event
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hl_dch_ci_put_echo_data(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
                                  tBTA_HL_DATA *p_data)
 {
@@ -315,15 +315,15 @@ void bta_hl_dch_ci_put_echo_data(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_i
 
 
 /*******************************************************************************
-**
-** Function         bta_hl_dch_ci_get_echo_data
-**
-** Description      Action routine for processing the call-in of the
-**                  get echo data event
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_dch_ci_get_echo_data
+ *
+ * Description      Action routine for processing the call-in of the
+ *                  get echo data event
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hl_dch_ci_get_echo_data(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
                                  tBTA_HL_DATA *p_data)
 {
@@ -357,15 +357,15 @@ void bta_hl_dch_ci_get_echo_data(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_i
 }
 
 /*******************************************************************************
-**
-** Function         bta_hl_dch_ci_put_rx_data
-**
-** Description      Action routine for processing the call-in of the
-**                  put rx data event
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_dch_ci_put_rx_data
+ *
+ * Description      Action routine for processing the call-in of the
+ *                  put rx data event
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hl_dch_ci_put_rx_data(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
                                tBTA_HL_DATA *p_data)
 {
@@ -398,15 +398,15 @@ void bta_hl_dch_ci_put_rx_data(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx
 
 
 /*******************************************************************************
-**
-** Function         bta_hl_dch_ci_get_tx_data
-**
-** Description      Action routine for processing the call-in of the
-**                  get tx data event
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_dch_ci_get_tx_data
+ *
+ * Description      Action routine for processing the call-in of the
+ *                  get tx data event
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hl_dch_ci_get_tx_data(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
                                tBTA_HL_DATA *p_data)
 {
@@ -474,14 +474,14 @@ void bta_hl_dch_ci_get_tx_data(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx
 
 
 /*******************************************************************************
-**
-** Function         bta_hl_dch_send_data
-**
-** Description      Action routine for processing api send data request
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_dch_send_data
+ *
+ * Description      Action routine for processing api send data request
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hl_dch_send_data(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
                           tBTA_HL_DATA *p_data)
 {
@@ -530,14 +530,14 @@ void bta_hl_dch_send_data(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
 }
 
 /*******************************************************************************
-**
-** Function         bta_hl_dch_close_cmpl
-**
-** Description      Action routine for processing the close complete event
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_dch_close_cmpl
+ *
+ * Description      Action routine for processing the close complete event
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hl_dch_close_cmpl(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
                            tBTA_HL_DATA *p_data)
 {
@@ -723,14 +723,14 @@ void bta_hl_dch_close_cmpl(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
     bta_hl_check_cch_close(app_idx, mcl_idx, p_data, false);
 }
 /*******************************************************************************
-**
-** Function         bta_hl_dch_mca_close_ind
-**
-** Description      Action routine for processing the close indication
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_dch_mca_close_ind
+ *
+ * Description      Action routine for processing the close indication
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hl_dch_mca_close_ind(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
                               tBTA_HL_DATA *p_data)
 {
@@ -766,14 +766,14 @@ void bta_hl_dch_mca_close_ind(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
 }
 
 /*******************************************************************************
-**
-** Function         bta_hl_dch_mca_close_cfm
-**
-** Description      Action routine for processing the close confirmation
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_dch_mca_close_cfm
+ *
+ * Description      Action routine for processing the close confirmation
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hl_dch_mca_close_cfm(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
                               tBTA_HL_DATA *p_data)
 {
@@ -813,14 +813,14 @@ void bta_hl_dch_mca_close_cfm(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
 }
 
 /*******************************************************************************
-**
-** Function         bta_hl_dch_mca_close
-**
-** Description      Action routine for processing the DCH close request
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_dch_mca_close
+ *
+ * Description      Action routine for processing the DCH close request
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hl_dch_mca_close(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
                           tBTA_HL_DATA *p_data)
 {
@@ -864,14 +864,14 @@ void bta_hl_dch_mca_close(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
 
 
 /*******************************************************************************
-**
-** Function         bta_hl_dch_mca_open_ind
-**
-** Description      Action routine for processing the open indication
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_dch_mca_open_ind
+ *
+ * Description      Action routine for processing the open indication
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hl_dch_mca_open_ind(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
                              tBTA_HL_DATA *p_data)
 {
@@ -971,14 +971,14 @@ void bta_hl_dch_mca_open_ind(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
 }
 
 /*******************************************************************************
-**
-** Function         bta_hl_dch_mca_open_cfm
-**
-** Description      Action routine for processing the open confirmation
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_dch_mca_open_cfm
+ *
+ * Description      Action routine for processing the open confirmation
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hl_dch_mca_open_cfm(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
                              tBTA_HL_DATA *p_data)
 {
@@ -1092,14 +1092,14 @@ void bta_hl_dch_mca_open_cfm(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
 
 
 /*******************************************************************************
-**
-** Function         bta_hl_dch_mca_abort_ind
-**
-** Description      Action routine for processing the abort indication
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_dch_mca_abort_ind
+ *
+ * Description      Action routine for processing the abort indication
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hl_dch_mca_abort_ind(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
                               tBTA_HL_DATA *p_data)
 {
@@ -1115,14 +1115,14 @@ void bta_hl_dch_mca_abort_ind(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
 }
 
 /*******************************************************************************
-**
-** Function         bta_hl_dch_mca_abort_cfm
-**
-** Description      Action routine for processing the abort confirmation
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_dch_mca_abort_cfm
+ *
+ * Description      Action routine for processing the abort confirmation
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hl_dch_mca_abort_cfm(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
                               tBTA_HL_DATA *p_data)
 {
@@ -1160,14 +1160,14 @@ void bta_hl_dch_mca_abort_cfm(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
 }
 
 /*******************************************************************************
-**
-** Function         bta_hl_dch_mca_abort
-**
-** Description      Action routine for processing the abort request
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_dch_mca_abort
+ *
+ * Description      Action routine for processing the abort request
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hl_dch_mca_abort(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
                           tBTA_HL_DATA *p_data)
 {
@@ -1221,14 +1221,14 @@ void bta_hl_dch_mca_abort(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
 }
 
 /*******************************************************************************
-**
-** Function         bta_hl_dch_mca_reconnect_ind
-**
-** Description      Action routine for processing the reconnect indication
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_dch_mca_reconnect_ind
+ *
+ * Description      Action routine for processing the reconnect indication
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hl_dch_mca_reconnect_ind(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
                                   tBTA_HL_DATA *p_data)
 {
@@ -1295,14 +1295,14 @@ void bta_hl_dch_mca_reconnect_ind(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_
 }
 
 /*******************************************************************************
-**
-** Function         bta_hl_dch_mca_reconnect_cfm
-**
-** Description      Action routine for processing the reconenct confirmation
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_dch_mca_reconnect_cfm
+ *
+ * Description      Action routine for processing the reconenct confirmation
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hl_dch_mca_reconnect_cfm(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
                                   tBTA_HL_DATA *p_data)
 {
@@ -1344,14 +1344,14 @@ void bta_hl_dch_mca_reconnect_cfm(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_
 }
 
 /*******************************************************************************
-**
-** Function         bta_hl_dch_mca_reconnect
-**
-** Description      Action routine for processing the reconnect request
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_dch_mca_reconnect
+ *
+ * Description      Action routine for processing the reconnect request
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hl_dch_mca_reconnect(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
                               tBTA_HL_DATA *p_data)
 {
@@ -1383,14 +1383,14 @@ void bta_hl_dch_mca_reconnect(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
 
 
 /*******************************************************************************
-**
-** Function         bta_hl_dch_create_rsp
-**
-** Description      Action routine for processing BTA_HL_API_DCH_CREATE_RSP_EVT
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_dch_create_rsp
+ *
+ * Description      Action routine for processing BTA_HL_API_DCH_CREATE_RSP_EVT
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hl_dch_create_rsp(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
                            tBTA_HL_DATA *p_data)
 {
@@ -1428,14 +1428,14 @@ void bta_hl_dch_create_rsp(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
 }
 
 /*******************************************************************************
-**
-** Function         bta_hl_dch_mca_create_ind
-**
-** Description      Action routine for processing
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_dch_mca_create_ind
+ *
+ * Description      Action routine for processing
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hl_dch_mca_create_ind(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
                                tBTA_HL_DATA *p_data)
 {
@@ -1534,14 +1534,14 @@ void bta_hl_dch_mca_create_ind(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx
 }
 
 /*******************************************************************************
-**
-** Function         bta_hl_dch_mca_create_cfm
-**
-** Description      Action routine for processing
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_dch_mca_create_cfm
+ *
+ * Description      Action routine for processing
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hl_dch_mca_create_cfm(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
                                tBTA_HL_DATA *p_data)
 {
@@ -1598,14 +1598,14 @@ void bta_hl_dch_mca_create_cfm(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx
 }
 
 /*******************************************************************************
-**
-** Function         bta_hl_dch_mca_create
-**
-** Description      Action routine for processing the MDL create request
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_dch_mca_create
+ *
+ * Description      Action routine for processing the MDL create request
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hl_dch_mca_create(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
                            tBTA_HL_DATA *p_data)
 {
@@ -1646,14 +1646,14 @@ void bta_hl_dch_mca_create(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
 }
 
 /*******************************************************************************
-**
-** Function         bta_hl_dch_sdp_fail
-**
-** Description      Action routine for processing the SDP failed event
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_dch_sdp_fail
+ *
+ * Description      Action routine for processing the SDP failed event
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hl_dch_sdp_fail(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
                          tBTA_HL_DATA *p_data)
 {
@@ -1665,19 +1665,19 @@ void bta_hl_dch_sdp_fail(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
 }
 
 /******************************************************************************
-**
-** Function         bta_hl_sdp_cback
-**
-** Description      This is the SDP callback function used by HL.
-**                  This function will be executed by SDP when the service
-**                  search is completed.  If the search is successful, it
-**                  finds the first record in the database that matches the
-**                  UUID of the search.  Then retrieves the scn from the
-**                  record.
-**
-** Returns          void.
-**
-******************************************************************************/
+ *
+ * Function         bta_hl_sdp_cback
+ *
+ * Description      This is the SDP callback function used by HL.
+ *                  This function will be executed by SDP when the service
+ *                  search is completed.  If the search is successful, it
+ *                  finds the first record in the database that matches the
+ *                  UUID of the search.  Then retrieves the scn from the
+ *                  record.
+ *
+ * Returns          void.
+ *
+ *****************************************************************************/
 static void bta_hl_sdp_cback(uint8_t sdp_oper, uint8_t app_idx, uint8_t mcl_idx,
                              uint8_t mdl_idx, uint16_t status)
 {
@@ -1928,14 +1928,14 @@ static void bta_hl_sdp_cback(uint8_t sdp_oper, uint8_t app_idx, uint8_t mcl_idx,
 
 
 /******************************************************************************
-**
-** Function         bta_hl_sdp_cback0
-**
-** Description      This is the SDP callback function used by index = 0
-**
-** Returns          void.
-**
-******************************************************************************/
+ *
+ * Function         bta_hl_sdp_cback0
+ *
+ * Description      This is the SDP callback function used by index = 0
+ *
+ * Returns          void.
+ *
+ *****************************************************************************/
 static void bta_hl_sdp_cback0(uint16_t status)
 {
     bta_hl_sdp_cback(bta_hl_cb.scb[0].sdp_oper,
@@ -1947,16 +1947,16 @@ static void bta_hl_sdp_cback0(uint16_t status)
 }
 
 /******************************************************************************
-**
-** Function         bta_hl_sdp_cback1
-**
-** Description      This is the SDP callback function used by index = 1
-**
-** Parameters       status  - status of the SDP callabck
-**
-** Returns          void.
-**
-******************************************************************************/
+ *
+ * Function         bta_hl_sdp_cback1
+ *
+ * Description      This is the SDP callback function used by index = 1
+ *
+ * Parameters       status  - status of the SDP callabck
+ *
+ * Returns          void.
+ *
+ *****************************************************************************/
 static void bta_hl_sdp_cback1(uint16_t status)
 {
     bta_hl_sdp_cback(bta_hl_cb.scb[1].sdp_oper,
@@ -1968,14 +1968,14 @@ static void bta_hl_sdp_cback1(uint16_t status)
 }
 
 /******************************************************************************
-**
-** Function         bta_hl_sdp_cback2
-**
-** Description      This is the SDP callback function used by index = 2
-**
-** Returns          void.
-**
-******************************************************************************/
+ *
+ * Function         bta_hl_sdp_cback2
+ *
+ * Description      This is the SDP callback function used by index = 2
+ *
+ * Returns          void.
+ *
+ *****************************************************************************/
 static void bta_hl_sdp_cback2(uint16_t status)
 {
     bta_hl_sdp_cback(bta_hl_cb.scb[2].sdp_oper,
@@ -1987,14 +1987,14 @@ static void bta_hl_sdp_cback2(uint16_t status)
 }
 
 /******************************************************************************
-**
-** Function         bta_hl_sdp_cback3
-**
-** Description      This is the SDP callback function used by index = 3
-**
-** Returns          void.
-**
-******************************************************************************/
+ *
+ * Function         bta_hl_sdp_cback3
+ *
+ * Description      This is the SDP callback function used by index = 3
+ *
+ * Returns          void.
+ *
+ *****************************************************************************/
 static void bta_hl_sdp_cback3(uint16_t status)
 {
     bta_hl_sdp_cback(bta_hl_cb.scb[3].sdp_oper,
@@ -2006,16 +2006,16 @@ static void bta_hl_sdp_cback3(uint16_t status)
 }
 
 /******************************************************************************
-**
-** Function         bta_hl_sdp_cback4
-**
-** Description      This is the SDP callback function used by index = 4
-**
-** Parameters       status  - status of the SDP callabck
-**
-** Returns          void.
-**
-******************************************************************************/
+ *
+ * Function         bta_hl_sdp_cback4
+ *
+ * Description      This is the SDP callback function used by index = 4
+ *
+ * Parameters       status  - status of the SDP callabck
+ *
+ * Returns          void.
+ *
+ *****************************************************************************/
 static void bta_hl_sdp_cback4(uint16_t status)
 {
     bta_hl_sdp_cback(bta_hl_cb.scb[4].sdp_oper,
@@ -2027,16 +2027,16 @@ static void bta_hl_sdp_cback4(uint16_t status)
 }
 
 /******************************************************************************
-**
-** Function         bta_hl_sdp_cback5
-**
-** Description      This is the SDP callback function used by index = 5
-**
-** Parameters       status  - status of the SDP callabck
-**
-** Returns          void.
-**
-******************************************************************************/
+ *
+ * Function         bta_hl_sdp_cback5
+ *
+ * Description      This is the SDP callback function used by index = 5
+ *
+ * Parameters       status  - status of the SDP callabck
+ *
+ * Returns          void.
+ *
+ *****************************************************************************/
 static void bta_hl_sdp_cback5(uint16_t status)
 {
     bta_hl_sdp_cback(bta_hl_cb.scb[5].sdp_oper,
@@ -2048,14 +2048,14 @@ static void bta_hl_sdp_cback5(uint16_t status)
 }
 
 /******************************************************************************
-**
-** Function         bta_hl_sdp_cback6
-**
-** Description      This is the SDP callback function used by index = 6
-**
-** Returns          void.
-**
-******************************************************************************/
+ *
+ * Function         bta_hl_sdp_cback6
+ *
+ * Description      This is the SDP callback function used by index = 6
+ *
+ * Returns          void.
+ *
+ *****************************************************************************/
 static void bta_hl_sdp_cback6(uint16_t status)
 {
     bta_hl_sdp_cback(bta_hl_cb.scb[6].sdp_oper,
@@ -2068,15 +2068,15 @@ static void bta_hl_sdp_cback6(uint16_t status)
 
 
 /*******************************************************************************
-**
-** Function      bta_hl_deallocate_spd_cback
-**
-** Description   Deallocate a SDP control block
-**
-** Returns      bool - true found
-**                        false not found
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_deallocate_spd_cback
+ *
+ * Description   Deallocate a SDP control block
+ *
+ * Returns      bool - true found
+ *                        false not found
+ *
+ ******************************************************************************/
 void bta_hl_deallocate_spd_cback(uint8_t sdp_cback_idx)
 {
     tBTA_HL_SDP_CB *p_spd_cb = &bta_hl_cb.scb[sdp_cback_idx];
@@ -2091,16 +2091,16 @@ void bta_hl_deallocate_spd_cback(uint8_t sdp_cback_idx)
 }
 
 /*******************************************************************************
-**
-** Function      bta_hl_allocate_spd_cback
-**
-** Description   Finds a not in used SDP control block index
-**
-**
-** Returns      bool - true found
-**                        false not found
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_allocate_spd_cback
+ *
+ * Description   Finds a not in used SDP control block index
+ *
+ *
+ * Returns      bool - true found
+ *                        false not found
+ *
+ ******************************************************************************/
 tSDP_DISC_CMPL_CB *bta_hl_allocate_spd_cback(tBTA_HL_SDP_OPER sdp_oper, uint8_t app_idx, uint8_t mcl_idx,
                                              uint8_t mdl_idx,
                                              uint8_t *p_sdp_cback_idx)
@@ -2144,14 +2144,14 @@ tSDP_DISC_CMPL_CB *bta_hl_allocate_spd_cback(tBTA_HL_SDP_OPER sdp_oper, uint8_t
 
 
 /*******************************************************************************
-**
-** Function         bta_hl_init_sdp
-**
-** Description      Action routine for processing the SDP initiattion request
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_init_sdp
+ *
+ * Description      Action routine for processing the SDP initiattion request
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 tBTA_HL_STATUS bta_hl_init_sdp(tBTA_HL_SDP_OPER sdp_oper, uint8_t app_idx, uint8_t mcl_idx,
                                uint8_t mdl_idx)
 {
@@ -2204,14 +2204,14 @@ tBTA_HL_STATUS bta_hl_init_sdp(tBTA_HL_SDP_OPER sdp_oper, uint8_t app_idx, uint8
 }
 
 /*******************************************************************************
-**
-** Function         bta_hl_cch_sdp_init
-**
-** Description      Action routine for processing the CCH SDP init event
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_cch_sdp_init
+ *
+ * Description      Action routine for processing the CCH SDP init event
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hl_cch_sdp_init(uint8_t app_idx, uint8_t mcl_idx,  tBTA_HL_DATA *p_data)
 {
     tBTA_HL_MCL_CB      *p_cb  = BTA_HL_GET_MCL_CB_PTR(app_idx, mcl_idx);
@@ -2237,14 +2237,14 @@ void bta_hl_cch_sdp_init(uint8_t app_idx, uint8_t mcl_idx,  tBTA_HL_DATA *p_data
 }
 
 /*******************************************************************************
-**
-** Function         bta_hl_cch_mca_open
-**
-** Description      Action routine for processing the CCH open request
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_cch_mca_open
+ *
+ * Description      Action routine for processing the CCH open request
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hl_cch_mca_open(uint8_t app_idx, uint8_t mcl_idx,  tBTA_HL_DATA *p_data)
 {
     tBTA_HL_APP_CB      *p_acb  = BTA_HL_GET_APP_CB_PTR(app_idx);
@@ -2275,14 +2275,14 @@ void bta_hl_cch_mca_open(uint8_t app_idx, uint8_t mcl_idx,  tBTA_HL_DATA *p_data
 }
 
 /*******************************************************************************
-**
-** Function         bta_hl_cch_mca_close
-**
-** Description      Action routine for processing the CCH close request
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_cch_mca_close
+ *
+ * Description      Action routine for processing the CCH close request
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hl_cch_mca_close(uint8_t app_idx, uint8_t mcl_idx,  tBTA_HL_DATA *p_data)
 {
     tBTA_HL_MCL_CB      *p_mcb  = BTA_HL_GET_MCL_CB_PTR(app_idx, mcl_idx);
@@ -2313,14 +2313,14 @@ void bta_hl_cch_mca_close(uint8_t app_idx, uint8_t mcl_idx,  tBTA_HL_DATA *p_dat
 }
 
 /*******************************************************************************
-**
-** Function         bta_hl_cch_close_cmpl
-**
-** Description      Action routine for processing the CCH close complete event
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_cch_close_cmpl
+ *
+ * Description      Action routine for processing the CCH close complete event
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hl_cch_close_cmpl(uint8_t app_idx, uint8_t mcl_idx,  tBTA_HL_DATA *p_data)
 {
     tBTA_HL_APP_CB      *p_acb  = BTA_HL_GET_APP_CB_PTR(app_idx);
@@ -2376,14 +2376,14 @@ void bta_hl_cch_close_cmpl(uint8_t app_idx, uint8_t mcl_idx,  tBTA_HL_DATA *p_da
 }
 
 /*******************************************************************************
-**
-** Function         bta_hl_cch_mca_disconnect
-**
-** Description      Action routine for processing the CCH disconnect indication
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_cch_mca_disconnect
+ *
+ * Description      Action routine for processing the CCH disconnect indication
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hl_cch_mca_disconnect(uint8_t app_idx, uint8_t mcl_idx,  tBTA_HL_DATA *p_data)
 {
 
@@ -2419,14 +2419,14 @@ void bta_hl_cch_mca_disconnect(uint8_t app_idx, uint8_t mcl_idx,  tBTA_HL_DATA *
 }
 
 /*******************************************************************************
-**
-** Function         bta_hl_cch_mca_disc_open
-**
-** Description      Action routine for disconnect the just opened Control channel
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_cch_mca_disc_open
+ *
+ * Description      Action routine for disconnect the just opened Control channel
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hl_cch_mca_disc_open(uint8_t app_idx, uint8_t mcl_idx,  tBTA_HL_DATA *p_data)
 {
     tBTA_HL_MCL_CB      *p_mcb  = BTA_HL_GET_MCL_CB_PTR(app_idx, mcl_idx);
@@ -2441,14 +2441,14 @@ void bta_hl_cch_mca_disc_open(uint8_t app_idx, uint8_t mcl_idx,  tBTA_HL_DATA *p
 }
 
 /*******************************************************************************
-**
-** Function         bta_hl_cch_mca_rsp_tout
-**
-** Description      Action routine for processing the MCAP response timeout
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_cch_mca_rsp_tout
+ *
+ * Description      Action routine for processing the MCAP response timeout
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hl_cch_mca_rsp_tout(uint8_t app_idx, uint8_t mcl_idx,  tBTA_HL_DATA *p_data)
 {
 
@@ -2463,14 +2463,14 @@ void bta_hl_cch_mca_rsp_tout(uint8_t app_idx, uint8_t mcl_idx,  tBTA_HL_DATA *p_
 }
 
 /*******************************************************************************
-**
-** Function         bta_hl_cch_mca_connect
-**
-** Description      Action routine for processing the CCH connect indication
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_cch_mca_connect
+ *
+ * Description      Action routine for processing the CCH connect indication
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hl_cch_mca_connect(uint8_t app_idx, uint8_t mcl_idx,  tBTA_HL_DATA *p_data)
 {
     tBTA_HL_APP_CB      *p_acb  = BTA_HL_GET_APP_CB_PTR(app_idx);
@@ -2513,14 +2513,14 @@ void bta_hl_cch_mca_connect(uint8_t app_idx, uint8_t mcl_idx,  tBTA_HL_DATA *p_d
 }
 
 /*******************************************************************************
-**
-** Function         bta_hl_mcap_ctrl_cback
-**
-** Description      MCAP control callback function for HL.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_mcap_ctrl_cback
+ *
+ * Description      MCAP control callback function for HL.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hl_mcap_ctrl_cback (tMCA_HANDLE handle, tMCA_CL mcl, uint8_t event,
                              tMCA_CTRL *p_data)
 {
@@ -2605,14 +2605,14 @@ void bta_hl_mcap_ctrl_cback (tMCA_HANDLE handle, tMCA_CL mcl, uint8_t event,
 }
 
 /*******************************************************************************
-**
-** Function         bta_hl_mcap_data_cback
-**
-** Description      MCAP data callback function for HL.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_mcap_data_cback
+ *
+ * Description      MCAP data callback function for HL.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hl_mcap_data_cback (tMCA_DL mdl, BT_HDR *p_pkt)
 {
     uint8_t app_idx, mcl_idx, mdl_idx;
@@ -2630,19 +2630,19 @@ void bta_hl_mcap_data_cback (tMCA_DL mdl, BT_HDR *p_pkt)
 }
 
 /*****************************************************************************
-**  Debug Functions
-*****************************************************************************/
+ *  Debug Functions
+ ****************************************************************************/
 #if (BTA_HL_DEBUG == TRUE && BT_TRACE_VERBOSE == TRUE)
 
 /*******************************************************************************
-**
-** Function         bta_hl_mcap_evt_code
-**
-** Description      get the MCAP event string pointer
-**
-** Returns          char * - event string pointer
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_mcap_evt_code
+ *
+ * Description      get the MCAP event string pointer
+ *
+ * Returns          char * - event string pointer
+ *
+ ******************************************************************************/
 static char *bta_hl_mcap_evt_code(uint8_t evt_code)
 {
 
@@ -2691,14 +2691,14 @@ static char *bta_hl_mcap_evt_code(uint8_t evt_code)
 
 
 /*******************************************************************************
-**
-** Function         bta_hl_cback_evt_code
-**
-** Description      get the HDP event string pointer
-**
-** Returns          char * - event string pointer
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_cback_evt_code
+ *
+ * Description      get the HDP event string pointer
+ *
+ * Returns          char * - event string pointer
+ *
+ ******************************************************************************/
 static char *bta_hl_cback_evt_code(uint8_t evt_code)
 {
 
@@ -2755,14 +2755,14 @@ static char *bta_hl_cback_evt_code(uint8_t evt_code)
 
 
 /*******************************************************************************
-**
-** Function         bta_hl_dch_oper_code
-**
-** Description      Get the DCH operation string
-**
-** Returns          char * - DCH operation string pointer
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_dch_oper_code
+ *
+ * Description      Get the DCH operation string
+ *
+ * Returns          char * - DCH operation string pointer
+ *
+ ******************************************************************************/
 static char *bta_hl_dch_oper_code(tBTA_HL_DCH_OPER oper_code)
 {
 
diff --git a/system/bta/hl/bta_hl_api.cc b/system/bta/hl/bta_hl_api.cc
index 7b57e04739a..a8ba0361ffc 100644
--- a/system/bta/hl/bta_hl_api.cc
+++ b/system/bta/hl/bta_hl_api.cc
@@ -34,8 +34,8 @@
 #include "bta_hl_int.h"
 
 /*****************************************************************************
-**  Constants
-*****************************************************************************/
+ *  Constants
+ ****************************************************************************/
 
 static const tBTA_SYS_REG bta_hl_reg =
 {
@@ -44,19 +44,19 @@ static const tBTA_SYS_REG bta_hl_reg =
 };
 
 /*******************************************************************************
-**
-** Function         BTA_HlEnable
-**
-** Description      Enable the HL subsystems.  This function must be
-**                  called before any other functions in the HL API are called.
-**                  When the enable operation is completed the callback function
-**                  will be called with an BTA_HL_CTRL_ENABLE_CFM_EVT event.
-**
-** Parameters       p_cback - HL event call back function
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HlEnable
+ *
+ * Description      Enable the HL subsystems.  This function must be
+ *                  called before any other functions in the HL API are called.
+ *                  When the enable operation is completed the callback function
+ *                  will be called with an BTA_HL_CTRL_ENABLE_CFM_EVT event.
+ *
+ * Parameters       p_cback - HL event call back function
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HlEnable(tBTA_HL_CTRL_CBACK *p_ctrl_cback)
 {
     tBTA_HL_API_ENABLE *p_buf =
@@ -72,14 +72,14 @@ void BTA_HlEnable(tBTA_HL_CTRL_CBACK *p_ctrl_cback)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_HlDisable
-**
-** Description     Disable the HL subsystem.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HlDisable
+ *
+ * Description     Disable the HL subsystem.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HlDisable(void)
 {
     BT_HDR *p_buf = (BT_HDR *)osi_malloc(sizeof(BT_HDR));
@@ -91,19 +91,19 @@ void BTA_HlDisable(void)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_HlUpdate
-**
-** Description      Register an HDP application
-**
-** Parameters       app_id        - Application ID
-**                  p_reg_param   - non-platform related parameters for the
-**                                  HDP application
-**                  p_cback       - HL event callback fucntion
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HlUpdate
+ *
+ * Description      Register an HDP application
+ *
+ * Parameters       app_id        - Application ID
+ *                  p_reg_param   - non-platform related parameters for the
+ *                                  HDP application
+ *                  p_cback       - HL event callback fucntion
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HlUpdate(uint8_t app_id, tBTA_HL_REG_PARAM *p_reg_param,
                   bool is_register, tBTA_HL_CBACK *p_cback)
 {
@@ -139,19 +139,19 @@ void BTA_HlUpdate(uint8_t app_id, tBTA_HL_REG_PARAM *p_reg_param,
 }
 
 /*******************************************************************************
-**
-** Function         BTA_HlRegister
-**
-** Description      Register an HDP application
-**
-** Parameters       app_id        - Application ID
-**                  p_reg_param   - non-platform related parameters for the
-**                                  HDP application
-**                  p_cback       - HL event callback fucntion
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HlRegister
+ *
+ * Description      Register an HDP application
+ *
+ * Parameters       app_id        - Application ID
+ *                  p_reg_param   - non-platform related parameters for the
+ *                                  HDP application
+ *                  p_cback       - HL event callback fucntion
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HlRegister(uint8_t  app_id,
                     tBTA_HL_REG_PARAM *p_reg_param,
                     tBTA_HL_CBACK *p_cback)
@@ -183,16 +183,16 @@ void BTA_HlRegister(uint8_t  app_id,
 }
 
 /*******************************************************************************
-**
-** Function         BTA_HlDeregister
-**
-** Description      Deregister an HDP application
-**
-** Parameters       app_handle - Application handle
-**
-** Returns           void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HlDeregister
+ *
+ * Description      Deregister an HDP application
+ *
+ * Parameters       app_handle - Application handle
+ *
+ * Returns           void
+ *
+ ******************************************************************************/
 void BTA_HlDeregister(uint8_t app_id,tBTA_HL_APP_HANDLE app_handle)
 {
     tBTA_HL_API_DEREGISTER *p_buf =
@@ -206,21 +206,21 @@ void BTA_HlDeregister(uint8_t app_id,tBTA_HL_APP_HANDLE app_handle)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_HlCchOpen
-**
-** Description      Open a Control channel connection with the specified BD address
-**
-** Parameters       app_handle - Application Handle
-**                  p_open_param - parameters for opening a control channel
-**
-** Returns          void
-**
-**                  Note: The control PSM value is used to select which
-**                  HDP insatnce should be used in case the peer device support
-**                  multiple HDP instances. Also, if the control PSM value is zero
-**                  then the first HDP instance is used for the control channel setup
-*******************************************************************************/
+ *
+ * Function         BTA_HlCchOpen
+ *
+ * Description      Open a Control channel connection with the specified BD address
+ *
+ * Parameters       app_handle - Application Handle
+ *                  p_open_param - parameters for opening a control channel
+ *
+ * Returns          void
+ *
+ *                  Note: The control PSM value is used to select which
+ *                  HDP insatnce should be used in case the peer device support
+ *                  multiple HDP instances. Also, if the control PSM value is zero
+ *                  then the first HDP instance is used for the control channel setup
+ ******************************************************************************/
 void BTA_HlCchOpen(uint8_t app_id, tBTA_HL_APP_HANDLE app_handle,
                    tBTA_HL_CCH_OPEN_PARAM *p_open_param)
 {
@@ -238,17 +238,17 @@ void BTA_HlCchOpen(uint8_t app_id, tBTA_HL_APP_HANDLE app_handle,
 }
 
 /*******************************************************************************
-**
-** Function         BTA_HlCchClose
-**
-** Description      Close a Control channel connection with the specified MCL
-**                  handle
-**
-** Parameters       mcl_handle - MCL handle
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HlCchClose
+ *
+ * Description      Close a Control channel connection with the specified MCL
+ *                  handle
+ *
+ * Parameters       mcl_handle - MCL handle
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HlCchClose(tBTA_HL_MCL_HANDLE mcl_handle)
 {
     tBTA_HL_API_CCH_CLOSE *p_buf =
@@ -261,17 +261,17 @@ void BTA_HlCchClose(tBTA_HL_MCL_HANDLE mcl_handle)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_HlDchOpen
-**
-** Description      Open a data channel connection with the specified DCH parameters
-**
-** Parameters       mcl_handle - MCL handle
-**                  p_open_param - parameters for opening a data channel
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HlDchOpen
+ *
+ * Description      Open a data channel connection with the specified DCH parameters
+ *
+ * Parameters       mcl_handle - MCL handle
+ *                  p_open_param - parameters for opening a data channel
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HlDchOpen(tBTA_HL_MCL_HANDLE mcl_handle,
                    tBTA_HL_DCH_OPEN_PARAM *p_open_param)
 {
@@ -290,17 +290,17 @@ void BTA_HlDchOpen(tBTA_HL_MCL_HANDLE mcl_handle,
 }
 
 /*******************************************************************************
-**
-** Function         BTA_HlDchReconnect
-**
-** Description      Reconnect a data channel with the specified MDL_ID
-**
-** Parameters       mcl_handle      - MCL handle
+ *
+ * Function         BTA_HlDchReconnect
+ *
+ * Description      Reconnect a data channel with the specified MDL_ID
+ *
+ * Parameters       mcl_handle      - MCL handle
 *8                  p_recon_param   - parameters for reconnecting a data channel
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HlDchReconnect(tBTA_HL_MCL_HANDLE mcl_handle,
                         tBTA_HL_DCH_RECONNECT_PARAM *p_recon_param)
 {
@@ -316,16 +316,16 @@ void BTA_HlDchReconnect(tBTA_HL_MCL_HANDLE mcl_handle,
 }
 
 /*******************************************************************************
-**
-** Function         BTA_HlDchClose
-**
-** Description      Close a data channel with the specified MDL handle
-**
-** Parameters       mdl_handle  - MDL handle
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HlDchClose
+ *
+ * Description      Close a data channel with the specified MDL handle
+ *
+ * Parameters       mdl_handle  - MDL handle
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HlDchClose(tBTA_HL_MDL_HANDLE mdl_handle)
 {
     tBTA_HL_API_DCH_CLOSE *p_buf =
@@ -338,18 +338,18 @@ void BTA_HlDchClose(tBTA_HL_MDL_HANDLE mdl_handle)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_HlDchAbort
-**
-** Description      Abort the current data channel setup with the specified MCL
-**                  handle
-**
-** Parameters       mcl_handle  - MCL handle
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HlDchAbort
+ *
+ * Description      Abort the current data channel setup with the specified MCL
+ *                  handle
+ *
+ * Parameters       mcl_handle  - MCL handle
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HlDchAbort(tBTA_HL_MCL_HANDLE mcl_handle)
 {
     tBTA_HL_API_DCH_ABORT *p_buf =
@@ -362,17 +362,17 @@ void BTA_HlDchAbort(tBTA_HL_MCL_HANDLE mcl_handle)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_HlSendData
-**
-** Description      Send an APDU to the peer device
-**
-** Parameters       mdl_handle  - MDL handle
-**                  pkt_size    - size of the data packet to be sent
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HlSendData
+ *
+ * Description      Send an APDU to the peer device
+ *
+ * Parameters       mdl_handle  - MDL handle
+ *                  pkt_size    - size of the data packet to be sent
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HlSendData(tBTA_HL_MDL_HANDLE mdl_handle,
                     uint16_t           pkt_size)
 {
@@ -387,21 +387,21 @@ void BTA_HlSendData(tBTA_HL_MDL_HANDLE mdl_handle,
 }
 
 /*******************************************************************************
-**
-** Function         BTA_HlDeleteMdl
-**
-** Description      Delete the specified MDL_ID within the specified MCL handle
-**
-** Parameters       mcl_handle  - MCL handle
-**                  mdl_id      - MDL ID
-**
-** Returns          void
-**
-**                  note: If mdl_id = 0xFFFF then this means to delete all MDLs
-**                        and this value can only be used with DeleteMdl request only
-**                        not other requests
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HlDeleteMdl
+ *
+ * Description      Delete the specified MDL_ID within the specified MCL handle
+ *
+ * Parameters       mcl_handle  - MCL handle
+ *                  mdl_id      - MDL ID
+ *
+ * Returns          void
+ *
+ *                  note: If mdl_id = 0xFFFF then this means to delete all MDLs
+ *                        and this value can only be used with DeleteMdl request only
+ *                        not other requests
+ *
+ ******************************************************************************/
 void BTA_HlDeleteMdl(tBTA_HL_MCL_HANDLE mcl_handle,
                      tBTA_HL_MDL_ID mdl_id )
 {
@@ -416,17 +416,17 @@ void BTA_HlDeleteMdl(tBTA_HL_MCL_HANDLE mcl_handle,
 }
 
 /*******************************************************************************
-**
-** Function         BTA_HlDchEchoTest
-**
-** Description      Initiate an echo test with the specified MCL handle
-**
-** Parameters       mcl_handle           - MCL handle
+ *
+ * Function         BTA_HlDchEchoTest
+ *
+ * Description      Initiate an echo test with the specified MCL handle
+ *
+ * Parameters       mcl_handle           - MCL handle
 *8                  p_echo_test_param   -  parameters for echo testing
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HlDchEchoTest( tBTA_HL_MCL_HANDLE  mcl_handle,
                         tBTA_HL_DCH_ECHO_TEST_PARAM *p_echo_test_param)
 {
@@ -443,17 +443,17 @@ void BTA_HlDchEchoTest( tBTA_HL_MCL_HANDLE  mcl_handle,
 }
 
 /*******************************************************************************
-**
-** Function         BTA_HlSdpQuery
-**
-** Description      SDP query request for the specified BD address
-**
-** Parameters       app_handle      - application handle
-**                  bd_addr         - BD address
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HlSdpQuery
+ *
+ * Description      SDP query request for the specified BD address
+ *
+ * Parameters       app_handle      - application handle
+ *                  bd_addr         - BD address
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HlSdpQuery(uint8_t  app_id,tBTA_HL_APP_HANDLE app_handle,
                     BD_ADDR bd_addr)
 {
@@ -469,21 +469,21 @@ void BTA_HlSdpQuery(uint8_t  app_id,tBTA_HL_APP_HANDLE app_handle,
 }
 
 /*******************************************************************************
-**
-** Function         BTA_HlDchCreateMdlRsp
-**
-** Description      Set the Response and configuration values for the Create MDL
-**                  request
-**
-** Parameters       mcl_handle  - MCL handle
-**                  p_rsp_param - parameters specified whether the request should
-**                                be accepted or not and if it should be accepted
-**                                then it also specified the configuration response
-**                                value
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HlDchCreateMdlRsp
+ *
+ * Description      Set the Response and configuration values for the Create MDL
+ *                  request
+ *
+ * Parameters       mcl_handle  - MCL handle
+ *                  p_rsp_param - parameters specified whether the request should
+ *                                be accepted or not and if it should be accepted
+ *                                then it also specified the configuration response
+ *                                value
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HlDchCreateRsp(tBTA_HL_MCL_HANDLE mcl_handle,
                         tBTA_HL_DCH_CREATE_RSP_PARAM *p_rsp_param)
 {
diff --git a/system/bta/hl/bta_hl_ci.cc b/system/bta/hl/bta_hl_ci.cc
index e89dfdbb03d..6b7b9e5cea1 100644
--- a/system/bta/hl/bta_hl_ci.cc
+++ b/system/bta/hl/bta_hl_ci.cc
@@ -33,20 +33,20 @@
 #include "bta_hl_int.h"
 
 /*******************************************************************************
-**
-** Function         bta_hl_ci_get_tx_data
-**
-** Description      This function is called in response to the
-**                  bta_hl_co_get_tx_data call-out function.
-**
-** Parameters       mdl_handle -MDL handle
-**                  status - BTA_MA_STATUS_OK if operation is successful
-**                           BTA_MA_STATUS_FAIL if any errors have occurred.
-**                  evt    - evt from the call-out function
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_ci_get_tx_data
+ *
+ * Description      This function is called in response to the
+ *                  bta_hl_co_get_tx_data call-out function.
+ *
+ * Parameters       mdl_handle -MDL handle
+ *                  status - BTA_MA_STATUS_OK if operation is successful
+ *                           BTA_MA_STATUS_FAIL if any errors have occurred.
+ *                  evt    - evt from the call-out function
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hl_ci_get_tx_data(tBTA_HL_MDL_HANDLE mdl_handle,
                            tBTA_HL_STATUS status, uint16_t evt)
 {
@@ -66,20 +66,20 @@ void bta_hl_ci_get_tx_data(tBTA_HL_MDL_HANDLE mdl_handle,
 }
 
 /*******************************************************************************
-**
-** Function         bta_hl_ci_put_rx_data
-**
-** Description      This function is called in response to the
-**                  bta_hl_co_put_rx_data call-out function.
-**
-** Parameters       mdl_handle -MDL handle
-**                  status - BTA_MA_STATUS_OK if operation is successful
-**                           BTA_MA_STATUS_FAIL if any errors have occurred.
-**                  evt    - evt from the call-out function
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_ci_put_rx_data
+ *
+ * Description      This function is called in response to the
+ *                  bta_hl_co_put_rx_data call-out function.
+ *
+ * Parameters       mdl_handle -MDL handle
+ *                  status - BTA_MA_STATUS_OK if operation is successful
+ *                           BTA_MA_STATUS_FAIL if any errors have occurred.
+ *                  evt    - evt from the call-out function
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void bta_hl_ci_put_rx_data(  tBTA_HL_MDL_HANDLE mdl_handle,
                                     tBTA_HL_STATUS status,
                                     uint16_t evt )
@@ -100,20 +100,20 @@ extern void bta_hl_ci_put_rx_data(  tBTA_HL_MDL_HANDLE mdl_handle,
 }
 
 /*******************************************************************************
-**
-** Function         bta_hl_ci_get_echo_data
-**
-** Description      This function is called in response to the
-**                  bta_hl_co_get_echo_data call-out function.
-**
-** Parameters       mcl_handle -MCL handle
-**                  status - BTA_MA_STATUS_OK if operation is successful
-**                           BTA_MA_STATUS_FAIL if any errors have occurred.
-**                  evt    - evt from the call-out function
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_ci_get_echo_data
+ *
+ * Description      This function is called in response to the
+ *                  bta_hl_co_get_echo_data call-out function.
+ *
+ * Parameters       mcl_handle -MCL handle
+ *                  status - BTA_MA_STATUS_OK if operation is successful
+ *                           BTA_MA_STATUS_FAIL if any errors have occurred.
+ *                  evt    - evt from the call-out function
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void bta_hl_ci_get_echo_data(  tBTA_HL_MCL_HANDLE mcl_handle,
                                       tBTA_HL_STATUS status,
                                       uint16_t evt )
@@ -134,20 +134,20 @@ extern void bta_hl_ci_get_echo_data(  tBTA_HL_MCL_HANDLE mcl_handle,
 }
 
 /*******************************************************************************
-**
-** Function         bta_hl_ci_put_echo_data
-**
-** Description      This function is called in response to the
-**                  bta_hl_co_put_echo_data call-out function.
-**
-** Parameters       mcl_handle -MCL handle
-**                  status - BTA_MA_STATUS_OK if operation is successful
-**                           BTA_MA_STATUS_FAIL if any errors have occurred.
-**                  evt    - evt from the call-out function
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_ci_put_echo_data
+ *
+ * Description      This function is called in response to the
+ *                  bta_hl_co_put_echo_data call-out function.
+ *
+ * Parameters       mcl_handle -MCL handle
+ *                  status - BTA_MA_STATUS_OK if operation is successful
+ *                           BTA_MA_STATUS_FAIL if any errors have occurred.
+ *                  evt    - evt from the call-out function
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void bta_hl_ci_put_echo_data(  tBTA_HL_MCL_HANDLE mcl_handle,
                                       tBTA_HL_STATUS status,
                                       uint16_t evt )
diff --git a/system/bta/hl/bta_hl_int.h b/system/bta/hl/bta_hl_int.h
index c8bfc582639..cc6139d642a 100644
--- a/system/bta/hl/bta_hl_int.h
+++ b/system/bta/hl/bta_hl_int.h
@@ -38,8 +38,8 @@ extern "C" {
 typedef uint16_t (tBTA_HL_ALLOCATE_PSM) (void);
 
 /*****************************************************************************
-**  Constants and data types
-*****************************************************************************/
+ *  Constants and data types
+ ****************************************************************************/
 
 #ifndef BTA_HL_DISC_SIZE
 #define BTA_HL_DISC_SIZE                1600
@@ -569,13 +569,13 @@ typedef struct
 }tBTA_HL_CB;
 
 /******************************************************************************
-**  Configuration Definitions
-*******************************************************************************/
+ *  Configuration Definitions
+ ******************************************************************************/
 /* Configuration structure */
 
 /*****************************************************************************
-**  Global data
-*****************************************************************************/
+ *  Global data
+ ****************************************************************************/
 
 /* HL control block */
 extern tBTA_HL_CB  bta_hl_cb;
@@ -600,8 +600,8 @@ extern tBTA_HL_CB  bta_hl_cb;
   ((uint8_t*)((uint8_t*)((p_pkt) + 1) + (p_pkt)->offset))
 
 /*****************************************************************************
-**  Function prototypes
-*****************************************************************************/
+ *  Function prototypes
+ ****************************************************************************/
     /* main */
     extern bool bta_hl_hdl_event(BT_HDR *p_msg);
     /* sdp */
diff --git a/system/bta/hl/bta_hl_main.cc b/system/bta/hl/bta_hl_main.cc
index 7324f638676..a7afdc8cb0a 100644
--- a/system/bta/hl/bta_hl_main.cc
+++ b/system/bta/hl/bta_hl_main.cc
@@ -46,11 +46,11 @@ static const char *bta_hl_dch_state_code(tBTA_HL_DCH_STATE state_code);
 extern uint16_t L2CA_AllocateRandomPsm(void);
 extern uint16_t L2CA_AllocatePsm(void);
 /*****************************************************************************
-** DCH State Table
-*****************************************************************************/
+ * DCH State Table
+ ****************************************************************************/
 /*****************************************************************************
-** Constants and types
-*****************************************************************************/
+ * Constants and types
+ ****************************************************************************/
 /* state machine action enumeration list for DCH */
 /* The order of this enumeration must be the same as bta_hl_dch_act_tbl[] */
 enum
@@ -285,11 +285,11 @@ const tBTA_HL_DCH_ST_TBL bta_hl_dch_st_tbl[] =
 };
 
 /*****************************************************************************
-** CCH State Table
-*****************************************************************************/
+ * CCH State Table
+ ****************************************************************************/
 /*****************************************************************************
-** Constants and types
-*****************************************************************************/
+ * Constants and types
+ ****************************************************************************/
 /* state machine action enumeration list for CCH */
 enum
 {
@@ -397,21 +397,21 @@ const tBTA_HL_CCH_ST_TBL bta_hl_cch_st_tbl[] =
 
 
 /*****************************************************************************
-** Global data
-*****************************************************************************/
+ * Global data
+ ****************************************************************************/
 
 /* HL control block */
 tBTA_HL_CB  bta_hl_cb;
 
 /*******************************************************************************
-**
-** Function         bta_hl_cch_sm_execute
-**
-** Description      State machine event handling function for CCH
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_cch_sm_execute
+ *
+ * Description      State machine event handling function for CCH
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hl_cch_sm_execute(uint8_t app_idx, uint8_t mcl_idx,
                            uint16_t event, tBTA_HL_DATA *p_data)
 {
@@ -462,14 +462,14 @@ void bta_hl_cch_sm_execute(uint8_t app_idx, uint8_t mcl_idx,
 }
 
 /*******************************************************************************
-**
-** Function         bta_hl_dch_sm_execute
-**
-** Description      State machine event handling function for DCH
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_dch_sm_execute
+ *
+ * Description      State machine event handling function for DCH
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hl_dch_sm_execute(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
                            uint16_t event, tBTA_HL_DATA *p_data)
 {
@@ -519,14 +519,14 @@ void bta_hl_dch_sm_execute(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
 #endif
 }
 /*******************************************************************************
-**
-** Function         bta_hl_api_enable
-**
-** Description      Process the API enable request to enable the HL subsystem
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_api_enable
+ *
+ * Description      Process the API enable request to enable the HL subsystem
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_hl_api_enable(tBTA_HL_CB *p_cb, tBTA_HL_DATA *p_data)
 {
     tBTA_HL_CTRL    evt_data;
@@ -552,14 +552,14 @@ static void bta_hl_api_enable(tBTA_HL_CB *p_cb, tBTA_HL_DATA *p_data)
 
 }
 /*******************************************************************************
-**
-** Function         bta_hl_api_disable
-**
-** Description      Process the API disable request to disable the HL subsystem
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_api_disable
+ *
+ * Description      Process the API disable request to disable the HL subsystem
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_hl_api_disable(tBTA_HL_CB *p_cb, tBTA_HL_DATA *p_data)
 {
     tBTA_HL_CTRL    evt_data;
@@ -588,14 +588,14 @@ static void bta_hl_api_disable(tBTA_HL_CB *p_cb, tBTA_HL_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hl_api_update
-**
-** Description      Process the API registration request to register an HDP applciation
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_api_update
+ *
+ * Description      Process the API registration request to register an HDP applciation
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_hl_api_update(tBTA_HL_CB *p_cb, tBTA_HL_DATA *p_data)
 {
     tBTA_HL         evt_data;
@@ -667,14 +667,14 @@ static void bta_hl_api_update(tBTA_HL_CB *p_cb, tBTA_HL_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hl_api_register
-**
-** Description      Process the API registration request to register an HDP applciation
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_api_register
+ *
+ * Description      Process the API registration request to register an HDP applciation
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_hl_api_register(tBTA_HL_CB *p_cb, tBTA_HL_DATA *p_data)
 {
     tBTA_HL         evt_data;
@@ -757,14 +757,14 @@ static void bta_hl_api_register(tBTA_HL_CB *p_cb, tBTA_HL_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hl_api_deregister
-**
-** Description      Process the API de-registration request
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_api_deregister
+ *
+ * Description      Process the API de-registration request
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_hl_api_deregister(UNUSED_ATTR tBTA_HL_CB *p_cb, tBTA_HL_DATA *p_data)
 {
     uint8_t           app_idx;
@@ -783,14 +783,14 @@ static void bta_hl_api_deregister(UNUSED_ATTR tBTA_HL_CB *p_cb, tBTA_HL_DATA *p_
 }
 
 /*******************************************************************************
-**
-** Function         bta_hl_api_cch_open
-**
-** Description      Process the API CCH open request
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_api_cch_open
+ *
+ * Description      Process the API CCH open request
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_hl_api_cch_open(UNUSED_ATTR tBTA_HL_CB *p_cb, tBTA_HL_DATA *p_data)
 {
     tBTA_HL         evt_data;
@@ -881,14 +881,14 @@ static void bta_hl_api_cch_open(UNUSED_ATTR tBTA_HL_CB *p_cb, tBTA_HL_DATA *p_da
 }
 
 /*******************************************************************************
-**
-** Function         bta_hl_api_cch_close
-**
-** Description      Process the API CCH close request
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_api_cch_close
+ *
+ * Description      Process the API CCH close request
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_hl_api_cch_close(UNUSED_ATTR tBTA_HL_CB *p_cb, tBTA_HL_DATA *p_data)
 {
     tBTA_HL         evt_data;
@@ -941,14 +941,14 @@ static void bta_hl_api_cch_close(UNUSED_ATTR tBTA_HL_CB *p_cb, tBTA_HL_DATA *p_d
 }
 
 /*******************************************************************************
-**
-** Function         bta_hl_api_dch_open
-**
-** Description      Process the API DCH open request
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_api_dch_open
+ *
+ * Description      Process the API DCH open request
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_hl_api_dch_open(UNUSED_ATTR tBTA_HL_CB *p_cb, tBTA_HL_DATA *p_data)
 {
     tBTA_HL                     evt_data;
@@ -1094,14 +1094,14 @@ static void bta_hl_api_dch_open(UNUSED_ATTR tBTA_HL_CB *p_cb, tBTA_HL_DATA *p_da
 
 }
 /*******************************************************************************
-**
-** Function         bta_hl_api_dch_close
-**
-** Description      Process the API DCH close request
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_api_dch_close
+ *
+ * Description      Process the API DCH close request
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_hl_api_dch_close(UNUSED_ATTR tBTA_HL_CB *p_cb, tBTA_HL_DATA *p_data)
 {
     tBTA_HL         evt_data;
@@ -1162,14 +1162,14 @@ static void bta_hl_api_dch_close(UNUSED_ATTR tBTA_HL_CB *p_cb, tBTA_HL_DATA *p_d
 
 
 /*******************************************************************************
-**
-** Function         bta_hl_api_dch_reconnect
-**
-** Description      Process the API DCH reconnect request
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_api_dch_reconnect
+ *
+ * Description      Process the API DCH reconnect request
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_hl_api_dch_reconnect(UNUSED_ATTR tBTA_HL_CB *p_cb, tBTA_HL_DATA *p_data)
 {
     tBTA_HL         evt_data;
@@ -1302,14 +1302,14 @@ static void bta_hl_api_dch_reconnect(UNUSED_ATTR tBTA_HL_CB *p_cb, tBTA_HL_DATA
 }
 
 /*******************************************************************************
-**
-** Function         bta_hl_api_dch_echo_test
-**
-** Description      Process the API Echo test request
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_api_dch_echo_test
+ *
+ * Description      Process the API Echo test request
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_hl_api_dch_echo_test(UNUSED_ATTR tBTA_HL_CB *p_cb, tBTA_HL_DATA *p_data)
 {
     tBTA_HL             evt_data;
@@ -1435,14 +1435,14 @@ static void bta_hl_api_dch_echo_test(UNUSED_ATTR tBTA_HL_CB *p_cb, tBTA_HL_DATA
 
 
 /*******************************************************************************
-**
-** Function         bta_hl_api_sdp_query
-**
-** Description      Process the API SDP query request
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_api_sdp_query
+ *
+ * Description      Process the API SDP query request
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_hl_api_sdp_query(UNUSED_ATTR tBTA_HL_CB *p_cb, tBTA_HL_DATA *p_data)
 {
     tBTA_HL         evt_data;
@@ -1536,14 +1536,14 @@ static void bta_hl_api_sdp_query(UNUSED_ATTR tBTA_HL_CB *p_cb, tBTA_HL_DATA *p_d
 
 
 /*******************************************************************************
-**
-** Function         bta_hl_sdp_query_results
-**
-** Description      Process the SDP query results
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_sdp_query_results
+ *
+ * Description      Process the SDP query results
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_hl_sdp_query_results(UNUSED_ATTR tBTA_HL_CB *p_cb, tBTA_HL_DATA *p_data)
 {
     tBTA_HL             evt_data;
@@ -1596,14 +1596,14 @@ static void bta_hl_sdp_query_results(UNUSED_ATTR tBTA_HL_CB *p_cb, tBTA_HL_DATA
 
 
 /*******************************************************************************
-**
-** Function         bta_hl_api_delete_mdl
-**
-** Description      Process the API DELETE MDL request
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_api_delete_mdl
+ *
+ * Description      Process the API DELETE MDL request
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_hl_api_delete_mdl(UNUSED_ATTR tBTA_HL_CB *p_cb, tBTA_HL_DATA *p_data)
 {
     tBTA_HL         evt_data;
@@ -1684,14 +1684,14 @@ static void bta_hl_api_delete_mdl(UNUSED_ATTR tBTA_HL_CB *p_cb, tBTA_HL_DATA *p_
 }
 
 /*******************************************************************************
-**
-** Function         bta_hl_mca_delete_mdl_cfm
-**
-** Description      Process the DELETE MDL confirmation event
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_mca_delete_mdl_cfm
+ *
+ * Description      Process the DELETE MDL confirmation event
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_hl_mca_delete_mdl_cfm(UNUSED_ATTR tBTA_HL_CB *p_cb, tBTA_HL_DATA *p_data)
 {
     tBTA_HL         evt_data;
@@ -1763,14 +1763,14 @@ static void bta_hl_mca_delete_mdl_cfm(UNUSED_ATTR tBTA_HL_CB *p_cb, tBTA_HL_DATA
 }
 
 /*******************************************************************************
-**
-** Function         bta_hl_mca_delete_mdl_ind
-**
-** Description      Process the DELETE MDL indication event
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_mca_delete_mdl_ind
+ *
+ * Description      Process the DELETE MDL indication event
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_hl_mca_delete_mdl_ind(UNUSED_ATTR tBTA_HL_CB *p_cb, tBTA_HL_DATA *p_data)
 {
     tBTA_HL         evt_data;
@@ -1825,14 +1825,14 @@ static void bta_hl_mca_delete_mdl_ind(UNUSED_ATTR tBTA_HL_CB *p_cb, tBTA_HL_DATA
 
 
 /*******************************************************************************
-**
-** Function         bta_hl_api_dch_abort
-**
-** Description      Process the API DCH abort request
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_api_dch_abort
+ *
+ * Description      Process the API DCH abort request
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_hl_api_dch_abort(UNUSED_ATTR tBTA_HL_CB *p_cb, tBTA_HL_DATA *p_data)
 {
     tBTA_HL_STATUS  status = BTA_HL_STATUS_OK;
@@ -1909,14 +1909,14 @@ static void bta_hl_api_dch_abort(UNUSED_ATTR tBTA_HL_CB *p_cb, tBTA_HL_DATA *p_d
 }
 
 /*******************************************************************************
-**
-** Function         bta_hl_hdl_event
-**
-** Description      HL main event handling function.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_hdl_event
+ *
+ * Description      HL main event handling function.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 bool bta_hl_hdl_event(BT_HDR *p_msg)
 {
     uint8_t app_idx, mcl_idx, mdl_idx;
@@ -2038,19 +2038,19 @@ bool bta_hl_hdl_event(BT_HDR *p_msg)
 
 
 /*****************************************************************************
-**  Debug Functions
-*****************************************************************************/
+ *  Debug Functions
+ ****************************************************************************/
 #if (BTA_HL_DEBUG == TRUE)
 
 /*******************************************************************************
-**
-** Function         bta_hl_cch_state_code
-**
-** Description      Map CCH state code to the corresponding state string
-**
-** Returns          string pointer for the associated state name
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_cch_state_code
+ *
+ * Description      Map CCH state code to the corresponding state string
+ *
+ * Returns          string pointer for the associated state name
+ *
+ ******************************************************************************/
 static const char *bta_hl_cch_state_code(tBTA_HL_CCH_STATE state_code)
 {
     switch (state_code)
@@ -2069,14 +2069,14 @@ static const char *bta_hl_cch_state_code(tBTA_HL_CCH_STATE state_code)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hl_dch_state_code
-**
-** Description      Map DCH state code to the corresponding state string
-**
-** Returns          string pointer for the associated state name
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_dch_state_code
+ *
+ * Description      Map DCH state code to the corresponding state string
+ *
+ * Returns          string pointer for the associated state name
+ *
+ ******************************************************************************/
 static const char *bta_hl_dch_state_code(tBTA_HL_DCH_STATE state_code)
 {
     switch (state_code)
diff --git a/system/bta/hl/bta_hl_sdp.cc b/system/bta/hl/bta_hl_sdp.cc
index f74aa17b46e..8b3951f4c1d 100644
--- a/system/bta/hl/bta_hl_sdp.cc
+++ b/system/bta/hl/bta_hl_sdp.cc
@@ -27,15 +27,15 @@
 #include "utl.h"
 
 /*******************************************************************************
-**
-** Function         bta_hl_fill_sup_feature_list
-**
-** Description      Fill the supported features from teh SDP record
-**
-** Returns          true if found, false if not
-**                  If found, the passed protocol list element is filled in.
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_fill_sup_feature_list
+ *
+ * Description      Fill the supported features from teh SDP record
+ *
+ * Returns          true if found, false if not
+ *                  If found, the passed protocol list element is filled in.
+ *
+ ******************************************************************************/
 bool bta_hl_fill_sup_feature_list( const tSDP_DISC_ATTR  *p_attr,
                                       tBTA_HL_SUP_FEATURE_LIST_ELEM *p_list)
 {
@@ -84,15 +84,15 @@ bool bta_hl_fill_sup_feature_list( const tSDP_DISC_ATTR  *p_attr,
 }
 
 /*******************************************************************************
-**
-** Function         bta_hl_compose_supported_feature_list
-**
-** Description      This function is called to compose a data sequence from
-**                  the supported  feature element list struct pointer
-**
-** Returns          the length of the data sequence
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_compose_supported_feature_list
+ *
+ * Description      This function is called to compose a data sequence from
+ *                  the supported  feature element list struct pointer
+ *
+ * Returns          the length of the data sequence
+ *
+ ******************************************************************************/
 int bta_hl_compose_supported_feature_list( uint8_t *p, uint16_t num_elem,
                                            const tBTA_HL_SUP_FEATURE_ELEM *p_elem_list)
 {
@@ -131,17 +131,17 @@ int bta_hl_compose_supported_feature_list( uint8_t *p, uint16_t num_elem,
 }
 
 /*******************************************************************************
-**
-** Function         bta_hl_add_sup_feature_list
-**
-** Description      This function is called to add a protocol descriptor list to
-**                  a record. This would be through the SDP database maintenance API.
-**                  If the protocol list already exists in the record, it is replaced
-**                  with the new list.
-**
-** Returns          true if added OK, else false
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_add_sup_feature_list
+ *
+ * Description      This function is called to add a protocol descriptor list to
+ *                  a record. This would be through the SDP database maintenance API.
+ *                  If the protocol list already exists in the record, it is replaced
+ *                  with the new list.
+ *
+ * Returns          true if added OK, else false
+ *
+ ******************************************************************************/
 bool bta_hl_add_sup_feature_list (uint32_t handle, uint16_t num_elem,
                                      const tBTA_HL_SUP_FEATURE_ELEM *p_elem_list)
 {
@@ -159,16 +159,16 @@ bool bta_hl_add_sup_feature_list (uint32_t handle, uint16_t num_elem,
 }
 
 /*****************************************************************************
-**
-**  Function:    bta_hl_sdp_update
-**
-**  Purpose:     Register an HDP application with SDP
-**
-**  Parameters:
-**
-**  Returns:     void
-**
-*****************************************************************************/
+ *
+ *  Function:    bta_hl_sdp_update
+ *
+ *  Purpose:     Register an HDP application with SDP
+ *
+ *  Parameters:
+ *
+ *  Returns:     void
+ *
+ ****************************************************************************/
 tBTA_HL_STATUS bta_hl_sdp_update (UNUSED_ATTR uint8_t app_id)
 {
     uint16_t                          svc_class_id_list[BTA_HL_NUM_SVC_ELEMS];
@@ -357,20 +357,20 @@ tBTA_HL_STATUS bta_hl_sdp_update (UNUSED_ATTR uint8_t app_id)
 
 
 /*****************************************************************************
-**
-**  Function:    bta_hl_sdp_register
-**
-**  Purpose:     Register an HDP application with SDP
-**
-**  Parameters:  p_cb           - Pointer to MA instance control block
-**               p_service_name - MA server name
-**               inst_id        - MAS instance ID
-**               msg_type       - Supported message type(s)
-**
-**
-**  Returns:     void
-**
-*****************************************************************************/
+ *
+ *  Function:    bta_hl_sdp_register
+ *
+ *  Purpose:     Register an HDP application with SDP
+ *
+ *  Parameters:  p_cb           - Pointer to MA instance control block
+ *               p_service_name - MA server name
+ *               inst_id        - MAS instance ID
+ *               msg_type       - Supported message type(s)
+ *
+ *
+ *  Returns:     void
+ *
+ ****************************************************************************/
 tBTA_HL_STATUS bta_hl_sdp_register (uint8_t app_idx)
 {
     uint16_t                          svc_class_id_list[BTA_HL_NUM_SVC_ELEMS];
@@ -563,18 +563,18 @@ tBTA_HL_STATUS bta_hl_sdp_register (uint8_t app_idx)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hl_find_sink_or_src_srv_class_in_db
-**
-** Description      This function queries an SDP database for either a HDP Sink or
-**                  Source service class ID.
-**                  If the p_start_rec pointer is NULL, it looks from the beginning
-**                  of the database, else it continues from the next record after
-**                  p_start_rec.
-**
-** Returns          Pointer to record containing service class, or NULL
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_find_sink_or_src_srv_class_in_db
+ *
+ * Description      This function queries an SDP database for either a HDP Sink or
+ *                  Source service class ID.
+ *                  If the p_start_rec pointer is NULL, it looks from the beginning
+ *                  of the database, else it continues from the next record after
+ *                  p_start_rec.
+ *
+ * Returns          Pointer to record containing service class, or NULL
+ *
+ ******************************************************************************/
 tSDP_DISC_REC *bta_hl_find_sink_or_src_srv_class_in_db (const tSDP_DISCOVERY_DB *p_db,
                                                         const tSDP_DISC_REC *p_start_rec)
 {
diff --git a/system/bta/hl/bta_hl_utils.cc b/system/bta/hl/bta_hl_utils.cc
index c8720de9830..4bab91034ee 100644
--- a/system/bta/hl/bta_hl_utils.cc
+++ b/system/bta/hl/bta_hl_utils.cc
@@ -40,13 +40,13 @@
 
 
 /*******************************************************************************
-**
-** Function      bta_hl_set_ctrl_psm_for_dch
-**
-** Description    This function set the control PSM for the DCH setup
-**
-** Returns     bool - true - control PSM setting is successful
-*******************************************************************************/
+ *
+ * Function      bta_hl_set_ctrl_psm_for_dch
+ *
+ * Description    This function set the control PSM for the DCH setup
+ *
+ * Returns     bool - true - control PSM setting is successful
+ ******************************************************************************/
 bool bta_hl_set_ctrl_psm_for_dch(uint8_t app_idx, uint8_t mcl_idx,
                                     UNUSED_ATTR uint8_t mdl_idx, uint16_t ctrl_psm)
 {
@@ -86,14 +86,14 @@ bool bta_hl_set_ctrl_psm_for_dch(uint8_t app_idx, uint8_t mcl_idx,
 
 
 /*******************************************************************************
-**
-** Function      bta_hl_find_sdp_idx_using_ctrl_psm
-**
-** Description
-**
-** Returns      true if found
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_find_sdp_idx_using_ctrl_psm
+ *
+ * Description
+ *
+ * Returns      true if found
+ *
+ ******************************************************************************/
 bool bta_hl_find_sdp_idx_using_ctrl_psm(tBTA_HL_SDP *p_sdp,
                                            uint16_t ctrl_psm,
                                            uint8_t *p_sdp_idx)
@@ -132,14 +132,14 @@ bool bta_hl_find_sdp_idx_using_ctrl_psm(tBTA_HL_SDP *p_sdp,
 }
 
 /*******************************************************************************
-**
-** Function      bta_hl_set_user_tx_buf_size
-**
-** Description  This function sets the user tx buffer size
-**
-** Returns      uint16_t buf_size
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_set_user_tx_buf_size
+ *
+ * Description  This function sets the user tx buffer size
+ *
+ * Returns      uint16_t buf_size
+ *
+ ******************************************************************************/
 
 uint16_t bta_hl_set_user_tx_buf_size(uint16_t max_tx_size)
 {
@@ -149,14 +149,14 @@ uint16_t bta_hl_set_user_tx_buf_size(uint16_t max_tx_size)
 }
 
 /*******************************************************************************
-**
-** Function      bta_hl_set_user_rx_buf_size
-**
-** Description  This function sets the user rx buffer size
-**
-** Returns      uint16_t buf_size
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_set_user_rx_buf_size
+ *
+ * Description  This function sets the user rx buffer size
+ *
+ * Returns      uint16_t buf_size
+ *
+ ******************************************************************************/
 
 uint16_t bta_hl_set_user_rx_buf_size(uint16_t mtu)
 {
@@ -168,14 +168,14 @@ uint16_t bta_hl_set_user_rx_buf_size(uint16_t mtu)
 
 
 /*******************************************************************************
-**
-** Function      bta_hl_set_tx_win_size
-**
-** Description  This function sets the tx window size
-**
-** Returns      uint8_t tx_win_size
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_set_tx_win_size
+ *
+ * Description  This function sets the tx window size
+ *
+ * Returns      uint8_t tx_win_size
+ *
+ ******************************************************************************/
 uint8_t bta_hl_set_tx_win_size(uint16_t mtu, uint16_t mps)
 {
     uint8_t tx_win_size;
@@ -205,14 +205,14 @@ uint8_t bta_hl_set_tx_win_size(uint16_t mtu, uint16_t mps)
 }
 
 /*******************************************************************************
-**
-** Function      bta_hl_set_mps
-**
-** Description  This function sets the MPS
-**
-** Returns      uint16_t MPS
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_set_mps
+ *
+ * Description  This function sets the MPS
+ *
+ * Returns      uint16_t MPS
+ *
+ ******************************************************************************/
 uint16_t bta_hl_set_mps(uint16_t mtu)
 {
     uint16_t mps;
@@ -233,14 +233,14 @@ uint16_t bta_hl_set_mps(uint16_t mtu)
 
 
 /*******************************************************************************
-**
-** Function      bta_hl_clean_mdl_cb
-**
-** Description  This function clean up the specified MDL control block
-**
-** Returns      void
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_clean_mdl_cb
+ *
+ * Description  This function clean up the specified MDL control block
+ *
+ * Returns      void
+ *
+ ******************************************************************************/
 void bta_hl_clean_mdl_cb(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx)
 {
     tBTA_HL_MDL_CB      *p_dcb  = BTA_HL_GET_MDL_CB_PTR(app_idx, mcl_idx, mdl_idx);
@@ -258,14 +258,14 @@ void bta_hl_clean_mdl_cb(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx)
 
 
 /*******************************************************************************
-**
-** Function      bta_hl_get_buf
-**
-** Description  This function allocate a buffer based on the specified data size
-**
-** Returns      BT_HDR *.
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_get_buf
+ *
+ * Description  This function allocate a buffer based on the specified data size
+ *
+ * Returns      BT_HDR *.
+ *
+ ******************************************************************************/
 BT_HDR * bta_hl_get_buf(uint16_t data_size, bool fcs_use)
 {
     size_t size = data_size + L2CAP_MIN_OFFSET + BT_HDR_SIZE + L2CAP_FCS_LEN
@@ -282,16 +282,16 @@ BT_HDR * bta_hl_get_buf(uint16_t data_size, bool fcs_use)
 }
 
 /*******************************************************************************
-**
-** Function      bta_hl_find_service_in_db
-**
-** Description  This function check the specified service class(es) can be find in
-**              the received SDP database
-**
-** Returns      bool true - found
-**                      false - not found
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_find_service_in_db
+ *
+ * Description  This function check the specified service class(es) can be find in
+ *              the received SDP database
+ *
+ * Returns      bool true - found
+ *                      false - not found
+ *
+ ******************************************************************************/
 bool bta_hl_find_service_in_db( uint8_t app_idx, uint8_t mcl_idx,
                                    uint16_t service_uuid,
                                    tSDP_DISC_REC **pp_rec )
@@ -321,17 +321,17 @@ bool bta_hl_find_service_in_db( uint8_t app_idx, uint8_t mcl_idx,
 }
 
 /*******************************************************************************
-**
-** Function      bta_hl_get_service_uuids
-**
-**
-** Description  This function finds the service class(es) for both CCH and DCH oeprations
-**
-** Returns      uint16_t - service_id
-**                       if service_uuid = 0xFFFF then it means service uuid
-**                       can be either Sink or Source
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_get_service_uuids
+ *
+ *
+ * Description  This function finds the service class(es) for both CCH and DCH oeprations
+ *
+ * Returns      uint16_t - service_id
+ *                       if service_uuid = 0xFFFF then it means service uuid
+ *                       can be either Sink or Source
+ *
+ ******************************************************************************/
 uint16_t bta_hl_get_service_uuids(uint8_t sdp_oper, uint8_t app_idx, uint8_t mcl_idx,
                                 uint8_t mdl_idx )
 {
@@ -368,16 +368,16 @@ uint16_t bta_hl_get_service_uuids(uint8_t sdp_oper, uint8_t app_idx, uint8_t mcl
 }
 
 /*******************************************************************************
-**
-** Function      bta_hl_find_echo_cfg_rsp
-**
-**
-** Description  This function finds the configuration response for the echo test
-**
-** Returns      bool - true found
-**                        false not found
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_find_echo_cfg_rsp
+ *
+ *
+ * Description  This function finds the configuration response for the echo test
+ *
+ * Returns      bool - true found
+ *                        false not found
+ *
+ ******************************************************************************/
 bool bta_hl_find_echo_cfg_rsp(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdep_idx, uint8_t cfg,
                                  uint8_t *p_cfg_rsp)
 {
@@ -415,15 +415,15 @@ bool bta_hl_find_echo_cfg_rsp(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdep_idx
 }
 
 /*******************************************************************************
-**
-** Function      bta_hl_validate_dch_cfg
-**
-** Description  This function validate the DCH configuration
-**
-** Returns      bool - true cfg is valid
-**                        false not valid
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_validate_dch_cfg
+ *
+ * Description  This function validate the DCH configuration
+ *
+ * Returns      bool - true cfg is valid
+ *                        false not valid
+ *
+ ******************************************************************************/
 bool bta_hl_validate_cfg(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
                             uint8_t cfg)
 {
@@ -468,15 +468,15 @@ bool bta_hl_validate_cfg(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
 }
 
 /*******************************************************************************
-**
-** Function       bta_hl_find_cch_cb_indexes
-**
-** Description  This function finds the indexes needed for the CCH state machine
-**
-** Returns      bool - true found
-**                        false not found
-**
-*******************************************************************************/
+ *
+ * Function       bta_hl_find_cch_cb_indexes
+ *
+ * Description  This function finds the indexes needed for the CCH state machine
+ *
+ * Returns      bool - true found
+ *                        false not found
+ *
+ ******************************************************************************/
 bool bta_hl_find_cch_cb_indexes(tBTA_HL_DATA *p_msg,
                                    uint8_t *p_app_idx,
                                    uint8_t  *p_mcl_idx)
@@ -576,15 +576,15 @@ bool bta_hl_find_cch_cb_indexes(tBTA_HL_DATA *p_msg,
 }
 
 /*******************************************************************************
-**
-** Function       bta_hl_find_dch_cb_indexes
-**
-** Description  This function finds the indexes needed for the DCH state machine
-**
-** Returns      bool - true found
-**                        false not found
-**
-*******************************************************************************/
+ *
+ * Function       bta_hl_find_dch_cb_indexes
+ *
+ * Description  This function finds the indexes needed for the DCH state machine
+ *
+ * Returns      bool - true found
+ *                        false not found
+ *
+ ******************************************************************************/
 bool bta_hl_find_dch_cb_indexes(tBTA_HL_DATA *p_msg,
                                    uint8_t *p_app_idx,
                                    uint8_t *p_mcl_idx,
@@ -750,14 +750,14 @@ bool bta_hl_find_dch_cb_indexes(tBTA_HL_DATA *p_msg,
 }
 
 /*******************************************************************************
-**
-** Function      bta_hl_allocate_mdl_id
-**
-** Description  This function allocates a MDL ID
-**
-** Returns      uint16_t - MDL ID
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_allocate_mdl_id
+ *
+ * Description  This function allocates a MDL ID
+ *
+ * Returns      uint16_t - MDL ID
+ *
+ ******************************************************************************/
 uint16_t  bta_hl_allocate_mdl_id(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx )
 {
     uint16_t  mdl_id=0;
@@ -808,14 +808,14 @@ uint16_t  bta_hl_allocate_mdl_id(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_i
     return mdl_id;
 }
 /*******************************************************************************
-**
-** Function      bta_hl_find_mdl_idx
-**
-** Description  This function finds the MDL index based on mdl_id
-**
-** Returns      bool true-found
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_find_mdl_idx
+ *
+ * Description  This function finds the MDL index based on mdl_id
+ *
+ * Returns      bool true-found
+ *
+ ******************************************************************************/
 bool bta_hl_find_mdl_idx(uint8_t app_idx, uint8_t mcl_idx, uint16_t mdl_id,
                             uint8_t *p_mdl_idx)
 {
@@ -847,14 +847,14 @@ bool bta_hl_find_mdl_idx(uint8_t app_idx, uint8_t mcl_idx, uint16_t mdl_id,
 }
 
 /*******************************************************************************
-**
-** Function      bta_hl_find_an_active_mdl_idx
-**
-** Description  This function finds an active MDL
-**
-** Returns      bool true-found
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_find_an_active_mdl_idx
+ *
+ * Description  This function finds an active MDL
+ *
+ * Returns      bool true-found
+ *
+ ******************************************************************************/
 bool bta_hl_find_an_active_mdl_idx(uint8_t app_idx, uint8_t mcl_idx,
                                       uint8_t *p_mdl_idx)
 {
@@ -885,14 +885,14 @@ bool bta_hl_find_an_active_mdl_idx(uint8_t app_idx, uint8_t mcl_idx,
 }
 
 /*******************************************************************************
-**
-** Function      bta_hl_find_dch_setup_mdl_idx
-**
-** Description  This function finds a MDL which in the DCH setup state
-**
-** Returns      bool true-found
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_find_dch_setup_mdl_idx
+ *
+ * Description  This function finds a MDL which in the DCH setup state
+ *
+ * Returns      bool true-found
+ *
+ ******************************************************************************/
 bool bta_hl_find_dch_setup_mdl_idx(uint8_t app_idx, uint8_t mcl_idx,
                                       uint8_t *p_mdl_idx)
 {
@@ -923,14 +923,14 @@ bool bta_hl_find_dch_setup_mdl_idx(uint8_t app_idx, uint8_t mcl_idx,
 }
 
 /*******************************************************************************
-**
-** Function      bta_hl_find_an_in_use_mcl_idx
-**
-** Description  This function finds an in-use MCL control block index
-**
-** Returns      bool true-found
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_find_an_in_use_mcl_idx
+ *
+ * Description  This function finds an in-use MCL control block index
+ *
+ * Returns      bool true-found
+ *
+ ******************************************************************************/
 bool bta_hl_find_an_in_use_mcl_idx(uint8_t app_idx,
                                       uint8_t *p_mcl_idx)
 {
@@ -963,14 +963,14 @@ bool bta_hl_find_an_in_use_mcl_idx(uint8_t app_idx,
 
 
 /*******************************************************************************
-**
-** Function      bta_hl_find_an_in_use_app_idx
-**
-** Description  This function finds an in-use application control block index
-**
-** Returns      bool true-found
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_find_an_in_use_app_idx
+ *
+ * Description  This function finds an in-use application control block index
+ *
+ * Returns      bool true-found
+ *
+ ******************************************************************************/
 bool bta_hl_find_an_in_use_app_idx(uint8_t *p_app_idx)
 {
     tBTA_HL_APP_CB      *p_acb ;
@@ -999,15 +999,15 @@ bool bta_hl_find_an_in_use_app_idx(uint8_t *p_app_idx)
     return found;
 }
 /*******************************************************************************
-**
-** Function      bta_hl_find_app_idx
-**
-** Description  This function finds the application control block index based on
-**              the application ID
-**
-** Returns      bool true-found
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_find_app_idx
+ *
+ * Description  This function finds the application control block index based on
+ *              the application ID
+ *
+ * Returns      bool true-found
+ *
+ ******************************************************************************/
 bool bta_hl_find_app_idx(uint8_t app_id, uint8_t *p_app_idx)
 {
     bool found=false;
@@ -1034,15 +1034,15 @@ bool bta_hl_find_app_idx(uint8_t app_id, uint8_t *p_app_idx)
 
 
 /*******************************************************************************
-**
-** Function      bta_hl_find_app_idx_using_handle
-**
-** Description  This function finds the application control block index based on
-**              the application handle
-**
-** Returns      bool true-found
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_find_app_idx_using_handle
+ *
+ * Description  This function finds the application control block index based on
+ *              the application handle
+ *
+ * Returns      bool true-found
+ *
+ ******************************************************************************/
 bool bta_hl_find_app_idx_using_handle(tBTA_HL_APP_HANDLE app_handle,
                                          uint8_t *p_app_idx)
 {
@@ -1073,15 +1073,15 @@ bool bta_hl_find_app_idx_using_handle(tBTA_HL_APP_HANDLE app_handle,
 
 
 /*******************************************************************************
-**
-** Function      bta_hl_find_mcl_idx_using_handle
-**
-** Description  This function finds the MCL control block index based on
-**              the MCL handle
-**
-** Returns      bool true-found
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_find_mcl_idx_using_handle
+ *
+ * Description  This function finds the MCL control block index based on
+ *              the MCL handle
+ *
+ * Returns      bool true-found
+ *
+ ******************************************************************************/
 bool bta_hl_find_mcl_idx_using_handle( tBTA_HL_MCL_HANDLE mcl_handle,
                                           uint8_t *p_app_idx, uint8_t *p_mcl_idx)
 {
@@ -1118,15 +1118,15 @@ bool bta_hl_find_mcl_idx_using_handle( tBTA_HL_MCL_HANDLE mcl_handle,
 }
 
 /*******************************************************************************
-**
-** Function      bta_hl_find_mcl_idx
-**
-** Description  This function finds the MCL control block index based on
-**              the peer BD address
-**
-** Returns      bool true-found
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_find_mcl_idx
+ *
+ * Description  This function finds the MCL control block index based on
+ *              the peer BD address
+ *
+ * Returns      bool true-found
+ *
+ ******************************************************************************/
 bool bta_hl_find_mcl_idx(uint8_t app_idx, BD_ADDR p_bd_addr, uint8_t *p_mcl_idx)
 {
     bool found=false;
@@ -1156,15 +1156,15 @@ bool bta_hl_find_mcl_idx(uint8_t app_idx, BD_ADDR p_bd_addr, uint8_t *p_mcl_idx)
 
 
 /*******************************************************************************
-**
-** Function      bta_hl_find_mdl_idx_using_handle
-**
-** Description  This function finds the MDL control block index based on
-**              the MDL handle
-**
-** Returns      bool true-found
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_find_mdl_idx_using_handle
+ *
+ * Description  This function finds the MDL control block index based on
+ *              the MDL handle
+ *
+ * Returns      bool true-found
+ *
+ ******************************************************************************/
 bool bta_hl_find_mdl_idx_using_handle(tBTA_HL_MDL_HANDLE mdl_handle,
                                          uint8_t *p_app_idx,uint8_t *p_mcl_idx,
                                          uint8_t *p_mdl_idx)
@@ -1216,16 +1216,16 @@ bool bta_hl_find_mdl_idx_using_handle(tBTA_HL_MDL_HANDLE mdl_handle,
     return found;
 }
 /*******************************************************************************
-**
-** Function      bta_hl_is_the_first_reliable_existed
-**
-** Description  This function checks whether the first reliable DCH channel
-**              has been setup on the MCL or not
-**
-** Returns      bool - true exist
-**                        false does not exist
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_is_the_first_reliable_existed
+ *
+ * Description  This function checks whether the first reliable DCH channel
+ *              has been setup on the MCL or not
+ *
+ * Returns      bool - true exist
+ *                        false does not exist
+ *
+ ******************************************************************************/
 bool bta_hl_is_the_first_reliable_existed(uint8_t app_idx, uint8_t mcl_idx )
 {
     tBTA_HL_MCL_CB      *p_mcb = BTA_HL_GET_MCL_CB_PTR(app_idx, mcl_idx);
@@ -1248,16 +1248,16 @@ bool bta_hl_is_the_first_reliable_existed(uint8_t app_idx, uint8_t mcl_idx )
 }
 
 /*******************************************************************************
-**
-** Function      bta_hl_find_non_active_mdl_cfg
-**
-** Description  This function finds a valid MDL configiration index and this
-**              MDL ID is not active
-**
-** Returns      bool - true found
-**                        false not found
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_find_non_active_mdl_cfg
+ *
+ * Description  This function finds a valid MDL configiration index and this
+ *              MDL ID is not active
+ *
+ * Returns      bool - true found
+ *                        false not found
+ *
+ ******************************************************************************/
 bool  bta_hl_find_non_active_mdl_cfg(uint8_t app_idx, uint8_t start_mdl_cfg_idx,
                                         uint8_t *p_mdl_cfg_idx)
 {
@@ -1310,15 +1310,15 @@ bool  bta_hl_find_non_active_mdl_cfg(uint8_t app_idx, uint8_t start_mdl_cfg_idx,
 }
 
 /*******************************************************************************
-**
-** Function      bta_hl_find_mdl_cfg_idx
-**
-** Description  This function finds an available MDL configuration index
-**
-** Returns      bool - true found
-**                        false not found
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_find_mdl_cfg_idx
+ *
+ * Description  This function finds an available MDL configuration index
+ *
+ * Returns      bool - true found
+ *                        false not found
+ *
+ ******************************************************************************/
 bool  bta_hl_find_avail_mdl_cfg_idx(uint8_t app_idx, UNUSED_ATTR uint8_t mcl_idx,
                                        uint8_t *p_mdl_cfg_idx)
 {
@@ -1403,16 +1403,16 @@ bool  bta_hl_find_avail_mdl_cfg_idx(uint8_t app_idx, UNUSED_ATTR uint8_t mcl_idx
 }
 
 /*******************************************************************************
-**
-** Function      bta_hl_find_mdl_cfg_idx
-**
-** Description  This function finds the MDL configuration index based on
-**              the MDL ID
-**
-** Returns      bool - true found
-**                        false not found
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_find_mdl_cfg_idx
+ *
+ * Description  This function finds the MDL configuration index based on
+ *              the MDL ID
+ *
+ * Returns      bool - true found
+ *                        false not found
+ *
+ ******************************************************************************/
 bool  bta_hl_find_mdl_cfg_idx(uint8_t app_idx, uint8_t mcl_idx,
                                  tBTA_HL_MDL_ID mdl_id, uint8_t *p_mdl_cfg_idx)
 {
@@ -1452,15 +1452,15 @@ bool  bta_hl_find_mdl_cfg_idx(uint8_t app_idx, uint8_t mcl_idx,
 
 
 /*******************************************************************************
-**
-** Function      bta_hl_get_cur_time
-**
-** Description  This function get the cuurent time value
-**
-** Returns      bool - true found
-**                        false not found
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_get_cur_time
+ *
+ * Description  This function get the cuurent time value
+ *
+ * Returns      bool - true found
+ *                        false not found
+ *
+ ******************************************************************************/
 bool  bta_hl_get_cur_time(uint8_t app_idx, uint8_t *p_cur_time)
 {
     tBTA_HL_MDL_CFG     *p_mdl;
@@ -1520,16 +1520,16 @@ bool  bta_hl_get_cur_time(uint8_t app_idx, uint8_t *p_cur_time)
 }
 
 /*******************************************************************************
-**
-** Function      bta_hl_sort_cfg_time_idx
-**
-** Description  This function sort the mdl configuration idx stored in array a
-**              based on decending time value
-**
-** Returns      bool - true found
-**                        false not found
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_sort_cfg_time_idx
+ *
+ * Description  This function sort the mdl configuration idx stored in array a
+ *              based on decending time value
+ *
+ * Returns      bool - true found
+ *                        false not found
+ *
+ ******************************************************************************/
 void bta_hl_sort_cfg_time_idx(uint8_t app_idx, uint8_t *a, uint8_t n)
 {
     tBTA_HL_APP_CB      *p_acb = BTA_HL_GET_APP_CB_PTR(app_idx);
@@ -1550,16 +1550,16 @@ void bta_hl_sort_cfg_time_idx(uint8_t app_idx, uint8_t *a, uint8_t n)
 }
 
 /*******************************************************************************
-**
-** Function      bta_hl_compact_mdl_cfg_time
-**
-** Description  This function finds the MDL configuration index based on
-**              the MDL ID
-**
-** Returns      bool - true found
-**                        false not found
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_compact_mdl_cfg_time
+ *
+ * Description  This function finds the MDL configuration index based on
+ *              the MDL ID
+ *
+ * Returns      bool - true found
+ *                        false not found
+ *
+ ******************************************************************************/
 void  bta_hl_compact_mdl_cfg_time(uint8_t app_idx, uint8_t mdep_id)
 {
     tBTA_HL_MDL_CFG     *p_mdl;
@@ -1602,16 +1602,16 @@ void  bta_hl_compact_mdl_cfg_time(uint8_t app_idx, uint8_t mdep_id)
 
 
 /*******************************************************************************
-**
-** Function      bta_hl_is_mdl_exsit_in_mcl
-**
-** Description  This function checks whether the MDL ID
-**              has already existed in teh MCL or not
-**
-** Returns      bool - true exist
-**                        false does not exist
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_is_mdl_exsit_in_mcl
+ *
+ * Description  This function checks whether the MDL ID
+ *              has already existed in teh MCL or not
+ *
+ * Returns      bool - true exist
+ *                        false does not exist
+ *
+ ******************************************************************************/
 bool  bta_hl_is_mdl_exsit_in_mcl(uint8_t app_idx, BD_ADDR bd_addr,
                                     tBTA_HL_MDL_ID mdl_id)
 {
@@ -1645,15 +1645,15 @@ bool  bta_hl_is_mdl_exsit_in_mcl(uint8_t app_idx, BD_ADDR bd_addr,
 }
 
 /*******************************************************************************
-**
-** Function      bta_hl_delete_mdl_cfg
-**
-** Description  This function delete the specified MDL ID
-**
-** Returns      bool - true Success
-**                        false Failed
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_delete_mdl_cfg
+ *
+ * Description  This function delete the specified MDL ID
+ *
+ * Returns      bool - true Success
+ *                        false Failed
+ *
+ ******************************************************************************/
 bool  bta_hl_delete_mdl_cfg(uint8_t app_idx, BD_ADDR bd_addr,
                                tBTA_HL_MDL_ID mdl_id)
 {
@@ -1691,21 +1691,21 @@ bool  bta_hl_delete_mdl_cfg(uint8_t app_idx, BD_ADDR bd_addr,
 
 
 /*******************************************************************************
-**
-** Function      bta_hl_is_mdl_value_valid
-**
-**
-** Description  This function checks the specified MDL ID is in valid range or not
-**
-** Returns      bool - true Success
-**                        false Failed
-**
-** note:   mdl_id range   0x0000 reserved,
-**                        0x0001-oxFEFF dynamic range,
-**                        0xFF00-0xFFFE reserved,
-**                        0xFFFF indicates all MDLs (for delete operation only)
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_is_mdl_value_valid
+ *
+ *
+ * Description  This function checks the specified MDL ID is in valid range or not
+ *
+ * Returns      bool - true Success
+ *                        false Failed
+ *
+ * note:   mdl_id range   0x0000 reserved,
+ *                        0x0001-oxFEFF dynamic range,
+ *                        0xFF00-0xFFFE reserved,
+ *                        0xFFFF indicates all MDLs (for delete operation only)
+ *
+ ******************************************************************************/
 bool  bta_hl_is_mdl_value_valid(tBTA_HL_MDL_ID mdl_id)
 {
     bool             status = true;
@@ -1729,16 +1729,16 @@ bool  bta_hl_is_mdl_value_valid(tBTA_HL_MDL_ID mdl_id)
 }
 
 /*******************************************************************************
-**
-** Function      bta_hl_find_mdep_cfg_idx
-**
-** Description  This function finds the MDEP configuration index based
-**                on the local MDEP ID
-**
-** Returns      bool - true found
-**                        false not found
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_find_mdep_cfg_idx
+ *
+ * Description  This function finds the MDEP configuration index based
+ *                on the local MDEP ID
+ *
+ * Returns      bool - true found
+ *                        false not found
+ *
+ ******************************************************************************/
 bool bta_hl_find_mdep_cfg_idx(uint8_t app_idx,  tBTA_HL_MDEP_ID local_mdep_id,
                                  uint8_t *p_mdep_cfg_idx)
 {
@@ -1769,15 +1769,15 @@ bool bta_hl_find_mdep_cfg_idx(uint8_t app_idx,  tBTA_HL_MDEP_ID local_mdep_id,
 
 
 /*******************************************************************************
-**
-** Function      bta_hl_find_rxtx_apdu_size
-**
-** Description  This function finds the maximum APDU rx and tx sizes based on
-**              the MDEP configuration data
-**
-** Returns      void
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_find_rxtx_apdu_size
+ *
+ * Description  This function finds the maximum APDU rx and tx sizes based on
+ *              the MDEP configuration data
+ *
+ * Returns      void
+ *
+ ******************************************************************************/
 void bta_hl_find_rxtx_apdu_size(uint8_t app_idx, uint8_t mdep_cfg_idx,
                                 uint16_t *p_rx_apu_size,
                                 uint16_t *p_tx_apu_size)
@@ -1817,15 +1817,15 @@ void bta_hl_find_rxtx_apdu_size(uint8_t app_idx, uint8_t mdep_cfg_idx,
 }
 
 /*******************************************************************************
-**
-** Function      bta_hl_validate_peer_cfg
-**
-** Description  This function validates the peer DCH configuration
-**
-** Returns      bool - true validation is successful
-**                        false validation failed
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_validate_peer_cfg
+ *
+ * Description  This function validates the peer DCH configuration
+ *
+ * Returns      bool - true validation is successful
+ *                        false validation failed
+ *
+ ******************************************************************************/
 bool bta_hl_validate_peer_cfg(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
                                  tBTA_HL_MDEP_ID peer_mdep_id,
                                  tBTA_HL_MDEP_ROLE peer_mdep_role,
@@ -1870,17 +1870,17 @@ bool bta_hl_validate_peer_cfg(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
 }
 
 /*******************************************************************************
-**
-** Function      bta_hl_chk_local_cfg
-**
-** Description  This function check whether the local DCH configuration is OK or not
-**
-** Returns      tBTA_HL_STATUS - OK - local DCH configuration is OK
-**                               NO_FIRST_RELIABLE - the streaming DCH configuration
-**                                                   is not OK and it needs to use
-**                                                   reliable DCH configuration
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_chk_local_cfg
+ *
+ * Description  This function check whether the local DCH configuration is OK or not
+ *
+ * Returns      tBTA_HL_STATUS - OK - local DCH configuration is OK
+ *                               NO_FIRST_RELIABLE - the streaming DCH configuration
+ *                                                   is not OK and it needs to use
+ *                                                   reliable DCH configuration
+ *
+ ******************************************************************************/
 tBTA_HL_STATUS bta_hl_chk_local_cfg(uint8_t app_idx, uint8_t mcl_idx,
                                     uint8_t mdep_cfg_idx,
                                     tBTA_HL_DCH_CFG local_cfg)
@@ -1902,14 +1902,14 @@ tBTA_HL_STATUS bta_hl_chk_local_cfg(uint8_t app_idx, uint8_t mcl_idx,
 
 
 /*******************************************************************************
-**
-** Function      bta_hl_validate_reconnect_params
-**
-** Description  This function validates the reconnect parameters
-**
-** Returns      bool - true validation is successful
-**                        false validation failed
-*******************************************************************************/
+ *
+ * Function      bta_hl_validate_reconnect_params
+ *
+ * Description  This function validates the reconnect parameters
+ *
+ * Returns      bool - true validation is successful
+ *                        false validation failed
+ ******************************************************************************/
 bool bta_hl_validate_reconnect_params(uint8_t app_idx, uint8_t mcl_idx,
                                          tBTA_HL_API_DCH_RECONNECT *p_reconnect,
                                          uint8_t *p_mdep_cfg_idx, uint8_t *p_mdl_cfg_idx)
@@ -1985,13 +1985,13 @@ bool bta_hl_validate_reconnect_params(uint8_t app_idx, uint8_t mcl_idx,
 }
 
 /*******************************************************************************
-**
-** Function      bta_hl_find_avail_mcl_idx
-**
-** Returns      bool - true found
-**                        false not found
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_find_avail_mcl_idx
+ *
+ * Returns      bool - true found
+ *                        false not found
+ *
+ ******************************************************************************/
 bool bta_hl_find_avail_mcl_idx(uint8_t app_idx, uint8_t *p_mcl_idx)
 {
     bool found=false;
@@ -2020,15 +2020,15 @@ bool bta_hl_find_avail_mcl_idx(uint8_t app_idx, uint8_t *p_mcl_idx)
 
 
 /*******************************************************************************
-**
-** Function      bta_hl_find_avail_mdl_idx
-**
-** Description  This function finds an available MDL control block index
-**
-** Returns      bool - true found
-**                        false not found
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_find_avail_mdl_idx
+ *
+ * Description  This function finds an available MDL control block index
+ *
+ * Returns      bool - true found
+ *                        false not found
+ *
+ ******************************************************************************/
 bool bta_hl_find_avail_mdl_idx(uint8_t app_idx, uint8_t mcl_idx,
                                   uint8_t *p_mdl_idx)
 {
@@ -2058,14 +2058,14 @@ bool bta_hl_find_avail_mdl_idx(uint8_t app_idx, uint8_t mcl_idx,
 }
 
 /*******************************************************************************
-**
-** Function      bta_hl_is_a_duplicate_id
-**
-** Description  This function finds the application has been used or not
-**
-** Returns      bool - true the app_id is a duplicate ID
-**                        false not a duplicate ID
-*******************************************************************************/
+ *
+ * Function      bta_hl_is_a_duplicate_id
+ *
+ * Description  This function finds the application has been used or not
+ *
+ * Returns      bool - true the app_id is a duplicate ID
+ *                        false not a duplicate ID
+ ******************************************************************************/
 bool bta_hl_is_a_duplicate_id(uint8_t app_id)
 {
     bool is_duplicate=false;
@@ -2096,15 +2096,15 @@ bool bta_hl_is_a_duplicate_id(uint8_t app_id)
 
 
 /*******************************************************************************
-**
-** Function      bta_hl_find_avail_app_idx
-**
-** Description  This function finds an available application control block index
-**
-** Returns      bool - true found
-**                        false not found
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_find_avail_app_idx
+ *
+ * Description  This function finds an available application control block index
+ *
+ * Returns      bool - true found
+ *                        false not found
+ *
+ ******************************************************************************/
 bool bta_hl_find_avail_app_idx(uint8_t *p_idx)
 {
     bool found=false;
@@ -2131,14 +2131,14 @@ bool bta_hl_find_avail_app_idx(uint8_t *p_idx)
 }
 
 /*******************************************************************************
-**
-** Function      bta_hl_app_update
-**
-** Description  This function registers an HDP application MCAP and DP
-**
-** Returns      tBTA_HL_STATUS -registration status
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_app_update
+ *
+ * Description  This function registers an HDP application MCAP and DP
+ *
+ * Returns      tBTA_HL_STATUS -registration status
+ *
+ ******************************************************************************/
 tBTA_HL_STATUS bta_hl_app_update(uint8_t app_id, bool is_register)
 {
     tBTA_HL_STATUS  status = BTA_HL_STATUS_OK;
@@ -2292,14 +2292,14 @@ tBTA_HL_STATUS bta_hl_app_update(uint8_t app_id, bool is_register)
 
 
 /*******************************************************************************
-**
-** Function      bta_hl_app_registration
-**
-** Description  This function registers an HDP application MCAP and DP
-**
-** Returns      tBTA_HL_STATUS -registration status
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_app_registration
+ *
+ * Description  This function registers an HDP application MCAP and DP
+ *
+ * Returns      tBTA_HL_STATUS -registration status
+ *
+ ******************************************************************************/
 tBTA_HL_STATUS bta_hl_app_registration(uint8_t app_idx)
 {
     tBTA_HL_STATUS  status = BTA_HL_STATUS_OK;
@@ -2433,14 +2433,14 @@ tBTA_HL_STATUS bta_hl_app_registration(uint8_t app_idx)
 
 
 /*******************************************************************************
-**
-** Function         bta_hl_discard_data
-**
-** Description  This function discard an HDP event
-**
-** Returns     void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_discard_data
+ *
+ * Description  This function discard an HDP event
+ *
+ * Returns     void
+ *
+ ******************************************************************************/
 void bta_hl_discard_data(uint16_t event, tBTA_HL_DATA *p_data)
 {
 
@@ -2465,14 +2465,14 @@ void bta_hl_discard_data(uint16_t event, tBTA_HL_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_hl_save_mdl_cfg
-**
-** Description    This function saves the MDL configuration
-**
-** Returns     void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_save_mdl_cfg
+ *
+ * Description    This function saves the MDL configuration
+ *
+ * Returns     void
+ *
+ ******************************************************************************/
 void bta_hl_save_mdl_cfg(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx )
 {
     tBTA_HL_APP_CB      *p_acb  = BTA_HL_GET_APP_CB_PTR(app_idx);
@@ -2537,13 +2537,13 @@ void bta_hl_save_mdl_cfg(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx )
 }
 
 /*******************************************************************************
-**
-** Function      bta_hl_set_dch_chan_cfg
-**
-** Description    This function setups the L2CAP DCH channel configuration
-**
-** Returns     void
-*******************************************************************************/
+ *
+ * Function      bta_hl_set_dch_chan_cfg
+ *
+ * Description    This function setups the L2CAP DCH channel configuration
+ *
+ * Returns     void
+ ******************************************************************************/
 void bta_hl_set_dch_chan_cfg(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,tBTA_HL_DATA *p_data)
 {
     tBTA_HL_APP_CB *p_acb  = BTA_HL_GET_APP_CB_PTR(app_idx);
@@ -2628,13 +2628,13 @@ void bta_hl_set_dch_chan_cfg(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,t
 }
 
 /*******************************************************************************
-**
-** Function      bta_hl_get_l2cap_cfg
-**
-** Description    This function get the current L2CAP channel configuration
-**
-** Returns     bool - true - operation is successful
-*******************************************************************************/
+ *
+ * Function      bta_hl_get_l2cap_cfg
+ *
+ * Description    This function get the current L2CAP channel configuration
+ *
+ * Returns     bool - true - operation is successful
+ ******************************************************************************/
 bool bta_hl_get_l2cap_cfg(tBTA_HL_MDL_HANDLE mdl_hnd, tBTA_HL_L2CAP_CFG_INFO *p_cfg)
 {
     bool success = false;
@@ -2700,13 +2700,13 @@ bool bta_hl_get_l2cap_cfg(tBTA_HL_MDL_HANDLE mdl_hnd, tBTA_HL_L2CAP_CFG_INFO *p_
 }
 
 /*******************************************************************************
-**
-** Function      bta_hl_validate_chan_cfg
-**
-** Description    This function validates the L2CAP channel configuration
-**
-** Returns     bool - true - validation is successful
-*******************************************************************************/
+ *
+ * Function      bta_hl_validate_chan_cfg
+ *
+ * Description    This function validates the L2CAP channel configuration
+ *
+ * Returns     bool - true - validation is successful
+ ******************************************************************************/
 bool bta_hl_validate_chan_cfg(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx)
 {
     tBTA_HL_APP_CB *p_acb  = BTA_HL_GET_APP_CB_PTR(app_idx);
@@ -2752,15 +2752,15 @@ bool bta_hl_validate_chan_cfg(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx)
 
 
 /*******************************************************************************
-**
-** Function      bta_hl_is_cong_on
-**
-** Description    This function checks whether the congestion condition is on or not
-**
-** Returns      bool - true DCH is congested
-**                        false not congested
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_is_cong_on
+ *
+ * Description    This function checks whether the congestion condition is on or not
+ *
+ * Returns      bool - true DCH is congested
+ *                        false not congested
+ *
+ ******************************************************************************/
 bool  bta_hl_is_cong_on(uint8_t app_id, BD_ADDR bd_addr, tBTA_HL_MDL_ID mdl_id)
 
 {
@@ -2784,14 +2784,14 @@ bool  bta_hl_is_cong_on(uint8_t app_id, BD_ADDR bd_addr, tBTA_HL_MDL_ID mdl_id)
 }
 
 /*******************************************************************************
-**
-** Function      bta_hl_check_cch_close
-**
-** Description   This function checks whether there is a pending CCH close request
-**               or not
-**
-** Returns      void
-*******************************************************************************/
+ *
+ * Function      bta_hl_check_cch_close
+ *
+ * Description   This function checks whether there is a pending CCH close request
+ *               or not
+ *
+ * Returns      void
+ ******************************************************************************/
 void bta_hl_check_cch_close(uint8_t app_idx, uint8_t mcl_idx, tBTA_HL_DATA *p_data, bool check_dch_setup )
 {
     tBTA_HL_MCL_CB      *p_mcb  = BTA_HL_GET_MCL_CB_PTR(app_idx, mcl_idx);
@@ -2837,14 +2837,14 @@ void bta_hl_check_cch_close(uint8_t app_idx, uint8_t mcl_idx, tBTA_HL_DATA *p_da
 }
 
 /*******************************************************************************
-**
-** Function         bta_hl_clean_app
-**
-** Description      Cleans up the HDP application resources and control block
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_clean_app
+ *
+ * Description      Cleans up the HDP application resources and control block
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_hl_clean_app(uint8_t app_idx)
 {
     tBTA_HL_APP_CB         *p_acb   = BTA_HL_GET_APP_CB_PTR(app_idx);
@@ -2873,14 +2873,14 @@ void bta_hl_clean_app(uint8_t app_idx)
 }
 
 /*******************************************************************************
-**
-** Function      bta_hl_check_deregistration
-**
-** Description   This function checks whether there is a pending deregistration
-**               request or not
-**
-** Returns      void
-*******************************************************************************/
+ *
+ * Function      bta_hl_check_deregistration
+ *
+ * Description   This function checks whether there is a pending deregistration
+ *               request or not
+ *
+ * Returns      void
+ ******************************************************************************/
 void bta_hl_check_deregistration(uint8_t app_idx, tBTA_HL_DATA *p_data )
 {
     tBTA_HL_APP_CB      *p_acb  = BTA_HL_GET_APP_CB_PTR(app_idx);
@@ -2921,15 +2921,15 @@ void bta_hl_check_deregistration(uint8_t app_idx, tBTA_HL_DATA *p_data )
 
 
 /*******************************************************************************
-**
-** Function      bta_hl_check_disable
-**
-** Description   This function checks whether there is a pending disable
-**               request or not
-**
-** Returns      void
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_check_disable
+ *
+ * Description   This function checks whether there is a pending disable
+ *               request or not
+ *
+ * Returns      void
+ *
+ ******************************************************************************/
 void bta_hl_check_disable(tBTA_HL_DATA *p_data )
 {
     tBTA_HL_CB          *p_cb= &bta_hl_cb;
@@ -2964,14 +2964,14 @@ void bta_hl_check_disable(tBTA_HL_DATA *p_data )
 }
 
 /*******************************************************************************
-**
-** Function      bta_hl_build_abort_cfm
-**
-** Description   This function builds the abort confirmation event data
-**
-** Returns      None
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_build_abort_cfm
+ *
+ * Description   This function builds the abort confirmation event data
+ *
+ * Returns      None
+ *
+ ******************************************************************************/
 void  bta_hl_build_abort_cfm(tBTA_HL *p_evt_data,
                              tBTA_HL_APP_HANDLE app_handle,
                              tBTA_HL_MCL_HANDLE mcl_handle,
@@ -2983,14 +2983,14 @@ void  bta_hl_build_abort_cfm(tBTA_HL *p_evt_data,
 }
 
 /*******************************************************************************
-**
-** Function      bta_hl_build_abort_ind
-**
-** Description   This function builds the abort indication event data
-**
-** Returns      None
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_build_abort_ind
+ *
+ * Description   This function builds the abort indication event data
+ *
+ * Returns      None
+ *
+ ******************************************************************************/
 void  bta_hl_build_abort_ind(tBTA_HL *p_evt_data,
                              tBTA_HL_APP_HANDLE app_handle,
                              tBTA_HL_MCL_HANDLE mcl_handle)
@@ -2999,14 +2999,14 @@ void  bta_hl_build_abort_ind(tBTA_HL *p_evt_data,
     p_evt_data->dch_abort_ind.app_handle = app_handle;
 }
 /*******************************************************************************
-**
-** Function      bta_hl_build_close_cfm
-**
-** Description   This function builds the close confirmation event data
-**
-** Returns      None
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_build_close_cfm
+ *
+ * Description   This function builds the close confirmation event data
+ *
+ * Returns      None
+ *
+ ******************************************************************************/
 void  bta_hl_build_dch_close_cfm(tBTA_HL *p_evt_data,
                                  tBTA_HL_APP_HANDLE app_handle,
                                  tBTA_HL_MCL_HANDLE mcl_handle,
@@ -3020,14 +3020,14 @@ void  bta_hl_build_dch_close_cfm(tBTA_HL *p_evt_data,
 }
 
 /*******************************************************************************
-**
-** Function      bta_hl_build_dch_close_ind
-**
-** Description   This function builds the close indication event data
-**
-** Returns      None
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_build_dch_close_ind
+ *
+ * Description   This function builds the close indication event data
+ *
+ * Returns      None
+ *
+ ******************************************************************************/
 void  bta_hl_build_dch_close_ind(tBTA_HL *p_evt_data,
                                  tBTA_HL_APP_HANDLE app_handle,
                                  tBTA_HL_MCL_HANDLE mcl_handle,
@@ -3041,14 +3041,14 @@ void  bta_hl_build_dch_close_ind(tBTA_HL *p_evt_data,
 }
 
 /*******************************************************************************
-**
-** Function      bta_hl_build_send_data_cfm
-**
-** Description   This function builds the send data confirmation event data
-**
-** Returns      None
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_build_send_data_cfm
+ *
+ * Description   This function builds the send data confirmation event data
+ *
+ * Returns      None
+ *
+ ******************************************************************************/
 void  bta_hl_build_send_data_cfm(tBTA_HL *p_evt_data,
                                  tBTA_HL_APP_HANDLE app_handle,
                                  tBTA_HL_MCL_HANDLE mcl_handle,
@@ -3063,14 +3063,14 @@ void  bta_hl_build_send_data_cfm(tBTA_HL *p_evt_data,
 }
 
 /*******************************************************************************
-**
-** Function      bta_hl_build_rcv_data_ind
-**
-** Description   This function builds the received data indication event data
-**
-** Returns      None
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_build_rcv_data_ind
+ *
+ * Description   This function builds the received data indication event data
+ *
+ * Returns      None
+ *
+ ******************************************************************************/
 void  bta_hl_build_rcv_data_ind(tBTA_HL *p_evt_data,
                                 tBTA_HL_APP_HANDLE app_handle,
                                 tBTA_HL_MCL_HANDLE mcl_handle,
@@ -3083,14 +3083,14 @@ void  bta_hl_build_rcv_data_ind(tBTA_HL *p_evt_data,
 
 
 /*******************************************************************************
-**
-** Function      bta_hl_build_cch_open_cfm
-**
-** Description   This function builds the CCH open confirmation event data
-**
-** Returns      None
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_build_cch_open_cfm
+ *
+ * Description   This function builds the CCH open confirmation event data
+ *
+ * Returns      None
+ *
+ ******************************************************************************/
 void  bta_hl_build_cch_open_cfm(tBTA_HL *p_evt_data,
                                 uint8_t app_id,
                                 tBTA_HL_APP_HANDLE app_handle,
@@ -3107,14 +3107,14 @@ void  bta_hl_build_cch_open_cfm(tBTA_HL *p_evt_data,
 }
 
 /*******************************************************************************
-**
-** Function      bta_hl_build_cch_open_ind
-**
-** Description   This function builds the CCH open indication event data
-**
-** Returns      None
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_build_cch_open_ind
+ *
+ * Description   This function builds the CCH open indication event data
+ *
+ * Returns      None
+ *
+ ******************************************************************************/
 void  bta_hl_build_cch_open_ind(tBTA_HL *p_evt_data, tBTA_HL_APP_HANDLE app_handle,
                                 tBTA_HL_MCL_HANDLE mcl_handle,
                                 BD_ADDR bd_addr )
@@ -3126,14 +3126,14 @@ void  bta_hl_build_cch_open_ind(tBTA_HL *p_evt_data, tBTA_HL_APP_HANDLE app_hand
 }
 
 /*******************************************************************************
-**
-** Function      bta_hl_build_cch_close_cfm
-**
-** Description   This function builds the CCH close confirmation event data
-**
-** Returns      None
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_build_cch_close_cfm
+ *
+ * Description   This function builds the CCH close confirmation event data
+ *
+ * Returns      None
+ *
+ ******************************************************************************/
 void  bta_hl_build_cch_close_cfm(tBTA_HL *p_evt_data,
                                  tBTA_HL_APP_HANDLE app_handle,
                                  tBTA_HL_MCL_HANDLE mcl_handle,
@@ -3146,14 +3146,14 @@ void  bta_hl_build_cch_close_cfm(tBTA_HL *p_evt_data,
 
 
 /*******************************************************************************
-**
-** Function      bta_hl_build_cch_close_ind
-**
-** Description   This function builds the CCH colse indication event data
-**
-** Returns      None
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_build_cch_close_ind
+ *
+ * Description   This function builds the CCH colse indication event data
+ *
+ * Returns      None
+ *
+ ******************************************************************************/
 void  bta_hl_build_cch_close_ind(tBTA_HL *p_evt_data,
                                  tBTA_HL_APP_HANDLE app_handle,
                                  tBTA_HL_MCL_HANDLE mcl_handle,
@@ -3165,14 +3165,14 @@ void  bta_hl_build_cch_close_ind(tBTA_HL *p_evt_data,
 }
 
 /*******************************************************************************
-**
-** Function      bta_hl_build_dch_open_cfm
-**
-** Description   This function builds the DCH open confirmation event data
-**
-** Returns      None
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_build_dch_open_cfm
+ *
+ * Description   This function builds the DCH open confirmation event data
+ *
+ * Returns      None
+ *
+ ******************************************************************************/
 void  bta_hl_build_dch_open_cfm(tBTA_HL *p_evt_data,
                                 tBTA_HL_APP_HANDLE app_handle,
                                 tBTA_HL_MCL_HANDLE mcl_handle,
@@ -3198,14 +3198,14 @@ void  bta_hl_build_dch_open_cfm(tBTA_HL *p_evt_data,
 
 
 /*******************************************************************************
-**
-** Function      bta_hl_build_sdp_query_cfm
-**
-** Description   This function builds the SDP query indication event data
-**
-** Returns      None
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_build_sdp_query_cfm
+ *
+ * Description   This function builds the SDP query indication event data
+ *
+ * Returns      None
+ *
+ ******************************************************************************/
 void  bta_hl_build_sdp_query_cfm(tBTA_HL *p_evt_data,
                                  uint8_t app_id,
                                  tBTA_HL_APP_HANDLE app_handle,
@@ -3225,14 +3225,14 @@ void  bta_hl_build_sdp_query_cfm(tBTA_HL *p_evt_data,
 
 
 /*******************************************************************************
-**
-** Function      bta_hl_build_delete_mdl_cfm
-**
-** Description   This function builds the delete MDL confirmation event data
-**
-** Returns      None
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_build_delete_mdl_cfm
+ *
+ * Description   This function builds the delete MDL confirmation event data
+ *
+ * Returns      None
+ *
+ ******************************************************************************/
 void  bta_hl_build_delete_mdl_cfm(tBTA_HL *p_evt_data,
                                   tBTA_HL_APP_HANDLE app_handle,
                                   tBTA_HL_MCL_HANDLE mcl_handle,
@@ -3247,14 +3247,14 @@ void  bta_hl_build_delete_mdl_cfm(tBTA_HL *p_evt_data,
 }
 
 /*******************************************************************************
-**
-** Function      bta_hl_build_echo_test_cfm
-**
-** Description   This function builds the echo test confirmation event data
-**
-** Returns      None
-**
-*******************************************************************************/
+ *
+ * Function      bta_hl_build_echo_test_cfm
+ *
+ * Description   This function builds the echo test confirmation event data
+ *
+ * Returns      None
+ *
+ ******************************************************************************/
 void  bta_hl_build_echo_test_cfm(tBTA_HL *p_evt_data,
                                  tBTA_HL_APP_HANDLE app_handle,
                                  tBTA_HL_MCL_HANDLE mcl_handle,
@@ -3267,19 +3267,19 @@ void  bta_hl_build_echo_test_cfm(tBTA_HL *p_evt_data,
 
 
 /*****************************************************************************
-**  Debug Functions
-*****************************************************************************/
+ *  Debug Functions
+ ****************************************************************************/
 #if (BTA_HL_DEBUG == TRUE)
 
 /*******************************************************************************
-**
-** Function         bta_hl_status_code
-**
-** Description      get the status string pointer
-**
-** Returns          char * - status string pointer
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_status_code
+ *
+ * Description      get the status string pointer
+ *
+ * Returns          char * - status string pointer
+ *
+ ******************************************************************************/
 const char *bta_hl_status_code(tBTA_HL_STATUS status)
 {
     switch (status)
@@ -3340,14 +3340,14 @@ const char *bta_hl_status_code(tBTA_HL_STATUS status)
     }
 }
 /*******************************************************************************
-**
-** Function         bta_hl_evt_code
-**
-** Description      Maps HL event code to the corresponding event string
-**
-** Returns          string pointer for the associated event name
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_evt_code
+ *
+ * Description      Maps HL event code to the corresponding event string
+ *
+ * Returns          string pointer for the associated event name
+ *
+ ******************************************************************************/
 const char *bta_hl_evt_code(tBTA_HL_INT_EVT evt_code)
 {
     switch (evt_code)
diff --git a/system/bta/include/bta_ag_api.h b/system/bta/include/bta_ag_api.h
index 13f0554d58d..c5e51cf8776 100644
--- a/system/bta/include/bta_ag_api.h
+++ b/system/bta/include/bta_ag_api.h
@@ -32,8 +32,8 @@ extern "C" {
 #endif
 
 /*****************************************************************************
-**  Constants and data types
-*****************************************************************************/
+ *  Constants and data types
+ ****************************************************************************/
 #define HFP_VERSION_1_1         0x0101
 #define HFP_VERSION_1_5         0x0105
 #define HFP_VERSION_1_6         0x0106
@@ -442,141 +442,141 @@ typedef struct
 } tBTA_AG_CFG;
 
 /*****************************************************************************
-**  External Function Declarations
-*****************************************************************************/
+ *  External Function Declarations
+ ****************************************************************************/
 
 /*******************************************************************************
-**
-** Function         BTA_AgEnable
-**
-** Description      Enable the audio gateway service. When the enable
-**                  operation is complete the callback function will be
-**                  called with a BTA_AG_ENABLE_EVT. This function must
-**                  be called before other function in the AG API are
-**                  called.
-**
-** Returns          BTA_SUCCESS if OK, BTA_FAILURE otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AgEnable
+ *
+ * Description      Enable the audio gateway service. When the enable
+ *                  operation is complete the callback function will be
+ *                  called with a BTA_AG_ENABLE_EVT. This function must
+ *                  be called before other function in the AG API are
+ *                  called.
+ *
+ * Returns          BTA_SUCCESS if OK, BTA_FAILURE otherwise.
+ *
+ ******************************************************************************/
 tBTA_STATUS BTA_AgEnable(tBTA_AG_PARSE_MODE parse_mode, tBTA_AG_CBACK *p_cback);
 
 /*******************************************************************************
-**
-** Function         BTA_AgDisable
-**
-** Description      Disable the audio gateway service
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AgDisable
+ *
+ * Description      Disable the audio gateway service
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AgDisable(void);
 
 /*******************************************************************************
-**
-** Function         BTA_AgRegister
-**
-** Description      Register an Audio Gateway service.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AgRegister
+ *
+ * Description      Register an Audio Gateway service.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AgRegister(tBTA_SERVICE_MASK services, tBTA_SEC sec_mask,
                     tBTA_AG_FEAT features, const char *p_service_names[], uint8_t app_id);
 
 /*******************************************************************************
-**
-** Function         BTA_AgDeregister
-**
-** Description      Deregister an audio gateway service.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AgDeregister
+ *
+ * Description      Deregister an audio gateway service.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AgDeregister(uint16_t handle);
 
 /*******************************************************************************
-**
-** Function         BTA_AgOpen
-**
-** Description      Opens a connection to a headset or hands-free device.
-**                  When connection is open callback function is called
-**                  with a BTA_AG_OPEN_EVT. Only the data connection is
-**                  opened. The audio connection is not opened.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AgOpen
+ *
+ * Description      Opens a connection to a headset or hands-free device.
+ *                  When connection is open callback function is called
+ *                  with a BTA_AG_OPEN_EVT. Only the data connection is
+ *                  opened. The audio connection is not opened.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AgOpen(uint16_t handle, BD_ADDR bd_addr, tBTA_SEC sec_mask, tBTA_SERVICE_MASK services);
 
 /*******************************************************************************
-**
-** Function         BTA_AgClose
-**
-** Description      Close the current connection to a headset or a handsfree
-**                  Any current audio connection will also be closed
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AgClose
+ *
+ * Description      Close the current connection to a headset or a handsfree
+ *                  Any current audio connection will also be closed
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AgClose(uint16_t handle);
 
 /*******************************************************************************
-**
-** Function         BTA_AgAudioOpen
-**
-** Description      Opens an audio connection to the currently connected
-**                  headset or hnadsfree
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AgAudioOpen
+ *
+ * Description      Opens an audio connection to the currently connected
+ *                  headset or hnadsfree
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AgAudioOpen(uint16_t handle);
 
 /*******************************************************************************
-**
-** Function         BTA_AgAudioClose
-**
-** Description      Close the currently active audio connection to a headset
-**                  or hnadsfree. The data connection remains open
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AgAudioClose
+ *
+ * Description      Close the currently active audio connection to a headset
+ *                  or hnadsfree. The data connection remains open
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AgAudioClose(uint16_t handle);
 
 /*******************************************************************************
-**
-** Function         BTA_AgResult
-**
-** Description      Send an AT result code to a headset or hands-free device.
-**                  This function is only used when the AG parse mode is set
-**                  to BTA_AG_PARSE.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AgResult
+ *
+ * Description      Send an AT result code to a headset or hands-free device.
+ *                  This function is only used when the AG parse mode is set
+ *                  to BTA_AG_PARSE.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AgResult(uint16_t handle, tBTA_AG_RES result, tBTA_AG_RES_DATA *p_data);
 
 /*******************************************************************************
-**
-** Function         BTA_AgSetCodec
-**
-** Description      Specify the codec type to be used for the subsequent
-**                  audio connection.
-**
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AgSetCodec
+ *
+ * Description      Specify the codec type to be used for the subsequent
+ *                  audio connection.
+ *
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AgSetCodec(uint16_t handle, tBTA_AG_PEER_CODEC codec);
 
 #ifdef __cplusplus
diff --git a/system/bta/include/bta_ag_ci.h b/system/bta/include/bta_ag_ci.h
index 4c2a4ffd37b..4b3a60264c4 100644
--- a/system/bta/include/bta_ag_ci.h
+++ b/system/bta/include/bta_ag_ci.h
@@ -27,49 +27,49 @@
 #include "bta_ag_api.h"
 
 /*****************************************************************************
-**  Function Declarations
-*****************************************************************************/
+ *  Function Declarations
+ ****************************************************************************/
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
 /*******************************************************************************
-**
-** Function         bta_ag_ci_rx_write
-**
-** Description      This function is called to send data to the AG when the AG
-**                  is configured for AT command pass-through.  The function
-**                  copies data to an event buffer and sends it.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_ci_rx_write
+ *
+ * Description      This function is called to send data to the AG when the AG
+ *                  is configured for AT command pass-through.  The function
+ *                  copies data to an event buffer and sends it.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void bta_ag_ci_rx_write(uint16_t handle, char *p_data, uint16_t len);
 
 /******************************************************************************
-**
-** Function         bta_ag_ci_slc_ready
-**
-** Description      This function is called to notify AG that SLC is up at
-**                  the application. This funcion is only used when the app
-**                  is running in pass-through mode.
-**
-** Returns          void
-**
-******************************************************************************/
+ *
+ * Function         bta_ag_ci_slc_ready
+ *
+ * Description      This function is called to notify AG that SLC is up at
+ *                  the application. This funcion is only used when the app
+ *                  is running in pass-through mode.
+ *
+ * Returns          void
+ *
+ *****************************************************************************/
 extern void bta_ag_ci_slc_ready(uint16_t handle);
 
 /******************************************************************************
-**
-** Function         bta_ag_ci_wbs_command
-**
-** Description      This function is called to notify AG that a WBS command is
-**                  received
-**
-** Returns          void
-**
-******************************************************************************/
+ *
+ * Function         bta_ag_ci_wbs_command
+ *
+ * Description      This function is called to notify AG that a WBS command is
+ *                  received
+ *
+ * Returns          void
+ *
+ *****************************************************************************/
 extern void bta_ag_ci_wbs_command (uint16_t handle, char *p_data, uint16_t len);
 
 #ifdef __cplusplus
diff --git a/system/bta/include/bta_ag_co.h b/system/bta/include/bta_ag_co.h
index b5d56b47c51..e744150c619 100644
--- a/system/bta/include/bta_ag_co.h
+++ b/system/bta/include/bta_ag_co.h
@@ -32,37 +32,37 @@ extern "C" {
 #endif
 
 /*******************************************************************************
-**
-** Function         bta_ag_co_init
-**
-** Description      This callout function is executed by AG when it is
-**                  started by calling BTA_AgEnable().  This function can be
-**                  used by the phone to initialize audio paths or for other
-**                  initialization purposes.
-**
-**
-** Returns          Void.
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_co_init
+ *
+ * Description      This callout function is executed by AG when it is
+ *                  started by calling BTA_AgEnable().  This function can be
+ *                  used by the phone to initialize audio paths or for other
+ *                  initialization purposes.
+ *
+ *
+ * Returns          Void.
+ *
+ ******************************************************************************/
 extern void bta_ag_co_init(void);
 
 /*******************************************************************************
-**
-** Function         bta_ag_co_audio_state
-**
-** Description      This function is called by the AG before the audio connection
-**                  is brought up, after it comes up, and after it goes down.
-**
-** Parameters       handle - handle of the AG instance
-**                  state - Audio state
-**                  codec - if WBS support is compiled in, codec to going to be used is provided
-**                      and when in SCO_STATE_SETUP, BTM_I2SPCMConfig() must be called with
-**                      the correct platform parameters.
-**                      in the other states codec type should not be ignored
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_co_audio_state
+ *
+ * Description      This function is called by the AG before the audio connection
+ *                  is brought up, after it comes up, and after it goes down.
+ *
+ * Parameters       handle - handle of the AG instance
+ *                  state - Audio state
+ *                  codec - if WBS support is compiled in, codec to going to be used is provided
+ *                      and when in SCO_STATE_SETUP, BTM_I2SPCMConfig() must be called with
+ *                      the correct platform parameters.
+ *                      in the other states codec type should not be ignored
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 #if (BTM_WBS_INCLUDED == TRUE)
 extern void bta_ag_co_audio_state(uint16_t handle, uint8_t app_id, uint8_t state,
                                           tBTA_AG_PEER_CODEC codec);
@@ -72,45 +72,45 @@ extern void bta_ag_co_audio_state(uint16_t handle, uint8_t app_id, uint8_t state
 #endif
 
 /*******************************************************************************
-**
-** Function         bta_ag_co_data_open
-**
-** Description      This function is executed by AG when a service level connection
-**                  is opened.  The phone can use this function to set
-**                  up data paths or perform any required initialization or
-**                  set up particular to the connected service.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_co_data_open
+ *
+ * Description      This function is executed by AG when a service level connection
+ *                  is opened.  The phone can use this function to set
+ *                  up data paths or perform any required initialization or
+ *                  set up particular to the connected service.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void bta_ag_co_data_open(uint16_t handle, tBTA_SERVICE_ID service);
 
 /*******************************************************************************
-**
-** Function         bta_ag_co_data_close
-**
-** Description      This function is called by AG when a service level
-**                  connection is closed
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_co_data_close
+ *
+ * Description      This function is called by AG when a service level
+ *                  connection is closed
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void bta_ag_co_data_close(uint16_t handle);
 
 /*******************************************************************************
-**
-** Function         bta_ag_co_tx_write
-**
-** Description      This function is called by the AG to send data to the
-**                  phone when the AG is configured for AT command pass-through.
-**                  The implementation of this function must copy the data to
-**                  the phone's memory.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ag_co_tx_write
+ *
+ * Description      This function is called by the AG to send data to the
+ *                  phone when the AG is configured for AT command pass-through.
+ *                  The implementation of this function must copy the data to
+ *                  the phone's memory.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void bta_ag_co_tx_write(uint16_t handle, uint8_t *p_data, uint16_t len);
 
 #ifdef __cplusplus
diff --git a/system/bta/include/bta_api.h b/system/bta/include/bta_api.h
index 187f8c282af..c6bcecf9e9d 100644
--- a/system/bta/include/bta_api.h
+++ b/system/bta/include/bta_api.h
@@ -38,8 +38,8 @@ extern "C" {
 #endif
 
 /*****************************************************************************
-**  Constants and data types
-*****************************************************************************/
+ *  Constants and data types
+ ****************************************************************************/
 
 /* Status Return Value */
 #define BTA_SUCCESS             0           /* Successful operation. */
@@ -1200,658 +1200,658 @@ typedef uint8_t tBTA_DM_LINK_TYPE;
 #define LOWEST_RSSI_VALUE     129
 
 /*****************************************************************************
-**  External Function Declarations
-*****************************************************************************/
+ *  External Function Declarations
+ ****************************************************************************/
 
 /*******************************************************************************
-**
-** Function         BTA_EnableBluetooth
-**
-** Description      This function initializes BTA and prepares BTA and the
-**                  Bluetooth protocol stack for use.  This function is
-**                  typically called at startup or when Bluetooth services
-**                  are required by the phone.  This function must be called
-**                  before calling any other API function.
-**
-**
-** Returns          BTA_SUCCESS if successful.
-**                  BTA_FAIL if internal failure.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_EnableBluetooth
+ *
+ * Description      This function initializes BTA and prepares BTA and the
+ *                  Bluetooth protocol stack for use.  This function is
+ *                  typically called at startup or when Bluetooth services
+ *                  are required by the phone.  This function must be called
+ *                  before calling any other API function.
+ *
+ *
+ * Returns          BTA_SUCCESS if successful.
+ *                  BTA_FAIL if internal failure.
+ *
+ ******************************************************************************/
 extern tBTA_STATUS BTA_EnableBluetooth(tBTA_DM_SEC_CBACK *p_cback);
 
 /*******************************************************************************
-**
-** Function         BTA_DisableBluetooth
-**
-** Description      This function disables BTA and the Bluetooth protocol
-**                  stack.  It is called when BTA is no longer being used
-**                  by any application in the system.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DisableBluetooth
+ *
+ * Description      This function disables BTA and the Bluetooth protocol
+ *                  stack.  It is called when BTA is no longer being used
+ *                  by any application in the system.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern tBTA_STATUS BTA_DisableBluetooth(void);
 
 /*******************************************************************************
-**
-** Function         BTA_EnableTestMode
-**
-** Description      Enables bluetooth device under test mode
-**
-**
-** Returns          tBTA_STATUS
-**
-*******************************************************************************/
+ *
+ * Function         BTA_EnableTestMode
+ *
+ * Description      Enables bluetooth device under test mode
+ *
+ *
+ * Returns          tBTA_STATUS
+ *
+ ******************************************************************************/
 extern tBTA_STATUS BTA_EnableTestMode(void);
 
 /*******************************************************************************
-**
-** Function         BTA_DisableTestMode
-**
-** Description      Disable bluetooth device under test mode
-**
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DisableTestMode
+ *
+ * Description      Disable bluetooth device under test mode
+ *
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 extern void BTA_DisableTestMode(void);
 
 /*******************************************************************************
-**
-** Function         BTA_DmSetDeviceName
-**
-** Description      This function sets the Bluetooth name of the local device.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmSetDeviceName
+ *
+ * Description      This function sets the Bluetooth name of the local device.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_DmSetDeviceName(char *p_name);
 
 /*******************************************************************************
-**
-** Function         BTA_DmSetVisibility
-**
-** Description      This function sets the Bluetooth connectable,discoverable,
-**                  pairable and conn paired only modesmodes of the local device.
-**                  This controls whether other Bluetooth devices can find and connect to
-**                  the local device.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmSetVisibility
+ *
+ * Description      This function sets the Bluetooth connectable,discoverable,
+ *                  pairable and conn paired only modesmodes of the local device.
+ *                  This controls whether other Bluetooth devices can find and connect to
+ *                  the local device.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_DmSetVisibility(tBTA_DM_DISC disc_mode, tBTA_DM_CONN conn_mode, uint8_t pairable_mode, uint8_t conn_filter);
 
 /*******************************************************************************
-**
-** Function         BTA_DmSearch
-**
-** Description      This function searches for peer Bluetooth devices.  It
-**                  first performs an inquiry; for each device found from the
-**                  inquiry it gets the remote name of the device.  If
-**                  parameter services is nonzero, service discovery will be
-**                  performed on each device for the services specified.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmSearch
+ *
+ * Description      This function searches for peer Bluetooth devices.  It
+ *                  first performs an inquiry; for each device found from the
+ *                  inquiry it gets the remote name of the device.  If
+ *                  parameter services is nonzero, service discovery will be
+ *                  performed on each device for the services specified.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_DmSearch(tBTA_DM_INQ *p_dm_inq, tBTA_SERVICE_MASK services,
                          tBTA_DM_SEARCH_CBACK *p_cback);
 
 /*******************************************************************************
-**
-** Function         BTA_DmSearchCancel
-**
-** Description      This function cancels a search that has been initiated
-**                  by calling BTA_DmSearch().
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmSearchCancel
+ *
+ * Description      This function cancels a search that has been initiated
+ *                  by calling BTA_DmSearch().
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_DmSearchCancel(void);
 
 /*******************************************************************************
-**
-** Function         BTA_DmDiscover
-**
-** Description      This function performs service discovery for the services
-**                  of a particular peer device.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmDiscover
+ *
+ * Description      This function performs service discovery for the services
+ *                  of a particular peer device.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_DmDiscover(BD_ADDR bd_addr, tBTA_SERVICE_MASK services,
                            tBTA_DM_SEARCH_CBACK *p_cback, bool sdp_search);
 
 /*******************************************************************************
-**
-** Function         BTA_DmDiscoverUUID
-**
-** Description      This function performs service discovery for the services
-**                  of a particular peer device.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmDiscoverUUID
+ *
+ * Description      This function performs service discovery for the services
+ *                  of a particular peer device.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_DmDiscoverUUID(BD_ADDR bd_addr, tSDP_UUID *uuid,
                                tBTA_DM_SEARCH_CBACK *p_cback, bool sdp_search);
 
 /*******************************************************************************
-**
-** Function         BTA_DmGetCachedRemoteName
-**
-** Description      Retieve cached remote name if available
-**
-** Returns          BTA_SUCCESS if cached name was retrieved
-**                  BTA_FAILURE if cached name is not available
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmGetCachedRemoteName
+ *
+ * Description      Retieve cached remote name if available
+ *
+ * Returns          BTA_SUCCESS if cached name was retrieved
+ *                  BTA_FAILURE if cached name is not available
+ *
+ ******************************************************************************/
 tBTA_STATUS BTA_DmGetCachedRemoteName(BD_ADDR remote_device, uint8_t **pp_cached_name);
 
 /*******************************************************************************
-**
-** Function         BTA_DmBond
-**
-** Description      This function initiates a bonding procedure with a peer
-**                  device.  The bonding procedure enables authentication
-**                  and optionally encryption on the Bluetooth link.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmBond
+ *
+ * Description      This function initiates a bonding procedure with a peer
+ *                  device.  The bonding procedure enables authentication
+ *                  and optionally encryption on the Bluetooth link.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_DmBond(BD_ADDR bd_addr);
 
 /*******************************************************************************
-**
-** Function         BTA_DmBondByTransport
-**
-** Description      This function initiates a bonding procedure with a peer
-**                  device by designated transport.  The bonding procedure enables
-**                  authentication and optionally encryption on the Bluetooth link.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmBondByTransport
+ *
+ * Description      This function initiates a bonding procedure with a peer
+ *                  device by designated transport.  The bonding procedure enables
+ *                  authentication and optionally encryption on the Bluetooth link.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_DmBondByTransport(BD_ADDR bd_addr, tBTA_TRANSPORT transport);
 
 
 /*******************************************************************************
-**
-** Function         BTA_DmBondCancel
-**
-** Description      This function cancels a bonding procedure with a peer
-**                  device.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmBondCancel
+ *
+ * Description      This function cancels a bonding procedure with a peer
+ *                  device.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_DmBondCancel(BD_ADDR bd_addr);
 
 /*******************************************************************************
-**
-** Function         BTA_DmPinReply
-**
-** Description      This function provides a PIN when one is requested by DM
-**                  during a bonding procedure.  The application should call
-**                  this function after the security callback is called with
-**                  a BTA_DM_PIN_REQ_EVT.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmPinReply
+ *
+ * Description      This function provides a PIN when one is requested by DM
+ *                  during a bonding procedure.  The application should call
+ *                  this function after the security callback is called with
+ *                  a BTA_DM_PIN_REQ_EVT.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_DmPinReply(BD_ADDR bd_addr, bool accept, uint8_t pin_len,
                            uint8_t *p_pin);
 
 /*******************************************************************************
-**
-** Function         BTA_DmLocalOob
-**
-** Description      This function retrieves the OOB data from local controller.
-**                  The result is reported by bta_dm_co_loc_oob().
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmLocalOob
+ *
+ * Description      This function retrieves the OOB data from local controller.
+ *                  The result is reported by bta_dm_co_loc_oob().
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_DmLocalOob(void);
 
 /*******************************************************************************
-**
-** Function         BTA_DmConfirm
-**
-** Description      This function accepts or rejects the numerical value of the
-**                  Simple Pairing process on BTA_DM_SP_CFM_REQ_EVT
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmConfirm
+ *
+ * Description      This function accepts or rejects the numerical value of the
+ *                  Simple Pairing process on BTA_DM_SP_CFM_REQ_EVT
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_DmConfirm(BD_ADDR bd_addr, bool accept);
 
 /*******************************************************************************
-**
-** Function         BTA_DmAddDevice
-**
-** Description      This function adds a device to the security database list
-**                  of peer devices. This function would typically be called
-**                  at system startup to initialize the security database with
-**                  known peer devices.  This is a direct execution function
-**                  that may lock task scheduling on some platforms.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmAddDevice
+ *
+ * Description      This function adds a device to the security database list
+ *                  of peer devices. This function would typically be called
+ *                  at system startup to initialize the security database with
+ *                  known peer devices.  This is a direct execution function
+ *                  that may lock task scheduling on some platforms.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_DmAddDevice(BD_ADDR bd_addr, DEV_CLASS dev_class,
                             LINK_KEY link_key, tBTA_SERVICE_MASK trusted_mask,
                             bool is_trusted, uint8_t key_type,
                             tBTA_IO_CAP io_cap, uint8_t pin_length);
 
 /*******************************************************************************
-**
-** Function         BTA_DmRemoveDevice
-**
-** Description      This function removes a device from the security database.
-**                  This is a direct execution function that may lock task
-**                  scheduling on some platforms.
-**
-**
-** Returns          BTA_SUCCESS if successful.
-**                  BTA_FAIL if operation failed.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmRemoveDevice
+ *
+ * Description      This function removes a device from the security database.
+ *                  This is a direct execution function that may lock task
+ *                  scheduling on some platforms.
+ *
+ *
+ * Returns          BTA_SUCCESS if successful.
+ *                  BTA_FAIL if operation failed.
+ *
+ ******************************************************************************/
 extern tBTA_STATUS BTA_DmRemoveDevice(BD_ADDR bd_addr);
 
 /*******************************************************************************
-**
-** Function         BTA_GetEirService
-**
-** Description      This function is called to get BTA service mask from EIR.
-**
-** Parameters       p_eir - pointer of EIR significant part
-**                  p_services - return the BTA service mask
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GetEirService
+ *
+ * Description      This function is called to get BTA service mask from EIR.
+ *
+ * Parameters       p_eir - pointer of EIR significant part
+ *                  p_services - return the BTA service mask
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 extern void BTA_GetEirService( uint8_t *p_eir, tBTA_SERVICE_MASK *p_services );
 
 /*******************************************************************************
-**
-** Function         BTA_DmGetConnectionState
-**
-** Description      Returns whether the remote device is currently connected.
-**
-** Returns          0 if the device is NOT connected.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmGetConnectionState
+ *
+ * Description      Returns whether the remote device is currently connected.
+ *
+ * Returns          0 if the device is NOT connected.
+ *
+ ******************************************************************************/
 extern uint16_t BTA_DmGetConnectionState( const BD_ADDR bd_addr );
 
 
 /*******************************************************************************
-**
-** Function         BTA_DmSetLocalDiRecord
-**
-** Description      This function adds a DI record to the local SDP database.
-**
-** Returns          BTA_SUCCESS if record set sucessfully, otherwise error code.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmSetLocalDiRecord
+ *
+ * Description      This function adds a DI record to the local SDP database.
+ *
+ * Returns          BTA_SUCCESS if record set sucessfully, otherwise error code.
+ *
+ ******************************************************************************/
 extern tBTA_STATUS BTA_DmSetLocalDiRecord( tBTA_DI_RECORD *p_device_info,
                                            uint32_t *p_handle );
 
 /*******************************************************************************
-**
-**
-** Function         BTA_DmCloseACL
-**
-** Description      This function force to close an ACL connection and remove the
-**                  device from the security database list of known devices.
-**
-** Parameters:      bd_addr       - Address of the peer device
-**                  remove_dev    - remove device or not after link down
-**                  transport     - which transport to close
-
-**
-** Returns          void.
-**
-*******************************************************************************/
+ *
+ *
+ * Function         BTA_DmCloseACL
+ *
+ * Description      This function force to close an ACL connection and remove the
+ *                  device from the security database list of known devices.
+ *
+ * Parameters:      bd_addr       - Address of the peer device
+ *                  remove_dev    - remove device or not after link down
+ *                  transport     - which transport to close
+
+ *
+ * Returns          void.
+ *
+ ******************************************************************************/
 extern void BTA_DmCloseACL(BD_ADDR bd_addr, bool remove_dev, tBTA_TRANSPORT transport);
 
 /*******************************************************************************
-**
-** Function         bta_dmexecutecallback
-**
-** Description      This function will request BTA to execute a call back in the context of BTU task
-**                  This API was named in lower case because it is only intended
-**                  for the internal customers(like BTIF).
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dmexecutecallback
+ *
+ * Description      This function will request BTA to execute a call back in the context of BTU task
+ *                  This API was named in lower case because it is only intended
+ *                  for the internal customers(like BTIF).
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void bta_dmexecutecallback (tBTA_DM_EXEC_CBACK* p_callback, void * p_param);
 
 #if (BTM_SCO_HCI_INCLUDED == TRUE)
 /*******************************************************************************
-**
-** Function         BTA_DmPcmInitSamples
-**
-** Description      initialize the down sample converter.
-**
-**                  src_sps: original samples per second (source audio data)
-**                            (ex. 44100, 48000)
-**                  bits: number of bits per pcm sample (16)
-**                  n_channels: number of channels (i.e. mono(1), stereo(2)...)
-**
-** Returns          none
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmPcmInitSamples
+ *
+ * Description      initialize the down sample converter.
+ *
+ *                  src_sps: original samples per second (source audio data)
+ *                            (ex. 44100, 48000)
+ *                  bits: number of bits per pcm sample (16)
+ *                  n_channels: number of channels (i.e. mono(1), stereo(2)...)
+ *
+ * Returns          none
+ *
+ ******************************************************************************/
 extern void BTA_DmPcmInitSamples (uint32_t src_sps, uint32_t bits, uint32_t n_channels);
 
 /**************************************************************************************
-** Function         BTA_DmPcmResample
-**
-** Description      Down sampling utility to convert higher sampling rate into 8K/16bits
-**                  PCM samples.
-**
-** Parameters       p_src: pointer to the buffer where the original sampling PCM
-**                              are stored.
-**                  in_bytes:  Length of the input PCM sample buffer in byte.
-**                  p_dst:      pointer to the buffer which is to be used to store
-**                              the converted PCM samples.
-**
-**
-** Returns          int32_t: number of samples converted.
-**
-**************************************************************************************/
+ * Function         BTA_DmPcmResample
+ *
+ * Description      Down sampling utility to convert higher sampling rate into 8K/16bits
+ *                  PCM samples.
+ *
+ * Parameters       p_src: pointer to the buffer where the original sampling PCM
+ *                              are stored.
+ *                  in_bytes:  Length of the input PCM sample buffer in byte.
+ *                  p_dst:      pointer to the buffer which is to be used to store
+ *                              the converted PCM samples.
+ *
+ *
+ * Returns          int32_t: number of samples converted.
+ *
+ *************************************************************************************/
 extern int32_t BTA_DmPcmResample (void *p_src, uint32_t in_bytes, void *p_dst);
 #endif
 
 #if (BLE_INCLUDED == TRUE)
 /* BLE related API functions */
 /*******************************************************************************
-**
-** Function         BTA_DmBleSecurityGrant
-**
-** Description      Grant security request access.
-**
-** Parameters:      bd_addr          - BD address of the peer
-**                  res              - security grant status.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmBleSecurityGrant
+ *
+ * Description      Grant security request access.
+ *
+ * Parameters:      bd_addr          - BD address of the peer
+ *                  res              - security grant status.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_DmBleSecurityGrant(BD_ADDR bd_addr, tBTA_DM_BLE_SEC_GRANT res);
 
 
 
 /*******************************************************************************
-**
-** Function         BTA_DmBleSetBgConnType
-**
-** Description      This function is called to set BLE connectable mode for a
-**                  peripheral device.
-**
-** Parameters       bg_conn_type: it can be auto connection, or selective connection.
-**                  p_select_cback: callback function when selective connection procedure
-**                              is being used.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmBleSetBgConnType
+ *
+ * Description      This function is called to set BLE connectable mode for a
+ *                  peripheral device.
+ *
+ * Parameters       bg_conn_type: it can be auto connection, or selective connection.
+ *                  p_select_cback: callback function when selective connection procedure
+ *                              is being used.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_DmBleSetBgConnType(tBTA_DM_BLE_CONN_TYPE bg_conn_type, tBTA_DM_BLE_SEL_CBACK *p_select_cback);
 
 /*******************************************************************************
-**
-** Function         BTA_DmBlePasskeyReply
-**
-** Description      Send BLE SMP passkey reply.
-**
-** Parameters:      bd_addr          - BD address of the peer
-**                  accept           - passkey entry sucessful or declined.
-**                  passkey          - passkey value, must be a 6 digit number,
-**                                     can be lead by 0.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmBlePasskeyReply
+ *
+ * Description      Send BLE SMP passkey reply.
+ *
+ * Parameters:      bd_addr          - BD address of the peer
+ *                  accept           - passkey entry sucessful or declined.
+ *                  passkey          - passkey value, must be a 6 digit number,
+ *                                     can be lead by 0.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_DmBlePasskeyReply(BD_ADDR bd_addr, bool accept, uint32_t passkey);
 
 /*******************************************************************************
-**
-** Function         BTA_DmBleConfirmReply
-**
-** Description      Send BLE SMP SC user confirmation reply.
-**
-** Parameters:      bd_addr          - BD address of the peer
-**                  accept           - numbers to compare are the same or different.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmBleConfirmReply
+ *
+ * Description      Send BLE SMP SC user confirmation reply.
+ *
+ * Parameters:      bd_addr          - BD address of the peer
+ *                  accept           - numbers to compare are the same or different.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_DmBleConfirmReply(BD_ADDR bd_addr, bool accept);
 
 /*******************************************************************************
-**
-** Function         BTA_DmAddBleDevice
-**
-** Description      Add a BLE device.  This function will be normally called
-**                  during host startup to restore all required information
-**                  for a LE device stored in the NVRAM.
-**
-** Parameters:      bd_addr          - BD address of the peer
-**                  dev_type         - Remote device's device type.
-**                  addr_type        - LE device address type.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmAddBleDevice
+ *
+ * Description      Add a BLE device.  This function will be normally called
+ *                  during host startup to restore all required information
+ *                  for a LE device stored in the NVRAM.
+ *
+ * Parameters:      bd_addr          - BD address of the peer
+ *                  dev_type         - Remote device's device type.
+ *                  addr_type        - LE device address type.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_DmAddBleDevice(BD_ADDR bd_addr, tBLE_ADDR_TYPE addr_type,
                                tBT_DEVICE_TYPE dev_type);
 
 
 /*******************************************************************************
-**
-** Function         BTA_DmAddBleKey
-**
-** Description      Add/modify LE device information.  This function will be
-**                  normally called during host startup to restore all required
-**                  information stored in the NVRAM.
-**
-** Parameters:      bd_addr          - BD address of the peer
-**                  p_le_key         - LE key values.
-**                  key_type         - LE SMP key type.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmAddBleKey
+ *
+ * Description      Add/modify LE device information.  This function will be
+ *                  normally called during host startup to restore all required
+ *                  information stored in the NVRAM.
+ *
+ * Parameters:      bd_addr          - BD address of the peer
+ *                  p_le_key         - LE key values.
+ *                  key_type         - LE SMP key type.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_DmAddBleKey (BD_ADDR bd_addr,
                              tBTA_LE_KEY_VALUE *p_le_key,
                              tBTA_LE_KEY_TYPE key_type);
 
 /*******************************************************************************
-**
-** Function         BTA_DmSetBlePrefConnParams
-**
-** Description      This function is called to set the preferred connection
-**                  parameters when default connection parameter is not desired.
-**
-** Parameters:      bd_addr          - BD address of the peripheral
-**                  min_conn_int     - minimum preferred connection interval
-**                  max_conn_int     - maximum preferred connection interval
-**                  slave_latency    - preferred slave latency
-**                  supervision_tout - preferred supervision timeout
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmSetBlePrefConnParams
+ *
+ * Description      This function is called to set the preferred connection
+ *                  parameters when default connection parameter is not desired.
+ *
+ * Parameters:      bd_addr          - BD address of the peripheral
+ *                  min_conn_int     - minimum preferred connection interval
+ *                  max_conn_int     - maximum preferred connection interval
+ *                  slave_latency    - preferred slave latency
+ *                  supervision_tout - preferred supervision timeout
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_DmSetBlePrefConnParams(const BD_ADDR bd_addr,
                                        uint16_t min_conn_int, uint16_t max_conn_int,
                                        uint16_t slave_latency, uint16_t supervision_tout );
 
 /*******************************************************************************
-**
-** Function         BTA_DmSetBleConnScanParams
-**
-** Description      This function is called to set scan parameters used in
-**                  BLE connection request
-**
-** Parameters:      scan_interval    - scan interval
-**                  scan_window      - scan window
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmSetBleConnScanParams
+ *
+ * Description      This function is called to set scan parameters used in
+ *                  BLE connection request
+ *
+ * Parameters:      scan_interval    - scan interval
+ *                  scan_window      - scan window
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_DmSetBleConnScanParams(uint32_t scan_interval,
                                        uint32_t scan_window);
 
 /*******************************************************************************
-**
-** Function         BTA_DmSetBleScanParams
-**
-** Description      This function is called to set scan parameters
-**
-** Parameters:      client_if - Client IF
-**                  scan_interval - scan interval
-**                  scan_window - scan window
-**                  scan_mode - scan mode
-**                  scan_param_setup_status_cback - Set scan param status callback
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmSetBleScanParams
+ *
+ * Description      This function is called to set scan parameters
+ *
+ * Parameters:      client_if - Client IF
+ *                  scan_interval - scan interval
+ *                  scan_window - scan window
+ *                  scan_mode - scan mode
+ *                  scan_param_setup_status_cback - Set scan param status callback
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_DmSetBleScanParams(tGATT_IF client_if, uint32_t scan_interval,
                                    uint32_t scan_window, tBLE_SCAN_MODE scan_mode,
                                    tBLE_SCAN_PARAM_SETUP_CBACK scan_param_setup_status_cback);
 
 /*******************************************************************************
-**
-** Function         BTA_DmSetBleAdvParams
-**
-** Description      This function sets the advertising parameters BLE functionality.
-**                  It is to be called when device act in peripheral or broadcaster
-**                  role.
-**
-** Parameters:      adv_int_min    - adv interval minimum
-**                  adv_int_max    - adv interval max
-**                  p_dir_bda      - directed adv initator address
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmSetBleAdvParams
+ *
+ * Description      This function sets the advertising parameters BLE functionality.
+ *                  It is to be called when device act in peripheral or broadcaster
+ *                  role.
+ *
+ * Parameters:      adv_int_min    - adv interval minimum
+ *                  adv_int_max    - adv interval max
+ *                  p_dir_bda      - directed adv initator address
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_DmSetBleAdvParams (uint16_t adv_int_min, uint16_t adv_int_max,
                                    tBLE_BD_ADDR *p_dir_bda);
 /*******************************************************************************
-**
-** Function         BTA_DmSearchExt
-**
-** Description      This function searches for peer Bluetooth devices. It performs
-**                  an inquiry and gets the remote name for devices. Service
-**                  discovery is done if services is non zero
-**
-** Parameters       p_dm_inq: inquiry conditions
-**                  services: if service is not empty, service discovery will be done.
-**                            for all GATT based service condition, put num_uuid, and
-**                            p_uuid is the pointer to the list of UUID values.
-**                  p_cback: callback functino when search is completed.
-**
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmSearchExt
+ *
+ * Description      This function searches for peer Bluetooth devices. It performs
+ *                  an inquiry and gets the remote name for devices. Service
+ *                  discovery is done if services is non zero
+ *
+ * Parameters       p_dm_inq: inquiry conditions
+ *                  services: if service is not empty, service discovery will be done.
+ *                            for all GATT based service condition, put num_uuid, and
+ *                            p_uuid is the pointer to the list of UUID values.
+ *                  p_cback: callback functino when search is completed.
+ *
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_DmSearchExt(tBTA_DM_INQ *p_dm_inq, tBTA_SERVICE_MASK_EXT *p_services,
                             tBTA_DM_SEARCH_CBACK *p_cback);
 
 /*******************************************************************************
-**
-** Function         BTA_DmDiscoverExt
-**
-** Description      This function does service discovery for services of a
-**                  peer device. When services.num_uuid is 0, it indicates all
-**                  GATT based services are to be searched; other wise a list of
-**                  UUID of interested services should be provided through
-**                  services.p_uuid.
-**
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmDiscoverExt
+ *
+ * Description      This function does service discovery for services of a
+ *                  peer device. When services.num_uuid is 0, it indicates all
+ *                  GATT based services are to be searched; other wise a list of
+ *                  UUID of interested services should be provided through
+ *                  services.p_uuid.
+ *
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_DmDiscoverExt(BD_ADDR bd_addr, tBTA_SERVICE_MASK_EXT *p_services,
                               tBTA_DM_SEARCH_CBACK *p_cback, bool sdp_search);
 
 /*******************************************************************************
-**
-** Function         BTA_DmDiscoverByTransport
-**
-** Description      This function does service discovery on particular transport
-**                  for services of a
-**                  peer device. When services.num_uuid is 0, it indicates all
-**                  GATT based services are to be searched; other wise a list of
-**                  UUID of interested services should be provided through
-**                  p_services->p_uuid.
-**
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmDiscoverByTransport
+ *
+ * Description      This function does service discovery on particular transport
+ *                  for services of a
+ *                  peer device. When services.num_uuid is 0, it indicates all
+ *                  GATT based services are to be searched; other wise a list of
+ *                  UUID of interested services should be provided through
+ *                  p_services->p_uuid.
+ *
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_DmDiscoverByTransport(BD_ADDR bd_addr, tBTA_SERVICE_MASK_EXT *p_services,
                                       tBTA_DM_SEARCH_CBACK *p_cback, bool sdp_search,
                                       tBTA_TRANSPORT transport);
 
 /*******************************************************************************
-**
-** Function         BTA_DmSetEncryption
-**
-** Description      This function is called to ensure that connection is
-**                  encrypted.  Should be called only on an open connection.
-**                  Typically only needed for connections that first want to
-**                  bring up unencrypted links, then later encrypt them.
-**
-** Parameters:      bd_addr       - Address of the peer device
-**                  transport     - transport of the link to be encruypted
-**                  p_callback    - Pointer to callback function to indicat the
-**                                  link encryption status
-**                  sec_act       - This is the security action to indicate
-**                                  what knid of BLE security level is required for
-**                                  the BLE link if the BLE is supported
-**                                  Note: This parameter is ignored for the BR/EDR link
-**                                        or the BLE is not supported
-**
-** Returns          void
-**
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmSetEncryption
+ *
+ * Description      This function is called to ensure that connection is
+ *                  encrypted.  Should be called only on an open connection.
+ *                  Typically only needed for connections that first want to
+ *                  bring up unencrypted links, then later encrypt them.
+ *
+ * Parameters:      bd_addr       - Address of the peer device
+ *                  transport     - transport of the link to be encruypted
+ *                  p_callback    - Pointer to callback function to indicat the
+ *                                  link encryption status
+ *                  sec_act       - This is the security action to indicate
+ *                                  what knid of BLE security level is required for
+ *                                  the BLE link if the BLE is supported
+ *                                  Note: This parameter is ignored for the BR/EDR link
+ *                                        or the BLE is not supported
+ *
+ * Returns          void
+ *
+ *
+ ******************************************************************************/
 extern void BTA_DmSetEncryption(BD_ADDR bd_addr, tBTA_TRANSPORT transport,
                                 tBTA_DM_ENCRYPT_CBACK *p_callback,
                                 tBTA_DM_BLE_SEC_ACT sec_act);
 
 
 /*******************************************************************************
-**
-** Function         BTA_DmBleObserve
-**
-** Description      This procedure keep the device listening for advertising
-**                  events from a broadcast device.
-**
-** Parameters       start: start or stop observe.
-**                  duration : Duration of the scan. Continuous scan if 0 is passed
-**                  p_results_cb: Callback to be called with scan results
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmBleObserve
+ *
+ * Description      This procedure keep the device listening for advertising
+ *                  events from a broadcast device.
+ *
+ * Parameters       start: start or stop observe.
+ *                  duration : Duration of the scan. Continuous scan if 0 is passed
+ *                  p_results_cb: Callback to be called with scan results
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_DmBleObserve(bool start, uint8_t duration,
                              tBTA_DM_SEARCH_CBACK *p_results_cb);
 
@@ -1860,79 +1860,79 @@ extern void BTA_DmBleObserve(bool start, uint8_t duration,
 
 #if (BLE_INCLUDED == TRUE)
 /*******************************************************************************
-**
-** Function         BTA_DmBleConfigLocalPrivacy
-**
-** Description      Enable/disable privacy on the local device
-**
-** Parameters:      privacy_enable   - enable/disabe privacy on remote device.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmBleConfigLocalPrivacy
+ *
+ * Description      Enable/disable privacy on the local device
+ *
+ * Parameters:      privacy_enable   - enable/disabe privacy on remote device.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_DmBleConfigLocalPrivacy(bool privacy_enable);
 
 /*******************************************************************************
-**
-** Function         BTA_DmBleEnableRemotePrivacy
-**
-** Description      Enable/disable privacy on a remote device
-**
-** Parameters:      bd_addr          - BD address of the peer
-**                  privacy_enable   - enable/disabe privacy on remote device.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmBleEnableRemotePrivacy
+ *
+ * Description      Enable/disable privacy on a remote device
+ *
+ * Parameters:      bd_addr          - BD address of the peer
+ *                  privacy_enable   - enable/disabe privacy on remote device.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_DmBleEnableRemotePrivacy(BD_ADDR bd_addr, bool privacy_enable);
 
 /*******************************************************************************
-**
-** Function         BTA_DmBleUpdateConnectionParams
-**
-** Description      Update connection parameters, can only be used when connection is up.
-**
-** Parameters:      bd_addr   - BD address of the peer
-**                  min_int   -     minimum connection interval, [0x0004~ 0x4000]
-**                  max_int   -     maximum connection interval, [0x0004~ 0x4000]
-**                  latency   -     slave latency [0 ~ 500]
-**                  timeout   -     supervision timeout [0x000a ~ 0xc80]
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmBleUpdateConnectionParams
+ *
+ * Description      Update connection parameters, can only be used when connection is up.
+ *
+ * Parameters:      bd_addr   - BD address of the peer
+ *                  min_int   -     minimum connection interval, [0x0004~ 0x4000]
+ *                  max_int   -     maximum connection interval, [0x0004~ 0x4000]
+ *                  latency   -     slave latency [0 ~ 500]
+ *                  timeout   -     supervision timeout [0x000a ~ 0xc80]
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_DmBleUpdateConnectionParams(const BD_ADDR bd_addr, uint16_t min_int,
                                    uint16_t max_int, uint16_t latency, uint16_t timeout);
 
 /*******************************************************************************
-**
-** Function         BTA_DmBleSetDataLength
-**
-** Description      This function is to set maximum LE data packet size
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmBleSetDataLength
+ *
+ * Description      This function is to set maximum LE data packet size
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_DmBleSetDataLength(BD_ADDR remote_device, uint16_t tx_data_length);
 
 /*******************************************************************************
-**
-** Function         BTA_DmBleSetStorageParams
-**
-** Description      This function is called to set the storage parameters
-**
-** Parameters       batch_scan_full_max -Max storage space (in %) allocated to full scanning
-**                  batch_scan_trunc_max -Max storage space (in %) allocated to truncated scanning
-**                  batch_scan_notify_threshold - Setup notification level based on total space
-**                  consumed by both pools. Setting it to 0 will disable threshold notification
-**                  p_setup_cback - Setup callback
-**                  p_thres_cback - Threshold callback
-**                  p_rep_cback - Reports callback
-**                  ref_value - Reference value
-**
-** Returns           None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmBleSetStorageParams
+ *
+ * Description      This function is called to set the storage parameters
+ *
+ * Parameters       batch_scan_full_max -Max storage space (in %) allocated to full scanning
+ *                  batch_scan_trunc_max -Max storage space (in %) allocated to truncated scanning
+ *                  batch_scan_notify_threshold - Setup notification level based on total space
+ *                  consumed by both pools. Setting it to 0 will disable threshold notification
+ *                  p_setup_cback - Setup callback
+ *                  p_thres_cback - Threshold callback
+ *                  p_rep_cback - Reports callback
+ *                  ref_value - Reference value
+ *
+ * Returns           None
+ *
+ ******************************************************************************/
 extern void BTA_DmBleSetStorageParams(uint8_t batch_scan_full_max,
                                          uint8_t batch_scan_trunc_max,
                                          uint8_t batch_scan_notify_threshold,
@@ -1942,21 +1942,21 @@ extern void BTA_DmBleSetStorageParams(uint8_t batch_scan_full_max,
                                          tBTA_DM_BLE_REF_VALUE ref_value);
 
 /*******************************************************************************
-**
-** Function         BTA_DmBleEnableBatchScan
-**
-** Description      This function is called to enable the batch scan
-**
-** Parameters       scan_mode -Batch scan mode
-**                  scan_interval - Scan interval
-**                  scan_window - Scan window
-**                  discard_rule -Discard rules
-**                  addr_type - Address type
-**                  ref_value - Reference value
-**
-** Returns           None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmBleEnableBatchScan
+ *
+ * Description      This function is called to enable the batch scan
+ *
+ * Parameters       scan_mode -Batch scan mode
+ *                  scan_interval - Scan interval
+ *                  scan_window - Scan window
+ *                  discard_rule -Discard rules
+ *                  addr_type - Address type
+ *                  ref_value - Reference value
+ *
+ * Returns           None
+ *
+ ******************************************************************************/
 extern void BTA_DmBleEnableBatchScan(tBTA_BLE_BATCH_SCAN_MODE scan_mode,
                                          uint32_t scan_interval, uint32_t scan_window,
                                          tBTA_BLE_DISCARD_RULE discard_rule,
@@ -1964,66 +1964,66 @@ extern void BTA_DmBleEnableBatchScan(tBTA_BLE_BATCH_SCAN_MODE scan_mode,
                                          tBTA_DM_BLE_REF_VALUE ref_value);
 
 /*******************************************************************************
-**
-** Function         BTA_DmBleReadScanReports
-**
-** Description      This function is called to read the batch scan reports
-**
-** Parameters       scan_mode -Batch scan mode
-**                  ref_value - Reference value
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmBleReadScanReports
+ *
+ * Description      This function is called to read the batch scan reports
+ *
+ * Parameters       scan_mode -Batch scan mode
+ *                  ref_value - Reference value
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 extern void BTA_DmBleReadScanReports(tBTA_BLE_BATCH_SCAN_MODE scan_type,
                                              tBTA_DM_BLE_REF_VALUE ref_value);
 
 /*******************************************************************************
-**
-** Function         BTA_DmBleDisableBatchScan
-**
-** Description      This function is called to disable the batch scanning
-**
-** Parameters       ref_value - Reference value
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmBleDisableBatchScan
+ *
+ * Description      This function is called to disable the batch scanning
+ *
+ * Parameters       ref_value - Reference value
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 extern void BTA_DmBleDisableBatchScan(tBTA_DM_BLE_REF_VALUE ref_value);
 
 /*******************************************************************************
-**
-** Function         BTA_DmEnableScanFilter
-**
-** Description      This function is called to enable the adv data payload filter
-**
-** Parameters       action - enable or disable the APCF feature
-**                  p_cmpl_cback - Command completed callback
-**                  ref_value - Reference value
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmEnableScanFilter
+ *
+ * Description      This function is called to enable the adv data payload filter
+ *
+ * Parameters       action - enable or disable the APCF feature
+ *                  p_cmpl_cback - Command completed callback
+ *                  ref_value - Reference value
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_DmEnableScanFilter(uint8_t action,
                                         tBTA_DM_BLE_PF_STATUS_CBACK *p_cmpl_cback,
                                         tBTA_DM_BLE_REF_VALUE ref_value);
 
 /*******************************************************************************
-**
-** Function         BTA_DmBleScanFilterSetup
-**
-** Description      This function is called to setup the filter params
-**
-** Parameters       p_target: enable the filter condition on a target device; if NULL
-**                  filt_index - Filter index
-**                  p_filt_params -Filter parameters
-**                  ref_value - Reference value
-**                  action - Add, delete or clear
-**                  p_cmpl_back - Command completed callback
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmBleScanFilterSetup
+ *
+ * Description      This function is called to setup the filter params
+ *
+ * Parameters       p_target: enable the filter condition on a target device; if NULL
+ *                  filt_index - Filter index
+ *                  p_filt_params -Filter parameters
+ *                  ref_value - Reference value
+ *                  action - Add, delete or clear
+ *                  p_cmpl_back - Command completed callback
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_DmBleScanFilterSetup(uint8_t action,
                                                    tBTA_DM_BLE_PF_FILT_INDEX filt_index,
                                                    tBTA_DM_BLE_PF_FILT_PARAMS *p_filt_params,
@@ -2032,22 +2032,22 @@ extern void BTA_DmBleScanFilterSetup(uint8_t action,
                                                    tBTA_DM_BLE_REF_VALUE ref_value);
 
 /*******************************************************************************
-**
-** Function         BTA_DmBleCfgFilterCondition
-**
-** Description      This function is called to configure the adv data payload filter
-**                  condition.
-**
-** Parameters       action: to read/write/clear
-**                  cond_type: filter condition type
-**                  filt_index - Filter index
-**                  p_cond: filter condition parameter
-**                  p_cmpl_back - Command completed callback
-**                  ref_value - Reference value
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmBleCfgFilterCondition
+ *
+ * Description      This function is called to configure the adv data payload filter
+ *                  condition.
+ *
+ * Parameters       action: to read/write/clear
+ *                  cond_type: filter condition type
+ *                  filt_index - Filter index
+ *                  p_cond: filter condition parameter
+ *                  p_cmpl_back - Command completed callback
+ *                  ref_value - Reference value
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_DmBleCfgFilterCondition(tBTA_DM_BLE_SCAN_COND_OP action,
                                                  tBTA_DM_BLE_PF_COND_TYPE cond_type,
                                                  tBTA_DM_BLE_PF_FILT_INDEX filt_index,
@@ -2057,53 +2057,53 @@ extern void BTA_DmBleCfgFilterCondition(tBTA_DM_BLE_SCAN_COND_OP action,
 
 
 /*******************************************************************************
-**
-** Function         BTA_DmBleTrackAdvertiser
-**
-** Description      This function is called to track the advertiser
-**
-** Parameters    ref_value - Reference value
-**               p_track_adv_cback - ADV callback
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmBleTrackAdvertiser
+ *
+ * Description      This function is called to track the advertiser
+ *
+ * Parameters    ref_value - Reference value
+ *               p_track_adv_cback - ADV callback
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 extern void BTA_DmBleTrackAdvertiser(tBTA_DM_BLE_REF_VALUE ref_value,
                             tBTA_BLE_TRACK_ADV_CBACK *p_track_adv_cback);
 
 /*******************************************************************************
-**
-** Function         BTA_DmBleGetEnergyInfo
-**
-** Description      This function is called to obtain the energy info
-**
-** Parameters       p_cmpl_cback - Command complete callback
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_DmBleGetEnergyInfo
+ *
+ * Description      This function is called to obtain the energy info
+ *
+ * Parameters       p_cmpl_cback - Command complete callback
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_DmBleGetEnergyInfo(tBTA_BLE_ENERGY_INFO_CBACK *p_cmpl_cback);
 
 /*******************************************************************************
-**
-** Function         BTA_BrcmInit
-**
-** Description      This function initializes Broadcom specific VS handler in BTA
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_BrcmInit
+ *
+ * Description      This function initializes Broadcom specific VS handler in BTA
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_VendorInit  (void);
 
 /*******************************************************************************
-**
-** Function         BTA_BrcmCleanup
-**
-** Description      This function frees up Broadcom specific VS specific dynamic memory
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_BrcmCleanup
+ *
+ * Description      This function frees up Broadcom specific VS specific dynamic memory
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_VendorCleanup (void);
 
 #endif
diff --git a/system/bta/include/bta_ar_api.h b/system/bta/include/bta_ar_api.h
index 5da295710d5..f19e40f1574 100644
--- a/system/bta/include/bta_ar_api.h
+++ b/system/bta/include/bta_ar_api.h
@@ -38,104 +38,104 @@ extern "C" {
 #endif
 
 /*****************************************************************************
-**  Constants and data types
-*****************************************************************************/
+ *  Constants and data types
+ ****************************************************************************/
 /* This event signal to AR user that other profile is connected */
 #define BTA_AR_AVDT_CONN_EVT    (AVDT_MAX_EVT + 1)
 
 /*******************************************************************************
-**
-** Function         bta_ar_init
-**
-** Description      This function is called from bta_sys_init().
-**                  to initialize the control block
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ar_init
+ *
+ * Description      This function is called from bta_sys_init().
+ *                  to initialize the control block
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void bta_ar_init(void);
 
 /*******************************************************************************
-**
-** Function         bta_ar_reg_avdt
-**
-** Description      This function is called to register to AVDTP.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ar_reg_avdt
+ *
+ * Description      This function is called to register to AVDTP.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void bta_ar_reg_avdt(tAVDT_REG *p_reg, tAVDT_CTRL_CBACK *p_cback, tBTA_SYS_ID sys_id);
 
 /*******************************************************************************
-**
-** Function         bta_ar_dereg_avdt
-**
-** Description      This function is called to de-register from AVDTP.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ar_dereg_avdt
+ *
+ * Description      This function is called to de-register from AVDTP.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void bta_ar_dereg_avdt(tBTA_SYS_ID sys_id);
 
 /*******************************************************************************
-**
-** Function         bta_ar_avdt_conn
-**
-** Description      This function is called to let ar know that some AVDTP profile
-**                  is connected for this sys_id.
-**                  If the other sys modules started a timer for PENDING_EVT,
-**                  the timer can be stopped now.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ar_avdt_conn
+ *
+ * Description      This function is called to let ar know that some AVDTP profile
+ *                  is connected for this sys_id.
+ *                  If the other sys modules started a timer for PENDING_EVT,
+ *                  the timer can be stopped now.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void bta_ar_avdt_conn(tBTA_SYS_ID sys_id, BD_ADDR bd_addr);
 
 /*******************************************************************************
-**
-** Function         bta_ar_reg_avct
-**
-** Description      This function is called to register to AVCTP.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ar_reg_avct
+ *
+ * Description      This function is called to register to AVCTP.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void bta_ar_reg_avct(uint16_t mtu, uint16_t mtu_br, uint8_t sec_mask, tBTA_SYS_ID sys_id);
 
 /*******************************************************************************
-**
-** Function         bta_ar_dereg_avct
-**
-** Description      This function is called to deregister from AVCTP.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_ar_dereg_avct
+ *
+ * Description      This function is called to deregister from AVCTP.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void bta_ar_dereg_avct(tBTA_SYS_ID sys_id);
 
 /******************************************************************************
-**
-** Function         bta_ar_reg_avrc
-**
-** Description      This function is called to register an SDP record for AVRCP.
-**
-** Returns          void
-**
-******************************************************************************/
+ *
+ * Function         bta_ar_reg_avrc
+ *
+ * Description      This function is called to register an SDP record for AVRCP.
+ *
+ * Returns          void
+ *
+ *****************************************************************************/
 extern void bta_ar_reg_avrc(uint16_t service_uuid, const char *p_service_name,
                             const char *p_provider_name, uint16_t categories,
                             tBTA_SYS_ID sys_id, bool browse_supported,
                             uint16_t profile_version);
 
 /******************************************************************************
-**
-** Function         bta_ar_dereg_avrc
-**
-** Description      This function is called to de-register/delete an SDP record for AVRCP.
-**
-** Returns          void
-**
-******************************************************************************/
+ *
+ * Function         bta_ar_dereg_avrc
+ *
+ * Description      This function is called to de-register/delete an SDP record for AVRCP.
+ *
+ * Returns          void
+ *
+ *****************************************************************************/
 extern void bta_ar_dereg_avrc(uint16_t service_uuid, tBTA_SYS_ID sys_id);
 
 
diff --git a/system/bta/include/bta_av_api.h b/system/bta/include/bta_av_api.h
index 35fb4c72d85..a3df4c329f4 100644
--- a/system/bta/include/bta_av_api.h
+++ b/system/bta/include/bta_av_api.h
@@ -36,8 +36,8 @@ extern "C" {
 #endif
 
 /*****************************************************************************
-**  Constants and data types
-*****************************************************************************/
+ *  Constants and data types
+ ****************************************************************************/
 /* Set to TRUE if seperate authorization prompt desired for AVCTP besides A2DP authorization */
 /* Typically FALSE when AVRCP is used in conjunction with A2DP */
 #ifndef BTA_AV_WITH_AVCTP_AUTHORIZATION
@@ -497,303 +497,303 @@ typedef struct
 } tBTA_AV_CFG;
 
 /*****************************************************************************
-**  External Function Declarations
-*****************************************************************************/
+ *  External Function Declarations
+ ****************************************************************************/
 
 /*******************************************************************************
-**
-** Function         BTA_AvEnable
-**
-** Description      Enable the advanced audio/video service. When the enable
-**                  operation is complete the callback function will be
-**                  called with a BTA_AV_ENABLE_EVT. This function must
-**                  be called before other function in the AV API are
-**                  called.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AvEnable
+ *
+ * Description      Enable the advanced audio/video service. When the enable
+ *                  operation is complete the callback function will be
+ *                  called with a BTA_AV_ENABLE_EVT. This function must
+ *                  be called before other function in the AV API are
+ *                  called.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AvEnable(tBTA_SEC sec_mask, tBTA_AV_FEAT features,
                           tBTA_AV_CBACK *p_cback);
 
 /*******************************************************************************
-**
-** Function         BTA_AvDisable
-**
-** Description      Disable the advanced audio/video service.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AvDisable
+ *
+ * Description      Disable the advanced audio/video service.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AvDisable(void);
 
 /*******************************************************************************
-**
-** Function         BTA_AvRegister
-**
-** Description      Register the audio or video service to stack. When the
-**                  operation is complete the callback function will be
-**                  called with a BTA_AV_REGISTER_EVT. This function must
-**                  be called before AVDT stream is open.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AvRegister
+ *
+ * Description      Register the audio or video service to stack. When the
+ *                  operation is complete the callback function will be
+ *                  called with a BTA_AV_REGISTER_EVT. This function must
+ *                  be called before AVDT stream is open.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AvRegister(tBTA_AV_CHNL chnl, const char *p_service_name,
                     uint8_t app_id, tBTA_AV_SINK_DATA_CBACK *p_sink_data_cback,
                     uint16_t service_uuid);
 
 /*******************************************************************************
-**
-** Function         BTA_AvDeregister
-**
-** Description      Deregister the audio or video service
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AvDeregister
+ *
+ * Description      Deregister the audio or video service
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AvDeregister(tBTA_AV_HNDL hndl);
 
 /*******************************************************************************
-**
-** Function         BTA_AvOpen
-**
-** Description      Opens an advanced audio/video connection to a peer device.
-**                  When connection is open callback function is called
-**                  with a BTA_AV_OPEN_EVT.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AvOpen
+ *
+ * Description      Opens an advanced audio/video connection to a peer device.
+ *                  When connection is open callback function is called
+ *                  with a BTA_AV_OPEN_EVT.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AvOpen(BD_ADDR bd_addr, tBTA_AV_HNDL handle,
                         bool use_rc, tBTA_SEC sec_mask, uint16_t uuid);
 
 /*******************************************************************************
-**
-** Function         BTA_AvClose
-**
-** Description      Close the current streams.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AvClose
+ *
+ * Description      Close the current streams.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AvClose(tBTA_AV_HNDL handle);
 
 /*******************************************************************************
-**
-** Function         BTA_AvDisconnect
-**
-** Description      Close the connection to the address.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AvDisconnect
+ *
+ * Description      Close the connection to the address.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AvDisconnect(BD_ADDR bd_addr);
 
 /*******************************************************************************
-**
-** Function         BTA_AvStart
-**
-** Description      Start audio/video stream data transfer.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AvStart
+ *
+ * Description      Start audio/video stream data transfer.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AvStart(void);
 
 /*******************************************************************************
-**
-** Function         BTA_AvStop
-**
-** Description      Stop audio/video stream data transfer.
-**                  If suspend is true, this function sends AVDT suspend signal
-**                  to the connected peer(s).
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AvStop
+ *
+ * Description      Stop audio/video stream data transfer.
+ *                  If suspend is true, this function sends AVDT suspend signal
+ *                  to the connected peer(s).
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AvStop(bool suspend);
 
 /*******************************************************************************
-**
-** Function         BTA_AvReconfig
-**
-** Description      Reconfigure the audio/video stream.
-**                  If suspend is true, this function tries the suspend/reconfigure
-**                  procedure first.
-**                  If suspend is false or when suspend/reconfigure fails,
-**                  this function closes and re-opens the AVDT connection.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AvReconfig
+ *
+ * Description      Reconfigure the audio/video stream.
+ *                  If suspend is true, this function tries the suspend/reconfigure
+ *                  procedure first.
+ *                  If suspend is false or when suspend/reconfigure fails,
+ *                  this function closes and re-opens the AVDT connection.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AvReconfig(tBTA_AV_HNDL hndl, bool suspend, uint8_t sep_info_idx,
                     uint8_t *p_codec_info, uint8_t num_protect,
                     const uint8_t *p_protect_info);
 
 /*******************************************************************************
-**
-** Function         BTA_AvProtectReq
-**
-** Description      Send a content protection request.  This function can only
-**                  be used if AV is enabled with feature BTA_AV_FEAT_PROTECT.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AvProtectReq
+ *
+ * Description      Send a content protection request.  This function can only
+ *                  be used if AV is enabled with feature BTA_AV_FEAT_PROTECT.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AvProtectReq(tBTA_AV_HNDL hndl, uint8_t *p_data, uint16_t len);
 
 /*******************************************************************************
-**
-** Function         BTA_AvProtectRsp
-**
-** Description      Send a content protection response.  This function must
-**                  be called if a BTA_AV_PROTECT_REQ_EVT is received.
-**                  This function can only be used if AV is enabled with
-**                  feature BTA_AV_FEAT_PROTECT.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AvProtectRsp
+ *
+ * Description      Send a content protection response.  This function must
+ *                  be called if a BTA_AV_PROTECT_REQ_EVT is received.
+ *                  This function can only be used if AV is enabled with
+ *                  feature BTA_AV_FEAT_PROTECT.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AvProtectRsp(tBTA_AV_HNDL hndl, uint8_t error_code, uint8_t *p_data,
                               uint16_t len);
 
 /*******************************************************************************
-**
-** Function         BTA_AvRemoteCmd
-**
-** Description      Send a remote control command.  This function can only
-**                  be used if AV is enabled with feature BTA_AV_FEAT_RCCT.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AvRemoteCmd
+ *
+ * Description      Send a remote control command.  This function can only
+ *                  be used if AV is enabled with feature BTA_AV_FEAT_RCCT.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AvRemoteCmd(uint8_t rc_handle, uint8_t label, tBTA_AV_RC rc_id,
                              tBTA_AV_STATE key_state);
 
 /*******************************************************************************
-**
-** Function         BTA_AvRemoteVendorUniqueCmd
-**
-** Description      Send a remote control command with Vendor Unique rc_id.
-**                  This function can only be used if AV is enabled with
-**                  feature BTA_AV_FEAT_RCCT.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AvRemoteVendorUniqueCmd
+ *
+ * Description      Send a remote control command with Vendor Unique rc_id.
+ *                  This function can only be used if AV is enabled with
+ *                  feature BTA_AV_FEAT_RCCT.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AvRemoteVendorUniqueCmd(uint8_t rc_handle, uint8_t label, tBTA_AV_STATE key_state,
                                          uint8_t* p_msg, uint8_t buf_len);
 
 /*******************************************************************************
-**
-** Function         BTA_AvVendorCmd
-**
-** Description      Send a vendor dependent remote control command.  This
-**                  function can only be used if AV is enabled with feature
-**                  BTA_AV_FEAT_VENDOR.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AvVendorCmd
+ *
+ * Description      Send a vendor dependent remote control command.  This
+ *                  function can only be used if AV is enabled with feature
+ *                  BTA_AV_FEAT_VENDOR.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AvVendorCmd(uint8_t rc_handle, uint8_t label, tBTA_AV_CODE cmd_code,
                              uint8_t *p_data, uint16_t len);
 
 /*******************************************************************************
-**
-** Function         BTA_AvVendorRsp
-**
-** Description      Send a vendor dependent remote control response.
-**                  This function must be called if a BTA_AV_VENDOR_CMD_EVT
-**                  is received. This function can only be used if AV is
-**                  enabled with feature BTA_AV_FEAT_VENDOR.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AvVendorRsp
+ *
+ * Description      Send a vendor dependent remote control response.
+ *                  This function must be called if a BTA_AV_VENDOR_CMD_EVT
+ *                  is received. This function can only be used if AV is
+ *                  enabled with feature BTA_AV_FEAT_VENDOR.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AvVendorRsp(uint8_t rc_handle, uint8_t label, tBTA_AV_CODE rsp_code,
                              uint8_t *p_data, uint16_t len, uint32_t company_id);
 
 
 /*******************************************************************************
-**
-** Function         BTA_AvOpenRc
-**
-** Description      Open an AVRCP connection toward the device with the
-**                  specified handle
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AvOpenRc
+ *
+ * Description      Open an AVRCP connection toward the device with the
+ *                  specified handle
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AvOpenRc(tBTA_AV_HNDL handle);
 
 /*******************************************************************************
-**
-** Function         BTA_AvCloseRc
-**
-** Description      Close an AVRCP connection
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AvCloseRc
+ *
+ * Description      Close an AVRCP connection
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AvCloseRc(uint8_t rc_handle);
 
 /*******************************************************************************
-**
-** Function         BTA_AvMetaRsp
-**
-** Description      Send a Metadata command/response. The message contained
-**                  in p_pkt can be composed with AVRC utility functions.
-**                  This function can only be used if AV is enabled with feature
-**                  BTA_AV_FEAT_METADATA.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AvMetaRsp
+ *
+ * Description      Send a Metadata command/response. The message contained
+ *                  in p_pkt can be composed with AVRC utility functions.
+ *                  This function can only be used if AV is enabled with feature
+ *                  BTA_AV_FEAT_METADATA.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AvMetaRsp(uint8_t rc_handle, uint8_t label, tBTA_AV_CODE rsp_code,
                                BT_HDR *p_pkt);
 
 /*******************************************************************************
-**
-** Function         BTA_AvMetaCmd
-**
-** Description      Send a Metadata/Advanced Control command. The message contained
-**                  in p_pkt can be composed with AVRC utility functions.
-**                  This function can only be used if AV is enabled with feature
-**                  BTA_AV_FEAT_METADATA.
-**                  This message is sent only when the peer supports the TG role.
+ *
+ * Function         BTA_AvMetaCmd
+ *
+ * Description      Send a Metadata/Advanced Control command. The message contained
+ *                  in p_pkt can be composed with AVRC utility functions.
+ *                  This function can only be used if AV is enabled with feature
+ *                  BTA_AV_FEAT_METADATA.
+ *                  This message is sent only when the peer supports the TG role.
 *8                  The only command makes sense right now is the absolute volume command.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AvMetaCmd(uint8_t rc_handle, uint8_t label, tBTA_AV_CMD cmd_code, BT_HDR *p_pkt);
 
 /*******************************************************************************
-**
-** Function         BTA_AvOffloadStart
-**
-** Description      Request Starting of A2DP Offload.
-**                  This function is used to start A2DP offload if vendor lib has
-**                  the feature enabled.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AvOffloadStart
+ *
+ * Description      Request Starting of A2DP Offload.
+ *                  This function is used to start A2DP offload if vendor lib has
+ *                  the feature enabled.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AvOffloadStart(tBTA_AV_HNDL hndl);
 
 /*******************************************************************************
-**
-** Function         BTA_AvOffloadStartRsp
-**
-** Description      Response from vendor library indicating response for
-**                  OffloadStart.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_AvOffloadStartRsp
+ *
+ * Description      Response from vendor library indicating response for
+ *                  OffloadStart.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_AvOffloadStartRsp(tBTA_AV_HNDL hndl, tBTA_AV_STATUS status);
 
 
diff --git a/system/bta/include/bta_av_ci.h b/system/bta/include/bta_av_ci.h
index 9ac32471a59..099f11363ee 100644
--- a/system/bta/include/bta_av_ci.h
+++ b/system/bta/include/bta_av_ci.h
@@ -27,39 +27,39 @@
 #include "bta_av_api.h"
 
 /*****************************************************************************
-**  Function Declarations
-*****************************************************************************/
+ *  Function Declarations
+ ****************************************************************************/
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
 /*******************************************************************************
-**
-** Function         bta_av_ci_src_data_ready
-**
-** Description      This function sends an event to the AV indicating that
-**                  the phone has audio stream data ready to send and AV
-**                  should call bta_av_co_audio_src_data_path().
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_ci_src_data_ready
+ *
+ * Description      This function sends an event to the AV indicating that
+ *                  the phone has audio stream data ready to send and AV
+ *                  should call bta_av_co_audio_src_data_path().
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void bta_av_ci_src_data_ready(tBTA_AV_CHNL chnl);
 
 /*******************************************************************************
-**
-** Function         bta_av_ci_setconfig
-**
-** Description      This function must be called in response to function
-**                  bta_av_co_audio_setconfig().
-**                  Parameter err_code is set to an AVDTP status value;
-**                  AVDT_SUCCESS if the codec configuration is ok,
-**                  otherwise error.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_ci_setconfig
+ *
+ * Description      This function must be called in response to function
+ *                  bta_av_co_audio_setconfig().
+ *                  Parameter err_code is set to an AVDTP status value;
+ *                  AVDT_SUCCESS if the codec configuration is ok,
+ *                  otherwise error.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void bta_av_ci_setconfig(tBTA_AV_HNDL hndl, uint8_t err_code,
                                         uint8_t category, uint8_t num_seid, uint8_t *p_seid,
                                         bool recfg_needed, uint8_t avdt_handle);
diff --git a/system/bta/include/bta_av_co.h b/system/bta/include/bta_av_co.h
index 752c289847a..c4679da5eef 100644
--- a/system/bta/include/bta_av_co.h
+++ b/system/bta/include/bta_av_co.h
@@ -32,53 +32,53 @@ extern "C" {
 #endif
 
 /*****************************************************************************
-**  Constants and data types
-*****************************************************************************/
+ *  Constants and data types
+ ****************************************************************************/
 
 /*******************************************************************************
-**
-** Function         bta_av_co_audio_init
-**
-** Description      This callout function is executed by AV when it is
-**                  started by calling BTA_AvEnable().  This function can be
-**                  used by the phone to initialize audio paths or for other
-**                  initialization purposes.
-**
-**
-** Returns          Stream codec and content protection capabilities info.
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_co_audio_init
+ *
+ * Description      This callout function is executed by AV when it is
+ *                  started by calling BTA_AvEnable().  This function can be
+ *                  used by the phone to initialize audio paths or for other
+ *                  initialization purposes.
+ *
+ *
+ * Returns          Stream codec and content protection capabilities info.
+ *
+ ******************************************************************************/
 bool bta_av_co_audio_init(tA2DP_CODEC_SEP_INDEX codec_sep_index,
                           tAVDT_CFG *p_cfg);
 
 /*******************************************************************************
-**
-** Function         bta_av_co_audio_disc_res
-**
-** Description      This callout function is executed by AV to report the
-**                  number of stream end points (SEP) were found during the
-**                  AVDT stream discovery process.
-**
-**
-** Returns          void.
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_co_audio_disc_res
+ *
+ * Description      This callout function is executed by AV to report the
+ *                  number of stream end points (SEP) were found during the
+ *                  AVDT stream discovery process.
+ *
+ *
+ * Returns          void.
+ *
+ ******************************************************************************/
 void bta_av_co_audio_disc_res(tBTA_AV_HNDL hndl, uint8_t num_seps,
                               uint8_t num_snk, uint8_t num_src, BD_ADDR addr,
                               uint16_t uuid_local);
 
 /*******************************************************************************
-**
-** Function         bta_av_co_audio_getconfig
-**
-** Description      This callout function is executed by AV to retrieve the
-**                  desired codec and content protection configuration for the
-**                  audio stream.
-**
-**
-** Returns          Stream codec and content protection configuration info.
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_co_audio_getconfig
+ *
+ * Description      This callout function is executed by AV to retrieve the
+ *                  desired codec and content protection configuration for the
+ *                  audio stream.
+ *
+ *
+ * Returns          Stream codec and content protection configuration info.
+ *
+ ******************************************************************************/
 tA2DP_STATUS bta_av_co_audio_getconfig(tBTA_AV_HNDL hndl,
                                        uint8_t *p_codec_info,
                                        uint8_t *p_sep_info_idx, uint8_t seid,
@@ -86,119 +86,119 @@ tA2DP_STATUS bta_av_co_audio_getconfig(tBTA_AV_HNDL hndl,
                                        uint8_t *p_protect_info);
 
 /*******************************************************************************
-**
-** Function         bta_av_co_audio_setconfig
-**
-** Description      This callout function is executed by AV to set the
-**                  codec and content protection configuration of the audio stream.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_co_audio_setconfig
+ *
+ * Description      This callout function is executed by AV to set the
+ *                  codec and content protection configuration of the audio stream.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_co_audio_setconfig(tBTA_AV_HNDL hndl, const uint8_t *p_codec_info,
                                uint8_t seid, BD_ADDR addr, uint8_t num_protect,
                                uint8_t *p_protect_info,uint8_t t_local_sep,
                                uint8_t avdt_handle);
 
 /*******************************************************************************
-**
-** Function         bta_av_co_audio_open
-**
-** Description      This function is called by AV when the audio stream connection
-**                  is opened.
-**                  BTA-AV maintains the MTU of A2DP streams.
-**                  If this is the 2nd audio stream, mtu is the smaller of the 2
-**                  streams.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_co_audio_open
+ *
+ * Description      This function is called by AV when the audio stream connection
+ *                  is opened.
+ *                  BTA-AV maintains the MTU of A2DP streams.
+ *                  If this is the 2nd audio stream, mtu is the smaller of the 2
+ *                  streams.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_co_audio_open(tBTA_AV_HNDL hndl, uint8_t *p_codec_info,
                           uint16_t mtu);
 
 /*******************************************************************************
-**
-** Function         bta_av_co_audio_close
-**
-** Description      This function is called by AV when the audio stream connection
-**                  is closed.
-**                  BTA-AV maintains the MTU of A2DP streams.
-**                  When one stream is closed and no other audio stream is open,
-**                  mtu is reported as 0.
-**                  Otherwise, the MTU remains open is reported.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_co_audio_close
+ *
+ * Description      This function is called by AV when the audio stream connection
+ *                  is closed.
+ *                  BTA-AV maintains the MTU of A2DP streams.
+ *                  When one stream is closed and no other audio stream is open,
+ *                  mtu is reported as 0.
+ *                  Otherwise, the MTU remains open is reported.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_co_audio_close(tBTA_AV_HNDL hndl, uint16_t mtu);
 
 /*******************************************************************************
-**
-** Function         bta_av_co_audio_start
-**
-** Description      This function is called by AV when the audio streaming data
-**                  transfer is started.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_co_audio_start
+ *
+ * Description      This function is called by AV when the audio streaming data
+ *                  transfer is started.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_co_audio_start(tBTA_AV_HNDL hndl, uint8_t *p_codec_info,
                            bool *p_no_rtp_hdr);
 
 /*******************************************************************************
-**
-** Function         bta_av_co_audio_stop
-**
-** Description      This function is called by AV when the audio streaming data
-**                  transfer is stopped.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_co_audio_stop
+ *
+ * Description      This function is called by AV when the audio streaming data
+ *                  transfer is stopped.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_co_audio_stop(tBTA_AV_HNDL hndl);
 
 /*******************************************************************************
-**
-** Function         bta_av_co_audio_src_data_path
-**
-** Description      This function is called to get the next data buffer from
-**                  the audio codec
-**
-** Returns          NULL if data is not ready.
-**                  Otherwise, a buffer (BT_HDR*) containing the audio data.
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_co_audio_src_data_path
+ *
+ * Description      This function is called to get the next data buffer from
+ *                  the audio codec
+ *
+ * Returns          NULL if data is not ready.
+ *                  Otherwise, a buffer (BT_HDR*) containing the audio data.
+ *
+ ******************************************************************************/
 void *bta_av_co_audio_src_data_path(const uint8_t *p_codec_info,
                                     uint32_t *p_timestamp);
 
 /*******************************************************************************
-**
-** Function         bta_av_co_audio_drop
-**
-** Description      An Audio packet is dropped. .
-**                  It's very likely that the connected headset with this handle
-**                  is moved far away. The implementation may want to reduce
-**                  the encoder bit rate setting to reduce the packet size.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_co_audio_drop
+ *
+ * Description      An Audio packet is dropped. .
+ *                  It's very likely that the connected headset with this handle
+ *                  is moved far away. The implementation may want to reduce
+ *                  the encoder bit rate setting to reduce the packet size.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_co_audio_drop(tBTA_AV_HNDL hndl);
 
 /*******************************************************************************
-**
-** Function         bta_av_co_audio_delay
-**
-** Description      This function is called by AV when the audio stream connection
-**                  needs to send the initial delay report to the connected SRC.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_av_co_audio_delay
+ *
+ * Description      This function is called by AV when the audio stream connection
+ *                  needs to send the initial delay report to the connected SRC.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_av_co_audio_delay(tBTA_AV_HNDL hndl, uint16_t delay);
 
 #ifdef __cplusplus
diff --git a/system/bta/include/bta_dm_ci.h b/system/bta/include/bta_dm_ci.h
index ec2fab704fd..7ccbfadc10a 100644
--- a/system/bta/include/bta_dm_ci.h
+++ b/system/bta/include/bta_dm_ci.h
@@ -27,49 +27,49 @@
 #include "bta_api.h"
 
 /*****************************************************************************
-**  Function Declarations
-*****************************************************************************/
+ *  Function Declarations
+ ****************************************************************************/
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /*******************************************************************************
-**
-** Function         bta_dm_ci_io_req
-**
-** Description      This function must be called in response to function
-**                  bta_dm_co_io_req(), if *p_oob_data is set to BTA_OOB_UNKNOWN
-**                  by bta_dm_co_io_req().
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_ci_io_req
+ *
+ * Description      This function must be called in response to function
+ *                  bta_dm_co_io_req(), if *p_oob_data is set to BTA_OOB_UNKNOWN
+ *                  by bta_dm_co_io_req().
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void bta_dm_ci_io_req(BD_ADDR bd_addr, tBTA_IO_CAP io_cap,
                                      tBTA_OOB_DATA oob_data, tBTA_AUTH_REQ auth_req);
 
 /*******************************************************************************
-**
-** Function         bta_dm_ci_rmt_oob
-**
-** Description      This function must be called in response to function
-**                  bta_dm_co_rmt_oob() to provide the OOB data associated
-**                  with the remote device.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_ci_rmt_oob
+ *
+ * Description      This function must be called in response to function
+ *                  bta_dm_co_rmt_oob() to provide the OOB data associated
+ *                  with the remote device.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void bta_dm_ci_rmt_oob(bool accept, BD_ADDR bd_addr,
                               BT_OCTET16 c, BT_OCTET16 r);
 /*******************************************************************************
-**
-** Function         bta_dm_sco_ci_data_ready
-**
-** Description      This function sends an event to indicating that the phone
-**                  has SCO data ready..
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_sco_ci_data_ready
+ *
+ * Description      This function sends an event to indicating that the phone
+ *                  has SCO data ready..
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void bta_dm_sco_ci_data_ready(uint16_t event, uint16_t sco_handle);
 
 #ifdef __cplusplus
diff --git a/system/bta/include/bta_dm_co.h b/system/bta/include/bta_dm_co.h
index c8900a25db9..e1397fd65b1 100644
--- a/system/bta/include/bta_dm_co.h
+++ b/system/bta/include/bta_dm_co.h
@@ -54,176 +54,176 @@ typedef tBTM_SCO_ROUTE_TYPE tBTA_DM_SCO_ROUTE_TYPE;
 
 
 /*****************************************************************************
-**  Function Declarations
-*****************************************************************************/
+ *  Function Declarations
+ ****************************************************************************/
 
 /*******************************************************************************
-**
-** Function         bta_dm_co_io_req
-**
-** Description      This callout function is executed by DM to get IO capabilities
-**                  of the local device for the Simple Pairing process
-**
-** Parameters       bd_addr  - The peer device
-**                  *p_io_cap - The local Input/Output capabilities
-**                  *p_oob_data - true, if OOB data is available for the peer device.
-**                  *p_auth_req - true, if MITM protection is required.
-**
-** Returns          void.
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_co_io_req
+ *
+ * Description      This callout function is executed by DM to get IO capabilities
+ *                  of the local device for the Simple Pairing process
+ *
+ * Parameters       bd_addr  - The peer device
+ *                  *p_io_cap - The local Input/Output capabilities
+ *                  *p_oob_data - true, if OOB data is available for the peer device.
+ *                  *p_auth_req - true, if MITM protection is required.
+ *
+ * Returns          void.
+ *
+ ******************************************************************************/
 extern void bta_dm_co_io_req(BD_ADDR bd_addr, tBTA_IO_CAP *p_io_cap,
                              tBTA_OOB_DATA *p_oob_data, tBTA_AUTH_REQ *p_auth_req,
                              bool is_orig);
 
 /*******************************************************************************
-**
-** Function         bta_dm_co_io_rsp
-**
-** Description      This callout function is executed by DM to report IO capabilities
-**                  of the peer device for the Simple Pairing process
-**
-** Parameters       bd_addr  - The peer device
-**                  io_cap - The remote Input/Output capabilities
-**                  oob_data - true, if OOB data is available for the peer device.
-**                  auth_req - true, if MITM protection is required.
-**
-** Returns          void.
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_co_io_rsp
+ *
+ * Description      This callout function is executed by DM to report IO capabilities
+ *                  of the peer device for the Simple Pairing process
+ *
+ * Parameters       bd_addr  - The peer device
+ *                  io_cap - The remote Input/Output capabilities
+ *                  oob_data - true, if OOB data is available for the peer device.
+ *                  auth_req - true, if MITM protection is required.
+ *
+ * Returns          void.
+ *
+ ******************************************************************************/
 extern void bta_dm_co_io_rsp(BD_ADDR bd_addr, tBTA_IO_CAP io_cap,
                              tBTA_OOB_DATA oob_data, tBTA_AUTH_REQ auth_req);
 
 /*******************************************************************************
-**
-** Function         bta_dm_co_lk_upgrade
-**
-** Description      This callout function is executed by DM to check if the
-**                  platform wants allow link key upgrade
-**
-** Parameters       bd_addr  - The peer device
-**                  *p_upgrade - true, if link key upgrade is desired.
-**
-** Returns          void.
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_co_lk_upgrade
+ *
+ * Description      This callout function is executed by DM to check if the
+ *                  platform wants allow link key upgrade
+ *
+ * Parameters       bd_addr  - The peer device
+ *                  *p_upgrade - true, if link key upgrade is desired.
+ *
+ * Returns          void.
+ *
+ ******************************************************************************/
 extern void  bta_dm_co_lk_upgrade(BD_ADDR bd_addr, bool *p_upgrade );
 
 /*******************************************************************************
-**
-** Function         bta_dm_co_loc_oob
-**
-** Description      This callout function is executed by DM to report the OOB
-**                  data of the local device for the Simple Pairing process
-**
-** Parameters       valid - true, if the local OOB data is retrieved from LM
-**                  c     - Simple Pairing Hash C
-**                  r     - Simple Pairing Randomnizer R
-**
-** Returns          void.
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_co_loc_oob
+ *
+ * Description      This callout function is executed by DM to report the OOB
+ *                  data of the local device for the Simple Pairing process
+ *
+ * Parameters       valid - true, if the local OOB data is retrieved from LM
+ *                  c     - Simple Pairing Hash C
+ *                  r     - Simple Pairing Randomnizer R
+ *
+ * Returns          void.
+ *
+ ******************************************************************************/
 extern void bta_dm_co_loc_oob(bool valid, BT_OCTET16 c, BT_OCTET16 r);
 
 /*******************************************************************************
-**
-** Function         bta_dm_co_rmt_oob
-**
-** Description      This callout function is executed by DM to request the OOB
-**                  data for the remote device for the Simple Pairing process
-**
-** Parameters       bd_addr  - The peer device
-**
-** Returns          void.
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_co_rmt_oob
+ *
+ * Description      This callout function is executed by DM to request the OOB
+ *                  data for the remote device for the Simple Pairing process
+ *
+ * Parameters       bd_addr  - The peer device
+ *
+ * Returns          void.
+ *
+ ******************************************************************************/
 extern void bta_dm_co_rmt_oob(BD_ADDR bd_addr);
 
 /*****************************************************************************
-**  SCO over HCI Function Declarations
-*****************************************************************************/
+ *  SCO over HCI Function Declarations
+ ****************************************************************************/
 /*******************************************************************************
-**
-** Function         bta_dm_sco_co_init
-**
-** Description      This function can be used by the phone to initialize audio
-**                  codec or for other initialization purposes before SCO connection
-**                  is opened.
-**
-**
-** Returns          Void.
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_sco_co_init
+ *
+ * Description      This function can be used by the phone to initialize audio
+ *                  codec or for other initialization purposes before SCO connection
+ *                  is opened.
+ *
+ *
+ * Returns          Void.
+ *
+ ******************************************************************************/
 extern tBTA_DM_SCO_ROUTE_TYPE bta_dm_sco_co_init(uint32_t rx_bw, uint32_t tx_bw,
                                                  tBTA_CODEC_INFO *p_codec_info, uint8_t app_id);
 
 
 /*******************************************************************************
-**
-** Function         bta_dm_sco_co_open
-**
-** Description      This function is executed when a SCO connection is open.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_sco_co_open
+ *
+ * Description      This function is executed when a SCO connection is open.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void bta_dm_sco_co_open(uint16_t handle, uint8_t pkt_size, uint16_t event);
 
 /*******************************************************************************
-**
-** Function         bta_dm_sco_co_close
-**
-** Description      This function is called when a SCO connection is closed
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_sco_co_close
+ *
+ * Description      This function is called when a SCO connection is closed
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void bta_dm_sco_co_close(void);
 
 /*******************************************************************************
-**
-** Function         bta_dm_sco_co_out_data
-**
-** Description      This function is called to send SCO data over HCI.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_sco_co_out_data
+ *
+ * Description      This function is called to send SCO data over HCI.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void bta_dm_sco_co_out_data(BT_HDR  **p_buf);
 
 /*******************************************************************************
-**
-** Function         bta_dm_sco_co_in_data
-**
-** Description      This function is called to send incoming SCO data to application.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_sco_co_in_data
+ *
+ * Description      This function is called to send incoming SCO data to application.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void bta_dm_sco_co_in_data(BT_HDR  *p_buf, tBTM_SCO_DATA_FLAG status);
 
 
 
 /*******************************************************************************
-**
-** Function         bta_dm_co_ble_io_req
-**
-** Description      This callout function is executed by DM to get BLE IO capabilities
-**                  before SMP pairing gets going.
-**
-** Parameters       bd_addr  - The peer device
-**                  *p_io_cap - The local Input/Output capabilities
-**                  *p_oob_data - true, if OOB data is available for the peer device.
-**                  *p_auth_req -  Auth request setting (Bonding and MITM required or not)
-**                  *p_max_key_size - max key size local device supported.
-**                  *p_init_key - initiator keys.
-**                  *p_resp_key - responder keys.
-**
-** Returns          void.
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_co_ble_io_req
+ *
+ * Description      This callout function is executed by DM to get BLE IO capabilities
+ *                  before SMP pairing gets going.
+ *
+ * Parameters       bd_addr  - The peer device
+ *                  *p_io_cap - The local Input/Output capabilities
+ *                  *p_oob_data - true, if OOB data is available for the peer device.
+ *                  *p_auth_req -  Auth request setting (Bonding and MITM required or not)
+ *                  *p_max_key_size - max key size local device supported.
+ *                  *p_init_key - initiator keys.
+ *                  *p_resp_key - responder keys.
+ *
+ * Returns          void.
+ *
+ ******************************************************************************/
 extern void bta_dm_co_ble_io_req(BD_ADDR bd_addr,  tBTA_IO_CAP *p_io_cap,
                                  tBTA_OOB_DATA *p_oob_data,
                                  tBTA_LE_AUTH_REQ *p_auth_req,
@@ -233,38 +233,38 @@ extern void bta_dm_co_ble_io_req(BD_ADDR bd_addr,  tBTA_IO_CAP *p_io_cap,
 
 
 /*******************************************************************************
-**
-** Function         bta_dm_co_ble_local_key_reload
-**
-** Description      This callout function is to load the local BLE keys if available
-**                  on the device.
-**
-** Parameters       none
-**
-** Returns          void.
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_co_ble_local_key_reload
+ *
+ * Description      This callout function is to load the local BLE keys if available
+ *                  on the device.
+ *
+ * Parameters       none
+ *
+ * Returns          void.
+ *
+ ******************************************************************************/
 extern void bta_dm_co_ble_load_local_keys (tBTA_DM_BLE_LOCAL_KEY_MASK *p_key_mask, BT_OCTET16 er,
                                            tBTA_BLE_LOCAL_ID_KEYS *p_id_keys);
 
 /*******************************************************************************
-**
-** Function         bta_dm_co_ble_io_req
-**
-** Description      This callout function is executed by DM to get BLE IO capabilities
-**                  before SMP pairing gets going.
-**
-** Parameters       bd_addr  - The peer device
-**                  *p_io_cap - The local Input/Output capabilities
-**                  *p_oob_data - true, if OOB data is available for the peer device.
-**                  *p_auth_req -  Auth request setting (Bonding and MITM required or not)
-**                  *p_max_key_size - max key size local device supported.
-**                  *p_init_key - initiator keys.
-**                  *p_resp_key - responder keys.
-**
-** Returns          void.
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_co_ble_io_req
+ *
+ * Description      This callout function is executed by DM to get BLE IO capabilities
+ *                  before SMP pairing gets going.
+ *
+ * Parameters       bd_addr  - The peer device
+ *                  *p_io_cap - The local Input/Output capabilities
+ *                  *p_oob_data - true, if OOB data is available for the peer device.
+ *                  *p_auth_req -  Auth request setting (Bonding and MITM required or not)
+ *                  *p_max_key_size - max key size local device supported.
+ *                  *p_init_key - initiator keys.
+ *                  *p_resp_key - responder keys.
+ *
+ * Returns          void.
+ *
+ ******************************************************************************/
 extern void bta_dm_co_ble_io_req(BD_ADDR bd_addr,  tBTA_IO_CAP *p_io_cap,
                                  tBTA_OOB_DATA *p_oob_data,
                                  tBTA_LE_AUTH_REQ *p_auth_req,
diff --git a/system/bta/include/bta_gatt_api.h b/system/bta/include/bta_gatt_api.h
index ffe939ca056..66ae35ea9a9 100644
--- a/system/bta/include/bta_gatt_api.h
+++ b/system/bta/include/bta_gatt_api.h
@@ -50,11 +50,11 @@ using std::vector;
 #endif
 
 /*****************************************************************************
-**  Constants and data types
-*****************************************************************************/
+ *  Constants and data types
+ ****************************************************************************/
 /**************************
-**  Common Definitions
-***************************/
+ *  Common Definitions
+ **************************/
 /* GATT ID */
 typedef struct
 {
@@ -563,172 +563,172 @@ typedef struct
 } __attribute__((packed)) tBTA_GATTC_INCLUDED_SVC;
 
 /*****************************************************************************
-**  External Function Declarations
-*****************************************************************************/
+ *  External Function Declarations
+ ****************************************************************************/
 
 /**************************
-**  Client Functions
-***************************/
+ *  Client Functions
+ **************************/
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_Disable
-**
-** Description      This function is called to disable the GATTC module
-**
-** Parameters       None.
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_Disable
+ *
+ * Description      This function is called to disable the GATTC module
+ *
+ * Parameters       None.
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 extern void BTA_GATTC_Disable(void);
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_AppRegister
-**
-** Description      This function is called to register application callbacks
-**                    with BTA GATTC module.
-**
-** Parameters       p_app_uuid - applicaiton UUID
-**                  p_client_cb - pointer to the application callback function.
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_AppRegister
+ *
+ * Description      This function is called to register application callbacks
+ *                    with BTA GATTC module.
+ *
+ * Parameters       p_app_uuid - applicaiton UUID
+ *                  p_client_cb - pointer to the application callback function.
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 extern void BTA_GATTC_AppRegister(tBT_UUID *p_app_uuid, tBTA_GATTC_CBACK *p_client_cb);
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_AppDeregister
-**
-** Description      This function is called to deregister an application
-**                  from BTA GATTC module.
-**
-** Parameters       client_if - client interface identifier.
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_AppDeregister
+ *
+ * Description      This function is called to deregister an application
+ *                  from BTA GATTC module.
+ *
+ * Parameters       client_if - client interface identifier.
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 extern void BTA_GATTC_AppDeregister (tBTA_GATTC_IF client_if);
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_Open
-**
-** Description      Open a direct connection or add a background auto connection
-**                  bd address
-**
-** Parameters       client_if: server interface.
-**                  remote_bda: remote device BD address.
-**                  is_direct: direct connection or background auto connection
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_Open
+ *
+ * Description      Open a direct connection or add a background auto connection
+ *                  bd address
+ *
+ * Parameters       client_if: server interface.
+ *                  remote_bda: remote device BD address.
+ *                  is_direct: direct connection or background auto connection
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_GATTC_Open(tBTA_GATTC_IF client_if, BD_ADDR remote_bda,
                            bool is_direct, tBTA_GATT_TRANSPORT transport);
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_CancelOpen
-**
-** Description      Open a direct connection or add a background auto connection
-**                  bd address
-**
-** Parameters       client_if: server interface.
-**                  remote_bda: remote device BD address.
-**                  is_direct: direct connection or background auto connection
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_CancelOpen
+ *
+ * Description      Open a direct connection or add a background auto connection
+ *                  bd address
+ *
+ * Parameters       client_if: server interface.
+ *                  remote_bda: remote device BD address.
+ *                  is_direct: direct connection or background auto connection
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_GATTC_CancelOpen(tBTA_GATTC_IF client_if, BD_ADDR remote_bda, bool is_direct);
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_Close
-**
-** Description      Close a connection to a GATT server.
-**
-** Parameters       conn_id: connectino ID to be closed.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_Close
+ *
+ * Description      Close a connection to a GATT server.
+ *
+ * Parameters       conn_id: connectino ID to be closed.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_GATTC_Close(uint16_t conn_id);
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_ServiceSearchRequest
-**
-** Description      This function is called to request a GATT service discovery
-**                    on a GATT server. This function report service search result
-**                  by a callback event, and followed by a service search complete
-**                  event.
-**
-** Parameters       conn_id: connection ID.
-**                  p_srvc_uuid: a UUID of the service application is interested in.
-**                              If Null, discover for all services.
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_ServiceSearchRequest
+ *
+ * Description      This function is called to request a GATT service discovery
+ *                    on a GATT server. This function report service search result
+ *                  by a callback event, and followed by a service search complete
+ *                  event.
+ *
+ * Parameters       conn_id: connection ID.
+ *                  p_srvc_uuid: a UUID of the service application is interested in.
+ *                              If Null, discover for all services.
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 extern void BTA_GATTC_ServiceSearchRequest(uint16_t conn_id, tBT_UUID *p_srvc_uuid);
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_GetServices
-**
-** Description      This function is called to find the services on the given server.
-**
-** Parameters       conn_id: connection ID which identify the server.
-**
-** Returns          returns list_t of tBTA_GATTC_SERVICE or NULL.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_GetServices
+ *
+ * Description      This function is called to find the services on the given server.
+ *
+ * Parameters       conn_id: connection ID which identify the server.
+ *
+ * Returns          returns list_t of tBTA_GATTC_SERVICE or NULL.
+ *
+ ******************************************************************************/
 extern const list_t* BTA_GATTC_GetServices(uint16_t conn_id);
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_GetCharacteristic
-**
-** Description      This function is called to find the characteristic on the given server.
-**
-** Parameters       conn_id: connection ID which identify the server.
-**                  handle: characteristic handle
-**
-** Returns          returns pointer to tBTA_GATTC_CHARACTERISTIC or NULL.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_GetCharacteristic
+ *
+ * Description      This function is called to find the characteristic on the given server.
+ *
+ * Parameters       conn_id: connection ID which identify the server.
+ *                  handle: characteristic handle
+ *
+ * Returns          returns pointer to tBTA_GATTC_CHARACTERISTIC or NULL.
+ *
+ ******************************************************************************/
 extern const tBTA_GATTC_CHARACTERISTIC* BTA_GATTC_GetCharacteristic(uint16_t conn_id, uint16_t handle);
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_GetDescriptor
-**
-** Description      This function is called to find the characteristic on the given server.
-**
-** Parameters       conn_id: connection ID which identify the server.
-**                  handle: descriptor handle
-**
-** Returns          returns pointer to tBTA_GATTC_DESCRIPTOR or NULL.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_GetDescriptor
+ *
+ * Description      This function is called to find the characteristic on the given server.
+ *
+ * Parameters       conn_id: connection ID which identify the server.
+ *                  handle: descriptor handle
+ *
+ * Returns          returns pointer to tBTA_GATTC_DESCRIPTOR or NULL.
+ *
+ ******************************************************************************/
 extern const tBTA_GATTC_DESCRIPTOR* BTA_GATTC_GetDescriptor(uint16_t conn_id, uint16_t handle);
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_GetGattDb
-**
-** Description      This function is called to get gatt db.
-**
-** Parameters       conn_id: connection ID which identify the server.
-**                  db: output parameter which will contain gatt db copy.
-**                      Caller is responsible for freeing it.
-**                  count: number of elements in db.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_GetGattDb
+ *
+ * Description      This function is called to get gatt db.
+ *
+ * Parameters       conn_id: connection ID which identify the server.
+ *                  db: output parameter which will contain gatt db copy.
+ *                      Caller is responsible for freeing it.
+ *                  count: number of elements in db.
+ *
+ ******************************************************************************/
 extern void BTA_GATTC_GetGattDb(uint16_t conn_id, uint16_t start_handle, uint16_t end_handle,
                                 btgatt_db_element_t **db, int *count);
 
@@ -737,49 +737,49 @@ typedef void (*GATT_READ_OP_CB)(uint16_t conn_id, tGATT_STATUS status, uint16_t
 typedef void (*GATT_WRITE_OP_CB)(uint16_t conn_id, tGATT_STATUS status, uint16_t handle, void* data);
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_ReadCharacteristic
-**
-** Description      This function is called to read a characteristics value
-**
-** Parameters       conn_id - connectino ID.
-**                  handle - characteritic handle to read.
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_ReadCharacteristic
+ *
+ * Description      This function is called to read a characteristics value
+ *
+ * Parameters       conn_id - connectino ID.
+ *                  handle - characteritic handle to read.
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 void BTA_GATTC_ReadCharacteristic(uint16_t conn_id, uint16_t handle, tBTA_GATT_AUTH_REQ auth_req,
                                   GATT_READ_OP_CB callback, void* cb_data);
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_ReadCharDescr
-**
-** Description      This function is called to read a descriptor value.
-**
-** Parameters       conn_id - connection ID.
-**                  handle - descriptor handle to read.
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_ReadCharDescr
+ *
+ * Description      This function is called to read a descriptor value.
+ *
+ * Parameters       conn_id - connection ID.
+ *                  handle - descriptor handle to read.
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 void BTA_GATTC_ReadCharDescr (uint16_t conn_id, uint16_t handle, tBTA_GATT_AUTH_REQ auth_req,
                               GATT_READ_OP_CB callback, void* cb_data);
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_WriteCharValue
-**
-** Description      This function is called to write characteristic value.
-**
-** Parameters       conn_id - connection ID.
-**                  handle - characteristic handle to write.
-**                  write_type - type of write.
-**                  value - the value to be written.
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_WriteCharValue
+ *
+ * Description      This function is called to write characteristic value.
+ *
+ * Parameters       conn_id - connection ID.
+ *                  handle - characteristic handle to write.
+ *                  write_type - type of write.
+ *                  value - the value to be written.
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 void BTA_GATTC_WriteCharValue ( uint16_t conn_id,
                                 uint16_t handle,
                                 tBTA_GATTC_WRITE_TYPE  write_type,
@@ -789,18 +789,18 @@ void BTA_GATTC_WriteCharValue ( uint16_t conn_id,
                                 void* cb_data);
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_WriteCharDescr
-**
-** Description      This function is called to write descriptor value.
-**
-** Parameters       conn_id - connection ID
-**                  handle - descriptor handle to write.
-**                  value - the value to be written.
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_WriteCharDescr
+ *
+ * Description      This function is called to write descriptor value.
+ *
+ * Parameters       conn_id - connection ID
+ *                  handle - descriptor handle to write.
+ *                  value - the value to be written.
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 void BTA_GATTC_WriteCharDescr (uint16_t conn_id,
                                uint16_t handle,
                                vector<uint8_t> value,
@@ -809,67 +809,67 @@ void BTA_GATTC_WriteCharDescr (uint16_t conn_id,
                                void* cb_data);
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_SendIndConfirm
-**
-** Description      This function is called to send handle value confirmation.
-**
-** Parameters       conn_id - connection ID.
-**                  handle - characteristic handle to confirm.
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_SendIndConfirm
+ *
+ * Description      This function is called to send handle value confirmation.
+ *
+ * Parameters       conn_id - connection ID.
+ *                  handle - characteristic handle to confirm.
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 extern void BTA_GATTC_SendIndConfirm (uint16_t conn_id, uint16_t handle);
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_RegisterForNotifications
-**
-** Description      This function is called to register for notification of a service.
-**
-** Parameters       client_if - client interface.
-**                  remote_bda - target GATT server.
-**                  handle - GATT characteristic handle.
-**
-** Returns          OK if registration succeed, otherwise failed.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_RegisterForNotifications
+ *
+ * Description      This function is called to register for notification of a service.
+ *
+ * Parameters       client_if - client interface.
+ *                  remote_bda - target GATT server.
+ *                  handle - GATT characteristic handle.
+ *
+ * Returns          OK if registration succeed, otherwise failed.
+ *
+ ******************************************************************************/
 extern tBTA_GATT_STATUS BTA_GATTC_RegisterForNotifications (tBTA_GATTC_IF      client_if,
                                                             const BD_ADDR      remote_bda,
                                                             uint16_t             handle);
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_DeregisterForNotifications
-**
-** Description      This function is called to de-register for notification of a servbice.
-**
-** Parameters       client_if - client interface.
-**                  remote_bda - target GATT server.
-**                  handle - GATT characteristic handle.
-**
-** Returns          OK if deregistration succeed, otherwise failed.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_DeregisterForNotifications
+ *
+ * Description      This function is called to de-register for notification of a servbice.
+ *
+ * Parameters       client_if - client interface.
+ *                  remote_bda - target GATT server.
+ *                  handle - GATT characteristic handle.
+ *
+ * Returns          OK if deregistration succeed, otherwise failed.
+ *
+ ******************************************************************************/
 extern tBTA_GATT_STATUS BTA_GATTC_DeregisterForNotifications (tBTA_GATTC_IF      client_if,
                                                               const BD_ADDR      remote_bda,
                                                               uint16_t             handle);
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_PrepareWrite
-**
-** Description      This function is called to prepare write a characteristic value.
-**
-** Parameters       conn_id - connection ID.
-**                  handle - GATT characteritic handle.
-**                  offset - offset of the write value.
-**                  value - the value to be written.
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_PrepareWrite
+ *
+ * Description      This function is called to prepare write a characteristic value.
+ *
+ * Parameters       conn_id - connection ID.
+ *                  handle - GATT characteritic handle.
+ *                  offset - offset of the write value.
+ *                  value - the value to be written.
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 extern void BTA_GATTC_PrepareWrite  (uint16_t conn_id,
                                      uint16_t handle,
                                      uint16_t offset,
@@ -879,249 +879,249 @@ extern void BTA_GATTC_PrepareWrite  (uint16_t conn_id,
                                      void* cb_data);
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_ExecuteWrite
-**
-** Description      This function is called to execute write a prepare write sequence.
-**
-** Parameters       conn_id - connection ID.
-**                    is_execute - execute or cancel.
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_ExecuteWrite
+ *
+ * Description      This function is called to execute write a prepare write sequence.
+ *
+ * Parameters       conn_id - connection ID.
+ *                    is_execute - execute or cancel.
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 extern void BTA_GATTC_ExecuteWrite  (uint16_t conn_id, bool is_execute);
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_ReadMultiple
-**
-** Description      This function is called to read multiple characteristic or
-**                  characteristic descriptors.
-**
-** Parameters       conn_id - connectino ID.
-**                    p_read_multi - read multiple parameters.
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_ReadMultiple
+ *
+ * Description      This function is called to read multiple characteristic or
+ *                  characteristic descriptors.
+ *
+ * Parameters       conn_id - connectino ID.
+ *                    p_read_multi - read multiple parameters.
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 extern void BTA_GATTC_ReadMultiple(uint16_t conn_id, tBTA_GATTC_MULTI *p_read_multi,
                                    tBTA_GATT_AUTH_REQ auth_req);
 
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_Refresh
-**
-** Description      Refresh the server cache of the remote device
-**
-** Parameters       remote_bda: remote device BD address.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_Refresh
+ *
+ * Description      Refresh the server cache of the remote device
+ *
+ * Parameters       remote_bda: remote device BD address.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_GATTC_Refresh(const BD_ADDR remote_bda);
 
 /*******************************************************************************
-**
-** Function         BTA_GATTC_ConfigureMTU
-**
-** Description      Configure the MTU size in the GATT channel. This can be done
-**                  only once per connection.
-**
-** Parameters       conn_id: connection ID.
-**                  mtu: desired MTU size to use.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTC_ConfigureMTU
+ *
+ * Description      Configure the MTU size in the GATT channel. This can be done
+ *                  only once per connection.
+ *
+ * Parameters       conn_id: connection ID.
+ *                  mtu: desired MTU size to use.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_GATTC_ConfigureMTU (uint16_t conn_id, uint16_t mtu);
 
 /*******************************************************************************
-**  BTA GATT Server API
-********************************************************************************/
+ *  BTA GATT Server API
+ *******************************************************************************/
 
 /*******************************************************************************
-**
-** Function         BTA_GATTS_Init
-**
-** Description      This function is called to initalize GATTS module
-**
-** Parameters       None
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTS_Init
+ *
+ * Description      This function is called to initalize GATTS module
+ *
+ * Parameters       None
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 extern void BTA_GATTS_Init();
 
 /*******************************************************************************
-**
-** Function         BTA_GATTS_Disable
-**
-** Description      This function is called to disable GATTS module
-**
-** Parameters       None.
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTS_Disable
+ *
+ * Description      This function is called to disable GATTS module
+ *
+ * Parameters       None.
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 extern void BTA_GATTS_Disable(void);
 
 /*******************************************************************************
-**
-** Function         BTA_GATTS_AppRegister
-**
-** Description      This function is called to register application callbacks
-**                    with BTA GATTS module.
-**
-** Parameters       p_app_uuid - applicaiton UUID
-**                  p_cback - pointer to the application callback function.
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTS_AppRegister
+ *
+ * Description      This function is called to register application callbacks
+ *                    with BTA GATTS module.
+ *
+ * Parameters       p_app_uuid - applicaiton UUID
+ *                  p_cback - pointer to the application callback function.
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 extern void BTA_GATTS_AppRegister(tBT_UUID *p_app_uuid, tBTA_GATTS_CBACK *p_cback);
 
 
 /*******************************************************************************
-**
-** Function         BTA_GATTS_AppDeregister
-**
-** Description      De-register with BTA GATT Server.
-**
-** Parameters       server_if: server interface
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTS_AppDeregister
+ *
+ * Description      De-register with BTA GATT Server.
+ *
+ * Parameters       server_if: server interface
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_GATTS_AppDeregister(tBTA_GATTS_IF server_if);
 
 /*******************************************************************************
-**
-** Function         BTA_GATTS_AddService
-**
-** Description      Add the given |service| and all included elements to the
-**                  GATT database. a |BTA_GATTS_ADD_SRVC_EVT| is triggered to
-**                  report the status and attribute handles.
-**
-** Parameters       server_if: server interface.
-**                  service: pointer to vector describing service.
-**
-** Returns          Returns |BTA_GATT_OK| on success or |BTA_GATT_ERROR| if the
-**                  service cannot be added.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTS_AddService
+ *
+ * Description      Add the given |service| and all included elements to the
+ *                  GATT database. a |BTA_GATTS_ADD_SRVC_EVT| is triggered to
+ *                  report the status and attribute handles.
+ *
+ * Parameters       server_if: server interface.
+ *                  service: pointer to vector describing service.
+ *
+ * Returns          Returns |BTA_GATT_OK| on success or |BTA_GATT_ERROR| if the
+ *                  service cannot be added.
+ *
+ ******************************************************************************/
 extern uint16_t BTA_GATTS_AddService(tBTA_GATTS_IF server_if, vector<btgatt_db_element_t> &service);
 
 /*******************************************************************************
-**
-** Function         BTA_GATTS_DeleteService
-**
-** Description      This function is called to delete a service. When this is done,
-**                  a callback event BTA_GATTS_DELETE_EVT is report with the status.
-**
-** Parameters       service_id: service_id to be deleted.
-**
-** Returns          returns none.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTS_DeleteService
+ *
+ * Description      This function is called to delete a service. When this is done,
+ *                  a callback event BTA_GATTS_DELETE_EVT is report with the status.
+ *
+ * Parameters       service_id: service_id to be deleted.
+ *
+ * Returns          returns none.
+ *
+ ******************************************************************************/
 extern void  BTA_GATTS_DeleteService(uint16_t service_id);
 
 /*******************************************************************************
-**
-** Function         BTA_GATTS_StopService
-**
-** Description      This function is called to stop a service.
-**
-** Parameters       service_id - service to be topped.
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTS_StopService
+ *
+ * Description      This function is called to stop a service.
+ *
+ * Parameters       service_id - service to be topped.
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 extern void BTA_GATTS_StopService(uint16_t service_id);
 
 /*******************************************************************************
-**
-** Function         BTA_GATTS_HandleValueIndication
-**
-** Description      This function is called to read a characteristics descriptor.
-**
-** Parameters       conn_id - connection identifier.
-**                  attr_id - attribute ID to indicate.
-**                  value - data to indicate.
-**                  need_confirm - if this indication expects a confirmation or not.
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTS_HandleValueIndication
+ *
+ * Description      This function is called to read a characteristics descriptor.
+ *
+ * Parameters       conn_id - connection identifier.
+ *                  attr_id - attribute ID to indicate.
+ *                  value - data to indicate.
+ *                  need_confirm - if this indication expects a confirmation or not.
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 extern void BTA_GATTS_HandleValueIndication (uint16_t conn_id, uint16_t attr_id,
                                              vector<uint8_t> value,
                                              bool need_confirm);
 
 /*******************************************************************************
-**
-** Function         BTA_GATTS_SendRsp
-**
-** Description      This function is called to send a response to a request.
-**
-** Parameters       conn_id - connection identifier.
-**                  trans_id - transaction ID.
-**                  status - response status
-**                  p_msg - response data.
-**
-** Returns          None
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTS_SendRsp
+ *
+ * Description      This function is called to send a response to a request.
+ *
+ * Parameters       conn_id - connection identifier.
+ *                  trans_id - transaction ID.
+ *                  status - response status
+ *                  p_msg - response data.
+ *
+ * Returns          None
+ *
+ ******************************************************************************/
 extern void BTA_GATTS_SendRsp (uint16_t conn_id, uint32_t trans_id,
                                tBTA_GATT_STATUS status, tBTA_GATTS_RSP *p_msg);
 
 
 /*******************************************************************************
-**
-** Function         BTA_GATTS_Open
-**
-** Description      Open a direct open connection or add a background auto connection
-**                  bd address
-**
-** Parameters       server_if: server interface.
-**                  remote_bda: remote device BD address.
-**                  is_direct: direct connection or background auto connection
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTS_Open
+ *
+ * Description      Open a direct open connection or add a background auto connection
+ *                  bd address
+ *
+ * Parameters       server_if: server interface.
+ *                  remote_bda: remote device BD address.
+ *                  is_direct: direct connection or background auto connection
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_GATTS_Open(tBTA_GATTS_IF server_if, BD_ADDR remote_bda,
                            bool is_direct, tBTA_GATT_TRANSPORT transport);
 
 
 /*******************************************************************************
-**
-** Function         BTA_GATTS_CancelOpen
-**
-** Description      Cancel a direct open connection or remove a background auto connection
-**                  bd address
-**
-** Parameters       server_if: server interface.
-**                  remote_bda: remote device BD address.
-**                  is_direct: direct connection or background auto connection
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTS_CancelOpen
+ *
+ * Description      Cancel a direct open connection or remove a background auto connection
+ *                  bd address
+ *
+ * Parameters       server_if: server interface.
+ *                  remote_bda: remote device BD address.
+ *                  is_direct: direct connection or background auto connection
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_GATTS_CancelOpen(tBTA_GATTS_IF server_if, BD_ADDR remote_bda, bool is_direct);
 
 
 /*******************************************************************************
-**
-** Function         BTA_GATTS_Close
-**
-** Description      Close a connection  a remote device.
-**
-** Parameters       conn_id: connectino ID to be closed.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_GATTS_Close
+ *
+ * Description      Close a connection  a remote device.
+ *
+ * Parameters       conn_id: connectino ID to be closed.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_GATTS_Close(uint16_t conn_id);
 
 #endif /* BTA_GATT_API_H */
diff --git a/system/bta/include/bta_gatts_co.h b/system/bta/include/bta_gatts_co.h
index 284e4ea1cb7..fe90b2f0e25 100644
--- a/system/bta/include/bta_gatts_co.h
+++ b/system/bta/include/bta_gatts_co.h
@@ -31,53 +31,53 @@ extern "C" {
 #endif
 
 /*******************************************************************************
-**
-** Function         bta_gatts_co_update_handle_range
-**
-** Description      This callout function is executed by GATTS when a GATT server
-**                  handle range ios to be added or removed.
-**
-** Parameter        is_add: true is to add a handle range; otherwise is to delete.
-**                  p_hndl_range: handle range.
-**
-** Returns          void.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gatts_co_update_handle_range
+ *
+ * Description      This callout function is executed by GATTS when a GATT server
+ *                  handle range ios to be added or removed.
+ *
+ * Parameter        is_add: true is to add a handle range; otherwise is to delete.
+ *                  p_hndl_range: handle range.
+ *
+ * Returns          void.
+ *
+ ******************************************************************************/
 extern void bta_gatts_co_update_handle_range(bool is_add, tBTA_GATTS_HNDL_RANGE *p_hndl_range);
 
 /*******************************************************************************
-**
-** Function         bta_gatts_co_srv_chg
-**
-** Description      This call-out is to read/write/remove service change related
-**                  informaiton. The request consists of the cmd and p_req and the
-**                  response is returned in p_rsp
-**
-** Parameter        cmd - request command
-**                  p_req - request paramters
-**                  p_rsp - response data for the request
-**
-** Returns          true - if the request is processed successfully and
-**                         the response is returned in p_rsp.
-**                  false - if the request can not be processed
-**
-*******************************************************************************/
+ *
+ * Function         bta_gatts_co_srv_chg
+ *
+ * Description      This call-out is to read/write/remove service change related
+ *                  informaiton. The request consists of the cmd and p_req and the
+ *                  response is returned in p_rsp
+ *
+ * Parameter        cmd - request command
+ *                  p_req - request paramters
+ *                  p_rsp - response data for the request
+ *
+ * Returns          true - if the request is processed successfully and
+ *                         the response is returned in p_rsp.
+ *                  false - if the request can not be processed
+ *
+ ******************************************************************************/
 extern bool bta_gatts_co_srv_chg(tBTA_GATTS_SRV_CHG_CMD cmd,
                                     tBTA_GATTS_SRV_CHG_REQ *p_req,
                                     tBTA_GATTS_SRV_CHG_RSP *p_rsp);
 
 /*******************************************************************************
-**
-** Function         bta_gatts_co_load_handle_range
-**
-** Description      This callout function is executed by GATTS when a GATT server
-**                  handle range is requested to be loaded from NV.
-**
-** Parameter
-**
-** Returns          void.
-**
-*******************************************************************************/
+ *
+ * Function         bta_gatts_co_load_handle_range
+ *
+ * Description      This callout function is executed by GATTS when a GATT server
+ *                  handle range is requested to be loaded from NV.
+ *
+ * Parameter
+ *
+ * Returns          void.
+ *
+ ******************************************************************************/
 extern  bool bta_gatts_co_load_handle_range(uint8_t index,
                                                tBTA_GATTS_HNDL_RANGE *p_handle);
 
diff --git a/system/bta/include/bta_hf_client_api.h b/system/bta/include/bta_hf_client_api.h
index 3ad6ccd13c3..84d8531c8d8 100644
--- a/system/bta/include/bta_hf_client_api.h
+++ b/system/bta/include/bta_hf_client_api.h
@@ -32,8 +32,8 @@ extern "C" {
 #endif
 
 /*****************************************************************************
-**  Constants and data types
-*****************************************************************************/
+ *  Constants and data types
+ ****************************************************************************/
 
 /* HFP peer (AG) features*/
 #define BTA_HF_CLIENT_PEER_FEAT_3WAY   0x00000001  /* Three-way calling */
@@ -243,125 +243,125 @@ typedef uint32_t tBTA_HF_CLIENT_FEAT;
 typedef void (tBTA_HF_CLIENT_CBACK)(tBTA_HF_CLIENT_EVT event, tBTA_HF_CLIENT *p_data);
 
 /*****************************************************************************
-**  External Function Declarations
-*****************************************************************************/
+ *  External Function Declarations
+ ****************************************************************************/
 
 /*******************************************************************************
-**
-** Function         BTA_HfClientEnable
-**
-** Description      Enable the HF CLient service. When the enable
-**                  operation is complete the callback function will be
-**                  called with a BTA_HF_CLIENT_ENABLE_EVT. This function must
-**                  be called before other function in the HF CLient API are
-**                  called.
-**
-** Returns          BTA_SUCCESS if OK, BTA_FAILURE otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HfClientEnable
+ *
+ * Description      Enable the HF CLient service. When the enable
+ *                  operation is complete the callback function will be
+ *                  called with a BTA_HF_CLIENT_ENABLE_EVT. This function must
+ *                  be called before other function in the HF CLient API are
+ *                  called.
+ *
+ * Returns          BTA_SUCCESS if OK, BTA_FAILURE otherwise.
+ *
+ ******************************************************************************/
 tBTA_STATUS BTA_HfClientEnable(tBTA_HF_CLIENT_CBACK *p_cback);
 
 /*******************************************************************************
-**
-** Function         BTA_HfClientDisable
-**
-** Description      Disable the HF Client service
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HfClientDisable
+ *
+ * Description      Disable the HF Client service
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HfClientDisable(void);
 
 /*******************************************************************************
-**
-** Function         BTA_HfClientRegister
-**
-** Description      Register an HF Client service.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HfClientRegister
+ *
+ * Description      Register an HF Client service.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HfClientRegister(tBTA_SEC sec_mask, tBTA_HF_CLIENT_FEAT features,
                           const char *p_service_name);
 
 /*******************************************************************************
-**
-** Function         BTA_HfClientDeregister
-**
-** Description      Deregister an HF Client service.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HfClientDeregister
+ *
+ * Description      Deregister an HF Client service.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HfClientDeregister(uint16_t handle);
 
 /*******************************************************************************
-**
-** Function         BTA_HfClientOpen
-**
-** Description      Opens a connection to an audio gateway.
-**                  When connection is open callback function is called
-**                  with a BTA_HF_CLIENT_OPEN_EVT. Only the data connection is
-**                  opened. The audio connection is not opened.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HfClientOpen
+ *
+ * Description      Opens a connection to an audio gateway.
+ *                  When connection is open callback function is called
+ *                  with a BTA_HF_CLIENT_OPEN_EVT. Only the data connection is
+ *                  opened. The audio connection is not opened.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HfClientOpen(uint16_t handle, BD_ADDR bd_addr, tBTA_SEC sec_mask);
 
 /*******************************************************************************
-**
-** Function         BTA_HfClientClose
-**
-** Description      Close the current connection to an audio gateway.
-**                  Any current audio connection will also be closed
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HfClientClose
+ *
+ * Description      Close the current connection to an audio gateway.
+ *                  Any current audio connection will also be closed
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HfClientClose(uint16_t handle);
 
 /*******************************************************************************
-**
-** Function         BTA_HfCllientAudioOpen
-**
-** Description      Opens an audio connection to the currently connected
-**                 audio gateway
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HfCllientAudioOpen
+ *
+ * Description      Opens an audio connection to the currently connected
+ *                 audio gateway
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HfClientAudioOpen(uint16_t handle);
 
 /*******************************************************************************
-**
-** Function         BTA_HfClientAudioClose
-**
-** Description      Close the currently active audio connection to an audio
-**                  gateway. The data connection remains open
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HfClientAudioClose
+ *
+ * Description      Close the currently active audio connection to an audio
+ *                  gateway. The data connection remains open
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HfClientAudioClose(uint16_t handle);
 
 /*******************************************************************************
-**
-** Function         BTA_HfClientSendAT
-**
-** Description      send AT command
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HfClientSendAT
+ *
+ * Description      send AT command
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_HfClientSendAT(uint16_t handle, tBTA_HF_CLIENT_AT_CMD_TYPE at, uint32_t val1, uint32_t val2, const char *str);
 
 #ifdef __cplusplus
diff --git a/system/bta/include/bta_hh_api.h b/system/bta/include/bta_hh_api.h
index c1f9d79ea33..6406debf8d8 100644
--- a/system/bta/include/bta_hh_api.h
+++ b/system/bta/include/bta_hh_api.h
@@ -30,8 +30,8 @@ extern "C" {
 #endif
 
 /*****************************************************************************
-**  Constants and Type Definitions
-*****************************************************************************/
+ *  Constants and Type Definitions
+ ****************************************************************************/
 #ifndef BTA_HH_DEBUG
 #define BTA_HH_DEBUG    true
 #endif
@@ -317,219 +317,219 @@ typedef void (tBTA_HH_CBACK) (tBTA_HH_EVT event, tBTA_HH *p_data);
 
 
 /*****************************************************************************
-**  External Function Declarations
-*****************************************************************************/
+ *  External Function Declarations
+ ****************************************************************************/
 
 /*******************************************************************************
-**
-** Function         BTA_HhRegister
-**
-** Description      This function enable HID host and registers HID-Host with
-**                  lower layers.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HhRegister
+ *
+ * Description      This function enable HID host and registers HID-Host with
+ *                  lower layers.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_HhEnable(tBTA_SEC sec_mask, tBTA_HH_CBACK *p_cback);
 
 /*******************************************************************************
-**
-** Function         BTA_HhDeregister
-**
-** Description      This function is called when the host is about power down.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HhDeregister
+ *
+ * Description      This function is called when the host is about power down.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_HhDisable(void);
 
 /*******************************************************************************
-**
-** Function         BTA_HhOpen
-**
-** Description      This function is called to start an inquiry and read SDP
-**                  record of responding devices; connect to a device if only
-**                  one active HID device is found.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HhOpen
+ *
+ * Description      This function is called to start an inquiry and read SDP
+ *                  record of responding devices; connect to a device if only
+ *                  one active HID device is found.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_HhOpen (BD_ADDR dev_bda, tBTA_HH_PROTO_MODE mode,
                         tBTA_SEC sec_mask);
 
 /*******************************************************************************
-**
-** Function         BTA_HhClose
-**
-** Description      This function disconnects the device.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HhClose
+ *
+ * Description      This function disconnects the device.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_HhClose(uint8_t dev_handle);
 
 /*******************************************************************************
-**
-** Function         BTA_HhSetProtoMode
-**
-** Description      This function set the protocol mode at specified HID handle
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HhSetProtoMode
+ *
+ * Description      This function set the protocol mode at specified HID handle
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_HhSetProtoMode(uint8_t handle, tBTA_HH_PROTO_MODE t_type);
 
 /*******************************************************************************
-**
-** Function         BTA_HhGetProtoMode
-**
-** Description      This function get the protocol mode of a specified HID device.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HhGetProtoMode
+ *
+ * Description      This function get the protocol mode of a specified HID device.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_HhGetProtoMode(uint8_t dev_handle);
 /*******************************************************************************
-**
-** Function         BTA_HhSetReport
-**
-** Description      send SET_REPORT to device.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HhSetReport
+ *
+ * Description      send SET_REPORT to device.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_HhSetReport(uint8_t dev_handle, tBTA_HH_RPT_TYPE r_type,
                             BT_HDR *p_data);
 
 /*******************************************************************************
-**
-** Function         BTA_HhGetReport
-**
-** Description      Send a GET_REPORT to HID device.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HhGetReport
+ *
+ * Description      Send a GET_REPORT to HID device.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_HhGetReport(uint8_t dev_handle, tBTA_HH_RPT_TYPE r_type,
                             uint8_t rpt_id, uint16_t buf_size);
 /*******************************************************************************
-**
-** Function         BTA_HhSetIdle
-**
-** Description      send SET_IDLE to device.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HhSetIdle
+ *
+ * Description      send SET_IDLE to device.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_HhSetIdle(uint8_t dev_handle, uint16_t idle_rate);
 
 /*******************************************************************************
-**
-** Function         BTA_HhGetIdle
-**
-** Description      Send a GET_IDLE to HID device.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HhGetIdle
+ *
+ * Description      Send a GET_IDLE to HID device.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_HhGetIdle(uint8_t dev_handle);
 
 /*******************************************************************************
-**
-** Function         BTA_HhSendCtrl
-**
-** Description      Send HID_CONTROL request to a HID device.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HhSendCtrl
+ *
+ * Description      Send HID_CONTROL request to a HID device.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_HhSendCtrl(uint8_t dev_handle,
                            tBTA_HH_TRANS_CTRL_TYPE c_type);
 
 /*******************************************************************************
-**
-** Function         BTA_HhSetIdle
-**
-** Description      send SET_IDLE to device.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HhSetIdle
+ *
+ * Description      send SET_IDLE to device.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_HhSetIdle(uint8_t dev_handle, uint16_t idle_rate);
 
 
 /*******************************************************************************
-**
-** Function         BTA_HhGetIdle
-**
-** Description      Send a GET_IDLE from HID device.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HhGetIdle
+ *
+ * Description      Send a GET_IDLE from HID device.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_HhGetIdle(uint8_t dev_handle);
 
 /*******************************************************************************
-**
-** Function         BTA_HhSendData
-**
-** Description      Send DATA transaction to a HID device.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HhSendData
+ *
+ * Description      Send DATA transaction to a HID device.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_HhSendData(uint8_t dev_handle, BD_ADDR dev_bda, BT_HDR  *p_buf);
 
 /*******************************************************************************
-**
-** Function         BTA_HhGetDscpInfo
-**
-** Description      Get report descriptor of the device
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HhGetDscpInfo
+ *
+ * Description      Get report descriptor of the device
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_HhGetDscpInfo(uint8_t dev_handle);
 
 /*******************************************************************************
-** Function         BTA_HhAddDev
-**
-** Description      Add a virtually cabled device into HID-Host device list
-**                  to manage and assign a device handle for future API call,
-**                  host applciation call this API at start-up to initialize its
-**                  virtually cabled devices.
-**
-** Returns          void
-**
-*******************************************************************************/
+ * Function         BTA_HhAddDev
+ *
+ * Description      Add a virtually cabled device into HID-Host device list
+ *                  to manage and assign a device handle for future API call,
+ *                  host applciation call this API at start-up to initialize its
+ *                  virtually cabled devices.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_HhAddDev(BD_ADDR bda, tBTA_HH_ATTR_MASK attr_mask,
                          uint8_t sub_class, uint8_t app_id,
                          tBTA_HH_DEV_DSCP_INFO dscp_info);
 /*******************************************************************************
-**
-** Function         BTA_HhRemoveDev
-**
-** Description      Remove a device from the HID host devices list.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HhRemoveDev
+ *
+ * Description      Remove a device from the HID host devices list.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_HhRemoveDev(uint8_t dev_handle );
 
 /*******************************************************************************
-**
-**              Parsing Utility Functions
-**
-*******************************************************************************/
+ *
+ *              Parsing Utility Functions
+ *
+ ******************************************************************************/
 /*******************************************************************************
-**
-** Function         BTA_HhParseBootRpt
-**
-** Description      This utility function parse a boot mode report.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HhParseBootRpt
+ *
+ * Description      This utility function parse a boot mode report.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_HhParseBootRpt(tBTA_HH_BOOT_RPT *p_data, uint8_t *p_report,
                                uint16_t report_len);
 
diff --git a/system/bta/include/bta_hh_co.h b/system/bta/include/bta_hh_co.h
index df0c04c2b17..435aa283aee 100644
--- a/system/bta/include/bta_hh_co.h
+++ b/system/bta/include/bta_hh_co.h
@@ -40,97 +40,97 @@ typedef struct
 }tBTA_HH_RPT_CACHE_ENTRY;
 
 /*******************************************************************************
-**
-** Function         bta_hh_co_data
-**
-** Description      This callout function is executed by HH when data is received
-**                  in interupt channel.
-**
-**
-** Returns          void.
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_co_data
+ *
+ * Description      This callout function is executed by HH when data is received
+ *                  in interupt channel.
+ *
+ *
+ * Returns          void.
+ *
+ ******************************************************************************/
 extern void bta_hh_co_data(uint8_t dev_handle, uint8_t *p_rpt, uint16_t len,
                            tBTA_HH_PROTO_MODE  mode, uint8_t sub_class,
                            uint8_t ctry_code, BD_ADDR peer_addr, uint8_t app_id);
 
 /*******************************************************************************
-**
-** Function         bta_hh_co_open
-**
-** Description      This callout function is executed by HH when connection is
-**                  opened, and application may do some device specific
-**                  initialization.
-**
-** Returns          void.
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_co_open
+ *
+ * Description      This callout function is executed by HH when connection is
+ *                  opened, and application may do some device specific
+ *                  initialization.
+ *
+ * Returns          void.
+ *
+ ******************************************************************************/
 extern void bta_hh_co_open(uint8_t dev_handle, uint8_t sub_class,
                            uint16_t attr_mask, uint8_t app_id);
 
 /*******************************************************************************
-**
-** Function         bta_hh_co_close
-**
-** Description      This callout function is executed by HH when connection is
-**                  closed, and device specific finalizatio nmay be needed.
-**
-** Returns          void.
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_co_close
+ *
+ * Description      This callout function is executed by HH when connection is
+ *                  closed, and device specific finalizatio nmay be needed.
+ *
+ * Returns          void.
+ *
+ ******************************************************************************/
 extern void bta_hh_co_close(uint8_t dev_handle, uint8_t app_id);
 
 #if (BLE_INCLUDED == TRUE && BTA_HH_LE_INCLUDED == TRUE)
 /*******************************************************************************
-**
-** Function         bta_hh_le_co_rpt_info
-**
-** Description      This callout function is to convey the report information on
-**                  a HOGP device to the application. Application can save this
-**                  information in NV if device is bonded and load it back when
-**                  stack reboot.
-**
-** Parameters       remote_bda  - remote device address
-**                  p_entry     - report entry pointer
-**                  app_id      - application id
-**
-** Returns          void.
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_le_co_rpt_info
+ *
+ * Description      This callout function is to convey the report information on
+ *                  a HOGP device to the application. Application can save this
+ *                  information in NV if device is bonded and load it back when
+ *                  stack reboot.
+ *
+ * Parameters       remote_bda  - remote device address
+ *                  p_entry     - report entry pointer
+ *                  app_id      - application id
+ *
+ * Returns          void.
+ *
+ ******************************************************************************/
 extern void bta_hh_le_co_rpt_info(BD_ADDR remote_bda,
                                           tBTA_HH_RPT_CACHE_ENTRY *p_entry,
                                           uint8_t app_id);
 
 /*******************************************************************************
-**
-** Function         bta_hh_le_co_cache_load
-**
-** Description      This callout function is to request the application to load the
-**                  cached HOGP report if there is any. When cache reading is completed,
-**                  bta_hh_le_ci_cache_load() is called by the application.
-**
-** Parameters       remote_bda  - remote device address
-**                  p_num_rpt: number of cached report
-**                  app_id      - application id
-**
-** Returns          the acched report array
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_le_co_cache_load
+ *
+ * Description      This callout function is to request the application to load the
+ *                  cached HOGP report if there is any. When cache reading is completed,
+ *                  bta_hh_le_ci_cache_load() is called by the application.
+ *
+ * Parameters       remote_bda  - remote device address
+ *                  p_num_rpt: number of cached report
+ *                  app_id      - application id
+ *
+ * Returns          the acched report array
+ *
+ ******************************************************************************/
 extern tBTA_HH_RPT_CACHE_ENTRY *bta_hh_le_co_cache_load (BD_ADDR remote_bda,
                                                                  uint8_t *p_num_rpt,
                                                                  uint8_t app_id);
 
 /*******************************************************************************
-**
-** Function         bta_hh_le_co_reset_rpt_cache
-**
-** Description      This callout function is to reset the HOGP device cache.
-**
-** Parameters       remote_bda  - remote device address
-**
-** Returns          none
-**
-*******************************************************************************/
+ *
+ * Function         bta_hh_le_co_reset_rpt_cache
+ *
+ * Description      This callout function is to reset the HOGP device cache.
+ *
+ * Parameters       remote_bda  - remote device address
+ *
+ * Returns          none
+ *
+ ******************************************************************************/
 extern void bta_hh_le_co_reset_rpt_cache (BD_ADDR remote_bda, uint8_t app_id);
 
 #endif /* #if (BLE_INCLUDED == true && BTA_HH_LE_INCLUDED == TRUE) */
diff --git a/system/bta/include/bta_hl_api.h b/system/bta/include/bta_hl_api.h
index 635718fad01..30334217861 100644
--- a/system/bta/include/bta_hl_api.h
+++ b/system/bta/include/bta_hl_api.h
@@ -35,8 +35,8 @@ extern "C" {
 #endif
 
 /*****************************************************************************
-**  Constants and data types
-*****************************************************************************/
+ *  Constants and data types
+ ****************************************************************************/
 /* Extra Debug Code */
 #ifndef BTA_HL_DEBUG
 #define BTA_HL_DEBUG           true
@@ -628,261 +628,261 @@ typedef void tBTA_HL_CBACK(tBTA_HL_EVT event, tBTA_HL *p_data);
 
 
 /*****************************************************************************
-**  External Function Declarations
-*****************************************************************************/
+ *  External Function Declarations
+ ****************************************************************************/
 
 /**************************
-**  API Functions
-***************************/
+ *  API Functions
+ **************************/
 
 /*******************************************************************************
-**
-** Function         BTA_HlEnable
-**
-** Description      Enable the HL subsystems.  This function must be
-**                  called before any other functions in the HL API are called.
-**                  When the enable operation is completed the callback function
-**                  will be called with an BTA_HL_CTRL_ENABLE_CFM_EVT event.
-**
-** Parameters       p_cback - HL event call back function
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HlEnable
+ *
+ * Description      Enable the HL subsystems.  This function must be
+ *                  called before any other functions in the HL API are called.
+ *                  When the enable operation is completed the callback function
+ *                  will be called with an BTA_HL_CTRL_ENABLE_CFM_EVT event.
+ *
+ * Parameters       p_cback - HL event call back function
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_HlEnable(tBTA_HL_CTRL_CBACK *p_ctrl_cback);
 /*******************************************************************************
-**
-** Function         BTA_HlDisable
-**
-** Description     Disable the HL subsystem.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HlDisable
+ *
+ * Description     Disable the HL subsystem.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_HlDisable(void);
 
 /*******************************************************************************
-**
-** Function         BTA_HlUpdate
-**
-** Description      Register an HDP application
-**
-** Parameters       app_id        - Application ID
-**                  p_reg_param   - non-platform related parameters for the
-**                                  HDP application
-**                  p_cback       - HL event callback fucntion
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HlUpdate
+ *
+ * Description      Register an HDP application
+ *
+ * Parameters       app_id        - Application ID
+ *                  p_reg_param   - non-platform related parameters for the
+ *                                  HDP application
+ *                  p_cback       - HL event callback fucntion
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_HlUpdate(uint8_t  app_id,
                          tBTA_HL_REG_PARAM *p_reg_param, bool is_register,
                          tBTA_HL_CBACK *p_cback);
 
 /*******************************************************************************
-**
-** Function         BTA_HlRegister
-**
-** Description      Register a HDP application
-**
-**
-** Parameters       app_id        - hdp application ID
-**                  p_reg_param   - non-platform related parameters for the
-**                                  HDP application
-**                  p_cback       - HL event callback fucntion
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HlRegister
+ *
+ * Description      Register a HDP application
+ *
+ *
+ * Parameters       app_id        - hdp application ID
+ *                  p_reg_param   - non-platform related parameters for the
+ *                                  HDP application
+ *                  p_cback       - HL event callback fucntion
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_HlRegister(uint8_t  app_id,
                            tBTA_HL_REG_PARAM *p_reg_param,
                            tBTA_HL_CBACK *p_cback);
 
 /*******************************************************************************
-**
-** Function         BTA_HlDeregister
-**
-** Description      Deregister an HDP application
-**
-** Parameters       app_handle - Application handle
-**
-** Returns         void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HlDeregister
+ *
+ * Description      Deregister an HDP application
+ *
+ * Parameters       app_handle - Application handle
+ *
+ * Returns         void
+ *
+ ******************************************************************************/
 extern void BTA_HlDeregister(uint8_t app_id,tBTA_HL_APP_HANDLE app_handle);
 
 /*******************************************************************************
-**
-** Function         BTA_HlCchOpen
-**
-** Description      Open a Control channel connection with the specified BD address
-**                  and the control PSM value is used to select which
-**                  HDP insatnce should be used in case the peer device support
-**                  multiple HDP instances.
-**
-**
-** Parameters       app_handle - Application Handle
-**                  p_open_param - parameters for opening a control channel
-**
-** Returns          void
-**
-**                  Note: If the control PSM value is zero then the first HDP
-**                        instance is used for the control channel setup
-*******************************************************************************/
+ *
+ * Function         BTA_HlCchOpen
+ *
+ * Description      Open a Control channel connection with the specified BD address
+ *                  and the control PSM value is used to select which
+ *                  HDP insatnce should be used in case the peer device support
+ *                  multiple HDP instances.
+ *
+ *
+ * Parameters       app_handle - Application Handle
+ *                  p_open_param - parameters for opening a control channel
+ *
+ * Returns          void
+ *
+ *                  Note: If the control PSM value is zero then the first HDP
+ *                        instance is used for the control channel setup
+ ******************************************************************************/
 extern void BTA_HlCchOpen(uint8_t app_id, tBTA_HL_APP_HANDLE app_handle,
                           tBTA_HL_CCH_OPEN_PARAM *p_open_param);
 
 /*******************************************************************************
-**
-** Function         BTA_HlCchClose
-**
-** Description      Close a Control channel connection with the specified MCL
-**                  handle
-**
-** Parameters       mcl_handle - MCL handle
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HlCchClose
+ *
+ * Description      Close a Control channel connection with the specified MCL
+ *                  handle
+ *
+ * Parameters       mcl_handle - MCL handle
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern  void BTA_HlCchClose(tBTA_HL_MCL_HANDLE mcl_handle);
 
 /*******************************************************************************
-**
-** Function         BTA_HlDchOpen
-**
-** Description      Open a data channel connection with the specified DCH parameters
-**
-** Parameters       mcl_handle - MCL handle
-**                  p_open_param - parameters for opening a data channel
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HlDchOpen
+ *
+ * Description      Open a data channel connection with the specified DCH parameters
+ *
+ * Parameters       mcl_handle - MCL handle
+ *                  p_open_param - parameters for opening a data channel
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern  void BTA_HlDchOpen(tBTA_HL_MCL_HANDLE mcl_handle,
                            tBTA_HL_DCH_OPEN_PARAM *p_open_param);
 /*******************************************************************************
-**
-** Function         BTA_HlDchReconnect
-**
-** Description      Reconnect a data channel with the specified MDL_ID
-**
-** Parameters       mcl_handle      - MCL handle
+ *
+ * Function         BTA_HlDchReconnect
+ *
+ * Description      Reconnect a data channel with the specified MDL_ID
+ *
+ * Parameters       mcl_handle      - MCL handle
 *8                  p_recon_param   - parameters for reconnecting a data channel
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_HlDchReconnect(tBTA_HL_MCL_HANDLE mcl_handle,
                                tBTA_HL_DCH_RECONNECT_PARAM *p_recon_param);
 /*******************************************************************************
-**
-** Function         BTA_HlDchClose
-**
-** Description      Close a data channel with the specified MDL handle
-**
-** Parameters       mdl_handle  - MDL handle
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HlDchClose
+ *
+ * Description      Close a data channel with the specified MDL handle
+ *
+ * Parameters       mdl_handle  - MDL handle
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_HlDchClose(tBTA_HL_MDL_HANDLE mdl_handle);
 
 /*******************************************************************************
-**
-** Function         BTA_HlDchAbort
-**
-** Description      Abort the current data channel setup with the specified MCL
-**                  handle
-**
-** Parameters       mcl_handle  - MCL handle
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HlDchAbort
+ *
+ * Description      Abort the current data channel setup with the specified MCL
+ *                  handle
+ *
+ * Parameters       mcl_handle  - MCL handle
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_HlDchAbort(tBTA_HL_MCL_HANDLE mcl_handle);
 
 /*******************************************************************************
-**
-** Function         BTA_HlSendData
-**
-** Description      Send an APDU to the peer device
-**
-** Parameters       mdl_handle  - MDL handle
-**                  pkt_size    - size of the data packet to be sent
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HlSendData
+ *
+ * Description      Send an APDU to the peer device
+ *
+ * Parameters       mdl_handle  - MDL handle
+ *                  pkt_size    - size of the data packet to be sent
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_HlSendData(tBTA_HL_MDL_HANDLE mdl_handle,
                            uint16_t           pkt_size);
 
 /*******************************************************************************
-**
-** Function         BTA_HlDeleteMdl
-**
-** Description      Delete the specified MDL_ID within the specified MCL handle
-**
-** Parameters       mcl_handle  - MCL handle
-**                  mdl_id      - MDL ID
-**
-** Returns          void
-**
-**                  note: If mdl_id = 0xFFFF then this means to delete all MDLs
-**                        and this value can only be used with DeleteMdl request only
-**                        not other requests
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HlDeleteMdl
+ *
+ * Description      Delete the specified MDL_ID within the specified MCL handle
+ *
+ * Parameters       mcl_handle  - MCL handle
+ *                  mdl_id      - MDL ID
+ *
+ * Returns          void
+ *
+ *                  note: If mdl_id = 0xFFFF then this means to delete all MDLs
+ *                        and this value can only be used with DeleteMdl request only
+ *                        not other requests
+ *
+ ******************************************************************************/
 extern void BTA_HlDeleteMdl(tBTA_HL_MCL_HANDLE mcl_handle,
                             tBTA_HL_MDL_ID mdl_id );
 
 /*******************************************************************************
-**
-** Function         BTA_HlDchEchoTest
-**
-** Description      Initiate an echo test with the specified MCL handle
-**
-** Parameters       mcl_handle           - MCL handle
+ *
+ * Function         BTA_HlDchEchoTest
+ *
+ * Description      Initiate an echo test with the specified MCL handle
+ *
+ * Parameters       mcl_handle           - MCL handle
 *8                  p_echo_test_param   -  parameters for echo testing
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_HlDchEchoTest( tBTA_HL_MCL_HANDLE  mcl_handle,
                                tBTA_HL_DCH_ECHO_TEST_PARAM *p_echo_test_param);
 
 /*******************************************************************************
-**
-** Function         BTA_HlSdpQuery
-**
-** Description      SDP query request for the specified BD address
-**
-** Parameters       app_id
+ *
+ * Function         BTA_HlSdpQuery
+ *
+ * Description      SDP query request for the specified BD address
+ *
+ * Parameters       app_id
                         app_handle      - application handle
-**                  bd_addr         - BD address
-**
-** Returns          void
-**
-*******************************************************************************/
+ *                  bd_addr         - BD address
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern  void BTA_HlSdpQuery(uint8_t  app_id,tBTA_HL_APP_HANDLE app_handle,
                             BD_ADDR bd_addr);
 
 /*******************************************************************************
-**
-** Function         BTA_HlDchCreateMdlRsp
-**
-** Description      Set the Response and configuration values for the Create MDL
-**                  request
-**
-** Parameters       mcl_handle  - MCL handle
-**                  p_rsp_param - parameters specified whether the request should
-**                                be accepted or not and if it should be accepted
-**                                then it also specified the configuration response
-**                                value
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_HlDchCreateMdlRsp
+ *
+ * Description      Set the Response and configuration values for the Create MDL
+ *                  request
+ *
+ * Parameters       mcl_handle  - MCL handle
+ *                  p_rsp_param - parameters specified whether the request should
+ *                                be accepted or not and if it should be accepted
+ *                                then it also specified the configuration response
+ *                                value
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_HlDchCreateRsp(tBTA_HL_MCL_HANDLE mcl_handle,
                                tBTA_HL_DCH_CREATE_RSP_PARAM *p_rsp_param);
 
diff --git a/system/bta/include/bta_hl_ci.h b/system/bta/include/bta_hl_ci.h
index 09cde5615b1..fd4116e9ee6 100644
--- a/system/bta/include/bta_hl_ci.h
+++ b/system/bta/include/bta_hl_ci.h
@@ -33,52 +33,52 @@ extern "C" {
 #endif
 
 /*****************************************************************************
-**  Constants and Data Types
-*****************************************************************************/
+ *  Constants and Data Types
+ ****************************************************************************/
 /**************************
-**  Common Definitions
-***************************/
+ *  Common Definitions
+ **************************/
 /* Read Ready Event */
 /*****************************************************************************
-**  Function Declarations
-*****************************************************************************/
+ *  Function Declarations
+ ****************************************************************************/
 /**************************
-**  Common Functions
-***************************/
+ *  Common Functions
+ **************************/
 /*******************************************************************************
-**
-** Function         bta_hl_ci_get_tx_data
-**
-** Description      This function is called in response to the
-**                  bta_hl_co_get_tx_data call-out function.
-**
-** Parameters       mdl_handle -MDL handle
-**                  status - BTA_MA_STATUS_OK if operation is successful
-**                           BTA_MA_STATUS_FAIL if any errors have occurred.
-**                  evt    - evt from the call-out function
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_ci_get_tx_data
+ *
+ * Description      This function is called in response to the
+ *                  bta_hl_co_get_tx_data call-out function.
+ *
+ * Parameters       mdl_handle -MDL handle
+ *                  status - BTA_MA_STATUS_OK if operation is successful
+ *                           BTA_MA_STATUS_FAIL if any errors have occurred.
+ *                  evt    - evt from the call-out function
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern  void bta_hl_ci_get_tx_data(  tBTA_HL_MDL_HANDLE mdl_handle,
                                      tBTA_HL_STATUS status,
                                      uint16_t evt );
 
 /*******************************************************************************
-**
-** Function         bta_hl_ci_put_rx_data
-**
-** Description      This function is called in response to the
-**                  bta_hl_co_put_rx_data call-out function.
-**
-** Parameters       mdl_handle -MDL handle
-**                  status - BTA_MA_STATUS_OK if operation is successful
-**                           BTA_MA_STATUS_FAIL if any errors have occurred.
-**                  evt    - evt from the call-out function
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_ci_put_rx_data
+ *
+ * Description      This function is called in response to the
+ *                  bta_hl_co_put_rx_data call-out function.
+ *
+ * Parameters       mdl_handle -MDL handle
+ *                  status - BTA_MA_STATUS_OK if operation is successful
+ *                           BTA_MA_STATUS_FAIL if any errors have occurred.
+ *                  evt    - evt from the call-out function
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern  void bta_hl_ci_put_rx_data(  tBTA_HL_MDL_HANDLE mdl_handle,
                                      tBTA_HL_STATUS status,
                                      uint16_t evt );
@@ -86,40 +86,40 @@ extern  void bta_hl_ci_put_rx_data(  tBTA_HL_MDL_HANDLE mdl_handle,
 
 
 /*******************************************************************************
-**
-** Function         bta_hl_ci_get_echo_data
-**
-** Description      This function is called in response to the
-**                  bta_hl_co_get_echo_data call-out function.
-**
-** Parameters       mcl_handle -MCL handle
-**                  status - BTA_MA_STATUS_OK if operation is successful
-**                           BTA_MA_STATUS_FAIL if any errors have occurred.
-**                  evt    - evt from the call-out function
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_ci_get_echo_data
+ *
+ * Description      This function is called in response to the
+ *                  bta_hl_co_get_echo_data call-out function.
+ *
+ * Parameters       mcl_handle -MCL handle
+ *                  status - BTA_MA_STATUS_OK if operation is successful
+ *                           BTA_MA_STATUS_FAIL if any errors have occurred.
+ *                  evt    - evt from the call-out function
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern  void bta_hl_ci_get_echo_data(  tBTA_HL_MCL_HANDLE mcl_handle,
                                        tBTA_HL_STATUS status,
                                        uint16_t evt );
 
 
 /*******************************************************************************
-**
-** Function         bta_hl_ci_put_echo_data
-**
-** Description      This function is called in response to the
-**                  bta_hl_co_put_echo_data call-out function.
-**
-** Parameters       mcl_handle -MCL handle
-**                  status - BTA_MA_STATUS_OK if operation is successful
-**                           BTA_MA_STATUS_FAIL if any errors have occurred.
-**                  evt    - evt from the call-out function
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_ci_put_echo_data
+ *
+ * Description      This function is called in response to the
+ *                  bta_hl_co_put_echo_data call-out function.
+ *
+ * Parameters       mcl_handle -MCL handle
+ *                  status - BTA_MA_STATUS_OK if operation is successful
+ *                           BTA_MA_STATUS_FAIL if any errors have occurred.
+ *                  evt    - evt from the call-out function
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void bta_hl_ci_put_echo_data(  tBTA_HL_MCL_HANDLE mcl_handle,
                                       tBTA_HL_STATUS status,
                                       uint16_t evt );
diff --git a/system/bta/include/bta_hl_co.h b/system/bta/include/bta_hl_co.h
index 8e6847f1bdd..92759072f92 100644
--- a/system/bta/include/bta_hl_co.h
+++ b/system/bta/include/bta_hl_co.h
@@ -33,59 +33,59 @@ extern "C" {
 #endif
 
 /*****************************************************************************
-**  Constants and Data Types
-*****************************************************************************/
+ *  Constants and Data Types
+ ****************************************************************************/
 /**************************
-**  Common Definitions
-***************************/
+ *  Common Definitions
+ **************************/
 
 
 /*******************************************************************************
-**
-** Function        bta_hl_co_get_num_of_mdep
-**
-** Description     This function is called to get the number of MDEPs for this
-**                 application ID
-**
-** Parameters      app_id - application ID
-**                 p_num_of_mdep (output) - number of MDEP configurations supported
-**                                          by the application
-**
-** Returns         Bloolean - true success
-**
-*******************************************************************************/
+ *
+ * Function        bta_hl_co_get_num_of_mdep
+ *
+ * Description     This function is called to get the number of MDEPs for this
+ *                 application ID
+ *
+ * Parameters      app_id - application ID
+ *                 p_num_of_mdep (output) - number of MDEP configurations supported
+ *                                          by the application
+ *
+ * Returns         Bloolean - true success
+ *
+ ******************************************************************************/
 extern bool bta_hl_co_get_num_of_mdep(uint8_t app_id, uint8_t *p_num_of_mdep);
 /*******************************************************************************
-**
-** Function        bta_hl_co_advrtise_source_sdp
-**
-** Description     This function is called to find out whether the SOURCE MDEP
-**                 configuration information should be advertize in the SDP or nopt
-**
-** Parameters      app_id - application ID
-**
-** Returns         Bloolean - true advertise the SOURCE MDEP configuration
-**                            information
-**
-*******************************************************************************/
+ *
+ * Function        bta_hl_co_advrtise_source_sdp
+ *
+ * Description     This function is called to find out whether the SOURCE MDEP
+ *                 configuration information should be advertize in the SDP or nopt
+ *
+ * Parameters      app_id - application ID
+ *
+ * Returns         Bloolean - true advertise the SOURCE MDEP configuration
+ *                            information
+ *
+ ******************************************************************************/
 extern bool bta_hl_co_advrtise_source_sdp(uint8_t app_id);
 /*******************************************************************************
-**
-** Function        bta_hl_co_get_mdep_config
-**
-** Description     This function is called to get the supported feature
-**                 configuration for the specified mdep index and it also assigns
-**                 the MDEP ID for the specified mdep index
-**
-** Parameters      app_id - HDP application ID
-**                 mdep_idx - the mdep index
-**                  mdep_counter - mdep_counter
-**                 mdep_id  - the assigned MDEP ID for the specified medp_idx
-**                 p_mdl_cfg (output) - pointer to the MDEP configuration
-**
-**
-** Returns         Bloolean - true success
-*******************************************************************************/
+ *
+ * Function        bta_hl_co_get_mdep_config
+ *
+ * Description     This function is called to get the supported feature
+ *                 configuration for the specified mdep index and it also assigns
+ *                 the MDEP ID for the specified mdep index
+ *
+ * Parameters      app_id - HDP application ID
+ *                 mdep_idx - the mdep index
+ *                  mdep_counter - mdep_counter
+ *                 mdep_id  - the assigned MDEP ID for the specified medp_idx
+ *                 p_mdl_cfg (output) - pointer to the MDEP configuration
+ *
+ *
+ * Returns         Bloolean - true success
+ ******************************************************************************/
 extern bool bta_hl_co_get_mdep_config(uint8_t app_id,
                                          uint8_t mdep_idx,
                                          uint8_t mdep_counter,
@@ -94,144 +94,144 @@ extern bool bta_hl_co_get_mdep_config(uint8_t app_id,
 
 
 /*******************************************************************************
-**
-** Function        bta_hl_co_get_echo_config
-**
-** Description     This function is called to get the echo test
-**                 maximum APDU size configuration
-**
-** Parameters      app_id - HDP application ID
-**                 p_echo_cfg (output) - pointer to the Echo test maximum APDU size
-**                                       configuration
-**
-** Returns         Bloolean - true success
-*******************************************************************************/
+ *
+ * Function        bta_hl_co_get_echo_config
+ *
+ * Description     This function is called to get the echo test
+ *                 maximum APDU size configuration
+ *
+ * Parameters      app_id - HDP application ID
+ *                 p_echo_cfg (output) - pointer to the Echo test maximum APDU size
+ *                                       configuration
+ *
+ * Returns         Bloolean - true success
+ ******************************************************************************/
 extern bool bta_hl_co_get_echo_config(uint8_t  app_id,
                                          tBTA_HL_ECHO_CFG *p_echo_cfg);
 
 
 /*******************************************************************************
-**
-** Function        bta_hl_co_save_mdl
-**
-** Description     This function is called to save a MDL configuration item in persistent
-**                 storage
-**
-** Parameters      app_id - HDP application ID
-**                 item_idx - the MDL configuration storage index
-**                 p_mdl_cfg - pointer to the MDL configuration data
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function        bta_hl_co_save_mdl
+ *
+ * Description     This function is called to save a MDL configuration item in persistent
+ *                 storage
+ *
+ * Parameters      app_id - HDP application ID
+ *                 item_idx - the MDL configuration storage index
+ *                 p_mdl_cfg - pointer to the MDL configuration data
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void bta_hl_co_save_mdl(uint8_t app_id, uint8_t item_idx, tBTA_HL_MDL_CFG *p_mdl_cfg );
 /*******************************************************************************
-**
-** Function        bta_hl_co_delete_mdl
-**
-** Description     This function is called to delete a MDL configuration item in persistent
-**                 storage
-**
-** Parameters      app_id - HDP application ID
-**                 item_idx - the MDL configuration storage index
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function        bta_hl_co_delete_mdl
+ *
+ * Description     This function is called to delete a MDL configuration item in persistent
+ *                 storage
+ *
+ * Parameters      app_id - HDP application ID
+ *                 item_idx - the MDL configuration storage index
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void bta_hl_co_delete_mdl(uint8_t app_id, uint8_t item_idx);
 /*******************************************************************************
-**
-** Function         bta_hl_co_get_mdl_config
-**
-** Description     This function is called to get the MDL configuration
-**                 from teh persistent memory. This function shall only be called
+ *
+ * Function         bta_hl_co_get_mdl_config
+ *
+ * Description     This function is called to get the MDL configuration
+ *                 from teh persistent memory. This function shall only be called
 *8                 once after the device is powered up
-**
-** Parameters      app_id - HDP application ID
-**                 buffer_size - the unit of the buffer size is sizeof(tBTA_HL_MDL_CFG)
-**                 p_mdl_buf - Point to the starting location of the buffer
-**
-** Returns         bool
-**
-**
-*******************************************************************************/
+ *
+ * Parameters      app_id - HDP application ID
+ *                 buffer_size - the unit of the buffer size is sizeof(tBTA_HL_MDL_CFG)
+ *                 p_mdl_buf - Point to the starting location of the buffer
+ *
+ * Returns         bool
+ *
+ *
+ ******************************************************************************/
 extern bool bta_hl_co_load_mdl_config (uint8_t app_id, uint8_t buffer_size,
                                           tBTA_HL_MDL_CFG *p_mdl_buf );
 
 
 /*******************************************************************************
-**
-** Function         bta_hl_co_get_tx_data
-**
-** Description     Get the data to be sent
-**
-** Parameters      app_id - HDP application ID
-**                 mdl_handle - MDL handle
-**                 buf_size - the size of the buffer
-**                 p_buf - the buffer pointer
-**                 evt - the evt to be passed back to the HL in the
-**                       bta_hl_ci_get_tx_data call-in function
-**
-** Returns        Void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_co_get_tx_data
+ *
+ * Description     Get the data to be sent
+ *
+ * Parameters      app_id - HDP application ID
+ *                 mdl_handle - MDL handle
+ *                 buf_size - the size of the buffer
+ *                 p_buf - the buffer pointer
+ *                 evt - the evt to be passed back to the HL in the
+ *                       bta_hl_ci_get_tx_data call-in function
+ *
+ * Returns        Void
+ *
+ ******************************************************************************/
 extern void bta_hl_co_get_tx_data (uint8_t app_id, tBTA_HL_MDL_HANDLE mdl_handle,
                                    uint16_t buf_size, uint8_t *p_buf, uint16_t evt);
 
 
 /*******************************************************************************
-**
-** Function        bta_hl_co_put_rx_data
-**
-** Description     Put the received data
-**
-** Parameters      app_id - HDP application ID
-**                 mdl_handle - MDL handle
-**                 data_size - the size of the data
-**                 p_data - the data pointer
-**                 evt - the evt to be passed back to the HL in the
-**                       bta_hl_ci_put_rx_data call-in function
-**
-** Returns        Void
-**
-*******************************************************************************/
+ *
+ * Function        bta_hl_co_put_rx_data
+ *
+ * Description     Put the received data
+ *
+ * Parameters      app_id - HDP application ID
+ *                 mdl_handle - MDL handle
+ *                 data_size - the size of the data
+ *                 p_data - the data pointer
+ *                 evt - the evt to be passed back to the HL in the
+ *                       bta_hl_ci_put_rx_data call-in function
+ *
+ * Returns        Void
+ *
+ ******************************************************************************/
 extern void bta_hl_co_put_rx_data (uint8_t app_id, tBTA_HL_MDL_HANDLE mdl_handle,
                                    uint16_t data_size, uint8_t *p_data, uint16_t evt);
 /*******************************************************************************
-**
-** Function         bta_hl_co_get_tx_data
-**
-** Description     Get the Echo data to be sent
-**
-** Parameters      app_id - HDP application ID
-**                 mcl_handle - MCL handle
-**                 buf_size - the size of the buffer
-**                 p_buf - the buffer pointer
-**                 evt - the evt to be passed back to the HL in the
-**                       bta_hl_ci_get_tx_data call-in function
-**
-** Returns        Void
-**
-*******************************************************************************/
+ *
+ * Function         bta_hl_co_get_tx_data
+ *
+ * Description     Get the Echo data to be sent
+ *
+ * Parameters      app_id - HDP application ID
+ *                 mcl_handle - MCL handle
+ *                 buf_size - the size of the buffer
+ *                 p_buf - the buffer pointer
+ *                 evt - the evt to be passed back to the HL in the
+ *                       bta_hl_ci_get_tx_data call-in function
+ *
+ * Returns        Void
+ *
+ ******************************************************************************/
 extern void bta_hl_co_get_echo_data (uint8_t app_id, tBTA_HL_MCL_HANDLE mcl_handle,
                                      uint16_t buf_size, uint8_t *p_buf, uint16_t evt);
 
 /*******************************************************************************
-**
-** Function        bta_hl_co_put_echo_data
-**
-** Description     Put the received loopback echo data
-**
-** Parameters      app_id - HDP application ID
-**                 mcl_handle - MCL handle
-**                 data_size - the size of the data
-**                 p_data - the data pointer
-**                 evt - the evt to be passed back to the HL in the
-**                       bta_hl_ci_put_echo_data call-in function
-**
-** Returns        Void
-**
-*******************************************************************************/
+ *
+ * Function        bta_hl_co_put_echo_data
+ *
+ * Description     Put the received loopback echo data
+ *
+ * Parameters      app_id - HDP application ID
+ *                 mcl_handle - MCL handle
+ *                 data_size - the size of the data
+ *                 p_data - the data pointer
+ *                 evt - the evt to be passed back to the HL in the
+ *                       bta_hl_ci_put_echo_data call-in function
+ *
+ * Returns        Void
+ *
+ ******************************************************************************/
 extern void bta_hl_co_put_echo_data (uint8_t app_id, tBTA_HL_MCL_HANDLE mcl_handle,
                                      uint16_t data_size, uint8_t *p_data, uint16_t evt);
 
diff --git a/system/bta/include/bta_jv_api.h b/system/bta/include/bta_jv_api.h
index 3fc03d92a96..bf1371cbdbc 100644
--- a/system/bta/include/bta_jv_api.h
+++ b/system/bta/include/bta_jv_api.h
@@ -35,8 +35,8 @@ extern "C" {
 #endif
 
 /*****************************************************************************
-**  Constants and data types
-*****************************************************************************/
+ *  Constants and data types
+ ****************************************************************************/
 /* status values */
 #define BTA_JV_SUCCESS             0            /* Successful operation. */
 #define BTA_JV_FAILURE             1            /* Generic failure. */
@@ -407,423 +407,423 @@ typedef struct
 } tBTA_JV_CFG;
 
 /*******************************************************************************
-**
-** Function         BTA_JvEnable
-**
-** Description      Enable the Java I/F service. When the enable
-**                  operation is complete the callback function will be
-**                  called with a BTA_JV_ENABLE_EVT. This function must
-**                  be called before other functions in the JV API are
-**                  called.
-**
-** Returns          BTA_JV_SUCCESS if successful.
-**                  BTA_JV_FAIL if internal failure.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvEnable
+ *
+ * Description      Enable the Java I/F service. When the enable
+ *                  operation is complete the callback function will be
+ *                  called with a BTA_JV_ENABLE_EVT. This function must
+ *                  be called before other functions in the JV API are
+ *                  called.
+ *
+ * Returns          BTA_JV_SUCCESS if successful.
+ *                  BTA_JV_FAIL if internal failure.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvEnable(tBTA_JV_DM_CBACK *p_cback);
 
 /*******************************************************************************
-**
-** Function         BTA_JvDisable
-**
-** Description      Disable the Java I/F
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvDisable
+ *
+ * Description      Disable the Java I/F
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_JvDisable(void);
 
 /*******************************************************************************
-**
-** Function         BTA_JvIsEncrypted
-**
-** Description      This function checks if the link to peer device is encrypted
-**
-** Returns          true if encrypted.
-**                  false if not.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvIsEncrypted
+ *
+ * Description      This function checks if the link to peer device is encrypted
+ *
+ * Returns          true if encrypted.
+ *                  false if not.
+ *
+ ******************************************************************************/
 bool BTA_JvIsEncrypted(BD_ADDR bd_addr);
 
 /*******************************************************************************
-**
-** Function         BTA_JvGetChannelId
-**
-** Description      This function reserves a SCN/PSM for applications running
-**                  over RFCOMM or L2CAP. It is primarily called by
-**                  server profiles/applications to register their SCN/PSM into the
-**                  SDP database. The SCN is reported by the tBTA_JV_DM_CBACK
-**                  callback with a BTA_JV_GET_SCN_EVT.
-**                  If the SCN/PSM reported is 0, that means all SCN resources are
-**                  exhausted.
-**                  The channel parameter can be used to request a specific
-**                  channel. If the request on the specific channel fails, the
-**                  SCN/PSM returned in the EVT will be 0 - no attempt to request
-**                  a new channel will be made. set channel to <= 0 to automatically
-**                  assign an channel ID.
-**
-** Returns          BTA_JV_SUCCESS, if the request is being processed.
-**                  BTA_JV_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvGetChannelId
+ *
+ * Description      This function reserves a SCN/PSM for applications running
+ *                  over RFCOMM or L2CAP. It is primarily called by
+ *                  server profiles/applications to register their SCN/PSM into the
+ *                  SDP database. The SCN is reported by the tBTA_JV_DM_CBACK
+ *                  callback with a BTA_JV_GET_SCN_EVT.
+ *                  If the SCN/PSM reported is 0, that means all SCN resources are
+ *                  exhausted.
+ *                  The channel parameter can be used to request a specific
+ *                  channel. If the request on the specific channel fails, the
+ *                  SCN/PSM returned in the EVT will be 0 - no attempt to request
+ *                  a new channel will be made. set channel to <= 0 to automatically
+ *                  assign an channel ID.
+ *
+ * Returns          BTA_JV_SUCCESS, if the request is being processed.
+ *                  BTA_JV_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvGetChannelId(int conn_type, void* user_data,
                                                  int32_t channel);
 
 /*******************************************************************************
-**
-** Function         BTA_JvFreeChannel
-**
-** Description      This function frees a SCN/PSM that was used
-**                  by an application running over RFCOMM or L2CAP.
-**
-** Returns          BTA_JV_SUCCESS, if the request is being processed.
-**                  BTA_JV_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvFreeChannel
+ *
+ * Description      This function frees a SCN/PSM that was used
+ *                  by an application running over RFCOMM or L2CAP.
+ *
+ * Returns          BTA_JV_SUCCESS, if the request is being processed.
+ *                  BTA_JV_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvFreeChannel(uint16_t channel, int conn_type);
 
 /*******************************************************************************
-**
-** Function         BTA_JvStartDiscovery
-**
-** Description      This function performs service discovery for the services
-**                  provided by the given peer device. When the operation is
-**                  complete the tBTA_JV_DM_CBACK callback function will be
-**                  called with a BTA_JV_DISCOVERY_COMP_EVT.
-**
-** Returns          BTA_JV_SUCCESS, if the request is being processed.
-**                  BTA_JV_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvStartDiscovery
+ *
+ * Description      This function performs service discovery for the services
+ *                  provided by the given peer device. When the operation is
+ *                  complete the tBTA_JV_DM_CBACK callback function will be
+ *                  called with a BTA_JV_DISCOVERY_COMP_EVT.
+ *
+ * Returns          BTA_JV_SUCCESS, if the request is being processed.
+ *                  BTA_JV_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvStartDiscovery(BD_ADDR bd_addr, uint16_t num_uuid,
                                            tSDP_UUID *p_uuid_list, void* user_data);
 
 /*******************************************************************************
-**
-** Function         BTA_JvCreateRecordByUser
-**
-** Description      Create a service record in the local SDP database by user in
-**                  tBTA_JV_DM_CBACK callback with a BTA_JV_CREATE_RECORD_EVT.
-**
-** Returns          BTA_JV_SUCCESS, if the request is being processed.
-**                  BTA_JV_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvCreateRecordByUser
+ *
+ * Description      Create a service record in the local SDP database by user in
+ *                  tBTA_JV_DM_CBACK callback with a BTA_JV_CREATE_RECORD_EVT.
+ *
+ * Returns          BTA_JV_SUCCESS, if the request is being processed.
+ *                  BTA_JV_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvCreateRecordByUser(void* user_data);
 
 /*******************************************************************************
-**
-** Function         BTA_JvDeleteRecord
-**
-** Description      Delete a service record in the local SDP database.
-**
-** Returns          BTA_JV_SUCCESS, if the request is being processed.
-**                  BTA_JV_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvDeleteRecord
+ *
+ * Description      Delete a service record in the local SDP database.
+ *
+ * Returns          BTA_JV_SUCCESS, if the request is being processed.
+ *                  BTA_JV_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvDeleteRecord(uint32_t handle);
 
 /*******************************************************************************
-**
-** Function         BTA_JvL2capConnectLE
-**
-** Description      Initiate a connection as an LE L2CAP client to the given BD
-**                  Address.
-**                  When the connection is initiated or failed to initiate,
-**                  tBTA_JV_L2CAP_CBACK is called with BTA_JV_L2CAP_CL_INIT_EVT
-**                  When the connection is established or failed,
-**                  tBTA_JV_L2CAP_CBACK is called with BTA_JV_L2CAP_OPEN_EVT
-**
-** Returns          BTA_JV_SUCCESS, if the request is being processed.
-**                  BTA_JV_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvL2capConnectLE
+ *
+ * Description      Initiate a connection as an LE L2CAP client to the given BD
+ *                  Address.
+ *                  When the connection is initiated or failed to initiate,
+ *                  tBTA_JV_L2CAP_CBACK is called with BTA_JV_L2CAP_CL_INIT_EVT
+ *                  When the connection is established or failed,
+ *                  tBTA_JV_L2CAP_CBACK is called with BTA_JV_L2CAP_OPEN_EVT
+ *
+ * Returns          BTA_JV_SUCCESS, if the request is being processed.
+ *                  BTA_JV_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvL2capConnectLE(tBTA_SEC sec_mask, tBTA_JV_ROLE role,
                            const tL2CAP_ERTM_INFO *ertm_info, uint16_t remote_chan,
                            uint16_t rx_mtu, tL2CAP_CFG_INFO *cfg,
                            BD_ADDR peer_bd_addr, tBTA_JV_L2CAP_CBACK *p_cback, void *user_data);
 
 /*******************************************************************************
-**
-** Function         BTA_JvL2capConnect
-**
-** Description      Initiate a connection as a L2CAP client to the given BD
-**                  Address.
-**                  When the connection is initiated or failed to initiate,
-**                  tBTA_JV_L2CAP_CBACK is called with BTA_JV_L2CAP_CL_INIT_EVT
-**                  When the connection is established or failed,
-**                  tBTA_JV_L2CAP_CBACK is called with BTA_JV_L2CAP_OPEN_EVT
-**
-** Returns          BTA_JV_SUCCESS, if the request is being processed.
-**                  BTA_JV_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvL2capConnect
+ *
+ * Description      Initiate a connection as a L2CAP client to the given BD
+ *                  Address.
+ *                  When the connection is initiated or failed to initiate,
+ *                  tBTA_JV_L2CAP_CBACK is called with BTA_JV_L2CAP_CL_INIT_EVT
+ *                  When the connection is established or failed,
+ *                  tBTA_JV_L2CAP_CBACK is called with BTA_JV_L2CAP_OPEN_EVT
+ *
+ * Returns          BTA_JV_SUCCESS, if the request is being processed.
+ *                  BTA_JV_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvL2capConnect(int conn_type, tBTA_SEC sec_mask, tBTA_JV_ROLE role,
                            const tL2CAP_ERTM_INFO *ertm_info, uint16_t remote_psm,
                            uint16_t rx_mtu, tL2CAP_CFG_INFO *cfg,
                            BD_ADDR peer_bd_addr, tBTA_JV_L2CAP_CBACK *p_cback, void *user_data);
 
 /*******************************************************************************
-**
-** Function         BTA_JvL2capClose
-**
-** Description      This function closes an L2CAP client connection
-**
-** Returns          BTA_JV_SUCCESS, if the request is being processed.
-**                  BTA_JV_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvL2capClose
+ *
+ * Description      This function closes an L2CAP client connection
+ *
+ * Returns          BTA_JV_SUCCESS, if the request is being processed.
+ *                  BTA_JV_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvL2capClose(uint32_t handle);
 
 /*******************************************************************************
-**
-** Function         BTA_JvL2capCloseLE
-**
-** Description      This function closes an L2CAP client connection for Fixed Channels
-**                  Function is idempotent and no callbacks are called!
-**
-** Returns          BTA_JV_SUCCESS, if the request is being processed.
-**                  BTA_JV_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvL2capCloseLE
+ *
+ * Description      This function closes an L2CAP client connection for Fixed Channels
+ *                  Function is idempotent and no callbacks are called!
+ *
+ * Returns          BTA_JV_SUCCESS, if the request is being processed.
+ *                  BTA_JV_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvL2capCloseLE(uint32_t handle);
 
 /*******************************************************************************
-**
-** Function         BTA_JvL2capStartServer
-**
-** Description      This function starts an L2CAP server and listens for an L2CAP
-**                  connection from a remote Bluetooth device.  When the server
-**                  is started successfully, tBTA_JV_L2CAP_CBACK is called with
-**                  BTA_JV_L2CAP_START_EVT.  When the connection is established,
-**                  tBTA_JV_L2CAP_CBACK is called with BTA_JV_L2CAP_OPEN_EVT.
-**
-** Returns          BTA_JV_SUCCESS, if the request is being processed.
-**                  BTA_JV_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvL2capStartServer
+ *
+ * Description      This function starts an L2CAP server and listens for an L2CAP
+ *                  connection from a remote Bluetooth device.  When the server
+ *                  is started successfully, tBTA_JV_L2CAP_CBACK is called with
+ *                  BTA_JV_L2CAP_START_EVT.  When the connection is established,
+ *                  tBTA_JV_L2CAP_CBACK is called with BTA_JV_L2CAP_OPEN_EVT.
+ *
+ * Returns          BTA_JV_SUCCESS, if the request is being processed.
+ *                  BTA_JV_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvL2capStartServer(int conn_type, tBTA_SEC sec_mask, tBTA_JV_ROLE role,
                            const tL2CAP_ERTM_INFO *ertm_info,
                            uint16_t local_psm, uint16_t rx_mtu, tL2CAP_CFG_INFO *cfg,
                            tBTA_JV_L2CAP_CBACK *p_cback, void *user_data);
 
 /*******************************************************************************
-**
-** Function         BTA_JvL2capStartServerLE
-**
-** Description      This function starts an LE L2CAP server and listens for an L2CAP
-**                  connection from a remote Bluetooth device on a fixed channel
-**                  over an LE link.  When the server
-**                  is started successfully, tBTA_JV_L2CAP_CBACK is called with
-**                  BTA_JV_L2CAP_START_EVT.  When the connection is established,
-**                  tBTA_JV_L2CAP_CBACK is called with BTA_JV_L2CAP_OPEN_EVT.
-**
-** Returns          BTA_JV_SUCCESS, if the request is being processed.
-**                  BTA_JV_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvL2capStartServerLE
+ *
+ * Description      This function starts an LE L2CAP server and listens for an L2CAP
+ *                  connection from a remote Bluetooth device on a fixed channel
+ *                  over an LE link.  When the server
+ *                  is started successfully, tBTA_JV_L2CAP_CBACK is called with
+ *                  BTA_JV_L2CAP_START_EVT.  When the connection is established,
+ *                  tBTA_JV_L2CAP_CBACK is called with BTA_JV_L2CAP_OPEN_EVT.
+ *
+ * Returns          BTA_JV_SUCCESS, if the request is being processed.
+ *                  BTA_JV_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvL2capStartServerLE(tBTA_SEC sec_mask, tBTA_JV_ROLE role,
                            const tL2CAP_ERTM_INFO *ertm_info,
                            uint16_t local_chan, uint16_t rx_mtu, tL2CAP_CFG_INFO *cfg,
                            tBTA_JV_L2CAP_CBACK *p_cback, void *user_data);
 
 /*******************************************************************************
-**
-** Function         BTA_JvL2capStopServerLE
-**
-** Description      This function stops the LE L2CAP server. If the server has an
-**                  active connection, it would be closed.
-**
-** Returns          BTA_JV_SUCCESS, if the request is being processed.
-**                  BTA_JV_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvL2capStopServerLE
+ *
+ * Description      This function stops the LE L2CAP server. If the server has an
+ *                  active connection, it would be closed.
+ *
+ * Returns          BTA_JV_SUCCESS, if the request is being processed.
+ *                  BTA_JV_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvL2capStopServerLE(uint16_t local_chan, void *user_data);
 
 /*******************************************************************************
-**
-** Function         BTA_JvL2capStopServerLE
-**
-** Description      This function stops the LE L2CAP server. If the server has an
-**                  active connection, it would be closed.
-**
-** Returns          BTA_JV_SUCCESS, if the request is being processed.
-**                  BTA_JV_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvL2capStopServerLE
+ *
+ * Description      This function stops the LE L2CAP server. If the server has an
+ *                  active connection, it would be closed.
+ *
+ * Returns          BTA_JV_SUCCESS, if the request is being processed.
+ *                  BTA_JV_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvL2capStopServer(uint16_t local_psm, void *user_data);
 
 /*******************************************************************************
-**
-** Function         BTA_JvL2capRead
-**
-** Description      This function reads data from an L2CAP connection
-**                  When the operation is complete, tBTA_JV_L2CAP_CBACK is
-**                  called with BTA_JV_L2CAP_READ_EVT.
-**
-** Returns          BTA_JV_SUCCESS, if the request is being processed.
-**                  BTA_JV_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvL2capRead
+ *
+ * Description      This function reads data from an L2CAP connection
+ *                  When the operation is complete, tBTA_JV_L2CAP_CBACK is
+ *                  called with BTA_JV_L2CAP_READ_EVT.
+ *
+ * Returns          BTA_JV_SUCCESS, if the request is being processed.
+ *                  BTA_JV_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvL2capRead(uint32_t handle, uint32_t req_id,
                                               uint8_t *p_data, uint16_t len);
 
 /*******************************************************************************
-**
-** Function         BTA_JvL2capReady
-**
-** Description      This function determined if there is data to read from
-**                  an L2CAP connection
-**
-** Returns          BTA_JV_SUCCESS, if data queue size is in *p_data_size.
-**                  BTA_JV_FAILURE, if error.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvL2capReady
+ *
+ * Description      This function determined if there is data to read from
+ *                  an L2CAP connection
+ *
+ * Returns          BTA_JV_SUCCESS, if data queue size is in *p_data_size.
+ *                  BTA_JV_FAILURE, if error.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvL2capReady(uint32_t handle, uint32_t *p_data_size);
 
 /*******************************************************************************
-**
-** Function         BTA_JvL2capWrite
-**
-** Description      This function writes data to an L2CAP connection
-**                  When the operation is complete, tBTA_JV_L2CAP_CBACK is
-**                  called with BTA_JV_L2CAP_WRITE_EVT. Works for
-**                  PSM-based connections
-**
-** Returns          BTA_JV_SUCCESS, if the request is being processed.
-**                  BTA_JV_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvL2capWrite
+ *
+ * Description      This function writes data to an L2CAP connection
+ *                  When the operation is complete, tBTA_JV_L2CAP_CBACK is
+ *                  called with BTA_JV_L2CAP_WRITE_EVT. Works for
+ *                  PSM-based connections
+ *
+ * Returns          BTA_JV_SUCCESS, if the request is being processed.
+ *                  BTA_JV_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvL2capWrite(uint32_t handle, uint32_t req_id,
                                                uint8_t *p_data, uint16_t len, void *user_data);
 
 
 /*******************************************************************************
-**
-** Function         BTA_JvL2capWriteFixed
-**
-** Description      This function writes data to an L2CAP connection
-**                  When the operation is complete, tBTA_JV_L2CAP_CBACK is
-**                  called with BTA_JV_L2CAP_WRITE_FIXED_EVT. Works for
-**                  fixed-channel connections
-**
-** Returns          BTA_JV_SUCCESS, if the request is being processed.
-**                  BTA_JV_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvL2capWriteFixed
+ *
+ * Description      This function writes data to an L2CAP connection
+ *                  When the operation is complete, tBTA_JV_L2CAP_CBACK is
+ *                  called with BTA_JV_L2CAP_WRITE_FIXED_EVT. Works for
+ *                  fixed-channel connections
+ *
+ * Returns          BTA_JV_SUCCESS, if the request is being processed.
+ *                  BTA_JV_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvL2capWriteFixed(uint16_t channel, BD_ADDR *addr, uint32_t req_id,
                                                tBTA_JV_L2CAP_CBACK *p_cback,
                                                uint8_t *p_data, uint16_t len, void *user_data);
 
 /*******************************************************************************
-**
-** Function         BTA_JvRfcommConnect
-**
-** Description      This function makes an RFCOMM conection to a remote BD
-**                  Address.
-**                  When the connection is initiated or failed to initiate,
-**                  tBTA_JV_RFCOMM_CBACK is called with BTA_JV_RFCOMM_CL_INIT_EVT
-**                  When the connection is established or failed,
-**                  tBTA_JV_RFCOMM_CBACK is called with BTA_JV_RFCOMM_OPEN_EVT
-**
-** Returns          BTA_JV_SUCCESS, if the request is being processed.
-**                  BTA_JV_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvRfcommConnect
+ *
+ * Description      This function makes an RFCOMM conection to a remote BD
+ *                  Address.
+ *                  When the connection is initiated or failed to initiate,
+ *                  tBTA_JV_RFCOMM_CBACK is called with BTA_JV_RFCOMM_CL_INIT_EVT
+ *                  When the connection is established or failed,
+ *                  tBTA_JV_RFCOMM_CBACK is called with BTA_JV_RFCOMM_OPEN_EVT
+ *
+ * Returns          BTA_JV_SUCCESS, if the request is being processed.
+ *                  BTA_JV_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvRfcommConnect(tBTA_SEC sec_mask,
                                           tBTA_JV_ROLE role, uint8_t remote_scn, BD_ADDR peer_bd_addr,
                                           tBTA_JV_RFCOMM_CBACK *p_cback, void *user_data);
 
 /*******************************************************************************
-**
-** Function         BTA_JvRfcommClose
-**
-** Description      This function closes an RFCOMM connection
-**
-** Returns          BTA_JV_SUCCESS, if the request is being processed.
-**                  BTA_JV_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvRfcommClose
+ *
+ * Description      This function closes an RFCOMM connection
+ *
+ * Returns          BTA_JV_SUCCESS, if the request is being processed.
+ *                  BTA_JV_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvRfcommClose(uint32_t handle, void* user_data);
 
 /*******************************************************************************
-**
-** Function         BTA_JvRfcommStartServer
-**
-** Description      This function starts listening for an RFCOMM connection
-**                  request from a remote Bluetooth device.  When the server is
-**                  started successfully, tBTA_JV_RFCOMM_CBACK is called
-**                  with BTA_JV_RFCOMM_START_EVT.
-**                  When the connection is established, tBTA_JV_RFCOMM_CBACK
-**                  is called with BTA_JV_RFCOMM_OPEN_EVT.
-**
-** Returns          BTA_JV_SUCCESS, if the request is being processed.
-**                  BTA_JV_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvRfcommStartServer
+ *
+ * Description      This function starts listening for an RFCOMM connection
+ *                  request from a remote Bluetooth device.  When the server is
+ *                  started successfully, tBTA_JV_RFCOMM_CBACK is called
+ *                  with BTA_JV_RFCOMM_START_EVT.
+ *                  When the connection is established, tBTA_JV_RFCOMM_CBACK
+ *                  is called with BTA_JV_RFCOMM_OPEN_EVT.
+ *
+ * Returns          BTA_JV_SUCCESS, if the request is being processed.
+ *                  BTA_JV_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvRfcommStartServer(tBTA_SEC sec_mask,
                                               tBTA_JV_ROLE role, uint8_t local_scn, uint8_t max_session,
                                               tBTA_JV_RFCOMM_CBACK *p_cback, void *user_data);
 
 /*******************************************************************************
-**
-** Function         BTA_JvRfcommStopServer
-**
-** Description      This function stops the RFCOMM server. If the server has an
-**                  active connection, it would be closed.
-**
-** Returns          BTA_JV_SUCCESS, if the request is being processed.
-**                  BTA_JV_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvRfcommStopServer
+ *
+ * Description      This function stops the RFCOMM server. If the server has an
+ *                  active connection, it would be closed.
+ *
+ * Returns          BTA_JV_SUCCESS, if the request is being processed.
+ *                  BTA_JV_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvRfcommStopServer(uint32_t handle, void* user_data);
 
 /*******************************************************************************
-**
-** Function         BTA_JvRfcommWrite
-**
-** Description      This function writes data to an RFCOMM connection
-**                  When the operation is complete, tBTA_JV_RFCOMM_CBACK is
-**                  called with BTA_JV_RFCOMM_WRITE_EVT.
-**
-** Returns          BTA_JV_SUCCESS, if the request is being processed.
-**                  BTA_JV_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvRfcommWrite
+ *
+ * Description      This function writes data to an RFCOMM connection
+ *                  When the operation is complete, tBTA_JV_RFCOMM_CBACK is
+ *                  called with BTA_JV_RFCOMM_WRITE_EVT.
+ *
+ * Returns          BTA_JV_SUCCESS, if the request is being processed.
+ *                  BTA_JV_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvRfcommWrite(uint32_t handle, uint32_t req_id);
 
 /*******************************************************************************
- **
- ** Function    BTA_JVSetPmProfile
- **
- ** Description This function set or free power mode profile for different JV application
- **
- ** Parameters:  handle,  JV handle from RFCOMM or L2CAP
- **              app_id:  app specific pm ID, can be BTA_JV_PM_ALL, see bta_dm_cfg.c for details
- **              BTA_JV_PM_ID_CLEAR: removes pm management on the handle. init_st is ignored and
- **              BTA_JV_CONN_CLOSE is called implicitely
- **              init_st:  state after calling this API. typically it should be BTA_JV_CONN_OPEN
- **
- ** Returns      BTA_JV_SUCCESS, if the request is being processed.
- **              BTA_JV_FAILURE, otherwise.
- **
- ** NOTE:        BTA_JV_PM_ID_CLEAR: In general no need to be called as jv pm calls automatically
- **              BTA_JV_CONN_CLOSE to remove in case of connection close!
- **
+ *
+ * Function    BTA_JVSetPmProfile
+ *
+ * Description This function set or free power mode profile for different JV application
+ *
+ * Parameters:  handle,  JV handle from RFCOMM or L2CAP
+ *              app_id:  app specific pm ID, can be BTA_JV_PM_ALL, see bta_dm_cfg.c for details
+ *              BTA_JV_PM_ID_CLEAR: removes pm management on the handle. init_st is ignored and
+ *              BTA_JV_CONN_CLOSE is called implicitely
+ *              init_st:  state after calling this API. typically it should be BTA_JV_CONN_OPEN
+ *
+ * Returns      BTA_JV_SUCCESS, if the request is being processed.
+ *              BTA_JV_FAILURE, otherwise.
+ *
+ * NOTE:        BTA_JV_PM_ID_CLEAR: In general no need to be called as jv pm calls automatically
+ *              BTA_JV_CONN_CLOSE to remove in case of connection close!
+ *
  *******************************************************************************/
 tBTA_JV_STATUS BTA_JvSetPmProfile(uint32_t handle, tBTA_JV_PM_ID app_id,
                                          tBTA_JV_CONN_STATE init_st);
 
 /*******************************************************************************
-**
-** Function         BTA_JvRfcommGetPortHdl
-**
-** Description    This function fetches the rfcomm port handle
-**
-** Returns          BTA_JV_SUCCESS, if the request is being processed.
-**                  BTA_JV_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvRfcommGetPortHdl
+ *
+ * Description    This function fetches the rfcomm port handle
+ *
+ * Returns          BTA_JV_SUCCESS, if the request is being processed.
+ *                  BTA_JV_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 uint16_t BTA_JvRfcommGetPortHdl(uint32_t handle);
 
 #ifdef __cplusplus
diff --git a/system/bta/include/bta_jv_co.h b/system/bta/include/bta_jv_co.h
index f8c7cf3f271..d0dd48d0ebd 100644
--- a/system/bta/include/bta_jv_co.h
+++ b/system/bta/include/bta_jv_co.h
@@ -31,20 +31,20 @@ extern "C" {
 #endif
 
 /*****************************************************************************
-**  Function Declarations
-*****************************************************************************/
+ *  Function Declarations
+ ****************************************************************************/
 
 
 /*******************************************************************************
-**
-** Function         bta_jv_co_rfc_data
-**
-** Description      This function is called by JV to send data to the java glue
-**                  code when the RX data path is configured to use a call-out
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_jv_co_rfc_data
+ *
+ * Description      This function is called by JV to send data to the java glue
+ *                  code when the RX data path is configured to use a call-out
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 
 extern int bta_co_rfc_data_incoming(void *user_data, BT_HDR *p_buf);
 extern int bta_co_rfc_data_outgoing_size(void *user_data, int *size);
diff --git a/system/bta/include/bta_mce_api.h b/system/bta/include/bta_mce_api.h
index eedf1d2190c..b5423652941 100644
--- a/system/bta/include/bta_mce_api.h
+++ b/system/bta/include/bta_mce_api.h
@@ -35,8 +35,8 @@ extern "C" {
 #endif
 
 /*****************************************************************************
-**  Constants and data types
-*****************************************************************************/
+ *  Constants and data types
+ ****************************************************************************/
 /* status values */
 #define BTA_MCE_SUCCESS             0            /* Successful operation. */
 #define BTA_MCE_FAILURE             1            /* Generic failure. */
@@ -90,38 +90,38 @@ typedef struct
 } tBTA_MCE_CFG;
 
 /*****************************************************************************
-**  External Function Declarations
-*****************************************************************************/
+ *  External Function Declarations
+ ****************************************************************************/
 
 /*******************************************************************************
-**
-** Function         BTA_MceEnable
-**
-** Description      Enable the MCE I/F service. When the enable
-**                  operation is complete the callback function will be
-**                  called with a BTA_MCE_ENABLE_EVT. This function must
-**                  be called before other functions in the MCE API are
-**                  called.
-**
-** Returns          BTA_MCE_SUCCESS if successful.
-**                  BTA_MCE_FAIL if internal failure.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_MceEnable
+ *
+ * Description      Enable the MCE I/F service. When the enable
+ *                  operation is complete the callback function will be
+ *                  called with a BTA_MCE_ENABLE_EVT. This function must
+ *                  be called before other functions in the MCE API are
+ *                  called.
+ *
+ * Returns          BTA_MCE_SUCCESS if successful.
+ *                  BTA_MCE_FAIL if internal failure.
+ *
+ ******************************************************************************/
 extern tBTA_MCE_STATUS BTA_MceEnable(tBTA_MCE_DM_CBACK *p_cback);
 
 /*******************************************************************************
-**
-** Function         BTA_MceGetRemoteMasInstances
-**
-** Description      This function performs service discovery for the MAS service
-**                  by the given peer device. When the operation is completed
-**                  the tBTA_MCE_DM_CBACK callback function will be  called with
-**                  a BTA_MCE_MAS_DISCOVERY_COMP_EVT.
-**
-** Returns          BTA_MCE_SUCCESS, if the request is being processed.
-**                  BTA_MCE_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_MceGetRemoteMasInstances
+ *
+ * Description      This function performs service discovery for the MAS service
+ *                  by the given peer device. When the operation is completed
+ *                  the tBTA_MCE_DM_CBACK callback function will be  called with
+ *                  a BTA_MCE_MAS_DISCOVERY_COMP_EVT.
+ *
+ * Returns          BTA_MCE_SUCCESS, if the request is being processed.
+ *                  BTA_MCE_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 extern tBTA_MCE_STATUS BTA_MceGetRemoteMasInstances(BD_ADDR bd_addr);
 
 #ifdef __cplusplus
diff --git a/system/bta/include/bta_op_api.h b/system/bta/include/bta_op_api.h
index f8371bff043..28012f6443a 100644
--- a/system/bta/include/bta_op_api.h
+++ b/system/bta/include/bta_op_api.h
@@ -29,8 +29,8 @@
 #include "bta_api.h"
 
 /*****************************************************************************
-**  Constants and data types
-*****************************************************************************/
+ *  Constants and data types
+ ****************************************************************************/
 /* Extra Debug Code */
 #ifndef BTA_OPS_DEBUG
 #define BTA_OPS_DEBUG           false
diff --git a/system/bta/include/bta_pan_api.h b/system/bta/include/bta_pan_api.h
index 739c64e1e7d..a9920cbb930 100644
--- a/system/bta/include/bta_pan_api.h
+++ b/system/bta/include/bta_pan_api.h
@@ -34,8 +34,8 @@ extern "C" {
 #endif
 
 /*****************************************************************************
-**  Constants and data types
-*****************************************************************************/
+ *  Constants and data types
+ ****************************************************************************/
 #define BTA_PAN_SUCCESS          0
 #define BTA_PAN_FAIL             1
 
@@ -121,75 +121,75 @@ typedef union
 typedef void (tBTA_PAN_CBACK)(tBTA_PAN_EVT event, tBTA_PAN *p_data);
 
 /*****************************************************************************
-**  External Function Declarations
-*****************************************************************************/
+ *  External Function Declarations
+ ****************************************************************************/
 
 /*******************************************************************************
-**
-** Function         BTA_PanEnable
-**
-** Description      Enable PAN service.  This function must be
-**                  called before any other functions in the PAN API are called.
-**                  When the enable operation is complete the callback function
-**                  will be called with a BTA_PAN_ENABLE_EVT.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_PanEnable
+ *
+ * Description      Enable PAN service.  This function must be
+ *                  called before any other functions in the PAN API are called.
+ *                  When the enable operation is complete the callback function
+ *                  will be called with a BTA_PAN_ENABLE_EVT.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_PanEnable(tBTA_PAN_CBACK p_cback);
 
 /*******************************************************************************
-**
-** Function         BTA_PanDisable
-**
-** Description      Disable PAN service.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_PanDisable
+ *
+ * Description      Disable PAN service.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_PanDisable(void);
 
 
 /*******************************************************************************
-**
-** Function         BTA_PanSetRole
-**
-** Description      Sets PAN roles. When the enable operation is complete
-**                  the callback function will be called with a BTA_PAN_SET_ROLE_EVT.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_PanSetRole
+ *
+ * Description      Sets PAN roles. When the enable operation is complete
+ *                  the callback function will be called with a BTA_PAN_SET_ROLE_EVT.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_PanSetRole(tBTA_PAN_ROLE role, tBTA_PAN_ROLE_INFO *p_user_info, tBTA_PAN_ROLE_INFO *p_gn_info,
                     tBTA_PAN_ROLE_INFO *p_nap_info);
 
 
 /*******************************************************************************
-**
-** Function         BTA_PanOpen
-**
-** Description      Opens a connection to a peer device.
-**                  When connection is open callback function is called
-**                  with a BTA_PAN_OPEN_EVT.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_PanOpen
+ *
+ * Description      Opens a connection to a peer device.
+ *                  When connection is open callback function is called
+ *                  with a BTA_PAN_OPEN_EVT.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_PanOpen(BD_ADDR bd_addr, tBTA_PAN_ROLE    local_role, tBTA_PAN_ROLE  peer_role);
 
 
 
 /*******************************************************************************
-**
-** Function         BTA_PanClose
-**
-** Description      Close a PAN  connection to a peer device.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_PanClose
+ *
+ * Description      Close a PAN  connection to a peer device.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void BTA_PanClose(uint16_t handle);
 
 
diff --git a/system/bta/include/bta_pan_ci.h b/system/bta/include/bta_pan_ci.h
index 66b7241373e..2c67db19f15 100644
--- a/system/bta/include/bta_pan_ci.h
+++ b/system/bta/include/bta_pan_ci.h
@@ -27,115 +27,115 @@
 #include "bta_pan_api.h"
 
 /*****************************************************************************
-**  Function Declarations
-*****************************************************************************/
+ *  Function Declarations
+ ****************************************************************************/
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
 /*******************************************************************************
-**
-** Function         bta_pan_ci_tx_ready
-**
-** Description      This function sends an event to PAN indicating the phone is
-**                  ready for more data and PAN should call bta_pan_co_tx_path().
-**                  This function is used when the TX data path is configured
-**                  to use a pull interface.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_ci_tx_ready
+ *
+ * Description      This function sends an event to PAN indicating the phone is
+ *                  ready for more data and PAN should call bta_pan_co_tx_path().
+ *                  This function is used when the TX data path is configured
+ *                  to use a pull interface.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void bta_pan_ci_tx_ready(uint16_t handle);
 
 /*******************************************************************************
-**
-** Function         bta_pan_ci_rx_ready
-**
-** Description      This function sends an event to PAN indicating the phone
-**                  has data available to send to PAN and PAN should call
-**                  bta_pan_co_rx_path().  This function is used when the RX
-**                  data path is configured to use a pull interface.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_ci_rx_ready
+ *
+ * Description      This function sends an event to PAN indicating the phone
+ *                  has data available to send to PAN and PAN should call
+ *                  bta_pan_co_rx_path().  This function is used when the RX
+ *                  data path is configured to use a pull interface.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void bta_pan_ci_rx_ready(uint16_t handle);
 
 /*******************************************************************************
-**
-** Function         bta_pan_ci_tx_flow
-**
-** Description      This function is called to enable or disable data flow on
-**                  the TX path.  The phone should call this function to
-**                  disable data flow when it is congested and cannot handle
-**                  any more data sent by bta_pan_co_tx_write() or
-**                  bta_pan_co_tx_writebuf().  This function is used when the
-**                  TX data path is configured to use a push interface.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_ci_tx_flow
+ *
+ * Description      This function is called to enable or disable data flow on
+ *                  the TX path.  The phone should call this function to
+ *                  disable data flow when it is congested and cannot handle
+ *                  any more data sent by bta_pan_co_tx_write() or
+ *                  bta_pan_co_tx_writebuf().  This function is used when the
+ *                  TX data path is configured to use a push interface.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void bta_pan_ci_tx_flow(uint16_t handle, bool enable);
 
 /*******************************************************************************
-**
-** Function         bta_pan_ci_rx_writebuf
-**
-** Description      This function is called to send data to the phone when
-**                  the RX path is configured to use a push interface with
-**                  zero copy.  The function sends an event to PAN containing
-**                  the data buffer. The buffer will be freed by BTA; the
-**                  phone must not free the buffer.
-**
-**
-** Returns          true if flow enabled
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_ci_rx_writebuf
+ *
+ * Description      This function is called to send data to the phone when
+ *                  the RX path is configured to use a push interface with
+ *                  zero copy.  The function sends an event to PAN containing
+ *                  the data buffer. The buffer will be freed by BTA; the
+ *                  phone must not free the buffer.
+ *
+ *
+ * Returns          true if flow enabled
+ *
+ ******************************************************************************/
 extern void bta_pan_ci_rx_writebuf(uint16_t handle, BD_ADDR src, BD_ADDR dst, uint16_t protocol, BT_HDR *p_buf, bool ext);
 
 /*******************************************************************************
-**
-** Function         bta_pan_ci_readbuf
-**
-** Description      This function is called by the phone to read data from PAN
-**                  when the TX path is configured to use a pull interface.
-**                  The caller must free the buffer when it is through
-**                  processing the buffer.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_ci_readbuf
+ *
+ * Description      This function is called by the phone to read data from PAN
+ *                  when the TX path is configured to use a pull interface.
+ *                  The caller must free the buffer when it is through
+ *                  processing the buffer.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern BT_HDR * bta_pan_ci_readbuf(uint16_t handle, BD_ADDR src, BD_ADDR dst, uint16_t *p_protocol,
                                    bool* p_ext, bool* p_forward);
 
 /*******************************************************************************
-**
-** Function         bta_pan_ci_set_pfilters
-**
-** Description      This function is called to set protocol filters
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_ci_set_pfilters
+ *
+ * Description      This function is called to set protocol filters
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void bta_pan_ci_set_pfilters(uint16_t handle, uint16_t num_filters, uint16_t *p_start_array, uint16_t *p_end_array);
 
 
 /*******************************************************************************
-**
-** Function         bta_pan_ci_set_mfilters
-**
-** Description      This function is called to set multicast filters
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_ci_set_mfilters
+ *
+ * Description      This function is called to set multicast filters
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void bta_pan_ci_set_mfilters(uint16_t handle, uint16_t num_mcast_filters, uint8_t *p_start_array,
                                     uint8_t *p_end_array);
 
diff --git a/system/bta/include/bta_pan_co.h b/system/bta/include/bta_pan_co.h
index cf28eef0f95..6de2c1f4875 100644
--- a/system/bta/include/bta_pan_co.h
+++ b/system/bta/include/bta_pan_co.h
@@ -31,8 +31,8 @@ extern "C" {
 #endif
 
 /*****************************************************************************
-**  Constants
-*****************************************************************************/
+ *  Constants
+ ****************************************************************************/
 
 
 
@@ -51,153 +51,153 @@ extern "C" {
 
 
 /*****************************************************************************
-**  Function Declarations
-*****************************************************************************/
+ *  Function Declarations
+ ****************************************************************************/
 
 /*******************************************************************************
-**
-** Function         bta_pan_co_init
-**
-** Description      This callout function is executed by PAN when a server is
-**                  started by calling BTA_PanEnable().  This function can be
-**                  used by the phone to initialize data paths or for other
-**                  initialization purposes.  The function must return the
-**                  data flow mask as described below.
-**
-**
-** Returns          Data flow mask.
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_co_init
+ *
+ * Description      This callout function is executed by PAN when a server is
+ *                  started by calling BTA_PanEnable().  This function can be
+ *                  used by the phone to initialize data paths or for other
+ *                  initialization purposes.  The function must return the
+ *                  data flow mask as described below.
+ *
+ *
+ * Returns          Data flow mask.
+ *
+ ******************************************************************************/
 extern uint8_t bta_pan_co_init(uint8_t *q_level);
 
 /*******************************************************************************
-**
-** Function         bta_pan_co_open
-**
-** Description      This function is executed by PAN when a connection
-**                  is opened.  The phone can use this function to set
-**                  up data paths or perform any required initialization.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_co_open
+ *
+ * Description      This function is executed by PAN when a connection
+ *                  is opened.  The phone can use this function to set
+ *                  up data paths or perform any required initialization.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void bta_pan_co_open(uint16_t handle, uint8_t app_id, tBTA_PAN_ROLE local_role, tBTA_PAN_ROLE peer_role, BD_ADDR peer_addr);
 
 /*******************************************************************************
-**
-** Function         bta_pan_co_close
-**
-** Description      This function is called by PAN when a connection to a
-**                  server is closed.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_co_close
+ *
+ * Description      This function is called by PAN when a connection to a
+ *                  server is closed.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void bta_pan_co_close(uint16_t handle, uint8_t app_id);
 
 /*******************************************************************************
-**
-** Function         bta_pan_co_tx_path
-**
-** Description      This function is called by PAN to transfer data on the
-**                  TX path; that is, data being sent from BTA to the phone.
-**                  This function is used when the TX data path is configured
-**                  to use the pull interface.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_co_tx_path
+ *
+ * Description      This function is called by PAN to transfer data on the
+ *                  TX path; that is, data being sent from BTA to the phone.
+ *                  This function is used when the TX data path is configured
+ *                  to use the pull interface.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void bta_pan_co_tx_path(uint16_t handle, uint8_t app_id);
 
 /*******************************************************************************
-**
-** Function         bta_pan_co_rx_path
-**
-** Description      This function is called by PAN to transfer data on the
-**                  RX path; that is, data being sent from the phone to BTA.
-**                  This function is used when the RX data path is configured
-**                  to use the pull interface.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_co_rx_path
+ *
+ * Description      This function is called by PAN to transfer data on the
+ *                  RX path; that is, data being sent from the phone to BTA.
+ *                  This function is used when the RX data path is configured
+ *                  to use the pull interface.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void bta_pan_co_rx_path(uint16_t handle, uint8_t app_id);
 
 /*******************************************************************************
-**
-** Function         bta_pan_co_tx_write
-**
-** Description      This function is called by PAN to send data to the phone
-**                  when the TX path is configured to use a push interface.
-**                  The implementation of this function must copy the data to
-**                  the phone's memory.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_co_tx_write
+ *
+ * Description      This function is called by PAN to send data to the phone
+ *                  when the TX path is configured to use a push interface.
+ *                  The implementation of this function must copy the data to
+ *                  the phone's memory.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void bta_pan_co_tx_write(uint16_t handle, uint8_t app_id, BD_ADDR src, BD_ADDR dst, uint16_t protocol, uint8_t *p_data,
                                 uint16_t len, bool ext, bool forward);
 
 /*******************************************************************************
-**
-** Function         bta_pan_co_tx_writebuf
-**
-** Description      This function is called by PAN to send data to the phone
-**                  when the TX path is configured to use a push interface with
-**                  zero copy.  The phone must free the buffer using function
-**                  osi_free() when it is through processing the buffer.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_co_tx_writebuf
+ *
+ * Description      This function is called by PAN to send data to the phone
+ *                  when the TX path is configured to use a push interface with
+ *                  zero copy.  The phone must free the buffer using function
+ *                  osi_free() when it is through processing the buffer.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void bta_pan_co_tx_writebuf(uint16_t handle, uint8_t app_id, BD_ADDR src, BD_ADDR dst, uint16_t protocol, BT_HDR *p_buf,
                                    bool ext, bool forward);
 
 
 /*******************************************************************************
-**
-** Function         bta_pan_co_rx_flow
-**
-** Description      This function is called by PAN to enable or disable
-**                  data flow on the RX path when it is configured to use
-**                  a push interface.  If data flow is disabled the phone must
-**                  not call bta_pan_ci_rx_write() or bta_pan_ci_rx_writebuf()
-**                  until data flow is enabled again.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_co_rx_flow
+ *
+ * Description      This function is called by PAN to enable or disable
+ *                  data flow on the RX path when it is configured to use
+ *                  a push interface.  If data flow is disabled the phone must
+ *                  not call bta_pan_ci_rx_write() or bta_pan_ci_rx_writebuf()
+ *                  until data flow is enabled again.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void bta_pan_co_rx_flow(uint16_t handle, uint8_t app_id, bool enable);
 
 
 /*******************************************************************************
-**
-** Function         bta_pan_co_filt_ind
-**
-** Description      protocol filter indication from peer device
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_co_filt_ind
+ *
+ * Description      protocol filter indication from peer device
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void bta_pan_co_pfilt_ind(uint16_t handle, bool indication, tBTA_PAN_STATUS result,
                                  uint16_t len, uint8_t *p_filters);
 
 /*******************************************************************************
-**
-** Function         bta_pan_co_mfilt_ind
-**
-** Description      multicast filter indication from peer device
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_co_mfilt_ind
+ *
+ * Description      multicast filter indication from peer device
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 extern void bta_pan_co_mfilt_ind(uint16_t handle,  bool indication, tBTA_PAN_STATUS result,
                                  uint16_t len, uint8_t *p_filters);
 
diff --git a/system/bta/include/bta_sdp_api.h b/system/bta/include/bta_sdp_api.h
index 2344bc1c282..50d91eddccf 100644
--- a/system/bta/include/bta_sdp_api.h
+++ b/system/bta/include/bta_sdp_api.h
@@ -81,61 +81,61 @@ typedef struct
 } tBTA_SDP_CFG;
 
 /*******************************************************************************
-**
-** Function         BTA_SdpEnable
-**
-** Description      Enable the SDP I/F service. When the enable
-**                  operation is complete the callback function will be
-**                  called with a BTA_SDP_ENABLE_EVT. This function must
-**                  be called before other functions in the MCE API are
-**                  called.
-**
-** Returns          BTA_SDP_SUCCESS if successful.
-**                  BTA_SDP_FAIL if internal failure.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_SdpEnable
+ *
+ * Description      Enable the SDP I/F service. When the enable
+ *                  operation is complete the callback function will be
+ *                  called with a BTA_SDP_ENABLE_EVT. This function must
+ *                  be called before other functions in the MCE API are
+ *                  called.
+ *
+ * Returns          BTA_SDP_SUCCESS if successful.
+ *                  BTA_SDP_FAIL if internal failure.
+ *
+ ******************************************************************************/
 extern tBTA_SDP_STATUS BTA_SdpEnable(tBTA_SDP_DM_CBACK *p_cback);
 
 /*******************************************************************************
-**
-** Function         BTA_SdpSearch
-**
-** Description      Start a search for sdp records for a specific BD_ADDR with a
-**                  specific profile uuid.
-**                  When the search operation is completed, the callback function
-**                  will be called with a BTA_SDP_SEARCH_EVT.
-** Returns          BTA_SDP_SUCCESS if successful.
-**                  BTA_SDP_FAIL if internal failure.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_SdpSearch
+ *
+ * Description      Start a search for sdp records for a specific BD_ADDR with a
+ *                  specific profile uuid.
+ *                  When the search operation is completed, the callback function
+ *                  will be called with a BTA_SDP_SEARCH_EVT.
+ * Returns          BTA_SDP_SUCCESS if successful.
+ *                  BTA_SDP_FAIL if internal failure.
+ *
+ ******************************************************************************/
 extern tBTA_SDP_STATUS BTA_SdpSearch(BD_ADDR bd_addr,tSDP_UUID *uuid);
 
 /*******************************************************************************
-**
-** Function         BTA_SdpCreateRecordByUser
-**
-** Description      This function is used to request a callback to create a SDP
-**                  record. The registered callback will be called with event
-**                  BTA_SDP_CREATE_RECORD_USER_EVT.
-**
-** Returns          BTA_SDP_SUCCESS, if the request is being processed.
-**                  BTA_SDP_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_SdpCreateRecordByUser
+ *
+ * Description      This function is used to request a callback to create a SDP
+ *                  record. The registered callback will be called with event
+ *                  BTA_SDP_CREATE_RECORD_USER_EVT.
+ *
+ * Returns          BTA_SDP_SUCCESS, if the request is being processed.
+ *                  BTA_SDP_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 extern tBTA_SDP_STATUS BTA_SdpCreateRecordByUser(void* user_data);
 
 /*******************************************************************************
-**
-** Function         BTA_SdpRemoveRecordByUser
-**
-** Description      This function is used to request a callback to remove a SDP
-**                  record. The registered callback will be called with event
-**                  BTA_SDP_REMOVE_RECORD_USER_EVT.
-**
-** Returns          BTA_SDP_SUCCESS, if the request is being processed.
-**                  BTA_SDP_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_SdpRemoveRecordByUser
+ *
+ * Description      This function is used to request a callback to remove a SDP
+ *                  record. The registered callback will be called with event
+ *                  BTA_SDP_REMOVE_RECORD_USER_EVT.
+ *
+ * Returns          BTA_SDP_SUCCESS, if the request is being processed.
+ *                  BTA_SDP_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 extern tBTA_SDP_STATUS BTA_SdpRemoveRecordByUser(void* user_data);
 
 #ifdef __cplusplus
diff --git a/system/bta/include/utl.h b/system/bta/include/utl.h
index c09aa24155e..63903503761 100644
--- a/system/bta/include/utl.h
+++ b/system/bta/include/utl.h
@@ -32,8 +32,8 @@ extern "C" {
 #endif
 
 /*****************************************************************************
-**  Constants
-*****************************************************************************/
+ *  Constants
+ ****************************************************************************/
 /*** class of device settings ***/
 #define BTA_UTL_SET_COD_MAJOR_MINOR     0x01
 #define BTA_UTL_SET_COD_SERVICE_CLASS   0x02 /* only set the bits in the input */
@@ -42,8 +42,8 @@ extern "C" {
 #define BTA_UTL_INIT_COD                0x0a
 
 /*****************************************************************************
-**  Type Definitions
-*****************************************************************************/
+ *  Type Definitions
+ ****************************************************************************/
 
 /** for utl_set_device_class() **/
 typedef struct
@@ -55,109 +55,109 @@ typedef struct
 
 
 /*****************************************************************************
-**  External Function Declarations
-*****************************************************************************/
+ *  External Function Declarations
+ ****************************************************************************/
 
 /*******************************************************************************
-**
-** Function         utl_str2int
-**
-** Description      This utility function converts a character string to an
-**                  integer.  Acceptable values in string are 0-9.  If invalid
-**                  string or string value too large, -1 is returned.
-**
-**
-** Returns          Integer value or -1 on error.
-**
-*******************************************************************************/
+ *
+ * Function         utl_str2int
+ *
+ * Description      This utility function converts a character string to an
+ *                  integer.  Acceptable values in string are 0-9.  If invalid
+ *                  string or string value too large, -1 is returned.
+ *
+ *
+ * Returns          Integer value or -1 on error.
+ *
+ ******************************************************************************/
 extern int16_t utl_str2int(const char *p_s);
 
 /*******************************************************************************
-**
-** Function         utl_strucmp
-**
-** Description      This utility function compares two strings in uppercase.
-**                  String p_s must be uppercase.  String p_t is converted to
-**                  uppercase if lowercase.  If p_s ends first, the substring
-**                  match is counted as a match.
-**
-**
-** Returns          0 if strings match, nonzero otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         utl_strucmp
+ *
+ * Description      This utility function compares two strings in uppercase.
+ *                  String p_s must be uppercase.  String p_t is converted to
+ *                  uppercase if lowercase.  If p_s ends first, the substring
+ *                  match is counted as a match.
+ *
+ *
+ * Returns          0 if strings match, nonzero otherwise.
+ *
+ ******************************************************************************/
 extern int utl_strucmp(const char *p_s, const char *p_t);
 
 /*******************************************************************************
-**
-** Function         utl_itoa
-**
-** Description      This utility function converts a uint16_t to a string.  The
-**                  string is NULL-terminated.  The length of the string is
-**                  returned.
-**
-**
-** Returns          Length of string.
-**
-*******************************************************************************/
+ *
+ * Function         utl_itoa
+ *
+ * Description      This utility function converts a uint16_t to a string.  The
+ *                  string is NULL-terminated.  The length of the string is
+ *                  returned.
+ *
+ *
+ * Returns          Length of string.
+ *
+ ******************************************************************************/
 extern uint8_t utl_itoa(uint16_t i, char *p_s);
 
 /*******************************************************************************
-**
-** Function         utl_set_device_class
-**
-** Description      This function updates the local Device Class.
-**
-** Parameters:
-**                  p_cod   - Pointer to the device class to set to
-**
-**                  cmd     - the fields of the device class to update.
-**                            BTA_UTL_SET_COD_MAJOR_MINOR, - overwrite major, minor class
-**                            BTA_UTL_SET_COD_SERVICE_CLASS - set the bits in the input
-**                            BTA_UTL_CLR_COD_SERVICE_CLASS - clear the bits in the input
-**                            BTA_UTL_SET_COD_ALL - overwrite major, minor, set the bits in service class
-**                            BTA_UTL_INIT_COD - overwrite major, minor, and service class
-**
-** Returns          true if successful, Otherwise false
-**
-*******************************************************************************/
+ *
+ * Function         utl_set_device_class
+ *
+ * Description      This function updates the local Device Class.
+ *
+ * Parameters:
+ *                  p_cod   - Pointer to the device class to set to
+ *
+ *                  cmd     - the fields of the device class to update.
+ *                            BTA_UTL_SET_COD_MAJOR_MINOR, - overwrite major, minor class
+ *                            BTA_UTL_SET_COD_SERVICE_CLASS - set the bits in the input
+ *                            BTA_UTL_CLR_COD_SERVICE_CLASS - clear the bits in the input
+ *                            BTA_UTL_SET_COD_ALL - overwrite major, minor, set the bits in service class
+ *                            BTA_UTL_INIT_COD - overwrite major, minor, and service class
+ *
+ * Returns          true if successful, Otherwise false
+ *
+ ******************************************************************************/
 extern bool utl_set_device_class(tBTA_UTL_COD *p_cod, uint8_t cmd);
 
 /*******************************************************************************
-**
-** Function         utl_isintstr
-**
-** Description      This utility function checks if the given string is an
-**                  integer string or not
-**
-**
-** Returns          true if successful, Otherwise false
-**
-*******************************************************************************/
+ *
+ * Function         utl_isintstr
+ *
+ * Description      This utility function checks if the given string is an
+ *                  integer string or not
+ *
+ *
+ * Returns          true if successful, Otherwise false
+ *
+ ******************************************************************************/
 extern bool utl_isintstr(const char *p_s);
 
 /*******************************************************************************
-**
-** Function         utl_isdialchar
-**
-** Description      This utility function checks if the given character
-**                  is an acceptable dial digit
-**
-** Returns          true if successful, Otherwise false
-**
-*******************************************************************************/
+ *
+ * Function         utl_isdialchar
+ *
+ * Description      This utility function checks if the given character
+ *                  is an acceptable dial digit
+ *
+ * Returns          true if successful, Otherwise false
+ *
+ ******************************************************************************/
 extern bool utl_isdialchar(const char d);
 
 /*******************************************************************************
-**
-** Function         utl_isdialstr
-**
-** Description      This utility function checks if the given string contains
-**                  only dial digits or not
-**
-**
-** Returns          true if successful, Otherwise false
-**
-*******************************************************************************/
+ *
+ * Function         utl_isdialstr
+ *
+ * Description      This utility function checks if the given string contains
+ *                  only dial digits or not
+ *
+ *
+ * Returns          true if successful, Otherwise false
+ *
+ ******************************************************************************/
 extern bool utl_isdialstr(const char *p_s);
 
 #ifdef __cplusplus
diff --git a/system/bta/jv/bta_jv_act.cc b/system/bta/jv/bta_jv_act.cc
index d80da926eb9..4ba721564b9 100644
--- a/system/bta/jv/bta_jv_act.cc
+++ b/system/bta/jv/bta_jv_act.cc
@@ -102,14 +102,14 @@ tBTA_JV_STATUS bta_jv_set_pm_conn_state(tBTA_JV_PM_CB *p_cb, const tBTA_JV_CONN_
         new_st);
 
 /*******************************************************************************
-**
-** Function     bta_jv_alloc_sec_id
-**
-** Description  allocate a security id
-**
-** Returns
-**
-*******************************************************************************/
+ *
+ * Function     bta_jv_alloc_sec_id
+ *
+ * Description  allocate a security id
+ *
+ * Returns
+ *
+ ******************************************************************************/
 uint8_t bta_jv_alloc_sec_id(void)
 {
     uint8_t ret = 0;
@@ -156,14 +156,14 @@ static int get_rfc_cb_used(void)
 }
 
 /*******************************************************************************
-**
-** Function     bta_jv_free_sec_id
-**
-** Description  free the given security id
-**
-** Returns
-**
-*******************************************************************************/
+ *
+ * Function     bta_jv_free_sec_id
+ *
+ * Description  free the given security id
+ *
+ * Returns
+ *
+ ******************************************************************************/
 static void bta_jv_free_sec_id(uint8_t *p_sec_id)
 {
     uint8_t sec_id = *p_sec_id;
@@ -176,14 +176,14 @@ static void bta_jv_free_sec_id(uint8_t *p_sec_id)
 }
 
 /*******************************************************************************
-**
-** Function     bta_jv_alloc_rfc_cb
-**
-** Description  allocate a control block for the given port handle
-**
-** Returns
-**
-*******************************************************************************/
+ *
+ * Function     bta_jv_alloc_rfc_cb
+ *
+ * Description  allocate a control block for the given port handle
+ *
+ * Returns
+ *
+ ******************************************************************************/
 tBTA_JV_RFC_CB * bta_jv_alloc_rfc_cb(uint16_t port_handle, tBTA_JV_PCB **pp_pcb)
 {
     tBTA_JV_RFC_CB *p_cb = NULL;
@@ -222,14 +222,14 @@ tBTA_JV_RFC_CB * bta_jv_alloc_rfc_cb(uint16_t port_handle, tBTA_JV_PCB **pp_pcb)
 }
 
 /*******************************************************************************
-**
-** Function     bta_jv_rfc_port_to_pcb
-**
-** Description  find the port control block associated with the given port handle
-**
-** Returns
-**
-*******************************************************************************/
+ *
+ * Function     bta_jv_rfc_port_to_pcb
+ *
+ * Description  find the port control block associated with the given port handle
+ *
+ * Returns
+ *
+ ******************************************************************************/
 tBTA_JV_PCB * bta_jv_rfc_port_to_pcb(uint16_t port_handle)
 {
     tBTA_JV_PCB *p_pcb = NULL;
@@ -244,14 +244,14 @@ tBTA_JV_PCB * bta_jv_rfc_port_to_pcb(uint16_t port_handle)
 }
 
 /*******************************************************************************
-**
-** Function     bta_jv_rfc_port_to_cb
-**
-** Description  find the RFCOMM control block associated with the given port handle
-**
-** Returns
-**
-*******************************************************************************/
+ *
+ * Function     bta_jv_rfc_port_to_cb
+ *
+ * Description  find the RFCOMM control block associated with the given port handle
+ *
+ * Returns
+ *
+ ******************************************************************************/
 tBTA_JV_RFC_CB * bta_jv_rfc_port_to_cb(uint16_t port_handle)
 {
     tBTA_JV_RFC_CB *p_cb = NULL;
@@ -373,14 +373,14 @@ static tBTA_JV_STATUS bta_jv_free_rfc_cb(tBTA_JV_RFC_CB *p_cb, tBTA_JV_PCB *p_pc
 }
 
 /*******************************************************************************
-**
-** Function     bta_jv_free_l2c_cb
-**
-** Description  free the given L2CAP control block
-**
-** Returns
-**
-*******************************************************************************/
+ *
+ * Function     bta_jv_free_l2c_cb
+ *
+ * Description  free the given L2CAP control block
+ *
+ * Returns
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS bta_jv_free_l2c_cb(tBTA_JV_L2C_CB *p_cb)
 {
     tBTA_JV_STATUS status = BTA_JV_SUCCESS;
@@ -400,17 +400,17 @@ tBTA_JV_STATUS bta_jv_free_l2c_cb(tBTA_JV_L2C_CB *p_cb)
 }
 
 /*******************************************************************************
-**
-**
-** Function    bta_jv_clear_pm_cb
-**
-** Description clears jv pm control block and optionally calls bta_sys_conn_close()
-**             In general close_conn should be set to true to remove registering with
-**             dm pm!
-**
-** WARNING:    Make sure to clear pointer form port or l2c to this control block too!
-**
-*******************************************************************************/
+ *
+ *
+ * Function    bta_jv_clear_pm_cb
+ *
+ * Description clears jv pm control block and optionally calls bta_sys_conn_close()
+ *             In general close_conn should be set to true to remove registering with
+ *             dm pm!
+ *
+ * WARNING:    Make sure to clear pointer form port or l2c to this control block too!
+ *
+ ******************************************************************************/
 static void bta_jv_clear_pm_cb(tBTA_JV_PM_CB *p_pm_cb, bool close_conn)
 {
     /* needs to be called if registered with bta pm, otherwise we may run out of dm pm slots! */
@@ -423,14 +423,14 @@ static void bta_jv_clear_pm_cb(tBTA_JV_PM_CB *p_pm_cb, bool close_conn)
 }
 
 /*******************************************************************************
- **
- ** Function     bta_jv_free_set_pm_profile_cb
- **
- ** Description  free pm profile control block
- **
- ** Returns     BTA_JV_SUCCESS if cb has been freed correctly,
- **             BTA_JV_FAILURE in case of no profile has been registered or already freed
- **
+ *
+ * Function     bta_jv_free_set_pm_profile_cb
+ *
+ * Description  free pm profile control block
+ *
+ * Returns     BTA_JV_SUCCESS if cb has been freed correctly,
+ *             BTA_JV_FAILURE in case of no profile has been registered or already freed
+ *
  *******************************************************************************/
 static tBTA_JV_STATUS bta_jv_free_set_pm_profile_cb(uint32_t jv_handle)
 {
@@ -510,13 +510,13 @@ static tBTA_JV_STATUS bta_jv_free_set_pm_profile_cb(uint32_t jv_handle)
 }
 
 /*******************************************************************************
- **
- ** Function    bta_jv_alloc_set_pm_profile_cb
- **
- ** Description set PM profile control block
- **
- ** Returns     pointer to allocated cb or NULL in case of failure
- **
+ *
+ * Function    bta_jv_alloc_set_pm_profile_cb
+ *
+ * Description set PM profile control block
+ *
+ * Returns     pointer to allocated cb or NULL in case of failure
+ *
  *******************************************************************************/
 static tBTA_JV_PM_CB *bta_jv_alloc_set_pm_profile_cb(uint32_t jv_handle, tBTA_JV_PM_ID app_id)
 {
@@ -584,14 +584,14 @@ static tBTA_JV_PM_CB *bta_jv_alloc_set_pm_profile_cb(uint32_t jv_handle, tBTA_JV
 }
 
 /*******************************************************************************
-**
-** Function     bta_jv_check_psm
-**
-** Description  for now use only the legal PSM per JSR82 spec
-**
-** Returns      true, if allowed
-**
-*******************************************************************************/
+ *
+ * Function     bta_jv_check_psm
+ *
+ * Description  for now use only the legal PSM per JSR82 spec
+ *
+ * Returns      true, if allowed
+ *
+ ******************************************************************************/
 bool bta_jv_check_psm(uint16_t psm)
 {
     bool ret = false;
@@ -650,14 +650,14 @@ bool bta_jv_check_psm(uint16_t psm)
 }
 
 /*******************************************************************************
-**
-** Function     bta_jv_enable
-**
-** Description  Initialises the JAVA I/F
-**
-** Returns      void
-**
-*******************************************************************************/
+ *
+ * Function     bta_jv_enable
+ *
+ * Description  Initialises the JAVA I/F
+ *
+ * Returns      void
+ *
+ ******************************************************************************/
 void bta_jv_enable(tBTA_JV_MSG *p_data)
 {
     tBTA_JV_STATUS status = BTA_JV_SUCCESS;
@@ -667,15 +667,15 @@ void bta_jv_enable(tBTA_JV_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function     bta_jv_disable
-**
-** Description  Disables the BT device manager
-**              free the resources used by java
-**
-** Returns      void
-**
-*******************************************************************************/
+ *
+ * Function     bta_jv_disable
+ *
+ * Description  Disables the BT device manager
+ *              free the resources used by java
+ *
+ * Returns      void
+ *
+ ******************************************************************************/
 void bta_jv_disable (UNUSED_ATTR tBTA_JV_MSG *p_data)
 {
     APPL_TRACE_ERROR("%s",__func__);
@@ -720,15 +720,15 @@ static void bta_jv_set_free_psm(uint16_t psm) {
 }
 
 /*******************************************************************************
-**
-** Function     bta_jv_get_channel_id
-**
-** Description  Obtain a free SCN (Server Channel Number)
-**              (RFCOMM channel or L2CAP PSM)
-**
-** Returns      void
-**
-*******************************************************************************/
+ *
+ * Function     bta_jv_get_channel_id
+ *
+ * Description  Obtain a free SCN (Server Channel Number)
+ *              (RFCOMM channel or L2CAP PSM)
+ *
+ * Returns      void
+ *
+ ******************************************************************************/
 void bta_jv_get_channel_id(tBTA_JV_MSG *p_data)
 {
     uint16_t   psm = 0;
@@ -775,14 +775,14 @@ void bta_jv_get_channel_id(tBTA_JV_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function     bta_jv_free_scn
-**
-** Description  free a SCN
-**
-** Returns      void
-**
-*******************************************************************************/
+ *
+ * Function     bta_jv_free_scn
+ *
+ * Description  free a SCN
+ *
+ * Returns      void
+ *
+ ******************************************************************************/
 void bta_jv_free_scn(tBTA_JV_MSG *p_data)
 {
     uint16_t   scn = p_data->free_channel.scn;
@@ -844,14 +844,14 @@ static inline tBT_UUID shorten_sdp_uuid(const tBT_UUID* u)
 }
 
 /*******************************************************************************
-**
-** Function     bta_jv_start_discovery_cback
-**
-** Description  Callback for Start Discovery
-**
-** Returns      void
-**
-*******************************************************************************/
+ *
+ * Function     bta_jv_start_discovery_cback
+ *
+ * Description  Callback for Start Discovery
+ *
+ * Returns      void
+ *
+ ******************************************************************************/
 static void bta_jv_start_discovery_cback(uint16_t result, void * user_data)
 {
     tBTA_JV_STATUS status;
@@ -886,14 +886,14 @@ static void bta_jv_start_discovery_cback(uint16_t result, void * user_data)
 }
 
 /*******************************************************************************
-**
-** Function     bta_jv_start_discovery
-**
-** Description  Discovers services on a remote device
-**
-** Returns      void
-**
-*******************************************************************************/
+ *
+ * Function     bta_jv_start_discovery
+ *
+ * Description  Discovers services on a remote device
+ *
+ * Returns      void
+ *
+ ******************************************************************************/
 void bta_jv_start_discovery(tBTA_JV_MSG *p_data)
 {
     tBTA_JV_STATUS status = BTA_JV_FAILURE;
@@ -936,14 +936,14 @@ void bta_jv_start_discovery(tBTA_JV_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function     bta_jv_create_record
-**
-** Description  Create an SDP record with the given attributes
-**
-** Returns      void
-**
-*******************************************************************************/
+ *
+ * Function     bta_jv_create_record
+ *
+ * Description  Create an SDP record with the given attributes
+ *
+ * Returns      void
+ *
+ ******************************************************************************/
 void bta_jv_create_record(tBTA_JV_MSG *p_data)
 {
     tBTA_JV_API_CREATE_RECORD *cr = &(p_data->create_record);
@@ -955,15 +955,15 @@ void bta_jv_create_record(tBTA_JV_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function     bta_jv_delete_record
-**
-** Description  Delete an SDP record
-**
-**
-** Returns      void
-**
-*******************************************************************************/
+ *
+ * Function     bta_jv_delete_record
+ *
+ * Description  Delete an SDP record
+ *
+ *
+ * Returns      void
+ *
+ ******************************************************************************/
 void bta_jv_delete_record(tBTA_JV_MSG *p_data)
 {
     tBTA_JV_API_ADD_ATTRIBUTE *dr = &(p_data->add_attr);
@@ -975,14 +975,14 @@ void bta_jv_delete_record(tBTA_JV_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function     bta_jv_l2cap_client_cback
-**
-** Description  handles the l2cap client events
-**
-** Returns      void
-**
-*******************************************************************************/
+ *
+ * Function     bta_jv_l2cap_client_cback
+ *
+ * Description  handles the l2cap client events
+ *
+ * Returns      void
+ *
+ ******************************************************************************/
 static void bta_jv_l2cap_client_cback(uint16_t gap_handle, uint16_t event)
 {
     tBTA_JV_L2C_CB  *p_cb = &bta_jv_cb.l2c_cb[gap_handle];
@@ -1037,14 +1037,14 @@ static void bta_jv_l2cap_client_cback(uint16_t gap_handle, uint16_t event)
 }
 
 /*******************************************************************************
-**
-** Function     bta_jv_l2cap_connect
-**
-** Description  makes an l2cap client connection
-**
-** Returns      void
-**
-*******************************************************************************/
+ *
+ * Function     bta_jv_l2cap_connect
+ *
+ * Description  makes an l2cap client connection
+ *
+ * Returns      void
+ *
+ ******************************************************************************/
 void bta_jv_l2cap_connect(tBTA_JV_MSG *p_data)
 {
     tBTA_JV_L2C_CB      *p_cb;
@@ -1119,14 +1119,14 @@ void bta_jv_l2cap_connect(tBTA_JV_MSG *p_data)
 
 
 /*******************************************************************************
-**
-** Function     bta_jv_l2cap_close
-**
-** Description  Close an L2CAP client connection
-**
-** Returns      void
-**
-*******************************************************************************/
+ *
+ * Function     bta_jv_l2cap_close
+ *
+ * Description  Close an L2CAP client connection
+ *
+ * Returns      void
+ *
+ ******************************************************************************/
 void bta_jv_l2cap_close(tBTA_JV_MSG *p_data)
 {
     tBTA_JV_L2CAP_CLOSE  evt_data;
@@ -1143,14 +1143,14 @@ void bta_jv_l2cap_close(tBTA_JV_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_jv_l2cap_server_cback
-**
-** Description      handles the l2cap server callback
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_jv_l2cap_server_cback
+ *
+ * Description      handles the l2cap server callback
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_jv_l2cap_server_cback(uint16_t gap_handle, uint16_t event)
 {
     tBTA_JV_L2C_CB  *p_cb = &bta_jv_cb.l2c_cb[gap_handle];
@@ -1208,14 +1208,14 @@ static void bta_jv_l2cap_server_cback(uint16_t gap_handle, uint16_t event)
 }
 
 /*******************************************************************************
-**
-** Function     bta_jv_l2cap_start_server
-**
-** Description  starts an L2CAP server
-**
-** Returns      void
-**
-*******************************************************************************/
+ *
+ * Function     bta_jv_l2cap_start_server
+ *
+ * Description  starts an L2CAP server
+ *
+ * Returns      void
+ *
+ ******************************************************************************/
 void bta_jv_l2cap_start_server(tBTA_JV_MSG *p_data)
 {
     tBTA_JV_L2C_CB      *p_cb;
@@ -1284,14 +1284,14 @@ void bta_jv_l2cap_start_server(tBTA_JV_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function     bta_jv_l2cap_stop_server
-**
-** Description  stops an L2CAP server
-**
-** Returns      void
-**
-*******************************************************************************/
+ *
+ * Function     bta_jv_l2cap_stop_server
+ *
+ * Description  stops an L2CAP server
+ *
+ * Returns      void
+ *
+ ******************************************************************************/
 void bta_jv_l2cap_stop_server(tBTA_JV_MSG *p_data)
 {
     tBTA_JV_L2C_CB      *p_cb;
@@ -1319,14 +1319,14 @@ void bta_jv_l2cap_stop_server(tBTA_JV_MSG *p_data)
 
 
 /*******************************************************************************
-**
-** Function     bta_jv_l2cap_read
-**
-** Description  Read data from an L2CAP connection
-**
-** Returns      void
-**
-*******************************************************************************/
+ *
+ * Function     bta_jv_l2cap_read
+ *
+ * Description  Read data from an L2CAP connection
+ *
+ * Returns      void
+ *
+ ******************************************************************************/
 void bta_jv_l2cap_read(tBTA_JV_MSG *p_data)
 {
     tBTA_JV_L2CAP_READ evt_data;
@@ -1348,14 +1348,14 @@ void bta_jv_l2cap_read(tBTA_JV_MSG *p_data)
 
 
 /*******************************************************************************
-**
-** Function     bta_jv_l2cap_write
-**
-** Description  Write data to an L2CAP connection
-**
-** Returns      void
-**
-*******************************************************************************/
+ *
+ * Function     bta_jv_l2cap_write
+ *
+ * Description  Write data to an L2CAP connection
+ *
+ * Returns      void
+ *
+ ******************************************************************************/
 void bta_jv_l2cap_write(tBTA_JV_MSG *p_data)
 {
     tBTA_JV_L2CAP_WRITE evt_data;
@@ -1395,14 +1395,14 @@ void bta_jv_l2cap_write(tBTA_JV_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function     bta_jv_l2cap_write_fixed
-**
-** Description  Write data to an L2CAP connection using Fixed channels
-**
-** Returns      void
-**
-*******************************************************************************/
+ *
+ * Function     bta_jv_l2cap_write_fixed
+ *
+ * Description  Write data to an L2CAP connection using Fixed channels
+ *
+ * Returns      void
+ *
+ ******************************************************************************/
 void bta_jv_l2cap_write_fixed(tBTA_JV_MSG *p_data)
 {
     tBTA_JV_L2CAP_WRITE_FIXED evt_data;
@@ -1426,15 +1426,15 @@ void bta_jv_l2cap_write_fixed(tBTA_JV_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function     bta_jv_port_data_co_cback
-**
-** Description  port data callback function of rfcomm
-**              connections
-**
-** Returns      void
-**
-*******************************************************************************/
+ *
+ * Function     bta_jv_port_data_co_cback
+ *
+ * Description  port data callback function of rfcomm
+ *              connections
+ *
+ * Returns      void
+ *
+ ******************************************************************************/
 static int bta_jv_port_data_co_cback(uint16_t port_handle, uint8_t *buf, uint16_t len, int type)
 {
     tBTA_JV_RFC_CB  *p_cb = bta_jv_rfc_port_to_cb(port_handle);
@@ -1459,15 +1459,15 @@ static int bta_jv_port_data_co_cback(uint16_t port_handle, uint8_t *buf, uint16_
 }
 
 /*******************************************************************************
-**
-** Function     bta_jv_port_mgmt_cl_cback
-**
-** Description  callback for port mamangement function of rfcomm
-**              client connections
-**
-** Returns      void
-**
-*******************************************************************************/
+ *
+ * Function     bta_jv_port_mgmt_cl_cback
+ *
+ * Description  callback for port mamangement function of rfcomm
+ *              client connections
+ *
+ * Returns      void
+ *
+ ******************************************************************************/
 static void bta_jv_port_mgmt_cl_cback(uint32_t code, uint16_t port_handle)
 {
     tBTA_JV_RFC_CB  *p_cb = bta_jv_rfc_port_to_cb(port_handle);
@@ -1514,14 +1514,14 @@ static void bta_jv_port_mgmt_cl_cback(uint32_t code, uint16_t port_handle)
 }
 
 /*******************************************************************************
-**
-** Function     bta_jv_port_event_cl_cback
-**
-** Description  Callback for RFCOMM client port events
-**
-** Returns      void
-**
-*******************************************************************************/
+ *
+ * Function     bta_jv_port_event_cl_cback
+ *
+ * Description  Callback for RFCOMM client port events
+ *
+ * Returns      void
+ *
+ ******************************************************************************/
 static void bta_jv_port_event_cl_cback(uint32_t code, uint16_t port_handle)
 {
     tBTA_JV_RFC_CB  *p_cb = bta_jv_rfc_port_to_cb(port_handle);
@@ -1556,14 +1556,14 @@ static void bta_jv_port_event_cl_cback(uint32_t code, uint16_t port_handle)
 }
 
 /*******************************************************************************
-**
-** Function     bta_jv_rfcomm_connect
-**
-** Description  Client initiates an RFCOMM connection
-**
-** Returns      void
-**
-*******************************************************************************/
+ *
+ * Function     bta_jv_rfcomm_connect
+ *
+ * Description  Client initiates an RFCOMM connection
+ *
+ * Returns      void
+ *
+ ******************************************************************************/
 void bta_jv_rfcomm_connect(tBTA_JV_MSG *p_data)
 {
     uint16_t handle = 0;
@@ -1664,14 +1664,14 @@ static int find_rfc_pcb(void* user_data, tBTA_JV_RFC_CB **cb, tBTA_JV_PCB **pcb)
 }
 
 /*******************************************************************************
-**
-** Function     bta_jv_rfcomm_close
-**
-** Description  Close an RFCOMM connection
-**
-** Returns      void
-**
-*******************************************************************************/
+ *
+ * Function     bta_jv_rfcomm_close
+ *
+ * Description  Close an RFCOMM connection
+ *
+ * Returns      void
+ *
+ ******************************************************************************/
 void bta_jv_rfcomm_close(tBTA_JV_MSG *p_data)
 {
     tBTA_JV_API_RFCOMM_CLOSE *cc = &(p_data->rfcomm_close);
@@ -1693,15 +1693,15 @@ void bta_jv_rfcomm_close(tBTA_JV_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function     bta_jv_port_mgmt_sr_cback
-**
-** Description  callback for port mamangement function of rfcomm
-**              server connections
-**
-** Returns      void
-**
-*******************************************************************************/
+ *
+ * Function     bta_jv_port_mgmt_sr_cback
+ *
+ * Description  callback for port mamangement function of rfcomm
+ *              server connections
+ *
+ * Returns      void
+ *
+ ******************************************************************************/
 static void bta_jv_port_mgmt_sr_cback(uint32_t code, uint16_t port_handle)
 {
     tBTA_JV_PCB     *p_pcb = bta_jv_rfc_port_to_pcb(port_handle);
@@ -1764,14 +1764,14 @@ static void bta_jv_port_mgmt_sr_cback(uint32_t code, uint16_t port_handle)
 }
 
 /*******************************************************************************
-**
-** Function     bta_jv_port_event_sr_cback
-**
-** Description  Callback for RFCOMM server port events
-**
-** Returns      void
-**
-*******************************************************************************/
+ *
+ * Function     bta_jv_port_event_sr_cback
+ *
+ * Description  Callback for RFCOMM server port events
+ *
+ * Returns      void
+ *
+ ******************************************************************************/
 static void bta_jv_port_event_sr_cback(uint32_t code, uint16_t port_handle)
 {
     tBTA_JV_PCB     *p_pcb = bta_jv_rfc_port_to_pcb(port_handle);
@@ -1807,14 +1807,14 @@ static void bta_jv_port_event_sr_cback(uint32_t code, uint16_t port_handle)
 }
 
 /*******************************************************************************
-**
-** Function     bta_jv_add_rfc_port
-**
-** Description  add a port for server when the existing posts is open
-**
-** Returns   return a pointer to tBTA_JV_PCB just added
-**
-*******************************************************************************/
+ *
+ * Function     bta_jv_add_rfc_port
+ *
+ * Description  add a port for server when the existing posts is open
+ *
+ * Returns   return a pointer to tBTA_JV_PCB just added
+ *
+ ******************************************************************************/
 static tBTA_JV_PCB * bta_jv_add_rfc_port(tBTA_JV_RFC_CB *p_cb, tBTA_JV_PCB *p_pcb_open)
 {
     uint8_t   used = 0, i, listen=0;
@@ -1892,15 +1892,15 @@ static tBTA_JV_PCB * bta_jv_add_rfc_port(tBTA_JV_RFC_CB *p_cb, tBTA_JV_PCB *p_pc
 }
 
 /*******************************************************************************
-**
-** Function     bta_jv_rfcomm_start_server
-**
-** Description  waits for an RFCOMM client to connect
-**
-**
-** Returns      void
-**
-*******************************************************************************/
+ *
+ * Function     bta_jv_rfcomm_start_server
+ *
+ * Description  waits for an RFCOMM client to connect
+ *
+ *
+ * Returns      void
+ *
+ ******************************************************************************/
 void bta_jv_rfcomm_start_server(tBTA_JV_MSG *p_data)
 {
     uint16_t handle = 0;
@@ -1983,14 +1983,14 @@ void bta_jv_rfcomm_start_server(tBTA_JV_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function     bta_jv_rfcomm_stop_server
-**
-** Description  stops an RFCOMM server
-**
-** Returns      void
-**
-*******************************************************************************/
+ *
+ * Function     bta_jv_rfcomm_stop_server
+ *
+ * Description  stops an RFCOMM server
+ *
+ * Returns      void
+ *
+ ******************************************************************************/
 
 void bta_jv_rfcomm_stop_server(tBTA_JV_MSG *p_data)
 {
@@ -2014,14 +2014,14 @@ void bta_jv_rfcomm_stop_server(tBTA_JV_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function     bta_jv_rfcomm_write
-**
-** Description  write data to an RFCOMM connection
-**
-** Returns      void
-**
-*******************************************************************************/
+ *
+ * Function     bta_jv_rfcomm_write
+ *
+ * Description  write data to an RFCOMM connection
+ *
+ * Returns      void
+ *
+ ******************************************************************************/
 void bta_jv_rfcomm_write(tBTA_JV_MSG *p_data)
 {
     tBTA_JV_API_RFCOMM_WRITE *wc = &(p_data->rfcomm_write);
@@ -2061,13 +2061,13 @@ void bta_jv_rfcomm_write(tBTA_JV_MSG *p_data)
 }
 
 /*******************************************************************************
- **
- ** Function     bta_jv_set_pm_profile
- **
- ** Description  Set or free power mode profile for a JV application
- **
- ** Returns      void
- **
+ *
+ * Function     bta_jv_set_pm_profile
+ *
+ * Description  Set or free power mode profile for a JV application
+ *
+ * Returns      void
+ *
  *******************************************************************************/
 void bta_jv_set_pm_profile(tBTA_JV_MSG *p_data)
 {
@@ -2101,13 +2101,13 @@ void bta_jv_set_pm_profile(tBTA_JV_MSG *p_data)
 }
 
 /*******************************************************************************
- **
- ** Function     bta_jv_change_pm_state
- **
- ** Description  change jv pm connect state, used internally
- **
- ** Returns      void
- **
+ *
+ * Function     bta_jv_change_pm_state
+ *
+ * Description  change jv pm connect state, used internally
+ *
+ * Returns      void
+ *
  *******************************************************************************/
 void bta_jv_change_pm_state(tBTA_JV_MSG *p_data)
 {
@@ -2119,17 +2119,17 @@ void bta_jv_change_pm_state(tBTA_JV_MSG *p_data)
 
 
 /*******************************************************************************
- **
- ** Function    bta_jv_set_pm_conn_state
- **
- ** Description Send pm event state change to jv state machine to serialize jv pm changes
- **             in relation to other jv messages. internal API use mainly.
- **
- ** Params:     p_cb: jv pm control block, NULL pointer returns failure
- **             new_state: new PM connections state, setting is forced by action function
- **
- ** Returns     BTA_JV_SUCCESS, BTA_JV_FAILURE (buffer allocation, or NULL ptr!)
- **
+ *
+ * Function    bta_jv_set_pm_conn_state
+ *
+ * Description Send pm event state change to jv state machine to serialize jv pm changes
+ *             in relation to other jv messages. internal API use mainly.
+ *
+ * Params:     p_cb: jv pm control block, NULL pointer returns failure
+ *             new_state: new PM connections state, setting is forced by action function
+ *
+ * Returns     BTA_JV_SUCCESS, BTA_JV_FAILURE (buffer allocation, or NULL ptr!)
+ *
  *******************************************************************************/
 tBTA_JV_STATUS bta_jv_set_pm_conn_state(tBTA_JV_PM_CB *p_cb, const tBTA_JV_CONN_STATE
         new_st)
@@ -2152,15 +2152,15 @@ tBTA_JV_STATUS bta_jv_set_pm_conn_state(tBTA_JV_PM_CB *p_cb, const tBTA_JV_CONN_
 }
 
 /*******************************************************************************
- **
- ** Function    bta_jv_pm_conn_busy
- **
- ** Description set pm connection busy state (input param safe)
- **
- ** Params      p_cb: pm control block of jv connection
- **
- ** Returns     void
- **
+ *
+ * Function    bta_jv_pm_conn_busy
+ *
+ * Description set pm connection busy state (input param safe)
+ *
+ * Params      p_cb: pm control block of jv connection
+ *
+ * Returns     void
+ *
  *******************************************************************************/
 static void bta_jv_pm_conn_busy(tBTA_JV_PM_CB *p_cb)
 {
@@ -2169,15 +2169,15 @@ static void bta_jv_pm_conn_busy(tBTA_JV_PM_CB *p_cb)
 }
 
 /*******************************************************************************
- **
- ** Function    bta_jv_pm_conn_busy
- **
- ** Description set pm connection busy state (input param safe)
- **
- ** Params      p_cb: pm control block of jv connection
- **
- ** Returns     void
- **
+ *
+ * Function    bta_jv_pm_conn_busy
+ *
+ * Description set pm connection busy state (input param safe)
+ *
+ * Params      p_cb: pm control block of jv connection
+ *
+ * Returns     void
+ *
  *******************************************************************************/
 static void bta_jv_pm_conn_idle(tBTA_JV_PM_CB *p_cb)
 {
@@ -2186,15 +2186,15 @@ static void bta_jv_pm_conn_idle(tBTA_JV_PM_CB *p_cb)
 }
 
 /*******************************************************************************
- **
- ** Function     bta_jv_pm_state_change
- **
- ** Description  Notify power manager there is state change
- **
- ** Params      p_cb: must be NONE NULL
- **
- ** Returns      void
- **
+ *
+ * Function     bta_jv_pm_state_change
+ *
+ * Description  Notify power manager there is state change
+ *
+ * Params      p_cb: must be NONE NULL
+ *
+ * Returns      void
+ *
  *******************************************************************************/
 static void bta_jv_pm_state_change(tBTA_JV_PM_CB *p_cb, const tBTA_JV_CONN_STATE state)
 {
@@ -2508,14 +2508,14 @@ static void fcchan_data_cbk(uint16_t chan, BD_ADDR bd_addr, BT_HDR *p_buf)
 
 
 /*******************************************************************************
-**
-** Function     bta_jv_l2cap_connect_le
-**
-** Description  makes an le l2cap client connection
-**
-** Returns      void
-**
-*******************************************************************************/
+ *
+ * Function     bta_jv_l2cap_connect_le
+ *
+ * Description  makes an le l2cap client connection
+ *
+ * Returns      void
+ *
+ ******************************************************************************/
 void bta_jv_l2cap_connect_le(tBTA_JV_MSG *p_data)
 {
     tBTA_JV_API_L2CAP_CONNECT *cc = &(p_data->l2cap_connect);
@@ -2560,14 +2560,14 @@ void bta_jv_l2cap_connect_le(tBTA_JV_MSG *p_data)
 
 
 /*******************************************************************************
-**
-** Function     bta_jv_l2cap_stop_server_le
-**
-** Description  stops an LE L2CAP server
-**
-** Returns      void
-**
-*******************************************************************************/
+ *
+ * Function     bta_jv_l2cap_stop_server_le
+ *
+ * Description  stops an LE L2CAP server
+ *
+ * Returns      void
+ *
+ ******************************************************************************/
 void bta_jv_l2cap_stop_server_le(tBTA_JV_MSG *p_data)
 {
     tBTA_JV  evt;
@@ -2600,14 +2600,14 @@ void bta_jv_l2cap_stop_server_le(tBTA_JV_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function     bta_jv_l2cap_start_server_le
-**
-** Description  starts an LE L2CAP server
-**
-** Returns      void
-**
-*******************************************************************************/
+ *
+ * Function     bta_jv_l2cap_start_server_le
+ *
+ * Description  starts an LE L2CAP server
+ *
+ * Returns      void
+ *
+ ******************************************************************************/
 void bta_jv_l2cap_start_server_le(tBTA_JV_MSG *p_data)
 {
     tBTA_JV_API_L2CAP_SERVER *ss = &(p_data->l2cap_server);
@@ -2635,14 +2635,14 @@ out:
 }
 
 /*******************************************************************************
-**
-** Function     bta_jv_l2cap_close_fixed
-**
-** Description  close a fixed channel connection. calls no callbacks. idempotent
-**
-** Returns      void
-**
-*******************************************************************************/
+ *
+ * Function     bta_jv_l2cap_close_fixed
+ *
+ * Description  close a fixed channel connection. calls no callbacks. idempotent
+ *
+ * Returns      void
+ *
+ ******************************************************************************/
 extern void bta_jv_l2cap_close_fixed (tBTA_JV_MSG *p_data)
 {
     tBTA_JV_API_L2CAP_CLOSE *cc = &(p_data->l2cap_close);
diff --git a/system/bta/jv/bta_jv_api.cc b/system/bta/jv/bta_jv_api.cc
index 32f85975dbf..f14f6e99898 100644
--- a/system/bta/jv/bta_jv_api.cc
+++ b/system/bta/jv/bta_jv_api.cc
@@ -34,8 +34,8 @@
 #include "gap_api.h"
 
 /*****************************************************************************
-**  Constants
-*****************************************************************************/
+ *  Constants
+ ****************************************************************************/
 
 static const tBTA_SYS_REG bta_jv_reg =
 {
@@ -44,19 +44,19 @@ static const tBTA_SYS_REG bta_jv_reg =
 };
 
 /*******************************************************************************
-**
-** Function         BTA_JvEnable
-**
-** Description      Enable the Java I/F service. When the enable
-**                  operation is complete the callback function will be
-**                  called with a BTA_JV_ENABLE_EVT. This function must
-**                  be called before other function in the JV API are
-**                  called.
-**
-** Returns          BTA_JV_SUCCESS if successful.
-**                  BTA_JV_FAIL if internal failure.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvEnable
+ *
+ * Description      Enable the Java I/F service. When the enable
+ *                  operation is complete the callback function will be
+ *                  called with a BTA_JV_ENABLE_EVT. This function must
+ *                  be called before other function in the JV API are
+ *                  called.
+ *
+ * Returns          BTA_JV_SUCCESS if successful.
+ *                  BTA_JV_FAIL if internal failure.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvEnable(tBTA_JV_DM_CBACK *p_cback)
 {
     tBTA_JV_STATUS status = BTA_JV_FAILURE;
@@ -92,14 +92,14 @@ tBTA_JV_STATUS BTA_JvEnable(tBTA_JV_DM_CBACK *p_cback)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_JvDisable
-**
-** Description      Disable the Java I/F
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvDisable
+ *
+ * Description      Disable the Java I/F
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_JvDisable(void)
 {
     BT_HDR *p_buf = (BT_HDR *)osi_malloc(sizeof(BT_HDR));
@@ -113,15 +113,15 @@ void BTA_JvDisable(void)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_JvIsEncrypted
-**
-** Description      This function checks if the link to peer device is encrypted
-**
-** Returns          true if encrypted.
-**                  false if not.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvIsEncrypted
+ *
+ * Description      This function checks if the link to peer device is encrypted
+ *
+ * Returns          true if encrypted.
+ *                  false if not.
+ *
+ ******************************************************************************/
 bool BTA_JvIsEncrypted(BD_ADDR bd_addr)
 {
     bool is_encrypted = false;
@@ -137,27 +137,27 @@ bool BTA_JvIsEncrypted(BD_ADDR bd_addr)
     return is_encrypted;
 }
 /*******************************************************************************
-**
-** Function         BTA_JvGetChannelId
-**
-** Description      This function reserves a SCN (server channel number) for
-**                  applications running over RFCOMM, L2CAP of L2CAP_LE.
-**                  It is primarily called by server profiles/applications to
-**                  register their SCN into the SDP database. The SCN is reported
-**                  by the tBTA_JV_DM_CBACK callback with a BTA_JV_GET_SCN_EVT
-**                  for RFCOMM channels and BTA_JV_GET_PSM_EVT for L2CAP and LE.
-**                  If the SCN/PSM reported is 0, that means all resources are
-**                  exhausted.
-** Parameters
-**   conn_type      one of BTA_JV_CONN_TYPE_
-**   user_data      Any uservalue - will be returned in the resulting event.
-**   channel        Only used for RFCOMM - to try to allocate a specific RFCOMM
-**                  channel.
-**
-** Returns          BTA_JV_SUCCESS, if the request is being processed.
-**                  BTA_JV_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvGetChannelId
+ *
+ * Description      This function reserves a SCN (server channel number) for
+ *                  applications running over RFCOMM, L2CAP of L2CAP_LE.
+ *                  It is primarily called by server profiles/applications to
+ *                  register their SCN into the SDP database. The SCN is reported
+ *                  by the tBTA_JV_DM_CBACK callback with a BTA_JV_GET_SCN_EVT
+ *                  for RFCOMM channels and BTA_JV_GET_PSM_EVT for L2CAP and LE.
+ *                  If the SCN/PSM reported is 0, that means all resources are
+ *                  exhausted.
+ * Parameters
+ *   conn_type      one of BTA_JV_CONN_TYPE_
+ *   user_data      Any uservalue - will be returned in the resulting event.
+ *   channel        Only used for RFCOMM - to try to allocate a specific RFCOMM
+ *                  channel.
+ *
+ * Returns          BTA_JV_SUCCESS, if the request is being processed.
+ *                  BTA_JV_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvGetChannelId(int conn_type, void* user_data, int32_t channel)
 {
     tBTA_JV_API_ALLOC_CHANNEL *p_msg =
@@ -177,19 +177,19 @@ tBTA_JV_STATUS BTA_JvGetChannelId(int conn_type, void* user_data, int32_t channe
 }
 
 /*******************************************************************************
-**
-** Function         BTA_JvFreeChannel
-**
-** Description      This function frees a server channel number that was used
-**                  by an application running over RFCOMM.
-** Parameters
-**   channel        The channel to free
-**   conn_type      one of BTA_JV_CONN_TYPE_
-**
-** Returns          BTA_JV_SUCCESS, if the request is being processed.
-**                  BTA_JV_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvFreeChannel
+ *
+ * Description      This function frees a server channel number that was used
+ *                  by an application running over RFCOMM.
+ * Parameters
+ *   channel        The channel to free
+ *   conn_type      one of BTA_JV_CONN_TYPE_
+ *
+ * Returns          BTA_JV_SUCCESS, if the request is being processed.
+ *                  BTA_JV_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvFreeChannel(uint16_t channel, int conn_type)
 {
     tBTA_JV_API_FREE_CHANNEL *p_msg =
@@ -207,18 +207,18 @@ tBTA_JV_STATUS BTA_JvFreeChannel(uint16_t channel, int conn_type)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_JvStartDiscovery
-**
-** Description      This function performs service discovery for the services
-**                  provided by the given peer device. When the operation is
-**                  complete the tBTA_JV_DM_CBACK callback function will be
-**                  called with a BTA_JV_DISCOVERY_COMP_EVT.
-**
-** Returns          BTA_JV_SUCCESS, if the request is being processed.
-**                  BTA_JV_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvStartDiscovery
+ *
+ * Description      This function performs service discovery for the services
+ *                  provided by the given peer device. When the operation is
+ *                  complete the tBTA_JV_DM_CBACK callback function will be
+ *                  called with a BTA_JV_DISCOVERY_COMP_EVT.
+ *
+ * Returns          BTA_JV_SUCCESS, if the request is being processed.
+ *                  BTA_JV_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvStartDiscovery(BD_ADDR bd_addr, uint16_t num_uuid,
             tSDP_UUID *p_uuid_list, void * user_data)
 {
@@ -240,17 +240,17 @@ tBTA_JV_STATUS BTA_JvStartDiscovery(BD_ADDR bd_addr, uint16_t num_uuid,
 }
 
 /*******************************************************************************
-**
-** Function         BTA_JvCreateRecord
-**
-** Description      Create a service record in the local SDP database.
-**                  When the operation is complete the tBTA_JV_DM_CBACK callback
-**                  function will be called with a BTA_JV_CREATE_RECORD_EVT.
-**
-** Returns          BTA_JV_SUCCESS, if the request is being processed.
-**                  BTA_JV_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvCreateRecord
+ *
+ * Description      Create a service record in the local SDP database.
+ *                  When the operation is complete the tBTA_JV_DM_CBACK callback
+ *                  function will be called with a BTA_JV_CREATE_RECORD_EVT.
+ *
+ * Returns          BTA_JV_SUCCESS, if the request is being processed.
+ *                  BTA_JV_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvCreateRecordByUser(void *user_data)
 {
     tBTA_JV_API_CREATE_RECORD *p_msg =
@@ -267,15 +267,15 @@ tBTA_JV_STATUS BTA_JvCreateRecordByUser(void *user_data)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_JvDeleteRecord
-**
-** Description      Delete a service record in the local SDP database.
-**
-** Returns          BTA_JV_SUCCESS, if the request is being processed.
-**                  BTA_JV_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvDeleteRecord
+ *
+ * Description      Delete a service record in the local SDP database.
+ *
+ * Returns          BTA_JV_SUCCESS, if the request is being processed.
+ *                  BTA_JV_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvDeleteRecord(uint32_t handle)
 {
     tBTA_JV_API_ADD_ATTRIBUTE *p_msg =
@@ -292,20 +292,20 @@ tBTA_JV_STATUS BTA_JvDeleteRecord(uint32_t handle)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_JvL2capConnectLE
-**
-** Description      Initiate an LE connection as a L2CAP client to the given BD
-**                  Address.
-**                  When the connection is initiated or failed to initiate,
-**                  tBTA_JV_L2CAP_CBACK is called with BTA_JV_L2CAP_CL_INIT_EVT
-**                  When the connection is established or failed,
-**                  tBTA_JV_L2CAP_CBACK is called with BTA_JV_L2CAP_OPEN_EVT
-**
-** Returns          BTA_JV_SUCCESS, if the request is being processed.
-**                  BTA_JV_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvL2capConnectLE
+ *
+ * Description      Initiate an LE connection as a L2CAP client to the given BD
+ *                  Address.
+ *                  When the connection is initiated or failed to initiate,
+ *                  tBTA_JV_L2CAP_CBACK is called with BTA_JV_L2CAP_CL_INIT_EVT
+ *                  When the connection is established or failed,
+ *                  tBTA_JV_L2CAP_CBACK is called with BTA_JV_L2CAP_OPEN_EVT
+ *
+ * Returns          BTA_JV_SUCCESS, if the request is being processed.
+ *                  BTA_JV_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvL2capConnectLE(tBTA_SEC sec_mask, tBTA_JV_ROLE role,
                            const tL2CAP_ERTM_INFO *ertm_info, uint16_t remote_chan,
                            uint16_t rx_mtu, tL2CAP_CFG_INFO *cfg,
@@ -345,20 +345,20 @@ tBTA_JV_STATUS BTA_JvL2capConnectLE(tBTA_SEC sec_mask, tBTA_JV_ROLE role,
 }
 
 /*******************************************************************************
-**
-** Function         BTA_JvL2capConnect
-**
-** Description      Initiate a connection as a L2CAP client to the given BD
-**                  Address.
-**                  When the connection is initiated or failed to initiate,
-**                  tBTA_JV_L2CAP_CBACK is called with BTA_JV_L2CAP_CL_INIT_EVT
-**                  When the connection is established or failed,
-**                  tBTA_JV_L2CAP_CBACK is called with BTA_JV_L2CAP_OPEN_EVT
-**
-** Returns          BTA_JV_SUCCESS, if the request is being processed.
-**                  BTA_JV_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvL2capConnect
+ *
+ * Description      Initiate a connection as a L2CAP client to the given BD
+ *                  Address.
+ *                  When the connection is initiated or failed to initiate,
+ *                  tBTA_JV_L2CAP_CBACK is called with BTA_JV_L2CAP_CL_INIT_EVT
+ *                  When the connection is established or failed,
+ *                  tBTA_JV_L2CAP_CBACK is called with BTA_JV_L2CAP_OPEN_EVT
+ *
+ * Returns          BTA_JV_SUCCESS, if the request is being processed.
+ *                  BTA_JV_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvL2capConnect(int conn_type, tBTA_SEC sec_mask, tBTA_JV_ROLE role,
                            const tL2CAP_ERTM_INFO *ertm_info, uint16_t remote_psm,
                            uint16_t rx_mtu, tL2CAP_CFG_INFO *cfg,
@@ -399,15 +399,15 @@ tBTA_JV_STATUS BTA_JvL2capConnect(int conn_type, tBTA_SEC sec_mask, tBTA_JV_ROLE
 }
 
 /*******************************************************************************
-**
-** Function         BTA_JvL2capClose
-**
-** Description      This function closes an L2CAP client connection
-**
-** Returns          BTA_JV_SUCCESS, if the request is being processed.
-**                  BTA_JV_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvL2capClose
+ *
+ * Description      This function closes an L2CAP client connection
+ *
+ * Returns          BTA_JV_SUCCESS, if the request is being processed.
+ *                  BTA_JV_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvL2capClose(uint32_t handle)
 {
     tBTA_JV_STATUS status = BTA_JV_FAILURE;
@@ -429,16 +429,16 @@ tBTA_JV_STATUS BTA_JvL2capClose(uint32_t handle)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_JvL2capCloseLE
-**
-** Description      This function closes an L2CAP client connection for Fixed Channels
-**                  Function is idempotent and no callbacks are called!
-**
-** Returns          BTA_JV_SUCCESS, if the request is being processed.
-**                  BTA_JV_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvL2capCloseLE
+ *
+ * Description      This function closes an L2CAP client connection for Fixed Channels
+ *                  Function is idempotent and no callbacks are called!
+ *
+ * Returns          BTA_JV_SUCCESS, if the request is being processed.
+ *                  BTA_JV_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvL2capCloseLE(uint32_t handle)
 {
     tBTA_JV_API_L2CAP_CLOSE *p_msg =
@@ -455,19 +455,19 @@ tBTA_JV_STATUS BTA_JvL2capCloseLE(uint32_t handle)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_JvL2capStartServer
-**
-** Description      This function starts an L2CAP server and listens for an L2CAP
-**                  connection from a remote Bluetooth device.  When the server
-**                  is started successfully, tBTA_JV_L2CAP_CBACK is called with
-**                  BTA_JV_L2CAP_START_EVT.  When the connection is established,
-**                  tBTA_JV_L2CAP_CBACK is called with BTA_JV_L2CAP_OPEN_EVT.
-**
-** Returns          BTA_JV_SUCCESS, if the request is being processed.
-**                  BTA_JV_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvL2capStartServer
+ *
+ * Description      This function starts an L2CAP server and listens for an L2CAP
+ *                  connection from a remote Bluetooth device.  When the server
+ *                  is started successfully, tBTA_JV_L2CAP_CBACK is called with
+ *                  BTA_JV_L2CAP_START_EVT.  When the connection is established,
+ *                  tBTA_JV_L2CAP_CBACK is called with BTA_JV_L2CAP_OPEN_EVT.
+ *
+ * Returns          BTA_JV_SUCCESS, if the request is being processed.
+ *                  BTA_JV_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvL2capStartServer(int conn_type, tBTA_SEC sec_mask, tBTA_JV_ROLE role,
         const tL2CAP_ERTM_INFO *ertm_info,uint16_t local_psm, uint16_t rx_mtu, tL2CAP_CFG_INFO *cfg,
         tBTA_JV_L2CAP_CBACK *p_cback, void *user_data)
@@ -506,19 +506,19 @@ tBTA_JV_STATUS BTA_JvL2capStartServer(int conn_type, tBTA_SEC sec_mask, tBTA_JV_
 }
 
 /*******************************************************************************
-**
-** Function         BTA_JvL2capStartServerLE
-**
-** Description      This function starts an LE L2CAP server and listens for an L2CAP
-**                  connection from a remote Bluetooth device.  When the server
-**                  is started successfully, tBTA_JV_L2CAP_CBACK is called with
-**                  BTA_JV_L2CAP_START_EVT.  When the connection is established,
-**                  tBTA_JV_L2CAP_CBACK is called with BTA_JV_L2CAP_OPEN_EVT.
-**
-** Returns          BTA_JV_SUCCESS, if the request is being processed.
-**                  BTA_JV_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvL2capStartServerLE
+ *
+ * Description      This function starts an LE L2CAP server and listens for an L2CAP
+ *                  connection from a remote Bluetooth device.  When the server
+ *                  is started successfully, tBTA_JV_L2CAP_CBACK is called with
+ *                  BTA_JV_L2CAP_START_EVT.  When the connection is established,
+ *                  tBTA_JV_L2CAP_CBACK is called with BTA_JV_L2CAP_OPEN_EVT.
+ *
+ * Returns          BTA_JV_SUCCESS, if the request is being processed.
+ *                  BTA_JV_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvL2capStartServerLE(tBTA_SEC sec_mask, tBTA_JV_ROLE role,
         const tL2CAP_ERTM_INFO *ertm_info,uint16_t local_chan, uint16_t rx_mtu, tL2CAP_CFG_INFO *cfg,
         tBTA_JV_L2CAP_CBACK *p_cback, void *user_data)
@@ -556,16 +556,16 @@ tBTA_JV_STATUS BTA_JvL2capStartServerLE(tBTA_SEC sec_mask, tBTA_JV_ROLE role,
 }
 
 /*******************************************************************************
-**
-** Function         BTA_JvL2capStopServer
-**
-** Description      This function stops the L2CAP server. If the server has an
-**                  active connection, it would be closed.
-**
-** Returns          BTA_JV_SUCCESS, if the request is being processed.
-**                  BTA_JV_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvL2capStopServer
+ *
+ * Description      This function stops the L2CAP server. If the server has an
+ *                  active connection, it would be closed.
+ *
+ * Returns          BTA_JV_SUCCESS, if the request is being processed.
+ *                  BTA_JV_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvL2capStopServer(uint16_t local_psm, void *user_data)
 {
     APPL_TRACE_API("%s", __func__);
@@ -582,16 +582,16 @@ tBTA_JV_STATUS BTA_JvL2capStopServer(uint16_t local_psm, void *user_data)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_JvL2capStopServerLE
-**
-** Description      This function stops the LE L2CAP server. If the server has an
-**                  active connection, it would be closed.
-**
-** Returns          BTA_JV_SUCCESS, if the request is being processed.
-**                  BTA_JV_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvL2capStopServerLE
+ *
+ * Description      This function stops the LE L2CAP server. If the server has an
+ *                  active connection, it would be closed.
+ *
+ * Returns          BTA_JV_SUCCESS, if the request is being processed.
+ *                  BTA_JV_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvL2capStopServerLE(uint16_t local_chan, void *user_data)
 {
     APPL_TRACE_API("%s", __func__);
@@ -608,19 +608,19 @@ tBTA_JV_STATUS BTA_JvL2capStopServerLE(uint16_t local_chan, void *user_data)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_JvL2capRead
-**
-** Description      This function reads data from an L2CAP connecti;
+ *
+ * Function         BTA_JvL2capRead
+ *
+ * Description      This function reads data from an L2CAP connecti;
     tBTA_JV_RFC_CB  *p_cb = rc->p_cb;
 on
-**                  When the operation is complete, tBTA_JV_L2CAP_CBACK is
-**                  called with BTA_JV_L2CAP_READ_EVT.
-**
-** Returns          BTA_JV_SUCCESS, if the request is being processed.
-**                  BTA_JV_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *                  When the operation is complete, tBTA_JV_L2CAP_CBACK is
+ *                  called with BTA_JV_L2CAP_READ_EVT.
+ *
+ * Returns          BTA_JV_SUCCESS, if the request is being processed.
+ *                  BTA_JV_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvL2capRead(uint32_t handle, uint32_t req_id, uint8_t *p_data, uint16_t len)
 {
     tBTA_JV_STATUS status = BTA_JV_FAILURE;
@@ -650,16 +650,16 @@ tBTA_JV_STATUS BTA_JvL2capRead(uint32_t handle, uint32_t req_id, uint8_t *p_data
 }
 
 /*******************************************************************************
-**
-** Function         BTA_JvL2capReady
-**
-** Description      This function determined if there is data to read from
-**                    an L2CAP connection
-**
-** Returns          BTA_JV_SUCCESS, if data queue size is in *p_data_size.
-**                  BTA_JV_FAILURE, if error.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvL2capReady
+ *
+ * Description      This function determined if there is data to read from
+ *                    an L2CAP connection
+ *
+ * Returns          BTA_JV_SUCCESS, if data queue size is in *p_data_size.
+ *                  BTA_JV_FAILURE, if error.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvL2capReady(uint32_t handle, uint32_t *p_data_size)
 {
     tBTA_JV_STATUS status = BTA_JV_FAILURE;
@@ -679,18 +679,18 @@ tBTA_JV_STATUS BTA_JvL2capReady(uint32_t handle, uint32_t *p_data_size)
 
 
 /*******************************************************************************
-**
-** Function         BTA_JvL2capWrite
-**
-** Description      This function writes data to an L2CAP connection
-**                  When the operation is complete, tBTA_JV_L2CAP_CBACK is
-**                  called with BTA_JV_L2CAP_WRITE_EVT. Works for
-**                  PSM-based connections
-**
-** Returns          BTA_JV_SUCCESS, if the request is being processed.
-**                  BTA_JV_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvL2capWrite
+ *
+ * Description      This function writes data to an L2CAP connection
+ *                  When the operation is complete, tBTA_JV_L2CAP_CBACK is
+ *                  called with BTA_JV_L2CAP_WRITE_EVT. Works for
+ *                  PSM-based connections
+ *
+ * Returns          BTA_JV_SUCCESS, if the request is being processed.
+ *                  BTA_JV_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvL2capWrite(uint32_t handle, uint32_t req_id, uint8_t *p_data,
         uint16_t len, void *user_data)
 {
@@ -718,18 +718,18 @@ tBTA_JV_STATUS BTA_JvL2capWrite(uint32_t handle, uint32_t req_id, uint8_t *p_dat
 }
 
 /*******************************************************************************
-**
-** Function         BTA_JvL2capWriteFixed
-**
-** Description      This function writes data to an L2CAP connection
-**                  When the operation is complete, tBTA_JV_L2CAP_CBACK is
-**                  called with BTA_JV_L2CAP_WRITE_EVT. Works for
-**                  fixed-channel connections
-**
-** Returns          BTA_JV_SUCCESS, if the request is being processed.
-**                  BTA_JV_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvL2capWriteFixed
+ *
+ * Description      This function writes data to an L2CAP connection
+ *                  When the operation is complete, tBTA_JV_L2CAP_CBACK is
+ *                  called with BTA_JV_L2CAP_WRITE_EVT. Works for
+ *                  fixed-channel connections
+ *
+ * Returns          BTA_JV_SUCCESS, if the request is being processed.
+ *                  BTA_JV_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvL2capWriteFixed(uint16_t channel, BD_ADDR *addr, uint32_t req_id,
         tBTA_JV_L2CAP_CBACK *p_cback, uint8_t *p_data, uint16_t len, void *user_data)
 {
@@ -753,20 +753,20 @@ tBTA_JV_STATUS BTA_JvL2capWriteFixed(uint16_t channel, BD_ADDR *addr, uint32_t r
 }
 
 /*******************************************************************************
-**
-** Function         BTA_JvRfcommConnect
-**
-** Description      This function makes an RFCOMM conection to a remote BD
-**                  Address.
-**                  When the connection is initiated or failed to initiate,
-**                  tBTA_JV_RFCOMM_CBACK is called with BTA_JV_RFCOMM_CL_INIT_EVT
-**                  When the connection is established or failed,
-**                  tBTA_JV_RFCOMM_CBACK is called with BTA_JV_RFCOMM_OPEN_EVT
-**
-** Returns          BTA_JV_SUCCESS, if the request is being processed.
-**                  BTA_JV_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvRfcommConnect
+ *
+ * Description      This function makes an RFCOMM conection to a remote BD
+ *                  Address.
+ *                  When the connection is initiated or failed to initiate,
+ *                  tBTA_JV_RFCOMM_CBACK is called with BTA_JV_RFCOMM_CL_INIT_EVT
+ *                  When the connection is established or failed,
+ *                  tBTA_JV_RFCOMM_CBACK is called with BTA_JV_RFCOMM_OPEN_EVT
+ *
+ * Returns          BTA_JV_SUCCESS, if the request is being processed.
+ *                  BTA_JV_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvRfcommConnect(tBTA_SEC sec_mask,
                            tBTA_JV_ROLE role, uint8_t remote_scn, BD_ADDR peer_bd_addr,
                            tBTA_JV_RFCOMM_CBACK *p_cback, void* user_data)
@@ -792,15 +792,15 @@ tBTA_JV_STATUS BTA_JvRfcommConnect(tBTA_SEC sec_mask,
 }
 
 /*******************************************************************************
-**
-** Function         BTA_JvRfcommClose
-**
-** Description      This function closes an RFCOMM connection
-**
-** Returns          BTA_JV_SUCCESS, if the request is being processed.
-**                  BTA_JV_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvRfcommClose
+ *
+ * Description      This function closes an RFCOMM connection
+ *
+ * Returns          BTA_JV_SUCCESS, if the request is being processed.
+ *                  BTA_JV_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvRfcommClose(uint32_t handle, void *user_data)
 {
     tBTA_JV_STATUS status = BTA_JV_FAILURE;
@@ -828,20 +828,20 @@ tBTA_JV_STATUS BTA_JvRfcommClose(uint32_t handle, void *user_data)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_JvRfcommStartServer
-**
-** Description      This function starts listening for an RFCOMM connection
-**                  request from a remote Bluetooth device.  When the server is
-**                  started successfully, tBTA_JV_RFCOMM_CBACK is called
-**                  with BTA_JV_RFCOMM_START_EVT.
-**                  When the connection is established, tBTA_JV_RFCOMM_CBACK
-**                  is called with BTA_JV_RFCOMM_OPEN_EVT.
-**
-** Returns          BTA_JV_SUCCESS, if the request is being processed.
-**                  BTA_JV_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvRfcommStartServer
+ *
+ * Description      This function starts listening for an RFCOMM connection
+ *                  request from a remote Bluetooth device.  When the server is
+ *                  started successfully, tBTA_JV_RFCOMM_CBACK is called
+ *                  with BTA_JV_RFCOMM_START_EVT.
+ *                  When the connection is established, tBTA_JV_RFCOMM_CBACK
+ *                  is called with BTA_JV_RFCOMM_OPEN_EVT.
+ *
+ * Returns          BTA_JV_SUCCESS, if the request is being processed.
+ *                  BTA_JV_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvRfcommStartServer(tBTA_SEC sec_mask,
                            tBTA_JV_ROLE role, uint8_t local_scn, uint8_t max_session,
                            tBTA_JV_RFCOMM_CBACK *p_cback, void* user_data)
@@ -873,16 +873,16 @@ tBTA_JV_STATUS BTA_JvRfcommStartServer(tBTA_SEC sec_mask,
 }
 
 /*******************************************************************************
-**
-** Function         BTA_JvRfcommStopServer
-**
-** Description      This function stops the RFCOMM server. If the server has an
-**                  active connection, it would be closed.
-**
-** Returns          BTA_JV_SUCCESS, if the request is being processed.
-**                  BTA_JV_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvRfcommStopServer
+ *
+ * Description      This function stops the RFCOMM server. If the server has an
+ *                  active connection, it would be closed.
+ *
+ * Returns          BTA_JV_SUCCESS, if the request is being processed.
+ *                  BTA_JV_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvRfcommStopServer(uint32_t handle, void * user_data)
 {
     tBTA_JV_API_RFCOMM_SERVER *p_msg =
@@ -900,15 +900,15 @@ tBTA_JV_STATUS BTA_JvRfcommStopServer(uint32_t handle, void * user_data)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_JvRfcommGetPortHdl
-**
-** Description    This function fetches the rfcomm port handle
-**
-** Returns          BTA_JV_SUCCESS, if the request is being processed.
-**                  BTA_JV_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvRfcommGetPortHdl
+ *
+ * Description    This function fetches the rfcomm port handle
+ *
+ * Returns          BTA_JV_SUCCESS, if the request is being processed.
+ *                  BTA_JV_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 uint16_t BTA_JvRfcommGetPortHdl(uint32_t handle)
 {
     uint32_t  hi = ((handle & BTA_JV_RFC_HDL_MASK) & ~BTA_JV_RFCOMM_MASK) - 1;
@@ -922,15 +922,15 @@ uint16_t BTA_JvRfcommGetPortHdl(uint32_t handle)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_JvRfcommWrite
-**
-** Description      This function writes data to an RFCOMM connection
-**
-** Returns          BTA_JV_SUCCESS, if the request is being processed.
-**                  BTA_JV_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_JvRfcommWrite
+ *
+ * Description      This function writes data to an RFCOMM connection
+ *
+ * Returns          BTA_JV_SUCCESS, if the request is being processed.
+ *                  BTA_JV_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_JV_STATUS BTA_JvRfcommWrite(uint32_t handle, uint32_t req_id)
 {
     tBTA_JV_STATUS status = BTA_JV_FAILURE;
@@ -960,23 +960,23 @@ tBTA_JV_STATUS BTA_JvRfcommWrite(uint32_t handle, uint32_t req_id)
 
 
 /*******************************************************************************
- **
- ** Function    BTA_JVSetPmProfile
- **
- ** Description This function set or free power mode profile for different JV application
- **
- ** Parameters:  handle,  JV handle from RFCOMM or L2CAP
- **              app_id:  app specific pm ID, can be BTA_JV_PM_ALL, see bta_dm_cfg.c for details
- **              BTA_JV_PM_ID_CLEAR: removes pm management on the handle. init_st is ignored and
- **              BTA_JV_CONN_CLOSE is called implicitely
- **              init_st:  state after calling this API. typically it should be BTA_JV_CONN_OPEN
- **
- ** Returns      BTA_JV_SUCCESS, if the request is being processed.
- **              BTA_JV_FAILURE, otherwise.
- **
- ** NOTE:        BTA_JV_PM_ID_CLEAR: In general no need to be called as jv pm calls automatically
- **              BTA_JV_CONN_CLOSE to remove in case of connection close!
- **
+ *
+ * Function    BTA_JVSetPmProfile
+ *
+ * Description This function set or free power mode profile for different JV application
+ *
+ * Parameters:  handle,  JV handle from RFCOMM or L2CAP
+ *              app_id:  app specific pm ID, can be BTA_JV_PM_ALL, see bta_dm_cfg.c for details
+ *              BTA_JV_PM_ID_CLEAR: removes pm management on the handle. init_st is ignored and
+ *              BTA_JV_CONN_CLOSE is called implicitely
+ *              init_st:  state after calling this API. typically it should be BTA_JV_CONN_OPEN
+ *
+ * Returns      BTA_JV_SUCCESS, if the request is being processed.
+ *              BTA_JV_FAILURE, otherwise.
+ *
+ * NOTE:        BTA_JV_PM_ID_CLEAR: In general no need to be called as jv pm calls automatically
+ *              BTA_JV_CONN_CLOSE to remove in case of connection close!
+ *
  *******************************************************************************/
 tBTA_JV_STATUS BTA_JvSetPmProfile(uint32_t handle, tBTA_JV_PM_ID app_id, tBTA_JV_CONN_STATE init_st)
 {
diff --git a/system/bta/jv/bta_jv_int.h b/system/bta/jv/bta_jv_int.h
index 92e4eb9d1e0..2f25f06edd5 100644
--- a/system/bta/jv/bta_jv_int.h
+++ b/system/bta/jv/bta_jv_int.h
@@ -31,8 +31,8 @@
 #include "port_api.h"
 
 /*****************************************************************************
-**  Constants
-*****************************************************************************/
+ *  Constants
+ ****************************************************************************/
 
 enum
 {
diff --git a/system/bta/jv/bta_jv_main.cc b/system/bta/jv/bta_jv_main.cc
index 5162f3e113d..2779fd6857e 100644
--- a/system/bta/jv/bta_jv_main.cc
+++ b/system/bta/jv/bta_jv_main.cc
@@ -28,8 +28,8 @@
 #include "bta_jv_int.h"
 
 /*****************************************************************************
-** Constants and types
-*****************************************************************************/
+ * Constants and types
+ ****************************************************************************/
 
 tBTA_JV_CB bta_jv_cb;
 
@@ -70,15 +70,15 @@ const tBTA_JV_ACTION bta_jv_action[] =
 };
 
 /*******************************************************************************
-**
-** Function         bta_jv_sm_execute
-**
-** Description      State machine event handling function for JV
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_jv_sm_execute
+ *
+ * Description      State machine event handling function for JV
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 bool bta_jv_sm_execute(BT_HDR *p_msg)
 {
     bool ret = false;
diff --git a/system/bta/mce/bta_mce_act.cc b/system/bta/mce/bta_mce_act.cc
index 827ca4c0767..ed1317b88d2 100644
--- a/system/bta/mce/bta_mce_act.cc
+++ b/system/bta/mce/bta_mce_act.cc
@@ -39,8 +39,8 @@
 #include <string.h>
 
 /*****************************************************************************
-**  Constants
-*****************************************************************************/
+ *  Constants
+ ****************************************************************************/
 
 static const tBT_UUID bta_mce_mas_uuid = {
     .len = 2,
@@ -48,14 +48,14 @@ static const tBT_UUID bta_mce_mas_uuid = {
 };
 
 /*******************************************************************************
-**
-** Function     bta_mce_search_cback
-**
-** Description  Callback from btm after search is completed
-**
-** Returns      void
-**
-*******************************************************************************/
+ *
+ * Function     bta_mce_search_cback
+ *
+ * Description  Callback from btm after search is completed
+ *
+ * Returns      void
+ *
+ ******************************************************************************/
 
 static void bta_mce_search_cback(uint16_t result, void * user_data)
 {
@@ -119,14 +119,14 @@ static void bta_mce_search_cback(uint16_t result, void * user_data)
 }
 
 /*******************************************************************************
-**
-** Function     bta_mce_enable
-**
-** Description  Initializes the MCE I/F
-**
-** Returns      void
-**
-*******************************************************************************/
+ *
+ * Function     bta_mce_enable
+ *
+ * Description  Initializes the MCE I/F
+ *
+ * Returns      void
+ *
+ ******************************************************************************/
 void bta_mce_enable(tBTA_MCE_MSG *p_data)
 {
     tBTA_MCE_STATUS status = BTA_MCE_SUCCESS;
@@ -135,14 +135,14 @@ void bta_mce_enable(tBTA_MCE_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function     bta_mce_get_remote_mas_instances
-**
-** Description  Discovers MAS instances on remote device
-**
-** Returns      void
-**
-*******************************************************************************/
+ *
+ * Function     bta_mce_get_remote_mas_instances
+ *
+ * Description  Discovers MAS instances on remote device
+ *
+ * Returns      void
+ *
+ ******************************************************************************/
 void bta_mce_get_remote_mas_instances(tBTA_MCE_MSG *p_data)
 {
     if(p_data == NULL)
diff --git a/system/bta/mce/bta_mce_api.cc b/system/bta/mce/bta_mce_api.cc
index b0a590de5a3..dc16a045b97 100644
--- a/system/bta/mce/bta_mce_api.cc
+++ b/system/bta/mce/bta_mce_api.cc
@@ -34,8 +34,8 @@
 #include "sdp_api.h"
 
 /*****************************************************************************
-**  Constants
-*****************************************************************************/
+ *  Constants
+ ****************************************************************************/
 
 static const tBTA_SYS_REG bta_mce_reg =
 {
@@ -44,19 +44,19 @@ static const tBTA_SYS_REG bta_mce_reg =
 };
 
 /*******************************************************************************
-**
-** Function         BTA_MceEnable
-**
-** Description      Enable the MCE I/F service. When the enable
-**                  operation is complete the callback function will be
-**                  called with a BTA_MCE_ENABLE_EVT. This function must
-**                  be called before other functions in the MCE API are
-**                  called.
-**
-** Returns          BTA_MCE_SUCCESS if successful.
-**                  BTA_MCE_FAIL if internal failure.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_MceEnable
+ *
+ * Description      Enable the MCE I/F service. When the enable
+ *                  operation is complete the callback function will be
+ *                  called with a BTA_MCE_ENABLE_EVT. This function must
+ *                  be called before other functions in the MCE API are
+ *                  called.
+ *
+ * Returns          BTA_MCE_SUCCESS if successful.
+ *                  BTA_MCE_FAIL if internal failure.
+ *
+ ******************************************************************************/
 tBTA_MCE_STATUS BTA_MceEnable(tBTA_MCE_DM_CBACK *p_cback)
 {
     tBTA_MCE_STATUS status = BTA_MCE_FAILURE;
@@ -83,18 +83,18 @@ tBTA_MCE_STATUS BTA_MceEnable(tBTA_MCE_DM_CBACK *p_cback)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_MceGetRemoteMasInstances
-**
-** Description      This function performs service discovery for the MAS service
-**                  by the given peer device. When the operation is completed
-**                  the tBTA_MCE_DM_CBACK callback function will be  called with
-**                  a BTA_MCE_MAS_DISCOVERY_COMP_EVT.
-**
-** Returns          BTA_MCE_SUCCESS, if the request is being processed.
-**                  BTA_MCE_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_MceGetRemoteMasInstances
+ *
+ * Description      This function performs service discovery for the MAS service
+ *                  by the given peer device. When the operation is completed
+ *                  the tBTA_MCE_DM_CBACK callback function will be  called with
+ *                  a BTA_MCE_MAS_DISCOVERY_COMP_EVT.
+ *
+ * Returns          BTA_MCE_SUCCESS, if the request is being processed.
+ *                  BTA_MCE_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_MCE_STATUS BTA_MceGetRemoteMasInstances(BD_ADDR bd_addr)
 {
     tBTA_MCE_API_GET_REMOTE_MAS_INSTANCES *p_msg =
diff --git a/system/bta/mce/bta_mce_int.h b/system/bta/mce/bta_mce_int.h
index d27575d4211..bb43d03d04f 100644
--- a/system/bta/mce/bta_mce_int.h
+++ b/system/bta/mce/bta_mce_int.h
@@ -30,8 +30,8 @@
 #include "bta_mce_api.h"
 
 /*****************************************************************************
-**  Constants
-*****************************************************************************/
+ *  Constants
+ ****************************************************************************/
 
 enum
 {
diff --git a/system/bta/mce/bta_mce_main.cc b/system/bta/mce/bta_mce_main.cc
index e418aa0a493..189434b42a8 100644
--- a/system/bta/mce/bta_mce_main.cc
+++ b/system/bta/mce/bta_mce_main.cc
@@ -30,8 +30,8 @@
 #include "bta_mce_int.h"
 
 /*****************************************************************************
-** Constants and types
-*****************************************************************************/
+ * Constants and types
+ ****************************************************************************/
 
 tBTA_MCE_CB bta_mce_cb;
 
@@ -49,15 +49,15 @@ const tBTA_MCE_ACTION bta_mce_action[] =
 };
 
 /*******************************************************************************
-**
-** Function         bta_mce_sm_execute
-**
-** Description      State machine event handling function for MCE
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_mce_sm_execute
+ *
+ * Description      State machine event handling function for MCE
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 bool bta_mce_sm_execute(BT_HDR *p_msg)
 {
     if(p_msg == NULL) return false;
diff --git a/system/bta/pan/bta_pan_act.cc b/system/bta/pan/bta_pan_act.cc
index 9cc9c2cf0bb..dee4bdb9945 100644
--- a/system/bta/pan/bta_pan_act.cc
+++ b/system/bta/pan/bta_pan_act.cc
@@ -43,15 +43,15 @@
 #define BTA_PAN_TX_MASK              0xF0
 
 /*******************************************************************************
- **
- ** Function    bta_pan_pm_conn_busy
- **
- ** Description set pan pm connection busy state
- **
- ** Params      p_scb: state machine control block of pan connection
- **
- ** Returns     void
- **
+ *
+ * Function    bta_pan_pm_conn_busy
+ *
+ * Description set pan pm connection busy state
+ *
+ * Params      p_scb: state machine control block of pan connection
+ *
+ * Returns     void
+ *
  *******************************************************************************/
 static void bta_pan_pm_conn_busy(tBTA_PAN_SCB *p_scb)
 {
@@ -60,15 +60,15 @@ static void bta_pan_pm_conn_busy(tBTA_PAN_SCB *p_scb)
 }
 
 /*******************************************************************************
- **
- ** Function    bta_pan_pm_conn_idle
- **
- ** Description set pan pm connection idle state
- **
- ** Params      p_scb: state machine control block of pan connection
- **
- ** Returns     void
- **
+ *
+ * Function    bta_pan_pm_conn_idle
+ *
+ * Description set pan pm connection idle state
+ *
+ * Params      p_scb: state machine control block of pan connection
+ *
+ * Returns     void
+ *
  *******************************************************************************/
 static void bta_pan_pm_conn_idle(tBTA_PAN_SCB *p_scb)
 {
@@ -77,15 +77,15 @@ static void bta_pan_pm_conn_idle(tBTA_PAN_SCB *p_scb)
 }
 
 /*******************************************************************************
-**
-** Function         bta_pan_conn_state_cback
-**
-** Description      Connection state callback from Pan profile
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_conn_state_cback
+ *
+ * Description      Connection state callback from Pan profile
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_pan_conn_state_cback(uint16_t handle, BD_ADDR bd_addr, tPAN_RESULT state,
                                      bool is_role_change, uint8_t src_role, uint8_t dst_role)
 {
@@ -131,15 +131,15 @@ static void bta_pan_conn_state_cback(uint16_t handle, BD_ADDR bd_addr, tPAN_RESU
 }
 
 /*******************************************************************************
-**
-** Function         bta_pan_data_flow_cb
-**
-** Description      Data flow status callback from PAN
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_data_flow_cb
+ *
+ * Description      Data flow status callback from PAN
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_pan_data_flow_cb(uint16_t handle, tPAN_RESULT result)
 {
     tBTA_PAN_SCB *p_scb;
@@ -160,15 +160,15 @@ static void bta_pan_data_flow_cb(uint16_t handle, tPAN_RESULT result)
 }
 
 /*******************************************************************************
-**
-** Function         bta_pan_data_buf_ind_cback
-**
-** Description      data indication callback from pan profile
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_data_buf_ind_cback
+ *
+ * Description      data indication callback from pan profile
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_pan_data_buf_ind_cback(uint16_t handle, BD_ADDR src, BD_ADDR dst, uint16_t protocol, BT_HDR *p_buf,
                                    bool ext, bool forward)
 {
@@ -206,15 +206,15 @@ static void bta_pan_data_buf_ind_cback(uint16_t handle, BD_ADDR src, BD_ADDR dst
 }
 
 /*******************************************************************************
-**
-** Function         bta_pan_pfilt_ind_cback
-**
-** Description
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_pfilt_ind_cback
+ *
+ * Description
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_pan_pfilt_ind_cback(uint16_t handle, bool indication,tBNEP_RESULT result,
                                     uint16_t num_filters, uint8_t *p_filters)
 {
@@ -227,15 +227,15 @@ static void bta_pan_pfilt_ind_cback(uint16_t handle, bool indication,tBNEP_RESUL
 
 
 /*******************************************************************************
-**
-** Function         bta_pan_mfilt_ind_cback
-**
-** Description
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_mfilt_ind_cback
+ *
+ * Description
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_pan_mfilt_ind_cback(uint16_t handle, bool indication,tBNEP_RESULT result,
                                     uint16_t num_mfilters, uint8_t *p_mfilters)
 {
@@ -247,16 +247,16 @@ static void bta_pan_mfilt_ind_cback(uint16_t handle, bool indication,tBNEP_RESUL
 
 
 /*******************************************************************************
-**
-** Function         bta_pan_has_multiple_connections
-**
-** Description      Check whether there are multiple GN/NAP connections to
-**                  different devices
-**
-**
-** Returns          bool
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_has_multiple_connections
+ *
+ * Description      Check whether there are multiple GN/NAP connections to
+ *                  different devices
+ *
+ *
+ * Returns          bool
+ *
+ ******************************************************************************/
 static bool bta_pan_has_multiple_connections(uint8_t app_id)
 {
     tBTA_PAN_SCB *p_scb = NULL;
@@ -294,16 +294,16 @@ static bool bta_pan_has_multiple_connections(uint8_t app_id)
 }
 
 /*******************************************************************************
-**
-** Function         bta_pan_enable
-**
-** Description
-**
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_enable
+ *
+ * Description
+ *
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_pan_enable(tBTA_PAN_DATA *p_data)
 {
     tPAN_REGISTER reg_data;
@@ -344,14 +344,14 @@ void bta_pan_enable(tBTA_PAN_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_pan_set_role
-**
-** Description
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_set_role
+ *
+ * Description
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_pan_set_role(tBTA_PAN_DATA *p_data)
 {
     tPAN_RESULT status;
@@ -408,16 +408,16 @@ void bta_pan_set_role(tBTA_PAN_DATA *p_data)
 
 
 /*******************************************************************************
-**
-** Function         bta_pan_disable
-**
-** Description
-**
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_disable
+ *
+ * Description
+ *
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_pan_disable(void)
 {
 
@@ -454,14 +454,14 @@ void bta_pan_disable(void)
 }
 
 /*******************************************************************************
-**
-** Function         bta_pan_open
-**
-** Description
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_open
+ *
+ * Description
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_pan_open(tBTA_PAN_SCB *p_scb, tBTA_PAN_DATA *p_data)
 {
     tPAN_RESULT status;
@@ -499,16 +499,16 @@ void bta_pan_open(tBTA_PAN_SCB *p_scb, tBTA_PAN_DATA *p_data)
 
 
 /*******************************************************************************
-**
-** Function         bta_pan_close
-**
-** Description
-**
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_close
+ *
+ * Description
+ *
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_pan_api_close (tBTA_PAN_SCB *p_scb,
                         UNUSED_ATTR tBTA_PAN_DATA *p_data)
 {
@@ -527,14 +527,14 @@ void bta_pan_api_close (tBTA_PAN_SCB *p_scb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_pan_conn_open
-**
-** Description      process connection open event
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_conn_open
+ *
+ * Description      process connection open event
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_pan_conn_open(tBTA_PAN_SCB *p_scb, tBTA_PAN_DATA *p_data)
 {
 
@@ -578,16 +578,16 @@ void bta_pan_conn_open(tBTA_PAN_SCB *p_scb, tBTA_PAN_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_pan_conn_close
-**
-** Description      process connection close event
-**
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_conn_close
+ *
+ * Description      process connection close event
+ *
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_pan_conn_close(tBTA_PAN_SCB *p_scb, tBTA_PAN_DATA *p_data)
 {
 
@@ -612,16 +612,16 @@ void bta_pan_conn_close(tBTA_PAN_SCB *p_scb, tBTA_PAN_DATA *p_data)
 
 
 /*******************************************************************************
-**
-** Function         bta_pan_rx_path
-**
-** Description      Handle data on the RX path (data sent from the phone to
-**                  BTA).
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_rx_path
+ *
+ * Description      Handle data on the RX path (data sent from the phone to
+ *                  BTA).
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_pan_rx_path(tBTA_PAN_SCB *p_scb,
                      UNUSED_ATTR tBTA_PAN_DATA *p_data)
 {
@@ -643,15 +643,15 @@ void bta_pan_rx_path(tBTA_PAN_SCB *p_scb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_pan_tx_path
-**
-** Description      Handle the TX data path (data sent from BTA to the phone).
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_tx_path
+ *
+ * Description      Handle the TX data path (data sent from BTA to the phone).
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_pan_tx_path(tBTA_PAN_SCB *p_scb,
                      UNUSED_ATTR tBTA_PAN_DATA *p_data)
 {
@@ -707,30 +707,30 @@ void bta_pan_tx_path(tBTA_PAN_SCB *p_scb,
 }
 
 /*******************************************************************************
-**
-** Function         bta_pan_tx_flow
-**
-** Description      Set the application flow control state.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_tx_flow
+ *
+ * Description      Set the application flow control state.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_pan_tx_flow(tBTA_PAN_SCB *p_scb, tBTA_PAN_DATA *p_data)
 {
     p_scb->app_flow_enable = p_data->ci_tx_flow.enable;
 }
 
 /*******************************************************************************
-**
-** Function         bta_pan_write_buf
-**
-** Description      Handle a bta_pan_ci_rx_writebuf() and send data to PAN.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_write_buf
+ *
+ * Description      Handle a bta_pan_ci_rx_writebuf() and send data to PAN.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_pan_write_buf(tBTA_PAN_SCB *p_scb, tBTA_PAN_DATA *p_data)
 {
     if ((bta_pan_cb.flow_mask & BTA_PAN_RX_MASK) == BTA_PAN_RX_PUSH_BUF)
@@ -749,15 +749,15 @@ void bta_pan_write_buf(tBTA_PAN_SCB *p_scb, tBTA_PAN_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_pan_free_buf
-**
-** Description      Frees the data buffer during closing state
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_free_buf
+ *
+ * Description      Frees the data buffer during closing state
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_pan_free_buf(UNUSED_ATTR tBTA_PAN_SCB *p_scb, tBTA_PAN_DATA *p_data)
 {
     osi_free(p_data);
diff --git a/system/bta/pan/bta_pan_api.cc b/system/bta/pan/bta_pan_api.cc
index d34dd60a4e0..4b4781164ef 100644
--- a/system/bta/pan/bta_pan_api.cc
+++ b/system/bta/pan/bta_pan_api.cc
@@ -44,17 +44,17 @@ static const tBTA_SYS_REG bta_pan_reg =
 };
 
 /*******************************************************************************
-**
-** Function         BTA_PanEnable
-**
-** Description      Enable PAN service.  This function must be
-**                  called before any other functions in the PAN API are called.
-**                  When the enable operation is complete the callback function
-**                  will be called with a BTA_PAN_ENABLE_EVT.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_PanEnable
+ *
+ * Description      Enable PAN service.  This function must be
+ *                  called before any other functions in the PAN API are called.
+ *                  When the enable operation is complete the callback function
+ *                  will be called with a BTA_PAN_ENABLE_EVT.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_PanEnable(tBTA_PAN_CBACK p_cback)
 {
     tBTA_PAN_API_ENABLE *p_buf =
@@ -72,15 +72,15 @@ void BTA_PanEnable(tBTA_PAN_CBACK p_cback)
 
 
 /*******************************************************************************
-**
-** Function         BTA_PanDisable
-**
-** Description      Disables PAN service.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_PanDisable
+ *
+ * Description      Disables PAN service.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_PanDisable(void)
 {
     BT_HDR *p_buf = (BT_HDR *)osi_malloc(sizeof(BT_HDR));
@@ -92,15 +92,15 @@ void BTA_PanDisable(void)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_PanSetRole
-**
-** Description      Sets PAN roles. When the enable operation is complete
-**                  the callback function will be called with a BTA_PAN_SET_ROLE_EVT.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_PanSetRole
+ *
+ * Description      Sets PAN roles. When the enable operation is complete
+ *                  the callback function will be called with a BTA_PAN_SET_ROLE_EVT.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_PanSetRole(tBTA_PAN_ROLE role, tBTA_PAN_ROLE_INFO *p_user_info, tBTA_PAN_ROLE_INFO *p_gn_info,
                                         tBTA_PAN_ROLE_INFO *p_nap_info)
 {
@@ -139,17 +139,17 @@ void BTA_PanSetRole(tBTA_PAN_ROLE role, tBTA_PAN_ROLE_INFO *p_user_info, tBTA_PA
 }
 
 /*******************************************************************************
-**
-** Function         BTA_PanOpen
-**
-** Description      Opens a connection to a peer device.
-**                  When connection is open callback function is called
-**                  with a BTA_PAN_OPEN_EVT.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_PanOpen
+ *
+ * Description      Opens a connection to a peer device.
+ *                  When connection is open callback function is called
+ *                  with a BTA_PAN_OPEN_EVT.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_PanOpen(BD_ADDR bd_addr, tBTA_PAN_ROLE    local_role, tBTA_PAN_ROLE    peer_role)
 {
     tBTA_PAN_API_OPEN *p_buf =
@@ -164,15 +164,15 @@ void BTA_PanOpen(BD_ADDR bd_addr, tBTA_PAN_ROLE    local_role, tBTA_PAN_ROLE
 }
 
 /*******************************************************************************
-**
-** Function         BTA_PanClose
-**
-** Description      Close a PAN  connection to a peer device.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         BTA_PanClose
+ *
+ * Description      Close a PAN  connection to a peer device.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void BTA_PanClose(uint16_t handle)
 {
     BT_HDR *p_buf = (BT_HDR *)osi_malloc(sizeof(BT_HDR));
diff --git a/system/bta/pan/bta_pan_ci.cc b/system/bta/pan/bta_pan_ci.cc
index f823a7ab78d..353e8e3ef6b 100644
--- a/system/bta/pan/bta_pan_ci.cc
+++ b/system/bta/pan/bta_pan_ci.cc
@@ -38,18 +38,18 @@
 #if (BTA_PAN_INCLUDED == TRUE)
 
 /*******************************************************************************
-**
-** Function         bta_pan_ci_tx_ready
-**
-** Description      This function sends an event to PAN indicating the phone is
-**                  ready for more data and PAN should call bta_pan_co_tx_path().
-**                  This function is used when the TX data path is configured
-**                  to use a pull interface.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_ci_tx_ready
+ *
+ * Description      This function sends an event to PAN indicating the phone is
+ *                  ready for more data and PAN should call bta_pan_co_tx_path().
+ *                  This function is used when the TX data path is configured
+ *                  to use a pull interface.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_pan_ci_tx_ready(uint16_t handle)
 {
     BT_HDR *p_buf = (BT_HDR *)osi_malloc(sizeof(BT_HDR));
@@ -61,18 +61,18 @@ void bta_pan_ci_tx_ready(uint16_t handle)
 }
 
 /*******************************************************************************
-**
-** Function         bta_pan_ci_rx_ready
-**
-** Description      This function sends an event to PAN indicating the phone
-**                  has data available to send to PAN and PAN should call
-**                  bta_pan_co_rx_path().  This function is used when the RX
-**                  data path is configured to use a pull interface.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_ci_rx_ready
+ *
+ * Description      This function sends an event to PAN indicating the phone
+ *                  has data available to send to PAN and PAN should call
+ *                  bta_pan_co_rx_path().  This function is used when the RX
+ *                  data path is configured to use a pull interface.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_pan_ci_rx_ready(uint16_t handle)
 {
     BT_HDR *p_buf = (BT_HDR *)osi_malloc(sizeof(BT_HDR));
@@ -84,20 +84,20 @@ void bta_pan_ci_rx_ready(uint16_t handle)
 }
 
 /*******************************************************************************
-**
-** Function         bta_pan_ci_tx_flow
-**
-** Description      This function is called to enable or disable data flow on
-**                  the TX path.  The phone should call this function to
-**                  disable data flow when it is congested and cannot handle
-**                  any more data sent by bta_pan_co_tx_write() or
-**                  bta_pan_co_tx_writebuf().  This function is used when the
-**                  TX data path is configured to use a push interface.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_ci_tx_flow
+ *
+ * Description      This function is called to enable or disable data flow on
+ *                  the TX path.  The phone should call this function to
+ *                  disable data flow when it is congested and cannot handle
+ *                  any more data sent by bta_pan_co_tx_write() or
+ *                  bta_pan_co_tx_writebuf().  This function is used when the
+ *                  TX data path is configured to use a push interface.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_pan_ci_tx_flow(uint16_t handle, bool enable)
 {
     tBTA_PAN_CI_TX_FLOW  *p_buf =
@@ -111,17 +111,17 @@ void bta_pan_ci_tx_flow(uint16_t handle, bool enable)
 }
 
 /*******************************************************************************
-**
-** Function         bta_pan_ci_rx_write
-**
-** Description      This function is called to send data to PAN when the RX path
-**                  is configured to use a push interface.  The function copies
-**                  data to an event buffer and sends it to PAN.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_ci_rx_write
+ *
+ * Description      This function is called to send data to PAN when the RX path
+ *                  is configured to use a push interface.  The function copies
+ *                  data to an event buffer and sends it to PAN.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_pan_ci_rx_write(uint16_t handle, BD_ADDR dst, BD_ADDR src, uint16_t protocol,
                             uint8_t *p_data, uint16_t len, bool ext)
 {
@@ -146,19 +146,19 @@ void bta_pan_ci_rx_write(uint16_t handle, BD_ADDR dst, BD_ADDR src, uint16_t pro
 }
 
 /*******************************************************************************
-**
-** Function         bta_pan_ci_rx_writebuf
-**
-** Description      This function is called to send data to the phone when
-**                  the RX path is configured to use a push interface with
-**                  zero copy.  The function sends an event to PAN containing
-**                  the data buffer. The buffer will be freed by BTA; the
-**                  phone must not free the buffer.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_ci_rx_writebuf
+ *
+ * Description      This function is called to send data to the phone when
+ *                  the RX path is configured to use a push interface with
+ *                  zero copy.  The function sends an event to PAN containing
+ *                  the data buffer. The buffer will be freed by BTA; the
+ *                  phone must not free the buffer.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_pan_ci_rx_writebuf(uint16_t handle, BD_ADDR dst, BD_ADDR src, uint16_t protocol,
                             BT_HDR *p_buf, bool ext)
 {
@@ -178,15 +178,15 @@ void bta_pan_ci_rx_writebuf(uint16_t handle, BD_ADDR dst, BD_ADDR src, uint16_t
 
 
 /*******************************************************************************
-**
-** Function         bta_pan_ci_readbuf
-**
-** Description
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_ci_readbuf
+ *
+ * Description
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 BT_HDR * bta_pan_ci_readbuf(uint16_t handle, BD_ADDR src, BD_ADDR dst, uint16_t* p_protocol,
                                  bool* p_ext, bool* p_forward)
 {
@@ -210,15 +210,15 @@ BT_HDR * bta_pan_ci_readbuf(uint16_t handle, BD_ADDR src, BD_ADDR dst, uint16_t*
 
 
 /*******************************************************************************
-**
-** Function         bta_pan_ci_set_mfilters
-**
-** Description      This function is called to set multicast filters
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_ci_set_mfilters
+ *
+ * Description      This function is called to set multicast filters
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_pan_ci_set_mfilters(uint16_t handle, uint16_t num_mcast_filters, uint8_t *p_start_array,
                                                     uint8_t *p_end_array)
 {
@@ -229,15 +229,15 @@ void bta_pan_ci_set_mfilters(uint16_t handle, uint16_t num_mcast_filters, uint8_
 
 
 /*******************************************************************************
-**
-** Function         bta_pan_ci_set_mfilters
-**
-** Description      This function is called to set protocol filters
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_ci_set_mfilters
+ *
+ * Description      This function is called to set protocol filters
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_pan_ci_set_pfilters(uint16_t handle, uint16_t num_filters, uint16_t *p_start_array, uint16_t *p_end_array)
 {
 
diff --git a/system/bta/pan/bta_pan_int.h b/system/bta/pan/bta_pan_int.h
index 472e9e051b0..85ee3b82e29 100644
--- a/system/bta/pan/bta_pan_int.h
+++ b/system/bta/pan/bta_pan_int.h
@@ -29,8 +29,8 @@
 #include "bta_pan_api.h"
 
 /*****************************************************************************
-**  Constants
-*****************************************************************************/
+ *  Constants
+ ****************************************************************************/
 
 
 
@@ -69,8 +69,8 @@ enum
 
 
 /*****************************************************************************
-**  Data types
-*****************************************************************************/
+ *  Data types
+ ****************************************************************************/
 
 /* data type for BTA_PAN_API_ENABLE_EVT */
 typedef struct
@@ -180,15 +180,15 @@ typedef struct
 
 
 /*****************************************************************************
-**  Global data
-*****************************************************************************/
+ *  Global data
+ ****************************************************************************/
 
 /* PAN control block */
 extern tBTA_PAN_CB  bta_pan_cb;
 
 /*****************************************************************************
-**  Function prototypes
-*****************************************************************************/
+ *  Function prototypes
+ ****************************************************************************/
 extern tBTA_PAN_SCB *bta_pan_scb_alloc(void);
 extern void bta_pan_scb_dealloc(tBTA_PAN_SCB *p_scb);
 extern uint8_t bta_pan_scb_to_idx(tBTA_PAN_SCB *p_scb);
diff --git a/system/bta/pan/bta_pan_main.cc b/system/bta/pan/bta_pan_main.cc
index b9e521b155f..e5df94c5a4c 100644
--- a/system/bta/pan/bta_pan_main.cc
+++ b/system/bta/pan/bta_pan_main.cc
@@ -37,8 +37,8 @@
 #include "utl.h"
 
 /*****************************************************************************
-** Constants and types
-*****************************************************************************/
+ * Constants and types
+ ****************************************************************************/
 
 
 
@@ -144,22 +144,22 @@ const tBTA_PAN_ST_TBL bta_pan_st_tbl[] = {
 };
 
 /*****************************************************************************
-** Global data
-*****************************************************************************/
+ * Global data
+ ****************************************************************************/
 
 /* PAN control block */
 tBTA_PAN_CB  bta_pan_cb;
 
 /*******************************************************************************
-**
-** Function         bta_pan_scb_alloc
-**
-** Description      Allocate a PAN server control block.
-**
-**
-** Returns          pointer to the scb, or NULL if none could be allocated.
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_scb_alloc
+ *
+ * Description      Allocate a PAN server control block.
+ *
+ *
+ * Returns          pointer to the scb, or NULL if none could be allocated.
+ *
+ ******************************************************************************/
 tBTA_PAN_SCB *bta_pan_scb_alloc(void)
 {
     tBTA_PAN_SCB     *p_scb = &bta_pan_cb.scb[0];
@@ -185,15 +185,15 @@ tBTA_PAN_SCB *bta_pan_scb_alloc(void)
 }
 
 /*******************************************************************************
-**
-** Function         bta_pan_sm_execute
-**
-** Description      State machine event handling function for PAN
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_sm_execute
+ *
+ * Description      State machine event handling function for PAN
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_pan_sm_execute(tBTA_PAN_SCB *p_scb, uint16_t event, tBTA_PAN_DATA *p_data)
 {
     tBTA_PAN_ST_TBL      state_table;
@@ -225,15 +225,15 @@ static void bta_pan_sm_execute(tBTA_PAN_SCB *p_scb, uint16_t event, tBTA_PAN_DAT
 }
 
 /*******************************************************************************
-**
-** Function         bta_pan_api_enable
-**
-** Description      Handle an API enable event.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_api_enable
+ *
+ * Description      Handle an API enable event.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_pan_api_enable(tBTA_PAN_DATA *p_data)
 {
     /* initialize control block */
@@ -245,15 +245,15 @@ static void bta_pan_api_enable(tBTA_PAN_DATA *p_data)
 }
 
 /*******************************************************************************
-**
-** Function         bta_pan_api_disable
-**
-** Description      Handle an API disable event.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_api_disable
+ *
+ * Description      Handle an API disable event.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_pan_api_disable(UNUSED_ATTR tBTA_PAN_DATA *p_data)
 {
     bta_pan_disable();
@@ -261,15 +261,15 @@ static void bta_pan_api_disable(UNUSED_ATTR tBTA_PAN_DATA *p_data)
 
 
 /*******************************************************************************
-**
-** Function         bta_pan_api_open
-**
-** Description      Handle an API listen event.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_api_open
+ *
+ * Description      Handle an API listen event.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 static void bta_pan_api_open(tBTA_PAN_DATA *p_data)
 {
     tBTA_PAN_SCB     *p_scb;
@@ -289,15 +289,15 @@ static void bta_pan_api_open(tBTA_PAN_DATA *p_data)
     }
 }
 /*******************************************************************************
-**
-** Function         bta_pan_scb_dealloc
-**
-** Description      Deallocate a link control block.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_scb_dealloc
+ *
+ * Description      Deallocate a link control block.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_pan_scb_dealloc(tBTA_PAN_SCB *p_scb)
 {
     APPL_TRACE_DEBUG("bta_pan_scb_dealloc %d", bta_pan_scb_to_idx(p_scb));
@@ -306,15 +306,15 @@ void bta_pan_scb_dealloc(tBTA_PAN_SCB *p_scb)
 }
 
 /*******************************************************************************
-**
-** Function         bta_pan_scb_to_idx
-**
-** Description      Given a pointer to an scb, return its index.
-**
-**
-** Returns          Index of scb.
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_scb_to_idx
+ *
+ * Description      Given a pointer to an scb, return its index.
+ *
+ *
+ * Returns          Index of scb.
+ *
+ ******************************************************************************/
 uint8_t bta_pan_scb_to_idx(tBTA_PAN_SCB *p_scb)
 {
 
@@ -324,15 +324,15 @@ uint8_t bta_pan_scb_to_idx(tBTA_PAN_SCB *p_scb)
 
 
 /*******************************************************************************
-**
-** Function         bta_pan_scb_by_handle
-**
-** Description      Find scb associated with handle.
-**
-**
-** Returns          Pointer to scb or NULL if not found.
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_scb_by_handle
+ *
+ * Description      Find scb associated with handle.
+ *
+ *
+ * Returns          Pointer to scb or NULL if not found.
+ *
+ ******************************************************************************/
 tBTA_PAN_SCB *bta_pan_scb_by_handle(uint16_t handle)
 {
     tBTA_PAN_SCB     *p_scb = &bta_pan_cb.scb[0];
@@ -353,15 +353,15 @@ tBTA_PAN_SCB *bta_pan_scb_by_handle(uint16_t handle)
 }
 
 /*******************************************************************************
-**
-** Function         bta_pan_hdl_event
-**
-** Description      Data gateway main event handling function.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_pan_hdl_event
+ *
+ * Description      Data gateway main event handling function.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 bool bta_pan_hdl_event(BT_HDR *p_msg)
 {
     tBTA_PAN_SCB *p_scb;
diff --git a/system/bta/pb/bta_pbs_int.h b/system/bta/pb/bta_pbs_int.h
index 348898637ac..8e520a6495a 100644
--- a/system/bta/pb/bta_pbs_int.h
+++ b/system/bta/pb/bta_pbs_int.h
@@ -28,8 +28,8 @@
 #include "bta_sys.h"
 
 /*****************************************************************************
-**  Constants and data types
-*****************************************************************************/
+ *  Constants and data types
+ ****************************************************************************/
 
 /* Profile supported features */
 #define BTA_PBS_SUPF_DOWNLOAD     0x0001
diff --git a/system/bta/sdp/bta_sdp.cc b/system/bta/sdp/bta_sdp.cc
index 6654c408abd..ef5c8d94e23 100644
--- a/system/bta/sdp/bta_sdp.cc
+++ b/system/bta/sdp/bta_sdp.cc
@@ -30,8 +30,8 @@
 #include "bta_sdp_int.h"
 
 /*****************************************************************************
-** Constants and types
-*****************************************************************************/
+ * Constants and types
+ ****************************************************************************/
 
 tBTA_SDP_CB bta_sdp_cb;
 
@@ -51,12 +51,12 @@ const tBTA_SDP_ACTION bta_sdp_action[] =
 };
 
 /*******************************************************************************
-** Function         bta_sdp_sm_execute
-**
-** Description      State machine event handling function for SDP search
-**
-** Returns          void
-*******************************************************************************/
+ * Function         bta_sdp_sm_execute
+ *
+ * Description      State machine event handling function for SDP search
+ *
+ * Returns          void
+ ******************************************************************************/
 bool bta_sdp_sm_execute(BT_HDR *p_msg)
 {
     if(p_msg == NULL) return false;
diff --git a/system/bta/sdp/bta_sdp_act.cc b/system/bta/sdp/bta_sdp_act.cc
index ac93704e086..cb3cc13e140 100644
--- a/system/bta/sdp/bta_sdp_act.cc
+++ b/system/bta/sdp/bta_sdp_act.cc
@@ -39,8 +39,8 @@
 #include "sdp_api.h"
 
 /*****************************************************************************
-**  Constants
-*****************************************************************************/
+ *  Constants
+ ****************************************************************************/
 
 static const uint8_t  UUID_OBEX_OBJECT_PUSH[] = {0x00, 0x00, 0x11, 0x05, 0x00, 0x00, 0x10, 0x00,
                                                  0x80, 0x00, 0x00, 0x80, 0x5F, 0x9B, 0x34, 0xFB};
@@ -370,14 +370,14 @@ static void bta_create_raw_sdp_record(bluetooth_sdp_record *record, tSDP_DISC_RE
 
 
 /*******************************************************************************
-**
-** Function     bta_sdp_search_cback
-**
-** Description  Callback from btm after search is completed
-**
-** Returns      void
-**
-*******************************************************************************/
+ *
+ * Function     bta_sdp_search_cback
+ *
+ * Description  Callback from btm after search is completed
+ *
+ * Returns      void
+ *
+ ******************************************************************************/
 static void bta_sdp_search_cback(uint16_t result, void * user_data)
 {
     tSDP_DISC_REC *p_rec = NULL;
@@ -446,14 +446,14 @@ static void bta_sdp_search_cback(uint16_t result, void * user_data)
 }
 
 /*******************************************************************************
-**
-** Function     bta_sdp_enable
-**
-** Description  Initializes the SDP I/F
-**
-** Returns      void
-**
-*******************************************************************************/
+ *
+ * Function     bta_sdp_enable
+ *
+ * Description  Initializes the SDP I/F
+ *
+ * Returns      void
+ *
+ ******************************************************************************/
 void bta_sdp_enable(tBTA_SDP_MSG *p_data)
 {
     APPL_TRACE_DEBUG("%s in, sdp_active:%d", __func__, bta_sdp_cb.sdp_active);
@@ -463,14 +463,14 @@ void bta_sdp_enable(tBTA_SDP_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function     bta_sdp_search
-**
-** Description  Discovers all sdp records for an uuid on remote device
-**
-** Returns      void
-**
-*******************************************************************************/
+ *
+ * Function     bta_sdp_search
+ *
+ * Description  Discovers all sdp records for an uuid on remote device
+ *
+ * Returns      void
+ *
+ ******************************************************************************/
 void bta_sdp_search(tBTA_SDP_MSG *p_data)
 {
     if (p_data == NULL) {
@@ -533,14 +533,14 @@ void bta_sdp_search(tBTA_SDP_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function     bta_sdp_record
-**
-** Description  Discovers all sdp records for an uuid on remote device
-**
-** Returns      void
-**
-*******************************************************************************/
+ *
+ * Function     bta_sdp_record
+ *
+ * Description  Discovers all sdp records for an uuid on remote device
+ *
+ * Returns      void
+ *
+ ******************************************************************************/
 void bta_sdp_create_record(tBTA_SDP_MSG *p_data)
 {
     APPL_TRACE_DEBUG("%s() event: %d", __func__, p_data->record.hdr.event);
@@ -549,14 +549,14 @@ void bta_sdp_create_record(tBTA_SDP_MSG *p_data)
 }
 
 /*******************************************************************************
-**
-** Function     bta_sdp_create_record
-**
-** Description  Discovers all sdp records for an uuid on remote device
-**
-** Returns      void
-**
-*******************************************************************************/
+ *
+ * Function     bta_sdp_create_record
+ *
+ * Description  Discovers all sdp records for an uuid on remote device
+ *
+ * Returns      void
+ *
+ ******************************************************************************/
 void bta_sdp_remove_record(tBTA_SDP_MSG *p_data)
 {
     APPL_TRACE_DEBUG("%s() event: %d", __func__, p_data->record.hdr.event);
diff --git a/system/bta/sdp/bta_sdp_api.cc b/system/bta/sdp/bta_sdp_api.cc
index e10c31ed3d4..2944a268442 100644
--- a/system/bta/sdp/bta_sdp_api.cc
+++ b/system/bta/sdp/bta_sdp_api.cc
@@ -32,8 +32,8 @@
 #include "sdp_api.h"
 
 /*****************************************************************************
-**  Constants
-*****************************************************************************/
+ *  Constants
+ ****************************************************************************/
 
 static const tBTA_SYS_REG bta_sdp_reg =
 {
@@ -42,19 +42,19 @@ static const tBTA_SYS_REG bta_sdp_reg =
 };
 
 /*******************************************************************************
-**
-** Function         BTA_SdpEnable
-**
-** Description      Enable the SDP search I/F service. When the enable
-**                  operation is complete the callback function will be
-**                  called with a BTA_SDP_ENABLE_EVT. This function must
-**                  be called before other functions in the SDP search API are
-**                  called.
-**
-** Returns          BTA_SDP_SUCCESS if successful.
-**                  BTA_SDP_FAIL if internal failure.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_SdpEnable
+ *
+ * Description      Enable the SDP search I/F service. When the enable
+ *                  operation is complete the callback function will be
+ *                  called with a BTA_SDP_ENABLE_EVT. This function must
+ *                  be called before other functions in the SDP search API are
+ *                  called.
+ *
+ * Returns          BTA_SDP_SUCCESS if successful.
+ *                  BTA_SDP_FAIL if internal failure.
+ *
+ ******************************************************************************/
 tBTA_SDP_STATUS BTA_SdpEnable(tBTA_SDP_DM_CBACK *p_cback)
 {
     tBTA_SDP_STATUS status = BTA_SDP_FAILURE;
@@ -80,18 +80,18 @@ tBTA_SDP_STATUS BTA_SdpEnable(tBTA_SDP_DM_CBACK *p_cback)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_SdpSearch
-**
-** Description      This function performs service discovery for a specific service
-**                  on given peer device. When the operation is completed
-**                  the tBTA_SDP_DM_CBACK callback function will be  called with
-**                  a BTA_SDP_SEARCH_COMPLETE_EVT.
-**
-** Returns          BTA_SDP_SUCCESS, if the request is being processed.
-**                  BTA_SDP_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_SdpSearch
+ *
+ * Description      This function performs service discovery for a specific service
+ *                  on given peer device. When the operation is completed
+ *                  the tBTA_SDP_DM_CBACK callback function will be  called with
+ *                  a BTA_SDP_SEARCH_COMPLETE_EVT.
+ *
+ * Returns          BTA_SDP_SUCCESS, if the request is being processed.
+ *                  BTA_SDP_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_SDP_STATUS BTA_SdpSearch(BD_ADDR bd_addr, tSDP_UUID *uuid)
 {
     tBTA_SDP_API_SEARCH *p_msg =
@@ -110,17 +110,17 @@ tBTA_SDP_STATUS BTA_SdpSearch(BD_ADDR bd_addr, tSDP_UUID *uuid)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_SdpCreateRecordByUser
-**
-** Description      This function is used to request a callback to create a SDP
-**                  record. The registered callback will be called with event
-**                  BTA_SDP_CREATE_RECORD_USER_EVT.
-**
-** Returns          BTA_SDP_SUCCESS, if the request is being processed.
-**                  BTA_SDP_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_SdpCreateRecordByUser
+ *
+ * Description      This function is used to request a callback to create a SDP
+ *                  record. The registered callback will be called with event
+ *                  BTA_SDP_CREATE_RECORD_USER_EVT.
+ *
+ * Returns          BTA_SDP_SUCCESS, if the request is being processed.
+ *                  BTA_SDP_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_SDP_STATUS BTA_SdpCreateRecordByUser(void* user_data)
 {
     tBTA_SDP_API_RECORD_USER *p_msg =
@@ -137,17 +137,17 @@ tBTA_SDP_STATUS BTA_SdpCreateRecordByUser(void* user_data)
 }
 
 /*******************************************************************************
-**
-** Function         BTA_SdpRemoveRecordByUser
-**
-** Description      This function is used to request a callback to remove a SDP
-**                  record. The registered callback will be called with event
-**                  BTA_SDP_REMOVE_RECORD_USER_EVT.
-**
-** Returns          BTA_SDP_SUCCESS, if the request is being processed.
-**                  BTA_SDP_FAILURE, otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         BTA_SdpRemoveRecordByUser
+ *
+ * Description      This function is used to request a callback to remove a SDP
+ *                  record. The registered callback will be called with event
+ *                  BTA_SDP_REMOVE_RECORD_USER_EVT.
+ *
+ * Returns          BTA_SDP_SUCCESS, if the request is being processed.
+ *                  BTA_SDP_FAILURE, otherwise.
+ *
+ ******************************************************************************/
 tBTA_SDP_STATUS BTA_SdpRemoveRecordByUser(void* user_data)
 {
     tBTA_SDP_API_RECORD_USER *p_msg =
diff --git a/system/bta/sdp/bta_sdp_int.h b/system/bta/sdp/bta_sdp_int.h
index 932adf58040..325060b3605 100644
--- a/system/bta/sdp/bta_sdp_int.h
+++ b/system/bta/sdp/bta_sdp_int.h
@@ -32,8 +32,8 @@
 #include "bta_sdp_api.h"
 
 /*****************************************************************************
-**  Constants
-*****************************************************************************/
+ *  Constants
+ ****************************************************************************/
 
 enum
 {
diff --git a/system/bta/sys/bta_sys.h b/system/bta/sys/bta_sys.h
index f0283dc62e5..20efc35db55 100644
--- a/system/bta/sys/bta_sys.h
+++ b/system/bta/sys/bta_sys.h
@@ -33,8 +33,8 @@ extern "C" {
 #endif
 
 /*****************************************************************************
-**  Constants and data types
-*****************************************************************************/
+ *  Constants and data types
+ ****************************************************************************/
 
 /* vendor specific event handler function type */
 typedef bool (tBTA_SYS_VS_EVT_HDLR)(uint16_t evt, void *p);
@@ -170,22 +170,22 @@ typedef void (*tBTA_SYS_REGISTER)(uint8_t id, const tBTA_SYS_REG *p_reg);
 typedef void (*tBTA_SYS_SENDMSG)(void *p_msg);
 
 /*****************************************************************************
-**  Global data
-*****************************************************************************/
+ *  Global data
+ ****************************************************************************/
 
 /* trace level */
 extern uint8_t appl_trace_level;
 
 /*****************************************************************************
-**  Macros
-*****************************************************************************/
+ *  Macros
+ ****************************************************************************/
 
 /* Calculate start of event enumeration; id is top 8 bits of event */
 #define BTA_SYS_EVT_START(id)       ((id) << 8)
 
 /*****************************************************************************
-**  events for BTA SYS HW manager
-*****************************************************************************/
+ *  events for BTA SYS HW manager
+ ****************************************************************************/
 
 /* events sent to SYS HW manager - must be kept synchronized with tables in bta_sys_main.cc */
 enum
@@ -219,8 +219,8 @@ typedef uint8_t tBTA_SYS_HW_EVT;
 typedef void (tBTA_SYS_HW_CBACK)(tBTA_SYS_HW_EVT status);
 
 /*****************************************************************************
-**  Function declarations
-*****************************************************************************/
+ *  Function declarations
+ ****************************************************************************/
 
 extern void bta_sys_init(void);
 extern void bta_sys_free(void);
diff --git a/system/bta/sys/bta_sys_conn.cc b/system/bta/sys/bta_sys_conn.cc
index 1098f9c9096..5562d0ec1b1 100644
--- a/system/bta/sys/bta_sys_conn.cc
+++ b/system/bta/sys/bta_sys_conn.cc
@@ -31,15 +31,15 @@
 #include "utl.h"
 
 /*******************************************************************************
-**
-** Function         bta_sys_rm_register
-**
-** Description      Called by BTA DM to register role management callbacks
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_sys_rm_register
+ *
+ * Description      Called by BTA DM to register role management callbacks
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_sys_rm_register(tBTA_SYS_CONN_CBACK * p_cback)
 {
     bta_sys_cb.prm_cb = p_cback;
@@ -47,44 +47,44 @@ void bta_sys_rm_register(tBTA_SYS_CONN_CBACK * p_cback)
 
 
 /*******************************************************************************
-**
-** Function         bta_sys_policy_register
-**
-** Description      Called by BTA DM to register link policy change callbacks
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_sys_policy_register
+ *
+ * Description      Called by BTA DM to register link policy change callbacks
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_sys_policy_register(tBTA_SYS_CONN_CBACK * p_cback)
 {
     bta_sys_cb.p_policy_cb = p_cback;
 }
 
 /*******************************************************************************
-**
-** Function         bta_sys_role_chg_register
-**
-** Description      Called by BTA AV to register role change callbacks
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_sys_role_chg_register
+ *
+ * Description      Called by BTA AV to register role change callbacks
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_sys_role_chg_register(tBTA_SYS_CONN_CBACK * p_cback)
 {
     bta_sys_cb.p_role_cb = p_cback;
 }
 /*******************************************************************************
-**
-** Function         bta_sys_ssr_cfg_register
-**
-** Description      Called by BTA DM to register SSR configuration callback
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_sys_ssr_cfg_register
+ *
+ * Description      Called by BTA DM to register SSR configuration callback
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 #if (BTM_SSR_INCLUDED == TRUE)
 void bta_sys_ssr_cfg_register(tBTA_SYS_SSR_CFG_CBACK * p_cback)
 {
@@ -92,15 +92,15 @@ void bta_sys_ssr_cfg_register(tBTA_SYS_SSR_CFG_CBACK * p_cback)
 }
 #endif
 /*******************************************************************************
-**
-** Function         bta_sys_role_chg_register
-**
-** Description      Called by BTA AV to register role change callbacks
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_sys_role_chg_register
+ *
+ * Description      Called by BTA AV to register role change callbacks
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_sys_notify_role_chg(BD_ADDR_PTR p_bda, uint8_t new_role, uint8_t hci_status)
 {
     if (bta_sys_cb.p_role_cb)
@@ -110,15 +110,15 @@ void bta_sys_notify_role_chg(BD_ADDR_PTR p_bda, uint8_t new_role, uint8_t hci_st
 }
 
 /*******************************************************************************
-**
-** Function         bta_sys_collision_register
-**
-** Description      Called by any BTA module to register for collision event.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_sys_collision_register
+ *
+ * Description      Called by any BTA module to register for collision event.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_sys_collision_register(uint8_t bta_id, tBTA_SYS_CONN_CBACK *p_cback)
 {
     uint8_t index;
@@ -136,15 +136,15 @@ void bta_sys_collision_register(uint8_t bta_id, tBTA_SYS_CONN_CBACK *p_cback)
 }
 
 /*******************************************************************************
-**
-** Function         bta_sys_notify_collision
-**
-** Description      Called by BTA DM to notify collision event.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_sys_notify_collision
+ *
+ * Description      Called by BTA DM to notify collision event.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_sys_notify_collision (BD_ADDR_PTR p_bda)
 {
     uint8_t index;
@@ -160,46 +160,46 @@ void bta_sys_notify_collision (BD_ADDR_PTR p_bda)
 }
 
 /*******************************************************************************
-**
-** Function         bta_sys_sco_register
-**
-** Description      Called by BTA AV to register sco connection change callbacks
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_sys_sco_register
+ *
+ * Description      Called by BTA AV to register sco connection change callbacks
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_sys_sco_register(tBTA_SYS_CONN_CBACK * p_cback)
 {
     bta_sys_cb.p_sco_cb = p_cback;
 }
 
 /*******************************************************************************
-**
-** Function         bta_sys_pm_register
-**
-** Description      Called by BTA DM to register power management callbacks
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_sys_pm_register
+ *
+ * Description      Called by BTA DM to register power management callbacks
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_sys_pm_register(tBTA_SYS_CONN_CBACK * p_cback)
 {
     bta_sys_cb.ppm_cb = p_cback;
 }
 
 /*******************************************************************************
-**
-** Function         bta_sys_conn_open
-**
-** Description      Called by BTA subsystems when a connection is made to
-**                  the service
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_sys_conn_open
+ *
+ * Description      Called by BTA subsystems when a connection is made to
+ *                  the service
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_sys_conn_open(uint8_t id, uint8_t app_id, BD_ADDR peer_addr)
 {
     if(bta_sys_cb.prm_cb)
@@ -220,16 +220,16 @@ void bta_sys_conn_open(uint8_t id, uint8_t app_id, BD_ADDR peer_addr)
 
 
 /*******************************************************************************
-**
-** Function         bta_sys_conn_close
-**
-** Description      Called by BTA subsystems when a connection to the service
-**                  is closed
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_sys_conn_close
+ *
+ * Description      Called by BTA subsystems when a connection to the service
+ *                  is closed
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_sys_conn_close(uint8_t id, uint8_t app_id, BD_ADDR peer_addr)
 {
     if(bta_sys_cb.prm_cb)
@@ -249,16 +249,16 @@ void bta_sys_conn_close(uint8_t id, uint8_t app_id, BD_ADDR peer_addr)
 
 
 /*******************************************************************************
-**
-** Function         bta_sys_app_open
-**
-** Description      Called by BTA subsystems when application initiates connection
-**                  to a peer device
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_sys_app_open
+ *
+ * Description      Called by BTA subsystems when application initiates connection
+ *                  to a peer device
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_sys_app_open(uint8_t id, uint8_t app_id, BD_ADDR peer_addr)
 {
     if(bta_sys_cb.ppm_cb)
@@ -270,15 +270,15 @@ void bta_sys_app_open(uint8_t id, uint8_t app_id, BD_ADDR peer_addr)
 
 
 /*******************************************************************************
-**
-** Function         bta_sys_app_close
-**
-** Description      Called by BTA subsystems when application initiates close
-**                  of connection to peer device
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_sys_app_close
+ *
+ * Description      Called by BTA subsystems when application initiates close
+ *                  of connection to peer device
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_sys_app_close(uint8_t id, uint8_t app_id, BD_ADDR peer_addr)
 {
     if(bta_sys_cb.ppm_cb)
@@ -289,15 +289,15 @@ void bta_sys_app_close(uint8_t id, uint8_t app_id, BD_ADDR peer_addr)
 
 
 /*******************************************************************************
-**
-** Function         bta_sys_sco_open
-**
-** Description      Called by BTA subsystems when sco connection for that service
-**                  is open
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_sys_sco_open
+ *
+ * Description      Called by BTA subsystems when sco connection for that service
+ *                  is open
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_sys_sco_open(uint8_t id, uint8_t app_id, BD_ADDR peer_addr)
 {
     /* AG triggers p_sco_cb by bta_sys_sco_use. */
@@ -314,15 +314,15 @@ void bta_sys_sco_open(uint8_t id, uint8_t app_id, BD_ADDR peer_addr)
 }
 
 /*******************************************************************************
-**
-** Function         bta_sys_sco_close
-**
-** Description      Called by BTA subsystems when sco connection for that service
-**                  is closed
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_sys_sco_close
+ *
+ * Description      Called by BTA subsystems when sco connection for that service
+ *                  is closed
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_sys_sco_close(uint8_t id, uint8_t app_id, BD_ADDR peer_addr)
 {
     uint8_t num_sco_links;
@@ -340,15 +340,15 @@ void bta_sys_sco_close(uint8_t id, uint8_t app_id, BD_ADDR peer_addr)
 }
 
 /*******************************************************************************
-**
-** Function         bta_sys_sco_use
-**
-** Description      Called by BTA subsystems when that service needs to use sco.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_sys_sco_use
+ *
+ * Description      Called by BTA subsystems when that service needs to use sco.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_sys_sco_use(UNUSED_ATTR uint8_t id, uint8_t app_id,
                      BD_ADDR peer_addr)
 {
@@ -361,15 +361,15 @@ void bta_sys_sco_use(UNUSED_ATTR uint8_t id, uint8_t app_id,
 }
 
 /*******************************************************************************
-**
-** Function         bta_sys_sco_unuse
-**
-** Description      Called by BTA subsystems when sco connection for that service
-**                  is no longer needed.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_sys_sco_unuse
+ *
+ * Description      Called by BTA subsystems when sco connection for that service
+ *                  is no longer needed.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_sys_sco_unuse(UNUSED_ATTR uint8_t id, uint8_t app_id,
                        BD_ADDR peer_addr)
 {
@@ -382,15 +382,15 @@ void bta_sys_sco_unuse(UNUSED_ATTR uint8_t id, uint8_t app_id,
     }
 }
 /*******************************************************************************
-**
-** Function         bta_sys_chg_ssr_config
-**
-** Description      Called by BTA subsystems to indicate that the given app SSR setting
-**                  need to be changed.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_sys_chg_ssr_config
+ *
+ * Description      Called by BTA subsystems to indicate that the given app SSR setting
+ *                  need to be changed.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 #if (BTM_SSR_INCLUDED == TRUE)
 void bta_sys_chg_ssr_config (uint8_t id, uint8_t app_id, uint16_t max_latency, uint16_t min_tout)
 {
@@ -401,15 +401,15 @@ void bta_sys_chg_ssr_config (uint8_t id, uint8_t app_id, uint16_t max_latency, u
 }
 #endif
 /*******************************************************************************
-**
-** Function         bta_sys_set_policy
-**
-** Description      Called by BTA subsystems to indicate that the given link
-**                  policy to peer device should be set
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_sys_set_policy
+ *
+ * Description      Called by BTA subsystems to indicate that the given link
+ *                  policy to peer device should be set
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_sys_set_policy (uint8_t id, uint8_t policy, BD_ADDR peer_addr)
 {
     if(bta_sys_cb.p_policy_cb)
@@ -419,15 +419,15 @@ void bta_sys_set_policy (uint8_t id, uint8_t policy, BD_ADDR peer_addr)
 }
 
 /*******************************************************************************
-**
-** Function         bta_sys_clear_policy
-**
-** Description      Called by BTA subsystems to indicate that the given link
-**                  policy to peer device should be clear
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_sys_clear_policy
+ *
+ * Description      Called by BTA subsystems to indicate that the given link
+ *                  policy to peer device should be clear
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_sys_clear_policy (uint8_t id, uint8_t policy, BD_ADDR peer_addr)
 {
     if(bta_sys_cb.p_policy_cb)
@@ -437,15 +437,15 @@ void bta_sys_clear_policy (uint8_t id, uint8_t policy, BD_ADDR peer_addr)
 }
 
 /*******************************************************************************
-**
-** Function         bta_sys_set_default_policy
-**
-** Description      Called by BTA subsystems to indicate that the given default
-**                  link policy should be set
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_sys_set_default_policy
+ *
+ * Description      Called by BTA subsystems to indicate that the given default
+ *                  link policy should be set
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_sys_set_default_policy (uint8_t id, uint8_t policy)
 {
     if(bta_sys_cb.p_policy_cb)
@@ -455,15 +455,15 @@ void bta_sys_set_default_policy (uint8_t id, uint8_t policy)
 }
 
 /*******************************************************************************
-**
-** Function         bta_sys_clear_default_policy
-**
-** Description      Called by BTA subsystems to indicate that the given default
-**                  link policy should be clear
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_sys_clear_default_policy
+ *
+ * Description      Called by BTA subsystems to indicate that the given default
+ *                  link policy should be clear
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_sys_clear_default_policy (uint8_t id, uint8_t policy)
 {
     if(bta_sys_cb.p_policy_cb)
@@ -473,15 +473,15 @@ void bta_sys_clear_default_policy (uint8_t id, uint8_t policy)
 }
 
 /*******************************************************************************
-**
-** Function         bta_sys_idle
-**
-** Description      Called by BTA subsystems to indicate that the connection to
-**                  peer device is idle
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_sys_idle
+ *
+ * Description      Called by BTA subsystems to indicate that the connection to
+ *                  peer device is idle
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_sys_idle(uint8_t id, uint8_t app_id, BD_ADDR peer_addr)
 {
 
@@ -500,15 +500,15 @@ void bta_sys_idle(uint8_t id, uint8_t app_id, BD_ADDR peer_addr)
 }
 
 /*******************************************************************************
-**
-** Function         bta_sys_busy
-**
-** Description      Called by BTA subsystems to indicate that the connection to
-**                  peer device is busy
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_sys_busy
+ *
+ * Description      Called by BTA subsystems to indicate that the connection to
+ *                  peer device is busy
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_sys_busy(uint8_t id, uint8_t app_id, BD_ADDR peer_addr)
 {
     if(bta_sys_cb.prm_cb)
@@ -528,30 +528,30 @@ void bta_sys_busy(uint8_t id, uint8_t app_id, BD_ADDR peer_addr)
 
 #if (BTA_EIR_CANNED_UUID_LIST != TRUE)
 /*******************************************************************************
-**
-** Function         bta_sys_eir_register
-**
-** Description      Called by BTA DM to register EIR utility function that can be
-**                  used by the other BTA modules to add/remove UUID.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_sys_eir_register
+ *
+ * Description      Called by BTA DM to register EIR utility function that can be
+ *                  used by the other BTA modules to add/remove UUID.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_sys_eir_register(tBTA_SYS_EIR_CBACK * p_cback)
 {
     bta_sys_cb.eir_cb = p_cback;
 }
 
 /*******************************************************************************
-**
-** Function         bta_sys_add_uuid
-**
-** Description      Called by BTA subsystems to indicate to DM that new service
-**                  class UUID is added.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_sys_add_uuid
+ *
+ * Description      Called by BTA subsystems to indicate to DM that new service
+ *                  class UUID is added.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_sys_add_uuid(uint16_t uuid16)
 {
     if(bta_sys_cb.eir_cb)
@@ -561,15 +561,15 @@ void bta_sys_add_uuid(uint16_t uuid16)
 }
 
 /*******************************************************************************
-**
-** Function         bta_sys_remove_uuid
-**
-** Description      Called by BTA subsystems to indicate to DM that the service
-**                  class UUID is removed.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_sys_remove_uuid
+ *
+ * Description      Called by BTA subsystems to indicate to DM that the service
+ *                  class UUID is removed.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_sys_remove_uuid(uint16_t uuid16)
 {
     if(bta_sys_cb.eir_cb)
diff --git a/system/bta/sys/bta_sys_int.h b/system/bta/sys/bta_sys_int.h
index 3ac73f3fef4..3657693e1c7 100644
--- a/system/bta/sys/bta_sys_int.h
+++ b/system/bta/sys/bta_sys_int.h
@@ -25,12 +25,12 @@
 #define BTA_SYS_INT_H
 
 /*****************************************************************************
-**  Constants and data types
-*****************************************************************************/
+ *  Constants and data types
+ ****************************************************************************/
 
 /*****************************************************************************
-**  state table
-*****************************************************************************/
+ *  state table
+ ****************************************************************************/
 
 /* SYS HW state */
 enum
@@ -79,8 +79,8 @@ typedef struct
 } tBTA_SYS_CB;
 
 /*****************************************************************************
-**  Global variables
-*****************************************************************************/
+ *  Global variables
+ ****************************************************************************/
 
 /* system manager control block */
 extern tBTA_SYS_CB bta_sys_cb;
diff --git a/system/bta/sys/bta_sys_main.cc b/system/bta/sys/bta_sys_main.cc
index d7ff53ad72b..b97b61e97bf 100644
--- a/system/bta/sys/bta_sys_main.cc
+++ b/system/bta/sys/bta_sys_main.cc
@@ -158,15 +158,15 @@ const tBTA_SYS_ST_TBL bta_sys_st_tbl[] = {
 };
 
 /*******************************************************************************
-**
-** Function         bta_sys_init
-**
-** Description      BTA initialization; called from task initialization.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_sys_init
+ *
+ * Description      BTA initialization; called from task initialization.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_sys_init(void)
 {
     memset(&bta_sys_cb, 0, sizeof(tBTA_SYS_CB));
@@ -197,15 +197,15 @@ void bta_sys_free(void) {
 }
 
 /*******************************************************************************
-**
-** Function         bta_dm_sm_execute
-**
-** Description      State machine event handling function for DM
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_dm_sm_execute
+ *
+ * Description      State machine event handling function for DM
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 bool bta_sys_sm_execute(BT_HDR *p_msg)
 {
     bool freebuf = true;
@@ -249,15 +249,15 @@ void bta_sys_hw_unregister( tBTA_SYS_HW_MODULE module )
 }
 
 /*******************************************************************************
-**
-** Function         bta_sys_hw_btm_cback
-**
-** Description     This function is registered by BTA SYS to BTM in order to get status notifications
-**
-**
-** Returns
-**
-*******************************************************************************/
+ *
+ * Function         bta_sys_hw_btm_cback
+ *
+ * Description     This function is registered by BTA SYS to BTM in order to get status notifications
+ *
+ *
+ * Returns
+ *
+ ******************************************************************************/
 void bta_sys_hw_btm_cback( tBTM_DEV_STATUS status )
 {
 
@@ -281,15 +281,15 @@ void bta_sys_hw_btm_cback( tBTM_DEV_STATUS status )
 }
 
 /*******************************************************************************
-**
-** Function         bta_sys_hw_error
-**
-** Description     In case the HW device stops answering... Try to turn it off, then re-enable all
-**                      previously active SW modules.
-**
-** Returns          success or failure
-**
-*******************************************************************************/
+ *
+ * Function         bta_sys_hw_error
+ *
+ * Description     In case the HW device stops answering... Try to turn it off, then re-enable all
+ *                      previously active SW modules.
+ *
+ * Returns          success or failure
+ *
+ ******************************************************************************/
 void bta_sys_hw_error(UNUSED_ATTR tBTA_SYS_HW_MSG *p_sys_hw_msg)
 {
     uint8_t module_index;
@@ -317,15 +317,15 @@ void bta_sys_hw_error(UNUSED_ATTR tBTA_SYS_HW_MSG *p_sys_hw_msg)
 
 
 /*******************************************************************************
-**
-** Function         bta_sys_hw_enable
-**
-** Description     this function is called after API enable and HW has been turned on
-**
-**
-** Returns          success or failure
-**
-*******************************************************************************/
+ *
+ * Function         bta_sys_hw_enable
+ *
+ * Description     this function is called after API enable and HW has been turned on
+ *
+ *
+ * Returns          success or failure
+ *
+ ******************************************************************************/
 
 void bta_sys_hw_api_enable( tBTA_SYS_HW_MSG *p_sys_hw_msg )
 {
@@ -357,15 +357,15 @@ void bta_sys_hw_api_enable( tBTA_SYS_HW_MSG *p_sys_hw_msg )
 }
 
 /*******************************************************************************
-**
-** Function         bta_sys_hw_disable
-**
-** Description     if no other module is using the HW, this function will call ( if defined ) a user-macro to turn off the HW
-**
-**
-** Returns          success or failure
-**
-*******************************************************************************/
+ *
+ * Function         bta_sys_hw_disable
+ *
+ * Description     if no other module is using the HW, this function will call ( if defined ) a user-macro to turn off the HW
+ *
+ *
+ * Returns          success or failure
+ *
+ ******************************************************************************/
 void bta_sys_hw_api_disable(tBTA_SYS_HW_MSG *p_sys_hw_msg)
 {
     APPL_TRACE_DEBUG("bta_sys_hw_api_disable for %d, active modules: 0x%04X",
@@ -401,15 +401,15 @@ void bta_sys_hw_api_disable(tBTA_SYS_HW_MSG *p_sys_hw_msg)
 }
 
 /*******************************************************************************
-**
-** Function         bta_sys_hw_event_enabled
-**
-** Description
-**
-**
-** Returns          success or failure
-**
-*******************************************************************************/
+ *
+ * Function         bta_sys_hw_event_enabled
+ *
+ * Description
+ *
+ *
+ * Returns          success or failure
+ *
+ ******************************************************************************/
 void bta_sys_hw_evt_enabled(tBTA_SYS_HW_MSG *p_sys_hw_msg)
 {
     APPL_TRACE_EVENT("bta_sys_hw_evt_enabled for %i", p_sys_hw_msg->hw_module);
@@ -418,15 +418,15 @@ void bta_sys_hw_evt_enabled(tBTA_SYS_HW_MSG *p_sys_hw_msg)
 
 
 /*******************************************************************************
-**
-** Function         bta_sys_hw_event_disabled
-**
-** Description
-**
-**
-** Returns          success or failure
-**
-*******************************************************************************/
+ *
+ * Function         bta_sys_hw_event_disabled
+ *
+ * Description
+ *
+ *
+ * Returns          success or failure
+ *
+ ******************************************************************************/
 void bta_sys_hw_evt_disabled(tBTA_SYS_HW_MSG *p_sys_hw_msg)
 {
     uint8_t hw_module_index;
@@ -441,15 +441,15 @@ void bta_sys_hw_evt_disabled(tBTA_SYS_HW_MSG *p_sys_hw_msg)
 }
 
 /*******************************************************************************
-**
-** Function         bta_sys_hw_event_stack_enabled
-**
-** Description     we receive this event once the SW side is ready ( stack, FW download,... ),
-**                       i.e. we can really start using the device. So notify the app.
-**
-** Returns          success or failure
-**
-*******************************************************************************/
+ *
+ * Function         bta_sys_hw_event_stack_enabled
+ *
+ * Description     we receive this event once the SW side is ready ( stack, FW download,... ),
+ *                       i.e. we can really start using the device. So notify the app.
+ *
+ * Returns          success or failure
+ *
+ ******************************************************************************/
 void bta_sys_hw_evt_stack_enabled(UNUSED_ATTR tBTA_SYS_HW_MSG *p_sys_hw_msg)
 {
     uint8_t hw_module_index;
@@ -467,15 +467,15 @@ void bta_sys_hw_evt_stack_enabled(UNUSED_ATTR tBTA_SYS_HW_MSG *p_sys_hw_msg)
 
 
 /*******************************************************************************
-**
-** Function         bta_sys_event
-**
-** Description      BTA event handler; called from task event handler.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_sys_event
+ *
+ * Description      BTA event handler; called from task event handler.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_sys_event(BT_HDR *p_msg)
 {
     uint8_t       id;
@@ -504,16 +504,16 @@ void bta_sys_event(BT_HDR *p_msg)
 }
 
 /*******************************************************************************
-**
-** Function         bta_sys_register
-**
-** Description      Called by other BTA subsystems to register their event
-**                  handler.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_sys_register
+ *
+ * Description      Called by other BTA subsystems to register their event
+ *                  handler.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_sys_register(uint8_t id, const tBTA_SYS_REG *p_reg)
 {
     bta_sys_cb.reg[id] = (tBTA_SYS_REG *) p_reg;
@@ -521,49 +521,49 @@ void bta_sys_register(uint8_t id, const tBTA_SYS_REG *p_reg)
 }
 
 /*******************************************************************************
-**
-** Function         bta_sys_deregister
-**
-** Description      Called by other BTA subsystems to de-register
-**                  handler.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_sys_deregister
+ *
+ * Description      Called by other BTA subsystems to de-register
+ *                  handler.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_sys_deregister(uint8_t id)
 {
     bta_sys_cb.is_reg[id] = false;
 }
 
 /*******************************************************************************
-**
-** Function         bta_sys_is_register
-**
-** Description      Called by other BTA subsystems to get registeration
-**                  status.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_sys_is_register
+ *
+ * Description      Called by other BTA subsystems to get registeration
+ *                  status.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 bool bta_sys_is_register(uint8_t id)
 {
     return bta_sys_cb.is_reg[id];
 }
 
 /*******************************************************************************
-**
-** Function         bta_sys_sendmsg
-**
-** Description      Send a GKI message to BTA.  This function is designed to
-**                  optimize sending of messages to BTA.  It is called by BTA
-**                  API functions and call-in functions.
-**
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_sys_sendmsg
+ *
+ * Description      Send a GKI message to BTA.  This function is designed to
+ *                  optimize sending of messages to BTA.  It is called by BTA
+ *                  API functions and call-in functions.
+ *
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_sys_sendmsg(void *p_msg)
 {
     // There is a race condition that occurs if the stack is shut down while
@@ -575,15 +575,15 @@ void bta_sys_sendmsg(void *p_msg)
 }
 
 /*******************************************************************************
-**
-** Function         bta_sys_start_timer
-**
-** Description      Start a protocol timer for the specified amount
-**                  of time in milliseconds.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_sys_start_timer
+ *
+ * Description      Start a protocol timer for the specified amount
+ *                  of time in milliseconds.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_sys_start_timer(alarm_t *alarm, period_ms_t interval, uint16_t event,
                          uint16_t layer_specific)
 {
@@ -596,14 +596,14 @@ void bta_sys_start_timer(alarm_t *alarm, period_ms_t interval, uint16_t event,
 }
 
 /*******************************************************************************
-**
-** Function         bta_sys_disable
-**
-** Description      For each registered subsystem execute its disable function.
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_sys_disable
+ *
+ * Description      For each registered subsystem execute its disable function.
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_sys_disable(tBTA_SYS_HW_MODULE module)
 {
     int bta_id = 0;
@@ -635,28 +635,28 @@ void bta_sys_disable(tBTA_SYS_HW_MODULE module)
 }
 
 /*******************************************************************************
-**
-** Function         bta_sys_set_trace_level
-**
-** Description      Set trace level for BTA
-**
-** Returns          void
-**
-*******************************************************************************/
+ *
+ * Function         bta_sys_set_trace_level
+ *
+ * Description      Set trace level for BTA
+ *
+ * Returns          void
+ *
+ ******************************************************************************/
 void bta_sys_set_trace_level(uint8_t level)
 {
     appl_trace_level = level;
 }
 
 /*******************************************************************************
-**
-** Function         bta_sys_get_sys_features
-**
-** Description      Returns sys_features to other BTA modules.
-**
-** Returns          sys_features
-**
-*******************************************************************************/
+ *
+ * Function         bta_sys_get_sys_features
+ *
+ * Description      Returns sys_features to other BTA modules.
+ *
+ * Returns          sys_features
+ *
+ ******************************************************************************/
 uint16_t bta_sys_get_sys_features (void)
 {
     return bta_sys_cb.sys_features;
diff --git a/system/bta/sys/utl.cc b/system/bta/sys/utl.cc
index 5832b11a1ad..9fb6f6739b1 100644
--- a/system/bta/sys/utl.cc
+++ b/system/bta/sys/utl.cc
@@ -27,18 +27,18 @@
 #include "btm_api.h"
 
 /*******************************************************************************
-**
-** Function         utl_str2int
-**
-** Description      This utility function converts a character string to an
-**                  integer.  Acceptable values in string are 0-9.  If invalid
-**                  string or string value too large, -1 is returned.  Leading
-**                  spaces are skipped.
-**
-**
-** Returns          Integer value or -1 on error.
-**
-*******************************************************************************/
+ *
+ * Function         utl_str2int
+ *
+ * Description      This utility function converts a character string to an
+ *                  integer.  Acceptable values in string are 0-9.  If invalid
+ *                  string or string value too large, -1 is returned.  Leading
+ *                  spaces are skipped.
+ *
+ *
+ * Returns          Integer value or -1 on error.
+ *
+ ******************************************************************************/
 int16_t utl_str2int(const char *p_s)
 {
     int32_t   val = 0;
@@ -67,18 +67,18 @@ int16_t utl_str2int(const char *p_s)
 }
 
 /*******************************************************************************
-**
-** Function         utl_strucmp
-**
-** Description      This utility function compares two strings in uppercase.
-**                  String p_s must be uppercase.  String p_t is converted to
-**                  uppercase if lowercase.  If p_s ends first, the substring
-**                  match is counted as a match.
-**
-**
-** Returns          0 if strings match, nonzero otherwise.
-**
-*******************************************************************************/
+ *
+ * Function         utl_strucmp
+ *
+ * Description      This utility function compares two strings in uppercase.
+ *                  String p_s must be uppercase.  String p_t is converted to
+ *                  uppercase if lowercase.  If p_s ends first, the substring
+ *                  match is counted as a match.
+ *
+ *
+ * Returns          0 if strings match, nonzero otherwise.
+ *
+ ******************************************************************************/
 int utl_strucmp(const char *p_s, const char *p_t)
 {
     char c;
@@ -108,17 +108,17 @@ int utl_strucmp(const char *p_s, const char *p_t)
 }
 
 /*******************************************************************************
-**
-** Function         utl_itoa
-**
-** Description      This utility function converts a uint16_t to a string.  The
-**                  string is NULL-terminated.  The length of the string is
-**                  returned;
-**
-**
-** Returns          Length of string.
-**
-*******************************************************************************/
+ *
+ * Function         utl_itoa
+ *
+ * Description      This utility function converts a uint16_t to a string.  The
+ *                  string is NULL-terminated.  The length of the string is
+ *                  returned;
+ *
+ *
+ * Returns          Length of string.
+ *
+ ******************************************************************************/
 uint8_t utl_itoa(uint16_t i, char *p_s)
 {
     uint16_t  j, k;
@@ -148,24 +148,24 @@ uint8_t utl_itoa(uint16_t i, char *p_s)
 }
 
 /*******************************************************************************
-**
-** Function         utl_set_device_class
-**
-** Description      This function updates the local Device Class.
-**
-** Parameters:
-**                  p_cod   - Pointer to the device class to set to
-**
-**                  cmd     - the fields of the device class to update.
-**                            BTA_UTL_SET_COD_MAJOR_MINOR, - overwrite major, minor class
-**                            BTA_UTL_SET_COD_SERVICE_CLASS - set the bits in the input
-**                            BTA_UTL_CLR_COD_SERVICE_CLASS - clear the bits in the input
-**                            BTA_UTL_SET_COD_ALL - overwrite major, minor, set the bits in service class
-**                            BTA_UTL_INIT_COD - overwrite major, minor, and service class
-**
-** Returns          true if successful, Otherwise false
-**
-*******************************************************************************/
+ *
+ * Function         utl_set_device_class
+ *
+ * Description      This function updates the local Device Class.
+ *
+ * Parameters:
+ *                  p_cod   - Pointer to the device class to set to
+ *
+ *                  cmd     - the fields of the device class to update.
+ *                            BTA_UTL_SET_COD_MAJOR_MINOR, - overwrite major, minor class
+ *                            BTA_UTL_SET_COD_SERVICE_CLASS - set the bits in the input
+ *                            BTA_UTL_CLR_COD_SERVICE_CLASS - clear the bits in the input
+ *                            BTA_UTL_SET_COD_ALL - overwrite major, minor, set the bits in service class
+ *                            BTA_UTL_INIT_COD - overwrite major, minor, and service class
+ *
+ * Returns          true if successful, Otherwise false
+ *
+ ******************************************************************************/
 bool utl_set_device_class(tBTA_UTL_COD *p_cod, uint8_t cmd)
 {
     uint8_t *dev;
@@ -223,16 +223,16 @@ bool utl_set_device_class(tBTA_UTL_COD *p_cod, uint8_t cmd)
 }
 
 /*******************************************************************************
-**
-** Function         utl_isintstr
-**
-** Description      This utility function checks if the given string is an
-**                  integer string or not
-**
-**
-** Returns          true if successful, Otherwise false
-**
-*******************************************************************************/
+ *
+ * Function         utl_isintstr
+ *
+ * Description      This utility function checks if the given string is an
+ *                  integer string or not
+ *
+ *
+ * Returns          true if successful, Otherwise false
+ *
+ ******************************************************************************/
 bool utl_isintstr(const char *p_s)
 {
     uint16_t i = 0;
@@ -247,15 +247,15 @@ bool utl_isintstr(const char *p_s)
 }
 
 /*******************************************************************************
-**
-** Function         utl_isdialchar
-**
-** Description      This utility function checks if the given character
-**                  is an acceptable dial digit
-**
-** Returns          true if successful, Otherwise false
-**
-*******************************************************************************/
+ *
+ * Function         utl_isdialchar
+ *
+ * Description      This utility function checks if the given character
+ *                  is an acceptable dial digit
+ *
+ * Returns          true if successful, Otherwise false
+ *
+ ******************************************************************************/
 bool utl_isdialchar(const char d)
 {
     return (((d >= '0') && (d <= '9'))
@@ -266,16 +266,16 @@ bool utl_isdialchar(const char d)
 }
 
 /*******************************************************************************
-**
-** Function         utl_isdialstr
-**
-** Description      This utility function checks if the given string contains
-**                  only dial digits or not
-**
-**
-** Returns          true if successful, Otherwise false
-**
-*******************************************************************************/
+ *
+ * Function         utl_isdialstr
+ *
+ * Description      This utility function checks if the given string contains
+ *                  only dial digits or not
+ *
+ *
+ * Returns          true if successful, Otherwise false
+ *
+ ******************************************************************************/
 bool utl_isdialstr(const char *p_s)
 {
     for (uint16_t i = 0; p_s[i] != 0; i++) {
-- 
GitLab