commit d19e0785e662e640191a075eda07acce61c2aeda
author Marie Janssen <jamuraa@google.com> Fri Jul 15 12:48:27 2016 -0700
committer Andre Eisenbach <eisenbach@google.com> Fri Aug 05 21:15:10 2016 +0000
tree db50dab9c9048cd8b211a569b245cf5467bc7aaa
parent 7294d958dcb610d7828f06c3a1cde933127694d3

Use standard types, consistent ifdef style everywhere

Remove the typedefs in stack/include/bt_types.h

Use standard types everywhere.
Use standard style for #if statements:
 - #if (VAR_NAME == TRUE)
 - #if (VAR_NAME1 == TRUE && VAR_NAME2 == TRUE)
Use __func__ instead of __FUNCTION__
Fix some debug statements to use __func__

Update script to be less disruptive to aligned assignment blocks.

Change-Id: I8f8f068e6c26ce74fd3b3707e1e31fd0b919cdd0

main/bte_init.c

diff --git a/main/bte_init.c b/main/bte_init.c
index a0b8418..a83667e 100644
--- a/main/bte_init.c
+++ b/main/bte_init.c
@@ -33,33 +33,33 @@
 /* Include initialization functions definitions */
 #include "port_api.h"
 
-#if (defined(BNEP_INCLUDED) && BNEP_INCLUDED == TRUE)
+#if (BNEP_INCLUDED == TRUE)
 #include "bnep_api.h"
 #endif
 
 #include "gap_api.h"
 
-#if (defined(PAN_INCLUDED) && PAN_INCLUDED == TRUE)
+#if (PAN_INCLUDED == TRUE)
 #include "pan_api.h"
 #endif
 
 #include "avrc_api.h"
 
-#if (defined(A2D_INCLUDED) && A2D_INCLUDED == TRUE)
+#if (A2D_INCLUDED == TRUE)
 #include "a2d_api.h"
 #endif
 
-#if (defined(HID_HOST_INCLUDED) && HID_HOST_INCLUDED == TRUE)
+#if (HID_HOST_INCLUDED == TRUE)
 #include "hidh_api.h"
 #endif
 
-#if (defined(MCA_INCLUDED) && MCA_INCLUDED == TRUE)
+#if (MCA_INCLUDED == TRUE)
 #include "mca_api.h"
 #endif
 
-#if (defined(BLE_INCLUDED) && BLE_INCLUDED == TRUE)
+#if (BLE_INCLUDED == TRUE)
 #include "gatt_api.h"
-#if (defined(SMP_INCLUDED) && SMP_INCLUDED == TRUE)
+#if (SMP_INCLUDED == TRUE)
 #include "smp_api.h"
 #endif
 #endif
@@ -91,10 +91,10 @@
 /**************************
 ** BNEP and its profiles **
 ***************************/
-#if (defined(BNEP_INCLUDED) && BNEP_INCLUDED == TRUE)
+#if (BNEP_INCLUDED == TRUE)
     BNEP_Init();
 
-#if (defined(PAN_INCLUDED) && PAN_INCLUDED == TRUE)
+#if (PAN_INCLUDED == TRUE)
     PAN_Init();
 #endif  /* PAN */
 #endif  /* BNEP Included */
@@ -103,7 +103,7 @@
 /**************************
 ** AVDT and its profiles **
 ***************************/
-#if (defined(A2D_INCLUDED) && A2D_INCLUDED == TRUE)
+#if (A2D_INCLUDED == TRUE)
     A2D_Init();
 #endif  /* AADP */
 
@@ -116,11 +116,11 @@
 ************/
     GAP_Init();
 
-#if (defined(HID_HOST_INCLUDED) && HID_HOST_INCLUDED == TRUE)
+#if (HID_HOST_INCLUDED == TRUE)
     HID_HostInit();
 #endif
 
-#if (defined(MCA_INCLUDED) && MCA_INCLUDED == TRUE)
+#if (MCA_INCLUDED == TRUE)
     MCA_Init();
 #endif