Revert "Header file and whitespace cleanups"

This reverts commit cc914cffd521b2e6e1be804c82aea2388b843ebf

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

Change-Id: Ic144dba96aeb8a60611baac7565c9f628ab8f9eb

4 files changed, 14 insertions, 14 deletions

diff --git a/stack/bnep/bnep_api.c b/stack/bnep/bnep_api.c
index 90dd946..7c4dee9 100644
--- a/stack/bnep/bnep_api.c
+++ b/stack/bnep/bnep_api.c
@@ -46,7 +46,7 @@ void BNEP_Init (void)
 **                  its callbacks with BNEP
 **
 ** Parameters:      p_reg_info - contains all callback function pointers
-**
+**                  
 **
 ** Returns          BNEP_SUCCESS        if registered successfully
 **                  BNEP_FAILURE        if connection state callback is missing
@@ -65,7 +65,7 @@ tBNEP_RESULT BNEP_Register (tBNEP_REGISTER *p_reg_info)
     bnep_cb.p_filter_ind_cb     = p_reg_info->p_filter_ind_cb;
     bnep_cb.p_mfilter_ind_cb    = p_reg_info->p_mfilter_ind_cb;
     bnep_cb.p_tx_data_flow_cb   = p_reg_info->p_tx_data_flow_cb;
-
+    
     if (bnep_register_with_l2cap ())
         return BNEP_SECURITY_FAIL;
 
@@ -83,7 +83,7 @@ tBNEP_RESULT BNEP_Register (tBNEP_REGISTER *p_reg_info)
 **                  its callbacks.
 **
 ** Parameters:      void
-**
+**                  
 **
 ** Returns          void
 **
@@ -214,7 +214,7 @@ tBNEP_RESULT BNEP_Connect (BD_ADDR p_rem_bda,
 ** Function         BNEP_ConnectResp
 **
 ** Description      This function is called in responce to connection indication
-**
+**                  
 **
 ** Parameters:      handle  - handle given in the connection indication
 **                  resp    - responce for the connection indication
diff --git a/stack/bnep/bnep_int.h b/stack/bnep/bnep_int.h
index adc5c2b..a849052 100644
--- a/stack/bnep/bnep_int.h
+++ b/stack/bnep/bnep_int.h
@@ -206,9 +206,9 @@ extern void        bnepu_release_bcb (tBNEP_CONN *p_bcb);
 extern void        bnepu_send_peer_our_filters (tBNEP_CONN *p_bcb);
 extern void        bnepu_send_peer_our_multi_filters (tBNEP_CONN *p_bcb);
 extern BOOLEAN     bnepu_does_dest_support_prot (tBNEP_CONN *p_bcb, UINT16 protocol);
-extern void        bnepu_build_bnep_hdr (tBNEP_CONN *p_bcb, BT_HDR *p_buf, UINT16 protocol,
+extern void        bnepu_build_bnep_hdr (tBNEP_CONN *p_bcb, BT_HDR *p_buf, UINT16 protocol, 
                                          UINT8 *p_src_addr, UINT8 *p_dest_addr, BOOLEAN ext_bit);
-extern void        test_bnepu_build_bnep_hdr (tBNEP_CONN *p_bcb, BT_HDR *p_buf, UINT16 protocol,
+extern void        test_bnepu_build_bnep_hdr (tBNEP_CONN *p_bcb, BT_HDR *p_buf, UINT16 protocol, 
                                          UINT8 *p_src_addr, UINT8 *p_dest_addr, UINT8 type);
 
 extern tBNEP_CONN *bnepu_get_route_to_dest (UINT8 *p_bda);
diff --git a/stack/bnep/bnep_main.c b/stack/bnep/bnep_main.c
index 2a4933a..fca0d22 100644
--- a/stack/bnep/bnep_main.c
+++ b/stack/bnep/bnep_main.c
@@ -99,7 +99,7 @@ tBNEP_RESULT bnep_register_with_l2cap (void)
 **
 ** Description      This function handles an inbound connection indication
 **                  from L2CAP. This is the case where we are acting as a
-**                  server.
+**                  server. 
 **
 ** Returns          void
 **
@@ -113,7 +113,7 @@ static void bnep_connect_ind (BD_ADDR  bd_addr, UINT16 l2cap_cid, UINT16 psm, UI
     if (!(bnep_cb.profile_registered) || (p_bcb)
      || ((p_bcb = bnepu_allocate_bcb(bd_addr)) == NULL))
     {
-        L2CA_ConnectRsp (bd_addr, l2cap_id, l2cap_cid, L2CAP_CONN_NO_PSM, 0);
+        L2CA_ConnectRsp (bd_addr, l2cap_id, l2cap_cid, L2CAP_CONN_NO_PSM, 0); 
         return;
     }
 
@@ -124,7 +124,7 @@ static void bnep_connect_ind (BD_ADDR  bd_addr, UINT16 l2cap_cid, UINT16 psm, UI
     p_bcb->l2cap_cid = l2cap_cid;
 
     /* Send response to the L2CAP layer. */
-    L2CA_ConnectRsp (bd_addr, l2cap_id, l2cap_cid, L2CAP_CONN_OK, L2CAP_CONN_OK);
+    L2CA_ConnectRsp (bd_addr, l2cap_id, l2cap_cid, L2CAP_CONN_OK, L2CAP_CONN_OK); 
 
     /* Send a Configuration Request. */
     L2CA_ConfigReq (l2cap_cid, &bnep_cb.l2cap_my_cfg);
@@ -385,7 +385,7 @@ static void bnep_disconnect_cfm (UINT16 l2cap_cid, UINT16 result)
 **
 ** Function         bnep_congestion_ind
 **
-** Description      This is a callback function called by L2CAP when
+** Description      This is a callback function called by L2CAP when 
 **                  congestion status changes
 **
 *******************************************************************************/
diff --git a/stack/bnep/bnep_utils.c b/stack/bnep/bnep_utils.c
index 8c23877..22c2730 100644
--- a/stack/bnep/bnep_utils.c
+++ b/stack/bnep/bnep_utils.c
@@ -469,7 +469,7 @@ void bnepu_check_send_packet (tBNEP_CONN *p_bcb, BT_HDR *p_buf)
 ** Returns          void
 **
 *******************************************************************************/
-void bnepu_build_bnep_hdr (tBNEP_CONN *p_bcb, BT_HDR *p_buf, UINT16 protocol,
+void bnepu_build_bnep_hdr (tBNEP_CONN *p_bcb, BT_HDR *p_buf, UINT16 protocol, 
                            UINT8 *p_src_addr, UINT8 *p_dest_addr, BOOLEAN fw_ext_present)
 {
     UINT8    ext_bit, *p = (UINT8 *)NULL;
@@ -650,7 +650,7 @@ void bnep_process_setup_conn_req (tBNEP_CONN *p_bcb, UINT8 *p_setup, UINT8 len)
         bnep_sec_check_complete (p_bcb->rem_bda, p_bcb, BTM_SUCCESS);
     else
 #endif
-    btm_sec_mx_access_request (p_bcb->rem_bda, BT_PSM_BNEP, FALSE,
+    btm_sec_mx_access_request (p_bcb->rem_bda, BT_PSM_BNEP, FALSE, 
                                BTM_SEC_PROTO_BNEP, bnep_get_uuid32(&(p_bcb->src_uuid)),
                                &bnep_sec_check_complete, p_bcb);
 
@@ -960,7 +960,7 @@ void bnepu_process_peer_filter_set (tBNEP_CONN *p_bcb, UINT8 *p_filters, UINT16
 ** Function         bnepu_process_peer_filter_rsp
 **
 ** Description      This function processes a peer's filter control
-**                  'response' message.
+**                  'response' message. 
 **
 ** Returns          void
 **
@@ -1012,7 +1012,7 @@ void bnepu_process_peer_filter_rsp (tBNEP_CONN *p_bcb, UINT8 *p_data)
 ** Function         bnepu_process_multicast_filter_rsp
 **
 ** Description      This function processes multicast filter control
-**                  'response' message.
+**                  'response' message. 
 **
 ** Returns          void
 **