bta: Fix comment formatting after clang-format

Test: mma -j32
Change-Id: Ic945ac421b1918527105c59674eda89afd3d4126
diff --git a/bta/include/bta_ag_co.h b/bta/include/bta_ag_co.h
index 336019d..f03322f 100644
--- a/bta/include/bta_ag_co.h
+++ b/bta/include/bta_ag_co.h
@@ -51,17 +51,16 @@
  * Function         bta_ag_co_audio_state
  *
  * Description      This function is called by the AG before the audio
- *connection
+ *                  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
+ *                          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
  *
@@ -80,7 +79,7 @@
  * Function         bta_ag_co_data_open
  *
  * Description      This function is executed by AG when a service level
- *connection
+ *                  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.
diff --git a/bta/include/bta_api.h b/bta/include/bta_api.h
index a583d70..f9d137f 100644
--- a/bta/include/bta_api.h
+++ b/bta/include/bta_api.h
@@ -1322,10 +1322,9 @@
  *
  * Description      This function sets the Bluetooth connectable,discoverable,
  *                  pairable and conn paired only modesmodes of the local
- *device.
+ *                  device.
  *                  This controls whether other Bluetooth devices can find and
- *connect to
- *                  the local device.
+ *                  connect to the local device.
  *
  *
  * Returns          void
@@ -1425,9 +1424,8 @@
  *
  * 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.
+ *                  enables authentication and optionally encryption on the
+ *                  Bluetooth link.
  *
  *
  * Returns          void
@@ -1583,7 +1581,7 @@
  * Function         bta_dmexecutecallback
  *
  * Description      This function will request BTA to execute a call back in the
- *context of BTU task
+ *                  context of BTU task.
  *                  This API was named in lower case because it is only intended
  *                  for the internal customers(like BTIF).
  *
@@ -1615,15 +1613,14 @@
  * Function         BTA_DmPcmResample
  *
  * Description      Down sampling utility to convert higher sampling rate into
- *8K/16bits
+ *                  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.
+ *                  p_dst: pointer to the buffer which is to be used to store
+ *                         the converted PCM samples.
  *
  *
  * Returns          int32_t: number of samples converted.
@@ -1656,10 +1653,9 @@
  *                  peripheral device.
  *
  * Parameters       bg_conn_type: it can be auto connection, or selective
- *connection.
+ *                                connection.
  *                  p_select_cback: callback function when selective connection
- *procedure
- *                              is being used.
+ *                                  procedure is being used.
  *
  * Returns          void
  *
@@ -1692,7 +1688,7 @@
  *
  * Parameters:      bd_addr          - BD address of the peer
  *                  accept           - numbers to compare are the same or
- *different.
+ *                                     different.
  *
  * Returns          void
  *
@@ -1785,7 +1781,7 @@
  *                  scan_window - scan window
  *                  scan_mode - scan mode
  *                  scan_param_setup_status_cback - Set scan param status
- *callback
+ *                                                  callback
  *
  * Returns          void
  *
@@ -1800,10 +1796,9 @@
  * Function         BTA_DmSetBleAdvParams
  *
  * Description      This function sets the advertising parameters BLE
- *functionality.
+ *                  functionality.
  *                  It is to be called when device act in peripheral or
- *broadcaster
- *                  role.
+ *                  broadcaster role.
  *
  * Parameters:      adv_int_min    - adv interval minimum
  *                  adv_int_max    - adv interval max
@@ -1819,16 +1814,15 @@
  * 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
+ *                  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.
+ *                            done.
  *                            for all GATT based service condition, put
- *num_uuid, and
- *                            p_uuid is the pointer to the list of UUID values.
+ *                            num_uuid, and p_uuid is the pointer to the list of
+ *                            UUID values.
  *                  p_cback: callback functino when search is completed.
  *
  *
@@ -1895,12 +1889,10 @@
  *                  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
+ *                                  what kind of BLE security level is required
+ *                                  for the BLE link if BLE is supported
+ *                                  Note: This parameter is ignored for
+ *                                        BR/EDR or if BLE is not supported.
  *
  * Returns          void
  *
@@ -1919,7 +1911,7 @@
  *
  * Parameters       start: start or stop observe.
  *                  duration : Duration of the scan. Continuous scan if 0 is
- *passed
+ *                             passed
  *                  p_results_cb: Callback to be called with scan results
  *
  * Returns          void
@@ -1963,15 +1955,13 @@
  * Function         BTA_DmBleUpdateConnectionParams
  *
  * Description      Update connection parameters, can only be used when
- *connection is up.
+ *                  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]
+ *                  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
  *
@@ -1999,13 +1989,14 @@
  * Description      This function is called to set the storage parameters
  *
  * Parameters       batch_scan_full_max -Max storage space (in %) allocated to
- *full scanning
+ *                                       full scanning
  *                  batch_scan_trunc_max -Max storage space (in %) allocated to
- *truncated scanning
+ *                                        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
+ *                                                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
@@ -2077,7 +2068,7 @@
  * Function         BTA_DmEnableScanFilter
  *
  * Description      This function is called to enable the adv data payload
- *filter
+ *                  filter
  *
  * Parameters       action - enable or disable the APCF feature
  *                  p_cmpl_cback - Command completed callback
@@ -2097,7 +2088,7 @@
  * Description      This function is called to setup the filter params
  *
  * Parameters       p_target: enable the filter condition on a target device; if
- *NULL
+ *                            NULL
  *                  filt_index - Filter index
  *                  p_filt_params -Filter parameters
  *                  ref_value - Reference value
@@ -2119,8 +2110,7 @@
  * Function         BTA_DmBleCfgFilterCondition
  *
  * Description      This function is called to configure the adv data payload
- *filter
- *                  condition.
+ *                  filter condition.
  *
  * Parameters       action: to read/write/clear
  *                  cond_type: filter condition type
@@ -2173,7 +2163,7 @@
  * Function         BTA_BrcmInit
  *
  * Description      This function initializes Broadcom specific VS handler in
- *BTA
+ *                  BTA
  *
  * Returns          void
  *
@@ -2185,7 +2175,7 @@
  * Function         BTA_BrcmCleanup
  *
  * Description      This function frees up Broadcom specific VS specific dynamic
- *memory
+ *                  memory
  *
  * Returns          void
  *
diff --git a/bta/include/bta_ar_api.h b/bta/include/bta_ar_api.h
index 46bb371..d6a8147 100644
--- a/bta/include/bta_ar_api.h
+++ b/bta/include/bta_ar_api.h
@@ -83,8 +83,7 @@
  * Function         bta_ar_avdt_conn
  *
  * Description      This function is called to let ar know that some AVDTP
- *profile
- *                  is connected for this sys_id.
+ *                  profile is connected for this sys_id.
  *                  If the other sys modules started a timer for PENDING_EVT,
  *                  the timer can be stopped now.
  *
@@ -135,7 +134,7 @@
  * Function         bta_ar_dereg_avrc
  *
  * Description      This function is called to de-register/delete an SDP record
- *for AVRCP.
+ *                  for AVRCP.
  *
  * Returns          void
  *
diff --git a/bta/include/bta_av_api.h b/bta/include/bta_av_api.h
index af38ac2..edc21de 100644
--- a/bta/include/bta_av_api.h
+++ b/bta/include/bta_av_api.h
@@ -615,8 +615,7 @@
  *
  * Description      Reconfigure the audio/video stream.
  *                  If suspend is true, this function tries the
- *suspend/reconfigure
- *                  procedure first.
+ *                  suspend/reconfigure procedure first.
  *                  If suspend is false or when suspend/reconfigure fails,
  *                  this function closes and re-opens the AVDT connection.
  *
@@ -775,8 +774,7 @@
  *
  * Description      Request Starting of A2DP Offload.
  *                  This function is used to start A2DP offload if vendor lib
- *has
- *                  the feature enabled.
+ *                  has the feature enabled.
  *
  * Returns          void
  *
diff --git a/bta/include/bta_av_co.h b/bta/include/bta_av_co.h
index 271099e..a7cc30e 100644
--- a/bta/include/bta_av_co.h
+++ b/bta/include/bta_av_co.h
@@ -90,7 +90,7 @@
  *
  * Description      This callout function is executed by AV to set the
  *                  codec and content protection configuration of the audio
- *stream.
+ *                  stream.
  *
  *
  * Returns          void
@@ -106,8 +106,7 @@
  * Function         bta_av_co_audio_open
  *
  * Description      This function is called by AV when the audio stream
- *connection
- *                  is opened.
+ *                  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.
@@ -123,8 +122,7 @@
  * Function         bta_av_co_audio_close
  *
  * Description      This function is called by AV when the audio stream
- *connection
- *                  is closed.
+ *                  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.
@@ -195,8 +193,8 @@
  * 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.
+ *                  connection needs to send the initial delay report to the
+ *                  connected SRC.
  *
  *
  * Returns          void
diff --git a/bta/include/bta_dm_co.h b/bta/include/bta_dm_co.h
index 1dffd88..13f3020 100644
--- a/bta/include/bta_dm_co.h
+++ b/bta/include/bta_dm_co.h
@@ -58,13 +58,13 @@
  * 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
+ *                  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.
+ *                                device.
  *                  *p_auth_req - true, if MITM protection is required.
  *
  * Returns          void.
@@ -79,13 +79,13 @@
  * 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
+ *                  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.
+ *                             device.
  *                  auth_req - true, if MITM protection is required.
  *
  * Returns          void.
@@ -148,8 +148,7 @@
  *
  * Description      This function can be used by the phone to initialize audio
  *                  codec or for other initialization purposes before SCO
- *connection
- *                  is opened.
+ *                  connection is opened.
  *
  *
  * Returns          Void.
@@ -200,7 +199,7 @@
  * Function         bta_dm_sco_co_in_data
  *
  * Description      This function is called to send incoming SCO data to
- *application.
+ *                  application.
  *
  * Returns          void
  *
@@ -212,15 +211,14 @@
  * 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.
+ *                  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.
+ *                                device.
  *                  *p_auth_req -  Auth request setting (Bonding and MITM
- *required or not)
+ *                                                       required or not)
  *                  *p_max_key_size - max key size local device supported.
  *                  *p_init_key - initiator keys.
  *                  *p_resp_key - responder keys.
@@ -240,8 +238,7 @@
  * Function         bta_dm_co_ble_local_key_reload
  *
  * Description      This callout function is to load the local BLE keys if
- *available
- *                  on the device.
+ *                  available on the device.
  *
  * Parameters       none
  *
@@ -257,15 +254,14 @@
  * 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.
+ *                  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.
+ *                                device.
  *                  *p_auth_req -  Auth request setting (Bonding and MITM
- *required or not)
+ *                                                       required or not)
  *                  *p_max_key_size - max key size local device supported.
  *                  *p_init_key - initiator keys.
  *                  *p_resp_key - responder keys.
diff --git a/bta/include/bta_gatt_api.h b/bta/include/bta_gatt_api.h
index 1be65fd..6df3f82 100644
--- a/bta/include/bta_gatt_api.h
+++ b/bta/include/bta_gatt_api.h
@@ -650,16 +650,13 @@
  * 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
+ *                  on a GATT server. This function report service search result
  *                  by a callback event, and followed by a service search
- *complete
- *                  event.
+ *                  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.
+ *                               in. If Null, discover for all services.
  *
  * Returns          None
  *
@@ -672,7 +669,7 @@
  * Function         BTA_GATTC_GetServices
  *
  * Description      This function is called to find the services on the given
- *server.
+ *                  server.
  *
  * Parameters       conn_id: connection ID which identify the server.
  *
@@ -686,7 +683,7 @@
  * Function         BTA_GATTC_GetCharacteristic
  *
  * Description      This function is called to find the characteristic on the
- *given server.
+ *                  given server.
  *
  * Parameters       conn_id: connection ID which identify the server.
  *                  handle: characteristic handle
@@ -702,7 +699,7 @@
  * Function         BTA_GATTC_GetDescriptor
  *
  * Description      This function is called to find the characteristic on the
- *given server.
+ *                  given server.
  *
  * Parameters       conn_id: connection ID which identify the server.
  *                  handle: descriptor handle
@@ -824,7 +821,7 @@
  * Function         BTA_GATTC_RegisterForNotifications
  *
  * Description      This function is called to register for notification of a
- *service.
+ *                  service.
  *
  * Parameters       client_if - client interface.
  *                  remote_bda - target GATT server.
@@ -841,7 +838,7 @@
  * Function         BTA_GATTC_DeregisterForNotifications
  *
  * Description      This function is called to de-register for notification of a
- *servbice.
+ *                  service.
  *
  * Parameters       client_if - client interface.
  *                  remote_bda - target GATT server.
@@ -858,7 +855,7 @@
  * Function         BTA_GATTC_PrepareWrite
  *
  * Description      This function is called to prepare write a characteristic
- *value.
+ *                  value.
  *
  * Parameters       conn_id - connection ID.
  *                  handle - GATT characteritic handle.
@@ -878,7 +875,7 @@
  * Function         BTA_GATTC_ExecuteWrite
  *
  * Description      This function is called to execute write a prepare write
- *sequence.
+ *                  sequence.
  *
  * Parameters       conn_id - connection ID.
  *                    is_execute - execute or cancel.
@@ -1015,9 +1012,8 @@
  * 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.
+ *                  done, a callback event BTA_GATTS_DELETE_EVT is report with
+ *                  the status.
  *
  * Parameters       service_id: service_id to be deleted.
  *
@@ -1044,13 +1040,13 @@
  * Function         BTA_GATTS_HandleValueIndication
  *
  * Description      This function is called to read a characteristics
- *descriptor.
+ *                  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.
+ *                                 not.
  *
  * Returns          None
  *
@@ -1081,8 +1077,7 @@
  * Function         BTA_GATTS_Open
  *
  * Description      Open a direct open connection or add a background auto
- *connection
- *                  bd address
+ *                  connection bd address
  *
  * Parameters       server_if: server interface.
  *                  remote_bda: remote device BD address.
@@ -1099,8 +1094,7 @@
  * Function         BTA_GATTS_CancelOpen
  *
  * Description      Cancel a direct open connection or remove a background auto
- *connection
- *                  bd address
+ *                  connection bd address
  *
  * Parameters       server_if: server interface.
  *                  remote_bda: remote device BD address.
diff --git a/bta/include/bta_gatts_co.h b/bta/include/bta_gatts_co.h
index c84f449..ed7f1c8 100644
--- a/bta/include/bta_gatts_co.h
+++ b/bta/include/bta_gatts_co.h
@@ -35,11 +35,10 @@
  * 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.
+ *                  server handle range ios to be added or removed.
  *
  * Parameter        is_add: true is to add a handle range; otherwise is to
- *delete.
+ *                          delete.
  *                  p_hndl_range: handle range.
  *
  * Returns          void.
@@ -54,8 +53,7 @@
  *
  * 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
+ *                  the response is returned in p_rsp
  *
  * Parameter        cmd - request command
  *                  p_req - request paramters
@@ -75,8 +73,7 @@
  * 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.
+ *                  server handle range is requested to be loaded from NV.
  *
  * Parameter
  *
diff --git a/bta/include/bta_hh_api.h b/bta/include/bta_hh_api.h
index 6d2ad69..9f33722 100644
--- a/bta/include/bta_hh_api.h
+++ b/bta/include/bta_hh_api.h
@@ -364,7 +364,7 @@
  * Function         BTA_HhGetProtoMode
  *
  * Description      This function get the protocol mode of a specified HID
- *device.
+ *                  device.
  *
  * Returns          void
  *
diff --git a/bta/include/bta_hh_co.h b/bta/include/bta_hh_co.h
index ac44c21..ac52696 100644
--- a/bta/include/bta_hh_co.h
+++ b/bta/include/bta_hh_co.h
@@ -43,7 +43,7 @@
  * Function         bta_hh_co_data
  *
  * Description      This callout function is executed by HH when data is
- *received
+ *                  received
  *                  in interupt channel.
  *
  *
@@ -107,10 +107,9 @@
  * 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.
+ *                  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
diff --git a/bta/include/bta_hl_api.h b/bta/include/bta_hl_api.h
index bc7ae8c..39a43f8 100644
--- a/bta/include/bta_hl_api.h
+++ b/bta/include/bta_hl_api.h
@@ -655,8 +655,7 @@
  * Function         BTA_HlCchOpen
  *
  * Description      Open a Control channel connection with the specified BD
- *address
- *                  and the control PSM value is used to select which
+ *                  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.
  *
@@ -691,7 +690,7 @@
  * Function         BTA_HlDchOpen
  *
  * Description      Open a data channel connection with the specified DCH
- *parameters
+ *                  parameters
  *
  * Parameters       mcl_handle - MCL handle
  *                  p_open_param - parameters for opening a data channel
@@ -770,8 +769,7 @@
  *
  *                  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
+ *                        only not other requests
  *
  ******************************************************************************/
 extern void BTA_HlDeleteMdl(tBTA_HL_MCL_HANDLE mcl_handle,
@@ -817,12 +815,9 @@
  *
  * 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
+ *                                should be accepted or not and if it should be
+ *                                accepted then it also specified the
+ *                                configuration response value
  *
  * Returns          void
  *
diff --git a/bta/include/bta_hl_co.h b/bta/include/bta_hl_co.h
index 7a290c5..efdd1d3 100644
--- a/bta/include/bta_hl_co.h
+++ b/bta/include/bta_hl_co.h
@@ -48,7 +48,7 @@
  *
  * Parameters      app_id - application ID
  *                 p_num_of_mdep (output) - number of MDEP configurations
- *supported
+ *                                          supported
  *                                          by the application
  *
  * Returns         Bloolean - true success
@@ -61,7 +61,7 @@
  *
  * Description     This function is called to find out whether the SOURCE MDEP
  *                 configuration information should be advertize in the SDP or
- *nopt
+ *                 not
  *
  * Parameters      app_id - application ID
  *
@@ -76,7 +76,7 @@
  *
  * Description     This function is called to get the supported feature
  *                 configuration for the specified mdep index and it also
- *assigns
+ *                 assigns
  *                 the MDEP ID for the specified mdep index
  *
  * Parameters      app_id - HDP application ID
@@ -102,8 +102,7 @@
  *
  * Parameters      app_id - HDP application ID
  *                 p_echo_cfg (output) - pointer to the Echo test maximum APDU
- *size
- *                                       configuration
+ *                                       size configuration
  *
  * Returns         Bloolean - true success
  ******************************************************************************/
@@ -115,8 +114,7 @@
  * Function        bta_hl_co_save_mdl
  *
  * Description     This function is called to save a MDL configuration item in
- *persistent
- *                 storage
+ *                 persistent storage
  *
  * Parameters      app_id - HDP application ID
  *                 item_idx - the MDL configuration storage index
@@ -132,8 +130,7 @@
  * Function        bta_hl_co_delete_mdl
  *
  * Description     This function is called to delete a MDL configuration item in
- *persistent
- *                 storage
+ *                 persistent storage
  *
  * Parameters      app_id - HDP application ID
  *                 item_idx - the MDL configuration storage index
diff --git a/bta/include/bta_jv_api.h b/bta/include/bta_jv_api.h
index b25b312..6d55df3 100644
--- a/bta/include/bta_jv_api.h
+++ b/bta/include/bta_jv_api.h
@@ -435,19 +435,15 @@
  * 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.
+ *                  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.
+ *                  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.
+ *                  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.
@@ -572,8 +568,7 @@
  * Function         BTA_JvL2capCloseLE
  *
  * Description      This function closes an L2CAP client connection for Fixed
- *Channels
- *                  Function is idempotent and no callbacks are called!
+ *                  Channels Function is idempotent and no callbacks are called!
  *
  * Returns          BTA_JV_SUCCESS, if the request is being processed.
  *                  BTA_JV_FAILURE, otherwise.
@@ -586,11 +581,11 @@
  * 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.
+ *                  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.
@@ -606,9 +601,8 @@
  * 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
+ *                  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.
@@ -629,8 +623,7 @@
  * Function         BTA_JvL2capStopServerLE
  *
  * Description      This function stops the LE L2CAP server. If the server has
- *an
- *                  active connection, it would be closed.
+ *                  an active connection, it would be closed.
  *
  * Returns          BTA_JV_SUCCESS, if the request is being processed.
  *                  BTA_JV_FAILURE, otherwise.
@@ -643,8 +636,7 @@
  * Function         BTA_JvL2capStopServerLE
  *
  * Description      This function stops the LE L2CAP server. If the server has
- *an
- *                  active connection, it would be closed.
+ *                  an active connection, it would be closed.
  *
  * Returns          BTA_JV_SUCCESS, if the request is being processed.
  *                  BTA_JV_FAILURE, otherwise.
@@ -723,7 +715,7 @@
  *                  Address.
  *                  When the connection is initiated or failed to initiate,
  *                  tBTA_JV_RFCOMM_CBACK is called with
- *BTA_JV_RFCOMM_CL_INIT_EVT
+ *                  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
  *
@@ -800,22 +792,22 @@
  * Function    BTA_JVSetPmProfile
  *
  * Description This function set or free power mode profile for different JV
- *application
+ *             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_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
+ *                                  is ignored and BTA_JV_CONN_CLOSE is called
+ *                                  implicitly
+ *              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
+ *                                  calls automatically
  *              BTA_JV_CONN_CLOSE to remove in case of connection close!
  *
  *******************************************************************************/
diff --git a/bta/include/bta_pan_api.h b/bta/include/bta_pan_api.h
index 8eae000..4e91828 100644
--- a/bta/include/bta_pan_api.h
+++ b/bta/include/bta_pan_api.h
@@ -144,7 +144,7 @@
  *
  * Description      Sets PAN roles. When the enable operation is complete
  *                  the callback function will be called with a
- *BTA_PAN_SET_ROLE_EVT.
+ *                  BTA_PAN_SET_ROLE_EVT.
  *
  * Returns          void
  *
diff --git a/bta/include/bta_pan_ci.h b/bta/include/bta_pan_ci.h
index a5ae0e3..7c46cce 100644
--- a/bta/include/bta_pan_ci.h
+++ b/bta/include/bta_pan_ci.h
@@ -39,7 +39,7 @@
  *
  * 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().
+ *                  bta_pan_co_tx_path().
  *                  This function is used when the TX data path is configured
  *                  to use a pull interface.
  *
diff --git a/bta/include/bta_sdp_api.h b/bta/include/bta_sdp_api.h
index 6884ea9..37a7774 100644
--- a/bta/include/bta_sdp_api.h
+++ b/bta/include/bta_sdp_api.h
@@ -102,8 +102,7 @@
  * 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.
+ *                  function will be called with a BTA_SDP_SEARCH_EVT.
  * Returns          BTA_SDP_SUCCESS if successful.
  *                  BTA_SDP_FAIL if internal failure.
  *
diff --git a/bta/include/utl.h b/bta/include/utl.h
index 200a965..71b186f 100644
--- a/bta/include/utl.h
+++ b/bta/include/utl.h
@@ -113,15 +113,15 @@
  *
  *                  cmd     - the fields of the device class to update.
  *                            BTA_UTL_SET_COD_MAJOR_MINOR, - overwrite major,
- *minor class
+ *                                                           minor class
  *                            BTA_UTL_SET_COD_SERVICE_CLASS - set the bits in
- *the input
+ *                                                            the input
  *                            BTA_UTL_CLR_COD_SERVICE_CLASS - clear the bits in
- *the input
+ *                                                            the input
  *                            BTA_UTL_SET_COD_ALL - overwrite major, minor, set
- *the bits in service class
+ *                                                  the bits in service class
  *                            BTA_UTL_INIT_COD - overwrite major, minor, and
- *service class
+ *                                               service class
  *
  * Returns          true if successful, Otherwise false
  *