Fix comments which aren't accurately fixed by clang-format

Test: compiles
Change-Id: Ia3e7a4007b096d57ae082f8474649b17144a2a86
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
diff --git a/src/adaptation/NfcAdaptation.cpp b/src/adaptation/NfcAdaptation.cpp
index 4636c73..4b5d8c5 100644
--- a/src/adaptation/NfcAdaptation.cpp
+++ b/src/adaptation/NfcAdaptation.cpp
@@ -508,13 +508,14 @@
 **
 ** Function:    NfcAdaptation::HalPrediscover
 **
-** Description:     Perform any vendor-specific pre-discovery actions (if needed)
-**                  If any actions were performed TRUE will be returned, and
-**                  HAL_PRE_DISCOVER_CPLT_EVT will notify when actions are
+** Description:     Perform any vendor-specific pre-discovery actions (if
+**                  needed) If any actions were performed TRUE will be returned,
+**                  and HAL_PRE_DISCOVER_CPLT_EVT will notify when actions are
 **                  completed.
 **
-** Returns:          TRUE if vendor-specific pre-discovery actions initialized
-**                  FALSE if no vendor-specific pre-discovery actions are needed.
+** Returns:         TRUE if vendor-specific pre-discovery actions initialized
+**                  FALSE if no vendor-specific pre-discovery actions are
+**                  needed.
 **
 *******************************************************************************/
 bool    NfcAdaptation::HalPrediscover ()
diff --git a/src/adaptation/OverrideLog.cpp b/src/adaptation/OverrideLog.cpp
index c2bb3bd..4bb3c9a 100644
--- a/src/adaptation/OverrideLog.cpp
+++ b/src/adaptation/OverrideLog.cpp
@@ -41,12 +41,12 @@
 **                  overrides .conf variable.
 **
 ** Returns:         Global log level:
-**                  BT_TRACE_LEVEL_NONE    0        * No trace messages to be generated
-**                  BT_TRACE_LEVEL_ERROR   1        * Error condition trace messages
-**                  BT_TRACE_LEVEL_WARNING 2        * Warning condition trace messages
-**                  BT_TRACE_LEVEL_API     3        * API traces
-**                  BT_TRACE_LEVEL_EVENT   4        * Debug messages for events
-**                  BT_TRACE_LEVEL_DEBUG   5        * Debug messages (general)
+**                  BT_TRACE_LEVEL_NONE    0 * No trace messages to be generated
+**                  BT_TRACE_LEVEL_ERROR   1 * Error condition trace messages
+**                  BT_TRACE_LEVEL_WARNING 2 * Warning condition trace messages
+**                  BT_TRACE_LEVEL_API     3 * API traces
+**                  BT_TRACE_LEVEL_EVENT   4 * Debug messages for events
+**                  BT_TRACE_LEVEL_DEBUG   5 * Debug messages (general)
 **
 *******************************************************************************/
 unsigned char initializeGlobalAppLogLevel ()
diff --git a/src/adaptation/android_logmsg.cpp b/src/adaptation/android_logmsg.cpp
index ab691eb..b318fe0 100644
--- a/src/adaptation/android_logmsg.cpp
+++ b/src/adaptation/android_logmsg.cpp
@@ -232,7 +232,7 @@
     }
 
 
-    /*******************************************************************************
+    /***************************************************************************
     **
     ** Function         DispLLCP
     **
@@ -240,7 +240,7 @@
     **
     ** Returns          None.
     **
-    *******************************************************************************/
+    ***************************************************************************/
     void DispLLCP (NFC_HDR *p_buf, bool    is_recv)
     {
         uint32_t nBytes = ((NFC_HDR_SIZE + p_buf->offset + p_buf->len)*2)+1;
@@ -258,7 +258,7 @@
     }
 
 
-    /*******************************************************************************
+    /***************************************************************************
     **
     ** Function         DispHcp
     **
@@ -266,7 +266,7 @@
     **
     ** Returns          None.
     **
-    *******************************************************************************/
+    ***************************************************************************/
     void DispHcp (uint8_t *data, uint16_t len, bool    is_recv)
     {
         uint32_t nBytes = (len*2)+1;
diff --git a/src/adaptation/libmain.c b/src/adaptation/libmain.c
index 8a6d5ef..44f7168 100644
--- a/src/adaptation/libmain.c
+++ b/src/adaptation/libmain.c
@@ -80,9 +80,9 @@
 **                  Note: Upon completion of the request, nfa_nv_ci_read() is
 **                        called with the buffer of data, along with the number
 **                        of bytes read into the buffer, and a status.  The
-**                        call-in function should only be called when ALL requested
-**                        bytes have been read, the end of file has been detected,
-**                        or an error has occurred.
+**                        call-in function should only be called when ALL
+**                        requested bytes have been read, the end of file has
+**                        been detected, or an error has occurred.
 **
 *******************************************************************************/
 extern void nfa_nv_co_read(uint8_t *pBuffer, uint16_t nbytes, uint8_t block)
@@ -140,8 +140,9 @@
 **
 **                  Note: Upon completion of the request, nfa_nv_ci_write() is
 **                        called with the file descriptor and the status.  The
-**                        call-in function should only be called when ALL requested
-**                        bytes have been written, or an error has been detected,
+**                        call-in function should only be called when ALL
+**                        requested bytes have been written, or an error has
+**                        been detected,
 **
 *******************************************************************************/
 extern void nfa_nv_co_write(const uint8_t *pBuffer, uint16_t nbytes, uint8_t block)
diff --git a/src/gki/common/gki.h b/src/gki/common/gki.h
index 93efc5d..7877d2f 100644
--- a/src/gki/common/gki.h
+++ b/src/gki/common/gki.h
@@ -106,8 +106,8 @@
 
 
 /************************************************************************
-**  Macro to determine the pool buffer size based on the GKI POOL ID at compile time.
-**  Pool IDs index from 0 to GKI_NUM_FIXED_BUF_POOLS - 1
+**  Macro to determine the pool buffer size based on the GKI POOL ID at compile
+**  time. Pool IDs index from 0 to GKI_NUM_FIXED_BUF_POOLS - 1
 */
 
 #if (GKI_NUM_FIXED_BUF_POOLS < 1)
diff --git a/src/gki/common/gki_buffer.c b/src/gki/common/gki_buffer.c
index b995c23..6d7b773 100644
--- a/src/gki/common/gki_buffer.c
+++ b/src/gki/common/gki_buffer.c
@@ -491,7 +491,8 @@
 **                  a specific buffer pool.
 **
 **                  Note: If there are no more buffers available from the pool,
-**                        the public buffers are searched for an available buffer.
+**                        the public buffers are searched for an available
+**                        buffer.
 **
 ** Parameters       pool_id - (input) pool ID to get a buffer out of.
 **
@@ -576,7 +577,8 @@
 **
 ** Function         GKI_freebuf
 **
-** Description      Called by an application to return a buffer to the free pool.
+** Description      Called by an application to return a buffer to the free
+**                  pool.
 **
 ** Parameters       p_buf - (input) address of the beginning of a buffer.
 **
@@ -1046,9 +1048,11 @@
 **
 ** Description      Return a pointer to the next buffer in a queue
 **
-** Parameters:      p_buf  - (input) pointer to the buffer to find the next one from.
+** Parameters:      p_buf - (input) pointer to the buffer to find the next one
+**                                  from.
 **
-** Returns          NULL if no more buffers in the queue, else next buffer address
+** Returns          NULL if no more buffers in the queue, else next buffer
+**                  address
 **
 *******************************************************************************/
 void *GKI_getnext (void *p_buf)
@@ -1092,8 +1096,8 @@
 **
 ** Parameters:      p_user_area - (input) address of anywhere in a GKI buffer.
 **
-** Returns          void * - Address of the beginning of the specified buffer if successful,
-**                          otherwise NULL if unsuccessful
+** Returns          void * - Address of the beginning of the specified buffer if
+**                           successful, otherwise NULL if unsuccessful
 **
 *******************************************************************************/
 void *GKI_find_buf_start (void *p_user_area)
@@ -1140,8 +1144,8 @@
 ** Description      This function is called to set or change the permissions for
 **                  the specified pool ID.
 **
-** Parameters       pool_id -       (input) pool ID to be set or changed
-**                  permission -    (input) GKI_PUBLIC_POOL or GKI_RESTRICTED_POOL
+** Parameters       pool_id - (input) pool ID to be set or changed
+**                  permission - (input) GKI_PUBLIC_POOL or GKI_RESTRICTED_POOL
 **
 ** Returns          GKI_SUCCESS if successful
 **                  GKI_INVALID_POOL if unsuccessful
@@ -1204,7 +1208,8 @@
 **
 ** Function         gki_remove_from_pool_list
 **
-** Description      Removes pool from the pool list. Called when a pool is deleted
+** Description      Removes pool from the pool list. Called when a pool is
+**                  deleted
 **
 ** Returns          void
 **
@@ -1233,8 +1238,8 @@
 **
 ** Function         GKI_igetpoolbuf
 **
-** Description      Called by an interrupt service routine to get a free buffer from
-**                  a specific buffer pool.
+** Description      Called by an interrupt service routine to get a free buffer
+**                  from a specific buffer pool.
 **
 ** Parameters       pool_id - (input) pool ID to get a buffer out of.
 **
@@ -1409,11 +1414,12 @@
 **
 ** Description      Called by applications to create a buffer pool.
 **
-** Parameters:      size        - (input) length (in bytes) of each buffer in the pool
-**                  count       - (input) number of buffers to allocate for the pool
-**                  permission  - (input) restricted or public access?
-**                                        (GKI_PUBLIC_POOL or GKI_RESTRICTED_POOL)
-**                  p_mem_pool  - (input) pointer to an OS memory pool, NULL if not provided
+** Parameters:      size - (input) length (in bytes) of each buffer in the pool
+**                  count - (input) number of buffers to allocate for the pool
+**                  permission - (input) restricted or public access?
+**                                      (GKI_PUBLIC_POOL or GKI_RESTRICTED_POOL)
+**                  p_mem_pool - (input) pointer to an OS memory pool, NULL if
+**                                       not provided
 **
 ** Returns          the buffer pool ID, which should be used in calls to
 **                  GKI_getpoolbuf(). If a pool could not be created, this
@@ -1467,9 +1473,10 @@
 **
 ** Function         GKI_delete_pool
 **
-** Description      Called by applications to delete a buffer pool.  The function
-**                  calls the operating specific function to free the actual memory.
-**                  An exception is generated if an error is detected.
+** Description      Called by applications to delete a buffer pool.  The
+**                  function calls the operating specific function to free the
+**                  actual memory. An exception is generated if an error is
+**                  detected.
 **
 ** Parameters:      pool_id - (input) Id of the poll being deleted.
 **
@@ -1519,7 +1526,8 @@
 **
 ** Function         GKI_get_pool_bufsize
 **
-** Description      Called by an application to get the size of buffers in a pool
+** Description      Called by an application to get the size of buffers in a
+**                  pool
 **
 ** Parameters       Pool ID.
 **
diff --git a/src/gki/common/gki_debug.c b/src/gki/common/gki_debug.c
index ef7e4ce..5ca13a7 100644
--- a/src/gki/common/gki_debug.c
+++ b/src/gki/common/gki_debug.c
@@ -102,7 +102,8 @@
 **                  stack used by looking non magic num. Magic num is consider
 **                  the first byte in the stack.
 **
-** Returns          the number of unused byte on the stack. 4 in case of stack overrun
+** Returns          the number of unused byte on the stack. 4 in case of stack
+**                  overrun
 **
 *******************************************************************************/
 uint16_t gki_calc_stack (uint8_t task)
@@ -159,7 +160,8 @@
 **
 ** Function         gki_print_buffer_statistics
 **
-** Description      Called internally by OSS to print the buffer pools statistics
+** Description      Called internally by OSS to print the buffer pools
+**                  statistics
 **
 ** Returns          void
 **
diff --git a/src/gki/common/gki_time.c b/src/gki/common/gki_time.c
index e842795..752db6d 100644
--- a/src/gki/common/gki_time.c
+++ b/src/gki/common/gki_time.c
@@ -35,8 +35,8 @@
 **
 ** Function         gki_timers_init
 **
-** Description      This internal function is called once at startup to initialize
-**                  all the timer structures.
+** Description      This internal function is called once at startup to
+**                  initialize all the timer structures.
 **
 ** Returns          void
 **
@@ -91,10 +91,12 @@
 **
 ** Function         gki_timers_is_timer_running
 **
-** Description      This internal function is called to test if any gki timer are running
+** Description      This internal function is called to test if any gki timer
+**                  are running
 **
 **
-** Returns          TRUE if at least one time is running in the system, FALSE else.
+** Returns          TRUE if at least one time is running in the system, FALSE
+**                  else.
 **
 *******************************************************************************/
 bool    gki_timers_is_timer_running(void)
@@ -163,9 +165,9 @@
 ** Parameters:      None
 **
 ** Returns          Number of ticks til the next timer expires
-**                  Note: the value is a signed  value.  This value should be
-**                      compared to x > 0, to avoid misinterpreting negative tick
-**                      values.
+**                  Note: The value is a signed  value.  This value should be
+**                      compared to x > 0, to avoid misinterpreting negative
+**                      tick values.
 **
 *******************************************************************************/
 int32_t  GKI_ready_to_sleep (void)
@@ -183,12 +185,14 @@
 **                  can be 1-shot or continuous. If a timer is already running,
 **                  it will be reset to the new parameters.
 **
-** Parameters       tnum            - (input) timer number to be started (TIMER_0,
-**                                              TIMER_1, TIMER_2, or TIMER_3)
+** Parameters       tnum            - (input) timer number to be started
+**                                            (TIMER_0, TIMER_1, TIMER_2, or
+**                                            TIMER_3)
 **                  ticks           - (input) the number of system ticks til the
-**                                              timer expires.
-**                  is_continuous   - (input) TRUE if timer restarts automatically,
-**                                              else FALSE if it is a 'one-shot'.
+**                                            timer expires.
+**                  is_continuous   - (input) TRUE if timer restarts
+**                                            automatically, else FALSE if it is
+**                                            a 'one-shot'.
 **
 ** Returns          void
 **
@@ -299,8 +303,8 @@
 **                  it's four general purpose timers. There is no harm in
 **                  stopping a timer that is already stopped.
 **
-** Parameters       tnum            - (input) timer number to be started (TIMER_0,
-**                                              TIMER_1, TIMER_2, or TIMER_3)
+** Parameters       tnum - (input) timer number to be started (TIMER_0,
+**                                 TIMER_1, TIMER_2, or TIMER_3)
 ** Returns          void
 **
 *******************************************************************************/
@@ -374,12 +378,14 @@
 **                  It is typically called at every system tick to
 **                  update the timers for all tasks, and check for timeouts.
 **
-**                  Note: It has been designed to also allow for variable tick updates
-**                      so that systems with strict power savings requirements can
-**                      have the update occur at variable intervals.
+**                  Note: It has been designed to also allow for variable tick
+**                        updates so that systems with strict power savings
+**                        requirements can have the update occur at variable
+**                        intervals.
 **
-** Parameters:      ticks_since_last_update - (input) This is the number of TICKS that have
-**                          occurred since the last time GKI_timer_update was called.
+** Parameters:      ticks_since_last_update - (input) This is the number of
+**                  TICKS that have occurred since the last time
+**                  GKI_timer_update was called.
 **
 ** Returns          void
 **
@@ -576,8 +582,8 @@
 **
 ** Function         GKI_timer_queue_empty
 **
-** Description      This function is called by applications to see whether the timer
-**                  queue is empty
+** Description      This function is called by applications to see whether the
+**                  timer queue is empty
 **
 ** Parameters
 **
@@ -601,8 +607,8 @@
 **
 ** Function         GKI_timer_queue_register_callback
 **
-** Description      This function is called by applications to register system tick
-**                  start/stop callback for time queues
+** Description      This function is called by applications to register system
+**                  tick start/stop callback for time queues
 **
 **
 ** Parameters       p_callback - (input) pointer to the system tick callback
@@ -624,7 +630,8 @@
 ** Description      This function is called by applications when they
 **                  want to initialize a timer list.
 **
-** Parameters       p_timer_listq   - (input) pointer to the timer list queue object
+** Parameters       p_timer_listq - (input) pointer to the timer list queue
+**                                          object
 **
 ** Returns          void
 **
@@ -646,7 +653,7 @@
 **                  want to initialize a timer list entry. This must be
 **                  done prior to first use of the entry.
 **
-** Parameters       p_tle           - (input) pointer to a timer list queue entry
+** Parameters       p_tle - (input) pointer to a timer list queue entry
 **
 ** Returns          void
 **
@@ -666,14 +673,17 @@
 **
 ** Description      This function is called by the applications when they
 **                  want to update a timer list. This should be at every
-**                  timer list unit tick, e.g. once per sec, once per minute etc.
+**                  timer list unit tick, e.g. once per sec, once per minute
+**                  etc.
 **
-** Parameters       p_timer_listq   - (input) pointer to the timer list queue object
-**                  num_units_since_last_update - (input) number of units since the last update
-**                                  (allows for variable unit update)
+** Parameters       p_timer_listq - (input) pointer to the timer list queue
+**                  object
+**                  num_units_since_last_update - (input) number of units since
+**                  the last update (allows for variable unit update)
 **
-**      NOTE: The following timer list update routines should not be used for exact time
-**            critical purposes.  The timer tasks should be used when exact timing is needed.
+** NOTE: The following timer list update routines should not be used for exact
+**       time critical purposes.  The timer tasks should be used when exact
+**       timing is needed.
 **
 ** Returns          the number of timers that have expired
 **
@@ -739,8 +749,9 @@
 ** Description      This function is called by an application to get remaining
 **                  ticks to expire
 **
-** Parameters       p_timer_listq   - (input) pointer to the timer list queue object
-**                  p_target_tle    - (input) pointer to a timer list queue entry
+** Parameters       p_timer_listq - (input) pointer to the timer list queue
+**                                          object
+**                  p_target_tle - (input) pointer to a timer list queue entry
 **
 ** Returns          0 if timer is not used or timer is not in the list
 **                  remaining ticks if success
@@ -788,11 +799,13 @@
 ** Description      This function is called by an application to add a timer
 **                  entry to a timer list.
 **
-**                  Note: A timer value of '0' will effectively insert an already
-**                      expired event.  Negative tick values will be ignored.
+**                  Note: A timer value of '0' will effectively insert an
+**                        already expired event.  Negative tick values will be
+**                        ignored.
 **
-** Parameters       p_timer_listq   - (input) pointer to the timer list queue object
-**                  p_tle           - (input) pointer to a timer list queue entry
+** Parameters       p_timer_listq - (input) pointer to the timer list queue
+**                                          object
+**                  p_tle - (input) pointer to a timer list queue entry
 **
 ** Returns          void
 **
@@ -894,8 +907,9 @@
 ** Description      This function is called by an application to remove a timer
 **                  entry from a timer list.
 **
-** Parameters       p_timer_listq   - (input) pointer to the timer list queue object
-**                  p_tle           - (input) pointer to a timer list queue entry
+** Parameters       p_timer_listq  - (input) pointer to the timer list queue
+**                                            object
+**                  p_tle - (input) pointer to a timer list queue entry
 **
 ** Returns          void
 **
@@ -988,15 +1002,18 @@
 **
 ** Function         gki_adjust_timer_count
 **
-** Description      This function is called whenever a new timer or GKI_wait occurs
-**                  to adjust (if necessary) the current time til the first expiration.
-**                  This only needs to make an adjustment if the new timer (in ticks) is
-**                  less than the number of ticks remaining on the current timer.
+** Description      This function is called whenever a new timer or GKI_wait
+**                  occurs to adjust (if necessary) the current time til the
+**                  first expiration. This only needs to make an adjustment if
+**                  the new timer (in ticks) is less than the number of ticks
+**                  remaining on the current timer.
 **
-** Parameters:      ticks - (input) number of system ticks of the new timer entry
+** Parameters:      ticks - (input) number of system ticks of the new timer
+**                                  entry
 **
-**                  NOTE:  This routine MUST be called while interrupts are disabled to
-**                          avoid updates while adjusting the timer variables.
+**                  NOTE:  This routine MUST be called while interrupts are
+**                         disabled to avoid updates while adjusting the timer
+**                         variables.
 **
 ** Returns          void
 **
diff --git a/src/gki/ulinux/gki_ulinux.c b/src/gki/ulinux/gki_ulinux.c
index b517623..8a16398 100644
--- a/src/gki/ulinux/gki_ulinux.c
+++ b/src/gki/ulinux/gki_ulinux.c
@@ -179,7 +179,8 @@
 **
 ** Function         GKI_get_os_tick_count
 **
-** Description      This function is called to retrieve the native OS system tick.
+** Description      This function is called to retrieve the native OS system
+**                  tick.
 **
 ** Returns          Tick count of native OS.
 **
@@ -198,11 +199,14 @@
 **
 ** Description      This function is called to create a new OSS task.
 **
-** Parameters:      task_entry  - (input) pointer to the entry function of the task
+** Parameters:      task_entry  - (input) pointer to the entry function of the
+**                                        task
 **                  task_id     - (input) Task id is mapped to priority
 **                  taskname    - (input) name given to the task
-**                  stack       - (input) pointer to the top of the stack (highest memory location)
-**                  stacksize   - (input) size of the stack allocated for the task
+**                  stack       - (input) pointer to the top of the stack
+**                                        (highest memory location)
+**                  stacksize   - (input) size of the stack allocated for the
+**                                        task
 **
 ** Returns          GKI_SUCCESS if all OK, GKI_FAILURE if any problem
 **
@@ -303,10 +307,10 @@
 **
 ** Function         GKI_shutdown
 **
-** Description      shutdowns the GKI tasks/threads in from max task id to 0 and frees
-**                  pthread resources!
-**                  IMPORTANT: in case of join method, GKI_shutdown must be called outside
-**                  a GKI thread context!
+** Description      shutdowns the GKI tasks/threads in from max task id to 0 and
+**                  frees pthread resources!
+**                  IMPORTANT: in case of join method, GKI_shutdown must be
+**                  called outside a GKI thread context!
 **
 ** Returns          void
 **
@@ -396,7 +400,7 @@
  **
  ** Returns         void
  **
- *********************************************************************************/
+ ******************************************************************************/
 void gki_system_tick_start_stop_cback(bool    start)
 {
     tGKI_OS         *p_os = &gki_cb.os;
@@ -443,7 +447,7 @@
 **
 ** Returns          void
 **
-*********************************************************************************/
+*******************************************************************************/
 #ifdef NO_GKI_RUN_RETURN
 void timer_thread(signed long id)
 {
@@ -485,7 +489,7 @@
 **                  starting a task is a 2-step process. Most OS's do it in
 **                  one step, If your OS does it in one step, this function
 **                  should be empty.
-*********************************************************************************/
+*******************************************************************************/
 void GKI_run (void *p_task_id)
 {
     GKI_TRACE_1("%s enter", __func__);
@@ -739,7 +743,8 @@
 ** Function         GKI_delay
 **
 ** Description      This function is called by tasks to sleep unconditionally
-**                  for a specified amount of time. The duration is in milliseconds
+**                  for a specified amount of time. The duration is in
+**                  milliseconds
 **
 ** Parameters:      timeout -    (input) the duration in milliseconds
 **
@@ -785,8 +790,8 @@
 ** Description      This function is called by tasks to send events to other
 **                  tasks. Tasks can also send events to themselves.
 **
-** Parameters:      task_id -  (input) The id of the task to which the event has to
-**                  be sent
+** Parameters:      task_id -  (input) The id of the task to which the event has
+**                                     to be sent
 **                  event   -  (input) The event that has to be sent
 **
 **
@@ -822,8 +827,9 @@
 ** Function         GKI_isend_event
 **
 ** Description      This function is called from ISRs to send events to other
-**                  tasks. The only difference between this function and GKI_send_event
-**                  is that this function assumes interrupts are already disabled.
+**                  tasks. The only difference between this function and
+**                  GKI_send_event is that this function assumes interrupts are
+**                  already disabled.
 **
 ** Parameters:      task_id -  (input) The destination task Id for the event.
 **                  event   -  (input) The event flag
@@ -853,10 +859,10 @@
 **
 ** Returns          task ID
 **
-** NOTE             The Widcomm upper stack and profiles may run as a single task.
-**                  If you only have one GKI task, then you can hard-code this
-**                  function to return a '1'. Otherwise, you should have some
-**                  OS-specific method to determine the current task.
+** NOTE             The Widcomm upper stack and profiles may run as a single
+**                  task. If you only have one GKI task, then you can hard-code
+**                  this function to return a '1'. Otherwise, you should have
+**                  some OS-specific method to determine the current task.
 **
 *******************************************************************************/
 uint8_t GKI_get_taskid (void)
@@ -880,9 +886,9 @@
 **
 ** Function         GKI_map_taskname
 **
-** Description      This function gets the task name of the taskid passed as arg.
-**                  If GKI_MAX_TASKS is passed as arg the currently running task
-**                  name is returned
+** Description      This function gets the task name of the taskid passed as
+**                  arg. If GKI_MAX_TASKS is passed as arg the currently running
+**                  task name is returned
 **
 ** Parameters:      task_id -  (input) The id of the task whose name is being
 **                  sought. GKI_MAX_TASKS is passed to get the name of the
@@ -1139,8 +1145,8 @@
 ** Returns          GKI_SUCCESS if all OK, else GKI_FAILURE
 **
 ** NOTE             This function is NOT called by the Widcomm stack and
-**                  profiles. If you want to implement task suspension capability,
-**                  put specific code here.
+**                  profiles. If you want to implement task suspension
+**                  capability, put specific code here.
 **
 *******************************************************************************/
 uint8_t GKI_suspend_task (uint8_t task_id)
@@ -1165,8 +1171,8 @@
 ** Returns          GKI_SUCCESS if all OK
 **
 ** NOTE             This function is NOT called by the Widcomm stack and
-**                  profiles. If you want to implement task suspension capability,
-**                  put specific code here.
+**                  profiles. If you want to implement task suspension
+**                  capability, put specific code here.
 **
 *******************************************************************************/
 uint8_t GKI_resume_task (uint8_t task_id)
@@ -1241,7 +1247,8 @@
 **
 ** Function         GKI_sched_unlock
 **
-** Description      This function is called by tasks to enable scheduler switching.
+** Description      This function is called by tasks to enable scheduler
+**                  switching.
 **
 ** Returns          void
 **
diff --git a/src/hal/include/nfc_hal_api.h b/src/hal/include/nfc_hal_api.h
index 42d8e5f..6fc4e8b 100644
--- a/src/hal/include/nfc_hal_api.h
+++ b/src/hal/include/nfc_hal_api.h
@@ -157,9 +157,9 @@
 ** Function         HAL_NfcCoreInitialized
 **
 ** Description      Called after the CORE_INIT_RSP is received from the NFCC.
-**                  At this time, the HAL can do any chip-specific configuration,
-**                  and when finished signal the libnfc-nci with event
-**                  HAL_POST_INIT_CPLT_EVT.
+**                  At this time, the HAL can do any chip-specific
+**                  configuration, and when finished signal the libnfc-nci with
+**                  event HAL_POST_INIT_CPLT_EVT.
 **
 ** Returns          void
 **
@@ -184,13 +184,14 @@
 **
 ** Function         HAL_NfcPreDiscover
 **
-** Description      Perform any vendor-specific pre-discovery actions (if needed)
-**                  If any actions were performed TRUE will be returned, and
-**                  HAL_PRE_DISCOVER_CPLT_EVT will notify when actions are
-**                  completed.
+** Description      Perform any vendor-specific pre-discovery actions (if
+**                  needed). If any actions were performed TRUE will be
+**                  returned, and HAL_PRE_DISCOVER_CPLT_EVT will notify when
+**                  actions are completed.
 **
 ** Returns          TRUE if vendor-specific pre-discovery actions initialized
-**                  FALSE if no vendor-specific pre-discovery actions are needed.
+**                  FALSE if no vendor-specific pre-discovery actions are
+**                  needed.
 **
 *******************************************************************************/
 bool    HAL_NfcPreDiscover (void);
diff --git a/src/hal/int/nfc_hal_int_api.h b/src/hal/int/nfc_hal_int_api.h
index 9accd17..4ce4db5 100644
--- a/src/hal/int/nfc_hal_int_api.h
+++ b/src/hal/int/nfc_hal_int_api.h
@@ -126,10 +126,12 @@
 **
 ** Function         HAL_NfcReInit
 **
-** Description      This function is called to restart initialization after REG_PU
-**                  toggled because of failure to detect NVM type or download patchram.
+** Description      This function is called to restart initialization after
+**                  REG_PU toggled because of failure to detect NVM type or
+**                  download patchram.
 **
-** Note             This function should be called only during the HAL init process
+** Note             This function should be called only during the HAL init
+**                  process
 **
 ** Returns          HAL_NFC_STATUS_OK if successfully initiated
 **                  HAL_NFC_STATUS_FAILED otherwise
@@ -152,7 +154,8 @@
 **
 **                  nfc_wake_active_mode/dh_wake_active_mode
 **                      NFC_HAL_LP_ACTIVE_LOW - high to low voltage is asserting
-**                      NFC_HAL_LP_ACTIVE_HIGH - low to high voltage is asserting
+**                      NFC_HAL_LP_ACTIVE_HIGH - low to high voltage is
+**                                               asserting
 **
 **                  p_snooze_cback
 **                      Notify status of operation
@@ -175,21 +178,24 @@
 **
 ** Input Params
 **                  format_type     patch format type
-**                                  (NFC_HAL_PRM_FORMAT_BIN, NFC_HAL_PRM_FORMAT_HCD, or
+**                                  (NFC_HAL_PRM_FORMAT_BIN,
+**                                   NFC_HAL_PRM_FORMAT_HCD, or
 **                                   NFC_HAL_PRM_FORMAT_NCD)
 **
-**                  dest_address    destination adderess (needed for BIN format only)
+**                  dest_address    destination adderess (needed for BIN format
+**                                  only)
 **
-**                  p_patchram_buf  pointer to patchram buffer. If NULL,
-**                                  then app must call HAL_NfcPrmDownloadContinue when
-**                                  NFC_HAL_PRM_CONTINUE_EVT is received, to send the next
-**                                  segment of patchram
+**                  p_patchram_buf  pointer to patchram buffer. If NULL, then
+**                                  app must call HAL_NfcPrmDownloadContinue
+**                                  when NFC_HAL_PRM_CONTINUE_EVT is received,
+**                                  to send the next segment of patchram
 **
 **                  patchram_len    size of p_patchram_buf (if non-NULL)
 **
 **                  patchram_delay  The delay after each patch.
-**                                  If the given value is less than the size of the patchram,
-**                                  the size of patchram is used instead.
+**                                  If the given value is less than the size of
+**                                  the patchram, the size of patchram is used
+**                                  instead.
 **
 **                  p_cback         callback for download status
 **
@@ -235,7 +241,8 @@
 ** Input Params     p_i2c_patchfile_buf: pointer to patch for i2c fix
 **                  i2c_patchfile_len: length of patch
 **                  prei2c_delay: the delay before downloading main patch
-**                                if 0 is given, NFC_HAL_PRM_POST_I2C_FIX_DELAY is used instead.
+**                                if 0 is given, NFC_HAL_PRM_POST_I2C_FIX_DELAY
+**                                is used instead.
 **
 ** Returns          Nothing
 **
@@ -250,14 +257,15 @@
 **
 ** Description      Set Host-to-NFCC NCI message size for secure patch download
 **
-**                  This API must be called before calling HAL_NfcPrmDownloadStart.
-**                  If the API is not called, then PRM will use the default
-**                  message size.
+**                  This API must be called before calling
+**                  HAL_NfcPrmDownloadStart. If the API is not called, then PRM
+**                  will use the default message size.
 **
 **                  Typically, this API is only called for platforms that have
 **                  message-size limitations in the transport/driver.
 **
-**                  Valid message size range: NFC_HAL_PRM_MIN_NCI_CMD_PAYLOAD_SIZE to 255.
+**                  Valid message size range:
+**                  NFC_HAL_PRM_MIN_NCI_CMD_PAYLOAD_SIZE to 255.
 **
 ** Returns          HAL_NFC_STATUS_OK if successful
 **                  HAL_NFC_STATUS_FAILED otherwise
diff --git a/src/hal/int/nfc_hal_nv_ci.h b/src/hal/int/nfc_hal_nv_ci.h
index db3859a..29cf27a 100644
--- a/src/hal/int/nfc_hal_nv_ci.h
+++ b/src/hal/int/nfc_hal_nv_ci.h
@@ -64,15 +64,16 @@
 **
 ** Function         nfc_hal_nv_ci_read
 **
-** Description      This function sends an event to NCIT indicating the phone has
-**                  read in the requested amount of data specified in the
-**                  nfa_nv_co_read () call-out function.  It should only be called
-**                  when the requested number of bytes has been read.
+** Description      This function sends an event to NCIT indicating the phone
+**                  has read in the requested amount of data specified in the
+**                  nfa_nv_co_read () call-out function.  It should only be
+**                  called when the requested number of bytes has been read.
 **
 ** Parameters       num_bytes_read - number of bytes read into the buffer
 **                      specified in the read callout-function.
 **                  status - NFC_HAL_NV_CO_OK if full buffer of data,
-**                           NFC_HAL_NV_CO_EOF if the end of file has been reached,
+**                           NFC_HAL_NV_CO_EOF if the end of file has been
+**                           reached,
 **                           NFC_HAL_NV_CO_FAIL if an error has occurred.
 **                  evt - Used Internally by NFA -> MUST be same value passed
 **                       in call-out function.
diff --git a/src/hal/int/nfc_hal_nv_co.h b/src/hal/int/nfc_hal_nv_co.h
index ce3ca94..7c0a31f 100644
--- a/src/hal/int/nfc_hal_nv_co.h
+++ b/src/hal/int/nfc_hal_nv_co.h
@@ -83,9 +83,9 @@
 **                  Note: Upon completion of the request, nfa_nv_ci_read () is
 **                        called with the buffer of data, along with the number
 **                        of bytes read into the buffer, and a status.  The
-**                        call-in function should only be called when ALL requested
-**                        bytes have been read, the end of file has been detected,
-**                        or an error has occurred.
+**                        call-in function should only be called when ALL
+**                        requested bytes have been read, the end of file has
+**                        been detected, or an error has occurred.
 **
 *******************************************************************************/
 void nfc_hal_nv_co_read (uint8_t *p_buf, uint16_t nbytes, uint8_t block);
@@ -103,9 +103,10 @@
 ** Returns          void
 **
 **                  Note: Upon completion of the request, nfa_nv_ci_write () is
-**                        called with the file descriptor and the status.  The
-**                        call-in function should only be called when ALL requested
-**                        bytes have been written, or an error has been detected,
+**                        called with the file descriptor and the status. The
+**                        call-in function should only be called when ALL
+**                        requested bytes have been written, or an error has
+**                        been detected,
 **
 *******************************************************************************/
 void nfc_hal_nv_co_write (const uint8_t *p_buf, uint16_t nbytes, uint8_t block);
diff --git a/src/hal/int/nfc_hal_post_reset.h b/src/hal/int/nfc_hal_post_reset.h
index 9cd2b70..bb7f418 100644
--- a/src/hal/int/nfc_hal_post_reset.h
+++ b/src/hal/int/nfc_hal_post_reset.h
@@ -65,8 +65,8 @@
 /*
 ** Post NCI reset handler
 **
-** This function is called to start device pre-initialization after NCI CORE-RESET.
-** When pre-initialization is completed,
+** This function is called to start device pre-initialization after
+** NCI CORE-RESET. When pre-initialization is completed,
 ** HAL_NfcPreInitDone() must be called to proceed with stack start up.
 */
 void nfc_hal_post_reset_init (uint32_t brcm_hw_id, uint8_t nvm_type);
diff --git a/src/include/_OverrideLog.h b/src/include/_OverrideLog.h
index 23d3cef..47f8e6a 100644
--- a/src/include/_OverrideLog.h
+++ b/src/include/_OverrideLog.h
@@ -53,12 +53,12 @@
 **                  overrides .conf variable.
 **
 ** Returns:         Global log level:
-**                  BT_TRACE_LEVEL_NONE    0        * No trace messages to be generated
-**                  BT_TRACE_LEVEL_ERROR   1        * Error condition trace messages
-**                  BT_TRACE_LEVEL_WARNING 2        * Warning condition trace messages
-**                  BT_TRACE_LEVEL_API     3        * API traces
-**                  BT_TRACE_LEVEL_EVENT   4        * Debug messages for events
-**                  BT_TRACE_LEVEL_DEBUG   5        * Debug messages (general)
+**                  BT_TRACE_LEVEL_NONE    0 * No trace messages to be generated
+**                  BT_TRACE_LEVEL_ERROR   1 * Error condition trace messages
+**                  BT_TRACE_LEVEL_WARNING 2 * Warning condition trace messages
+**                  BT_TRACE_LEVEL_API     3 * API traces
+**                  BT_TRACE_LEVEL_EVENT   4 * Debug messages for events
+**                  BT_TRACE_LEVEL_DEBUG   5 * Debug messages (general)
 **
 *******************************************************************************/
 unsigned char initializeGlobalAppLogLevel ();
diff --git a/src/include/gki_target.h b/src/include/gki_target.h
index b66b30a..21b11f2 100644
--- a/src/include/gki_target.h
+++ b/src/include/gki_target.h
@@ -262,9 +262,10 @@
 #endif
 
 /* The size of the buffers in pool 5
-** Special pool used by l2cap retransmissions only.  This size based on segment
+** Special pool used by l2cap retransmissions only. This size based on segment
 ** that will fit into both DH5 and 2-DH3 packet types after accounting for GKI
-** header.  13 bytes of max headers allows us a 339 payload max. (in btui_app.txt)
+** header. 13 bytes of max headers allows us a 339 payload max.
+** (in btui_app.txt)
 ** Note: 748 used for insight scriptwrapper with CAT-2 scripts.
 */
 #ifndef GKI_BUF5_SIZE
diff --git a/src/include/nfc_target.h b/src/include/nfc_target.h
index 6f843bf..086a86b 100644
--- a/src/include/nfc_target.h
+++ b/src/include/nfc_target.h
@@ -372,11 +372,13 @@
 #endif
 
 /*
-** LTO is max time interval between the last bit received and the first bit sent over the air.
-** Link timeout must be delayed as much as time between the packet sent from LLCP and the last bit transmitted at NFCC.
-**  - 200ms, max OTA transmitting time between the first bit and the last bit at NFCC
-**    Largest MIU(2175bytes) of LLCP must be fragmented and sent on NFC-DEP over the air.
-**    8 * (DEP_REQ/RES+ACK) + DEP_REQ/RES for 2175 MIU at 106kbps bit rate.
+** LTO is max time interval between the last bit received and the first bit sent
+** over the air. Link timeout must be delayed as much as time between the packet
+** sent from LLCP and the last bit transmitted at NFCC.
+**  - 200ms, max OTA transmitting time between the first bit and the last bit at
+**    NFCC. Largest MIU(2175bytes) of LLCP must be fragmented and sent on
+**    NFC-DEP over the air. 8 * (DEP_REQ/RES+ACK) + DEP_REQ/RES for 2175 MIU at
+**    106kbps bit rate.
 **  - 10ms, processing time
 */
 #ifndef LLCP_INTERNAL_TX_DELAY
@@ -384,11 +386,13 @@
 #endif
 
 /*
-** LTO is max time interval between the last bit received and the first bit sent over the air.
-** Link timeout must be delayed as much as time between the first bit received at NFCC and the packet received at LLCP.
-**  - 200ms, max OTA transmitting time between the first bit and the last bit at NFCC
-**    LLCP cannot receive data packet until all bit are received and reassembled in NCI.
-**    8 * (DEP_REQ/RES+ACK) + DEP_REQ/RES for 2175 MIU at 106kbps bit rate.
+** LTO is max time interval between the last bit received and the first bit sent
+** over the air. Link timeout must be delayed as much as time between the first
+** bit received at NFCC and the packet received at LLCP.
+**  - 200ms, max OTA transmitting time between the first bit and the last bit at
+**    NFCC. LLCP cannot receive data packet until all bit are received and
+**    reassembled in NCI. 8 * (DEP_REQ/RES+ACK) + DEP_REQ/RES for 2175 MIU at
+**    106kbps bit rate.
 **  - 10ms, processing time
 */
 #ifndef LLCP_INTERNAL_RX_DELAY
diff --git a/src/nfa/ce/nfa_ce_act.c b/src/nfa/ce/nfa_ce_act.c
index 9bcec0e..7fb1947 100644
--- a/src/nfa/ce/nfa_ce_act.c
+++ b/src/nfa/ce/nfa_ce_act.c
@@ -305,7 +305,8 @@
             /* Set tag's system code and NFCID2 */
             UINT8_TO_STREAM (p_params, NFC_PMID_LF_T3T_ID1+t3t_idx);                 /* type */
             UINT8_TO_STREAM (p_params, NCI_PARAM_LEN_LF_T3T_ID);                     /* length */
-            UINT16_TO_BE_STREAM (p_params, p_cb->listen_info[i].t3t_system_code);    /* System Code */
+            /* System Code */
+            UINT16_TO_BE_STREAM (p_params, p_cb->listen_info[i].t3t_system_code);
             ARRAY_TO_BE_STREAM (p_params,  p_cb->listen_info[i].t3t_nfcid2, NCI_RF_F_UID_LEN);
 
             /* Set mask for this ID */
@@ -319,7 +320,8 @@
 
     UINT8_TO_STREAM (p_params, NFC_PMID_LF_T3T_FLAGS2);      /* type */
     UINT8_TO_STREAM (p_params, NCI_PARAM_LEN_LF_T3T_FLAGS2); /* length */
-    UINT16_TO_STREAM (p_params, t3t_flags2_mask);            /* Mask of IDs to disable listening */
+    /* Mask of IDs to disable listening */
+    UINT16_TO_STREAM (p_params, t3t_flags2_mask);
 
     tlv_size = (uint8_t) (p_params-tlv);
     nfa_dm_check_set_config (tlv_size, (uint8_t *)tlv, false);
@@ -488,7 +490,8 @@
 **
 ** Function         nfa_ce_restart_listen_check
 **
-** Description      Called on deactivation. Check if any active listen_info entries to listen for
+** Description      Called on deactivation. Check if any active listen_info
+**                  entries to listen for
 **
 ** Returns          TRUE if listening is restarted.
 **                  FALSE if listening not restarted
@@ -525,7 +528,8 @@
 **
 ** Function         nfa_ce_remove_listen_info_entry
 **
-** Description      Remove entry from listen_info table. (when API deregister is called or listen_start failed)
+** Description      Remove entry from listen_info table. (when API deregister is
+**                  called or listen_start failed)
 **
 **
 ** Returns          Nothing
@@ -910,11 +914,11 @@
 **
 ** Description      Action when deactivate occurs. (NFA_CE_DEACTIVATE_NTF_EVT)
 **
-**                  - If deactivate due to API deregister, then remove its entry from
-**                      listen_info table
+**                  - If deactivate due to API deregister, then remove its entry
+**                    from listen_info table
 **
 **                  - If NDEF was modified while activated, then restore
-**                      original NDEF contents
+**                    original NDEF contents
 **
 **                  - Restart listening (if any active entries in listen table)
 **
@@ -1404,8 +1408,8 @@
 **
 ** Function         nfa_ce_api_cfg_isodep_tech
 **
-** Description      Configure the technologies (NFC-A and/or NFC-B) to listen for
-**                  ISO-DEP
+** Description      Configure the technologies (NFC-A and/or NFC-B) to listen
+**                  for ISO-DEP
 **
 ** Returns          TRUE (message buffer to be freed by caller)
 **
diff --git a/src/nfa/ce/nfa_ce_api.c b/src/nfa/ce/nfa_ce_api.c
index b0004eb..28867d2 100644
--- a/src/nfa/ce/nfa_ce_api.c
+++ b/src/nfa/ce/nfa_ce_api.c
@@ -84,15 +84,15 @@
 **                  Tag events will be notifed using the tNFA_CONN_CBACK
 **                  (registered during NFA_Enable)
 **
-**                  The NFA_CE_LOCAL_TAG_CONFIGURED_EVT reports the status of the
-**                  operation.
+**                  The NFA_CE_LOCAL_TAG_CONFIGURED_EVT reports the status of
+**                  the operation.
 **
 **                  Activation and deactivation are reported using the
 **                  NFA_ACTIVATED_EVT and NFA_DEACTIVATED_EVT events
 **
 **                  If a write-request is received to update the tag memory,
-**                  an NFA_CE_NDEF_WRITE_CPLT_EVT will notify the application, along
-**                  with a buffer containing the updated contents.
+**                  an NFA_CE_NDEF_WRITE_CPLT_EVT will notify the application,
+**                  along with a buffer containing the updated contents.
 **
 **                  To disable the local NDEF tag, set protocol_mask=0
 **
@@ -100,9 +100,10 @@
 **                  as long as the local NDEF tag is enabled.
 **
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function. Also, Input parameters p_uid and
-**                  uid_len are reserved for future use.
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function. Also, Input parameters
+**                  p_uid and uid_len are reserved for future use.
 **
 ** Returns:
 **                  NFA_STATUS_OK,            if command accepted
@@ -182,14 +183,15 @@
 **                  Events will be notifed using the tNFA_CONN_CBACK
 **                  (registered during NFA_Enable)
 **
-**                  The NFA_CE_UICC_LISTEN_CONFIGURED_EVT reports the status of the
-**                  operation.
+**                  The NFA_CE_UICC_LISTEN_CONFIGURED_EVT reports the status of
+**                  the operation.
 **
 **                  Activation and deactivation are reported using the
 **                  NFA_ACTIVATED_EVT and NFA_DEACTIVATED_EVT events
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
 ** Returns:
 **                  NFA_STATUS_OK, if command accepted
@@ -238,8 +240,9 @@
 **                  The NFA_CE_REGISTERED_EVT reports the status of the
 **                  operation.
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
 ** Returns:
 **                  NFA_STATUS_OK, if command accepted
@@ -281,13 +284,15 @@
 ** Function         NFA_CeDeregisterFelicaSystemCodeOnDH
 **
 ** Description      Deregister listening callback for Felica
-**                  (previously registered using NFA_CeRegisterFelicaSystemCodeOnDH)
+**                  (previously registered using
+**                  NFA_CeRegisterFelicaSystemCodeOnDH)
 **
 **                  The NFA_CE_DEREGISTERED_EVT reports the status of the
 **                  operation.
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_BAD_HANDLE if invalid handle
@@ -313,8 +318,9 @@
 **                  will get notifications for any AIDs routed to the DH. This
 **                  over-rides callbacks registered for specific AIDs.
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
 ** Returns:
 **                  NFA_STATUS_OK, if command accepted
@@ -361,8 +367,9 @@
 **                  The NFA_CE_DEREGISTERED_EVT reports the status of the
 **                  operation.
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_BAD_HANDLE if invalid handle
@@ -380,18 +387,21 @@
 ** Function         NFA_CeSetIsoDepListenTech
 **
 ** Description      Set the technologies (NFC-A and/or NFC-B) to listen for when
-**                  NFA_CeConfigureLocalTag or NFA_CeDeregisterAidOnDH are called.
+**                  NFA_CeConfigureLocalTag or NFA_CeDeregisterAidOnDH are
+**                  called.
 **
 **                  By default (if this API is not called), NFA will listen
 **                  for both NFC-A and NFC-B for ISODEP.
 **
 ** Note:            If listening for ISODEP on UICC, the DH listen callbacks
-**                  may still get activate notifications for ISODEP if the reader/
-**                  writer selects an AID that is not routed to the UICC (regardless
-**                  of whether A or B was disabled using NFA_CeSetIsoDepListenTech)
+**                  may still get activate notifications for ISODEP if the
+**                  reader/writer selects an AID that is not routed to the UICC
+**                  (regardless of whether A or B was disabled using
+**                  NFA_CeSetIsoDepListenTech)
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
 ** Returns:
 **                  NFA_STATUS_OK, if command accepted
diff --git a/src/nfa/dm/nfa_dm_act.c b/src/nfa/dm/nfa_dm_act.c
index a73e735..2d58dfa 100644
--- a/src/nfa/dm/nfa_dm_act.c
+++ b/src/nfa/dm/nfa_dm_act.c
@@ -153,8 +153,8 @@
     }
 
     /* LF_T3T_FLAGS:
-    ** DH needs to set this configuration, even if default value (not listening) is used,
-    ** to let NFCC know of intention (not listening) of DH.
+    ** DH needs to set this configuration, even if default value (not listening)
+    ** is used, to let NFCC know of intention (not listening) of DH.
     */
 
     /* FWI */
@@ -295,7 +295,8 @@
 
     case NFC_SET_CONFIG_REVT:                    /* 2  Set Config Response */
         /* If this setconfig was due to NFA_SetConfig, then notify the app */
-        if (nfa_dm_cb.setcfg_pending_mask & 1)      /* lsb=whether last NCI_SET_CONFIG was due to NFA_SetConfig */
+        /* lsb=whether last NCI_SET_CONFIG was due to NFA_SetConfig */
+        if (nfa_dm_cb.setcfg_pending_mask & 1)
         {
             dm_cback_data.set_config.status         = p_data->set_config.status;
             dm_cback_data.set_config.num_param_id   = p_data->set_config.num_param_id;
@@ -746,8 +747,10 @@
 
     NFA_TRACE_DEBUG0 ("nfa_dm_act_deactivate ()");
 
-    if (  (p_data->deactivate.sleep_mode == false)                 /* Always allow deactivate to IDLE */
-        ||(  (nfa_dm_cb.disc_cb.activated_protocol != NFA_PROTOCOL_T1T)      /* Do not allow deactivate to SLEEP for T1T,NFCDEP, ISO15693 */
+    /* Always allow deactivate to IDLE */
+    /* Do not allow deactivate to SLEEP for T1T,NFCDEP, ISO15693 */
+    if (  (p_data->deactivate.sleep_mode == false)
+        ||(  (nfa_dm_cb.disc_cb.activated_protocol != NFA_PROTOCOL_T1T)
            &&(nfa_dm_cb.disc_cb.activated_protocol != NFA_PROTOCOL_NFC_DEP)
            &&(nfa_dm_cb.disc_cb.activated_protocol != NFA_PROTOCOL_ISO15693)
            &&(nfa_dm_cb.disc_cb.activated_protocol != NFC_PROTOCOL_KOVIO)  )  )
@@ -848,7 +851,8 @@
 **
 ** Function         nfa_dm_act_send_vsc
 **
-** Description      Send the NCI Vendor Specific command to the NCI command queue
+** Description      Send the NCI Vendor Specific command to the NCI command
+**                  queue
 **
 ** Returns          FALSE (message buffer is NOT freed by caller)
 **
@@ -1840,8 +1844,9 @@
         else if (!(nfa_dm_cb.flags & NFA_DM_FLAGS_EXCL_RF_ACTIVE))
         {
             /*
-            ** if the same tag is activated then do not perform auto NDEF detection.
-            ** Application may put a tag into sleep mode and reactivate the same tag.
+            ** if the same tag is activated then do not perform auto NDEF
+            ** detection. Application may put a tag into sleep mode and
+            ** reactivate the same tag.
             */
 
             if (  (p_tech_params->mode != nfa_dm_cb.activated_tech_mode)
diff --git a/src/nfa/dm/nfa_dm_api.c b/src/nfa/dm/nfa_dm_api.c
index 8fcff74..d175b9a 100644
--- a/src/nfa/dm/nfa_dm_api.c
+++ b/src/nfa/dm/nfa_dm_api.c
@@ -82,12 +82,12 @@
 **                  transport, resets the NFC controller, downloads patches to
 **                  the NFCC (if necessary), and initializes the NFC subsystems.
 **
-**                  This function should only be called once - typically when NFC
-**                  is enabled during boot-up, or when NFC is enabled from a
+**                  This function should only be called once - typically when
+**                  NFC is enabled during boot-up, or when NFC is enabled from a
 **                  settings UI. Subsequent calls to NFA_Enable while NFA is
 **                  enabling or enabled will be ignored. When the NFC startup
-**                  procedure is completed, an NFA_DM_ENABLE_EVT is returned to the
-**                  application using the tNFA_DM_CBACK.
+**                  procedure is completed, an NFA_DM_ENABLE_EVT is returned to
+**                  the application using the tNFA_DM_CBACK.
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
@@ -133,9 +133,9 @@
 **                  returned to the application using the tNFA_DM_CBACK.
 **
 **                  The platform should wait until the NFC_DISABLE_REVT is
-**                  received before powering down the NFC chip and NCI transport.
-**                  This is required to so that NFA can gracefully shut down any
-**                  open connections.
+**                  received before powering down the NFC chip and NCI
+**                  transport. This is required to so that NFA can gracefully
+**                  shut down any open connections.
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
@@ -168,8 +168,9 @@
 **                  reported with an NFA_DM_SET_CONFIG_EVT in the tNFA_DM_CBACK
 **                  callback.
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function. Most Configuration
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function. Most Configuration
 **                  parameters are related to RF discovery.
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
@@ -258,8 +259,8 @@
 **                  NFA_ACTIVATED_EVT and NFA_DEACTIVATED_EVT indicates link
 **                  activation/deactivation.
 **
-**                  NFA_SendRawFrame is used to send data to the peer. NFA_DATA_EVT
-**                  indicates data from the peer.
+**                  NFA_SendRawFrame is used to send data to the peer.
+**                  NFA_DATA_EVT indicates data from the peer.
 **
 **                  If a tag is activated, then the NFA_RW APIs may be used to
 **                  send commands to the tag. Incoming NDEF messages are sent to
@@ -269,8 +270,9 @@
 **                  LLCP internally. The application has exclusive control of
 **                  the link.
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
@@ -357,19 +359,24 @@
 **
 **                  - NFA_POLL_ENABLED_EVT indicates whether or not polling
 **                    successfully enabled.
-**                  - NFA_DISC_RESULT_EVT indicates there are more than one devices,
-**                    so application must select one of tags by calling NFA_Select().
-**                  - NFA_SELECT_RESULT_EVT indicates whether previous selection was
-**                    successful or not. If it was failed then application must select
-**                    again or deactivate by calling NFA_Deactivate().
-**                  - NFA_ACTIVATED_EVT is generated when an NFC link is activated.
+**                  - NFA_DISC_RESULT_EVT indicates there are more than one
+**                    devices, so application must select one of tags by calling
+**                    NFA_Select().
+**                  - NFA_SELECT_RESULT_EVT indicates whether previous selection
+**                    was successful or not. If it was failed then application
+**                    must select again or deactivate by calling
+**                    NFA_Deactivate().
+**                  - NFA_ACTIVATED_EVT is generated when an NFC link is
+**                    activated.
 **                  - NFA_NDEF_DETECT_EVT is generated if tag is activated
-**                  - NFA_LLCP_ACTIVATED_EVT/NFA_LLCP_DEACTIVATED_EVT is generated
-**                    if NFC-DEP is activated
-**                  - NFA_DEACTIVATED_EVT will be returned after deactivating NFC link.
+**                  - NFA_LLCP_ACTIVATED_EVT/NFA_LLCP_DEACTIVATED_EVT is
+**                    generated if NFC-DEP is activated
+**                  - NFA_DEACTIVATED_EVT will be returned after deactivating
+**                    NFC link.
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
@@ -399,10 +406,12 @@
 ** Function         NFA_DisablePolling
 **
 ** Description      Disable polling
-**                  NFA_POLL_DISABLED_EVT will be returned after stopping polling.
+**                  NFA_POLL_DISABLED_EVT will be returned after stopping
+**                  polling.
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
@@ -431,17 +440,19 @@
 ** Function         NFA_EnableListening
 **
 ** Description      Enable listening.
-**                  NFA_LISTEN_ENABLED_EVT will be returned after listening is allowed.
+**                  NFA_LISTEN_ENABLED_EVT will be returned after listening is
+**                  allowed.
 **
 **                  The actual listening technologies are specified by other NFA
 **                  API functions. Such functions include (but not limited to)
 **                  NFA_CeConfigureUiccListenTech.
-**                  If NFA_DisableListening () is called to ignore the listening technologies,
-**                  NFA_EnableListening () is called to restore the listening technologies
-**                  set by these functions.
+**                  If NFA_DisableListening () is called to ignore the listening
+**                  technologies, NFA_EnableListening () is called to restore
+**                  the listening technologies set by these functions.
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
@@ -470,11 +481,13 @@
 ** Function         NFA_DisableListening
 **
 ** Description      Disable listening
-**                  NFA_LISTEN_DISABLED_EVT will be returned after stopping listening.
-**                  This function is called to exclude listen at RF discovery.
+**                  NFA_LISTEN_DISABLED_EVT will be returned after stopping
+**                  listening. This function is called to exclude listen at RF
+**                  discovery.
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
@@ -510,8 +523,9 @@
 **                  available. NFA_ResumeP2p() is called to resume the P2P
 **                  services.
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
@@ -543,8 +557,9 @@
 **                  NFA_P2P_RESUMED_EVT will be returned after P2P services are.
 **                  enables again.
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
@@ -572,16 +587,17 @@
 **
 ** Function         NFA_SetP2pListenTech
 **
-** Description      This function is called to set listen technology for NFC-DEP.
-**                  This funtion may be called before or after starting any server
-**                  on NFA P2P/CHO/SNEP.
+** Description      This function is called to set listen technology for
+**                  NFC-DEP. This funtion may be called before or after starting
+**                  any server on NFA P2P/CHO/SNEP.
 **                  If there is no technology for NFC-DEP, P2P listening will be
 **                  stopped.
 **
 **                  NFA_SET_P2P_LISTEN_TECH_EVT without data will be returned.
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
@@ -613,7 +629,8 @@
 ** Description      Start RF discovery
 **                  RF discovery parameters shall be set by other APIs.
 **
-**                  An NFA_RF_DISCOVERY_STARTED_EVT indicates whether starting was successful or not.
+**                  An NFA_RF_DISCOVERY_STARTED_EVT indicates whether starting
+**                  was successful or not.
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
@@ -643,7 +660,8 @@
 **
 ** Description      Stop RF discovery
 **
-**                  An NFA_RF_DISCOVERY_STOPPED_EVT indicates whether stopping was successful or not.
+**                  An NFA_RF_DISCOVERY_STOPPED_EVT indicates whether stopping
+**                  was successful or not.
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
@@ -680,8 +698,9 @@
 **                  NFA_StartRfDiscovery afterwards to restart discovery using
 **                  the new duration.
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
 ** Returns:
 **                  NFA_STATUS_OK, if command accepted
@@ -718,11 +737,13 @@
 **                  (from NFA_DISC_RESULT_EVTs). The application should wait for
 **                  the final NFA_DISC_RESULT_EVT before selecting.
 **
-**                  An NFA_SELECT_RESULT_EVT indicates whether selection was successful or not.
-**                  If failed then application must select again or deactivate by NFA_Deactivate().
+**                  An NFA_SELECT_RESULT_EVT indicates whether selection was
+**                  successful or not. If failed then application must select
+**                  again or deactivate by NFA_Deactivate().
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
-**                  NFA_STATUS_INVALID_PARAM if RF interface is not matched protocol
+**                  NFA_STATUS_INVALID_PARAM if RF interface is not matched
+**                  protocol
 **                  NFA_STATUS_FAILED otherwise
 **
 *******************************************************************************/
@@ -761,8 +782,8 @@
 **
 ** Function         NFA_UpdateRFCommParams
 **
-** Description      This function is called to update RF Communication parameters
-**                  once the Frame RF Interface has been activated.
+** Description      This function is called to update RF Communication
+**                  parameters once the Frame RF Interface has been activated.
 **
 **                  An NFA_UPDATE_RF_PARAM_RESULT_EVT indicates whether updating
 **                  was successful or not.
@@ -796,21 +817,25 @@
 **
 ** Description
 **                  If sleep_mode=TRUE:
-**                      Deselect the activated device by deactivating into sleep mode.
+**                      Deselect the activated device by deactivating into sleep
+**                      mode.
 **
-**                      An NFA_DEACTIVATE_FAIL_EVT indicates that selection was not successful.
-**                      Application can select another discovered device or deactivate by NFA_Deactivate ()
+**                      An NFA_DEACTIVATE_FAIL_EVT indicates that selection was
+**                      not successful. Application can select another
+**                      discovered device or deactivate by NFA_Deactivate()
 **                      after receiving NFA_DEACTIVATED_EVT.
 **
-**                      Deactivating to sleep mode is not allowed when NFCC is in wait-for-host-select
-**                      mode, or in listen-sleep states; NFA will deactivate to idle or discovery state
-**                      for these cases respectively.
+**                      Deactivating to sleep mode is not allowed when NFCC is
+**                      in wait-for-host-select mode, or in listen-sleep states;
+**                      NFA will deactivate to idle or discovery state for these
+**                      cases respectively.
 **
 **
 **                  If sleep_mode=FALSE:
-**                      Deactivate the connection (e.g. as a result of presence check failure)
-**                      NFA_DEACTIVATED_EVT will indicate that link is deactivated.
-**                      Polling/listening will resume (unless the nfcc is in wait_for-all-discoveries state)
+**                      Deactivate the connection (e.g. as a result of presence
+**                      check failure) NFA_DEACTIVATED_EVT will indicate that
+**                      link is deactivated. Polling/listening will resume
+**                      (unless the nfcc is in wait_for-all-discoveries state)
 **
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
@@ -841,13 +866,15 @@
 ** Function         NFA_SendRawFrame
 **
 ** Description      Send a raw frame over the activated interface with the NFCC.
-**                  This function can only be called after NFC link is activated.
+**                  This function can only be called after NFC link is
+**                  activated.
 **
-**                  If the activated interface is a tag and auto-presence check is
-**                  enabled then presence_check_start_delay can be used to indicate
-**                  the delay in msec after which the next auto presence check
-**                  command can be sent. NFA_DM_DEFAULT_PRESENCE_CHECK_START_DELAY
-**                  can be used as the default value for the delay.
+**                  If the activated interface is a tag and auto-presence check
+**                  is enabled then presence_check_start_delay can be used to
+**                  indicate the delay in msec after which the next auto
+**                  presence check command can be sent.
+**                  NFA_DM_DEFAULT_PRESENCE_CHECK_START_DELAY can be used as the
+**                  default value for the delay.
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
@@ -955,17 +982,18 @@
 ** Function         NFA_RegisterNDefUriHandler
 **
 ** Description      This API is a special-case of NFA_RegisterNDefTypeHandler
-**                  with TNF=NFA_TNF_WKT, and type_name='U' (URI record); and allows
-**                  registering for specific URI types (e.g. 'tel:' or 'mailto:').
+**                  with TNF=NFA_TNF_WKT, and type_name='U' (URI record); and
+**                  allows registering for specific URI types (e.g. 'tel:' or
+**                  'mailto:').
 **
 **                  An NFA_NDEF_REGISTER_EVT will be sent to the tNFA_NDEF_CBACK
 **                  to indicate that registration was successful, and provide a
 **                  handle for this registration.
 **
-**                  If uri_id=NFA_NDEF_URI_ID_ABSOLUTE, then p_abs_uri contains the
-**                  unabridged URI. For all other uri_id values, the p_abs_uri
-**                  parameter is ignored (i.e the URI prefix is implied by uri_id).
-**                  See [NFC RTD URI] for more information.
+**                  If uri_id=NFA_NDEF_URI_ID_ABSOLUTE, then p_abs_uri contains
+**                  the unabridged URI. For all other uri_id values,
+**                  the p_abs_uri parameter is ignored (i.e the URI prefix is
+**                  implied by uri_id). See [NFC RTD URI] for more information.
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
@@ -1054,8 +1082,9 @@
 **
 ** Function         NFA_PowerOffSleepMode
 **
-** Description      This function is called to enter or leave NFCC Power Off Sleep mode
-**                  NFA_DM_PWR_MODE_CHANGE_EVT will be sent to indicate status.
+** Description      This function is called to enter or leave NFCC Power Off
+**                  Sleep mode NFA_DM_PWR_MODE_CHANGE_EVT will be sent to
+**                  indicate status.
 **
 **                  start_stop : TRUE if entering Power Off Sleep mode
 **                               FALSE if leaving Power Off Sleep mode
@@ -1097,10 +1126,10 @@
 **
 ** Function         NFA_RegVSCback
 **
-** Description      This function is called to register or de-register a callback
-**                  function to receive Proprietary NCI response and notification
-**                  events.
-**                  The maximum number of callback functions allowed is NFC_NUM_VS_CBACKS
+** Description      This function is called to register or de-register a
+**                  callback function to receive Proprietary NCI response and
+**                  notification events. The maximum number of callback
+**                  functions allowed is NFC_NUM_VS_CBACKS
 **
 ** Returns          tNFC_STATUS
 **
@@ -1142,8 +1171,8 @@
 **                  oid             - The opcode of the VS command.
 **                  cmd_params_len  - The command parameter len
 **                  p_cmd_params    - The command parameter
-**                  p_cback         - The callback function to receive the command
-**                                    status
+**                  p_cback         - The callback function to receive the
+**                                    command status
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
diff --git a/src/nfa/dm/nfa_dm_cfg.c b/src/nfa/dm/nfa_dm_cfg.c
index b666a20..c0df41e 100644
--- a/src/nfa/dm/nfa_dm_cfg.c
+++ b/src/nfa/dm/nfa_dm_cfg.c
@@ -49,7 +49,8 @@
 const uint8_t nfa_dm_gen_cfg[] =
 {
     3,                         /* total length */
-    NFC_PMID_RF_FIELD_INFO,     /* Instruct NFCC to report RF field generated by remote device (or not) */
+    /* Instruct NFCC to report RF field generated by remote device (or not) */
+    NFC_PMID_RF_FIELD_INFO,
     1,
     0x01
 };
@@ -96,11 +97,16 @@
 
 const tNFA_DM_CFG nfa_dm_cfg =
 {
-    NFA_DM_AUTO_DETECT_NDEF,                /* Automatic NDEF detection (when not in exclusive RF mode) */
-    NFA_DM_AUTO_READ_NDEF,                  /* Automatic NDEF read (when not in exclusive RF mode)      */
-    NFA_DM_AUTO_PRESENCE_CHECK,             /* Automatic presence check                                 */
-    NFA_DM_PRESENCE_CHECK_OPTION,           /* Use sleep/wake(last interface) for ISODEP presence check */
-    NFA_DM_MAX_PRESENCE_CHECK_TIMEOUT       /* Maximum time to wait for presence check response         */
+    /* Automatic NDEF detection (when not in exclusive RF mode) */
+    NFA_DM_AUTO_DETECT_NDEF,
+    /* Automatic NDEF read (when not in exclusive RF mode) */
+    NFA_DM_AUTO_READ_NDEF,
+    /* Automatic presence check */
+    NFA_DM_AUTO_PRESENCE_CHECK,
+    /* Use sleep/wake(last interface) for ISODEP presence check */
+    NFA_DM_PRESENCE_CHECK_OPTION,
+    /* Maximum time to wait for presence check response */
+    NFA_DM_MAX_PRESENCE_CHECK_TIMEOUT
 };
 
 tNFA_DM_CFG *p_nfa_dm_cfg = (tNFA_DM_CFG *) &nfa_dm_cfg;
@@ -114,10 +120,14 @@
 
 const tNFA_HCI_CFG nfa_hci_cfg =
 {
-    NFA_HCI_NETWK_INIT_IDLE_TIMEOUT, /* Max HCI Network IDLE time to wait for EE DISC REQ Ntf(s) */
-    NFA_HCI_RESPONSE_TIMEOUT,        /* Maximum HCP Response time to any HCP Command */
-    0x03,                            /* Number of host in the whitelist of Terminal host */
-    (uint8_t *) nfa_hci_whitelist      /* Pointer to the Whitelist of Terminal Host */
+    /* Max HCI Network IDLE time to wait for EE DISC REQ Ntf(s) */
+    NFA_HCI_NETWK_INIT_IDLE_TIMEOUT,
+    /* Maximum HCP Response time to any HCP Command */
+    NFA_HCI_RESPONSE_TIMEOUT,
+    /* Number of host in the whitelist of Terminal host */
+    0x03,
+    /* Pointer to the Whitelist of Terminal Host */
+    (uint8_t *) nfa_hci_whitelist
 };
 
 tNFA_HCI_CFG *p_nfa_hci_cfg = (tNFA_HCI_CFG *) &nfa_hci_cfg;
diff --git a/src/nfa/dm/nfa_dm_discover.c b/src/nfa/dm/nfa_dm_discover.c
index 469096e..bd2c16b 100644
--- a/src/nfa/dm/nfa_dm_discover.c
+++ b/src/nfa/dm/nfa_dm_discover.c
@@ -74,7 +74,8 @@
 **
 ** Function         nfa_dm_get_rf_discover_config
 **
-** Description      Build RF discovery configurations from tNFA_DM_DISC_TECH_PROTO_MASK
+** Description      Build RF discovery configurations from
+**                  tNFA_DM_DISC_TECH_PROTO_MASK
 **
 ** Returns          number of RF discovery configurations
 **
@@ -293,7 +294,8 @@
     /*
     ** T1T listen     LA_PROT 0x80, LA_SENS_RES byte1:0x00 byte2:0x0C
     ** T2T listen     LA_PROT 0x00
-    ** T3T listen     No bit for T3T in LF_PROT (CE T3T set listen parameters, system code, NFCID2, etc.)
+    ** T3T listen     No bit for T3T in LF_PROT (CE T3T set listen parameters,
+    **                system code, NFCID2, etc.)
     ** ISO-DEP listen LA_PROT 0x01, LB_PROT 0x01
     ** NFC-DEP listen LA_PROT 0x02, LF_PROT 0x02
     */
@@ -881,7 +883,8 @@
 
     NFA_TRACE_DEBUG1 ("nfa_dm_disc_force_to_idle() disc_flags = 0x%x", nfa_dm_cb.disc_cb.disc_flags);
 
-    if (nfa_dm_cb.disc_cb.disc_flags & NFA_DM_DISC_FLAGS_W4_NTF) /* do not execute more than one */
+    /* do not execute more than one */
+    if (nfa_dm_cb.disc_cb.disc_flags & NFA_DM_DISC_FLAGS_W4_NTF)
     {
         nfa_dm_cb.disc_cb.disc_flags &= ~(NFA_DM_DISC_FLAGS_W4_NTF);
         nfa_dm_cb.disc_cb.disc_flags |= (NFA_DM_DISC_FLAGS_W4_RSP);
@@ -1005,7 +1008,8 @@
                 listen_mask = 0;
 
                 /*
-                ** add listen mode technolgies and protocols if host ID is matched to listen mode routing table
+                ** add listen mode technolgies and protocols if host ID is
+                ** matched to listen mode routing table
                 */
 
                 /* NFC-A */
@@ -1048,7 +1052,8 @@
                 }
 
                 /*
-                ** clear listen mode technolgies and protocols which are already used by others
+                ** clear listen mode technolgies and protocols which are already
+                ** used by others
                 */
 
                 /* Check if other modules are listening T1T or T2T */
@@ -1128,8 +1133,8 @@
     {
         /*
         ** NFCC will abort programming personality slots if not available.
-        ** NFCC programs the personality slots in the following order of RF technologies:
-        **      NFC-A, NFC-B, NFC-BP, NFC-I93
+        ** NFCC programs the personality slots in the following order of RF
+        ** technologies: NFC-A, NFC-B, NFC-BP, NFC-I93
         */
 
         /* if this is not for exclusive control */
@@ -1193,9 +1198,11 @@
 **
 ** Function         nfa_dm_disc_handle_kovio_activation
 **
-** Description      Handle Kovio activation; whether it's new or repeated activation
+** Description      Handle Kovio activation; whether it's new or repeated
+**                  activation
 **
-** Returns          TRUE if repeated activation. No need to notify activated event to upper layer
+** Returns          TRUE if repeated activation. No need to notify activated
+**                  event to upper layer
 **
 *******************************************************************************/
 bool    nfa_dm_disc_handle_kovio_activation (tNFC_DISCOVER *p_data, tNFA_DISCOVER_CBACK *p_disc_cback)
@@ -1455,8 +1462,10 @@
     if (sm_event == NFA_DM_RF_DEACTIVATE_RSP)
     {
         /*
-        ** Activation has been aborted by upper layer in NFA_DM_RFST_W4_ALL_DISCOVERIES or NFA_DM_RFST_W4_HOST_SELECT
-        ** Deactivation by upper layer or RF link loss in NFA_DM_RFST_LISTEN_SLEEP
+        ** Activation has been aborted by upper layer in
+        ** NFA_DM_RFST_W4_ALL_DISCOVERIES or NFA_DM_RFST_W4_HOST_SELECT
+        ** Deactivation by upper layer or RF link loss in
+        ** NFA_DM_RFST_LISTEN_SLEEP
         ** No sub-module is activated at this state.
         */
 
@@ -1809,8 +1818,9 @@
 
     nfa_dm_cb.disc_cb.disc_state = new_state;
 
+    /* not error recovering */
     if (  (new_state == NFA_DM_RFST_IDLE)
-        &&(!(nfa_dm_cb.disc_cb.disc_flags & NFA_DM_DISC_FLAGS_W4_RSP))  ) /* not error recovering */
+        &&(!(nfa_dm_cb.disc_cb.disc_flags & NFA_DM_DISC_FLAGS_W4_RSP))  )
     {
         if (nfa_dm_cb.disc_cb.disc_flags & NFA_DM_DISC_FLAGS_STOPPING)
         {
@@ -2085,7 +2095,8 @@
 **
 ** Function         nfa_dm_disc_sm_w4_all_discoveries
 **
-** Description      Processing discovery events in NFA_DM_RFST_W4_ALL_DISCOVERIES state
+** Description      Processing discovery events in
+**                  NFA_DM_RFST_W4_ALL_DISCOVERIES state
 **
 ** Returns          void
 **
@@ -2127,7 +2138,8 @@
     case NFA_DM_RF_INTF_ACTIVATED_NTF:
         /*
         ** This is only for ISO15693.
-        ** FW sends activation NTF when all responses are received from tags without host selecting.
+        ** FW sends activation NTF when all responses are received from tags
+        ** without host selecting.
         */
         nfa_dm_disc_new_state (NFA_DM_RFST_POLL_ACTIVE);
 
@@ -2149,7 +2161,8 @@
 **
 ** Function         nfa_dm_disc_sm_w4_host_select
 **
-** Description      Processing discovery events in NFA_DM_RFST_W4_HOST_SELECT state
+** Description      Processing discovery events in NFA_DM_RFST_W4_HOST_SELECT
+**                  state
 **
 ** Returns          void
 **
@@ -2408,7 +2421,8 @@
 **
 ** Function         nfa_dm_disc_sm_listen_active
 **
-** Description      Processing discovery events in NFA_DM_RFST_LISTEN_ACTIVE state
+** Description      Processing discovery events in NFA_DM_RFST_LISTEN_ACTIVE
+**                  state
 **
 ** Returns          void
 **
@@ -2489,7 +2503,8 @@
 **
 ** Function         nfa_dm_disc_sm_listen_sleep
 **
-** Description      Processing discovery events in NFA_DM_RFST_LISTEN_SLEEP state
+** Description      Processing discovery events in NFA_DM_RFST_LISTEN_SLEEP
+**                  state
 **
 ** Returns          void
 **
diff --git a/src/nfa/dm/nfa_dm_main.c b/src/nfa/dm/nfa_dm_main.c
index 2d21f65..b7f15d9 100644
--- a/src/nfa/dm/nfa_dm_main.c
+++ b/src/nfa/dm/nfa_dm_main.c
@@ -142,7 +142,8 @@
 **
 ** Function         nfa_dm_sys_disable
 **
-** Description      This function is called after all subsystems have been disabled.
+** Description      This function is called after all subsystems have been
+**                  disabled.
 **
 ** Returns          void
 **
@@ -199,7 +200,8 @@
 ** Description      check if all modules of NFA is done with enable process and
 **                  NFA is not restoring NFCC.
 **
-** Returns          TRUE, if NFA_DM_ENABLE_EVT is reported and it is not restoring NFCC
+** Returns          TRUE, if NFA_DM_ENABLE_EVT is reported and it is not
+**                  restoring NFCC
 **
 *******************************************************************************/
 bool    nfa_dm_is_active (void)
diff --git a/src/nfa/dm/nfa_dm_ndef.c b/src/nfa/dm/nfa_dm_ndef.c
index 55c6a82..7877d91 100644
--- a/src/nfa/dm/nfa_dm_ndef.c
+++ b/src/nfa/dm/nfa_dm_ndef.c
@@ -182,7 +182,8 @@
         NFA_TRACE_DEBUG1 ("NDEF handler successfully registered. Handle=0x%08x", p_reg_info->ndef_type_handle);
         (*(p_reg_info->p_ndef_cback)) (NFA_NDEF_REGISTER_EVT, (tNFA_NDEF_EVT_DATA *) &ndef_register);
 
-        return false;       /* indicate that we will free message buffer when type_handler is deregistered */
+        /* indicate that we will free message buffer when type_handler is deregistered */
+        return false;
     }
     else
     {
@@ -385,7 +386,8 @@
     /* If in exclusive RF mode is activer, then route NDEF message callback registered with NFA_StartExclusiveRfControl */
     if ((p_cb->flags & NFA_DM_FLAGS_EXCL_RF_ACTIVE) && (p_cb->p_excl_ndef_cback))
     {
-        ndef_data.ndef_type_handle = 0;     /* No ndef-handler handle, since this callback is not from RegisterNDefHandler */
+        /* No ndef-handler handle, since this callback is not from RegisterNDefHandler */
+        ndef_data.ndef_type_handle = 0;
         ndef_data.p_data = p_msg_buf;
         ndef_data.len = len;
         (*p_cb->p_excl_ndef_cback) (NFA_NDEF_DATA_EVT, (tNFA_NDEF_EVT_DATA *) &ndef_data);
diff --git a/src/nfa/ee/nfa_ee_act.c b/src/nfa/ee/nfa_ee_act.c
index da4b548..7cb0c45 100644
--- a/src/nfa/ee/nfa_ee_act.c
+++ b/src/nfa/ee/nfa_ee_act.c
@@ -692,7 +692,8 @@
         }
         else if (p_cb->aid_entries < NFA_EE_MAX_AID_ENTRIES)
         {
-            new_size = nfa_ee_total_lmrt_size() + 4 + p_add->aid_len; /* 4 = 1 (tag) + 1 (len) + 1(nfcee_id) + 1(power cfg) */
+            /* 4 = 1 (tag) + 1 (len) + 1(nfcee_id) + 1(power cfg) */
+            new_size = nfa_ee_total_lmrt_size() + 4 + p_add->aid_len;
             if (new_size > NFC_GetLmrtSize())
             {
                 NFA_TRACE_ERROR1 ("Exceed LMRT size:%d", new_size);
@@ -1827,8 +1828,8 @@
 **
 ** Function         nfa_ee_get_tech_route
 **
-** Description      Given a power state, find the technology routing destination.
-**                  The result is filled in the given p_handles
+** Description      Given a power state, find the technology routing
+**                  destination. The result is filled in the given p_handles
 **                  in the order of A, B, F, Bprime
 **
 ** Returns          None
@@ -1882,7 +1883,8 @@
 ** Function         nfa_ee_check_set_routing
 **
 ** Description      If the new size exceeds the capacity of next block,
-**                  send the routing command now and reset the related parameters
+**                  send the routing command now and reset the related
+**                  parameters.
 **
 ** Returns          void
 **
@@ -2009,7 +2011,8 @@
         start_offset = 0;
         for (xx = 0; xx < p_cb->aid_entries; xx++)
         {
-            p_start     = pp; /* rememebr the beginning of this AID routing entry, just in case we need to put it in next command */
+            /* rememebr the beginning of this AID routing entry, just in case we need to put it in next command */
+            p_start     = pp;
             /* add one AID entry */
             if (p_cb->aid_rt_info[xx] & NFA_EE_AE_ROUTE)
             {
@@ -2106,23 +2109,25 @@
 ** Description      Check if any API function to configure the routing table or
 **                  VS is called since last update
 **
-**                  The algorithm for the NFCEE configuration handling is as follows:
+**                  The algorithm for the NFCEE configuration handling is as
+**                  follows:
 **
 **                  Each NFCEE_ID/DH has its own control block - tNFA_EE_ECB
 **                  Each control block uses ecb_flags to keep track if an API
-**                  that changes routing/VS is invoked.
-**                  This ecb_flags is cleared at the end of nfa_ee_update_rout().
+**                  that changes routing/VS is invoked. This ecb_flags is
+**                  cleared at the end of nfa_ee_update_rout().
 **
 **                  nfa_ee_cb.ee_cfged is the bitmask of the control blocks with
 **                  routing/VS configuration and NFA_EE_CFGED_UPDATE_NOW.
-**                  nfa_ee_cb.ee_cfged is cleared and re-calculated at the end of
-**                  nfa_ee_update_rout().
+**                  nfa_ee_cb.ee_cfged is cleared and re-calculated at the end
+**                  of nfa_ee_update_rout().
 **
-**                  nfa_ee_cb.ee_cfg_sts is used to check is any status is changed
-**                  and the associated command is issued to NFCC.
-**                  nfa_ee_cb.ee_cfg_sts is AND with NFA_EE_STS_PREV at the end of
-**                  nfa_ee_update_rout() to clear the NFA_EE_STS_CHANGED bits
-**                  (except NFA_EE_STS_CHANGED_CANNED_VS is cleared in nfa_ee_vs_cback)
+**                  nfa_ee_cb.ee_cfg_sts is used to check is any status is
+**                  changed and the associated command is issued to NFCC.
+**                  nfa_ee_cb.ee_cfg_sts is AND with NFA_EE_STS_PREV at the end
+**                  of nfa_ee_update_rout() to clear the NFA_EE_STS_CHANGED bits
+**                  (except NFA_EE_STS_CHANGED_CANNED_VS is cleared in
+**                  nfa_ee_vs_cback)
 **
 ** Returns          TRUE if any configuration is changed
 **
diff --git a/src/nfa/ee/nfa_ee_api.c b/src/nfa/ee/nfa_ee_api.c
index 9cd4170..3ffb814 100644
--- a/src/nfa/ee/nfa_ee_api.c
+++ b/src/nfa/ee/nfa_ee_api.c
@@ -218,10 +218,11 @@
 **
 ** Function         NFA_EeModeSet
 **
-** Description      This function is called to activate (mode = NFA_EE_MD_ACTIVATE)
-**                  or deactivate (mode = NFA_EE_MD_DEACTIVATE) the NFCEE
-**                  identified by the given ee_handle. The result of this
-**                  operation is reported with the NFA_EE_MODE_SET_EVT.
+** Description      This function is called to activate
+**                  (mode = NFA_EE_MD_ACTIVATE) or deactivate
+**                  (mode = NFA_EE_MD_DEACTIVATE) the NFCEE identified by the
+**                  given ee_handle. The result of this operation is reported
+**                  with the NFA_EE_MODE_SET_EVT.
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
@@ -279,11 +280,12 @@
 **                  routing table for the given ee_handle. The status of this
 **                  operation is reported as the NFA_EE_SET_TECH_CFG_EVT.
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
-** Note:            NFA_EeUpdateNow() should be called after last NFA-EE function
-**                  to change the listen mode routing is called.
+** Note:            NFA_EeUpdateNow() should be called after last NFA-EE
+**                  function to change the listen mode routing is called.
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
@@ -335,11 +337,12 @@
 **                  table for the given ee_handle. The status of this
 **                  operation is reported as the NFA_EE_SET_PROTO_CFG_EVT.
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
-** Note:            NFA_EeUpdateNow() should be called after last NFA-EE function
-**                  to change the listen mode routing is called.
+** Note:            NFA_EeUpdateNow() should be called after last NFA-EE
+**                  function to change the listen mode routing is called.
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
@@ -390,11 +393,12 @@
 **                  listen mode routing table in NFCC. The status of this
 **                  operation is reported as the NFA_EE_ADD_AID_EVT.
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
-** Note:            NFA_EeUpdateNow() should be called after last NFA-EE function
-**                  to change the listen mode routing is called.
+** Note:            NFA_EeUpdateNow() should be called after last NFA-EE
+**                  function to change the listen mode routing is called.
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
@@ -445,16 +449,17 @@
 **
 ** Function         NFA_EeRemoveAidRouting
 **
-** Description      This function is called to remove the given AID entry from the
-**                  listen mode routing table. If the entry configures VS,
+** Description      This function is called to remove the given AID entry from
+**                  the listen mode routing table. If the entry configures VS,
 **                  it is also removed. The status of this operation is reported
 **                  as the NFA_EE_REMOVE_AID_EVT.
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
-** Note:            NFA_EeUpdateNow() should be called after last NFA-EE function
-**                  to change the listen mode routing is called.
+** Note:            NFA_EeUpdateNow() should be called after last NFA-EE
+**                  function to change the listen mode routing is called.
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
@@ -522,8 +527,8 @@
 ** Function         NFA_EeUpdateNow
 **
 ** Description      This function is called to send the current listen mode
-**                  routing table and VS configuration to the NFCC (without waiting
-**                  for NFA_EE_ROUT_TIMEOUT_VAL).
+**                  routing table and VS configuration to the NFCC (without
+**                  waiting for NFA_EE_ROUT_TIMEOUT_VAL).
 **
 **                  The status of this operation is
 **                  reported with the NFA_EE_UPDATED_EVT.
@@ -609,8 +614,9 @@
 ** Function         NFA_EeSendData
 **
 ** Description      Send data to the given NFCEE.
-**                  This function shall be called after NFA_EE_CONNECT_EVT is reported
-**                  and before NFA_EeDisconnect is called on the given ee_handle.
+**                  This function shall be called after NFA_EE_CONNECT_EVT is
+**                  reported and before NFA_EeDisconnect is called on the given
+**                  ee_handle.
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
diff --git a/src/nfa/ee/nfa_ee_main.c b/src/nfa/ee/nfa_ee_main.c
index 33df9cb..35fa54c 100644
--- a/src/nfa/ee/nfa_ee_main.c
+++ b/src/nfa/ee/nfa_ee_main.c
@@ -368,7 +368,8 @@
 **
 ** Function         nfa_ee_ecb_to_mask
 **
-** Description      Given a ecb, return the bit mask to be used in nfa_ee_cb.ee_cfged
+** Description      Given a ecb, return the bit mask to be used in
+**                  nfa_ee_cb.ee_cfged
 **
 ** Returns          the bitmask for the given ecb.
 **
diff --git a/src/nfa/hci/nfa_hci_api.c b/src/nfa/hci/nfa_hci_api.c
index d7f9183..504ec75 100644
--- a/src/nfa/hci/nfa_hci_api.c
+++ b/src/nfa/hci/nfa_hci_api.c
@@ -36,11 +36,12 @@
 **
 ** Description      This function will register an application with hci and
 **                  returns an application handle and provides a mechanism to
-**                  register a callback with HCI to receive NFA HCI event notification.
-**                  When the application is registered (or if an error occurs),
-**                  the app will be notified with NFA_HCI_REGISTER_EVT. Previous
-**                  session information including allocated gates, created pipes
-**                  and pipes states will be returned as part of tNFA_HCI_REGISTER data.
+**                  register a callback with HCI to receive NFA HCI event
+**                  notification. When the application is registered (or if an
+**                  error occurs), the app will be notified with
+**                  NFA_HCI_REGISTER_EVT. Previous session information including
+**                  allocated gates, created pipes and pipes states will be
+**                  returned as part of tNFA_HCI_REGISTER data.
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
@@ -136,12 +137,13 @@
 **
 ** Description      This function is called to deregister an application
 **                  from HCI. The app will be notified by NFA_HCI_DEREGISTER_EVT
-**                  after deleting all the pipes owned by the app and deallocating
-**                  all the gates allocated to the app or if an error occurs.
-**                  Even if deregistration fails, the app has to register again
-**                  to provide a new cback function.
+**                  after deleting all the pipes owned by the app and
+**                  deallocating all the gates allocated to the app or if an
+**                  error occurs. Even if deregistration fails, the app has to
+**                  register again to provide a new cback function.
 **
-** Returns          NFA_STATUS_OK if the application is deregistered successfully
+** Returns          NFA_STATUS_OK if the application is deregistered
+**                  successfully
 **                  NFA_STATUS_FAILED otherwise
 
 *******************************************************************************/
@@ -202,8 +204,9 @@
 **                  for a particular service to other host or to establish
 **                  communication with other host. When the gate is
 **                  allocated (or if an error occurs), the app will be notified
-**                  with NFA_HCI_ALLOCATE_GATE_EVT with the gate id. The allocated
-**                  Gate information will be stored in non volatile memory.
+**                  with NFA_HCI_ALLOCATE_GATE_EVT with the gate id. The
+**                  allocated Gate information will be stored in non volatile
+**                  memory.
 **
 ** Returns          NFA_STATUS_OK if this API started
 **                  NFA_STATUS_FAILED if no generic gate is available
@@ -878,9 +881,10 @@
 ** Function         NFA_HciAddStaticPipe
 **
 ** Description      This function is called to add a static pipe for sending
-**                  7816 APDUs. When the static pipe is added (or if an error occurs),
-**                  the app will be notified with NFA_HCI_ADD_STATIC_PIPE_EVT with
-**                  the status.
+**                  7816 APDUs. When the static pipe is added (or if an error
+**                  occurs), the app will be notified with
+**                  NFA_HCI_ADD_STATIC_PIPE_EVT with the status.
+**
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
 **
diff --git a/src/nfa/include/nfa_api.h b/src/nfa/include/nfa_api.h
index d12e355..484fad0 100644
--- a/src/nfa/include/nfa_api.h
+++ b/src/nfa/include/nfa_api.h
@@ -44,38 +44,69 @@
 #define NFA_MIN_AID_LEN     5 /* per NCI specification */
 
 /* NFA API return status codes */
-#define NFA_STATUS_OK                   NCI_STATUS_OK                   /* Command succeeded    */
-#define NFA_STATUS_REJECTED             NCI_STATUS_REJECTED             /* Command is rejected. */
-#define NFA_STATUS_MSG_CORRUPTED        NCI_STATUS_MESSAGE_CORRUPTED    /* Message is corrupted */
-#define NFA_STATUS_BUFFER_FULL          NCI_STATUS_BUFFER_FULL          /* buffer full          */
-#define NFA_STATUS_FAILED               NCI_STATUS_FAILED               /* failed               */
-#define NFA_STATUS_NOT_INITIALIZED      NCI_STATUS_NOT_INITIALIZED      /* not initialized      */
-#define NFA_STATUS_SYNTAX_ERROR         NCI_STATUS_SYNTAX_ERROR         /* Syntax error         */
-#define NFA_STATUS_SEMANTIC_ERROR       NCI_STATUS_SEMANTIC_ERROR       /* Semantic error       */
-#define NFA_STATUS_UNKNOWN_GID          NCI_STATUS_UNKNOWN_GID          /* Unknown NCI Group ID */
-#define NFA_STATUS_UNKNOWN_OID          NCI_STATUS_UNKNOWN_OID          /* Unknown NCI Opcode   */
-#define NFA_STATUS_INVALID_PARAM        NCI_STATUS_INVALID_PARAM        /* Invalid Parameter    */
-#define NFA_STATUS_MSG_SIZE_TOO_BIG     NCI_STATUS_MSG_SIZE_TOO_BIG     /* Message size too big */
-#define NFA_STATUS_ALREADY_STARTED      NCI_STATUS_ALREADY_STARTED      /* Already started      */
-#define NFA_STATUS_ACTIVATION_FAILED    NCI_STATUS_ACTIVATION_FAILED    /* Activation Failed    */
-#define NFA_STATUS_TEAR_DOWN            NCI_STATUS_TEAR_DOWN            /* Tear Down Error      */
-#define NFA_STATUS_RF_TRANSMISSION_ERR  NCI_STATUS_RF_TRANSMISSION_ERR  /* RF transmission error*/
-#define NFA_STATUS_RF_PROTOCOL_ERR      NCI_STATUS_RF_PROTOCOL_ERR      /* RF protocol error    */
-#define NFA_STATUS_TIMEOUT              NCI_STATUS_TIMEOUT              /* RF Timeout           */
-#define NFA_STATUS_EE_INTF_ACTIVE_FAIL  NCI_STATUS_EE_INTF_ACTIVE_FAIL  /* EE Intf activate err */
-#define NFA_STATUS_EE_TRANSMISSION_ERR  NCI_STATUS_EE_TRANSMISSION_ERR  /* EE transmission error*/
-#define NFA_STATUS_EE_PROTOCOL_ERR      NCI_STATUS_EE_PROTOCOL_ERR      /* EE protocol error    */
-#define NFA_STATUS_EE_TIMEOUT           NCI_STATUS_EE_TIMEOUT           /* EE Timeout           */
+/* Command succeeded    */
+#define NFA_STATUS_OK                   NCI_STATUS_OK
+/* Command is rejected. */
+#define NFA_STATUS_REJECTED             NCI_STATUS_REJECTED
+/* Message is corrupted */
+#define NFA_STATUS_MSG_CORRUPTED        NCI_STATUS_MESSAGE_CORRUPTED
+/* buffer full          */
+#define NFA_STATUS_BUFFER_FULL          NCI_STATUS_BUFFER_FULL
+/* failed               */
+#define NFA_STATUS_FAILED               NCI_STATUS_FAILED
+/* not initialized      */
+#define NFA_STATUS_NOT_INITIALIZED      NCI_STATUS_NOT_INITIALIZED
+/* Syntax error         */
+#define NFA_STATUS_SYNTAX_ERROR         NCI_STATUS_SYNTAX_ERROR
+/* Semantic error       */
+#define NFA_STATUS_SEMANTIC_ERROR       NCI_STATUS_SEMANTIC_ERROR
+/* Unknown NCI Group ID */
+#define NFA_STATUS_UNKNOWN_GID          NCI_STATUS_UNKNOWN_GID
+/* Unknown NCI Opcode   */
+#define NFA_STATUS_UNKNOWN_OID          NCI_STATUS_UNKNOWN_OID
+/* Invalid Parameter    */
+#define NFA_STATUS_INVALID_PARAM        NCI_STATUS_INVALID_PARAM
+/* Message size too big */
+#define NFA_STATUS_MSG_SIZE_TOO_BIG     NCI_STATUS_MSG_SIZE_TOO_BIG
+/* Already started      */
+#define NFA_STATUS_ALREADY_STARTED      NCI_STATUS_ALREADY_STARTED
+/* Activation Failed    */
+#define NFA_STATUS_ACTIVATION_FAILED    NCI_STATUS_ACTIVATION_FAILED
+/* Tear Down Error      */
+#define NFA_STATUS_TEAR_DOWN            NCI_STATUS_TEAR_DOWN
+/* RF transmission error*/
+#define NFA_STATUS_RF_TRANSMISSION_ERR  NCI_STATUS_RF_TRANSMISSION_ERR
+/* RF protocol error    */
+#define NFA_STATUS_RF_PROTOCOL_ERR      NCI_STATUS_RF_PROTOCOL_ERR
+/* RF Timeout           */
+#define NFA_STATUS_TIMEOUT              NCI_STATUS_TIMEOUT
+/* EE Intf activate err */
+#define NFA_STATUS_EE_INTF_ACTIVE_FAIL  NCI_STATUS_EE_INTF_ACTIVE_FAIL
+/* EE transmission error*/
+#define NFA_STATUS_EE_TRANSMISSION_ERR  NCI_STATUS_EE_TRANSMISSION_ERR
+/* EE protocol error    */
+#define NFA_STATUS_EE_PROTOCOL_ERR      NCI_STATUS_EE_PROTOCOL_ERR
+/* EE Timeout           */
+#define NFA_STATUS_EE_TIMEOUT           NCI_STATUS_EE_TIMEOUT
 
-#define NFA_STATUS_CMD_STARTED          NFC_STATUS_CMD_STARTED    /* Command started successfully                     */
-#define NFA_STATUS_HW_TIMEOUT           NFC_STATUS_HW_TIMEOUT     /* NFCC Timeout in responding to an NCI command     */
-#define NFA_STATUS_CONTINUE             NFC_STATUS_CONTINUE       /* More NFA_CE_GET_ROUTING_REVT to follow           */
-#define NFA_STATUS_REFUSED              NFC_STATUS_REFUSED        /* API is called to perform illegal function        */
-#define NFA_STATUS_BAD_RESP             NFC_STATUS_BAD_RESP       /* Wrong format of R-APDU, CC file or NDEF file     */
-#define NFA_STATUS_CMD_NOT_CMPLTD       NFC_STATUS_CMD_NOT_CMPLTD /* 7816 Status Word is not command complete(0x9000) */
-#define NFA_STATUS_NO_BUFFERS           NFC_STATUS_NO_BUFFERS     /* Out of GKI buffers                               */
-#define NFA_STATUS_WRONG_PROTOCOL       NFC_STATUS_WRONG_PROTOCOL /* Protocol mismatch between API and activated one  */
-#define NFA_STATUS_BUSY                 NFC_STATUS_BUSY           /* Another Tag command is already in progress       */
+/* Command started successfully */
+#define NFA_STATUS_CMD_STARTED          NFC_STATUS_CMD_STARTED
+/* NFCC Timeout in responding to an NCI command */
+#define NFA_STATUS_HW_TIMEOUT           NFC_STATUS_HW_TIMEOUT
+/* More NFA_CE_GET_ROUTING_REVT to follow */
+#define NFA_STATUS_CONTINUE             NFC_STATUS_CONTINUE
+/* API is called to perform illegal function */
+#define NFA_STATUS_REFUSED              NFC_STATUS_REFUSED
+/* Wrong format of R-APDU, CC file or NDEF file */
+#define NFA_STATUS_BAD_RESP             NFC_STATUS_BAD_RESP
+/* 7816 Status Word is not command complete(0x9000) */
+#define NFA_STATUS_CMD_NOT_CMPLTD       NFC_STATUS_CMD_NOT_CMPLTD
+/* Out of GKI buffers */
+#define NFA_STATUS_NO_BUFFERS           NFC_STATUS_NO_BUFFERS
+/* Protocol mismatch between API and activated one */
+#define NFA_STATUS_WRONG_PROTOCOL       NFC_STATUS_WRONG_PROTOCOL
+/* Another Tag command is already in progress */
+#define NFA_STATUS_BUSY                 NFC_STATUS_BUSY
 
 #define NFA_STATUS_BAD_LENGTH           NFC_STATUS_BAD_LENGTH     /* data len exceeds MIU                             */
 #define NFA_STATUS_BAD_HANDLE           NFC_STATUS_BAD_HANDLE     /* invalid handle                                   */
@@ -115,11 +146,16 @@
 typedef uint8_t tNFA_TECHNOLOGY_MASK;
 
 /* Definitions for NFC protocol for RW, CE and P2P APIs */
-#define NFA_PROTOCOL_T1T        NFC_PROTOCOL_T1T        /* Type1Tag         - NFC-A             */
-#define NFA_PROTOCOL_T2T        NFC_PROTOCOL_T2T        /* MIFARE/Type2Tag  - NFC-A             */
-#define NFA_PROTOCOL_T3T        NFC_PROTOCOL_T3T        /* Felica/Type3Tag  - NFC-F             */
-#define NFA_PROTOCOL_ISO_DEP    NFC_PROTOCOL_ISO_DEP    /* Type 4A,4B       - NFC-A or NFC-B    */
-#define NFA_PROTOCOL_NFC_DEP    NFC_PROTOCOL_NFC_DEP    /* NFCDEP/LLCP      - NFC-A or NFC-F    */
+/* Type1Tag - NFC-A */
+#define NFA_PROTOCOL_T1T        NFC_PROTOCOL_T1T
+/* MIFARE/Type2Tag - NFC-A */
+#define NFA_PROTOCOL_T2T        NFC_PROTOCOL_T2T
+/* Felica/Type3Tag - NFC-F */
+#define NFA_PROTOCOL_T3T        NFC_PROTOCOL_T3T
+/* Type 4A,4B - NFC-A or NFC-B */
+#define NFA_PROTOCOL_ISO_DEP    NFC_PROTOCOL_ISO_DEP
+/* NFCDEP/LLCP - NFC-A or NFC-F */
+#define NFA_PROTOCOL_NFC_DEP    NFC_PROTOCOL_NFC_DEP
 #define NFA_PROTOCOL_ISO15693   NFC_PROTOCOL_15693
 #define NFA_PROTOCOL_B_PRIME    NFC_PROTOCOL_B_PRIME
 #define NFA_PROTOCOL_KOVIO      NFC_PROTOCOL_KOVIO
@@ -153,14 +189,22 @@
 #define NFA_T1T_CMD_UID_LEN         T1T_CMD_UID_LEN /* UID len for T1T cmds     */
 #define NFA_T2T_UID_LEN             T2T_UID_LEN     /* T2T UID length           */
 
-#define NFA_RW_NDEF_FL_READ_ONLY        RW_NDEF_FL_READ_ONLY     /* Tag is read only              */
-#define NFA_RW_NDEF_FL_FORMATED         RW_NDEF_FL_FORMATED      /* Tag formated for NDEF         */
-#define NFA_RW_NDEF_FL_SUPPORTED        RW_NDEF_FL_SUPPORTED     /* NDEF supported by the tag     */
-#define NFA_RW_NDEF_FL_UNKNOWN          RW_NDEF_FL_UNKNOWN       /* Unable to find if tag is ndef capable/formated/read only */
-#define NFA_RW_NDEF_FL_FORMATABLE       RW_NDEF_FL_FORMATABLE    /* Tag supports format operation */
-#define NFA_RW_NDEF_FL_SOFT_LOCKABLE    RW_NDEF_FL_SOFT_LOCKABLE /* Tag can be soft locked */
-#define NFA_RW_NDEF_FL_HARD_LOCKABLE    RW_NDEF_FL_HARD_LOCKABLE /* Tag can be hard locked */
-#define NFA_RW_NDEF_FL_OTP              RW_NDEF_FL_OTP           /* Tag is one time programmable */
+/* Tag is read only */
+#define NFA_RW_NDEF_FL_READ_ONLY        RW_NDEF_FL_READ_ONLY
+/* Tag formated for NDEF */
+#define NFA_RW_NDEF_FL_FORMATED         RW_NDEF_FL_FORMATED
+/* NDEF supported by the tag */
+#define NFA_RW_NDEF_FL_SUPPORTED        RW_NDEF_FL_SUPPORTED
+/* Unable to find if tag is ndef capable/formated/read only */
+#define NFA_RW_NDEF_FL_UNKNOWN          RW_NDEF_FL_UNKNOWN
+/* Tag supports format operation */
+#define NFA_RW_NDEF_FL_FORMATABLE       RW_NDEF_FL_FORMATABLE
+/* Tag can be soft locked */
+#define NFA_RW_NDEF_FL_SOFT_LOCKABLE    RW_NDEF_FL_SOFT_LOCKABLE
+/* Tag can be hard locked */
+#define NFA_RW_NDEF_FL_HARD_LOCKABLE    RW_NDEF_FL_HARD_LOCKABLE
+/* Tag is one time programmable */
+#define NFA_RW_NDEF_FL_OTP              RW_NDEF_FL_OTP
 
 typedef uint8_t tNFA_RW_NDEF_FLAG;
 
@@ -188,8 +232,9 @@
 /* Data for NFA_DM_PWR_MODE_CHANGE_EVT */
 typedef struct
 {
-    tNFA_STATUS         status;        /* NFA_STATUS_OK if successful                       */
-    tNFA_DM_PWR_MODE    power_mode;    /* NFA_DM_PWR_MODE_FULL or NFA_DM_PWR_MODE_OFF_SLEEP */
+    tNFA_STATUS         status;        /* NFA_STATUS_OK if successful */
+    /* NFA_DM_PWR_MODE_FULL or NFA_DM_PWR_MODE_OFF_SLEEP */
+    tNFA_DM_PWR_MODE    power_mode;
 } tNFA_DM_PWR_MODE_CHANGE;
 
 /* Data for NFA_DM_RF_FIELD_EVT */
@@ -199,7 +244,8 @@
 typedef struct
 {
     tNFA_STATUS     status;         /* NFA_STATUS_OK if successful  */
-    uint8_t         rf_field_status;/* NFA_DM_RF_FIELD_ON if operating field generated by remote */
+    /* NFA_DM_RF_FIELD_ON if operating field generated by remote */
+    uint8_t         rf_field_status;
 } tNFA_DM_RF_FIELD;
 
 /* Union of all DM callback structures */
@@ -218,46 +264,58 @@
 
 
 /* NFA Connection Callback Events */
-#define NFA_POLL_ENABLED_EVT                    0   /* Polling enabled event                        */
-#define NFA_POLL_DISABLED_EVT                   1   /* Polling disabled event                       */
-#define NFA_DISC_RESULT_EVT                     2   /* NFC link/protocol discovery notificaiton     */
-#define NFA_SELECT_RESULT_EVT                   3   /* NFC link/protocol discovery select response  */
-#define NFA_DEACTIVATE_FAIL_EVT                 4   /* NFA_Deactivate failure                       */
-#define NFA_ACTIVATED_EVT                       5   /* NFC link/protocol activated                  */
-#define NFA_DEACTIVATED_EVT                     6   /* NFC link/protocol deactivated                */
-#define NFA_TLV_DETECT_EVT                      7   /* TLV Detection complete                       */
-#define NFA_NDEF_DETECT_EVT                     8   /* NDEF Detection complete                      */
-#define NFA_DATA_EVT                            9   /* Data message received                        */
-#define NFA_SELECT_CPLT_EVT                     10  /* Select completed                             */
-#define NFA_READ_CPLT_EVT                       11  /* Read completed                               */
-#define NFA_WRITE_CPLT_EVT                      12  /* Write completed                              */
-#define NFA_LLCP_ACTIVATED_EVT                  13  /* LLCP link is activated                       */
-#define NFA_LLCP_DEACTIVATED_EVT                14  /* LLCP link is deactivated                     */
-#define NFA_PRESENCE_CHECK_EVT                  15  /* Response to NFA_RwPresenceCheck              */
-#define NFA_FORMAT_CPLT_EVT                     16  /* Tag Formating completed                      */
-#define NFA_I93_CMD_CPLT_EVT                    17  /* ISO 15693 command completed                  */
-#define NFA_SET_TAG_RO_EVT                      18  /* Tag set as Read only                         */
-#define NFA_EXCLUSIVE_RF_CONTROL_STARTED_EVT    19  /* Result for NFA_RequestExclusiveRfControl     */
-#define NFA_EXCLUSIVE_RF_CONTROL_STOPPED_EVT    20  /* Result for NFA_ReleaseExclusiveRfControl     */
-#define NFA_CE_REGISTERED_EVT                   21  /* DH Card emulation: AID or System code reg'd  */
-#define NFA_CE_DEREGISTERED_EVT                 22  /* DH Card emulation: AID or System code dereg'd*/
-#define NFA_CE_DATA_EVT                         23  /* DH Card emulation: data received event       */
-#define NFA_CE_ACTIVATED_EVT                    24  /* DH Card emulation: activation event          */
-#define NFA_CE_DEACTIVATED_EVT                  25  /* DH Card emulation: deactivation event        */
-#define NFA_CE_LOCAL_TAG_CONFIGURED_EVT         26  /* DH Card emulation: local NDEF configured     */
-#define NFA_CE_NDEF_WRITE_START_EVT             27  /* DH Card emulation: NDEF write started        */
-#define NFA_CE_NDEF_WRITE_CPLT_EVT              28  /* DH Card emulation: NDEF write completed      */
-#define NFA_CE_UICC_LISTEN_CONFIGURED_EVT       29  /* UICC Listen configured                       */
-#define NFA_RF_DISCOVERY_STARTED_EVT            30  /* RF Discovery started event                   */
-#define NFA_RF_DISCOVERY_STOPPED_EVT            31  /* RF Discovery stopped event                   */
-#define NFA_UPDATE_RF_PARAM_RESULT_EVT          32  /* status of updating RF communication paramters*/
-#define NFA_SET_P2P_LISTEN_TECH_EVT             33  /* status of setting P2P listen technologies    */
-#define NFA_RW_INTF_ERROR_EVT                   34  /* RF Interface error event                     */
-#define NFA_LLCP_FIRST_PACKET_RECEIVED_EVT      35  /* First packet received over LLCP link         */
-#define NFA_LISTEN_ENABLED_EVT                  36  /* Listening enabled event                      */
-#define NFA_LISTEN_DISABLED_EVT                 37  /* Listening disabled event                     */
-#define NFA_P2P_PAUSED_EVT                      38  /* P2P services paused event                    */
-#define NFA_P2P_RESUMED_EVT                     39  /* P2P services resumed event                   */
+#define NFA_POLL_ENABLED_EVT                    0   /* Polling enabled event */
+#define NFA_POLL_DISABLED_EVT                   1   /* Polling disabled event */
+/* NFC link/protocol discovery notificaiton */
+#define NFA_DISC_RESULT_EVT                     2
+/* NFC link/protocol discovery select response */
+#define NFA_SELECT_RESULT_EVT                   3
+#define NFA_DEACTIVATE_FAIL_EVT                 4   /* NFA_Deactivate failure */
+#define NFA_ACTIVATED_EVT                       5   /* NFC link/protocol activated */
+#define NFA_DEACTIVATED_EVT                     6   /* NFC link/protocol deactivated */
+#define NFA_TLV_DETECT_EVT                      7   /* TLV Detection complete */
+#define NFA_NDEF_DETECT_EVT                     8   /* NDEF Detection complete */
+#define NFA_DATA_EVT                            9   /* Data message received */
+#define NFA_SELECT_CPLT_EVT                     10  /* Select completed */
+#define NFA_READ_CPLT_EVT                       11  /* Read completed */
+#define NFA_WRITE_CPLT_EVT                      12  /* Write completed */
+#define NFA_LLCP_ACTIVATED_EVT                  13  /* LLCP link is activated */
+#define NFA_LLCP_DEACTIVATED_EVT                14  /* LLCP link is deactivated */
+#define NFA_PRESENCE_CHECK_EVT                  15  /* Response to NFA_RwPresenceCheck */
+#define NFA_FORMAT_CPLT_EVT                     16  /* Tag Formating completed */
+#define NFA_I93_CMD_CPLT_EVT                    17  /* ISO 15693 command completed */
+#define NFA_SET_TAG_RO_EVT                      18  /* Tag set as Read only */
+/* Result for NFA_RequestExclusiveRfControl */
+#define NFA_EXCLUSIVE_RF_CONTROL_STARTED_EVT    19
+/* Result for NFA_ReleaseExclusiveRfControl */
+#define NFA_EXCLUSIVE_RF_CONTROL_STOPPED_EVT    20
+/* DH Card emulation: AID or System code reg'd  */
+#define NFA_CE_REGISTERED_EVT                   21
+/* DH Card emulation: AID or System code dereg'd */
+#define NFA_CE_DEREGISTERED_EVT                 22
+#define NFA_CE_DATA_EVT                         23  /* DH Card emulation: data received event */
+#define NFA_CE_ACTIVATED_EVT                    24  /* DH Card emulation: activation event */
+#define NFA_CE_DEACTIVATED_EVT                  25  /* DH Card emulation: deactivation event */
+/* DH Card emulation: local NDEF configured */
+#define NFA_CE_LOCAL_TAG_CONFIGURED_EVT         26
+/* DH Card emulation: NDEF write started */
+#define NFA_CE_NDEF_WRITE_START_EVT             27
+/* DH Card emulation: NDEF write completed */
+#define NFA_CE_NDEF_WRITE_CPLT_EVT              28
+#define NFA_CE_UICC_LISTEN_CONFIGURED_EVT       29  /* UICC Listen configured */
+#define NFA_RF_DISCOVERY_STARTED_EVT            30  /* RF Discovery started event */
+#define NFA_RF_DISCOVERY_STOPPED_EVT            31  /* RF Discovery stopped event */
+/* status of updating RF communication paramters */
+#define NFA_UPDATE_RF_PARAM_RESULT_EVT          32
+#define NFA_RW_INTF_ERROR_EVT                   34  /* RF Interface error event */
+/* status of setting P2P listen technologies */
+#define NFA_SET_P2P_LISTEN_TECH_EVT             33
+/* First packet received over LLCP link */
+#define NFA_LLCP_FIRST_PACKET_RECEIVED_EVT      35
+#define NFA_LISTEN_ENABLED_EVT                  36  /* Listening enabled event */
+#define NFA_LISTEN_DISABLED_EVT                 37  /* Listening disabled event */
+#define NFA_P2P_PAUSED_EVT                      38  /* P2P services paused event */
+#define NFA_P2P_RESUMED_EVT                     39  /* P2P services resumed event */
 
 /* NFC deactivation type */
 #define NFA_DEACTIVATE_TYPE_IDLE        NFC_DEACTIVATE_TYPE_IDLE
@@ -319,7 +377,8 @@
 /* Data for NFA_DEACTIVATED_EVT */
 typedef struct
 {
-    tNFA_DEACTIVATE_TYPE type;          /* NFA_DEACTIVATE_TYPE_IDLE or NFA_DEACTIVATE_TYPE_SLEEP */
+    /* NFA_DEACTIVATE_TYPE_IDLE or NFA_DEACTIVATE_TYPE_SLEEP */
+    tNFA_DEACTIVATE_TYPE type;
 } tNFA_DEACTIVATED;
 
 /* Structure for NFA_NDEF_DETECT_EVT event data */
@@ -329,7 +388,8 @@
     tNFA_NFC_PROTOCOL   protocol;           /* protocol used to detect NDEF                             */
     uint32_t            max_size;           /* max number of bytes available for NDEF data              */
     uint32_t            cur_size;           /* current size of stored NDEF data (in bytes)              */
-    tNFA_RW_NDEF_FLAG   flags;              /* Flags to indicate NDEF capability, is formated, soft/hard lockable, formatable, otp and read only */
+    /* Flags to indicate NDEF capability, is formated, soft/hard lockable, formatable, otp and read only */
+    tNFA_RW_NDEF_FLAG   flags;
 } tNFA_NDEF_DETECT;
 
 
@@ -431,7 +491,8 @@
 typedef struct
 {
     tNFA_HANDLE         handle;         /* handle from NFA_CE_REGISTERED_EVT   */
-    tNFA_DEACTIVATE_TYPE type;          /* NFA_DEACTIVATE_TYPE_IDLE or NFA_DEACTIVATE_TYPE_SLEEP */
+    /* NFA_DEACTIVATE_TYPE_IDLE or NFA_DEACTIVATE_TYPE_SLEEP */
+    tNFA_DEACTIVATE_TYPE type;
 } tNFA_CE_DEACTIVATED;
 
 /* Structure for NFA_CE_DATA_EVT data */
@@ -502,27 +563,38 @@
 } tNFA_DM_DISC_FREQ_CFG;
 
 /* definitions for tNFA_DM_CFG.presence_check_option */
-#define NFA_DM_PCO_ISO_SLEEP_WAKE       0x01 /* if NDEF is not supported by the tag, use sleep/wake(last interface) */
-#define NFA_DM_PCO_EMPTY_I_BLOCK        0x02 /* NFA_SendRawFrame() has been used, use empty I block for presence check
-                                              * if this bit is not set, use read-binary on channel 3 for presence check */
+/* if NDEF is not supported by the tag, use sleep/wake(last interface) */
+#define NFA_DM_PCO_ISO_SLEEP_WAKE       0x01
+/* NFA_SendRawFrame() has been used, use empty I block for presence check
+ * if this bit is not set, use read-binary on channel 3 for presence check */
+#define NFA_DM_PCO_EMPTY_I_BLOCK        0x02
 
 /* compile-time configuration structure */
 typedef struct
 {
-    bool    auto_detect_ndef;           /* Automatic NDEF detection (when not in exclusive RF mode) */
-    bool    auto_read_ndef;             /* Automatic NDEF read (when not in exclusive RF mode)      */
-    bool    auto_presence_check;        /* Automatic presence check                                 */
-    uint8_t presence_check_option;      /* Use sleep/wake(last interface) for ISODEP presence check */
-    uint16_t  presence_check_timeout;     /* Maximum time to wait for presence check response         */
+    /* Automatic NDEF detection (when not in exclusive RF mode) */
+    bool    auto_detect_ndef;
+    /* Automatic NDEF read (when not in exclusive RF mode)      */
+    bool    auto_read_ndef;
+    /* Automatic presence check                                 */
+    bool    auto_presence_check;
+    /* Use sleep/wake(last interface) for ISODEP presence check */
+    uint8_t presence_check_option;
+    /* Maximum time to wait for presence check response         */
+    uint16_t  presence_check_timeout;
 } tNFA_DM_CFG;
 
 /* compile-time configuration structure for HCI */
 typedef struct
 {
-    uint16_t hci_netwk_enable_timeout; /* Maximum idle(no HCP Pkt) time to wait for EE DISC REQ Ntf(s) */
-    uint16_t hcp_response_timeout;     /* Maximum time to wait for EE DISC REQ NTF(s) after HOT PLUG EVT(s) */
-    uint8_t  num_whitelist_host;          /* Number of host in the whitelist of Terminal host */
-    uint8_t  *p_whitelist;                /* Whitelist of Terminal Host */
+    /* Maximum idle(no HCP Pkt) time to wait for EE DISC REQ Ntf(s) */
+    uint16_t hci_netwk_enable_timeout;
+    /* Maximum time to wait for EE DISC REQ NTF(s) after HOT PLUG EVT(s) */
+    uint16_t hcp_response_timeout;
+    /* Number of host in the whitelist of Terminal host */
+    uint8_t  num_whitelist_host;
+    /* Whitelist of Terminal Host */
+    uint8_t  *p_whitelist;
 } tNFA_HCI_CFG;
 
 /*
@@ -563,7 +635,8 @@
     bool    lf_enable;                          /* TRUE if listening F          */
     uint8_t lf_con_bitr_f;                      /* bit rate to listen           */
     uint8_t lf_protocol_type;                   /* Supported Protocols          */
-    uint16_t  lf_t3t_flags;                       /* bit field indicating which lf_t3t_identifier are enabled */
+    /* bit field indicating which lf_t3t_identifier are enabled */
+    uint16_t  lf_t3t_flags;
     uint8_t lf_t3t_identifier[NFA_LF_MAX_SC_NFCID2][NCI_SYSTEMCODE_LEN + NCI_NFCID2_LEN];
                                                 /* System Code and NFCID2       */
     uint8_t lf_t3t_pmm[NCI_T3T_PMM_LEN];        /* Bytes 10 - 17 in SENSF_RES   */
@@ -603,15 +676,24 @@
 *******************************************************************************/
 
 /* Definitions for tNFA_TNF (NDEF type name format ID) */
-#define NFA_TNF_EMPTY           NDEF_TNF_EMPTY      /* Empty or no type specified                       */
-#define NFA_TNF_WKT             NDEF_TNF_WKT        /* NFC Forum well-known type [NFC RTD]              */
-#define NFA_TNF_RFC2046_MEDIA   NDEF_TNF_MEDIA      /* Media-type as defined in RFC 2046 [RFC 2046]     */
-#define NFA_TNF_RFC3986_URI     NDEF_TNF_URI        /* Absolute URI as defined in RFC 3986 [RFC 3986]   */
-#define NFA_TNF_EXTERNAL        NDEF_TNF_EXT        /* NFC Forum external type [NFC RTD]                */
-#define NFA_TNF_UNKNOWN	        NDEF_TNF_UNKNOWN    /* Unknown                                          */
-#define NFA_TNF_UNCHANGED       NDEF_TNF_UNCHANGED  /* Unchanged                                        */
-#define NFA_TNF_RESERVED        NDEF_TNF_RESERVED   /* Reserved                                         */
-#define NFA_TNF_DEFAULT	        0xFF                /* Used to register default NDEF type handler       */
+/* Empty or no type specified                       */
+#define NFA_TNF_EMPTY           NDEF_TNF_EMPTY
+/* NFC Forum well-known type [NFC RTD]              */
+#define NFA_TNF_WKT             NDEF_TNF_WKT
+/* Media-type as defined in RFC 2046 [RFC 2046]     */
+#define NFA_TNF_RFC2046_MEDIA   NDEF_TNF_MEDIA
+/* Absolute URI as defined in RFC 3986 [RFC 3986]   */
+#define NFA_TNF_RFC3986_URI     NDEF_TNF_URI
+/* NFC Forum external type [NFC RTD]                */
+#define NFA_TNF_EXTERNAL        NDEF_TNF_EXT
+/* Unknown                                          */
+#define NFA_TNF_UNKNOWN	        NDEF_TNF_UNKNOWN
+/* Unchanged                                        */
+#define NFA_TNF_UNCHANGED       NDEF_TNF_UNCHANGED
+/* Reserved                                         */
+#define NFA_TNF_RESERVED        NDEF_TNF_RESERVED
+/* Used to register default NDEF type handler       */
+#define NFA_TNF_DEFAULT	        0xFF
 typedef uint8_t tNFA_TNF;
 
 /* Definitions for tNFA_NDEF_URI_ID (Frequently used prefixes. For additional values, see [NFC RTD URI] */
@@ -626,8 +708,10 @@
 typedef uint8_t tNFA_NDEF_URI_ID;
 
 /* Events for tNFA_NDEF_CBACK */
-#define NFA_NDEF_REGISTER_EVT   0   /* NDEF record type registered. (In response to NFA_RegisterNDefTypeHandler)    */
-#define NFA_NDEF_DATA_EVT	    1   /* Received an NDEF message with the registered type. See [tNFA_NDEF_DATA]       */
+/* NDEF record type registered. (In response to NFA_RegisterNDefTypeHandler)    */
+#define NFA_NDEF_REGISTER_EVT   0 
+/* Received an NDEF message with the registered type. See [tNFA_NDEF_DATA]       */
+#define NFA_NDEF_DATA_EVT	    1
 typedef uint8_t tNFA_NDEF_EVT;
 
 /* Structure for NFA_NDEF_REGISTER_EVT event data */
@@ -648,8 +732,10 @@
 /* Union of all NDEF callback structures */
 typedef union
 {
-    tNFA_NDEF_REGISTER  ndef_reg;       /* Structure for NFA_NDEF_REGISTER_EVT event data   */
-    tNFA_NDEF_DATA      ndef_data;      /* Structure for NFA_NDEF_DATA_EVT event data       */
+    /* Structure for NFA_NDEF_REGISTER_EVT event data */
+    tNFA_NDEF_REGISTER  ndef_reg;
+    /* Structure for NFA_NDEF_DATA_EVT event data */
+    tNFA_NDEF_DATA      ndef_data;
 } tNFA_NDEF_EVT_DATA;
 
 /* NFA_NDEF callback */
@@ -694,12 +780,12 @@
 **                  transport, resets the NFC controller, downloads patches to
 **                  the NFCC (if necessary), and initializes the NFC subsystems.
 **
-**                  This function should only be called once - typically when NFC
-**                  is enabled during boot-up, or when NFC is enabled from a
+**                  This function should only be called once - typically when
+**                  NFC is enabled during boot-up, or when NFC is enabled from a
 **                  settings UI. Subsequent calls to NFA_Enable while NFA is
 **                  enabling or enabled will be ignored. When the NFC startup
-**                  procedure is completed, an NFA_DM_ENABLE_EVT is returned to the
-**                  application using the tNFA_DM_CBACK.
+**                  procedure is completed, an NFA_DM_ENABLE_EVT is returned to
+**                  the application using the tNFA_DM_CBACK.
 **
 **                  The tNFA_CONN_CBACK parameter is used to register a callback
 **                  for polling, p2p and card emulation events.
@@ -724,9 +810,9 @@
 **                  returned to the application using the tNFA_DM_CBACK.
 **
 **                  The platform should wait until the NFC_DISABLE_REVT is
-**                  received before powering down the NFC chip and NCI transport.
-**                  This is required to so that NFA can gracefully shut down any
-**                  open connections.
+**                  received before powering down the NFC chip and NCI
+**                  transport. This is required to so that NFA can gracefully
+**                  shut down any open connections.
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
@@ -742,8 +828,9 @@
 **                  reported with an NFA_DM_SET_CONFIG_EVT in the tNFA_DM_CBACK
 **                  callback.
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function. Most Configuration
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function. Most Configuration
 **                  parameters are related to RF discovery.
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
@@ -785,8 +872,8 @@
 **                  NFA_ACTIVATED_EVT and NFA_DEACTIVATED_EVT indicates link
 **                  activation/deactivation.
 **
-**                  NFA_SendRawFrame is used to send data to the peer. NFA_DATA_EVT
-**                  indicates data from the peer.
+**                  NFA_SendRawFrame is used to send data to the peer.
+**                  NFA_DATA_EVT indicates data from the peer.
 **
 **                  If a tag is activated, then the NFA_RW APIs may be used to
 **                  send commands to the tag. Incoming NDEF messages are sent to
@@ -796,8 +883,9 @@
 **                  LLCP internally. The application has exclusive control of
 **                  the link.
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
@@ -834,19 +922,24 @@
 **
 **                  - NFA_POLL_ENABLED_EVT indicates whether or not polling
 **                    successfully enabled.
-**                  - NFA_DISC_RESULT_EVT indicates there are more than one devices,
-**                    so application must select one of tags by calling NFA_Select().
-**                  - NFA_SELECT_RESULT_EVT indicates whether previous selection was
-**                    successful or not. If it was failed then application must select
-**                    again or deactivate by calling NFA_Deactivate().
-**                  - NFA_ACTIVATED_EVT is generated when an NFC link is activated.
+**                  - NFA_DISC_RESULT_EVT indicates there are more than one
+**                    devices, so application must select one of tags by calling
+**                    NFA_Select().
+**                  - NFA_SELECT_RESULT_EVT indicates whether previous selection
+**                    was successful or not. If it was failed then application
+**                    must select again or deactivate by calling
+**                    NFA_Deactivate().
+**                  - NFA_ACTIVATED_EVT is generated when an NFC link is
+**                    activated.
 **                  - NFA_NDEF_DETECT_EVT is generated if tag is activated
-**                  - NFA_LLCP_ACTIVATED_EVT/NFA_LLCP_DEACTIVATED_EVT is generated
-**                    if NFC-DEP is activated
-**                  - NFA_DEACTIVATED_EVT will be returned after deactivating NFC link.
+**                  - NFA_LLCP_ACTIVATED_EVT/NFA_LLCP_DEACTIVATED_EVT is
+**                    generated if NFC-DEP is activated
+**                  - NFA_DEACTIVATED_EVT will be returned after deactivating
+**                    NFC link.
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
@@ -859,10 +952,12 @@
 ** Function         NFA_DisablePolling
 **
 ** Description      Disable polling
-**                  NFA_POLL_DISABLED_EVT will be returned after stopping polling.
+**                  NFA_POLL_DISABLED_EVT will be returned after stopping
+**                  polling.
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
@@ -875,17 +970,19 @@
 ** Function         NFA_EnableListening
 **
 ** Description      Enable listening.
-**                  NFA_LISTEN_ENABLED_EVT will be returned after listening is allowed.
+**                  NFA_LISTEN_ENABLED_EVT will be returned after listening is
+**                  allowed.
 **
 **                  The actual listening technologies are specified by other NFA
 **                  API functions. Such functions include (but not limited to)
 **                  NFA_CeConfigureUiccListenTech.
-**                  If NFA_DisableListening () is called to ignore the listening technologies,
-**                  NFA_EnableListening () is called to restore the listening technologies
-**                  set by these functions.
+**                  If NFA_DisableListening () is called to ignore the listening
+**                  technologies, NFA_EnableListening () is called to restore
+**                  the listening technologies set by these functions.
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
@@ -898,11 +995,13 @@
 ** Function         NFA_DisableListening
 **
 ** Description      Disable listening
-**                  NFA_LISTEN_DISABLED_EVT will be returned after stopping listening.
-**                  This function is called to exclude listen at RF discovery.
+**                  NFA_LISTEN_DISABLED_EVT will be returned after stopping
+**                  listening. This function is called to exclude listen at RF
+**                  discovery.
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
@@ -922,8 +1021,9 @@
 **                  available. NFA_ResumeP2p() is called to resume the P2P
 **                  services.
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
@@ -939,8 +1039,9 @@
 **                  NFA_P2P_RESUMED_EVT will be returned after P2P services are.
 **                  enables again.
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
@@ -952,16 +1053,17 @@
 **
 ** Function         NFA_SetP2pListenTech
 **
-** Description      This function is called to set listen technology for NFC-DEP.
-**                  This funtion may be called before or after starting any server
-**                  on NFA P2P/CHO/SNEP.
+** Description      This function is called to set listen technology for
+**                  NFC-DEP. This funtion may be called before or after starting
+**                  any server on NFA P2P/CHO/SNEP.
 **                  If there is no technology for NFC-DEP, P2P listening will be
 **                  stopped.
 **
 **                  NFA_SET_P2P_LISTEN_TECH_EVT without data will be returned.
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
@@ -976,7 +1078,8 @@
 ** Description      Start RF discovery
 **                  RF discovery parameters shall be set by other APIs.
 **
-**                  An NFA_RF_DISCOVERY_STARTED_EVT indicates whether starting was successful or not.
+**                  An NFA_RF_DISCOVERY_STARTED_EVT indicates whether starting
+**                  was successful or not.
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
@@ -990,7 +1093,8 @@
 **
 ** Description      Stop RF discovery
 **
-**                  An NFA_RF_DISCOVERY_STOPPED_EVT indicates whether stopping was successful or not.
+**                  An NFA_RF_DISCOVERY_STOPPED_EVT indicates whether stopping
+**                  was successful or not.
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
@@ -1022,13 +1126,15 @@
 **
 ** Function         NFA_Select
 **
-** Description      Select one from detected devices by NFA_DISC_RESULT_EVT after the
-**                  last discovery result is received.
-**                  An NFA_SELECT_RESULT_EVT indicates whether selection was successful or not.
-**                  If failed then application must select again or deactivate by NFA_Deactivate ().
+** Description      Select one from detected devices by NFA_DISC_RESULT_EVT
+**                  after the last discovery result is received.
+**                  An NFA_SELECT_RESULT_EVT indicates whether selection was
+**                  successful or not. If failed then application must select
+**                  again or deactivate by NFA_Deactivate ().
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
-**                  NFA_STATUS_INVALID_PARAM if RF interface is not matched protocol
+**                  NFA_STATUS_INVALID_PARAM if RF interface is not matched
+**                  protocol
 **                  NFA_STATUS_FAILED otherwise
 **
 *******************************************************************************/
@@ -1040,8 +1146,8 @@
 **
 ** Function         NFA_UpdateRFCommParams
 **
-** Description      This function is called to update RF Communication parameters
-**                  once the Frame RF Interface has been activated.
+** Description      This function is called to update RF Communication
+**                  parameters once the Frame RF Interface has been activated.
 **
 **                  An NFA_UPDATE_RF_PARAM_RESULT_EVT indicates whether updating
 **                  was successful or not.
@@ -1058,21 +1164,25 @@
 **
 ** Description
 **                  If sleep_mode=TRUE:
-**                      Deselect the activated device by deactivating into sleep mode.
+**                      Deselect the activated device by deactivating into sleep
+**                      mode.
 **
-**                      An NFA_DEACTIVATE_FAIL_EVT indicates that selection was not successful.
-**                      Application can select another discovered device or deactivate by NFA_Deactivate ()
+**                      An NFA_DEACTIVATE_FAIL_EVT indicates that selection was
+**                      not successful. Application can select another
+**                      discovered device or deactivate by NFA_Deactivate ()
 **                      after receiving NFA_DEACTIVATED_EVT.
 **
-**                      Deactivating to sleep mode is not allowed when NFCC is in wait-for-host-select
-**                      mode, or in listen-sleep states; NFA will deactivate to idle or discovery state
-**                      for these cases respectively.
+**                      Deactivating to sleep mode is not allowed when NFCC is
+**                      in wait-for-host-select mode, or in listen-sleep states;
+**                      NFA will deactivate to idle or discovery state for these
+**                      cases respectively.
 **
 **
 **                  If sleep_mode=FALSE:
-**                      Deactivate the connection (e.g. as a result of presence check failure)
-**                      NFA_DEACTIVATED_EVT will indicate that link is deactivated.
-**                      Polling/listening will resume (unless the nfcc is in wait_for-all-discoveries state)
+**                      Deactivate the connection (e.g. as a result of presence
+**                      check failure) NFA_DEACTIVATED_EVT will indicate that
+**                      link is deactivated. Polling/listening will resume
+**                      (unless the nfcc is in wait_for-all-discoveries state)
 **
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
@@ -1086,13 +1196,15 @@
 ** Function         NFA_SendRawFrame
 **
 ** Description      Send a raw frame over the activated interface with the NFCC.
-**                  This function can only be called after NFC link is activated.
+**                  This function can only be called after NFC link is
+**                  activated.
 **
-**                  If the activated interface is a tag and auto-presence check is
-**                  enabled then presence_check_start_delay can be used to indicate
-**                  the delay in msec after which the next auto presence check
-**                  command can be sent. NFA_DM_DEFAULT_PRESENCE_CHECK_START_DELAY
-**                  can be used as the default value for the delay.
+**                  If the activated interface is a tag and auto-presence check
+**                  is enabled then presence_check_start_delay can be used to
+**                  indicate the delay in msec after which the next auto
+**                  presence check command can be sent.
+**                  NFA_DM_DEFAULT_PRESENCE_CHECK_START_DELAY can be used as the
+**                  default value for the delay.
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
@@ -1142,16 +1254,19 @@
 ** Function         NFA_RegisterNDefUriHandler
 **
 ** Description      This API is a special-case of NFA_RegisterNDefTypeHandler
-**                  with TNF=NFA_TNF_WKT, and type_name='U' (URI record); and allows
-**                  registering for specific URI types (e.g. 'tel:' or 'mailto:').
+**                  with TNF=NFA_TNF_WKT, and type_name='U' (URI record); and
+**                  allows registering for specific URI types (e.g. 'tel:' or
+**                  'mailto:').
 **
 **                  An NFA_NDEF_REGISTER_EVT will be sent to the tNFA_NDEF_CBACK
 **                  to indicate that registration was successful, and provide a
 **                  handle for this registration.
 **
-**                  If uri_id=NFA_NDEF_URI_ID_ABSOLUTE, then p_abs_uri contains the
-**                  unabridged URI. For all other uri_id values, the p_abs_uri
-**                  parameter is ignored (i.e the URI prefix is implied by uri_id).
+**                  If uri_id=NFA_NDEF_URI_ID_ABSOLUTE, then p_abs_uri contains
+**                  the unabridged URI. For all other uri_id values, the
+**                  p_abs_uri parameter is ignored (i.e the URI prefix is
+**                  implied by uri_id).
+**
 **                  See [NFC RTD URI] for more information.
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
@@ -1182,7 +1297,8 @@
 **
 ** Function         NFA_PowerOffSleepMode
 **
-** Description      This function is called to enter or leave NFCC Power Off Sleep mode
+** Description      This function is called to enter or leave NFCC Power Off
+**                  Sleep mode
 **                  NFA_DM_PWR_MODE_CHANGE_EVT will be sent to indicate status.
 **
 **                  start_stop : TRUE if entering Power Off Sleep mode
@@ -1199,10 +1315,11 @@
 **
 ** Function         NFA_RegVSCback
 **
-** Description      This function is called to register or de-register a callback
-**                  function to receive Proprietary NCI response and notification
-**                  events.
-**                  The maximum number of callback functions allowed is NFC_NUM_VS_CBACKS
+** Description      This function is called to register or de-register a
+**                  callback function to receive Proprietary NCI response and
+**                  notification events.
+**                  The maximum number of callback functions allowed is
+**                  NFC_NUM_VS_CBACKS
 **
 ** Returns          tNFC_STATUS
 **
@@ -1220,8 +1337,8 @@
 **                  oid             - The opcode of the VS command.
 **                  cmd_params_len  - The command parameter len
 **                  p_cmd_params    - The command parameter
-**                  p_cback         - The callback function to receive the command
-**                                    status
+**                  p_cback         - The callback function to receive the
+**                                    command status
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
diff --git a/src/nfa/include/nfa_ce_api.h b/src/nfa/include/nfa_ce_api.h
index 0d064c2..16c5f09 100644
--- a/src/nfa/include/nfa_ce_api.h
+++ b/src/nfa/include/nfa_ce_api.h
@@ -49,25 +49,26 @@
 **                  Tag events will be notifed using the tNFA_CONN_CBACK
 **                  (registered during NFA_Enable)
 **
-**                  The NFA_CE_LOCAL_TAG_CONFIGURED_EVT reports the status of the
-**                  operation.
+**                  The NFA_CE_LOCAL_TAG_CONFIGURED_EVT reports the status of
+**                  the operation.
 **
 **                  Activation and deactivation are reported using the
 **                  NFA_ACTIVATED_EVT and NFA_DEACTIVATED_EVT events
 **
 **                  If a write-request is received to update the tag memory,
-**                  an NFA_CE_NDEF_WRITE_CPLT_EVT will notify the application, along
-**                  with a buffer containing the updated contents.
+**                  an NFA_CE_NDEF_WRITE_CPLT_EVT will notify the application,
+**                  along with a buffer containing the updated contents.
 **
 **                  To disable the local NDEF tag, set protocol_mask=0
 **
 **                  The NDEF data provided by p_ndef_data must be persistent
-**                  as long as the local NDEF tag is enabled. Also, Input parameters p_uid and
-**                  uid_len are reserved for future use.
+**                  as long as the local NDEF tag is enabled. Also, Input
+**                  parameters p_uid and uid_len are reserved for future use.
 **
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function.
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function.
 **
 ** Returns:
 **                  NFA_STATUS_OK,            if command accepted
@@ -97,14 +98,15 @@
 **                  Events will be notifed using the tNFA_CONN_CBACK
 **                  (registered during NFA_Enable)
 **
-**                  The NFA_CE_UICC_LISTEN_CONFIGURED_EVT reports the status of the
-**                  operation.
+**                  The NFA_CE_UICC_LISTEN_CONFIGURED_EVT reports the status of
+**                  the operation.
 **
 **                  Activation and deactivation are reported using the
 **                  NFA_ACTIVATED_EVT and NFA_DEACTIVATED_EVT events
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
 ** Returns:
 **                  NFA_STATUS_OK, if command accepted
@@ -123,8 +125,9 @@
 **                  The NFA_CE_REGISTERED_EVT reports the status of the
 **                  operation.
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
 ** Returns:
 **                  NFA_STATUS_OK, if command accepted
@@ -140,13 +143,15 @@
 ** Function         NFA_CeDeregisterFelicaSystemCodeOnDH
 **
 ** Description      Deregister listening callback for Felica
-**                  (previously registered using NFA_CeRegisterFelicaSystemCodeOnDH)
+**                  (previously registered using
+**                  NFA_CeRegisterFelicaSystemCodeOnDH)
 **
 **                  The NFA_CE_DEREGISTERED_EVT reports the status of the
 **                  operation.
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_BAD_HANDLE if invalid handle
@@ -168,8 +173,9 @@
 **                  will get notifications for any AIDs routed to the DH. This
 **                  over-rides callbacks registered for specific AIDs.
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
 ** Returns:
 **                  NFA_STATUS_OK, if command accepted
@@ -190,8 +196,9 @@
 **                  The NFA_CE_DEREGISTERED_EVT reports the status of the
 **                  operation.
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_BAD_HANDLE if invalid handle
@@ -205,18 +212,21 @@
 ** Function         NFA_CeSetIsoDepListenTech
 **
 ** Description      Set the technologies (NFC-A and/or NFC-B) to listen for when
-**                  NFA_CeConfigureLocalTag or NFA_CeDeregisterAidOnDH are called.
+**                  NFA_CeConfigureLocalTag or NFA_CeDeregisterAidOnDH are
+**                  called.
 **
 **                  By default (if this API is not called), NFA will listen
 **                  for both NFC-A and NFC-B for ISODEP.
 **
 ** Note:            If listening for ISODEP on UICC, the DH listen callbacks
-**                  may still get activate notifications for ISODEP if the reader/
-**                  writer selects an AID that is not routed to the UICC (regardless
-**                  of whether A or B was disabled using NFA_CeSetIsoDepListenTech)
+**                  may still get activate notifications for ISODEP if the
+**                  reader/writer selects an AID that is not routed to the UICC
+**                  (regardless of whether A or B was disabled using
+**                  NFA_CeSetIsoDepListenTech)
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
 ** Returns:
 **                  NFA_STATUS_OK, if command accepted
diff --git a/src/nfa/include/nfa_ee_api.h b/src/nfa/include/nfa_ee_api.h
index e341248..3ee6697 100644
--- a/src/nfa/include/nfa_ee_api.h
+++ b/src/nfa/include/nfa_ee_api.h
@@ -281,10 +281,11 @@
 **
 ** Function         NFA_EeModeSet
 **
-** Description      This function is called to activate (mode = NFA_EE_MD_ACTIVATE)
-**                  or deactivate (mode = NFA_EE_MD_DEACTIVATE) the NFCEE
-**                  identified by the given ee_handle. The result of this
-**                  operation is reported with the NFA_EE_MODE_SET_EVT.
+** Description      This function is called to activate
+**                  (mode = NFA_EE_MD_ACTIVATE) or deactivate
+**                  (mode = NFA_EE_MD_DEACTIVATE) the NFCEE identified by the
+**                  given ee_handle. The result of this operation is reported
+**                  with the NFA_EE_MODE_SET_EVT.
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
@@ -304,11 +305,12 @@
 **                  routing table for the given ee_handle. The status of this
 **                  operation is reported as the NFA_EE_SET_TECH_CFG_EVT.
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
-** Note:            NFA_EeUpdateNow() should be called after last NFA-EE function
-**                  to change the listen mode routing is called.
+** Note:            NFA_EeUpdateNow() should be called after last NFA-EE
+**                  function to change the listen mode routing is called.
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
@@ -329,11 +331,12 @@
 **                  table for the given ee_handle. The status of this
 **                  operation is reported as the NFA_EE_SET_PROTO_CFG_EVT.
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
-** Note:            NFA_EeUpdateNow() should be called after last NFA-EE function
-**                  to change the listen mode routing is called.
+** Note:            NFA_EeUpdateNow() should be called after last NFA-EE
+**                  function to change the listen mode routing is called.
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
@@ -353,11 +356,12 @@
 **                  listen mode routing table in NFCC. The status of this
 **                  operation is reported as the NFA_EE_ADD_AID_EVT.
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
-** Note:            NFA_EeUpdateNow() should be called after last NFA-EE function
-**                  to change the listen mode routing is called.
+** Note:            NFA_EeUpdateNow() should be called after last NFA-EE
+**                  function to change the listen mode routing is called.
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
@@ -373,16 +377,17 @@
 **
 ** Function         NFA_EeRemoveAidRouting
 **
-** Description      This function is called to remove the given AID entry from the
-**                  listen mode routing table. If the entry configures VS,
+** Description      This function is called to remove the given AID entry from
+**                  the listen mode routing table. If the entry configures VS,
 **                  it is also removed. The status of this operation is reported
 **                  as the NFA_EE_REMOVE_AID_EVT.
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
-** Note:            NFA_EeUpdateNow() should be called after last NFA-EE function
-**                  to change the listen mode routing is called.
+** Note:            NFA_EeUpdateNow() should be called after last NFA-EE
+**                  function to change the listen mode routing is called.
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
@@ -411,8 +416,8 @@
 ** Function         NFA_EeUpdateNow
 **
 ** Description      This function is called to send the current listen mode
-**                  routing table and VS configuration to the NFCC (without waiting
-**                  for NFA_EE_ROUT_TIMEOUT_VAL).
+**                  routing table and VS configuration to the NFCC (without
+**                  waiting for NFA_EE_ROUT_TIMEOUT_VAL).
 **
 **                  The status of this operation is
 **                  reported with the NFA_EE_UPDATED_EVT.
@@ -447,8 +452,9 @@
 ** Function         NFA_EeSendData
 **
 ** Description      Send data to the given NFCEE.
-**                  This function shall be called after NFA_EE_CONNECT_EVT is reported
-**                  and before NFA_EeDisconnect is called on the given ee_handle.
+**                  This function shall be called after NFA_EE_CONNECT_EVT is
+**                  reported and before NFA_EeDisconnect is called on the given
+**                  ee_handle.
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
diff --git a/src/nfa/include/nfa_hci_api.h b/src/nfa/include/nfa_hci_api.h
index fba865b..8dfc415 100644
--- a/src/nfa/include/nfa_hci_api.h
+++ b/src/nfa/include/nfa_hci_api.h
@@ -287,11 +287,12 @@
 **
 ** Description      This function will register an application with hci and
 **                  returns an application handle and provides a mechanism to
-**                  register a callback with HCI to receive NFA HCI event notification.
-**                  When the application is registered (or if an error occurs),
-**                  the app will be notified with NFA_HCI_REGISTER_EVT. Previous
-**                  session information including allocated gates, created pipes
-**                  and pipes states will be returned as part of tNFA_HCI_REGISTER data.
+**                  register a callback with HCI to receive NFA HCI event
+**                  notification. When the application is registered (or if an
+**                  error occurs), the app will be notified with
+**                  NFA_HCI_REGISTER_EVT. Previous session information
+**                  including allocated gates, created pipes and pipes states
+**                  will be returned as part of tNFA_HCI_REGISTER data.
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
@@ -323,15 +324,16 @@
 **
 ** Description      This function is called to deregister an application
 **                  from HCI. The app will be notified by NFA_HCI_DEREGISTER_EVT
-**                  after deleting all the pipes owned by the app and deallocating
-**                  all the gates allocated to the app or if an error occurs.
-**                  The app can release the buffer provided for collecting long
-**                  APDUs after receiving NFA_HCI_DEREGISTER_EVT.
-**                  Even if deregistration fails, the app has to register again
-**                  to provide a new cback function and event buffer for receiving
-**                  long APDUs.
+**                  after deleting all the pipes owned by the app and
+**                  deallocating all the gates allocated to the app or if an
+**                  error occurs. The app can release the buffer provided for
+**                  collecting long APDUs after receiving
+**                  NFA_HCI_DEREGISTER_EVT. Even if deregistration fails, the
+**                  app has to register again to provide a new cback function
+**                  and event buffer for receiving long APDUs.
 **
-** Returns          NFA_STATUS_OK if the application is deregistered successfully
+** Returns          NFA_STATUS_OK if the application is deregistered
+**                  successfully
 **                  NFA_STATUS_FAILED otherwise
 **
 *******************************************************************************/
@@ -346,8 +348,9 @@
 **                  for a particular service to other host or to establish
 **                  communication with other host. When the gate is
 **                  allocated (or if an error occurs), the app will be notified
-**                  with NFA_HCI_ALLOCATE_GATE_EVT with the gate id. The allocated
-**                  Gate information will be stored in non volatile memory.
+**                  with NFA_HCI_ALLOCATE_GATE_EVT with the gate id. The
+**                  allocated Gate information will be stored in non volatile
+**                  memory.
 **
 ** Returns          NFA_STATUS_OK if this API started
 **                  NFA_STATUS_FAILED if no generic gate is available
@@ -584,9 +587,9 @@
 ** Function         NFA_HciAddStaticPipe
 **
 ** Description      This function is called to add a static pipe for sending
-**                  7816 APDUs. When the static pipe is added (or if an error occurs),
-**                  the app will be notified with NFA_HCI_ADD_STATIC_PIPE_EVT with
-**                  status.
+**                  7816 APDUs. When the static pipe is added (or if an error
+**                  occurs), the app will be notified with
+**                  NFA_HCI_ADD_STATIC_PIPE_EVT with status.
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
diff --git a/src/nfa/include/nfa_nv_ci.h b/src/nfa/include/nfa_nv_ci.h
index 430bc6b..d89ddd9 100644
--- a/src/nfa/include/nfa_nv_ci.h
+++ b/src/nfa/include/nfa_nv_ci.h
@@ -82,8 +82,8 @@
 **
 ** Description      This function sends an event to NFA indicating the phone has
 **                  read in the requested amount of data specified in the
-**                  nfa_nv_co_read () call-out function.  It should only be called
-**                  when the requested number of bytes has been read.
+**                  nfa_nv_co_read () call-out function.  It should only be
+**                  called when the requested number of bytes has been read.
 **
 ** Parameters       num_bytes_read - number of bytes read into the buffer
 **                      specified in the read callout-function.
diff --git a/src/nfa/include/nfa_nv_co.h b/src/nfa/include/nfa_nv_co.h
index d4dcf32..6ab050b 100644
--- a/src/nfa/include/nfa_nv_co.h
+++ b/src/nfa/include/nfa_nv_co.h
@@ -83,9 +83,9 @@
 **                  Note: Upon completion of the request, nfa_nv_ci_read () is
 **                        called with the buffer of data, along with the number
 **                        of bytes read into the buffer, and a status.  The
-**                        call-in function should only be called when ALL requested
-**                        bytes have been read, the end of file has been detected,
-**                        or an error has occurred.
+**                        call-in function should only be called when ALL
+**                        requested bytes have been read, the end of file has
+**                        been detected, or an error has occurred.
 **
 *******************************************************************************/
 extern void nfa_nv_co_read (uint8_t *p_buf, uint16_t nbytes, uint8_t block);
@@ -104,8 +104,9 @@
 **
 **                  Note: Upon completion of the request, nfa_nv_ci_write () is
 **                        called with the file descriptor and the status.  The
-**                        call-in function should only be called when ALL requested
-**                        bytes have been written, or an error has been detected,
+**                        call-in function should only be called when ALL
+**                        requested bytes have been written, or an error has
+**                        been detected,
 **
 *******************************************************************************/
 extern void nfa_nv_co_write (const uint8_t *p_buf, uint16_t nbytes, uint8_t block);
diff --git a/src/nfa/include/nfa_p2p_api.h b/src/nfa/include/nfa_p2p_api.h
index 00d53da..158da86 100644
--- a/src/nfa/include/nfa_p2p_api.h
+++ b/src/nfa/include/nfa_p2p_api.h
@@ -190,19 +190,22 @@
 **
 ** Function         NFA_P2pRegisterServer
 **
-** Description      This function is called to listen to a SAP as server on LLCP.
+** Description      This function is called to listen to a SAP as server on
+**                  LLCP.
 **
-**                  NFA_P2P_REG_SERVER_EVT will be returned with status and handle.
+**                  NFA_P2P_REG_SERVER_EVT will be returned with status and
+**                  handle.
 **
-**                  If server_sap is set to NFA_P2P_ANY_SAP, then NFA will allocate
-**                  a SAP between LLCP_LOWER_BOUND_SDP_SAP and LLCP_UPPER_BOUND_SDP_SAP
-**                  Otherwise, server_sap must be between (LLCP_SDP_SAP + 1) and
-**                  LLCP_UPPER_BOUND_SDP_SAP
+**                  If server_sap is set to NFA_P2P_ANY_SAP, then NFA will
+**                  allocate a SAP between LLCP_LOWER_BOUND_SDP_SAP and
+**                  LLCP_UPPER_BOUND_SDP_SAP Otherwise, server_sap must be
+**                  between (LLCP_SDP_SAP + 1) and LLCP_UPPER_BOUND_SDP_SAP
 **
 **                  link_type : NFA_P2P_LLINK_TYPE and/or NFA_P2P_DLINK_TYPE
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
@@ -217,9 +220,11 @@
 **
 ** Function         NFA_P2pRegisterClient
 **
-** Description      This function is called to register a client service on LLCP.
+** Description      This function is called to register a client service on
+**                  LLCP.
 **
-**                  NFA_P2P_REG_CLIENT_EVT will be returned with status and handle.
+**                  NFA_P2P_REG_CLIENT_EVT will be returned with status and
+**                  handle.
 **
 **                  link_type : NFA_P2P_LLINK_TYPE and/or NFA_P2P_DLINK_TYPE
 **
@@ -237,9 +242,10 @@
 ** Description      This function is called to stop listening to a SAP as server
 **                  or stop client service on LLCP.
 **
-** Note:            If this function is called to de-register a server and RF discovery
-**                  is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If this function is called to de-register a server and RF
+**                  discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_BAD_HANDLE if handle is not valid
@@ -287,9 +293,11 @@
 ** Description      This function is called to disconnect an existing or
 **                  connecting data link connection.
 **
-**                  discard any pending data on data link connection if flush is set to TRUE
+**                  discard any pending data on data link connection if flush is
+**                  set to TRUE
 **
-**                  NFA_P2P_DISC_EVT will be returned after data link connection is disconnected
+**                  NFA_P2P_DISC_EVT will be returned after data link connection
+**                  is disconnected
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_BAD_HANDLE if handle is not valid
@@ -303,8 +311,8 @@
 **
 ** Function         NFA_P2pConnectByName
 **
-** Description      This function is called to create a connection-oriented transport
-**                  by a service name.
+** Description      This function is called to create a connection-oriented
+**                  transport by a service name.
 **                  NFA_P2P_CONNECTED_EVT if success
 **                  NFA_P2P_DISC_EVT if failed
 **
@@ -322,8 +330,8 @@
 **
 ** Function         NFA_P2pConnectBySap
 **
-** Description      This function is called to create a connection-oriented transport
-**                  by a SAP.
+** Description      This function is called to create a connection-oriented
+**                  transport by a SAP.
 **                  NFA_P2P_CONNECTED_EVT if success
 **                  NFA_P2P_DISC_EVT if failed
 **
@@ -346,7 +354,8 @@
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_BAD_HANDLE if handle is not valid
-**                  NFA_STATUS_BAD_LENGTH if data length is more than remote link MIU
+**                  NFA_STATUS_BAD_LENGTH if data length is more than remote
+**                  link MIU
 **                  NFA_STATUS_CONGESTED  if congested
 **                  NFA_STATUS_FAILED otherwise
 **
@@ -361,12 +370,14 @@
 ** Function         NFA_P2pReadUI
 **
 ** Description      This function is called to read data on connectionless
-**                  transport when receiving NFA_P2P_DATA_EVT with NFA_P2P_LLINK_TYPE.
+**                  transport when receiving NFA_P2P_DATA_EVT with
+**                  NFA_P2P_LLINK_TYPE.
 **
 **                  - Remote SAP who sent UI PDU is returned.
-**                  - Information of UI PDU up to max_data_len is copied into p_data.
-**                  - If more information of UI PDU or more UI PDU in queue then more
-**                    is returned to TRUE.
+**                  - Information of UI PDU up to max_data_len is copied into
+**                    p_data.
+**                  - If more information of UI PDU or more UI PDU in queue then
+**                    more is returned to TRUE.
 **                  - Information of next UI PDU is not concatenated.
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
@@ -417,11 +428,13 @@
 ** Function         NFA_P2pReadData
 **
 ** Description      This function is called to read data on connection-oriented
-**                  transport when receiving NFA_P2P_DATA_EVT with NFA_P2P_DLINK_TYPE.
+**                  transport when receiving NFA_P2P_DATA_EVT with
+**                  NFA_P2P_DLINK_TYPE.
 **
-**                  - Information of I PDU is copied into p_data up to max_data_len.
-**                  - If more information of I PDU or more I PDU in queue, then more
-**                    is returned to TRUE.
+**                  - Information of I PDU is copied into p_data up to
+**                    max_data_len.
+**                  - If more information of I PDU or more I PDU in queue, then
+**                    more is returned to TRUE.
 **                  - Information of next I PDU is not concatenated.
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
@@ -468,8 +481,8 @@
 ** Function         NFA_P2pGetLinkInfo
 **
 ** Description      This function is called to get local/remote link MIU and
-**                  Well-Known Service list encoded as a 16-bit field of connected LLCP.
-**                  NFA_P2P_LINK_INFO_EVT will be returned.
+**                  Well-Known Service list encoded as a 16-bit field of
+**                  connected LLCP. NFA_P2P_LINK_INFO_EVT will be returned.
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_BAD_HANDLE if server or client is not registered
@@ -482,8 +495,8 @@
 **
 ** Function         NFA_P2pGetRemoteSap
 **
-** Description      This function is called to get SAP associated by service name
-**                  on connected remote LLCP.
+** Description      This function is called to get SAP associated by service
+**                  name on connected remote LLCP.
 **                  NFA_P2P_SDP_EVT will be returned.
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
@@ -506,11 +519,15 @@
 **                  - Option parameter (LLCP_OPT_VALUE)
 **                  - Response Waiting Time Index (LLCP_WAITING_TIME)
 **                  - Local Link Timeout (LLCP_LTO_VALUE)
-**                  - Inactivity Timeout as initiator role (LLCP_INIT_INACTIVITY_TIMEOUT)
-**                  - Inactivity Timeout as target role (LLCP_TARGET_INACTIVITY_TIMEOUT)
+**                  - Inactivity Timeout as initiator role
+**                    (LLCP_INIT_INACTIVITY_TIMEOUT)
+**                  - Inactivity Timeout as target role
+**                    (LLCP_TARGET_INACTIVITY_TIMEOUT)
 **                  - Delay SYMM response (LLCP_DELAY_RESP_TIME)
-**                  - Data link connection timeout (LLCP_DATA_LINK_CONNECTION_TOUT)
-**                  - Delay timeout to send first PDU as initiator (LLCP_DELAY_TIME_TO_SEND_FIRST_PDU)
+**                  - Data link connection timeout
+**                    (LLCP_DATA_LINK_CONNECTION_TOUT)
+**                  - Delay timeout to send first PDU as initiator
+**                    (LLCP_DELAY_TIME_TO_SEND_FIRST_PDU)
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
diff --git a/src/nfa/include/nfa_rw_api.h b/src/nfa/include/nfa_rw_api.h
index 816d958..1dc9127 100644
--- a/src/nfa/include/nfa_rw_api.h
+++ b/src/nfa/include/nfa_rw_api.h
@@ -75,8 +75,8 @@
 **                  size, etc.).
 **
 **                  It is not mandatory to call this function -  NFA_RwReadNDef
-**                  and NFA_RwWriteNDef will perform NDEF detection internally if
-**                  not performed already. This API may be called to get a
+**                  and NFA_RwWriteNDef will perform NDEF detection internally
+**                  if not performed already. This API may be called to get a
 **                  tag's NDEF size before issuing a write-request.
 **
 ** Returns:
@@ -97,19 +97,21 @@
 **                  appropriate method for the currently activated tag.
 **
 **                  Upon successful completion of NDEF detection (if performed),
-**                  a NFA_NDEF_DETECT_EVT will be sent, to notify the application
-**                  of the NDEF attributes (NDEF total memory size, current size,
-**                  etc.).
+**                  a NFA_NDEF_DETECT_EVT will be sent, to notify the
+**                  application of the NDEF attributes (NDEF total memory size,
+**                  current size, etc.).
 **
 **                  Upon receiving the NDEF message, the message will be sent to
 **                  the handler registered with NFA_RegisterNDefTypeHandler or
-**                  NFA_RequestExclusiveRfControl (if exclusive RF mode is active)
+**                  NFA_RequestExclusiveRfControl (if exclusive RF mode is
+**                  active)
 **
 **
 ** Returns:
 **                  NFA_STATUS_OK if successfully initiated
 **                  NFC_STATUS_REFUSED if tag does not support NDEF
-**                  NFC_STATUS_NOT_INITIALIZED if NULL NDEF was detected on the tag
+**                  NFC_STATUS_NOT_INITIALIZED if NULL NDEF was detected on the
+**                  tag
 **                  NFA_STATUS_FAILED otherwise
 **
 *******************************************************************************/
@@ -200,15 +202,17 @@
 **                  calling NFA_RwDetectNDef and should expect to receive
 **                  NFA_NDEF_DETECT_EVT instead of NFA_TLV_DETECT_EVT
 **
-**                  It is not mandatory to call this function -  NFA_RwDetectNDef,
-**                  NFA_RwReadNDef and NFA_RwWriteNDef will perform TLV detection
-**                  internally if not performed already. An application may call
-**                  this API to check the a tag/card-emulator's total Reserved/
-**                  Lock bytes before issuing a write-request.
+**                  It is not mandatory to call this function -
+**                  NFA_RwDetectNDef, NFA_RwReadNDef and NFA_RwWriteNDef will
+**                  perform TLV detection internally if not performed already.
+**                  An application may call this API to check the a
+**                  tag/card-emulator's total Reserved/ Lock bytes before
+**                  issuing a write-request.
 **
 ** Returns:
 **                  NFA_STATUS_OK if successfully initiated
-**                  NFC_STATUS_REFUSED if tlv_type is NDEF & tag won't support NDEF
+**                  NFC_STATUS_REFUSED if tlv_type is NDEF & tag won't support
+**                  NDEF
 **                  NFA_STATUS_FAILED otherwise
 **
 *******************************************************************************/
@@ -240,9 +244,9 @@
 ** Description:
 **      Send a RID command to the activated Type 1 tag.
 **
-**      Data is returned to the application using the NFA_DATA_EVT. When the read
-**      operation has completed, or if an error occurs, the app will be notified with
-**      NFA_READ_CPLT_EVT.
+**      Data is returned to the application using the NFA_DATA_EVT. When the
+**      read operation has completed, or if an error occurs, the app will be
+**      notified with NFA_READ_CPLT_EVT.
 **
 ** Returns:
 **      NFA_STATUS_OK if successfully initiated
@@ -259,9 +263,9 @@
 ** Description:
 **      Send a RALL command to the activated Type 1 tag.
 **
-**      Data is returned to the application using the NFA_DATA_EVT. When the read
-**      operation has completed, or if an error occurs, the app will be notified with
-**      NFA_READ_CPLT_EVT.
+**      Data is returned to the application using the NFA_DATA_EVT. When the
+**      read operation has completed, or if an error occurs, the app will be
+**      notified with NFA_READ_CPLT_EVT.
 **
 ** Returns:
 **      NFA_STATUS_OK if successfully initiated
@@ -278,9 +282,9 @@
 ** Description:
 **      Send a READ command to the activated Type 1 tag.
 **
-**      Data is returned to the application using the NFA_DATA_EVT. When the read
-**      operation has completed, or if an error occurs, the app will be notified with
-**      NFA_READ_CPLT_EVT.
+**      Data is returned to the application using the NFA_DATA_EVT. When the
+**      read operation has completed, or if an error occurs, the app will be
+**      notified with NFA_READ_CPLT_EVT.
 **
 ** Returns:
 **      NFA_STATUS_OK if successfully initiated
@@ -297,9 +301,9 @@
 ** Description:
 **      Send a WRITE command to the activated Type 1 tag.
 **
-**      Data is returned to the application using the NFA_DATA_EVT. When the write
-**      operation has completed, or if an error occurs, the app will be notified with
-**      NFA_WRITE_CPLT_EVT.
+**      Data is returned to the application using the NFA_DATA_EVT. When the
+**      write operation has completed, or if an error occurs, the app will be
+**      notified with NFA_WRITE_CPLT_EVT.
 **
 ** Returns:
 **      NFA_STATUS_OK if successfully initiated
@@ -319,9 +323,9 @@
 ** Description:
 **      Send a RSEG command to the activated Type 1 tag.
 **
-**      Data is returned to the application using the NFA_DATA_EVT. When the read
-**      operation has completed, or if an error occurs, the app will be notified with
-**      NFA_READ_CPLT_EVT.
+**      Data is returned to the application using the NFA_DATA_EVT. When the
+**      read operation has completed, or if an error occurs, the app will be
+**      notified with NFA_READ_CPLT_EVT.
 **
 ** Returns:
 **      NFA_STATUS_OK if successfully initiated
@@ -338,9 +342,9 @@
 ** Description:
 **      Send a READ8 command to the activated Type 1 tag.
 **
-**      Data is returned to the application using the NFA_DATA_EVT. When the read
-**      operation has completed, or if an error occurs, the app will be notified with
-**      NFA_READ_CPLT_EVT.
+**      Data is returned to the application using the NFA_DATA_EVT. When the
+**      read operation has completed, or if an error occurs, the app will be
+**      notified with NFA_READ_CPLT_EVT.
 **
 ** Returns:
 **      NFA_STATUS_OK if successfully initiated
@@ -357,9 +361,9 @@
 ** Description:
 **      Send a WRITE8_E / WRITE8_NE command to the activated Type 1 tag.
 **
-**      Data is returned to the application using the NFA_DATA_EVT. When the read
-**      operation has completed, or if an error occurs, the app will be notified with
-**      NFA_READ_CPLT_EVT.
+**      Data is returned to the application using the NFA_DATA_EVT. When the
+**      read operation has completed, or if an error occurs, the app will be
+**      notified with NFA_READ_CPLT_EVT.
 **
 ** Returns:
 **      NFA_STATUS_OK if successfully initiated
@@ -378,9 +382,9 @@
 ** Description:
 **      Send a READ command to the activated Type 2 tag.
 **
-**      Data is returned to the application using the NFA_DATA_EVT. When the read
-**      operation has completed, or if an error occurs, the app will be notified with
-**      NFA_READ_CPLT_EVT.
+**      Data is returned to the application using the NFA_DATA_EVT. When the
+**      read operation has completed, or if an error occurs, the app will be
+**      notified with NFA_READ_CPLT_EVT.
 **
 ** Returns:
 **      NFA_STATUS_OK if successfully initiated
@@ -415,8 +419,8 @@
 ** Description:
 **      Send SECTOR SELECT command to the activated Type 2 tag.
 **
-**      When the sector select operation has completed (or if an error occurs), the
-**      app will be notified with NFA_SECTOR_SELECT_CPLT_EVT.
+**      When the sector select operation has completed (or if an error occurs),
+**      the app will be notified with NFA_SECTOR_SELECT_CPLT_EVT.
 **
 ** Returns:
 **      NFA_STATUS_OK if successfully initiated
@@ -433,9 +437,9 @@
 ** Description:
 **      Send a CHECK (read) command to the activated Type 3 tag.
 **
-**      Data is returned to the application using the NFA_RW_DATA_EVT. When the read
-**      operation has completed, or if an error occurs, the app will be notified with
-**      NFA_READ_CPLT_EVT.
+**      Data is returned to the application using the NFA_RW_DATA_EVT. When the
+**      read operation has completed, or if an error occurs, the app will be
+**      notified with NFA_READ_CPLT_EVT.
 **
 ** Returns:
 **      NFA_STATUS_OK if successfully initiated
@@ -510,9 +514,9 @@
 ** Description:
 **      Send Read Single Block command to the activated ISO 15693 tag.
 **
-**      Data is returned to the application using the NFA_DATA_EVT. When the read
-**      operation has completed, or if an error occurs, the app will be notified with
-**      NFA_I93_CMD_CPLT_EVT.
+**      Data is returned to the application using the NFA_DATA_EVT. When the
+**      read operation has completed, or if an error occurs, the app will be
+**      notified with NFA_I93_CMD_CPLT_EVT.
 **
 ** Returns:
 **      NFA_STATUS_OK if successfully initiated
@@ -566,9 +570,9 @@
 ** Description:
 **      Send Read Multiple Block command to the activated ISO 15693 tag.
 **
-**      Data is returned to the application using the NFA_DATA_EVT. When the read
-**      operation has completed, or if an error occurs, the app will be notified with
-**      NFA_I93_CMD_CPLT_EVT.
+**      Data is returned to the application using the NFA_DATA_EVT. When the
+**      read operation has completed, or if an error occurs, the app will be
+**      notified with NFA_I93_CMD_CPLT_EVT.
 **
 ** Returns:
 **      NFA_STATUS_OK if successfully initiated
@@ -736,11 +740,12 @@
 ** Function         NFA_RwI93GetMultiBlockSecurityStatus
 **
 ** Description:
-**      Send Get Multiple block security status command to the activated ISO 15693 tag.
+**      Send Get Multiple block security status command to the activated ISO
+**      15693 tag.
 **
-**      Data is returned to the application using the NFA_DATA_EVT. When the read
-**      operation has completed, or if an error occurs, the app will be notified with
-**      NFA_I93_CMD_CPLT_EVT.
+**      Data is returned to the application using the NFA_DATA_EVT. When the
+**      read operation has completed, or if an error occurs, the app will be
+**      notified with NFA_I93_CMD_CPLT_EVT.
 **
 ** Returns:
 **      NFA_STATUS_OK if successfully initiated
diff --git a/src/nfa/include/nfa_snep_api.h b/src/nfa/include/nfa_snep_api.h
index e44d7ca..5bb51cd 100644
--- a/src/nfa/include/nfa_snep_api.h
+++ b/src/nfa/include/nfa_snep_api.h
@@ -197,13 +197,15 @@
 **
 ** Function         NFA_SnepStartDefaultServer
 **
-** Description      This function is called to listen to SAP, 0x04 as SNEP default
-**                  server ("urn:nfc:sn:snep") on LLCP.
+** Description      This function is called to listen to SAP, 0x04 as SNEP
+**                  default server ("urn:nfc:sn:snep") on LLCP.
 **
-**                  NFA_SNEP_DEFAULT_SERVER_STARTED_EVT without data will be returned.
+**                  NFA_SNEP_DEFAULT_SERVER_STARTED_EVT without data will be
+**                  returned.
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
@@ -217,10 +219,12 @@
 **
 ** Description      This function is called to stop SNEP default server on LLCP.
 **
-**                  NFA_SNEP_DEFAULT_SERVER_STOPPED_EVT without data will be returned.
+**                  NFA_SNEP_DEFAULT_SERVER_STOPPED_EVT without data will be
+**                  returned.
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
@@ -234,19 +238,23 @@
 **
 ** Description      This function is called to listen to a SAP as SNEP server.
 **
-**                  If server_sap is set to NFA_SNEP_ANY_SAP, then NFA will allocate
-**                  a SAP between LLCP_LOWER_BOUND_SDP_SAP and LLCP_UPPER_BOUND_SDP_SAP
+**                  If server_sap is set to NFA_SNEP_ANY_SAP, then NFA will
+**                  allocate a SAP between LLCP_LOWER_BOUND_SDP_SAP and
+**                  LLCP_UPPER_BOUND_SDP_SAP
 **
-**                  NFC Forum default SNEP server ("urn:nfc:sn:snep") may be launched
-**                  by NFA_SnepStartDefaultServer ().
+**                  NFC Forum default SNEP server ("urn:nfc:sn:snep") may be
+**                  launched by NFA_SnepStartDefaultServer ().
 **
-**                  NFA_SNEP_REG_EVT will be returned with status, handle and service name.
+**                  NFA_SNEP_REG_EVT will be returned with status, handle and
+**                  service name.
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
-**                  NFA_STATUS_INVALID_PARAM if p_service_name or p_cback is NULL
+**                  NFA_STATUS_INVALID_PARAM if p_service_name or p_cback is
+**                  NULL
 **                  NFA_STATUS_FAILED otherwise
 **
 *******************************************************************************/
@@ -277,9 +285,10 @@
 **                  or SNEP client. Application shall use reg_handle returned in
 **                  NFA_SNEP_REG_EVT.
 **
-** Note:            If this function is called to de-register a SNEP server and RF
-**                  discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If this function is called to de-register a SNEP server and
+**                  RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_BAD_HANDLE if handle is not valid
@@ -292,16 +301,18 @@
 **
 ** Function         NFA_SnepConnect
 **
-** Description      This function is called by client to create data link connection
-**                  to SNEP server on peer device.
+** Description      This function is called by client to create data link
+**                  connection to SNEP server on peer device.
 **
-**                  Client handle and service name of server to connect shall be provided.
-**                  A conn_handle will be returned in NFA_SNEP_CONNECTED_EVT, if
-**                  successfully connected. Otherwise NFA_SNEP_DISC_EVT will be returned.
+**                  Client handle and service name of server to connect shall be
+**                  provided. A conn_handle will be returned in
+**                  NFA_SNEP_CONNECTED_EVT, if successfully connected. Otherwise
+**                  NFA_SNEP_DISC_EVT will be returned.
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_BAD_HANDLE if handle is not valid
-**                  NFA_STATUS_INVALID_PARAM if p_service_name or p_cback is NULL
+**                  NFA_STATUS_INVALID_PARAM if p_service_name or p_cback is
+**                  NULL
 **                  NFA_STATUS_FAILED otherwise
 **
 *******************************************************************************/
@@ -314,10 +325,11 @@
 **
 ** Description      This function is called by client to send GET request.
 **
-**                  Application shall allocate a buffer and put NDEF message with
-**                  desired record type to get from server. NDEF message from server
-**                  will be returned in the same buffer with NFA_SNEP_GET_RESP_EVT.
-**                  The size of buffer will be used as "Acceptable Length".
+**                  Application shall allocate a buffer and put NDEF message
+**                  with desired record type to get from server. NDEF message
+**                  from server will be returned in the same buffer with
+**                  NFA_SNEP_GET_RESP_EVT. The size of buffer will be used as
+**                  "Acceptable Length".
 **
 **                  NFA_SNEP_GET_RESP_EVT or NFA_SNEP_DISC_EVT will be returned
 **                  through registered p_cback. Application may free the buffer
@@ -340,16 +352,17 @@
 **
 ** Description      This function is called by client to send PUT request.
 **
-**                  Application shall allocate a buffer and put desired NDEF message
-**                  to send to server.
+**                  Application shall allocate a buffer and put desired NDEF
+**                  message to send to server.
 **
 **                  NFA_SNEP_PUT_RESP_EVT or NFA_SNEP_DISC_EVT will be returned
-**                  through p_cback. Application may free the buffer after receiving
-**                  these events.
+**                  through p_cback. Application may free the buffer after
+**                  receiving these events.
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_BAD_HANDLE if handle is not valid
-**                  NFA_STATUS_INVALID_PARAM if p_service_name or p_cback is NULL
+**                  NFA_STATUS_INVALID_PARAM if p_service_name or p_cback is
+**                  NULL
 **                  NFA_STATUS_FAILED otherwise
 **
 *******************************************************************************/
@@ -361,26 +374,28 @@
 **
 ** Function         NFA_SnepGetResponse
 **
-** Description      This function is called by server to send response of GET request.
+** Description      This function is called by server to send response of GET
+**                  request.
 **
 **                  When server application receives NFA_SNEP_ALLOC_BUFF_EVT,
 **                  it shall allocate a buffer for incoming NDEF message and
-**                  pass the pointer within callback context. This buffer will be
-**                  returned with NFA_SNEP_GET_REQ_EVT after receiving complete
-**                  NDEF message. If buffer is not allocated, NFA_SNEP_RESP_CODE_NOT_FOUND
-**                  (Note:There is no proper response code for this case)
-**                  or NFA_SNEP_RESP_CODE_REJECT will be sent to client.
+**                  pass the pointer within callback context. This buffer will
+**                  be returned with NFA_SNEP_GET_REQ_EVT after receiving
+**                  complete NDEF message. If buffer is not allocated,
+**                  NFA_SNEP_RESP_CODE_NOT_FOUND (Note:There is no proper
+**                  response code for this case) or NFA_SNEP_RESP_CODE_REJECT
+**                  will be sent to client.
 **
-**                  Server application shall provide conn_handle which is received in
-**                  NFA_SNEP_GET_REQ_EVT.
+**                  Server application shall provide conn_handle which is
+**                  received in NFA_SNEP_GET_REQ_EVT.
 **
-**                  Server application shall allocate a buffer and put NDEF message if
-**                  response code is NFA_SNEP_RESP_CODE_SUCCESS. Otherwise, ndef_length
-**                  shall be set to zero.
+**                  Server application shall allocate a buffer and put NDEF
+**                  message if response code is NFA_SNEP_RESP_CODE_SUCCESS.
+**                  Otherwise, ndef_length shall be set to zero.
 **
-**                  NFA_SNEP_GET_RESP_CMPL_EVT or NFA_SNEP_DISC_EVT will be returned
-**                  through registered callback function. Application may free
-**                  the buffer after receiving these events.
+**                  NFA_SNEP_GET_RESP_CMPL_EVT or NFA_SNEP_DISC_EVT will be
+**                  returned through registered callback function. Application
+**                  may free the buffer after receiving these events.
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_BAD_HANDLE if handle is not valid
@@ -396,22 +411,24 @@
 **
 ** Function         NFA_SnepPutResponse
 **
-** Description      This function is called by server to send response of PUT request.
+** Description      This function is called by server to send response of PUT
+**                  request.
 **
 **                  When server application receives NFA_SNEP_ALLOC_BUFF_EVT,
 **                  it shall allocate a buffer for incoming NDEF message and
-**                  pass the pointer within callback context. This buffer will be
-**                  returned with NFA_SNEP_PUT_REQ_EVT after receiving complete
-**                  NDEF message.  If buffer is not allocated, NFA_SNEP_RESP_CODE_REJECT
-**                  will be sent to client or NFA will discard request and send
-**                  NFA_SNEP_RESP_CODE_SUCCESS (Note:There is no proper response code for
-**                  this case).
+**                  pass the pointer within callback context. This buffer will
+**                  be returned with NFA_SNEP_PUT_REQ_EVT after receiving
+**                  complete NDEF message.  If buffer is not allocated,
+**                  NFA_SNEP_RESP_CODE_REJECT will be sent to client or NFA will
+**                  discard request and send NFA_SNEP_RESP_CODE_SUCCESS
+**                  (Note:There is no proper response code for this case).
 **
-**                  Server application shall provide conn_handle which is received in
-**                  NFA_SNEP_PUT_REQ_EVT.
+**                  Server application shall provide conn_handle which is
+**                  received in NFA_SNEP_PUT_REQ_EVT.
 **
-**                  NFA_SNEP_DISC_EVT will be returned through registered callback
-**                  function when client disconnects data link connection.
+**                  NFA_SNEP_DISC_EVT will be returned through registered
+**                  callback function when client disconnects data link
+**                  connection.
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_BAD_HANDLE if handle is not valid
@@ -428,11 +445,11 @@
 ** Description      This function is called to disconnect data link connection.
 **                  discard any pending data if flush is set to TRUE
 **
-**                  Client application shall provide conn_handle in NFA_SNEP_GET_RESP_EVT
-**                  or NFA_SNEP_PUT_RESP_EVT.
+**                  Client application shall provide conn_handle in
+**                  NFA_SNEP_GET_RESP_EVT or NFA_SNEP_PUT_RESP_EVT.
 **
-**                  Server application shall provide conn_handle in NFA_SNEP_GET_REQ_EVT
-**                  or NFA_SNEP_PUT_REQ_EVT.
+**                  Server application shall provide conn_handle in
+**                  NFA_SNEP_GET_REQ_EVT or NFA_SNEP_PUT_REQ_EVT.
 **
 **                  NFA_SNEP_DISC_EVT will be returned
 **
diff --git a/src/nfa/p2p/nfa_p2p_act.c b/src/nfa/p2p/nfa_p2p_act.c
index 1ae99d9..0938bdf 100644
--- a/src/nfa/p2p/nfa_p2p_act.c
+++ b/src/nfa/p2p/nfa_p2p_act.c
@@ -424,7 +424,8 @@
         {
             /*
             ** LLCP link has been deactivated before receiving CC or DM.
-            ** Return NFA_P2P_DISC_EVT to indicate failure of creating connection
+            ** Return NFA_P2P_DISC_EVT to indicate failure of creating
+            ** connection
             */
 
             evt_data.disc.handle = (NFA_HANDLE_GROUP_P2P | local_sap);
@@ -783,8 +784,9 @@
 **
 ** Function         nfa_p2p_dereg
 **
-** Description      Deallocate a service as server or client and deregister to LLCP
-**                  LLCP will deallocate data link connection created by this server
+** Description      Deallocate a service as server or client and deregister to
+**                  LLCP. LLCP will deallocate data link connection created by
+**                  this server
 **
 ** Returns          TRUE to deallocate buffer
 **
diff --git a/src/nfa/p2p/nfa_p2p_api.c b/src/nfa/p2p/nfa_p2p_api.c
index 21e2113..764afd2 100644
--- a/src/nfa/p2p/nfa_p2p_api.c
+++ b/src/nfa/p2p/nfa_p2p_api.c
@@ -39,19 +39,22 @@
 **
 ** Function         NFA_P2pRegisterServer
 **
-** Description      This function is called to listen to a SAP as server on LLCP.
+** Description      This function is called to listen to a SAP as server on
+**                  LLCP.
 **
-**                  NFA_P2P_REG_SERVER_EVT will be returned with status and handle.
+**                  NFA_P2P_REG_SERVER_EVT will be returned with status and
+**                  handle.
 **
-**                  If server_sap is set to NFA_P2P_ANY_SAP, then NFA will allocate
-**                  a SAP between LLCP_LOWER_BOUND_SDP_SAP and LLCP_UPPER_BOUND_SDP_SAP
-**                  Otherwise, server_sap must be between (LLCP_SDP_SAP + 1) and
-**                  LLCP_UPPER_BOUND_SDP_SAP
+**                  If server_sap is set to NFA_P2P_ANY_SAP, then NFA will
+**                  allocate a SAP between LLCP_LOWER_BOUND_SDP_SAP and
+**                  LLCP_UPPER_BOUND_SDP_SAP Otherwise, server_sap must be
+**                  between (LLCP_SDP_SAP + 1) and LLCP_UPPER_BOUND_SDP_SAP
 **
 **                  link_type : NFA_P2P_LLINK_TYPE and/or NFA_P2P_DLINK_TYPE
 **
-** Note:            If RF discovery is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If RF discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
@@ -105,9 +108,11 @@
 **
 ** Function         NFA_P2pRegisterClient
 **
-** Description      This function is called to register a client service on LLCP.
+** Description      This function is called to register a client service on
+**                  LLCP.
 **
-**                  NFA_P2P_REG_CLIENT_EVT will be returned with status and handle.
+**                  NFA_P2P_REG_CLIENT_EVT will be returned with status and
+**                  handle.
 **
 **                  link_type : NFA_P2P_LLINK_TYPE and/or NFA_P2P_DLINK_TYPE
 **
@@ -151,9 +156,10 @@
 ** Description      This function is called to stop listening to a SAP as server
 **                  or stop client service on LLCP.
 **
-** Note:            If this function is called to de-register a server and RF discovery
-**                  is started, NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT
-**                  should happen before calling this function
+** Note:            If this function is called to de-register a server and RF
+**                  discovery is started,
+**                  NFA_StopRfDiscovery()/NFA_RF_DISCOVERY_STOPPED_EVT should
+**                  happen before calling this function
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_BAD_HANDLE if handle is not valid
@@ -312,9 +318,11 @@
 ** Description      This function is called to disconnect an existing or
 **                  connecting data link connection.
 **
-**                  discard any pending data on data link connection if flush is set to TRUE
+**                  discard any pending data on data link connection if flush is
+**                  set to TRUE
 **
-**                  NFA_P2P_DISC_EVT will be returned after data link connection is disconnected
+**                  NFA_P2P_DISC_EVT will be returned after data link connection
+**                  is disconnected
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_BAD_HANDLE if handle is not valid
@@ -366,8 +374,8 @@
 **
 ** Function         NFA_P2pConnectByName
 **
-** Description      This function is called to create a connection-oriented transport
-**                  by a service name.
+** Description      This function is called to create a connection-oriented
+**                  transport by a service name.
 **                  NFA_P2P_CONNECTED_EVT if success
 **                  NFA_P2P_DISC_EVT if failed
 **
@@ -427,8 +435,8 @@
 **
 ** Function         NFA_P2pConnectBySap
 **
-** Description      This function is called to create a connection-oriented transport
-**                  by a SAP.
+** Description      This function is called to create a connection-oriented
+**                  transport by a SAP.
 **                  NFA_P2P_CONNECTED_EVT if success
 **                  NFA_P2P_DISC_EVT if failed
 **
@@ -492,7 +500,8 @@
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_BAD_HANDLE if handle is not valid
-**                  NFA_STATUS_BAD_LENGTH if data length is more than remote link MIU
+**                  NFA_STATUS_BAD_LENGTH if data length is more than remote
+**                  link MIU
 **                  NFA_STATUS_CONGESTED  if congested
 **                  NFA_STATUS_FAILED otherwise
 **
@@ -580,12 +589,14 @@
 ** Function         NFA_P2pReadUI
 **
 ** Description      This function is called to read data on connectionless
-**                  transport when receiving NFA_P2P_DATA_EVT with NFA_P2P_LLINK_TYPE.
+**                  transport when receiving NFA_P2P_DATA_EVT with
+**                  NFA_P2P_LLINK_TYPE.
 **
 **                  - Remote SAP who sent UI PDU is returned.
-**                  - Information of UI PDU up to max_data_len is copied into p_data.
-**                  - If more information of UI PDU or more UI PDU in queue then more
-**                    is returned to TRUE.
+**                  - Information of UI PDU up to max_data_len is copied into
+**                    p_data.
+**                  - If more information of UI PDU or more UI PDU in queue then
+**                    more is returned to TRUE.
 **                  - Information of next UI PDU is not concatenated.
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
@@ -772,11 +783,13 @@
 ** Function         NFA_P2pReadData
 **
 ** Description      This function is called to read data on connection-oriented
-**                  transport when receiving NFA_P2P_DATA_EVT with NFA_P2P_DLINK_TYPE.
+**                  transport when receiving NFA_P2P_DATA_EVT with
+**                  NFA_P2P_DLINK_TYPE.
 **
-**                  - Information of I PDU is copied into p_data up to max_data_len.
-**                  - If more information of I PDU or more I PDU in queue, then more
-**                    is returned to TRUE.
+**                  - Information of I PDU is copied into p_data up to
+**                    max_data_len.
+**                  - If more information of I PDU or more I PDU in queue, then
+**                    more is returned to TRUE.
 **                  - Information of next I PDU is not concatenated.
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
@@ -923,8 +936,8 @@
 ** Function         NFA_P2pGetLinkInfo
 **
 ** Description      This function is called to get local/remote link MIU and
-**                  Well-Known Service list encoded as a 16-bit field of connected LLCP.
-**                  NFA_P2P_LINK_INFO_EVT will be returned.
+**                  Well-Known Service list encoded as a 16-bit field of
+**                  connected LLCP. NFA_P2P_LINK_INFO_EVT will be returned.
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_BAD_HANDLE if server or client is not registered
@@ -971,8 +984,8 @@
 **
 ** Function         NFA_P2pGetRemoteSap
 **
-** Description      This function is called to get SAP associated by service name
-**                  on connected remote LLCP.
+** Description      This function is called to get SAP associated by service
+**                  name on connected remote LLCP.
 **                  NFA_P2P_SDP_EVT will be returned.
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
@@ -1032,11 +1045,15 @@
 **                  - Option parameter (LLCP_OPT_VALUE)
 **                  - Response Waiting Time Index (LLCP_WAITING_TIME)
 **                  - Local Link Timeout (LLCP_LTO_VALUE)
-**                  - Inactivity Timeout as initiator role (LLCP_INIT_INACTIVITY_TIMEOUT)
-**                  - Inactivity Timeout as target role (LLCP_TARGET_INACTIVITY_TIMEOUT)
+**                  - Inactivity Timeout as initiator role
+**                    (LLCP_INIT_INACTIVITY_TIMEOUT)
+**                  - Inactivity Timeout as target role
+**                    (LLCP_TARGET_INACTIVITY_TIMEOUT)
 **                  - Delay SYMM response (LLCP_DELAY_RESP_TIME)
-**                  - Data link connection timeout (LLCP_DATA_LINK_CONNECTION_TOUT)
-**                  - Delay timeout to send first PDU as initiator (LLCP_DELAY_TIME_TO_SEND_FIRST_PDU)
+**                  - Data link connection timeout
+**                    (LLCP_DATA_LINK_CONNECTION_TOUT)
+**                  - Delay timeout to send first PDU as initiator
+**                    (LLCP_DELAY_TIME_TO_SEND_FIRST_PDU)
 **
 ** Returns          NFA_STATUS_OK if successfully initiated
 **                  NFA_STATUS_FAILED otherwise
diff --git a/src/nfa/p2p/nfa_p2p_main.c b/src/nfa/p2p/nfa_p2p_main.c
index f16efff..ff74fdb 100644
--- a/src/nfa/p2p/nfa_p2p_main.c
+++ b/src/nfa/p2p/nfa_p2p_main.c
@@ -363,7 +363,8 @@
             else if ((nfa_p2p_cb.is_active_mode) && (reason == LLCP_LINK_TIMEOUT))
             {
                 /*
-                ** target needs to trun off RF in case of receiving invalid frame from initiator
+                ** target needs to trun off RF in case of receiving invalid
+                ** frame from initiator
                 */
                 P2P_TRACE_DEBUG0 ("Got LLCP_LINK_TIMEOUT in active mode on target");
                 nfa_dm_rf_deactivate (NFA_DEACTIVATE_TYPE_DISCOVERY);
@@ -612,8 +613,8 @@
 ** Function         nfa_p2p_disable_listening
 **
 ** Description      Remove listen technologies and protocols for LLCP and
-**                  deregister callback from NFA DM discovery if all of P2P/CHO/SNEP
-**                  doesn't listen LLCP any more.
+**                  deregister callback from NFA DM discovery if all of
+**                  P2P/CHO/SNEP doesn't listen LLCP any more.
 **                  If LLCP WKS is changed then ATR_RES will be updated.
 **
 ** Returns          void
diff --git a/src/nfa/rw/nfa_rw_api.c b/src/nfa/rw/nfa_rw_api.c
index 608b9f1..9c94dd2 100644
--- a/src/nfa/rw/nfa_rw_api.c
+++ b/src/nfa/rw/nfa_rw_api.c
@@ -50,8 +50,8 @@
 **                  size, etc.).
 **
 **                  It is not mandatory to call this function -  NFA_RwReadNDef
-**                  and NFA_RwWriteNDef will perform NDEF detection internally if
-**                  not performed already. This API may be called to get a
+**                  and NFA_RwWriteNDef will perform NDEF detection internally
+**                  if not performed already. This API may be called to get a
 **                  tag's NDEF size before issuing a write-request.
 **
 ** Returns:
@@ -89,18 +89,20 @@
 **                  appropriate method for the currently activated tag.
 **
 **                  Upon successful completion of NDEF detection (if performed),
-**                  a NFA_NDEF_DETECT_EVT will be sent, to notify the application
-**                  of the NDEF attributes (NDEF total memory size, current size,
-**                  etc.).
+**                  a NFA_NDEF_DETECT_EVT will be sent, to notify the
+**                  application of the NDEF attributes (NDEF total memory size,
+**                  current size, etc.).
 **
 **                  Upon receiving the NDEF message, the message will be sent to
 **                  the handler registered with NFA_RegisterNDefTypeHandler or
-**                  NFA_RequestExclusiveRfControl (if exclusive RF mode is active)
+**                  NFA_RequestExclusiveRfControl (if exclusive RF mode is
+**                  active)
 **
 ** Returns:
 **                  NFA_STATUS_OK if successfully initiated
 **                  NFC_STATUS_REFUSED if tag does not support NDEF
-**                  NFC_STATUS_NOT_INITIALIZED if NULL NDEF was detected on the tag
+**                  NFC_STATUS_NOT_INITIALIZED if NULL NDEF was detected on the
+**                  tag
 **                  NFA_STATUS_FAILED otherwise
 **
 *******************************************************************************/
@@ -315,15 +317,17 @@
 **                  calling NFA_RwDetectNDef and should expect to receive
 **                  NFA_NDEF_DETECT_EVT instead of NFA_TLV_DETECT_EVT
 **
-**                  It is not mandatory to call this function -  NFA_RwDetectNDef,
-**                  NFA_RwReadNDef and NFA_RwWriteNDef will perform TLV detection
-**                  internally if not performed already. An application may call
-**                  this API to check the a tag/card-emulator's total Reserved/
+**                  It is not mandatory to call this function -
+**                  NFA_RwDetectNDef, NFA_RwReadNDef and NFA_RwWriteNDef will
+**                  perform TLV detection internally if not performed already.
+**                  An application may call this API to check the a
+**                  tag/card-emulator's total Reserved/
 **                  Lock bytes before issuing a write-request.
 **
 ** Returns:
 **                  NFA_STATUS_OK if successfully initiated
-**                  NFC_STATUS_REFUSED if tlv_type is NDEF & tag won't support NDEF
+**                  NFC_STATUS_REFUSED if tlv_type is NDEF & tag won't support
+**                  NDEF
 **                  NFA_STATUS_FAILED otherwise
 **
 *******************************************************************************/
@@ -367,9 +371,9 @@
 ** Description:
 **      Send a RID command to the activated Type 1 tag.
 **
-**      Data is returned to the application using the NFA_DATA_EVT. When the read
-**      operation has completed, or if an error occurs, the app will be notified with
-**      NFA_READ_CPLT_EVT.
+**      Data is returned to the application using the NFA_DATA_EVT. When the
+**      read operation has completed, or if an error occurs, the app will be
+**      notified with NFA_READ_CPLT_EVT.
 **
 ** Returns:
 **      NFA_STATUS_OK if successfully initiated
@@ -399,9 +403,9 @@
 ** Description:
 **      Send a RALL command to the activated Type 1 tag.
 **
-**      Data is returned to the application using the NFA_DATA_EVT. When the read
-**      operation has completed, or if an error occurs, the app will be notified with
-**      NFA_READ_CPLT_EVT.
+**      Data is returned to the application using the NFA_DATA_EVT. When the
+**      read operation has completed, or if an error occurs, the app will be
+**      notified with NFA_READ_CPLT_EVT.
 **
 ** Returns:
 **      NFA_STATUS_OK if successfully initiated
@@ -431,9 +435,9 @@
 ** Description:
 **      Send a READ command to the activated Type 1 tag.
 **
-**      Data is returned to the application using the NFA_DATA_EVT. When the read
-**      operation has completed, or if an error occurs, the app will be notified with
-**      NFA_READ_CPLT_EVT.
+**      Data is returned to the application using the NFA_DATA_EVT. When the
+**      read operation has completed, or if an error occurs, the app will be
+**      notified with NFA_READ_CPLT_EVT.
 **
 ** Returns:
 **      NFA_STATUS_OK if successfully initiated
@@ -465,9 +469,9 @@
 ** Description:
 **      Send a WRITE command to the activated Type 1 tag.
 **
-**      Data is returned to the application using the NFA_DATA_EVT. When the write
-**      operation has completed, or if an error occurs, the app will be notified with
-**      NFA_WRITE_CPLT_EVT.
+**      Data is returned to the application using the NFA_DATA_EVT. When the
+**      write operation has completed, or if an error occurs, the app will be
+**      notified with NFA_WRITE_CPLT_EVT.
 **
 ** Returns:
 **      NFA_STATUS_OK if successfully initiated
@@ -501,9 +505,9 @@
 ** Description:
 **      Send a RSEG command to the activated Type 1 tag.
 **
-**      Data is returned to the application using the NFA_DATA_EVT. When the read
-**      operation has completed, or if an error occurs, the app will be notified with
-**      NFA_READ_CPLT_EVT.
+**      Data is returned to the application using the NFA_DATA_EVT. When the
+**      read operation has completed, or if an error occurs, the app will be
+**      notified with NFA_READ_CPLT_EVT.
 **
 ** Returns:
 **      NFA_STATUS_OK if successfully initiated
@@ -534,9 +538,9 @@
 ** Description:
 **      Send a READ8 command to the activated Type 1 tag.
 **
-**      Data is returned to the application using the NFA_DATA_EVT. When the read
-**      operation has completed, or if an error occurs, the app will be notified with
-**      NFA_READ_CPLT_EVT.
+**      Data is returned to the application using the NFA_DATA_EVT. When the
+**      read operation has completed, or if an error occurs, the app will be
+**      notified with NFA_READ_CPLT_EVT.
 **
 ** Returns:
 **      NFA_STATUS_OK if successfully initiated
@@ -567,9 +571,9 @@
 ** Description:
 **      Send a WRITE8_E / WRITE8_NE command to the activated Type 1 tag.
 **
-**      Data is returned to the application using the NFA_DATA_EVT. When the read
-**      operation has completed, or if an error occurs, the app will be notified with
-**      NFA_READ_CPLT_EVT.
+**      Data is returned to the application using the NFA_DATA_EVT. When the
+**      read operation has completed, or if an error occurs, the app will be
+**      notified with NFA_READ_CPLT_EVT.
 **
 ** Returns:
 **      NFA_STATUS_OK if successfully initiated
@@ -603,9 +607,9 @@
 ** Description:
 **      Send a READ command to the activated Type 2 tag.
 **
-**      Data is returned to the application using the NFA_DATA_EVT. When the read
-**      operation has completed, or if an error occurs, the app will be notified with
-**      NFA_READ_CPLT_EVT.
+**      Data is returned to the application using the NFA_DATA_EVT. When the
+**      read operation has completed, or if an error occurs, the app will be
+**      notified with NFA_READ_CPLT_EVT.
 **
 ** Returns:
 **      NFA_STATUS_OK if successfully initiated
@@ -675,8 +679,8 @@
 ** Description:
 **      Send SECTOR SELECT command to the activated Type 2 tag.
 **
-**      When the sector select operation has completed (or if an error occurs), the
-**      app will be notified with NFA_SECTOR_SELECT_CPLT_EVT.
+**      When the sector select operation has completed (or if an error occurs),
+**      the app will be notified with NFA_SECTOR_SELECT_CPLT_EVT.
 **
 ** Returns:
 **      NFA_STATUS_OK if successfully initiated
@@ -710,9 +714,9 @@
 ** Description:
 **      Send a CHECK (read) command to the activated Type 3 tag.
 **
-**      Data is returned to the application using the NFA_DATA_EVT. When the read
-**      operation has completed, or if an error occurs, the app will be notified with
-**      NFA_READ_CPLT_EVT.
+**      Data is returned to the application using the NFA_DATA_EVT. When the
+**      read operation has completed, or if an error occurs, the app will be
+**      notified with NFA_READ_CPLT_EVT.
 **
 ** Returns:
 **      NFA_STATUS_OK if successfully initiated
@@ -910,9 +914,9 @@
 ** Description:
 **      Send Read Single Block command to the activated ISO 15693 tag.
 **
-**      Data is returned to the application using the NFA_DATA_EVT. When the read
-**      operation has completed, or if an error occurs, the app will be notified with
-**      NFA_I93_CMD_CPLT_EVT.
+**      Data is returned to the application using the NFA_DATA_EVT. When the
+**      read operation has completed, or if an error occurs, the app will be
+**      notified with NFA_I93_CMD_CPLT_EVT.
 **
 ** Returns:
 **      NFA_STATUS_OK if successfully initiated
@@ -1051,9 +1055,9 @@
 ** Description:
 **      Send Read Multiple Block command to the activated ISO 15693 tag.
 **
-**      Data is returned to the application using the NFA_DATA_EVT. When the read
-**      operation has completed, or if an error occurs, the app will be notified with
-**      NFA_I93_CMD_CPLT_EVT.
+**      Data is returned to the application using the NFA_DATA_EVT. When the
+**      read operation has completed, or if an error occurs, the app will be
+**      notified with NFA_I93_CMD_CPLT_EVT.
 **
 ** Returns:
 **      NFA_STATUS_OK if successfully initiated
@@ -1463,11 +1467,12 @@
 ** Function         NFA_RwI93GetMultiBlockSecurityStatus
 **
 ** Description:
-**      Send Get Multiple block security status command to the activated ISO 15693 tag.
+**      Send Get Multiple block security status command to the activated ISO
+**      15693 tag.
 **
-**      Data is returned to the application using the NFA_DATA_EVT. When the read
-**      operation has completed, or if an error occurs, the app will be notified with
-**      NFA_I93_CMD_CPLT_EVT.
+**      Data is returned to the application using the NFA_DATA_EVT. When the
+**      read operation has completed, or if an error occurs, the app will be
+**      notified with NFA_I93_CMD_CPLT_EVT.
 **
 ** Returns:
 **      NFA_STATUS_OK if successfully initiated
diff --git a/src/nfa/sys/nfa_sys_cback.c b/src/nfa/sys/nfa_sys_cback.c
index 5a67f3c..ad065bf 100644
--- a/src/nfa/sys/nfa_sys_cback.c
+++ b/src/nfa/sys/nfa_sys_cback.c
@@ -32,7 +32,8 @@
 **
 ** Function         nfa_sys_cback_reg_enable_complete
 **
-** Description      Called to register an initialization complete callback function
+** Description      Called to register an initialization complete callback
+**                  function
 **
 ** Returns          void
 **
@@ -72,8 +73,8 @@
 **
 ** Function         nfa_sys_cback_reg_nfcc_power_mode_proc_complete
 **
-** Description      Called to register a callback function for complete of processing
-**                  NFCC power mode change from NFA sub-systems
+** Description      Called to register a callback function for complete of
+**                  processing NFCC power mode change from NFA sub-systems
 **
 ** Returns          void
 **
@@ -88,8 +89,8 @@
 **
 ** Function         nfa_sys_cback_notify_nfcc_power_mode_proc_complete
 **
-** Description      Called by other NFA subsystems to notify processing NFCC power
-**                  mode is complete
+** Description      Called by other NFA subsystems to notify processing NFCC
+**                  power mode is complete
 **
 ** Returns          void
 **
@@ -102,7 +103,8 @@
                        nfa_sys_cb.proc_nfcc_pwr_mode_cplt_flags,
                        nfa_sys_cb.proc_nfcc_pwr_mode_cplt_mask);
 
-    if (  (nfa_sys_cb.proc_nfcc_pwr_mode_cplt_flags == nfa_sys_cb.proc_nfcc_pwr_mode_cplt_mask) /* except SYS */
+    /* except SYS */
+    if (  (nfa_sys_cb.proc_nfcc_pwr_mode_cplt_flags == nfa_sys_cb.proc_nfcc_pwr_mode_cplt_mask)
         &&(nfa_sys_cb.p_proc_nfcc_pwr_mode_cmpl_cback)  )
     {
         nfa_sys_cb.p_proc_nfcc_pwr_mode_cmpl_cback ();
diff --git a/src/nfc/include/llcp_api.h b/src/nfc/include/llcp_api.h
index aa94490..a154ee4 100644
--- a/src/nfc/include/llcp_api.h
+++ b/src/nfc/include/llcp_api.h
@@ -273,14 +273,17 @@
 ** Function         LLCP_GetDiscoveryConfig
 **
 ** Description      Returns discovery config for LLCP MAC link activation
-**                  This function is called to get general bytes for NFC_PMID_ATR_REQ_GEN_BYTES
-**                  or NFC_PMID_ATR_RES_GEN_BYTES before starting discovery.
+**                  This function is called to get general bytes for
+**                  NFC_PMID_ATR_REQ_GEN_BYTES or NFC_PMID_ATR_RES_GEN_BYTES
+**                  before starting discovery.
 **
 **                  wt:Waiting time 0 - 8, only for listen
-**                  p_gen_bytes: pointer to store LLCP magic number and paramters
+**                  p_gen_bytes: pointer to store LLCP magic number and
+**                               paramters
 **                  p_gen_bytes_len: length of buffer for gen bytes as input
-**                                   (NOTE:it must be bigger than LLCP_MIN_GEN_BYTES)
-**                                   actual gen bytes size as output
+**                                   (NOTE:it must be bigger than
+**                                   LLCP_MIN_GEN_BYTES) actual gen bytes
+**                                   size as output
 **
 **                  Restrictions on the use of ISO 18092
 **                  1. The DID features shall not be used.
@@ -298,8 +301,8 @@
 **
 ** Function         LLCP_ActivateLink
 **
-** Description      This function will activate LLCP link with LR, WT and Gen Bytes
-**                  in activation NTF from NFCC.
+** Description      This function will activate LLCP link with LR, WT and Gen
+**                  Bytes in activation NTF from NFCC.
 **
 **                  LLCP_LINK_ACTIVATION_COMPLETE_EVT will be returned through
 **                  callback function if successful.
@@ -318,7 +321,8 @@
 ** Description      Deactivate LLCP link
 **
 **                  LLCP_LINK_DEACTIVATED_EVT will be returned through callback
-**                  when LLCP link is deactivated. Then NFC link may be deactivated.
+**                  when LLCP link is deactivated. Then NFC link may be
+**                  deactivated.
 **
 ** Returns          LLCP_STATUS_SUCCESS if success
 **
@@ -333,10 +337,12 @@
 **
 **                  reg_sap : Well-Known SAP except LM and SDP (0x02 - 0x0F)
 **                            Advertized by SDP (0x10 - 0x1F)
-**                            LLCP_INVALID_SAP, LLCP will allocate between 0x10 and 0x1F
+**                            LLCP_INVALID_SAP, LLCP will allocate between 0x10
+**                            and 0x1F
 **                  link_type : LLCP_LINK_TYPE_LOGICAL_DATA_LINK
 **                              and/or LLCP_LINK_TYPE_DATA_LINK_CONNECTION
-**                  p_service_name : Null-terminated string up to LLCP_MAX_SN_LEN
+**                  p_service_name : Null-terminated string up to
+**                                   LLCP_MAX_SN_LEN
 **
 ** Returns          SAP between 0x02 and 0x1F, if success
 **                  LLCP_INVALID_SAP, otherwise
@@ -411,7 +417,8 @@
 ** Description      Read information of UI PDU for local SAP
 **
 **                  - Remote SAP who sent UI PDU is returned.
-**                  - Information of UI PDU up to max_data_len is copied into p_data.
+**                  - Information of UI PDU up to max_data_len is copied into
+**                    p_data.
 **                  - Information of next UI PDU is not concatenated.
 **                  - Recommended max_data_len is link MIU of local device
 **
@@ -523,10 +530,11 @@
 **
 ** Description      Read information of I PDU for data link connection
 **
-**                  - Information of I PDU up to max_data_len is copied into p_data.
+**                  - Information of I PDU up to max_data_len is copied into
+**                    p_data.
 **                  - Information of next I PDU is not concatenated.
-**                  - Recommended max_data_len is data link connection MIU of local
-**                    end point
+**                  - Recommended max_data_len is data link connection MIU of
+**                    local end point
 **
 ** Returns          TRUE if more data in queue
 **
@@ -570,8 +578,8 @@
 **
 ** Description      This function is called to get LLCP_SAP_EVT_TX_COMPLETE
 **                  when Tx queue is empty and all PDU is acked.
-**                  This is one time event, so upper layer shall call this function
-**                  again to get next LLCP_SAP_EVT_TX_COMPLETE.
+**                  This is one time event, so upper layer shall call this
+**                  function again to get next LLCP_SAP_EVT_TX_COMPLETE.
 **
 ** Returns          LLCP_STATUS_SUCCESS if success
 **
@@ -645,8 +653,8 @@
 **
 ** Function         LLCP_DiscoverService
 **
-** Description      Return SAP of service name in connected device through callback
-**
+** Description      Return SAP of service name in connected device through
+**                  callback
 **
 ** Returns          LLCP_STATUS_SUCCESS if success
 **
@@ -674,7 +682,6 @@
 **
 ** Description      Set test parameters for LLCP
 **
-**
 ** Returns          void
 **
 *******************************************************************************/
diff --git a/src/nfc/include/ndef_utils.h b/src/nfc/include/ndef_utils.h
index a01f7cc..c18b30e 100644
--- a/src/nfc/include/ndef_utils.h
+++ b/src/nfc/include/ndef_utils.h
@@ -112,8 +112,8 @@
 **
 ** Function         NDEF_MsgGetRecLength
 **
-** Description      This function returns length of the current record in the given
-**                  NDEF message.
+** Description      This function returns length of the current record in the
+**                  given NDEF message.
 **
 ** Returns          Length of record
 **
@@ -151,7 +151,8 @@
 ** Description      This function gets a pointer to the last record in the
 **                  given NDEF message.
 **
-** Returns          Pointer to the start of the last record, or NULL if some problem
+** Returns          Pointer to the start of the last record, or NULL if some
+**                  problem
 **
 *******************************************************************************/
 extern uint8_t *NDEF_MsgGetLastRecInMsg (uint8_t *p_msg);
@@ -160,8 +161,8 @@
 **
 ** Function         NDEF_MsgGetFirstRecByType
 **
-** Description      This function gets a pointer to the first record with the given
-**                  record type in the given NDEF message.
+** Description      This function gets a pointer to the first record with the
+**                  given record type in the given NDEF message.
 **
 ** Returns          Pointer to the start of the record, or NULL
 **
@@ -172,8 +173,8 @@
 **
 ** Function         NDEF_MsgGetNextRecByType
 **
-** Description      This function gets a pointer to the next record with the given
-**                  record type in the given NDEF message.
+** Description      This function gets a pointer to the next record with the
+**                  given record type in the given NDEF message.
 **
 ** Returns          Pointer to the start of the record, or NULL
 **
@@ -184,8 +185,8 @@
 **
 ** Function         NDEF_MsgGetFirstRecById
 **
-** Description      This function gets a pointer to the first record with the given
-**                  record id in the given NDEF message.
+** Description      This function gets a pointer to the first record with the
+**                  given record id in the given NDEF message.
 **
 ** Returns          Pointer to the start of the record, or NULL
 **
@@ -196,8 +197,8 @@
 **
 ** Function         NDEF_MsgGetNextRecById
 **
-** Description      This function gets a pointer to the next record with the given
-**                  record id in the given NDEF message.
+** Description      This function gets a pointer to the next record with the
+**                  given record id in the given NDEF message.
 **
 ** Returns          Pointer to the start of the record, or NULL
 **
@@ -208,7 +209,8 @@
 **
 ** Function         NDEF_RecGetType
 **
-** Description      This function gets a pointer to the record type for the given NDEF record.
+** Description      This function gets a pointer to the record type for the
+**                  given NDEF record.
 **
 ** Returns          Pointer to Type (NULL if none). TNF and len are filled in.
 **
@@ -219,7 +221,8 @@
 **
 ** Function         NDEF_RecGetId
 **
-** Description      This function gets a pointer to the record id for the given NDEF record.
+** Description      This function gets a pointer to the record id for the given
+**                  NDEF record.
 **
 ** Returns          Pointer to Id (NULL if none). ID Len is filled in.
 **
@@ -230,9 +233,11 @@
 **
 ** Function         NDEF_RecGetPayload
 **
-** Description      This function gets a pointer to the payload for the given NDEF record.
+** Description      This function gets a pointer to the payload for the given
+**                  NDEF record.
 **
-** Returns          a pointer to the payload (NULL if none). Payload len filled in.
+** Returns          a pointer to the payload (NULL if none). Payload len filled
+**                  in.
 **
 *******************************************************************************/
 extern uint8_t *NDEF_RecGetPayload (uint8_t *p_rec, uint32_t *p_payload_len);
@@ -256,7 +261,8 @@
 **
 ** Function         NDEF_MsgAddRec
 **
-** Description      This function adds an NDEF record to the end of an NDEF message.
+** Description      This function adds an NDEF record to the end of an NDEF
+**                  message.
 **
 ** Returns          OK, or error if the record did not fit
 **                  *p_cur_size is updated
@@ -287,7 +293,8 @@
 **
 ** Function         NDEF_MsgAppendRec
 **
-** Description      This function adds NDEF records to the end of an NDEF message.
+** Description      This function adds NDEF records to the end of an NDEF
+**                  message.
 **
 ** Returns          OK, or error if the record did not fit
 **                  *p_cur_size is updated
@@ -300,8 +307,8 @@
 **
 ** Function         NDEF_MsgAppendPayload
 **
-** Description      This function appends extra payload to a specific record in the
-**                  given NDEF message
+** Description      This function appends extra payload to a specific record in
+**                  the given NDEF message
 **
 ** Returns          OK, or error if the extra payload did not fit
 **                  *p_cur_size is updated
@@ -314,8 +321,8 @@
 **
 ** Function         NDEF_MsgReplacePayload
 **
-** Description      This function replaces the payload of a specific record in the
-**                  given NDEF message
+** Description      This function replaces the payload of a specific record in
+**                  the given NDEF message
 **
 ** Returns          OK, or error if the new payload did not fit
 **                  *p_cur_size is updated
@@ -328,8 +335,8 @@
 **
 ** Function         NDEF_MsgReplaceType
 **
-** Description      This function replaces the type field of a specific record in the
-**                  given NDEF message
+** Description      This function replaces the type field of a specific record
+**                  in the given NDEF message
 **
 ** Returns          OK, or error if the new type field did not fit
 **                  *p_cur_size is updated
@@ -342,8 +349,8 @@
 **
 ** Function         NDEF_MsgReplaceId
 **
-** Description      This function replaces the ID field of a specific record in the
-**                  given NDEF message
+** Description      This function replaces the ID field of a specific record in
+**                  the given NDEF message
 **
 ** Returns          OK, or error if the new ID field did not fit
 **                  *p_cur_size is updated
diff --git a/src/nfc/include/nfc_api.h b/src/nfc/include/nfc_api.h
index 17e7ea5..4faead8 100644
--- a/src/nfc/include/nfc_api.h
+++ b/src/nfc/include/nfc_api.h
@@ -841,13 +841,16 @@
 ** Function         NFC_Enable
 **
 ** Description      This function enables NFC. Prior to calling NFC_Enable:
-**                  - the NFCC must be powered up, and ready to receive commands.
+**                  - the NFCC must be powered up, and ready to receive
+**                    commands.
 **                  - GKI must be enabled
 **                  - NFC_TASK must be started
-**                  - NCIT_TASK must be started (if using dedicated NCI transport)
+**                  - NCIT_TASK must be started (if using dedicated NCI
+**                    transport)
 **
 **                  This function opens the NCI transport (if applicable),
-**                  resets the NFC controller, and initializes the NFC subsystems.
+**                  resets the NFC controller, and initializes the NFC
+**                  subsystems.
 **
 **                  When the NFC startup procedure is completed, an
 **                  NFC_ENABLE_REVT is returned to the application using the
@@ -919,9 +922,9 @@
 **
 ** Function         NFC_GetConfig
 **
-** Description      This function is called to retrieve the parameter TLV from NFCC.
-**                  The response from NFCC is reported by tNFC_RESPONSE_CBACK
-**                  as NFC_GET_CONFIG_REVT.
+** Description      This function is called to retrieve the parameter TLV from
+**                  NFCC. The response from NFCC is reported by
+**                  tNFC_RESPONSE_CBACK as NFC_GET_CONFIG_REVT.
 **
 ** Parameters       num_ids - the number of parameter IDs
 **                  p_param_ids - the parameter ID list.
@@ -936,11 +939,11 @@
 **
 ** Function         NFC_NfceeDiscover
 **
-** Description      This function is called to enable or disable NFCEE Discovery.
-**                  The response from NFCC is reported by tNFC_RESPONSE_CBACK
-**                  as NFC_NFCEE_DISCOVER_REVT.
-**                  The notification from NFCC is reported by tNFC_RESPONSE_CBACK
-**                  as NFC_NFCEE_INFO_REVT.
+** Description      This function is called to enable or disable NFCEE
+**                  Discovery. The response from NFCC is reported by
+**                  tNFC_RESPONSE_CBACK as NFC_NFCEE_DISCOVER_REVT.
+**                  The notification from NFCC is reported by
+**                  tNFC_RESPONSE_CBACK as NFC_NFCEE_INFO_REVT.
 **
 ** Parameters       discover - 1 to enable discover, 0 to disable.
 **
@@ -970,9 +973,9 @@
 **
 ** Function         NFC_DiscoveryMap
 **
-** Description      This function is called to set the discovery interface mapping.
-**                  The response from NFCC is reported by tNFC_DISCOVER_CBACK as.
-**                  NFC_MAP_DEVT.
+** Description      This function is called to set the discovery interface
+**                  mapping. The response from NFCC is reported by
+**                  tNFC_DISCOVER_CBACK as. NFC_MAP_DEVT.
 **
 ** Parameters       num - the number of items in p_params.
 **                  p_maps - the discovery interface mappings
@@ -989,8 +992,8 @@
 ** Function         NFC_DiscoveryStart
 **
 ** Description      This function is called to start Polling and/or Listening.
-**                  The response from NFCC is reported by tNFC_DISCOVER_CBACK as.
-**                  NFC_START_DEVT. The notification from NFCC is reported by
+**                  The response from NFCC is reported by tNFC_DISCOVER_CBACK
+**                  as NFC_START_DEVT. The notification from NFCC is reported by
 **                  tNFC_DISCOVER_CBACK as NFC_RESULT_DEVT.
 **
 ** Parameters       num_params - the number of items in p_params.
@@ -1036,7 +1039,8 @@
 ** Parameters       dest_type - the destination type
 **                  id   - the NFCEE ID or RF Discovery ID .
 **                  protocol - the protocol
-**                  p_cback - the data callback function to receive data fron NFCC
+**                  p_cback - the data callback function to receive data from
+**                  NFCC
 **
 ** Returns          tNFC_STATUS
 **
@@ -1082,8 +1086,8 @@
 **
 ** Description      This function is called to set if nfc will reassemble
 **                  nci packet as much as its buffer can hold or it should not
-**                  reassemble but forward the fragmented nci packet to layer above.
-**                  If nci data pkt is fragmented, nfc may send multiple
+**                  reassemble but forward the fragmented nci packet to layer
+**                  above. If nci data pkt is fragmented, nfc may send multiple
 **                  NFC_DATA_CEVT with status NFC_STATUS_CONTINUE before sending
 **                  NFC_DATA_CEVT with status NFC_STATUS_OK based on reassembly
 **                  configuration and reassembly buffer size
@@ -1130,14 +1134,16 @@
 ** Function         NFC_Deactivate
 **
 ** Description      This function is called to stop the discovery process or
-**                  put the listen device in sleep mode or terminate the NFC link.
+**                  put the listen device in sleep mode or terminate the NFC
+**                  link.
 **
 **                  The response from NFCC is reported by tNFC_DISCOVER_CBACK
 **                  as NFC_DEACTIVATE_DEVT.
 **
 ** Parameters       deactivate_type - NFC_DEACTIVATE_TYPE_IDLE, to IDLE mode.
 **                                    NFC_DEACTIVATE_TYPE_SLEEP to SLEEP mode.
-**                                    NFC_DEACTIVATE_TYPE_SLEEP_AF to SLEEP_AF mode.
+**                                    NFC_DEACTIVATE_TYPE_SLEEP_AF to SLEEP_AF
+**                                    mode.
 **
 ** Returns          tNFC_STATUS
 **
@@ -1148,8 +1154,8 @@
 **
 ** Function         NFC_UpdateRFCommParams
 **
-** Description      This function is called to update RF Communication parameters
-**                  once the Frame RF Interface has been activated.
+** Description      This function is called to update RF Communication
+**                  parameters once the Frame RF Interface has been activated.
 **
 **                  The response from NFCC is reported by tNFC_RESPONSE_CBACK
 **                  as NFC_RF_COMM_PARAMS_UPDATE_REVT.
@@ -1203,9 +1209,9 @@
 **
 ** Function         NFC_GetRouting
 **
-** Description      This function is called to retrieve the CE routing table from
-**                  NFCC. The response from NFCC is reported by tNFC_RESPONSE_CBACK
-**                  as NFC_GET_ROUTING_REVT.
+** Description      This function is called to retrieve the CE routing table
+**                  from NFCC. The response from NFCC is reported by
+**                  tNFC_RESPONSE_CBACK as NFC_GET_ROUTING_REVT.
 **
 ** Returns          tNFC_STATUS
 **
@@ -1216,10 +1222,11 @@
 **
 ** Function         NFC_RegVSCback
 **
-** Description      This function is called to register or de-register a callback
-**                  function to receive Proprietary NCI response and notification
-**                  events.
-**                  The maximum number of callback functions allowed is NFC_NUM_VS_CBACKS
+** Description      This function is called to register or de-register a
+**                  callback function to receive Proprietary NCI response and
+**                  notification events.
+**                  The maximum number of callback functions allowed is
+**                  NFC_NUM_VS_CBACKS
 **
 ** Returns          tNFC_STATUS
 **
diff --git a/src/nfc/include/rw_api.h b/src/nfc/include/rw_api.h
index 10d198e..4c66f33 100644
--- a/src/nfc/include/rw_api.h
+++ b/src/nfc/include/rw_api.h
@@ -310,7 +310,8 @@
 **
 ** Function         RW_T1tWriteNoErase
 **
-** Description      This function send a WRITE-NE command for Reader/Writer mode.
+** Description      This function send a WRITE-NE command for Reader/Writer
+**                  mode.
 **
 ** Returns          tNFC_STATUS
 **
@@ -343,7 +344,8 @@
 **
 ** Function         RW_T1tWriteErase8
 **
-** Description      This function send a WRITE-E8 command for Reader/Writer mode.
+** Description      This function send a WRITE-E8 command for Reader/Writer
+**                  mode.
 **
 ** Returns          tNFC_STATUS
 **
@@ -354,7 +356,8 @@
 **
 ** Function         RW_T1tWriteNoErase8
 **
-** Description      This function send a WRITE-NE8 command for Reader/Writer mode.
+** Description      This function send a WRITE-NE8 command for Reader/Writer
+**                  mode.
 **
 ** Returns          tNFC_STATUS
 **
@@ -369,7 +372,8 @@
 **
 ** Parameters:      void
 **
-** Returns          NCI_STATUS_OK, if detection was started. Otherwise, error status.
+** Returns          NCI_STATUS_OK, if detection was started. Otherwise, error
+**                  status.
 **
 *******************************************************************************/
 extern tNFC_STATUS RW_T1tLocateTlv (uint8_t tlv_type);
@@ -383,7 +387,8 @@
 **
 ** Parameters:      void
 **
-** Returns          NCI_STATUS_OK, if detection was started. Otherwise, error status.
+** Returns          NCI_STATUS_OK, if detection was started. Otherwise, error
+**                  status.
 **
 *******************************************************************************/
 extern tNFC_STATUS RW_T1tDetectNDef (void);
@@ -392,7 +397,8 @@
 **
 ** Function         RW_T1tReadNDef
 **
-** Description      This function can be called to read the NDEF message on the tag.
+** Description      This function can be called to read the NDEF message on the
+**                  tag.
 **
 ** Parameters:      p_buffer:   The buffer into which to read the NDEF message
 **                  buf_len:    The length of the buffer
@@ -406,12 +412,14 @@
 **
 ** Function         RW_T1tWriteNDef
 **
-** Description      This function can be called to write an NDEF message to the tag.
+** Description      This function can be called to write an NDEF message to the
+**                  tag.
 **
 ** Parameters:      msg_len:    The length of the buffer
 **                  p_msg:      The NDEF message to write
 **
-** Returns          NCI_STATUS_OK, if write was started. Otherwise, error status.
+** Returns          NCI_STATUS_OK, if write was started. Otherwise, error
+**                  status.
 **
 *******************************************************************************/
 extern tNFC_STATUS RW_T1tWriteNDef (uint16_t msg_len, uint8_t *p_msg);
@@ -508,12 +516,13 @@
 ** Function         RW_T2tSectorSelect
 **
 ** Description      This function issues the Type 2 Tag SECTOR-SELECT command
-**                  packet 1. If a NACK is received as the response, the callback
-**                  function will be called with a RW_T2T_SECTOR_SELECT_EVT. If
-**                  an ACK is received as the response, the command packet 2 with
-**                  the given sector number is sent to the peer device. When the
-**                  response for packet 2 is received, the callback function will
-**                  be called with a RW_T2T_SECTOR_SELECT_EVT.
+**                  packet 1. If a NACK is received as the response, the
+**                  callback function will be called with a
+**                  RW_T2T_SECTOR_SELECT_EVT. If an ACK is received as the
+**                  response, the command packet 2 with the given sector number
+**                  is sent to the peer device. When the response for packet 2
+**                  is received, the callback function will be called with a
+**                  RW_T2T_SECTOR_SELECT_EVT.
 **
 **                  A sector is 256 contiguous blocks (1024 bytes).
 **
@@ -537,7 +546,8 @@
 **
 ** Function         RW_T2tReadNDef
 **
-** Description      This function can be called to read the NDEF message on the tag.
+** Description      This function can be called to read the NDEF message on the
+**                  tag.
 **
 ** Parameters:      p_buffer:   The buffer into which to read the NDEF message
 **                  buf_len:    The length of the buffer
@@ -551,12 +561,14 @@
 **
 ** Function         RW_T2tWriteNDef
 **
-** Description      This function can be called to write an NDEF message to the tag.
+** Description      This function can be called to write an NDEF message to the
+**                  tag.
 **
 ** Parameters:      msg_len:    The length of the buffer
 **                  p_msg:      The NDEF message to write
 **
-** Returns          NCI_STATUS_OK, if write was started. Otherwise, error status.
+** Returns          NCI_STATUS_OK, if write was started. Otherwise, error
+**                  status.
 **
 *******************************************************************************/
 extern tNFC_STATUS RW_T2tWriteNDef (uint16_t msg_len, uint8_t *p_msg );
@@ -672,8 +684,8 @@
 **      Retrieve NDEF contents from a Type3 tag.
 **
 **      The RW_T3T_CHECK_EVT event is used to notify the application for each
-**      segment of NDEF data received. The RW_T3T_CHECK_CPLT_EVT event is used to
-**      notify the application all segments have been received.
+**      segment of NDEF data received. The RW_T3T_CHECK_CPLT_EVT event is used
+**      to notify the application all segments have been received.
 **
 **      Before using this API, the RW_T3tDetectNDef function must be called to
 **      verify that the tag contains NDEF data, and to retrieve the NDEF
@@ -880,7 +892,8 @@
 **
 **                  The following event will be returned
 **                      RW_T4T_NDEF_READ_EVT for each segmented NDEF message
-**                      RW_T4T_NDEF_READ_CPLT_EVT for the last segment or complete NDEF
+**                      RW_T4T_NDEF_READ_CPLT_EVT for the last segment or
+**                      complete NDEF
 **                      RW_T4T_NDEF_READ_FAIL_EVT for failure
 **
 ** Returns          NFC_STATUS_OK if success
@@ -895,7 +908,8 @@
 **
 ** Description      This function performs NDEF update procedure
 **                  Note: RW_T4tDetectNDef() must be called before using this
-**                        Updating data must not be removed until returning event
+**                        Updating data must not be removed until returning
+**                        event
 **
 **                  The following event will be returned
 **                      RW_T4T_NDEF_UPDATE_CPLT_EVT for complete
@@ -916,7 +930,9 @@
 **
 **      The RW_T4T_PRESENCE_CHECK_EVT w/ status is used to indicate presence
 **      or non-presence.
-**      option is RW_T4T_CHK_EMPTY_I_BLOCK, use empty I block for presence check.
+**
+**      option is RW_T4T_CHK_EMPTY_I_BLOCK, use empty I block for presence
+**      check.
 **
 ** Returns
 **      NFC_STATUS_OK, if raw data frame sent
@@ -994,7 +1010,8 @@
 ** Function         RW_I93WriteSingleBlock
 **
 ** Description      This function send Write Single Block command
-**                  Application must get block size first by calling RW_I93GetSysInfo().
+**                  Application must get block size first by calling
+**                  RW_I93GetSysInfo().
 **
 **                  RW_I93_CMD_CMPL_EVT will be returned
 **
@@ -1179,7 +1196,8 @@
 **
 ** Function         RW_I93GetMultiBlockSecurityStatus
 **
-** Description      This function send Get Multiple Block Security Status command
+** Description      This function send Get Multiple Block Security Status
+**                  command
 **
 **                  RW_I93_RESPONSE_EVT will be returned
 **
@@ -1215,7 +1233,8 @@
 **
 **                  The following event will be returned
 **                      RW_I93_NDEF_READ_EVT for each segmented NDEF message
-**                      RW_I93_NDEF_READ_CPLT_EVT for the last segment or complete NDEF
+**                      RW_I93_NDEF_READ_CPLT_EVT for the last segment or
+**                      complete NDEF
 **                      RW_I93_NDEF_READ_FAIL_EVT for failure
 **
 ** Returns          NFC_STATUS_OK if success
@@ -1230,7 +1249,8 @@
 **
 ** Description      This function performs NDEF update procedure
 **                  Note: RW_I93DetectNDef() must be called before using this
-**                        Updating data must not be removed until returning event
+**                        Updating data must not be removed until returning
+**                        event
 **
 **                  The following event will be returned
 **                      RW_I93_NDEF_UPDATE_CPLT_EVT for complete
@@ -1262,7 +1282,8 @@
 **
 ** Description      This function performs NDEF read-only procedure
 **                  Note: RW_I93DetectNDef() must be called before using this
-**                        Updating data must not be removed until returning event
+**                        Updating data must not be removed until returning
+**                        event
 **
 **                  The RW_I93_SET_TAG_RO_EVT event will be returned.
 **
@@ -1282,7 +1303,8 @@
 **                  presence or non-presence.
 **
 ** Returns          NFC_STATUS_OK, if raw data frame sent
-**                  NFC_STATUS_NO_BUFFERS: unable to allocate a buffer for this operation
+**                  NFC_STATUS_NO_BUFFERS: unable to allocate a buffer for this
+**                  operation
 **                  NFC_STATUS_FAILED: other error
 **
 *****************************************************************************/
diff --git a/src/nfc/int/llcp_int.h b/src/nfc/int/llcp_int.h
index 98727ae..c9683f8 100644
--- a/src/nfc/int/llcp_int.h
+++ b/src/nfc/int/llcp_int.h
@@ -249,8 +249,8 @@
     uint8_t         dl_tx_uncongest_ntf_start_idx;  /* next start of data link connection           */
 
     /*
-    ** when overall rx link congestion starts, RNR is sent to remote end point of data link connection
-    ** while rx link is congested, UI PDU is discarded.
+    ** when overall rx link congestion starts, RNR is sent to remote end point
+    ** of data link connection while rx link is congested, UI PDU is discarded.
     */
     uint8_t         num_rx_buff;                    /* reserved number of rx UI/I PDU in queue      */
     uint8_t         overall_rx_congest_start;       /* threshold of overall rx congestion start     */
@@ -258,8 +258,9 @@
     uint8_t         max_num_ll_rx_buff;             /* max number of rx UI PDU in queue             */
 
     /*
-    ** threshold (number of rx UI PDU) is dynamically adjusted based on number of logical links
-    ** when number of rx UI PDU is more than ll_rx_congest_start, the oldest UI PDU is discarded
+    ** threshold (number of rx UI PDU) is dynamically adjusted based on number
+    ** of logical links when number of rx UI PDU is more than
+    ** ll_rx_congest_start, the oldest UI PDU is discarded
     */
     uint8_t         ll_rx_congest_start;            /* rx congest start threshold for each logical link */
 
diff --git a/src/nfc/llcp/llcp_api.c b/src/nfc/llcp/llcp_api.c
index d2c6225..87925e8 100644
--- a/src/nfc/llcp/llcp_api.c
+++ b/src/nfc/llcp/llcp_api.c
@@ -194,14 +194,17 @@
 ** Function         LLCP_GetDiscoveryConfig
 **
 ** Description      Returns discovery config for ISO 18092 MAC link activation
-**                  This function is called to get general bytes for NFC_PMID_ATR_REQ_GEN_BYTES
-**                  or NFC_PMID_ATR_RES_GEN_BYTES before starting discovery.
+**                  This function is called to get general bytes for
+**                  NFC_PMID_ATR_REQ_GEN_BYTES or NFC_PMID_ATR_RES_GEN_BYTES
+**                  before starting discovery.
 **
 **                  wt:Waiting time 0 - 8, only for listen
-**                  p_gen_bytes: pointer to store LLCP magic number and paramters
+**                  p_gen_bytes: pointer to store LLCP magic number and
+**                               paramters
 **                  p_gen_bytes_len: length of buffer for gen bytes as input
-**                                   (NOTE:it must be bigger than LLCP_MIN_GEN_BYTES)
-**                                   actual gen bytes size as output
+**                                   (NOTE:it must be bigger than
+**                                   LLCP_MIN_GEN_BYTES) actual gen bytes size
+**                                   as output
 **
 **                  Restrictions on the use of ISO 18092
 **                  1. The DID features shall not be used.
@@ -281,8 +284,8 @@
 **
 ** Function         LLCP_ActivateLink
 **
-** Description      This function will activate LLCP link with LR, WT and Gen Bytes
-**                  in activation NTF from NFCC.
+** Description      This function will activate LLCP link with LR, WT and Gen
+**                  Bytes in activation NTF from NFCC.
 **
 **                  LLCP_LINK_ACTIVATION_COMPLETE_EVT will be returned through
 **                  callback function if successful.
@@ -313,7 +316,8 @@
 ** Description      Deactivate LLCP link
 **
 **                  LLCP_LINK_DEACTIVATED_EVT will be returned through callback
-**                  when LLCP link is deactivated. Then NFC link may be deactivated.
+**                  when LLCP link is deactivated. Then NFC link may be
+**                  deactivated.
 **
 ** Returns          LLCP_STATUS_SUCCESS if success
 **
@@ -339,10 +343,12 @@
 **
 **                  reg_sap : Well-Known SAP except LM and SDP (0x02 - 0x0F)
 **                            Advertized by SDP (0x10 - 0x1F)
-**                            LLCP_INVALID_SAP, LLCP will allocate between 0x10 and 0x1F
+**                            LLCP_INVALID_SAP, LLCP will allocate between 0x10
+**                            and 0x1F
 **                  link_type : LLCP_LINK_TYPE_LOGICAL_DATA_LINK
 **                              and/or LLCP_LINK_TYPE_DATA_LINK_CONNECTION
-**                  p_service_name : Null-terminated string up to LLCP_MAX_SN_LEN
+**                  p_service_name : Null-terminated string up to
+**                                   LLCP_MAX_SN_LEN
 **
 ** Returns          SAP between 0x02 and 0x1F, if success
 **                  LLCP_INVALID_SAP, otherwise
@@ -734,7 +740,8 @@
 ** Description      Read information of UI PDU for local SAP
 **
 **                  - Remote SAP who sent UI PDU is returned.
-**                  - Information of UI PDU up to max_data_len is copied into p_data.
+**                  - Information of UI PDU up to max_data_len is copied into
+**                    p_data.
 **                  - Information of next UI PDU is not concatenated.
 **                  - Recommended max_data_len is link MIU of local device
 **
@@ -964,8 +971,9 @@
     if (p_dlcb)
     {
         /*
-        ** Accepting LLCP may change SAP in CC, so we cannot find right data link connection
-        ** if there is multiple pending connection request on the same local SAP.
+        ** Accepting LLCP may change SAP in CC, so we cannot find right data
+        ** link connection if there is multiple pending connection request on
+        ** the same local SAP.
         */
         LLCP_TRACE_ERROR0 ("LLCP_ConnectReq (): There is pending connect request on this reg_sap");
         return LLCP_STATUS_FAIL;
@@ -1187,10 +1195,11 @@
 **
 ** Description      Read information of I PDU for data link connection
 **
-**                  - Information of I PDU up to max_data_len is copied into p_data.
+**                  - Information of I PDU up to max_data_len is copied into
+**                    p_data.
 **                  - Information of next I PDU is not concatenated.
-**                  - Recommended max_data_len is data link connection MIU of local
-**                    end point
+**                  - Recommended max_data_len is data link connection MIU of
+**                    local end point
 **
 ** Returns          TRUE if more data in queue
 **
@@ -1406,8 +1415,8 @@
 **
 ** Description      This function is called to get LLCP_SERVICE_TX_COMPLETE
 **                  when Tx queue is empty and all PDU is acked.
-**                  This is one time event, so upper layer shall call this function
-**                  again to get next LLCP_SERVICE_TX_COMPLETE.
+**                  This is one time event, so upper layer shall call this
+**                  function again to get next LLCP_SERVICE_TX_COMPLETE.
 **
 ** Returns          LLCP_STATUS_SUCCESS if success
 **
@@ -1587,7 +1596,8 @@
 **
 ** Function         LLCP_DiscoverService
 **
-** Description      Return SAP of service name in connected device through callback
+** Description      Return SAP of service name in connected device through
+**                  callback
 **
 **
 ** Returns          LLCP_STATUS_SUCCESS if success
diff --git a/src/nfc/llcp/llcp_dlc.c b/src/nfc/llcp/llcp_dlc.c
index 36a4e0a..a29c9c0 100644
--- a/src/nfc/llcp/llcp_dlc.c
+++ b/src/nfc/llcp/llcp_dlc.c
@@ -46,7 +46,8 @@
 **
 ** Function         llcp_dlsm_execute
 **
-** Description      This function executes the state machine for data link connection.
+** Description      This function executes the state machine for data link
+**                  connection.
 **
 ** Returns          tLLCP_STATUS
 **
@@ -178,7 +179,8 @@
 **
 ** Function         llcp_dlsm_w4_remote_resp
 **
-** Description      data link connection is waiting for connection confirm from peer
+** Description      data link connection is waiting for connection confirm from
+**                  peer
 **
 ** Returns          tLLCP_STATUS
 **
@@ -269,7 +271,8 @@
 **
 ** Function         llcp_dlsm_w4_local_resp
 **
-** Description      data link connection is waiting for connection confirm from application
+** Description      data link connection is waiting for connection confirm from
+**                  application
 **
 ** Returns          tLLCP_STATUS
 **
@@ -488,7 +491,8 @@
 **
 ** Function         llcp_dlsm_w4_remote_dm
 **
-** Description      data link connection is waiting for disconnection confirm from peer
+** Description      data link connection is waiting for disconnection confirm
+**                  from peer
 **
 ** Returns          tLLCP_STATUS
 **
@@ -549,8 +553,8 @@
 ** Function         llcp_dlc_find_dlcb_by_local_sap
 **
 ** Description      Find tLLCP_DLCB by local SAP and remote SAP
-**                  if remote_sap is LLCP_INVALID_SAP, it will return a DLCB which
-**                  is waiting for CC from peer.
+**                  if remote_sap is LLCP_INVALID_SAP, it will return a DLCB
+**                  which is waiting for CC from peer.
 **
 ** Returns          tLLCP_DLCB *
 **
@@ -1264,12 +1268,13 @@
     LLCP_TRACE_DEBUG0 ("llcp_dlc_check_to_send_rr_rnr ()");
 
     /*
-    ** DLC doesn't send RR PDU for each received I PDU because multiple I PDUs can be aggregated
-    ** in a received AGF PDU. In this case, this is post processing of AGF PDU to send single RR
-    ** or RNR after processing all I PDUs in received AGF if there was no I-PDU to carry N(R).
+    ** DLC doesn't send RR PDU for each received I PDU because multiple I PDUs
+    ** can be aggregated in a received AGF PDU. In this case, this is post
+    ** processing of AGF PDU to send single RR or RNR after processing all I
+    ** PDUs in received AGF if there was no I-PDU to carry N(R).
     **
-    ** Send RR or RNR if any change of local busy condition or rx congestion status, or V(RA) is not
-    ** V(R).
+    ** Send RR or RNR if any change of local busy condition or rx congestion
+    ** status, or V(RA) is not V(R).
     */
     for (idx = 0; idx < LLCP_MAX_DATA_LINK; idx++)
     {
diff --git a/src/nfc/llcp/llcp_link.c b/src/nfc/llcp/llcp_link.c
index 53be685..6162963 100644
--- a/src/nfc/llcp/llcp_link.c
+++ b/src/nfc/llcp/llcp_link.c
@@ -120,7 +120,7 @@
 **
 ** Function         llcp_link_start_link_timer
 **
-** Description      This function starts LLCP link timer (LTO or delay response).
+** Description      This function starts LLCP link timer (LTO or delay response)
 **
 ** Returns          void
 **
@@ -193,8 +193,8 @@
     }
 
     /*
-    ** For the Target device, the scaled value of RWT MUST be less than or equal to the
-    ** scaled value of the LLC Link Timeout (LTO).
+    ** For the Target device, the scaled value of RWT MUST be less than or equal
+    ** to the scaled value of the LLC Link Timeout (LTO).
     */
     if ((p_config->is_initiator) && (llcp_link_rwt[p_config->waiting_time] > llcp_cb.lcb.peer_lto))
     {
@@ -236,8 +236,8 @@
         llcp_cb.lcb.effective_miu = llcp_cb.lcb.local_link_miu;
 
     /*
-    ** When entering the normal operation phase, LLCP shall initialize the symmetry
-    ** procedure.
+    ** When entering the normal operation phase, LLCP shall initialize the
+    ** symmetry procedure.
     */
     if (llcp_cb.lcb.is_initiator)
     {
@@ -269,8 +269,8 @@
 
 
     /*
-    ** Set state to LLCP_LINK_STATE_ACTIVATED and notify activation before set data callback
-    ** because LLCP PDU could be in NCI queue.
+    ** Set state to LLCP_LINK_STATE_ACTIVATED and notify activation before set
+    ** data callback because LLCP PDU could be in NCI queue.
     */
     llcp_cb.lcb.link_state = LLCP_LINK_STATE_ACTIVATED;
 
@@ -896,11 +896,11 @@
 
         /*
         ** For data link connection,
-        ** V(RA) was updated and N(R) was set to V(RA), if I PDU was added in this transmission.
-        ** If there was no I PDU to carry V(RA) and V(RA) is not V(R) and it's not congested,
-        ** then RR PDU will be sent.
-        ** If there was no I PDU to carry V(RA) and V(RA) is not V(R) and it's congested,
-        ** then RNR PDU will be sent.
+        ** V(RA) was updated and N(R) was set to V(RA), if I PDU was added in
+        ** this transmission. If there was no I PDU to carry V(RA) and V(RA) is
+        ** not V(R) and it's not congested, then RR PDU will be sent.
+        ** If there was no I PDU to carry V(RA) and V(RA) is not V(R) and it's
+        ** congested, then RNR PDU will be sent.
         ** If local busy state has been changed then RR or RNR PDU may be sent.
         */
         llcp_dlc_check_to_send_rr_rnr ();
diff --git a/src/nfc/llcp/llcp_sdp.c b/src/nfc/llcp/llcp_sdp.c
index c6190cb..72d4009 100644
--- a/src/nfc/llcp/llcp_sdp.c
+++ b/src/nfc/llcp/llcp_sdp.c
@@ -53,7 +53,8 @@
 **
 ** Function         llcp_sdp_check_send_snl
 **
-** Description      Enqueue Service Name Lookup PDU into sig_xmit_q for transmitting
+** Description      Enqueue Service Name Lookup PDU into sig_xmit_q for
+**                  transmitting
 **
 **
 ** Returns          void
@@ -350,7 +351,8 @@
 **
 ** Function         llcp_sdp_proc_deactivation
 **
-** Description      Report SDP failure for any pending request because of deactivation
+** Description      Report SDP failure for any pending request because of
+**                  deactivation
 **
 **
 ** Returns          void
diff --git a/src/nfc/llcp/llcp_util.c b/src/nfc/llcp/llcp_util.c
index 55f5e9b..ad0ccca 100644
--- a/src/nfc/llcp/llcp_util.c
+++ b/src/nfc/llcp/llcp_util.c
@@ -176,8 +176,8 @@
                 if (rx_congest_start > llcp_cb.dlcb[idx].local_rw)
                 {
                     /*
-                    ** set rx congestion threshold LLCP_DL_MIN_RX_CONGEST at least
-                    ** so, we don't need to flow off too often.
+                    ** set rx congestion threshold LLCP_DL_MIN_RX_CONGEST at
+                    ** least so, we don't need to flow off too often.
                     */
                     if (llcp_cb.dlcb[idx].local_rw + 1 > LLCP_DL_MIN_RX_CONGEST)
                         llcp_cb.dlcb[idx].rx_congest_threshold = llcp_cb.dlcb[idx].local_rw + 1;
@@ -717,8 +717,8 @@
 **
 ** Function         llcp_util_build_info_pdu
 **
-** Description      Add DSAP, PTYPE, SSAP and sequence numbers and update local ack
-**                  sequence
+** Description      Add DSAP, PTYPE, SSAP and sequence numbers and update local
+**                  ack sequence
 **
 ** Returns          void
 **
diff --git a/src/nfc/nci/nci_hmsgs.c b/src/nfc/nci/nci_hmsgs.c
index 39fc460..b2accba 100644
--- a/src/nfc/nci/nci_hmsgs.c
+++ b/src/nfc/nci/nci_hmsgs.c
@@ -328,7 +328,8 @@
 **
 ** Function         nci_snd_discover_cmd
 **
-** Description      compose and send RF Management DISCOVER command to command queue
+** Description      compose and send RF Management DISCOVER command to command
+**                  queue
 **
 ** Returns          status
 **
@@ -576,8 +577,8 @@
 **
 ** Function         nci_snd_set_routing_cmd
 **
-** Description      compose and send RF Management SET_LISTEN_MODE_ROUTING command
-**                  to command queue
+** Description      compose and send RF Management SET_LISTEN_MODE_ROUTING
+**                  command to command queue
 **
 ** Returns          status
 **
@@ -626,8 +627,8 @@
 **
 ** Function         nci_snd_get_routing_cmd
 **
-** Description      compose and send RF Management GET_LISTEN_MODE_ROUTING command
-**                  to command queue
+** Description      compose and send RF Management GET_LISTEN_MODE_ROUTING
+**                  command to command queue
 **
 ** Returns          status
 **
diff --git a/src/nfc/ndef/ndef_utils.c b/src/nfc/ndef/ndef_utils.c
index 0d24049..36c4314 100644
--- a/src/nfc/ndef/ndef_utils.c
+++ b/src/nfc/ndef/ndef_utils.c
@@ -297,8 +297,8 @@
 **
 ** Function         NDEF_MsgGetRecLength
 **
-** Description      This function returns length of the current record in the given
-**                  NDEF message.
+** Description      This function returns length of the current record in the
+**                  given NDEF message.
 **
 ** Returns          Length of record
 **
@@ -349,8 +349,8 @@
 ** Function         NDEF_MsgGetNextRec
 **
 ** Description      This function gets a pointer to the next record in the given
-**                  NDEF message. If the current record pointer is NULL, a pointer
-**                  to the first record is returned.
+**                  NDEF message. If the current record pointer is NULL, a
+**                  pointer to the first record is returned.
 **
 ** Returns          Pointer to the start of the record, or NULL if no more
 **
@@ -446,7 +446,8 @@
 ** Description      This function gets a pointer to the last record in the
 **                  given NDEF message.
 **
-** Returns          Pointer to the start of the last record, or NULL if some problem
+** Returns          Pointer to the start of the last record, or NULL if some
+**                  problem
 **
 *******************************************************************************/
 uint8_t *NDEF_MsgGetLastRecInMsg (uint8_t *p_msg)
@@ -491,8 +492,8 @@
 **
 ** Function         NDEF_MsgGetFirstRecByType
 **
-** Description      This function gets a pointer to the first record with the given
-**                  record type in the given NDEF message.
+** Description      This function gets a pointer to the first record with the
+**                  given record type in the given NDEF message.
 **
 ** Returns          Pointer to the start of the record, or NULL
 **
@@ -548,8 +549,8 @@
 **
 ** Function         NDEF_MsgGetNextRecByType
 **
-** Description      This function gets a pointer to the next record with the given
-**                  record type in the given NDEF message.
+** Description      This function gets a pointer to the next record with the
+**                  given record type in the given NDEF message.
 **
 ** Returns          Pointer to the start of the record, or NULL
 **
@@ -610,8 +611,8 @@
 **
 ** Function         NDEF_MsgGetFirstRecById
 **
-** Description      This function gets a pointer to the first record with the given
-**                  record id in the given NDEF message.
+** Description      This function gets a pointer to the first record with the
+**                  given record id in the given NDEF message.
 **
 ** Returns          Pointer to the start of the record, or NULL
 **
@@ -667,8 +668,8 @@
 **
 ** Function         NDEF_MsgGetNextRecById
 **
-** Description      This function gets a pointer to the next record with the given
-**                  record id in the given NDEF message.
+** Description      This function gets a pointer to the next record with the
+**                  given record id in the given NDEF message.
 **
 ** Returns          Pointer to the start of the record, or NULL
 **
@@ -728,7 +729,8 @@
 **
 ** Function         NDEF_RecGetType
 **
-** Description      This function gets a pointer to the record type for the given NDEF record.
+** Description      This function gets a pointer to the record type for the
+**                  given NDEF record.
 **
 ** Returns          Pointer to Type (NULL if none). TNF and len are filled in.
 **
@@ -767,7 +769,8 @@
 **
 ** Function         NDEF_RecGetId
 **
-** Description      This function gets a pointer to the record id for the given NDEF record.
+** Description      This function gets a pointer to the record id for the given
+**                  NDEF record.
 **
 ** Returns          Pointer to Id (NULL if none). ID Len is filled in.
 **
@@ -806,9 +809,11 @@
 **
 ** Function         NDEF_RecGetPayload
 **
-** Description      This function gets a pointer to the payload for the given NDEF record.
+** Description      This function gets a pointer to the payload for the given
+**                  NDEF record.
 **
-** Returns          a pointer to the payload (or NULL none). Payload len filled in.
+** Returns          a pointer to the payload (or NULL none). Payload len filled
+**                  in.
 **
 *******************************************************************************/
 uint8_t *NDEF_RecGetPayload (uint8_t *p_rec, uint32_t *p_payload_len)
@@ -864,7 +869,8 @@
 **
 ** Function         NDEF_MsgAddRec
 **
-** Description      This function adds an NDEF record to the end of an NDEF message.
+** Description      This function adds an NDEF record to the end of an NDEF
+**                  message.
 **
 ** Returns          OK, or error if the record did not fit
 **                  *p_cur_size is updated
@@ -1055,7 +1061,8 @@
 **
 ** Function         NDEF_MsgAppendRec
 **
-** Description      This function adds NDEF records to the end of an NDEF message.
+** Description      This function adds NDEF records to the end of an NDEF
+**                  message.
 **
 ** Returns          OK, or error if the record did not fit
 **                  *p_cur_size is updated
@@ -1105,8 +1112,8 @@
 **
 ** Function         NDEF_MsgAppendPayload
 **
-** Description      This function appends extra payload to a specific record in the
-**                  given NDEF message
+** Description      This function appends extra payload to a specific record in
+**                  the given NDEF message
 **
 ** Returns          OK, or error if the extra payload did not fit
 **                  *p_cur_size is updated
@@ -1189,8 +1196,8 @@
 **
 ** Function         NDEF_MsgReplacePayload
 **
-** Description      This function replaces the payload of a specific record in the
-**                  given NDEF message
+** Description      This function replaces the payload of a specific record in
+**                  the given NDEF message
 **
 ** Returns          OK, or error if the new payload did not fit
 **                  *p_cur_size is updated
@@ -1308,8 +1315,8 @@
 **
 ** Function         NDEF_MsgReplaceType
 **
-** Description      This function replaces the type field of a specific record in the
-**                  given NDEF message
+** Description      This function replaces the type field of a specific record
+**                  in the given NDEF message
 **
 ** Returns          OK, or error if the new type field did not fit
 **                  *p_cur_size is updated
@@ -1380,8 +1387,8 @@
 **
 ** Function         NDEF_MsgReplaceId
 **
-** Description      This function replaces the ID field of a specific record in the
-**                  given NDEF message
+** Description      This function replaces the ID field of a specific record in
+**                  the given NDEF message
 **
 ** Returns          OK, or error if the new ID field did not fit
 **                  *p_cur_size is updated
diff --git a/src/nfc/nfc/nfc_ee.c b/src/nfc/nfc/nfc_ee.c
index 3f69477..02d766e 100644
--- a/src/nfc/nfc/nfc_ee.c
+++ b/src/nfc/nfc/nfc_ee.c
@@ -37,11 +37,11 @@
 **
 ** Function         NFC_NfceeDiscover
 **
-** Description      This function is called to enable or disable NFCEE Discovery.
-**                  The response from NFCC is reported by tNFC_RESPONSE_CBACK
-**                  as NFC_NFCEE_DISCOVER_REVT.
-**                  The notification from NFCC is reported by tNFC_RESPONSE_CBACK
-**                  as NFC_NFCEE_INFO_REVT.
+** Description      This function is called to enable or disable NFCEE
+**                  Discovery. The response from NFCC is reported by
+**                  tNFC_RESPONSE_CBACK as NFC_NFCEE_DISCOVER_REVT.
+**                  The notification from NFCC is reported by
+**                  tNFC_RESPONSE_CBACK as NFC_NFCEE_INFO_REVT.
 **
 ** Parameters       discover - 1 to enable discover, 0 to disable.
 **
@@ -109,9 +109,9 @@
 **
 ** Function         NFC_GetRouting
 **
-** Description      This function is called to retrieve the CE routing table from
-**                  NFCC. The response from NFCC is reported by tNFC_RESPONSE_CBACK
-**                  as NFC_GET_ROUTING_REVT.
+** Description      This function is called to retrieve the CE routing table
+**                  from NFCC. The response from NFCC is reported by
+**                  tNFC_RESPONSE_CBACK as NFC_GET_ROUTING_REVT.
 **
 ** Returns          tNFC_STATUS
 **
diff --git a/src/nfc/nfc/nfc_main.c b/src/nfc/nfc/nfc_main.c
index 862e1b7..b469007 100644
--- a/src/nfc/nfc/nfc_main.c
+++ b/src/nfc/nfc/nfc_main.c
@@ -308,7 +308,8 @@
 **
 ** Function         nfc_gen_cleanup
 **
-** Description      Clean up for both going into low power mode and disabling NFC
+** Description      Clean up for both going into low power mode and disabling
+**                  NFC
 **
 *******************************************************************************/
 void nfc_gen_cleanup (void)
@@ -390,8 +391,8 @@
         if (nfc_cb.p_nci_init_rsp)
         {
             /*
-            ** if NFC_Disable() is called before receiving HAL_NFC_POST_INIT_CPLT_EVT,
-            ** then wait for HAL_NFC_CLOSE_CPLT_EVT.
+            ** if NFC_Disable() is called before receiving
+            ** HAL_NFC_POST_INIT_CPLT_EVT, then wait for HAL_NFC_CLOSE_CPLT_EVT.
             */
             if (nfc_cb.nfc_state == NFC_STATE_W4_POST_INIT_CPLT)
             {
@@ -649,13 +650,16 @@
 ** Function         NFC_Enable
 **
 ** Description      This function enables NFC. Prior to calling NFC_Enable:
-**                  - the NFCC must be powered up, and ready to receive commands.
+**                  - the NFCC must be powered up, and ready to receive
+**                    commands.
 **                  - GKI must be enabled
 **                  - NFC_TASK must be started
-**                  - NCIT_TASK must be started (if using dedicated NCI transport)
+**                  - NCIT_TASK must be started (if using dedicated NCI
+**                    transport)
 **
 **                  This function opens the NCI transport (if applicable),
-**                  resets the NFC controller, and initializes the NFC subsystems.
+**                  resets the NFC controller, and initializes the NFC
+**                  subsystems.
 **
 **                  When the NFC startup procedure is completed, an
 **                  NFC_ENABLE_REVT is returned to the application using the
@@ -799,9 +803,9 @@
 **
 ** Function         NFC_GetConfig
 **
-** Description      This function is called to retrieve the parameter TLV from NFCC.
-**                  The response from NFCC is reported by tNFC_RESPONSE_CBACK
-**                  as NFC_GET_CONFIG_REVT.
+** Description      This function is called to retrieve the parameter TLV from
+**                  NFCC. The response from NFCC is reported by
+**                  tNFC_RESPONSE_CBACK as NFC_GET_CONFIG_REVT.
 **
 ** Parameters       num_ids - the number of parameter IDs
 **                  p_param_ids - the parameter ID list.
@@ -819,9 +823,9 @@
 **
 ** Function         NFC_DiscoveryMap
 **
-** Description      This function is called to set the discovery interface mapping.
-**                  The response from NFCC is reported by tNFC_DISCOVER_CBACK as.
-**                  NFC_MAP_DEVT.
+** Description      This function is called to set the discovery interface
+**                  mapping. The response from NFCC is reported by
+**                  tNFC_DISCOVER_CBACK as NFC_MAP_DEVT.
 **
 ** Parameters       num - the number of items in p_params.
 **                  p_maps - the discovery interface mappings
@@ -884,7 +888,7 @@
 ** Function         NFC_DiscoveryStart
 **
 ** Description      This function is called to start Polling and/or Listening.
-**                  The response from NFCC is reported by tNFC_DISCOVER_CBACK as.
+**                  The response from NFCC is reported by tNFC_DISCOVER_CBACK as
 **                  NFC_START_DEVT. The notification from NFCC is reported by
 **                  tNFC_DISCOVER_CBACK as NFC_RESULT_DEVT.
 **
@@ -1066,8 +1070,8 @@
 **
 ** Description      This function is called to set if nfc will reassemble
 **                  nci packet as much as its buffer can hold or it should not
-**                  reassemble but forward the fragmented nci packet to layer above.
-**                  If nci data pkt is fragmented, nfc may send multiple
+**                  reassemble but forward the fragmented nci packet to layer
+**                  above. If nci data pkt is fragmented, nfc may send multiple
 **                  NFC_DATA_CEVT with status NFC_STATUS_CONTINUE before sending
 **                  NFC_DATA_CEVT with status NFC_STATUS_OK based on reassembly
 **                  configuration and reassembly buffer size
@@ -1091,8 +1095,10 @@
 **
 ** Parameters       conn_id - the connection id.
 **                  p_data - the data packet.
-**                  p_data->offset must be >= NCI_MSG_OFFSET_SIZE + NCI_DATA_HDR_SIZE
-**                  The data payload starts at ((uint8_t *) (p_data + 1) + p_data->offset)
+**                  p_data->offset must be >= NCI_MSG_OFFSET_SIZE +
+**                  NCI_DATA_HDR_SIZE
+**                  The data payload starts at
+**                  ((uint8_t *) (p_data + 1) + p_data->offset)
 **
 ** Returns          tNFC_STATUS
 **
@@ -1147,14 +1153,16 @@
 ** Function         NFC_Deactivate
 **
 ** Description      This function is called to stop the discovery process or
-**                  put the listen device in sleep mode or terminate the NFC link.
+**                  put the listen device in sleep mode or terminate the NFC
+**                  link.
 **
 **                  The response from NFCC is reported by tNFC_DISCOVER_CBACK
 **                  as NFC_DEACTIVATE_DEVT.
 **
 ** Parameters       deactivate_type - NFC_DEACTIVATE_TYPE_IDLE, to IDLE mode.
 **                                    NFC_DEACTIVATE_TYPE_SLEEP to SLEEP mode.
-**                                    NFC_DEACTIVATE_TYPE_SLEEP_AF to SLEEP_AF mode.
+**                                    NFC_DEACTIVATE_TYPE_SLEEP_AF to SLEEP_AF
+**                                    mode.
 **
 ** Returns          tNFC_STATUS
 **
@@ -1206,8 +1214,8 @@
 **
 ** Function         NFC_UpdateRFCommParams
 **
-** Description      This function is called to update RF Communication parameters
-**                  once the Frame RF Interface has been activated.
+** Description      This function is called to update RF Communication
+**                  parameters once the Frame RF Interface has been activated.
 **
 **                  The response from NFCC is reported by tNFC_RESPONSE_CBACK
 **                  as NFC_RF_COMM_PARAMS_UPDATE_REVT.
diff --git a/src/nfc/nfc/nfc_ncif.c b/src/nfc/nfc/nfc_ncif.c
index 3b5c338..5c67031 100644
--- a/src/nfc/nfc/nfc_ncif.c
+++ b/src/nfc/nfc/nfc_ncif.c
@@ -57,7 +57,7 @@
 **
 ** Returns          void
 **
-*********************************************************************************/
+*******************************************************************************/
 void nfc_ncif_update_window (void)
 {
     /* Sanity check - see if we were expecting a update_window */
@@ -358,8 +358,8 @@
 **
 ** Function         nfc_ncif_process_event
 **
-** Description      This function is called to process the data/response/notification
-**                  from NFCC
+** Description      This function is called to process the
+**                  data/response/notification from NFCC
 **
 ** Returns          TRUE if need to free buffer
 **
@@ -524,7 +524,8 @@
 **
 ** Function         nfc_ncif_error_status
 **
-** Description      This function is called to report an error event to data cback
+** Description      This function is called to report an error event to data
+**                  cback
 **
 ** Returns          void
 **
@@ -1258,7 +1259,8 @@
 **
 ** Function         nfc_ncif_proc_reset_rsp
 **
-** Description      This function is called to process reset response/notification
+** Description      This function is called to process reset
+**                  response/notification
 **
 ** Returns          void
 **
diff --git a/src/nfc/nfc/nfc_vs.c b/src/nfc/nfc/nfc_vs.c
index a4ed539..b1cdb66 100644
--- a/src/nfc/nfc/nfc_vs.c
+++ b/src/nfc/nfc/nfc_vs.c
@@ -41,10 +41,10 @@
 **
 ** Function         NFC_RegVSCback
 **
-** Description      This function is called to register or de-register a callback
-**                  function to receive Proprietary NCI response and notification
-**                  events.
-**                  The maximum number of callback functions allowed is NFC_NUM_VS_CBACKS
+** Description      This function is called to register or de-register a
+**                  callback function to receive Proprietary NCI response and
+**                  notification events. The maximum number of callback
+**                  functions allowed is NFC_NUM_VS_CBACKS
 **
 ** Returns          tNFC_STATUS
 **
diff --git a/src/nfc/tags/rw_i93.c b/src/nfc/tags/rw_i93.c
index 5cef317..133ca4e 100644
--- a/src/nfc/tags/rw_i93.c
+++ b/src/nfc/tags/rw_i93.c
@@ -275,9 +275,10 @@
                     ||(p_i93->product_version == RW_I93_STM_M24LR64E_R)  )
                 {
                     /*
-                    ** M24LR16E-R or M24LR64E-R returns system information without memory size,
-                    ** if option flag is not set.
-                    ** LRIS64K and M24LR64-R return error if option flag is not set.
+                    ** M24LR16E-R or M24LR64E-R returns system information
+                    ** without memory size, if option flag is not set.
+                    ** LRIS64K and M24LR64-R return error if option flag is not
+                    ** set.
                     */
                     if (!(p_i93->intl_flags & RW_I93_FLAG_16BIT_NUM_BLOCK))
                     {
@@ -310,7 +311,8 @@
 **
 ** Function         rw_i93_check_sys_info_prot_ext
 **
-** Description      Check if need to set protocol extension flag to get system info
+** Description      Check if need to set protocol extension flag to get system
+**                  info
 **
 ** Returns          TRUE if sent Get System Info with protocol extension flag
 **
@@ -1388,7 +1390,8 @@
 **
 ** Function         rw_i93_get_next_blocks
 **
-** Description      Read as many blocks as possible (up to RW_I93_READ_MULTI_BLOCK_SIZE)
+** Description      Read as many blocks as possible (up to
+**                  RW_I93_READ_MULTI_BLOCK_SIZE)
 **
 ** Returns          tNFC_STATUS
 **
@@ -1415,8 +1418,9 @@
         if (p_i93->uid[1] == I93_UID_IC_MFG_CODE_STM)
         {
             /* LRIS64K, M24LR64-R, M24LR04E-R, M24LR16E-R, M24LR64E-R requires
-            **      The max number of blocks is 32 and they are all located in the same sector.
-            **      The sector is 32 blocks of 4 bytes.
+            ** - The max number of blocks is 32 and they are all located in the
+            **   same sector.
+            ** - The sector is 32 blocks of 4 bytes.
             */
             if (  (p_i93->product_version == RW_I93_STM_LRIS64K)
                 ||(p_i93->product_version == RW_I93_STM_M24LR64_R)
@@ -1447,8 +1451,8 @@
 **
 ** Function         rw_i93_get_next_block_sec
 **
-** Description      Get as many security of blocks as possible from p_i93->rw_offset
-**                  (up to RW_I93_GET_MULTI_BLOCK_SEC_SIZE)
+** Description      Get as many security of blocks as possible from
+**                  p_i93->rw_offset (up to RW_I93_GET_MULTI_BLOCK_SEC_SIZE)
 **
 ** Returns          tNFC_STATUS
 **
@@ -1485,7 +1489,8 @@
 **                  2. Get System Info if not having yet
 **                  3. Read first block for CC
 **                  4. Search NDEF Type and length
-**                  5. Get block status to get max NDEF size and read-only status
+**                  5. Get block status to get max NDEF size and read-only
+**                     status
 **
 ** Returns          void
 **
@@ -1596,9 +1601,12 @@
         ** CC[0] : magic number (0xE1)
         ** CC[1] : Bit 7-6:Major version number
         **       : Bit 5-4:Minor version number
-        **       : Bit 3-2:Read access condition    (00b: read access granted without any security)
-        **       : Bit 1-0:Write access condition   (00b: write access granted without any security)
-        ** CC[2] : Memory size in 8 bytes (Ex. 0x04 is 32 bytes) [STM, set to 0xFF if more than 2040bytes]
+        **       : Bit 3-2:Read access condition (00b: read access granted
+        **         without any security)
+        **       : Bit 1-0:Write access condition (00b: write access granted
+        **         without any security)
+        ** CC[2] : Memory size in 8 bytes (Ex. 0x04 is 32 bytes) [STM, set to
+        **         0xFF if more than 2040bytes]
         ** CC[3] : Bit 0:Read multiple blocks is supported [NXP, STM]
         **       : Bit 1:Inventory page read is supported [NXP]
         **       : Bit 2:More than 2040 bytes are supported [STM]
@@ -3354,7 +3362,8 @@
 ** Function         RW_I93WriteSingleBlock
 **
 ** Description      This function send Write Single Block command
-**                  Application must get block size first by calling RW_I93GetSysInfo().
+**                  Application must get block size first by calling
+**                  RW_I93GetSysInfo().
 **
 **                  RW_I93_CMD_CMPL_EVT will be returned
 **
@@ -3787,7 +3796,8 @@
 **
 ** Function         RW_I93GetMultiBlockSecurityStatus
 **
-** Description      This function send Get Multiple Block Security Status command
+** Description      This function send Get Multiple Block Security Status
+**                  command
 **
 **                  RW_I93_RESPONSE_EVT will be returned
 **
@@ -3888,7 +3898,8 @@
 **
 **                  The following event will be returned
 **                      RW_I93_NDEF_READ_EVT for each segmented NDEF message
-**                      RW_I93_NDEF_READ_CPLT_EVT for the last segment or complete NDEF
+**                      RW_I93_NDEF_READ_CPLT_EVT for the last segment or
+**                      complete NDEF
 **                      RW_I93_NDEF_READ_FAIL_EVT for failure
 **
 ** Returns          NFC_STATUS_OK if success
@@ -3936,7 +3947,8 @@
 **
 ** Description      This function performs NDEF update procedure
 **                  Note: RW_I93DetectNDef () must be called before using this
-**                        Updating data must not be removed until returning event
+**                        Updating data must not be removed until returning
+**                        event
 **
 **                  The following event will be returned
 **                      RW_I93_NDEF_UPDATE_CPLT_EVT for complete
@@ -4059,7 +4071,8 @@
 **
 ** Description      This function performs NDEF read-only procedure
 **                  Note: RW_I93DetectNDef () must be called before using this
-**                        Updating data must not be removed until returning event
+**                        Updating data must not be removed until returning
+**                        event
 **
 **                  The RW_I93_SET_TAG_RO_EVT event will be returned.
 **
@@ -4116,7 +4129,8 @@
 **                  presence or non-presence.
 **
 ** Returns          NFC_STATUS_OK, if raw data frame sent
-**                  NFC_STATUS_NO_BUFFERS: unable to allocate a buffer for this operation
+**                  NFC_STATUS_NO_BUFFERS: unable to allocate a buffer for this
+**                  operation
 **                  NFC_STATUS_FAILED: other error
 **
 *****************************************************************************/
diff --git a/src/nfc/tags/rw_t1t.c b/src/nfc/tags/rw_t1t.c
index b82b714..f86ac00 100644
--- a/src/nfc/tags/rw_t1t.c
+++ b/src/nfc/tags/rw_t1t.c
@@ -375,8 +375,8 @@
 **
 ** Function         rw_t1t_send_dyn_cmd
 **
-** Description      This function composes a Type 1 Tag command for dynamic memory
-**                  and send through NCI to NFCC.
+** Description      This function composes a Type 1 Tag command for dynamic
+**                  memory and send through NCI to NFCC.
 **
 ** Returns          NFC_STATUS_OK if the command is successfuly sent to NCI
 **                  otherwise, error status
@@ -857,7 +857,8 @@
 **
 ** Function         RW_T1tWriteErase
 **
-** Description      This function sends a WRITE-E command for Reader/Writer mode.
+** Description      This function sends a WRITE-E command for Reader/Writer
+**                  mode.
 **
 ** Returns          tNFC_STATUS
 **
@@ -910,7 +911,8 @@
 **
 ** Function         RW_T1tWriteNoErase
 **
-** Description      This function sends a WRITE-NE command for Reader/Writer mode.
+** Description      This function sends a WRITE-NE command for Reader/Writer
+**                  mode.
 **
 ** Returns          tNFC_STATUS
 **
@@ -1031,7 +1033,8 @@
 **
 ** Function         RW_T1tWriteErase8
 **
-** Description      This function sends a WRITE-E8 command for Reader/Writer mode.
+** Description      This function sends a WRITE-E8 command for Reader/Writer
+**                  mode.
 **
 ** Returns          tNFC_STATUS
 **
@@ -1081,7 +1084,8 @@
 **
 ** Function         RW_T1tWriteNoErase8
 **
-** Description      This function sends a WRITE-NE8 command for Reader/Writer mode.
+** Description      This function sends a WRITE-NE8 command for Reader/Writer
+**                  mode.
 **
 ** Returns          tNFC_STATUS
 **
diff --git a/src/nfc/tags/rw_t1t_ndef.c b/src/nfc/tags/rw_t1t_ndef.c
index e6e6c8f..164896a 100644
--- a/src/nfc/tags/rw_t1t_ndef.c
+++ b/src/nfc/tags/rw_t1t_ndef.c
@@ -119,7 +119,8 @@
 **
 ** Function         rw_t1t_info_to_event
 **
-** Description      This function returns RW event code based on the current state
+** Description      This function returns RW event code based on the current
+**                  state
 **
 ** Returns          RW event code
 **
@@ -172,7 +173,8 @@
 ** Description      This function will extract lock bytes if any present in the
 **                  response data
 **
-** Parameters       p_data: Data bytes in the response of RSEG/READ8/RALL command
+** Parameters       p_data: Data bytes in the response of RSEG/READ8/RALL
+**                          command
 **
 ** Returns          None
 **
@@ -596,8 +598,8 @@
 **
 ** Function         rw_t1t_handle_read_rsp
 **
-** Description      This function handle the data bytes excluding ADD(S)/ADD8 field
-**                  received as part of RSEG, RALL, READ8 command response
+** Description      This function handle the data bytes excluding ADD(S)/ADD8
+**                  field received as part of RSEG, RALL, READ8 command response
 **
 ** Returns          status of the current NDEF/TLV Operation
 **
@@ -2404,7 +2406,8 @@
 **
 ** Parameters:      tlv_type, Type of TLV to find
 **
-** Returns          NCI_STATUS_OK, if detection was started. Otherwise, error status.
+** Returns          NCI_STATUS_OK, if detection was started. Otherwise, error
+**                  status.
 **
 *******************************************************************************/
 tNFC_STATUS RW_T1tLocateTlv (uint8_t tlv_type)
@@ -2490,7 +2493,8 @@
 **
 ** Function         RW_T1tReadNDef
 **
-** Description      This function can be called to read the NDEF message on the tag.
+** Description      This function can be called to read the NDEF message on the
+**                  tag.
 **
 ** Parameters:      p_buffer:   The buffer into which to read the NDEF message
 **                  buf_len:    The length of the buffer
@@ -2587,12 +2591,14 @@
 **
 ** Function         RW_T1tWriteNDef
 **
-** Description      This function can be called to write an NDEF message to the tag.
+** Description      This function can be called to write an NDEF message to the
+**                  tag.
 **
 ** Parameters:      msg_len:    The length of the buffer
 **                  p_msg:      The NDEF message to write
 **
-** Returns          NCI_STATUS_OK, if write was started. Otherwise, error status.
+** Returns          NCI_STATUS_OK, if write was started. Otherwise, error
+**                  status.
 **
 *******************************************************************************/
 tNFC_STATUS RW_T1tWriteNDef (uint16_t msg_len, uint8_t *p_msg)
diff --git a/src/nfc/tags/rw_t2t.c b/src/nfc/tags/rw_t2t.c
index 3e045a3..3099ccc 100644
--- a/src/nfc/tags/rw_t2t.c
+++ b/src/nfc/tags/rw_t2t.c
@@ -1046,12 +1046,13 @@
 ** Function         RW_T2tSectorSelect
 **
 ** Description      This function issues the Type 2 Tag SECTOR-SELECT command
-**                  packet 1. If a NACK is received as the response, the callback
-**                  function will be called with a RW_T2T_SECTOR_SELECT_EVT. If
-**                  an ACK is received as the response, the command packet 2 with
-**                  the given sector number is sent to the peer device. When the
-**                  response for packet 2 is received, the callback function will
-**                  be called with a RW_T2T_SECTOR_SELECT_EVT.
+**                  packet 1. If a NACK is received as the response, the
+**                  callback function will be called with a
+**                  RW_T2T_SECTOR_SELECT_EVT. If an ACK is received as the
+**                  response, the command packet 2 with the given sector number
+**                  is sent to the peer device. When the response for packet 2
+**                  is received, the callback function will be called with a
+**                  RW_T2T_SECTOR_SELECT_EVT.
 **
 **                  A sector is 256 contiguous blocks (1024 bytes).
 **
diff --git a/src/nfc/tags/rw_t2t_ndef.c b/src/nfc/tags/rw_t2t_ndef.c
index 090857d..7214d9f 100644
--- a/src/nfc/tags/rw_t2t_ndef.c
+++ b/src/nfc/tags/rw_t2t_ndef.c
@@ -166,7 +166,8 @@
 **
 ** Function         rw_t2t_info_to_event
 **
-** Description      This function returns RW event code based on the current state
+** Description      This function returns RW event code based on the current
+**                  state
 **
 ** Returns          RW event code
 **
@@ -944,8 +945,8 @@
 **                  locate the offset of Terminator TLV based on the size of
 **                  new NDEF Message
 **
-** Returns          NCI_STATUS_OK,if able to locate last ndef block & read started
-**                  Otherwise, error status.
+** Returns          NCI_STATUS_OK, if able to locate last ndef block & read
+**                  started. Otherwise, error status.
 **
 *******************************************************************************/
 tNFC_STATUS rw_t2t_read_ndef_last_block (void)
@@ -1151,7 +1152,8 @@
 **                  Also after writting NDEF this function may be called to
 **                  update new NDEF length
 **
-** Returns          NCI_STATUS_OK, if write was started. Otherwise, error status.
+** Returns          NCI_STATUS_OK, if write was started.
+**                  Otherwise, error status.
 **
 *******************************************************************************/
 tNFC_STATUS rw_t2t_write_ndef_first_block (uint16_t msg_len, bool    b_update_len)
@@ -1257,7 +1259,8 @@
 **
 ** Description      This function can be called to write an NDEF message block
 **
-** Returns          NCI_STATUS_OK, if write was started. Otherwise, error status.
+** Returns          NCI_STATUS_OK, if write was started.
+**                  Otherwise, error status.
 **
 *******************************************************************************/
 tNFC_STATUS rw_t2t_write_ndef_next_block (uint16_t block, uint16_t msg_len, bool    b_update_len)
@@ -1380,7 +1383,8 @@
 **
 ** Description      This function can be called to write an NDEF message block
 **
-** Returns          NCI_STATUS_OK, if write was started. Otherwise, error status.
+** Returns          NCI_STATUS_OK, if write was started.
+**                  Otherwise, error status.
 **
 *******************************************************************************/
 static void rw_t2t_update_cb (uint16_t block, uint8_t *p_write_block, bool    b_update_len)
@@ -1538,7 +1542,8 @@
 **
 ** Description      This function will add terminator TLV after NDEF Message
 **
-** Returns          NCI_STATUS_OK, if write was started. Otherwise, error status.
+** Returns          NCI_STATUS_OK, if write was started.
+**                  Otherwise, error status.
 **
 *******************************************************************************/
 tNFC_STATUS rw_t2t_add_terminator_tlv (void)
@@ -1624,7 +1629,8 @@
 **
 ** Function         rw_t2t_handle_ndef_write_rsp
 **
-** Description      Handle response received to reading (or part of) NDEF message.
+** Description      Handle response received to reading (or part of) NDEF
+**                  message.
 **
 ** Returns          none
 **
@@ -2131,9 +2137,10 @@
 ** Description      This function returns the offset of lock bits associated for
 **                  the specified segment
 **
-** Parameters:      segment: The segment number to which lock bits are associated
-**                  p_start_byte: The offset of lock byte that contains the first
-**                                lock bit for the segment
+** Parameters:      segment: The segment number to which lock bits are
+**                           associated
+**                  p_start_byte: The offset of lock byte that contains the
+**                                first lock bit for the segment
 **                  p_start_bit:  The offset of the lock bit in the lock byte
 **
 **                  p_end_byte:   The offset of the last bit associcated to the
@@ -2606,8 +2613,8 @@
 ** Function         rw_t2t_set_cc
 **
 ** Description      This function will set Capability Container on the activated
-**                  type 2 tag with default values of CC0, CC1, CC4 and specified
-**                  CC3 value
+**                  type 2 tag with default values of CC0, CC1, CC4 and
+**                  specified CC3 value
 **
 ** Parameters:      CC3 value of the tag
 **
@@ -2841,7 +2848,8 @@
 **
 ** Parameters:      tlv_type : TLV to detect
 **
-** Returns          NCI_STATUS_OK, if detection was started. Otherwise, error status.
+** Returns          NCI_STATUS_OK, if detection was started. Otherwise, error
+**                  status.
 **
 *******************************************************************************/
 tNFC_STATUS RW_T2tLocateTlv (uint8_t tlv_type)
@@ -2970,8 +2978,9 @@
 **                  be called to verify that the tag contains NDEF data, and to
 **                  retrieve the NDEF attributes.
 **
-**                  Internally, this command will be separated into multiple Tag2
-**                  Read commands (if necessary) - depending on the NDEF Msg size
+**                  Internally, this command will be separated into multiple
+**                  Tag2 Read commands (if necessary) - depending on the NDEF
+**                  Msg size
 **
 ** Parameters:      p_buffer:   The buffer into which to read the NDEF message
 **                  buf_len:    The length of the buffer
@@ -3049,8 +3058,9 @@
 **                  The RW_T2T_NDEF_WRITE_EVT callback event will be used to
 **                  notify the application of the response.
 **
-**                  Internally, this command will be separated into multiple Tag2
-**                  Write commands (if necessary) - depending on the NDEF Msg size
+**                  Internally, this command will be separated into multiple
+**                  Tag2 Write commands (if necessary) - depending on the NDEF
+**                  Msg size
 **
 ** Parameters:      msg_len:    The length of the buffer
 **                  p_msg:      The NDEF message to write
diff --git a/src/nfc/tags/rw_t3t.c b/src/nfc/tags/rw_t3t.c
index 7ac9490..efc9dbd 100644
--- a/src/nfc/tags/rw_t3t.c
+++ b/src/nfc/tags/rw_t3t.c
@@ -2543,8 +2543,8 @@
 **      Retrieve NDEF contents from a Type3 tag.
 **
 **      The RW_T3T_CHECK_EVT event is used to notify the application for each
-**      segment of NDEF data received. The RW_T3T_CHECK_CPLT_EVT event is used to
-**      notify the application all segments have been received.
+**      segment of NDEF data received. The RW_T3T_CHECK_CPLT_EVT event is used
+**      to notify the application all segments have been received.
 **
 **      Before using this API, the RW_T3tDetectNDef function must be called to
 **      verify that the tag contains NDEF data, and to retrieve the NDEF
diff --git a/src/nfc/tags/rw_t4t.c b/src/nfc/tags/rw_t4t.c
index bff191b..2e222a9 100644
--- a/src/nfc/tags/rw_t4t.c
+++ b/src/nfc/tags/rw_t4t.c
@@ -2163,7 +2163,8 @@
 **
 **                  The following event will be returned
 **                      RW_T4T_NDEF_READ_EVT for each segmented NDEF message
-**                      RW_T4T_NDEF_READ_CPLT_EVT for the last segment or complete NDEF
+**                      RW_T4T_NDEF_READ_CPLT_EVT for the last segment or
+**                      complete NDEF
 **                      RW_T4T_NDEF_READ_FAIL_EVT for failure
 **
 ** Returns          NFC_STATUS_OK if success
@@ -2208,7 +2209,8 @@
 **
 ** Description      This function performs NDEF update procedure
 **                  Note: RW_T4tDetectNDef () must be called before using this
-**                        Updating data must not be removed until returning event
+**                        Updating data must not be removed until returning
+**                        event
 **
 **                  The following event will be returned
 **                      RW_T4T_NDEF_UPDATE_CPLT_EVT for complete
@@ -2280,7 +2282,8 @@
 **
 **      The RW_T4T_PRESENCE_CHECK_EVT w/ status is used to indicate presence
 **      or non-presence.
-**      option is RW_T4T_CHK_EMPTY_I_BLOCK, use empty I block for presence check.
+**
+**      option is RW_T4T_CHK_EMPTY_I_BLOCK, use empty I block for presence check
 **
 ** Returns
 **      NFC_STATUS_OK, if raw data frame sent
diff --git a/src/nfc/tags/tags_int.c b/src/nfc/tags/tags_int.c
index 6603d94..3c09493 100644
--- a/src/nfc/tags/tags_int.c
+++ b/src/nfc/tags/tags_int.c
@@ -226,7 +226,8 @@
 **
 ** Function         t1t_info_to_evt
 **
-** Description      This function maps the given tT1T_CMD_RSP_INFO to RW/CE event code
+** Description      This function maps the given tT1T_CMD_RSP_INFO to RW/CE
+**                  event code
 **
 ** Returns          RW/CE event code
 **
@@ -240,7 +241,8 @@
 **
 ** Function         t2t_info_to_evt
 **
-** Description      This function maps the given tT2T_CMD_RSP_INFO to RW/CE event code
+** Description      This function maps the given tT2T_CMD_RSP_INFO to RW/CE
+**                  event code
 **
 ** Returns          RW/CE event code
 **
@@ -255,7 +257,8 @@
 **
 ** Function         t1t_info_to_str
 **
-** Description      This function maps the given tT1T_CMD_RSP_INFO to T1T cmd str
+** Description      This function maps the given tT1T_CMD_RSP_INFO to T1T cmd
+**                  str
 **
 ** Returns          T1T cmd str
 **
@@ -273,7 +276,8 @@
 **
 ** Function         t2t_info_to_str
 **
-** Description      This function maps the given tT2T_CMD_RSP_INFO to T2T cmd str
+** Description      This function maps the given tT2T_CMD_RSP_INFO to T2T cmd
+**                  str
 **
 ** Returns          T2T cmd str
 **