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, 49 insertions, 49 deletions

diff --git a/bta/pan/bta_pan_api.c b/bta/pan/bta_pan_api.c
index 520e6e6..5a84668 100644
--- a/bta/pan/bta_pan_api.c
+++ b/bta/pan/bta_pan_api.c
@@ -37,7 +37,7 @@ static const tBTA_SYS_REG bta_pan_reg =
 ** Description      Enable PAN service.  This function must be
 **                  called before any other functions in the PAN API are called.
 **                  When the enable operation is complete the callback function
-**                  will be called with a BTA_PAN_ENABLE_EVT.
+**                  will be called with a BTA_PAN_ENABLE_EVT. 
 **
 ** Returns          void
 **
@@ -66,8 +66,8 @@ void BTA_PanEnable(tBTA_PAN_CBACK p_cback)
 **
 ** Function         BTA_PanDisable
 **
-** Description      Disables PAN service.
-**
+** Description      Disables PAN service. 
+**                  
 **
 ** Returns          void
 **
@@ -89,8 +89,8 @@ void BTA_PanDisable(void)
 ** Function         BTA_PanSetRole
 **
 ** Description      Sets PAN roles. When the enable operation is complete
-**                  the callback function will be called with a BTA_PAN_SET_ROLE_EVT.
-**
+**                  the callback function will be called with a BTA_PAN_SET_ROLE_EVT. 
+**                  
 ** Returns          void
 **
 *******************************************************************************/
@@ -156,8 +156,8 @@ void BTA_PanSetRole(tBTA_PAN_ROLE role, tBTA_PAN_ROLE_INFO *p_user_info, tBTA_PA
 **
 ** Description      Opens a connection to a peer device.
 **                  When connection is open callback function is called
-**                  with a BTA_PAN_OPEN_EVT.
-**
+**                  with a BTA_PAN_OPEN_EVT. 
+**                  
 **
 ** Returns          void
 **
@@ -182,8 +182,8 @@ BTA_API void BTA_PanOpen(BD_ADDR bd_addr, tBTA_PAN_ROLE    local_role, tBTA_PAN_
 **
 ** Function         BTA_PanClose
 **
-** Description      Close a PAN  connection to a peer device.
-**
+** Description      Close a PAN  connection to a peer device. 
+**                  
 **
 ** Returns          void
 **
diff --git a/bta/pan/bta_pan_ci.c b/bta/pan/bta_pan_ci.c
index 1d2aac9..843d2b9 100644
--- a/bta/pan/bta_pan_ci.c
+++ b/bta/pan/bta_pan_ci.c
@@ -33,9 +33,9 @@
 **                  ready for more data and PAN should call bta_pan_co_tx_path().
 **                  This function is used when the TX data path is configured
 **                  to use a pull interface.
+**                  
 **
-**
-** Returns          void
+** Returns          void 
 **
 *******************************************************************************/
 void bta_pan_ci_tx_ready(UINT16 handle)
@@ -58,9 +58,9 @@ void bta_pan_ci_tx_ready(UINT16 handle)
 **                  has data available to send to PAN and PAN should call
 **                  bta_pan_co_rx_path().  This function is used when the RX
 **                  data path is configured to use a pull interface.
+**                  
 **
-**
-** Returns          void
+** Returns          void 
 **
 *******************************************************************************/
 void bta_pan_ci_rx_ready(UINT16 handle)
@@ -85,9 +85,9 @@ void bta_pan_ci_rx_ready(UINT16 handle)
 **                  any more data sent by bta_pan_co_tx_write() or
 **                  bta_pan_co_tx_writebuf().  This function is used when the
 **                  TX data path is configured to use a push interface.
+**                  
 **
-**
-** Returns          void
+** Returns          void 
 **
 *******************************************************************************/
 void bta_pan_ci_tx_flow(UINT16 handle, BOOLEAN enable)
@@ -110,29 +110,29 @@ void bta_pan_ci_tx_flow(UINT16 handle, BOOLEAN enable)
 ** Description      This function is called to send data to PAN when the RX path
 **                  is configured to use a push interface.  The function copies
 **                  data to an event buffer and sends it to PAN.
+**                  
 **
-**
-** Returns          void
+** Returns          void 
 **
 *******************************************************************************/
 void bta_pan_ci_rx_write(UINT16 handle, BD_ADDR dst, BD_ADDR src, UINT16 protocol,
                             UINT8 *p_data, UINT16 len, BOOLEAN ext)
 {
     BT_HDR * p_buf;
-
+ 
     if((p_buf = (BT_HDR *) GKI_getpoolbuf(PAN_POOL_ID)) != NULL)
     {
 
 
         p_buf->offset = PAN_MINIMUM_OFFSET;
-
+	
         /* copy all other params before the data */
         bdcpy(((tBTA_PAN_DATA_PARAMS *)p_buf)->src, src);
         bdcpy(((tBTA_PAN_DATA_PARAMS *)p_buf)->dst, dst);
         ((tBTA_PAN_DATA_PARAMS *)p_buf)->protocol = protocol;
         ((tBTA_PAN_DATA_PARAMS *)p_buf)->ext = ext;
         p_buf->len=len;
-
+        
         /* copy data */
         memcpy((UINT8 *)(p_buf + 1) + p_buf->offset, p_data, len);
 
@@ -153,9 +153,9 @@ void bta_pan_ci_rx_write(UINT16 handle, BD_ADDR dst, BD_ADDR src, UINT16 protoco
 **                  the data buffer.  The buffer must be allocated using
 **                  functions GKI_getbuf() or GKI_getpoolbuf().  The buffer
 **                  will be freed by BTA; the phone must not free the buffer.
+**                  
 **
-**
-** Returns          void
+** Returns          void 
 **
 *******************************************************************************/
 void bta_pan_ci_rx_writebuf(UINT16 handle, BD_ADDR dst, BD_ADDR src, UINT16 protocol,
@@ -180,13 +180,13 @@ void bta_pan_ci_rx_writebuf(UINT16 handle, BD_ADDR dst, BD_ADDR src, UINT16 prot
 **
 ** Function         bta_pan_ci_readbuf
 **
-** Description
-**
+** Description      
+**                        
 **
-** Returns          void
+** Returns          void 
 **
 *******************************************************************************/
-BT_HDR * bta_pan_ci_readbuf(UINT16 handle, BD_ADDR src, BD_ADDR dst, UINT16* p_protocol,
+BT_HDR * bta_pan_ci_readbuf(UINT16 handle, BD_ADDR src, BD_ADDR dst, UINT16* p_protocol, 
                                  BOOLEAN* p_ext, BOOLEAN* p_forward)
 {
     tBTA_PAN_SCB * p_scb;
@@ -213,10 +213,10 @@ BT_HDR * bta_pan_ci_readbuf(UINT16 handle, BD_ADDR src, BD_ADDR dst, UINT16* p_p
 **
 ** Function         bta_pan_ci_set_mfilters
 **
-** Description      This function is called to set multicast filters
+** Description      This function is called to set multicast filters 
+**                  
 **
-**
-** Returns          void
+** Returns          void 
 **
 *******************************************************************************/
 void bta_pan_ci_set_mfilters(UINT16 handle, UINT16 num_mcast_filters, UINT8 *p_start_array,
@@ -232,10 +232,10 @@ void bta_pan_ci_set_mfilters(UINT16 handle, UINT16 num_mcast_filters, UINT8 *p_s
 **
 ** Function         bta_pan_ci_set_mfilters
 **
-** Description      This function is called to set protocol filters
-**
+** Description      This function is called to set protocol filters 
+**                  
 **
-** Returns          void
+** Returns          void 
 **
 *******************************************************************************/
 void bta_pan_ci_set_pfilters(UINT16 handle, UINT16 num_filters, UINT16 *p_start_array, UINT16 *p_end_array)
diff --git a/bta/pan/bta_pan_int.h b/bta/pan/bta_pan_int.h
index 9d44ae0..5715c31 100644
--- a/bta/pan/bta_pan_int.h
+++ b/bta/pan/bta_pan_int.h
@@ -11,7 +11,7 @@
 *****************************************************************************/
 #ifndef BTA_PAN_INT_H
 #define BTA_PAN_INT_H
-
+ 
 #include "bta_sys.h"
 #include "bta_pan_api.h"
 
@@ -65,7 +65,7 @@ typedef struct
     char                user_name[BTA_SERVICE_NAME_LEN+1];   /* Service name */
     char                gn_name[BTA_SERVICE_NAME_LEN+1];     /* Service name */
     char                nap_name[BTA_SERVICE_NAME_LEN+1];    /* Service name */
-    tBTA_PAN_ROLE       role;
+    tBTA_PAN_ROLE       role;   
     UINT8               user_app_id;
     UINT8               gn_app_id;
     UINT8               nap_app_id;
diff --git a/bta/pan/bta_pan_main.c b/bta/pan/bta_pan_main.c
index 1ba520b..34caf61 100644
--- a/bta/pan/bta_pan_main.c
+++ b/bta/pan/bta_pan_main.c
@@ -152,7 +152,7 @@ tBTA_PAN_CB  bta_pan_cb;
 ** Function         bta_pan_scb_alloc
 **
 ** Description      Allocate a PAN server control block.
-**
+**                  
 **
 ** Returns          pointer to the scb, or NULL if none could be allocated.
 **
@@ -171,7 +171,7 @@ tBTA_PAN_SCB *bta_pan_scb_alloc(void)
             break;
         }
     }
-
+    
     if (i == BTA_PAN_NUM_CONN)
     {
         /* out of scbs */
@@ -186,7 +186,7 @@ tBTA_PAN_SCB *bta_pan_scb_alloc(void)
 ** Function         bta_pan_sm_execute
 **
 ** Description      State machine event handling function for PAN
-**
+**                  
 **
 ** Returns          void
 **
@@ -226,7 +226,7 @@ static void bta_pan_sm_execute(tBTA_PAN_SCB *p_scb, UINT16 event, tBTA_PAN_DATA
 ** Function         bta_pan_api_enable
 **
 ** Description      Handle an API enable event.
-**
+**                  
 **
 ** Returns          void
 **
@@ -246,7 +246,7 @@ static void bta_pan_api_enable(tBTA_PAN_DATA *p_data)
 ** Function         bta_pan_api_disable
 **
 ** Description      Handle an API disable event.
-**
+**                  
 **
 ** Returns          void
 **
@@ -262,7 +262,7 @@ static void bta_pan_api_disable(tBTA_PAN_DATA *p_data)
 ** Function         bta_pan_api_open
 **
 ** Description      Handle an API listen event.
-**
+**                  
 **
 ** Returns          void
 **
@@ -276,7 +276,7 @@ static void bta_pan_api_open(tBTA_PAN_DATA *p_data)
     if ((p_scb = bta_pan_scb_alloc()) != NULL)
     {
         bta_pan_open(p_scb, p_data);
-    }
+    }   
     else
     {
         bdcpy(data.bd_addr, p_data->api_open.bd_addr);
@@ -290,7 +290,7 @@ static void bta_pan_api_open(tBTA_PAN_DATA *p_data)
 ** Function         bta_pan_scb_dealloc
 **
 ** Description      Deallocate a link control block.
-**
+**                  
 **
 ** Returns          void
 **
@@ -306,7 +306,7 @@ void bta_pan_scb_dealloc(tBTA_PAN_SCB *p_scb)
 ** Function         bta_pan_scb_to_idx
 **
 ** Description      Given a pointer to an scb, return its index.
-**
+**                  
 **
 ** Returns          Index of scb.
 **
@@ -324,7 +324,7 @@ UINT8 bta_pan_scb_to_idx(tBTA_PAN_SCB *p_scb)
 ** Function         bta_pan_scb_by_handle
 **
 ** Description      Find scb associated with handle.
-**
+**                  
 **
 ** Returns          Pointer to scb or NULL if not found.
 **
@@ -343,8 +343,8 @@ tBTA_PAN_SCB *bta_pan_scb_by_handle(UINT16 handle)
     }
 
 
-    APPL_TRACE_WARNING1("No scb for handle %d", handle);
-
+    APPL_TRACE_WARNING1("No scb for handle %d", handle);      
+    
     return NULL;
 }
 
@@ -353,7 +353,7 @@ tBTA_PAN_SCB *bta_pan_scb_by_handle(UINT16 handle)
 ** Function         bta_pan_hdl_event
 **
 ** Description      Data gateway main event handling function.
-**
+**                  
 **
 ** Returns          void
 **
@@ -385,7 +385,7 @@ BOOLEAN bta_pan_hdl_event(BT_HDR *p_msg)
             bta_pan_api_open((tBTA_PAN_DATA *) p_msg);
             break;
 
-
+                
         /* events that require buffer not be released */
         case BTA_PAN_CI_RX_WRITEBUF_EVT:
             freebuf = FALSE;
@@ -404,6 +404,6 @@ BOOLEAN bta_pan_hdl_event(BT_HDR *p_msg)
             break;
 
     }
-    return freebuf;
+    return freebuf;   
 }
 #endif /* BTA_PAN_INCLUDED */