Revert "Header file and whitespace cleanups"

This reverts commit cc914cffd521b2e6e1be804c82aea2388b843ebf

More changes in the original CL after my cherry-pick.

Change-Id: Ic144dba96aeb8a60611baac7565c9f628ab8f9eb

7 files changed, 65 insertions, 65 deletions

diff --git a/stack/avct/avct_api.c b/stack/avct/avct_api.c
index 90edb3d..d1d5cee 100644
--- a/stack/avct/avct_api.c
+++ b/stack/avct/avct_api.c
@@ -34,7 +34,7 @@ tAVCT_CB avct_cb;
 **                  prepares the protocol stack for its use.  This function
 **                  must be called once by the system or platform using AVCTP
 **                  before the other functions of the API an be used.
-**
+**                  
 **
 ** Returns          void
 **
@@ -45,7 +45,7 @@ void AVCT_Register(UINT16 mtu, UINT16 mtu_br, UINT8 sec_mask)
 
     /* register PSM with L2CAP */
     L2CA_Register(AVCT_PSM, (tL2CAP_APPL_INFO *) &avct_l2c_appl);
-
+    
     /* set security level */
     BTM_SetSecurityLevel(TRUE, "", BTM_SEC_SERVICE_AVCTP, sec_mask, AVCT_PSM, 0, 0);
     BTM_SetSecurityLevel(FALSE, "", BTM_SEC_SERVICE_AVCTP, sec_mask, AVCT_PSM, 0, 0);
@@ -86,7 +86,7 @@ void AVCT_Register(UINT16 mtu, UINT16 mtu_br, UINT8 sec_mask)
 **                  application in the system.  Before this function can be
 **                  called, all connections must be removed with
 **                  AVCT_RemoveConn().
-**
+**                  
 **
 ** Returns          void
 **
@@ -108,9 +108,9 @@ void AVCT_Deregister(void)
 **                  the p_cc->role parameter.  When this function is called to
 **                  create an initiator connection, an AVCTP connection to
 **                  the peer device is initiated if one does not already exist.
-**                  If an acceptor connection is created, the connection waits
+**                  If an acceptor connection is created, the connection waits 
 **                  passively for an incoming AVCTP connection from a peer device.
-**
+**                  
 **
 ** Returns          AVCT_SUCCESS if successful, otherwise error.
 **
@@ -173,7 +173,7 @@ UINT16 AVCT_CreateConn(UINT8 *p_handle, tAVCT_CC *p_cc, BD_ADDR peer_addr)
 **                  the application is no longer using a connection.  If this
 **                  is the last connection to a peer the L2CAP channel for AVCTP
 **                  will be closed.
-**
+**                  
 **
 ** Returns          AVCT_SUCCESS if successful, otherwise error.
 **
@@ -212,9 +212,9 @@ UINT16 AVCT_RemoveConn(UINT8 handle)
 **                  the role parameter.  When this function is called to
 **                  create an initiator connection, the Browse channel to
 **                  the peer device is initiated if one does not already exist.
-**                  If an acceptor connection is created, the connection waits
+**                  If an acceptor connection is created, the connection waits 
 **                  passively for an incoming AVCTP connection from a peer device.
-**
+**                  
 **
 ** Returns          AVCT_SUCCESS if successful, otherwise error.
 **
@@ -289,7 +289,7 @@ UINT16 AVCT_CreateBrowse (UINT8 handle, UINT8 role)
 **                  the application is no longer using a connection.  If this
 **                  is the last connection to a peer the L2CAP channel for AVCTP
 **                  will be closed.
-**
+**                  
 **
 ** Returns          AVCT_SUCCESS if successful, otherwise error.
 **
@@ -322,7 +322,7 @@ UINT16 AVCT_RemoveBrowse (UINT8 handle)
 **
 ** Function         AVCT_GetBrowseMtu
 **
-** Description      Get the peer_mtu for the AVCTP Browse channel of the given
+** Description      Get the peer_mtu for the AVCTP Browse channel of the given 
 **                  connection.
 **
 ** Returns          the peer browsing channel MTU.
@@ -346,7 +346,7 @@ UINT16 AVCT_GetBrowseMtu (UINT8 handle)
 **
 ** Function         AVCT_GetPeerMtu
 **
-** Description      Get the peer_mtu for the AVCTP channel of the given
+** Description      Get the peer_mtu for the AVCTP channel of the given 
 **                  connection.
 **
 ** Returns          the peer MTU size.
@@ -423,7 +423,7 @@ UINT16 AVCT_MsgReq(UINT8 handle, UINT8 label, UINT8 cr, BT_HDR *p_msg)
         ul_msg.p_buf = p_msg;
         ul_msg.p_ccb = p_ccb;
         ul_msg.label = label;
-        ul_msg.cr = cr;
+        ul_msg.cr = cr;    
 
 #if (AVCT_BROWSE_INCLUDED == TRUE)
         /* send msg event to bcb */
diff --git a/stack/avct/avct_ccb.c b/stack/avct/avct_ccb.c
index 1de4652..89465a2 100644
--- a/stack/avct/avct_ccb.c
+++ b/stack/avct/avct_ccb.c
@@ -21,7 +21,7 @@
 ** Function         avct_ccb_alloc
 **
 ** Description      Allocate a connection control block; copy parameters to ccb.
-**
+**                  
 **
 ** Returns          pointer to the ccb, or NULL if none could be allocated.
 **
@@ -41,7 +41,7 @@ tAVCT_CCB *avct_ccb_alloc(tAVCT_CC *p_cc)
             break;
         }
     }
-
+    
     if (i == AVCT_NUM_CONN)
     {
         /* out of ccbs */
@@ -57,7 +57,7 @@ tAVCT_CCB *avct_ccb_alloc(tAVCT_CC *p_cc)
 **
 ** Description      Deallocate a connection control block and call application
 **                  callback.
-**
+**                  
 **
 ** Returns          void.
 **
@@ -91,7 +91,7 @@ void avct_ccb_dealloc(tAVCT_CCB *p_ccb, UINT8 event, UINT16 result, BD_ADDR bd_a
 ** Function         avct_ccb_to_idx
 **
 ** Description      Given a pointer to an ccb, return its index.
-**
+**                  
 **
 ** Returns          Index of ccb.
 **
@@ -107,7 +107,7 @@ UINT8 avct_ccb_to_idx(tAVCT_CCB *p_ccb)
 ** Function         avct_ccb_by_idx
 **
 ** Description      Return ccb pointer based on ccb index (or handle).
-**
+**                  
 **
 ** Returns          pointer to the ccb, or NULL if none found.
 **
@@ -126,7 +126,7 @@ tAVCT_CCB *avct_ccb_by_idx(UINT8 idx)
         {
             p_ccb = NULL;
             AVCT_TRACE_WARNING1("ccb %d not allocated", idx);
-        }
+        }   
     }
     else
     {
diff --git a/stack/avct/avct_defs.h b/stack/avct/avct_defs.h
index 4496acd..dd03c1e 100644
--- a/stack/avct/avct_defs.h
+++ b/stack/avct/avct_defs.h
@@ -5,7 +5,7 @@
 **  Description:    This contains constants definitions and other information
 **                  from the AVCTP specification.  This file is intended for
 **                  use internal to AVCT only.
-**
+**                  
 **
 **  Copyright (c) 2003-2004, WIDCOMM Inc., All Rights Reserved.
 **  WIDCOMM Bluetooth Core. Proprietary and confidential.
@@ -47,5 +47,5 @@
 
 #define AVCT_PRS_PKT_TYPE(p, type) \
     type = (*(p) >> 2) & 3;
-
+         
 #endif /* AVCT_DEFS_H */
diff --git a/stack/avct/avct_int.h b/stack/avct/avct_int.h
index 193ecb1..d67c404 100644
--- a/stack/avct/avct_int.h
+++ b/stack/avct/avct_int.h
@@ -3,7 +3,7 @@
 **  Name:           avct_int.h
 **
 **  Description:    This file contains interfaces which are internal to AVCTP.
-**
+**                  
 **
 **  Copyright (c) 2003-2008, Broadcom Corp., All Rights Reserved.
 **  WIDCOMM Bluetooth Core. Proprietary and confidential.
@@ -104,7 +104,7 @@ typedef struct {
     UINT8                   label;
     UINT8                   cr;
 } tAVCT_UL_MSG;
-
+    
 /* union associated with lcb state machine events */
 typedef union {
     tAVCT_UL_MSG            ul_msg;
diff --git a/stack/avct/avct_l2c.c b/stack/avct/avct_l2c.c
index b5f10a7..cf1a652 100644
--- a/stack/avct/avct_l2c.c
+++ b/stack/avct/avct_l2c.c
@@ -82,7 +82,7 @@ static BOOLEAN avct_l2c_is_passive (tAVCT_LCB *p_lcb)
 ** Function         avct_l2c_connect_ind_cback
 **
 ** Description      This is the L2CAP connect indication callback function.
-**
+**                  
 **
 ** Returns          void
 **
@@ -118,14 +118,14 @@ void avct_l2c_connect_ind_cback(BD_ADDR bd_addr, UINT16 lcid, UINT16 psm, UINT8
             AVCT_TRACE_DEBUG1("avct_l2c_connect_ind_cback conflict_lcid:0x%x", p_lcb->conflict_lcid);
         }
     }
-
+    
     if(p_lcb)
     {
         AVCT_TRACE_DEBUG3("avct_l2c_connect_ind_cback: 0x%x, res: %d, ch_state: %d",
             lcid, result, p_lcb->ch_state);
     }
     /* Send L2CAP connect rsp */
-    L2CA_ConnectRsp(bd_addr, id, lcid, result, 0);
+    L2CA_ConnectRsp(bd_addr, id, lcid, result, 0); 
 
     /* if result ok, proceed with connection */
     if (result == L2CAP_CONN_OK)
@@ -155,7 +155,7 @@ void avct_l2c_connect_ind_cback(BD_ADDR bd_addr, UINT16 lcid, UINT16 psm, UINT8
 ** Function         avct_l2c_connect_cfm_cback
 **
 ** Description      This is the L2CAP connect confirm callback function.
-**
+**                  
 **
 ** Returns          void
 **
@@ -216,7 +216,7 @@ void avct_l2c_connect_cfm_cback(UINT16 lcid, UINT16 result)
 ** Function         avct_l2c_config_cfm_cback
 **
 ** Description      This is the L2CAP config confirm callback function.
-**
+**                  
 **
 ** Returns          void
 **
@@ -266,7 +266,7 @@ void avct_l2c_config_cfm_cback(UINT16 lcid, tL2CAP_CFG_INFO *p_cfg)
 ** Function         avct_l2c_config_ind_cback
 **
 ** Description      This is the L2CAP config indication callback function.
-**
+**                  
 **
 ** Returns          void
 **
@@ -296,7 +296,7 @@ void avct_l2c_config_ind_cback(UINT16 lcid, tL2CAP_CFG_INFO *p_cfg)
 
         /* if first config ind */
         if ((p_lcb->ch_flags & AVCT_L2C_CFG_IND_DONE) == 0)
-        {
+        {        
             /* update flags */
             p_lcb->ch_flags |= AVCT_L2C_CFG_IND_DONE;
 
@@ -316,7 +316,7 @@ void avct_l2c_config_ind_cback(UINT16 lcid, tL2CAP_CFG_INFO *p_cfg)
 ** Function         avct_l2c_disconnect_ind_cback
 **
 ** Description      This is the L2CAP disconnect indication callback function.
-**
+**                  
 **
 ** Returns          void
 **
@@ -335,7 +335,7 @@ void avct_l2c_disconnect_ind_cback(UINT16 lcid, BOOLEAN ack_needed)
             /* send L2CAP disconnect response */
             L2CA_DisconnectRsp(lcid);
         }
-
+  
         avct_lcb_event(p_lcb, AVCT_LCB_LL_CLOSE_EVT, (tAVCT_LCB_EVT *) &result);
         AVCT_TRACE_DEBUG1("ch_state di: %d ", p_lcb->ch_state);
     }
@@ -346,7 +346,7 @@ void avct_l2c_disconnect_ind_cback(UINT16 lcid, BOOLEAN ack_needed)
 ** Function         avct_l2c_disconnect_cfm_cback
 **
 ** Description      This is the L2CAP disconnect confirm callback function.
-**
+**                  
 **
 ** Returns          void
 **
@@ -375,7 +375,7 @@ void avct_l2c_disconnect_cfm_cback(UINT16 lcid, UINT16 result)
 ** Function         avct_l2c_congestion_ind_cback
 **
 ** Description      This is the L2CAP congestion indication callback function.
-**
+**                  
 **
 ** Returns          void
 **
@@ -397,7 +397,7 @@ void avct_l2c_congestion_ind_cback(UINT16 lcid, BOOLEAN is_congested)
 ** Function         avct_l2c_data_ind_cback
 **
 ** Description      This is the L2CAP data indication callback function.
-**
+**                  
 **
 ** Returns          void
 **
diff --git a/stack/avct/avct_lcb.c b/stack/avct/avct_lcb.c
index abbe1ad..f7127a3 100644
--- a/stack/avct/avct_lcb.c
+++ b/stack/avct/avct_lcb.c
@@ -173,7 +173,7 @@ const tAVCT_LCB_ST_TBL avct_lcb_st_tbl[] = {
 ** Function         avct_lcb_event
 **
 ** Description      State machine event handling function for lcb
-**
+**                  
 **
 ** Returns          Nothing.
 **
@@ -215,7 +215,7 @@ void avct_lcb_event(tAVCT_LCB *p_lcb, UINT8 event, tAVCT_LCB_EVT *p_data)
 ** Function         avct_bcb_event
 **
 ** Description      State machine event handling function for lcb
-**
+**                  
 **
 ** Returns          Nothing.
 **
@@ -259,7 +259,7 @@ void avct_bcb_event(tAVCT_BCB *p_bcb, UINT8 event, tAVCT_LCB_EVT *p_data)
 ** Function         avct_lcb_by_bd
 **
 ** Description      This lookup function finds the lcb for a BD address.
-**
+**                  
 **
 ** Returns          pointer to the lcb, or NULL if none found.
 **
@@ -277,7 +277,7 @@ tAVCT_LCB *avct_lcb_by_bd(BD_ADDR bd_addr)
             break;
         }
     }
-
+    
     if (i == AVCT_NUM_LINKS)
     {
         /* if no lcb found */
@@ -294,7 +294,7 @@ tAVCT_LCB *avct_lcb_by_bd(BD_ADDR bd_addr)
 ** Function         avct_lcb_alloc
 **
 ** Description      Allocate a link control block.
-**
+**                  
 **
 ** Returns          pointer to the lcb, or NULL if none could be allocated.
 **
@@ -314,7 +314,7 @@ tAVCT_LCB *avct_lcb_alloc(BD_ADDR bd_addr)
             break;
         }
     }
-
+    
     if (i == AVCT_NUM_LINKS)
     {
         /* out of lcbs */
@@ -329,7 +329,7 @@ tAVCT_LCB *avct_lcb_alloc(BD_ADDR bd_addr)
 ** Function         avct_lcb_dealloc
 **
 ** Description      Deallocate a link control block.
-**
+**                  
 **
 ** Returns          void.
 **
@@ -374,7 +374,7 @@ void avct_lcb_dealloc(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data)
 ** Function         avct_lcb_by_lcid
 **
 ** Description      Find the LCB associated with the L2CAP LCID
-**
+**                  
 **
 ** Returns          pointer to the lcb, or NULL if none found.
 **
@@ -391,7 +391,7 @@ tAVCT_LCB *avct_lcb_by_lcid(UINT16 lcid)
             break;
         }
     }
-
+    
     if (i == AVCT_NUM_LINKS)
     {
         /* out of lcbs */
@@ -407,7 +407,7 @@ tAVCT_LCB *avct_lcb_by_lcid(UINT16 lcid)
 ** Function         avct_lcb_has_pid
 **
 ** Description      See if any ccbs on this lcb have a particular pid.
-**
+**                  
 **
 ** Returns          Pointer to CCB if PID found, NULL otherwise.
 **
@@ -432,7 +432,7 @@ tAVCT_CCB *avct_lcb_has_pid(tAVCT_LCB *p_lcb, UINT16 pid)
 ** Function         avct_lcb_last_ccb
 **
 ** Description      See if given ccb is only one on the lcb.
-**
+**                  
 **
 ** Returns          TRUE if ccb is last, FALSE otherwise.
 **
diff --git a/stack/avct/avct_lcb_act.c b/stack/avct/avct_lcb_act.c
index 186c5d2..8d48c10 100644
--- a/stack/avct/avct_lcb_act.c
+++ b/stack/avct/avct_lcb_act.c
@@ -24,14 +24,14 @@ const UINT8 avct_lcb_pkt_type_len[] = {
     AVCT_HDR_LEN_START,
     AVCT_HDR_LEN_CONT,
     AVCT_HDR_LEN_END
-};
+}; 
 
 /*******************************************************************************
 **
 ** Function         avct_lcb_msg_asmbl
 **
 ** Description      Reassemble incoming message.
-**
+**                  
 **
 ** Returns          Pointer to reassembled message;  NULL if no message
 **                  available.
@@ -150,7 +150,7 @@ static BT_HDR *avct_lcb_msg_asmbl(tAVCT_LCB *p_lcb, BT_HDR *p_buf)
 ** Function         avct_lcb_chnl_open
 **
 ** Description      Open L2CAP channel to peer
-**
+**                  
 **
 ** Returns          Nothing.
 **
@@ -174,7 +174,7 @@ void avct_lcb_chnl_open(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data)
 ** Function         avct_lcb_unbind_disc
 **
 ** Description      Deallocate ccb and call callback with disconnect event.
-**
+**                  
 **
 ** Returns          Nothing.
 **
@@ -192,7 +192,7 @@ void avct_lcb_unbind_disc(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data)
 **                  bound to this lcb, send a connect event.  For each
 **                  unbound ccb with a new PID, bind that ccb to this lcb and
 **                  send a connect event.
-**
+**                  
 **
 ** Returns          Nothing.
 **
@@ -243,7 +243,7 @@ void avct_lcb_open_ind(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data)
 **
 ** Description      L2CAP channel open attempt failed.  Deallocate any ccbs
 **                  on this lcb and send connect confirm event with failure.
-**
+**                  
 **
 ** Returns          Nothing.
 **
@@ -269,7 +269,7 @@ void avct_lcb_open_fail(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data)
 **
 ** Description      L2CAP channel closed by peer.  Deallocate any initiator
 **                  ccbs on this lcb and send disconnect ind event.
-**
+**                  
 **
 ** Returns          Nothing.
 **
@@ -304,7 +304,7 @@ void avct_lcb_close_ind(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data)
 **
 ** Description      L2CAP channel closed by us.  Deallocate any initiator
 **                  ccbs on this lcb and send disconnect ind or cfm event.
-**
+**                  
 **
 ** Returns          Nothing.
 **
@@ -349,7 +349,7 @@ void avct_lcb_close_cfm(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data)
 ** Function         avct_lcb_bind_conn
 **
 ** Description      Bind ccb to lcb and send connect cfm event.
-**
+**                  
 **
 ** Returns          Nothing.
 **
@@ -365,10 +365,10 @@ void avct_lcb_bind_conn(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data)
 **
 ** Function         avct_lcb_chk_disc
 **
-** Description      A ccb wants to close; if it is the last ccb on this lcb,
+** Description      A ccb wants to close; if it is the last ccb on this lcb, 
 **                  close channel.  Otherwise just deallocate and call
 **                  callback.
-**
+**                  
 **
 ** Returns          Nothing.
 **
@@ -397,7 +397,7 @@ void avct_lcb_chk_disc(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data)
 ** Function         avct_lcb_chnl_disc
 **
 ** Description      Disconnect L2CAP channel.
-**
+**                  
 **
 ** Returns          Nothing.
 **
@@ -411,9 +411,9 @@ void avct_lcb_chnl_disc(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data)
 **
 ** Function         avct_lcb_bind_fail
 **
-** Description      Deallocate ccb and call callback with connect event
+** Description      Deallocate ccb and call callback with connect event 
 **                  with failure result.
-**
+**                  
 **
 ** Returns          Nothing.
 **
@@ -428,7 +428,7 @@ void avct_lcb_bind_fail(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data)
 ** Function         avct_lcb_cong_ind
 **
 ** Description      Handle congestion indication from L2CAP.
-**
+**                  
 **
 ** Returns          Nothing.
 **
@@ -469,7 +469,7 @@ void avct_lcb_cong_ind(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data)
 ** Function         avct_lcb_discard_msg
 **
 ** Description      Discard a message sent in from the API.
-**
+**                  
 **
 ** Returns          Nothing.
 **
@@ -486,7 +486,7 @@ void avct_lcb_discard_msg(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data)
 ** Function         avct_lcb_send_msg
 **
 ** Description      Build and send an AVCTP message.
-**
+**                  
 **
 ** Returns          Nothing.
 **
@@ -502,7 +502,7 @@ void avct_lcb_send_msg(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data)
     UINT16          temp;
     UINT16          buf_size = p_lcb->peer_mtu + L2CAP_MIN_OFFSET + BT_HDR_SIZE;
 
-
+        
     /* store msg len */
     curr_msg_len = p_data->ul_msg.p_buf->len;
 
@@ -604,7 +604,7 @@ void avct_lcb_send_msg(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data)
 ** Function         avct_lcb_free_msg_ind
 **
 ** Description      Discard an incoming AVCTP message.
-**
+**                  
 **
 ** Returns          Nothing.
 **
@@ -621,7 +621,7 @@ void avct_lcb_free_msg_ind(tAVCT_LCB *p_lcb, tAVCT_LCB_EVT *p_data)
 ** Function         avct_lcb_msg_ind
 **
 ** Description      Handle an incoming AVCTP message.
-**
+**                  
 **
 ** Returns          Nothing.
 **