Revert "Header file and whitespace cleanups"

This reverts commit cc914cffd521b2e6e1be804c82aea2388b843ebf

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

Change-Id: Ic144dba96aeb8a60611baac7565c9f628ab8f9eb

2 files changed, 26 insertions, 26 deletions

diff --git a/stack/hcic/hciblecmds.c b/stack/hcic/hciblecmds.c
index 7be3520..d491ca4 100644
--- a/stack/hcic/hciblecmds.c
+++ b/stack/hcic/hciblecmds.c
@@ -148,7 +148,7 @@ BOOLEAN btsnd_hcic_ble_set_random_addr (BD_ADDR random_bda)
     return (TRUE);
 }
 
-BOOLEAN btsnd_hcic_ble_write_adv_params (UINT16 adv_int_min, UINT16 adv_int_max,
+BOOLEAN btsnd_hcic_ble_write_adv_params (UINT16 adv_int_min, UINT16 adv_int_max, 
                                        UINT8 adv_type, UINT8 addr_type_own,
                                        UINT8 addr_type_dir, BD_ADDR direct_bda,
                                        UINT8 channel_map, UINT8 adv_filter_policy)
@@ -252,7 +252,7 @@ BOOLEAN btsnd_hcic_ble_set_scan_rsp_data (UINT8 data_len, UINT8 *p_scan_rsp)
     if (p_scan_rsp != NULL && data_len > 0)
     {
 
-        if (data_len > HCIC_PARAM_SIZE_BLE_WRITE_SCAN_RSP )
+        if (data_len > HCIC_PARAM_SIZE_BLE_WRITE_SCAN_RSP ) 
             data_len = HCIC_PARAM_SIZE_BLE_WRITE_SCAN_RSP;
 
         UINT8_TO_STREAM (pp, data_len);
@@ -286,8 +286,8 @@ BOOLEAN btsnd_hcic_ble_set_adv_enable (UINT8 adv_enable)
     btu_hcif_send_cmd (LOCAL_BR_EDR_CONTROLLER_ID,  p);
     return (TRUE);
 }
-BOOLEAN btsnd_hcic_ble_set_scan_params (UINT8 scan_type,
-                                          UINT16 scan_int, UINT16 scan_win,
+BOOLEAN btsnd_hcic_ble_set_scan_params (UINT8 scan_type, 
+                                          UINT16 scan_int, UINT16 scan_win, 
                                           UINT8 addr_type_own, UINT8 scan_filter_policy)
 {
     BT_HDR *p;
@@ -338,11 +338,11 @@ BOOLEAN btsnd_hcic_ble_set_scan_enable (UINT8 scan_enable, UINT8 duplicate)
 }
 
 /* link layer connection management commands */
-BOOLEAN btsnd_hcic_ble_create_ll_conn (UINT16 scan_int, UINT16 scan_win,
-                                       UINT8 init_filter_policy,
-                                       UINT8 addr_type_peer, BD_ADDR bda_peer,
+BOOLEAN btsnd_hcic_ble_create_ll_conn (UINT16 scan_int, UINT16 scan_win, 
+                                       UINT8 init_filter_policy, 
+                                       UINT8 addr_type_peer, BD_ADDR bda_peer, 
                                        UINT8 addr_type_own,
-                                       UINT16 conn_int_min, UINT16 conn_int_max,
+                                       UINT16 conn_int_min, UINT16 conn_int_max, 
                                        UINT16 conn_latency, UINT16 conn_timeout,
                                        UINT16 min_ce_len, UINT16 max_ce_len)
 {
@@ -486,7 +486,7 @@ BOOLEAN btsnd_hcic_ble_remove_from_white_list (UINT8 addr_type, BD_ADDR bda)
     return (TRUE);
 }
 
-BOOLEAN btsnd_hcic_ble_upd_ll_conn_params (UINT16 handle,
+BOOLEAN btsnd_hcic_ble_upd_ll_conn_params (UINT16 handle, 
                                            UINT16 conn_int_min, UINT16 conn_int_max,
                                            UINT16 conn_latency, UINT16 conn_timeout,
                                            UINT16 min_ce_len, UINT16 max_ce_len)
@@ -585,14 +585,14 @@ BOOLEAN btsnd_hcic_ble_read_remote_feat (UINT16 handle)
 }
 
 /* security management commands */
-BOOLEAN btsnd_hcic_ble_encrypt (UINT8 *key, UINT8 key_len,
-                                UINT8 *plain_text, UINT8 pt_len,
+BOOLEAN btsnd_hcic_ble_encrypt (UINT8 *key, UINT8 key_len, 
+                                UINT8 *plain_text, UINT8 pt_len, 
                                 void *p_cmd_cplt_cback)
 {
     BT_HDR *p;
     UINT8 *pp;
 
-    if ((p = HCI_GET_CMD_BUF(sizeof(BT_HDR) + sizeof (void *) +
+    if ((p = HCI_GET_CMD_BUF(sizeof(BT_HDR) + sizeof (void *) + 
                             HCIC_PARAM_SIZE_BLE_ENCRYPT)) == NULL)
         return (FALSE);
 
@@ -603,7 +603,7 @@ BOOLEAN btsnd_hcic_ble_encrypt (UINT8 *key, UINT8 key_len,
 
     *((void **)pp) = p_cmd_cplt_cback;  /* Store command complete callback in buffer */
     pp += sizeof(void *);               /* Skip over callback pointer */
-
+    
 
     UINT16_TO_STREAM (pp, HCI_BLE_ENCRYPT);
     UINT8_TO_STREAM  (pp, HCIC_PARAM_SIZE_BLE_ENCRYPT);
@@ -612,7 +612,7 @@ BOOLEAN btsnd_hcic_ble_encrypt (UINT8 *key, UINT8 key_len,
 
     if (key_len > HCIC_BLE_ENCRYT_KEY_SIZE) key_len = HCIC_BLE_ENCRYT_KEY_SIZE;
     if (pt_len > HCIC_BLE_ENCRYT_KEY_SIZE) pt_len = HCIC_BLE_ENCRYT_KEY_SIZE;
-
+    
     ARRAY_TO_STREAM (pp, key, key_len);
     pp += (HCIC_BLE_ENCRYT_KEY_SIZE - key_len);
     ARRAY_TO_STREAM (pp, plain_text, pt_len);
@@ -626,7 +626,7 @@ BOOLEAN btsnd_hcic_ble_rand (void *p_cmd_cplt_cback)
     BT_HDR *p;
     UINT8 *pp;
 
-    if ((p = HCI_GET_CMD_BUF(sizeof(BT_HDR) + sizeof (void *) +
+    if ((p = HCI_GET_CMD_BUF(sizeof(BT_HDR) + sizeof (void *) + 
                         HCIC_PARAM_SIZE_BLE_RAND)) == NULL)
         return (FALSE);
 
diff --git a/stack/hcic/hcicmds.c b/stack/hcic/hcicmds.c
index 2a5299e..edc98a2 100644
--- a/stack/hcic/hcicmds.c
+++ b/stack/hcic/hcicmds.c
@@ -71,7 +71,7 @@ BOOLEAN btsnd_hcic_inq_cancel(void)
     return (TRUE);
 }
 
-BOOLEAN btsnd_hcic_per_inq_mode (UINT16 max_period, UINT16 min_period,
+BOOLEAN btsnd_hcic_per_inq_mode (UINT16 max_period, UINT16 min_period, 
                                  const LAP inq_lap, UINT8 duration, UINT8 response_cnt)
 {
     BT_HDR *p;
@@ -325,7 +325,7 @@ BOOLEAN btsnd_hcic_link_key_neg_reply (BD_ADDR bd_addr)
     return (TRUE);
 }
 
-BOOLEAN btsnd_hcic_pin_code_req_reply (BD_ADDR bd_addr, UINT8 pin_code_len,
+BOOLEAN btsnd_hcic_pin_code_req_reply (BD_ADDR bd_addr, UINT8 pin_code_len, 
                                     PIN_CODE pin_code)
 {
     BT_HDR *p;
@@ -348,7 +348,7 @@ BOOLEAN btsnd_hcic_pin_code_req_reply (BD_ADDR bd_addr, UINT8 pin_code_len,
 
     for (i = 0; i < pin_code_len; i++)
         *pp++ = *pin_code++;
-
+    
     for (; i < PIN_CODE_LEN; i++)
         *pp++ = 0;
 
@@ -793,7 +793,7 @@ BOOLEAN btsnd_hcic_sniff_mode (UINT16 handle, UINT16 max_sniff_period,
 }
 
 BOOLEAN btsnd_hcic_exit_sniff_mode (UINT16 handle)
-{
+{ 
     BT_HDR *p;
     UINT8 *pp;
 
@@ -840,7 +840,7 @@ BOOLEAN btsnd_hcic_park_mode (UINT16 handle, UINT16 beacon_max_interval,
 }
 
 BOOLEAN btsnd_hcic_exit_park_mode (UINT16 handle)
-{
+{ 
     BT_HDR *p;
     UINT8 *pp;
 
@@ -864,7 +864,7 @@ BOOLEAN btsnd_hcic_exit_park_mode (UINT16 handle)
 BOOLEAN btsnd_hcic_qos_setup (UINT16 handle, UINT8 flags, UINT8 service_type,
                               UINT32 token_rate, UINT32 peak, UINT32 latency,
                               UINT32 delay_var)
-{
+{ 
     BT_HDR *p;
     UINT8 *pp;
 
@@ -1025,7 +1025,7 @@ BOOLEAN btsnd_hcic_flow_specification(UINT16 handle, UINT8 flags, UINT8 flow_dir
                                       UINT8  service_type, UINT32 token_rate,
                                       UINT32 token_bucket_size, UINT32 peak,
                                       UINT32 latency)
-{
+{ 
     BT_HDR *p;
     UINT8 *pp;
 
@@ -1287,7 +1287,7 @@ BOOLEAN btsnd_hcic_read_stored_key (BD_ADDR bd_addr, BOOLEAN read_all_flag)
 
 BOOLEAN btsnd_hcic_write_stored_key (UINT8 num_keys, BD_ADDR *bd_addr,
                                      LINK_KEY *link_key)
-{
+{    
     BT_HDR *p;
     UINT8 *pp;
     int j;
@@ -1981,7 +1981,7 @@ BOOLEAN btsnd_hcic_set_host_flow_ctrl (UINT8 value)
     return (TRUE);
 }
 
-BOOLEAN btsnd_hcic_set_host_buf_size (UINT16 acl_len, UINT8 sco_len,
+BOOLEAN btsnd_hcic_set_host_buf_size (UINT16 acl_len, UINT8 sco_len, 
                                       UINT16 acl_num, UINT16 sco_num)
 {
     BT_HDR *p;
@@ -2237,9 +2237,9 @@ BOOLEAN btsnd_hcic_write_page_scan_mode (UINT8 mode)
 *******************************************/
 #if BTM_SSR_INCLUDED == TRUE
 
-BOOLEAN btsnd_hcic_sniff_sub_rate(UINT16 handle, UINT16 max_lat,
+BOOLEAN btsnd_hcic_sniff_sub_rate(UINT16 handle, UINT16 max_lat, 
                                   UINT16 min_remote_lat, UINT16 min_local_lat)
-{
+{ 
     BT_HDR *p;
     UINT8 *pp;