Remove BLE_INCLUDED define
Test: Connect to a BLE Keyboard
Change-Id: I5f8f4017c90c3c404004632fd10e6c2b93bd7783
diff --git a/bta/dm/bta_dm_api.cc b/bta/dm/bta_dm_api.cc
index 6eada78..bdb7b2f 100644
--- a/bta/dm/bta_dm_api.cc
+++ b/bta/dm/bta_dm_api.cc
@@ -270,7 +270,7 @@
p_msg->p_cback = p_cback;
p_msg->sdp_search = sdp_search;
-#if (BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE)
+#if (BTA_GATT_INCLUDED == TRUE)
p_msg->num_uuid = 0;
p_msg->p_uuid = NULL;
#endif
@@ -611,7 +611,6 @@
******************************************************************************/
void BTA_DmAddBleKey(BD_ADDR bd_addr, tBTA_LE_KEY_VALUE* p_le_key,
tBTA_LE_KEY_TYPE key_type) {
-#if (BLE_INCLUDED == TRUE)
tBTA_DM_API_ADD_BLEKEY* p_msg =
(tBTA_DM_API_ADD_BLEKEY*)osi_calloc(sizeof(tBTA_DM_API_ADD_BLEKEY));
@@ -622,7 +621,6 @@
memcpy(&p_msg->blekey, p_le_key, sizeof(tBTA_LE_KEY_VALUE));
bta_sys_sendmsg(p_msg);
-#endif
}
/*******************************************************************************
@@ -642,7 +640,6 @@
******************************************************************************/
void BTA_DmAddBleDevice(BD_ADDR bd_addr, tBLE_ADDR_TYPE addr_type,
tBT_DEVICE_TYPE dev_type) {
-#if (BLE_INCLUDED == TRUE)
tBTA_DM_API_ADD_BLE_DEVICE* p_msg = (tBTA_DM_API_ADD_BLE_DEVICE*)osi_calloc(
sizeof(tBTA_DM_API_ADD_BLE_DEVICE));
@@ -652,7 +649,6 @@
p_msg->dev_type = dev_type;
bta_sys_sendmsg(p_msg);
-#endif
}
/*******************************************************************************
@@ -670,7 +666,6 @@
*
******************************************************************************/
void BTA_DmBlePasskeyReply(BD_ADDR bd_addr, bool accept, uint32_t passkey) {
-#if (BLE_INCLUDED == TRUE)
tBTA_DM_API_PASSKEY_REPLY* p_msg =
(tBTA_DM_API_PASSKEY_REPLY*)osi_calloc(sizeof(tBTA_DM_API_PASSKEY_REPLY));
@@ -681,7 +676,6 @@
if (accept) p_msg->passkey = passkey;
bta_sys_sendmsg(p_msg);
-#endif
}
/*******************************************************************************
@@ -698,7 +692,6 @@
*
******************************************************************************/
void BTA_DmBleConfirmReply(BD_ADDR bd_addr, bool accept) {
-#if (BLE_INCLUDED == TRUE)
tBTA_DM_API_CONFIRM* p_msg =
(tBTA_DM_API_CONFIRM*)osi_calloc(sizeof(tBTA_DM_API_CONFIRM));
@@ -707,7 +700,6 @@
p_msg->accept = accept;
bta_sys_sendmsg(p_msg);
-#endif
}
/*******************************************************************************
@@ -723,7 +715,6 @@
*
******************************************************************************/
void BTA_DmBleSecurityGrant(BD_ADDR bd_addr, tBTA_DM_BLE_SEC_GRANT res) {
-#if (BLE_INCLUDED == TRUE)
tBTA_DM_API_BLE_SEC_GRANT* p_msg =
(tBTA_DM_API_BLE_SEC_GRANT*)osi_calloc(sizeof(tBTA_DM_API_BLE_SEC_GRANT));
@@ -732,7 +723,6 @@
p_msg->res = res;
bta_sys_sendmsg(p_msg);
-#endif
}
/*******************************************************************************
@@ -757,7 +747,6 @@
void BTA_DmSetBlePrefConnParams(const BD_ADDR bd_addr, uint16_t min_conn_int,
uint16_t max_conn_int, uint16_t slave_latency,
uint16_t supervision_tout) {
-#if (BLE_INCLUDED == TRUE)
tBTA_DM_API_BLE_CONN_PARAMS* p_msg = (tBTA_DM_API_BLE_CONN_PARAMS*)osi_calloc(
sizeof(tBTA_DM_API_BLE_CONN_PARAMS));
@@ -769,7 +758,6 @@
p_msg->supervision_tout = supervision_tout;
bta_sys_sendmsg(p_msg);
-#endif
}
/*******************************************************************************
@@ -786,7 +774,6 @@
*
******************************************************************************/
void BTA_DmSetBleConnScanParams(uint32_t scan_interval, uint32_t scan_window) {
-#if (BLE_INCLUDED == TRUE)
tBTA_DM_API_BLE_SCAN_PARAMS* p_msg = (tBTA_DM_API_BLE_SCAN_PARAMS*)osi_calloc(
sizeof(tBTA_DM_API_BLE_SCAN_PARAMS));
@@ -795,7 +782,6 @@
p_msg->scan_window = scan_window;
bta_sys_sendmsg(p_msg);
-#endif // BLE_INCLUDED == true
}
/*******************************************************************************
@@ -815,7 +801,6 @@
*
******************************************************************************/
-#if (BLE_INCLUDED == TRUE)
void BTA_DmSetBleScanParams(
tGATT_IF client_if, uint32_t scan_interval, uint32_t scan_window,
tBLE_SCAN_MODE scan_mode,
@@ -832,7 +817,6 @@
bta_sys_sendmsg(p_msg);
}
-#endif // BLE_INCLUDED == true
/*******************************************************************************
*
@@ -849,7 +833,6 @@
******************************************************************************/
void BTA_DmSetBleAdvParams(uint16_t adv_int_min, uint16_t adv_int_max,
tBLE_BD_ADDR* p_dir_bda) {
-#if (BLE_INCLUDED == TRUE)
if (p_dir_bda != NULL) {
tBLE_BD_ADDR* bda = new tBLE_BD_ADDR;
memcpy(bda, p_dir_bda, sizeof(tBLE_BD_ADDR));
@@ -861,14 +844,12 @@
do_in_bta_thread(FROM_HERE, base::Bind(&bta_dm_ble_set_adv_params,
adv_int_min, adv_int_max, nullptr));
-#endif
}
/*******************************************************************************
* BLE ADV data management API
*******************************************************************************/
-#if (BLE_INCLUDED == TRUE)
/*******************************************************************************
*
* Function BTA_DmBleSetStorageParams
@@ -1021,8 +1002,6 @@
bta_sys_sendmsg(p_msg);
}
-#endif
-
/*******************************************************************************
* BLE ADV data management API
*******************************************************************************/
@@ -1044,7 +1023,6 @@
******************************************************************************/
void BTA_DmBleSetBgConnType(tBTA_DM_BLE_CONN_TYPE bg_conn_type,
tBTA_DM_BLE_SEL_CBACK* p_select_cback) {
-#if (BLE_INCLUDED == TRUE)
tBTA_DM_API_BLE_SET_BG_CONN_TYPE* p_msg =
(tBTA_DM_API_BLE_SET_BG_CONN_TYPE*)osi_calloc(
sizeof(tBTA_DM_API_BLE_SET_BG_CONN_TYPE));
@@ -1054,7 +1032,6 @@
p_msg->p_select_cback = p_select_cback;
bta_sys_sendmsg(p_msg);
-#endif
}
/*******************************************************************************
@@ -1066,7 +1043,7 @@
* Returns void
*
******************************************************************************/
-#if (BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE)
+#if (BTA_GATT_INCLUDED == TRUE)
static void bta_dm_discover_send_msg(BD_ADDR bd_addr,
tBTA_SERVICE_MASK_EXT* p_services,
tBTA_DM_SEARCH_CBACK* p_cback,
@@ -1084,7 +1061,7 @@
p_msg->transport = transport;
if (p_services != NULL) {
-#if (BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE)
+#if (BTA_GATT_INCLUDED == TRUE)
p_msg->services = p_services->srvc_mask;
p_msg->num_uuid = p_services->num_uuid;
if (p_services->num_uuid != 0) {
@@ -1119,7 +1096,7 @@
tBTA_SERVICE_MASK_EXT* p_services,
tBTA_DM_SEARCH_CBACK* p_cback, bool sdp_search,
tBTA_TRANSPORT transport) {
-#if (BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE)
+#if (BTA_GATT_INCLUDED == TRUE)
bta_dm_discover_send_msg(bd_addr, p_services, p_cback, sdp_search, transport);
#endif
}
@@ -1141,7 +1118,7 @@
******************************************************************************/
void BTA_DmDiscoverExt(BD_ADDR bd_addr, tBTA_SERVICE_MASK_EXT* p_services,
tBTA_DM_SEARCH_CBACK* p_cback, bool sdp_search) {
-#if (BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE)
+#if (BTA_GATT_INCLUDED == TRUE)
bta_dm_discover_send_msg(bd_addr, p_services, p_cback, sdp_search,
BTA_TRANSPORT_UNKNOWN);
#endif
@@ -1167,7 +1144,7 @@
* Returns void
*
******************************************************************************/
-#if (BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE)
+#if (BTA_GATT_INCLUDED == TRUE)
void BTA_DmSearchExt(tBTA_DM_INQ* p_dm_inq, tBTA_SERVICE_MASK_EXT* p_services,
tBTA_DM_SEARCH_CBACK* p_cback) {
const size_t len = p_services ? (sizeof(tBTA_DM_API_SEARCH) +
@@ -1221,7 +1198,6 @@
void BTA_DmBleUpdateConnectionParam(BD_ADDR bd_addr, uint16_t min_int,
uint16_t max_int, uint16_t latency,
uint16_t timeout) {
-#if (BLE_INCLUDED == TRUE)
tBTA_DM_API_UPDATE_CONN_PARAM* p_msg =
(tBTA_DM_API_UPDATE_CONN_PARAM*)osi_calloc(
sizeof(tBTA_DM_API_UPDATE_CONN_PARAM));
@@ -1234,7 +1210,6 @@
p_msg->timeout = timeout;
bta_sys_sendmsg(p_msg);
-#endif
}
/*******************************************************************************
@@ -1249,7 +1224,7 @@
*
******************************************************************************/
void BTA_DmBleConfigLocalPrivacy(bool privacy_enable) {
-#if (BLE_INCLUDED == TRUE && BLE_PRIVACY_SPT == TRUE)
+#if (BLE_PRIVACY_SPT == TRUE)
tBTA_DM_API_LOCAL_PRIVACY* p_msg = (tBTA_DM_API_LOCAL_PRIVACY*)osi_calloc(
sizeof(tBTA_DM_API_ENABLE_PRIVACY));
@@ -1262,7 +1237,6 @@
#endif
}
-#if (BLE_INCLUDED == TRUE)
/*******************************************************************************
*
* Function BTA_DmBleCfgFilterCondition
@@ -1563,7 +1537,6 @@
bta_sys_sendmsg(p_msg);
}
-#endif
/*******************************************************************************
*
@@ -1632,7 +1605,6 @@
bta_sys_sendmsg(p_msg);
}
-#if (BLE_INCLUDED == TRUE)
/*******************************************************************************
*
* Function BTA_DmBleObserve
@@ -1688,7 +1660,7 @@
tBTM_BLE_VSC_CB cmn_ble_vsc_cb;
BTM_BleGetVendorCapabilities(&cmn_ble_vsc_cb);
-#if (BLE_INCLUDED == TRUE && BLE_ANDROID_CONTROLLER_SCAN_FILTER == TRUE)
+#if (BLE_ANDROID_CONTROLLER_SCAN_FILTER == TRUE)
if (cmn_ble_vsc_cb.max_filter > 0) {
btm_ble_adv_filter_cleanup();
#if (BLE_PRIVACY_SPT == TRUE)
@@ -1702,4 +1674,3 @@
if (cmn_ble_vsc_cb.adv_inst_max > 0) btm_ble_multi_adv_cleanup();
}
-#endif