commit 2e8e9f42132d0297a94c0852a1fbf45c9bc348e5
author Myles Watson <mylesgw@google.com> Mon Nov 14 16:45:15 2016 -0800
committer Myles Watson <mylesgw@google.com> Wed Nov 23 09:43:24 2016 -0800
tree f1c6754fbc73838edea25a9fed29359ab2a21392
parent 84baa7f16e830394408278dbb8c508dd9fa02887

Remove SMP_INCLUDED define

Test: Connect to a BLE Keyboard
Change-Id: I785692cb61f4ca5ccccab7424aa03f50c54523c9

bta/dm/bta_dm_act.cc

diff --git a/bta/dm/bta_dm_act.cc b/bta/dm/bta_dm_act.cc
index 5e48257..f5314a1 100644
--- a/bta/dm/bta_dm_act.cc
+++ b/bta/dm/bta_dm_act.cc
@@ -101,10 +101,8 @@
 static void bta_dm_sys_hw_cback(tBTA_SYS_HW_EVT status);
 static void bta_dm_disable_search_and_disc(void);
 
-#if (SMP_INCLUDED == TRUE)
 static uint8_t bta_dm_ble_smp_cback(tBTM_LE_EVT event, BD_ADDR bda,
                                     tBTM_LE_EVT_DATA* p_data);
-#endif
 static void bta_dm_ble_id_key_cback(uint8_t key_type,
                                     tBTM_BLE_LOCAL_KEYS* p_key);
 #if (BTA_GATT_INCLUDED == TRUE)
@@ -235,20 +233,18 @@
 };
 
 /* bta security callback */
-const tBTM_APPL_INFO bta_security = {
-    &bta_dm_authorize_cback, &bta_dm_pin_cback, &bta_dm_new_link_key_cback,
-    &bta_dm_authentication_complete_cback, &bta_dm_bond_cancel_complete_cback,
+const tBTM_APPL_INFO bta_security = {&bta_dm_authorize_cback,
+                                     &bta_dm_pin_cback,
+                                     &bta_dm_new_link_key_cback,
+                                     &bta_dm_authentication_complete_cback,
+                                     &bta_dm_bond_cancel_complete_cback,
 #if (BTM_LOCAL_IO_CAPS != BTM_IO_CAP_NONE)
-    &bta_dm_sp_cback
+                                     &bta_dm_sp_cback,
 #else
-    NULL
+                                     NULL
 #endif
-#if (SMP_INCLUDED == TRUE)
-    ,
-    &bta_dm_ble_smp_cback
-#endif
-    ,
-    &bta_dm_ble_id_key_cback};
+                                     &bta_dm_ble_smp_cback,
+                                     &bta_dm_ble_id_key_cback};
 
 #define MAX_DISC_RAW_DATA_BUF (4096)
 uint8_t g_disc_raw_data_buf[MAX_DISC_RAW_DATA_BUF];
@@ -4034,7 +4030,6 @@
   }
 }
 
-#if (SMP_INCLUDED == TRUE)
 /*******************************************************************************
  *
  * Function         bta_dm_ble_smp_cback
@@ -4150,7 +4145,6 @@
   }
   return status;
 }
-#endif /* SMP_INCLUDED == TRUE */
 
 /*******************************************************************************
  *

bta/include/bta_api.h

diff --git a/bta/include/bta_api.h b/bta/include/bta_api.h
index f7845b7..e2a0115 100644
--- a/bta/include/bta_api.h
+++ b/bta/include/bta_api.h
@@ -679,13 +679,11 @@
   uint8_t level_flags; /* indicates individual flags */
 } tBTA_DM_BUSY_LEVEL;
 
-#define BTA_IO_CAP_OUT BTM_IO_CAP_OUT   /* 0 DisplayOnly */
-#define BTA_IO_CAP_IO BTM_IO_CAP_IO     /* 1 DisplayYesNo */
-#define BTA_IO_CAP_IN BTM_IO_CAP_IN     /* 2 KeyboardOnly */
-#define BTA_IO_CAP_NONE BTM_IO_CAP_NONE /* 3 NoInputNoOutput */
-#if (SMP_INCLUDED == TRUE)
+#define BTA_IO_CAP_OUT BTM_IO_CAP_OUT       /* 0 DisplayOnly */
+#define BTA_IO_CAP_IO BTM_IO_CAP_IO         /* 1 DisplayYesNo */
+#define BTA_IO_CAP_IN BTM_IO_CAP_IN         /* 2 KeyboardOnly */
+#define BTA_IO_CAP_NONE BTM_IO_CAP_NONE     /* 3 NoInputNoOutput */
 #define BTA_IO_CAP_KBDISP BTM_IO_CAP_KBDISP /* 4 Keyboard display */
-#endif
 typedef tBTM_IO_CAP tBTA_IO_CAP;
 
 #define BTA_AUTH_SP_NO                                      \