Remove BLE_INCLUDED define
Test: Connect to a BLE Keyboard
Change-Id: I5f8f4017c90c3c404004632fd10e6c2b93bd7783
diff --git a/bta/dm/bta_dm_act.cc b/bta/dm/bta_dm_act.cc
index b8357c8..5e48257 100644
--- a/bta/dm/bta_dm_act.cc
+++ b/bta/dm/bta_dm_act.cc
@@ -101,7 +101,6 @@
static void bta_dm_sys_hw_cback(tBTA_SYS_HW_EVT status);
static void bta_dm_disable_search_and_disc(void);
-#if (BLE_INCLUDED == TRUE)
#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);
@@ -124,7 +123,6 @@
#define BTA_DM_BLE_ADV_CHNL_MAP \
(BTM_BLE_ADV_CHNL_37 | BTM_BLE_ADV_CHNL_38 | BTM_BLE_ADV_CHNL_39)
#endif
-#endif
/* Disable timer interval (in milliseconds) */
#ifndef BTA_DM_DISABLE_TIMER_MS
@@ -183,7 +181,7 @@
UUID_SERVCLASS_MESSAGE_NOTIFICATION, /* BTA_MN_SERVICE_ID */
UUID_SERVCLASS_HDP_PROFILE, /* BTA_HDP_SERVICE_ID */
UUID_SERVCLASS_PBAP_PCE /* BTA_PCE_SERVICE_ID */
-#if (BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE)
+#if (BTA_GATT_INCLUDED == TRUE)
,
UUID_PROTOCOL_ATT /* BTA_GATT_SERVICE_ID */
#endif
@@ -229,7 +227,7 @@
BTM_SEC_SERVICE_MAP, /* BTA_MN_SERVICE_ID */
BTM_SEC_SERVICE_HDP_SNK, /* BTA_HDP_SERVICE_ID */
BTM_SEC_SERVICE_PBAP /* BTA_PCE_SERVICE_ID */
-#if (BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE)
+#if (BTA_GATT_INCLUDED == TRUE)
,
BTM_SEC_SERVICE_ATT /* BTA_GATT_SERVICE_ID */
#endif
@@ -245,16 +243,12 @@
#else
NULL
#endif
-#if (BLE_INCLUDED == TRUE)
#if (SMP_INCLUDED == TRUE)
,
&bta_dm_ble_smp_cback
#endif
,
- &bta_dm_ble_id_key_cback
-#endif
-
-};
+ &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];
@@ -366,11 +360,9 @@
static void bta_dm_sys_hw_cback(tBTA_SYS_HW_EVT status) {
DEV_CLASS dev_class;
tBTA_DM_SEC_CBACK* temp_cback;
-#if (BLE_INCLUDED == TRUE)
uint8_t key_mask = 0;
BT_OCTET16 er;
tBTA_BLE_LOCAL_ID_KEYS id_key;
-#endif
APPL_TRACE_DEBUG("%s with event: %i", __func__, status);
@@ -430,7 +422,6 @@
memcpy(dev_class, p_bta_dm_cfg->dev_class, sizeof(dev_class));
BTM_SetDeviceClass(dev_class);
-#if (BLE_INCLUDED == TRUE)
/* load BLE local information: ID keys, ER if available */
bta_dm_co_ble_load_local_keys(&key_mask, er, &id_key);
@@ -445,7 +436,6 @@
#if (BTA_GATT_INCLUDED == TRUE)
bta_dm_search_cb.conn_id = BTA_GATT_INVALID_CONN_ID;
#endif // (defined(BTA_GATT_INCLUDED) && BTA_GATT_INCLUDED)
-#endif // (defined(BLE_INCLUDED) && (BLE_INCLUDED == true))
BTM_SecRegister((tBTM_APPL_INFO*)&bta_security);
BTM_SetDefaultLinkSuperTout(p_bta_dm_cfg->link_timeout);
@@ -479,7 +469,7 @@
bta_sys_policy_register((tBTA_SYS_CONN_CBACK*)bta_dm_policy_cback);
-#if (BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE)
+#if (BTA_GATT_INCLUDED == TRUE)
bta_dm_gattc_register();
#endif
@@ -513,7 +503,7 @@
bta_dm_disable_search_and_disc();
bta_dm_cb.disabling = true;
-#if (BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE)
+#if (BTA_GATT_INCLUDED == TRUE)
BTM_BleClearBgConnDev();
#endif
@@ -560,9 +550,7 @@
if (BTM_GetNumAclLinks() && (param == 0)) {
for (i = 0; i < bta_dm_cb.device_list.count; i++) {
-#if (BLE_INCLUDED == TRUE)
transport = bta_dm_cb.device_list.peer_device[i].transport;
-#endif
btm_remove_acl(bta_dm_cb.device_list.peer_device[i].peer_bdaddr,
transport);
trigger_disc = true;
@@ -684,14 +672,14 @@
***
******************************************************************************/
void bta_dm_process_remove_device(BD_ADDR bd_addr) {
-#if (BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE)
+#if (BTA_GATT_INCLUDED == TRUE)
/* need to remove all pending background connection before unpair */
BTA_GATTC_CancelOpen(0, bd_addr, false);
#endif
BTM_SecDeleteDevice(bd_addr);
-#if (BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE)
+#if (BTA_GATT_INCLUDED == TRUE)
/* remove all cached GATT information */
BTA_GATTC_Refresh(bd_addr);
#endif
@@ -880,7 +868,7 @@
if (!BTM_SecDeleteDevice(p_remove_acl->bd_addr)) {
APPL_TRACE_ERROR("delete device from security database failed.");
}
-#if (BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE)
+#if (BTA_GATT_INCLUDED == TRUE)
/* need to remove all pending background connection if any */
BTA_GATTC_CancelOpen(0, p_remove_acl->bd_addr, false);
/* remove all cached GATT information */
@@ -907,9 +895,7 @@
for (uint8_t i = 0; i < bta_dm_cb.device_list.count; i++) {
BD_ADDR addr = {0};
bdcpy(addr, bta_dm_cb.device_list.peer_device[i].peer_bdaddr);
-#if (BLE_INCLUDED == TRUE)
transport = bta_dm_cb.device_list.peer_device[i].transport;
-#endif
if ((link_type == BTA_DM_LINK_TYPE_ALL) ||
((link_type == BTA_DM_LINK_TYPE_LE) &&
(transport == BT_TRANSPORT_LE)) ||
@@ -1156,7 +1142,7 @@
void bta_dm_search_start(tBTA_DM_MSG* p_data) {
tBTM_INQUIRY_CMPL result;
-#if (BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE)
+#if (BTA_GATT_INCLUDED == TRUE)
size_t len = sizeof(tBT_UUID) * p_data->search.num_uuid;
bta_dm_gattc_register();
#endif
@@ -1176,7 +1162,7 @@
bta_dm_search_cb.p_search_cback = p_data->search.p_cback;
bta_dm_search_cb.services = p_data->search.services;
-#if (BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE)
+#if (BTA_GATT_INCLUDED == TRUE)
osi_free_and_reset((void**)&bta_dm_search_cb.p_srvc_uuid);
if ((bta_dm_search_cb.num_uuid = p_data->search.num_uuid) != 0 &&
@@ -1237,7 +1223,7 @@
bta_sys_sendmsg(p_msg);
}
-#if (BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE)
+#if (BTA_GATT_INCLUDED == TRUE)
if (bta_dm_search_cb.gatt_disc_active) {
bta_dm_cancel_gatt_discovery(bta_dm_search_cb.peer_bdaddr);
}
@@ -1255,7 +1241,7 @@
*
******************************************************************************/
void bta_dm_discover(tBTA_DM_MSG* p_data) {
-#if (BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE)
+#if (BTA_GATT_INCLUDED == TRUE)
size_t len = sizeof(tBT_UUID) * p_data->discover.num_uuid;
#endif
APPL_TRACE_EVENT("%s services_to_search=0x%04X, sdp_search=%d", __func__,
@@ -1264,7 +1250,7 @@
/* save the search condition */
bta_dm_search_cb.services = p_data->discover.services;
-#if (BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE)
+#if (BTA_GATT_INCLUDED == TRUE)
bta_dm_gattc_register();
osi_free_and_reset((void**)&bta_dm_search_cb.p_srvc_uuid);
if ((bta_dm_search_cb.num_uuid = p_data->discover.num_uuid) != 0 &&
@@ -1541,7 +1527,7 @@
uint16_t service = 0xFFFF;
tSDP_PROTOCOL_ELEM pe;
-#if (BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE)
+#if (BTA_GATT_INCLUDED == TRUE)
tBT_UUID* p_uuid = bta_dm_search_cb.p_srvc_uuid;
tBTA_DM_SEARCH result;
tBT_UUID service_uuid;
@@ -1571,7 +1557,7 @@
p_sdp_rec =
SDP_FindServiceInDb(bta_dm_search_cb.p_sdp_db, service, p_sdp_rec);
}
-#if (BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE)
+#if (BTA_GATT_INCLUDED == TRUE)
/* finished with BR/EDR services, now we check the result for GATT based
* service UUID */
if (bta_dm_search_cb.service_index == BTA_MAX_SERVICE_ID) {
@@ -1627,7 +1613,7 @@
if (bta_dm_search_cb.services == BTA_ALL_SERVICE_MASK &&
bta_dm_search_cb.services_to_search == 0) {
-#if (BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE)
+#if (BTA_GATT_INCLUDED == TRUE)
if (bta_dm_search_cb.service_index == BTA_BLE_SERVICE_ID &&
bta_dm_search_cb.uuid_to_search > 0)
bta_dm_search_cb.uuid_to_search--;
@@ -1769,7 +1755,7 @@
void bta_dm_search_cmpl(tBTA_DM_MSG* p_data) {
APPL_TRACE_EVENT("%s", __func__);
-#if (BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE)
+#if (BTA_GATT_INCLUDED == TRUE)
osi_free_and_reset((void**)&bta_dm_search_cb.p_srvc_uuid);
#endif
@@ -1792,7 +1778,7 @@
void bta_dm_disc_result(tBTA_DM_MSG* p_data) {
APPL_TRACE_EVENT("%s", __func__);
-#if (BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE)
+#if (BTA_GATT_INCLUDED == TRUE)
/* if any BR/EDR service discovery has been done, report the event */
if ((bta_dm_search_cb.services &
((BTA_ALL_SERVICE_MASK | BTA_USER_SERVICE_MASK) &
@@ -1968,7 +1954,7 @@
if (!bta_dm_search_cb.name_discover_done) {
BTM_CancelRemoteDeviceName();
}
-#if (BLE_INCLUDED == TRUE) && (BTA_GATT_INCLUDED == TRUE)
+#if (BTA_GATT_INCLUDED == TRUE)
if (bta_dm_search_cb.gatt_disc_active) {
bta_dm_cancel_gatt_discovery(bta_dm_search_cb.peer_bdaddr);
}
@@ -2009,7 +1995,7 @@
bta_dm_search_cb.services_to_search = 0;
}
} else {
-#if (BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE)
+#if (BTA_GATT_INCLUDED == TRUE)
/* for LE only profile */
if (bta_dm_search_cb.service_index == BTA_BLE_SERVICE_ID) {
if (bta_dm_search_cb.uuid_to_search > 0 &&
@@ -2068,7 +2054,7 @@
bta_dm_search_cb.service_index = BTA_MAX_SERVICE_ID;
} else {
-#if (BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE)
+#if (BTA_GATT_INCLUDED == TRUE)
if ((bta_dm_search_cb.service_index == BTA_BLE_SERVICE_ID &&
bta_dm_search_cb.uuid_to_search == 0) ||
bta_dm_search_cb.service_index != BTA_BLE_SERVICE_ID)
@@ -2139,7 +2125,6 @@
******************************************************************************/
static void bta_dm_discover_device(BD_ADDR remote_bd_addr) {
tBT_TRANSPORT transport = BT_TRANSPORT_BR_EDR;
-#if (BLE_INCLUDED == TRUE)
if (bta_dm_search_cb.transport == BTA_TRANSPORT_UNKNOWN) {
tBT_DEVICE_TYPE dev_type;
tBLE_ADDR_TYPE addr_type;
@@ -2150,7 +2135,6 @@
} else {
transport = bta_dm_search_cb.transport;
}
-#endif
/* Reset transport state for next discovery */
bta_dm_search_cb.transport = BTA_TRANSPORT_UNKNOWN;
@@ -2170,7 +2154,6 @@
APPL_TRACE_DEBUG("%s appl_knows_rem_name %d", __func__,
bta_dm_search_cb.p_btm_inq_info->appl_knows_rem_name);
}
-#if (BLE_INCLUDED == TRUE)
if ((bta_dm_search_cb.p_btm_inq_info) &&
(bta_dm_search_cb.p_btm_inq_info->results.device_type ==
BT_DEVICE_TYPE_BLE) &&
@@ -2178,7 +2161,6 @@
/* Do not perform RNR for LE devices at inquiry complete*/
bta_dm_search_cb.name_discover_done = true;
}
-#endif
/* if name discovery is not done and application needs remote name */
if ((!bta_dm_search_cb.name_discover_done) &&
((bta_dm_search_cb.p_btm_inq_info == NULL) ||
@@ -2198,7 +2180,7 @@
bta_dm_search_cb.service_index = 0;
bta_dm_search_cb.services_found = 0;
bta_dm_search_cb.services_to_search = bta_dm_search_cb.services;
-#if (BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE)
+#if (BTA_GATT_INCLUDED == TRUE)
bta_dm_search_cb.uuid_to_search = bta_dm_search_cb.num_uuid;
#endif
if ((bta_dm_search_cb.p_btm_inq_info != NULL) &&
@@ -2221,7 +2203,7 @@
else
bta_dm_search_cb.wait_disc = true;
-#if (BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE)
+#if (BTA_GATT_INCLUDED == TRUE)
if (bta_dm_search_cb.p_btm_inq_info) {
APPL_TRACE_DEBUG(
"%s p_btm_inq_info 0x%x results.device_type 0x%x "
@@ -2309,12 +2291,10 @@
(service_class & BTM_COD_SERVICE_LMTD_DISCOVER) ? true : false;
result.inq_res.rssi = p_inq->rssi;
-#if (BLE_INCLUDED == TRUE)
result.inq_res.ble_addr_type = p_inq->ble_addr_type;
result.inq_res.inq_result_type = p_inq->inq_result_type;
result.inq_res.device_type = p_inq->device_type;
result.inq_res.flag = p_inq->flag;
-#endif
/* application will parse EIR to find out remote device name */
result.inq_res.p_eir = p_eir;
@@ -2436,11 +2416,9 @@
BTM_SecDeleteRmtNameNotifyCallback(&bta_dm_service_search_remname_cback);
-#if (BLE_INCLUDED == TRUE)
if (bta_dm_search_cb.transport == BT_TRANSPORT_LE) {
GAP_BleReadPeerPrefConnParams(bta_dm_search_cb.peer_bdaddr);
}
-#endif
tBTA_DM_REM_NAME* p_msg =
(tBTA_DM_REM_NAME*)osi_malloc(sizeof(tBTA_DM_REM_NAME));
@@ -2633,11 +2611,9 @@
memcpy(p_auth_cmpl->key, key, LINK_KEY_LEN);
sec_event.auth_cmpl.fail_reason = HCI_SUCCESS;
-#if (BLE_INCLUDED == TRUE)
// Report the BR link key based on the BR/EDR address and type
BTM_ReadDevInfo(bd_addr, &sec_event.auth_cmpl.dev_type,
&sec_event.auth_cmpl.addr_type);
-#endif
if (bta_dm_cb.p_sec_cback) bta_dm_cb.p_sec_cback(event, &sec_event);
// Setting remove_dev_pending flag to false, where it will avoid deleting
@@ -2674,11 +2650,9 @@
memcpy(sec_event.auth_cmpl.bd_name, bd_name, (BD_NAME_LEN - 1));
sec_event.auth_cmpl.bd_name[BD_NAME_LEN - 1] = 0;
-#if (BLE_INCLUDED == TRUE)
// Report the BR link key based on the BR/EDR address and type
BTM_ReadDevInfo(bd_addr, &sec_event.auth_cmpl.dev_type,
&sec_event.auth_cmpl.addr_type);
-#endif
sec_event.auth_cmpl.fail_reason = (uint8_t)result;
if (bta_dm_cb.p_sec_cback)
@@ -2894,17 +2868,13 @@
case BTM_BL_CONN_EVT:
p_msg->is_new = true;
bdcpy(p_msg->bd_addr, p_data->conn.p_bda);
-#if (BLE_INCLUDED == TRUE)
p_msg->transport = p_data->conn.transport;
p_msg->handle = p_data->conn.handle;
-#endif
break;
case BTM_BL_DISCN_EVT:
bdcpy(p_msg->bd_addr, p_data->discn.p_bda);
-#if (BLE_INCLUDED == TRUE)
p_msg->transport = p_data->discn.transport;
p_msg->handle = p_data->discn.handle;
-#endif
break;
case BTM_BL_UPDATE_EVT:
p_msg->busy_level = p_data->update.busy_level;
@@ -3079,13 +3049,9 @@
if (is_new) {
for (i = 0; i < bta_dm_cb.device_list.count; i++) {
- if (!bdcmp(bta_dm_cb.device_list.peer_device[i].peer_bdaddr, p_bda)
-#if (BLE_INCLUDED == TRUE)
- &&
+ if (!bdcmp(bta_dm_cb.device_list.peer_device[i].peer_bdaddr, p_bda) &&
bta_dm_cb.device_list.peer_device[i].conn_handle ==
- p_data->acl_change.handle
-#endif
- )
+ p_data->acl_change.handle)
break;
}
@@ -3097,12 +3063,10 @@
bta_dm_cb.device_list.peer_device[bta_dm_cb.device_list.count]
.link_policy = bta_dm_cb.cur_policy;
bta_dm_cb.device_list.count++;
-#if (BLE_INCLUDED == TRUE)
bta_dm_cb.device_list.peer_device[i].conn_handle =
p_data->acl_change.handle;
if (p_data->acl_change.transport == BT_TRANSPORT_LE)
bta_dm_cb.device_list.le_count++;
-#endif
} else {
APPL_TRACE_ERROR("%s max active connection reached, no resources",
__func__);
@@ -3114,11 +3078,9 @@
bta_dm_cb.device_list.peer_device[i].pref_role = BTA_ANY_ROLE;
bdcpy(conn.link_up.bd_addr, p_bda);
bta_dm_cb.device_list.peer_device[i].info = BTA_DM_DI_NONE;
-#if (BLE_INCLUDED == TRUE)
conn.link_up.link_type = p_data->acl_change.transport;
bta_dm_cb.device_list.peer_device[i].transport =
p_data->acl_change.transport;
-#endif
if (((NULL != (p = BTM_ReadLocalFeatures())) &&
HCI_SNIFF_SUB_RATE_SUPPORTED(p)) &&
@@ -3134,13 +3096,9 @@
bta_dm_cb.p_sec_cback(BTA_DM_LINK_UP_EVT, (tBTA_DM_SEC*)&conn);
} else {
for (i = 0; i < bta_dm_cb.device_list.count; i++) {
- if (bdcmp(bta_dm_cb.device_list.peer_device[i].peer_bdaddr, p_bda)
-#if (BLE_INCLUDED == TRUE)
- ||
+ if (bdcmp(bta_dm_cb.device_list.peer_device[i].peer_bdaddr, p_bda) ||
bta_dm_cb.device_list.peer_device[i].transport !=
- p_data->acl_change.transport
-#endif
- )
+ p_data->acl_change.transport)
continue;
if (bta_dm_cb.device_list.peer_device[i].conn_state == BTA_DM_UNPAIRING) {
@@ -3163,12 +3121,10 @@
break;
}
if (bta_dm_cb.device_list.count) bta_dm_cb.device_list.count--;
-#if (BLE_INCLUDED == TRUE)
if ((p_data->acl_change.transport == BT_TRANSPORT_LE) &&
(bta_dm_cb.device_list.le_count))
bta_dm_cb.device_list.le_count--;
conn.link_down.link_type = p_data->acl_change.transport;
-#endif
if (bta_dm_search_cb.wait_disc &&
!bdcmp(bta_dm_search_cb.peer_bdaddr, p_bda)) {
@@ -3194,7 +3150,7 @@
}
if (conn.link_down.is_removed) {
BTM_SecDeleteDevice(p_bda);
-#if (BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE)
+#if (BTA_GATT_INCLUDED == TRUE)
/* need to remove all pending background connection */
BTA_GATTC_CancelOpen(0, p_bda, false);
/* remove all cached GATT information */
@@ -3369,7 +3325,7 @@
}
} else {
BTM_SecDeleteDevice(remote_bd_addr);
-#if (BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE)
+#if (BTA_GATT_INCLUDED == TRUE)
/* need to remove all pending background connection */
BTA_GATTC_CancelOpen(0, remote_bd_addr, false);
/* remove all cached GATT information */
@@ -3391,12 +3347,8 @@
static void bta_dm_adjust_roles(bool delay_role_switch) {
uint8_t i;
bool set_master_role = false;
-#if (BLE_INCLUDED == TRUE)
uint8_t br_count =
bta_dm_cb.device_list.count - bta_dm_cb.device_list.le_count;
-#else
- uint8_t br_count = bta_dm_cb.device_list.count;
-#endif
if (br_count) {
/* the configuration is no scatternet
* or AV connection exists and there are more than one ACL link */
@@ -3407,12 +3359,9 @@
}
for (i = 0; i < bta_dm_cb.device_list.count; i++) {
- if (bta_dm_cb.device_list.peer_device[i].conn_state == BTA_DM_CONNECTED
-#if (BLE_INCLUDED == TRUE)
- &&
- bta_dm_cb.device_list.peer_device[i].transport == BT_TRANSPORT_BR_EDR
-#endif
- ) {
+ if (bta_dm_cb.device_list.peer_device[i].conn_state == BTA_DM_CONNECTED &&
+ bta_dm_cb.device_list.peer_device[i].transport ==
+ BT_TRANSPORT_BR_EDR) {
if (!set_master_role &&
(bta_dm_cb.device_list.peer_device[i].pref_role != BTA_ANY_ROLE) &&
(p_bta_dm_rm_cfg[0].cfg == BTA_DM_PARTIAL_SCATTERNET)) {
@@ -3802,7 +3751,7 @@
APPL_TRACE_DEBUG(" with services_to_search=0x%08X", *p_services_to_search);
-#if (BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE)
+#if (BTA_GATT_INCLUDED == TRUE)
/* always do GATT based service discovery by SDP instead of from EIR */
/* if GATT based service is also to be put in EIR, need to modify this */
while (service_index < (BTA_MAX_SERVICE_ID - 1))
@@ -4021,7 +3970,6 @@
}
}
-#if (BLE_INCLUDED == TRUE)
/*******************************************************************************
*
* Function bta_dm_observe_results_cb
@@ -4173,10 +4121,8 @@
case BTM_LE_COMPLT_EVT:
bdcpy(sec_event.auth_cmpl.bd_addr, bda);
-#if (BLE_INCLUDED == TRUE)
BTM_ReadDevInfo(bda, &sec_event.auth_cmpl.dev_type,
&sec_event.auth_cmpl.addr_type);
-#endif
p_name = BTM_SecReadDevName(bda);
if (p_name != NULL)
strlcpy((char*)sec_event.auth_cmpl.bd_name, p_name, (BD_NAME_LEN));
@@ -5198,5 +5144,3 @@
}
}
#endif /* BLE_VND_INCLUDED */
-
-#endif /* BLE_INCLUDED */
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
diff --git a/bta/dm/bta_dm_cfg.cc b/bta/dm/bta_dm_cfg.cc
index 37d9383..423602e 100644
--- a/bta/dm/bta_dm_cfg.cc
+++ b/bta/dm/bta_dm_cfg.cc
@@ -115,15 +115,9 @@
tBTA_DM_RM* p_bta_dm_rm_cfg = (tBTA_DM_RM*)&bta_dm_rm_cfg;
-#if (BLE_INCLUDED == TRUE)
#define BTA_DM_NUM_PM_ENTRY \
23 /* number of entries in bta_dm_pm_cfg except the first */
#define BTA_DM_NUM_PM_SPEC 15 /* number of entries in bta_dm_pm_spec */
-#else
-#define BTA_DM_NUM_PM_ENTRY \
- 21 /* number of entries in bta_dm_pm_cfg except the first */
-#define BTA_DM_NUM_PM_SPEC 13 /* number of entries in bta_dm_pm_spec */
-#endif
tBTA_DM_PM_TYPE_QUALIFIER tBTA_DM_PM_CFG
bta_dm_pm_cfg[BTA_DM_NUM_PM_ENTRY + 1] = {
@@ -151,13 +145,9 @@
{BTA_ID_HL, BTA_ALL_APP_ID, 8}, /* reuse fts spec table */
{BTA_ID_PAN, BTUI_PAN_ID_PANU, 9}, /* PANU spec table */
{BTA_ID_PAN, BTUI_PAN_ID_NAP, 10}, /* NAP spec table */
- {BTA_ID_HS, BTA_ALL_APP_ID, 11} /* HS spec table */
-#if (BLE_INCLUDED == TRUE)
- ,
- {BTA_ID_GATTC, BTA_ALL_APP_ID, 13} /* gattc spec table */
- ,
+ {BTA_ID_HS, BTA_ALL_APP_ID, 11}, /* HS spec table */
+ {BTA_ID_GATTC, BTA_ALL_APP_ID, 13}, /* gattc spec table */
{BTA_ID_GATTS, BTA_ALL_APP_ID, 14} /* gatts spec table */
-#endif
};
tBTA_DM_PM_TYPE_QUALIFIER tBTA_DM_PM_SPEC bta_dm_pm_spec[BTA_DM_NUM_PM_SPEC] = {
@@ -427,7 +417,6 @@
{BTA_DM_PM_NO_ACTION, 0}} /* mode change retry */
}}
-#if (BLE_INCLUDED == TRUE)
/* GATTC : 13 */
,
{(BTA_DM_PM_SNIFF | BTA_DM_PM_PARK), /* allow park & sniff */
@@ -474,8 +463,6 @@
{BTA_DM_PM_NO_ACTION, 0}} /* mode change retry */
}}
-#endif
-
#ifdef BTE_SIM_APP /* For Insight builds only */
/* Entries at the end of the pm_spec table are user-defined (runtime
configurable),
diff --git a/bta/dm/bta_dm_int.h b/bta/dm/bta_dm_int.h
index 3d8b85d..48ad6f9 100644
--- a/bta/dm/bta_dm_int.h
+++ b/bta/dm/bta_dm_int.h
@@ -27,7 +27,7 @@
#include "bt_target.h"
#include "bta_sys.h"
-#if (BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE)
+#if (BTA_GATT_INCLUDED == TRUE)
#include "bta_gatt_api.h"
#endif
@@ -76,7 +76,6 @@
BTA_DM_CI_IO_REQ_EVT,
BTA_DM_CI_RMT_OOB_EVT,
-#if (BLE_INCLUDED == TRUE)
BTA_DM_API_ADD_BLEKEY_EVT,
BTA_DM_API_ADD_BLEDEVICE_EVT,
BTA_DM_API_BLE_PASSKEY_REPLY_EVT,
@@ -105,8 +104,6 @@
BTA_DM_API_BLE_TRACK_ADVERTISER_EVT,
BTA_DM_API_BLE_ENERGY_INFO_EVT,
-#endif
-
BTA_DM_API_ENABLE_TEST_MODE_EVT,
BTA_DM_API_DISABLE_TEST_MODE_EVT,
BTA_DM_API_EXECUTE_CBACK_EVT,
@@ -166,7 +163,7 @@
tBTA_SERVICE_MASK services;
tBTA_DM_SEARCH_CBACK* p_cback;
tBTA_DM_RS_RES rs_res;
-#if (BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE)
+#if (BTA_GATT_INCLUDED == TRUE)
uint8_t num_uuid;
tBT_UUID* p_uuid;
#endif
@@ -180,7 +177,7 @@
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)
uint8_t num_uuid;
tBT_UUID* p_uuid;
#endif
@@ -281,10 +278,8 @@
uint8_t new_role;
BD_ADDR bd_addr;
uint8_t hci_status;
-#if (BLE_INCLUDED == TRUE)
uint16_t handle;
tBT_TRANSPORT transport;
-#endif
} tBTA_DM_ACL_CHANGE;
/* data type for BTA_DM_PM_BTM_STATUS_EVT */
@@ -344,7 +339,6 @@
BD_ADDR bd_addr;
} tBTA_DM_API_SET_ENCRYPTION;
-#if (BLE_INCLUDED == TRUE)
typedef struct {
BT_HDR hdr;
BD_ADDR bd_addr;
@@ -486,8 +480,6 @@
tBTA_BLE_ENERGY_INFO_CBACK* p_energy_info_cback;
} tBTA_DM_API_ENERGY_INFO;
-#endif /* BLE_INCLUDED */
-
/* data type for BTA_DM_API_REMOVE_ACL_EVT */
typedef struct {
BT_HDR hdr;
@@ -590,7 +582,6 @@
tBTA_DM_API_SET_ENCRYPTION set_encryption;
-#if (BLE_INCLUDED == TRUE)
tBTA_DM_API_ADD_BLEKEY add_ble_key;
tBTA_DM_API_ADD_BLE_DEVICE add_ble_device;
tBTA_DM_API_PASSKEY_REPLY ble_passkey_reply;
@@ -616,7 +607,6 @@
tBTA_DM_API_DISABLE_SCAN ble_disable_scan;
tBTA_DM_API_TRACK_ADVERTISER ble_track_advert;
tBTA_DM_API_ENERGY_INFO ble_energy_info;
-#endif
tBTA_DM_API_REMOVE_ACL remove_acl;
tBTA_DM_API_REMOVE_ALL_ACL remove_all_acl;
@@ -662,10 +652,8 @@
tBTA_DM_PM_ACTION pm_mode_attempted;
tBTA_DM_PM_ACTION pm_mode_failed;
bool remove_dev_pending;
-#if (BLE_INCLUDED == TRUE)
uint16_t conn_handle;
tBT_TRANSPORT transport;
-#endif
} tBTA_DM_PEER_DEVICE;
/* structure to store list of
@@ -673,9 +661,7 @@
typedef struct {
tBTA_DM_PEER_DEVICE peer_device[BTA_DM_NUM_PEER_DEVICE];
uint8_t count;
-#if (BLE_INCLUDED == TRUE)
uint8_t le_count;
-#endif
} tBTA_DM_ACTIVE_LINK;
typedef struct {
@@ -725,13 +711,11 @@
bool is_bta_dm_active;
tBTA_DM_ACTIVE_LINK device_list;
tBTA_DM_SEC_CBACK* p_sec_cback;
-#if (BLE_INCLUDED == TRUE)
tBTA_BLE_SCAN_SETUP_CBACK* p_setup_cback;
tBTA_DM_BLE_PF_CFG_CBACK* p_scan_filt_cfg_cback;
tBTA_DM_BLE_PF_STATUS_CBACK* p_scan_filt_status_cback;
tBTA_DM_BLE_PF_PARAM_CBACK* p_scan_filt_param_cback;
tBTA_BLE_ENERGY_INFO_CBACK* p_energy_info_cback;
-#endif
uint16_t state;
bool disabling;
alarm_t* disable_timer;
@@ -798,7 +782,6 @@
bool sdp_search;
bool cancel_pending; /* inquiry cancel is pending */
tBTA_TRANSPORT transport;
-#if (BLE_INCLUDED == TRUE)
tBTA_DM_SEARCH_CBACK* p_scan_cback;
#if (BTA_GATT_INCLUDED == TRUE)
tBTA_GATTC_IF client_if;
@@ -813,7 +796,6 @@
alarm_t* gatt_close_timer; /* GATT channel close delay timer */
BD_ADDR pending_close_bda; /* pending GATT channel remote device address */
#endif
-#endif
} tBTA_DM_SEARCH_CB;
@@ -939,7 +921,6 @@
extern void bta_dm_pm_timer(tBTA_DM_MSG* p_data);
extern void bta_dm_add_ampkey(tBTA_DM_MSG* p_data);
-#if (BLE_INCLUDED == TRUE)
extern void bta_dm_add_blekey(tBTA_DM_MSG* p_data);
extern void bta_dm_add_ble_device(tBTA_DM_MSG* p_data);
extern void bta_dm_ble_passkey_reply(tBTA_DM_MSG* p_data);
@@ -972,7 +953,6 @@
extern void bta_dm_ble_track_advertiser(tBTA_DM_MSG* p_data);
extern void bta_dm_ble_get_energy_info(tBTA_DM_MSG* p_data);
-#endif
extern void bta_dm_set_encryption(tBTA_DM_MSG* p_data);
extern void bta_dm_confirm(tBTA_DM_MSG* p_data);
extern void bta_dm_loc_oob(tBTA_DM_MSG* p_data);
diff --git a/bta/dm/bta_dm_main.cc b/bta/dm/bta_dm_main.cc
index ecbff69..d8810d0 100644
--- a/bta/dm/bta_dm_main.cc
+++ b/bta/dm/bta_dm_main.cc
@@ -70,7 +70,6 @@
bta_dm_ci_io_req_act, /* 21 BTA_DM_CI_IO_REQ_EVT */
bta_dm_ci_rmt_oob_act, /* 22 BTA_DM_CI_RMT_OOB_EVT */
-#if (BLE_INCLUDED == TRUE)
bta_dm_add_blekey, /* BTA_DM_API_ADD_BLEKEY_EVT */
bta_dm_add_ble_device, /* BTA_DM_API_ADD_BLEDEVICE_EVT */
bta_dm_ble_passkey_reply, /* BTA_DM_API_BLE_PASSKEY_REPLY_EVT */
@@ -96,7 +95,6 @@
bta_dm_ble_read_scan_reports, /* BTA_DM_API_BLE_READ_SCAN_REPORTS_EVT */
bta_dm_ble_track_advertiser, /* BTA_DM_API_BLE_TRACK_ADVERTISER_EVT */
bta_dm_ble_get_energy_info, /* BTA_DM_API_BLE_ENERGY_INFO_EVT */
-#endif
bta_dm_enable_test_mode, /* BTA_DM_API_ENABLE_TEST_MODE_EVT */
bta_dm_disable_test_mode, /* BTA_DM_API_DISABLE_TEST_MODE_EVT */
@@ -126,9 +124,7 @@
BTA_DM_SEARCH_CANCEL_TRANSAC_CMPL, /* 15 bta_dm_search_cancel_transac_cmpl */
BTA_DM_DISC_RMT_NAME, /* 16 bta_dm_disc_rmt_name */
BTA_DM_API_DI_DISCOVER, /* 17 bta_dm_di_disc */
-#if (BLE_INCLUDED == TRUE)
BTA_DM_CLOSE_GATT_CONN, /* 18 bta_dm_close_gatt_conn */
-#endif
BTA_DM_SEARCH_NUM_ACTIONS /* 19 */
};
@@ -153,11 +149,8 @@
bta_dm_search_cancel_transac_cmpl, /* 15 BTA_DM_SEARCH_CANCEL_TRANSAC_CMPL
*/
bta_dm_disc_rmt_name, /* 16 BTA_DM_DISC_RMT_NAME */
- bta_dm_di_disc /* 17 BTA_DM_API_DI_DISCOVER */
-#if (BLE_INCLUDED == TRUE)
- ,
+ bta_dm_di_disc, /* 17 BTA_DM_API_DI_DISCOVER */
bta_dm_close_gatt_conn
-#endif
};
#define BTA_DM_SEARCH_IGNORE BTA_DM_SEARCH_NUM_ACTIONS
@@ -188,11 +181,9 @@
/* DISCV_RES_EVT */ {BTA_DM_SEARCH_IGNORE, BTA_DM_SEARCH_IGNORE,
BTA_DM_SEARCH_IDLE},
/* API_DI_DISCOVER_EVT */ {BTA_DM_API_DI_DISCOVER, BTA_DM_SEARCH_IGNORE,
- BTA_DM_SEARCH_ACTIVE}
-#if (BLE_INCLUDED == TRUE)
- /* DISC_CLOSE_TOUT_EVT */,
+ BTA_DM_SEARCH_ACTIVE},
+ /* DISC_CLOSE_TOUT_EVT */
{BTA_DM_CLOSE_GATT_CONN, BTA_DM_SEARCH_IGNORE, BTA_DM_SEARCH_IDLE}
-#endif
};
const uint8_t bta_dm_search_search_active_st_table[][BTA_DM_SEARCH_NUM_COLS] = {
@@ -215,11 +206,9 @@
/* DISCV_RES_EVT */ {BTA_DM_SEARCH_RESULT, BTA_DM_SEARCH_IGNORE,
BTA_DM_SEARCH_ACTIVE},
/* API_DI_DISCOVER_EVT */ {BTA_DM_SEARCH_IGNORE, BTA_DM_SEARCH_IGNORE,
- BTA_DM_SEARCH_ACTIVE}
-#if (BLE_INCLUDED == TRUE)
- /* DISC_CLOSE_TOUT_EVT */,
+ BTA_DM_SEARCH_ACTIVE},
+ /* DISC_CLOSE_TOUT_EVT */
{BTA_DM_CLOSE_GATT_CONN, BTA_DM_SEARCH_IGNORE, BTA_DM_SEARCH_ACTIVE}
-#endif
};
@@ -246,12 +235,9 @@
/* DISCV_RES_EVT */ {BTA_DM_SEARCH_CANCEL_TRANSAC_CMPL,
BTA_DM_SEARCH_CANCEL_CMPL, BTA_DM_SEARCH_IDLE},
/* API_DI_DISCOVER_EVT */ {BTA_DM_SEARCH_IGNORE, BTA_DM_SEARCH_IGNORE,
- BTA_DM_SEARCH_CANCELLING}
-#if (BLE_INCLUDED == TRUE)
- /* DISC_CLOSE_TOUT_EVT */,
+ BTA_DM_SEARCH_CANCELLING},
+ /* DISC_CLOSE_TOUT_EVT */
{BTA_DM_SEARCH_IGNORE, BTA_DM_SEARCH_IGNORE, BTA_DM_SEARCH_CANCELLING}
-#endif
-
};
const uint8_t bta_dm_search_disc_active_st_table[][BTA_DM_SEARCH_NUM_COLS] = {
@@ -275,12 +261,9 @@
/* DISCV_RES_EVT */ {BTA_DM_DISC_RESULT, BTA_DM_SEARCH_IGNORE,
BTA_DM_DISCOVER_ACTIVE},
/* API_DI_DISCOVER_EVT */ {BTA_DM_SEARCH_IGNORE, BTA_DM_SEARCH_IGNORE,
- BTA_DM_DISCOVER_ACTIVE}
-
-#if (BLE_INCLUDED == TRUE)
- /* DISC_CLOSE_TOUT_EVT */,
+ BTA_DM_DISCOVER_ACTIVE},
+ /* DISC_CLOSE_TOUT_EVT */
{BTA_DM_SEARCH_IGNORE, BTA_DM_SEARCH_IGNORE, BTA_DM_DISCOVER_ACTIVE}
-#endif
};
typedef const uint8_t (*tBTA_DM_ST_TBL)[BTA_DM_SEARCH_NUM_COLS];
diff --git a/bta/dm/bta_dm_pm.cc b/bta/dm/bta_dm_pm.cc
index 6f64bc2..a857b97 100644
--- a/bta/dm/bta_dm_pm.cc
+++ b/bta/dm/bta_dm_pm.cc
@@ -1147,7 +1147,6 @@
BTM_SetLinkPolicy(p_dev->peer_bdaddr, &policy_setting);
}
-#if (BLE_INCLUDED == TRUE)
/*******************************************************************************
*
* Function bta_dm_pm_obtain_controller_state
@@ -1169,4 +1168,3 @@
APPL_TRACE_DEBUG("bta_dm_pm_obtain_controller_state: %d", cur_state);
return cur_state;
}
-#endif
diff --git a/bta/gatt/bta_gattc_act.cc b/bta/gatt/bta_gattc_act.cc
index a2e88e2..36fad74 100644
--- a/bta/gatt/bta_gattc_act.cc
+++ b/bta/gatt/bta_gattc_act.cc
@@ -42,7 +42,7 @@
#include "bta_hh_int.h"
#endif
-#if (BTA_GATT_INCLUDED == TRUE && BLE_INCLUDED == TRUE)
+#if (BTA_GATT_INCLUDED == TRUE)
/*****************************************************************************
* Constants
@@ -760,9 +760,7 @@
void bta_gattc_set_discover_st(tBTA_GATTC_SERV* p_srcb) {
uint8_t i;
-#if (BLE_INCLUDED == TRUE)
L2CA_EnableUpdateBleConnParams(p_srcb->server_bda, false);
-#endif
for (i = 0; i < BTA_GATTC_CLCB_MAX; i++) {
if (bta_gattc_cb.clcb[i].p_srcb == p_srcb) {
bta_gattc_cb.clcb[i].status = BTA_GATT_OK;
@@ -884,10 +882,8 @@
APPL_TRACE_DEBUG("bta_gattc_disc_cmpl conn_id=%d", p_clcb->bta_conn_id);
-#if (BLE_INCLUDED == TRUE)
if (p_clcb->transport == BTA_TRANSPORT_LE)
L2CA_EnableUpdateBleConnParams(p_clcb->p_srcb->server_bda, true);
-#endif
p_clcb->p_srcb->state = BTA_GATTC_SERV_IDLE;
p_clcb->disc_active = false;
@@ -1708,4 +1704,4 @@
}
}
}
-#endif // BTA_GATT_INCLUDED == TRUE && BLE_INCLUDED == TRUE
+#endif // BTA_GATT_INCLUDED == TRUE
diff --git a/bta/gatt/bta_gattc_int.h b/bta/gatt/bta_gattc_int.h
index 53c5670..70b400d 100644
--- a/bta/gatt/bta_gattc_int.h
+++ b/bta/gatt/bta_gattc_int.h
@@ -421,10 +421,9 @@
tBTA_TRANSPORT transport, uint16_t mtu);
extern void bta_gattc_process_api_refresh(tBTA_GATTC_DATA* p_msg);
extern void bta_gattc_cfg_mtu(tBTA_GATTC_CLCB* p_clcb, tBTA_GATTC_DATA* p_data);
-#if (BLE_INCLUDED == TRUE)
extern void bta_gattc_listen(tBTA_GATTC_DATA* p_msg);
extern void bta_gattc_broadcast(tBTA_GATTC_DATA* p_msg);
-#endif
+
/* utility functions */
extern tBTA_GATTC_CLCB* bta_gattc_find_clcb_by_cif(uint8_t client_if,
BD_ADDR remote_bda,
diff --git a/bta/hh/bta_hh_int.h b/bta/hh/bta_hh_int.h
index 0edbf60..a2aa984 100644
--- a/bta/hh/bta_hh_int.h
+++ b/bta/hh/bta_hh_int.h
@@ -36,7 +36,7 @@
/* can be moved to bta_api.h */
#define BTA_HH_MAX_RPT_CHARS 8
-#if (BTA_GATT_INCLUDED == FALSE || BLE_INCLUDED == FALSE)
+#if (BTA_GATT_INCLUDED == FALSE)
#undef BTA_HH_LE_INCLUDED
#define BTA_HH_LE_INCLUDED false
#endif
diff --git a/bta/include/bta_api.h b/bta/include/bta_api.h
index f9d137f..f7845b7 100644
--- a/bta/include/bta_api.h
+++ b/bta/include/bta_api.h
@@ -28,10 +28,7 @@
#include "bt_target.h"
#include "bt_types.h"
#include "btm_api.h"
-
-#if (BLE_INCLUDED == TRUE)
#include "btm_ble_api.h"
-#endif
#ifdef __cplusplus
extern "C" {
@@ -92,7 +89,7 @@
#define BTA_HDP_SERVICE_ID 27 /* Health Device Profile */
#define BTA_PCE_SERVICE_ID 28 /* PhoneBook Access Client*/
#define BTA_SDP_SERVICE_ID 29 /* SDP Search*/
-#if (BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE)
+#if (BTA_GATT_INCLUDED == TRUE)
/* BLE profile service ID */
#define BTA_BLE_SERVICE_ID 30 /* GATT profile */
@@ -141,14 +138,14 @@
#define BTA_HL_SERVICE_MASK 0x08000000 /* Health Device Profile */
#define BTA_PCE_SERVICE_MASK 0x10000000 /* Phone Book Client */
-#if (BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE)
+#if (BTA_GATT_INCLUDED == TRUE)
#define BTA_BLE_SERVICE_MASK 0x20000000 /* GATT based service */
#define BTA_USER_SERVICE_MASK 0x40000000 /* Message Notification Profile */
#else
#define BTA_USER_SERVICE_MASK 0x20000000 /* Message Notification Profile */
#endif
-#if (BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE)
+#if (BTA_GATT_INCLUDED == TRUE)
#define BTA_ALL_SERVICE_MASK 0x3FFFFFFF /* All services supported by BTA. */
#else
#define BTA_ALL_SERVICE_MASK 0x1FFFFFFF /* All services supported by BTA. */
@@ -198,14 +195,12 @@
#define BTA_DM_GENERAL_DISC \
BTM_GENERAL_DISCOVERABLE /* General discoverable. \
*/
-#if (BLE_INCLUDED == TRUE)
#define BTA_DM_BLE_NON_DISCOVERABLE \
BTM_BLE_NON_DISCOVERABLE /* Device is not LE discoverable */
#define BTA_DM_BLE_GENERAL_DISCOVERABLE \
BTM_BLE_GENERAL_DISCOVERABLE /* Device is LE General discoverable */
#define BTA_DM_BLE_LIMITED_DISCOVERABLE \
BTM_BLE_LIMITED_DISCOVERABLE /* Device is LE Limited discoverable */
-#endif
typedef uint16_t
tBTA_DM_DISC; /* this discoverability mode is a bit mask among BR mode and
LE mode */
@@ -213,12 +208,10 @@
/* Connectable Modes */
#define BTA_DM_NON_CONN BTM_NON_CONNECTABLE /* Device is not connectable. */
#define BTA_DM_CONN BTM_CONNECTABLE /* Device is connectable. */
-#if (BLE_INCLUDED == TRUE)
#define BTA_DM_BLE_NON_CONNECTABLE \
BTM_BLE_NON_CONNECTABLE /* Device is LE non-connectable. */
#define BTA_DM_BLE_CONNECTABLE \
BTM_BLE_CONNECTABLE /* Device is LE connectable. */
-#endif
typedef uint16_t tBTA_DM_CONN;
@@ -242,13 +235,11 @@
#define BTA_DM_LIMITED_INQUIRY \
BTM_LIMITED_INQUIRY /* Perform limited inquiry. */
-#if (BLE_INCLUDED == TRUE)
#define BTA_BLE_INQUIRY_NONE BTM_BLE_INQUIRY_NONE
#define BTA_BLE_GENERAL_INQUIRY \
BTM_BLE_GENERAL_INQUIRY /* Perform LE general inquiry. */
#define BTA_BLE_LIMITED_INQUIRY \
BTM_BLE_LIMITED_INQUIRY /* Perform LE limited inquiry. */
-#endif
typedef uint8_t tBTA_DM_INQ_MODE;
/* Inquiry Filter Type */
@@ -339,8 +330,6 @@
uint8_t* bta_dm_eir_additional; /* additional data */
} tBTA_DM_EIR_CONF;
-#if (BLE_INCLUDED == TRUE)
-
/* advertising filter policy */
typedef tBTM_BLE_AFP tBTA_BLE_AFP;
@@ -368,7 +357,6 @@
typedef tBTM_BLE_BATCH_SCAN_EVT tBTA_BLE_BATCH_SCAN_EVT;
typedef tBTM_BLE_TRACK_ADV_ACTION tBTA_BLE_TRACK_ADV_ACTION;
-#endif
/* BLE customer specific feature function type definitions */
/* data type used on customer specific feature for RSSI monitoring */
@@ -667,9 +655,7 @@
/* Structure associated with BTA_DM_LINK_UP_EVT */
typedef struct {
BD_ADDR bd_addr; /* BD address peer device. */
-#if (BLE_INCLUDED == TRUE)
tBTA_TRANSPORT link_type;
-#endif
} tBTA_DM_LINK_UP;
/* Structure associated with BTA_DM_LINK_DOWN_EVT */
@@ -677,9 +663,7 @@
BD_ADDR bd_addr; /* BD address peer device. */
uint8_t status; /* connection open/closed */
bool is_removed; /* true if device is removed when link is down */
-#if (BLE_INCLUDED == TRUE)
tBTA_TRANSPORT link_type;
-#endif
} tBTA_DM_LINK_DOWN;
/* Structure associated with BTA_DM_ROLE_CHG_EVT */
@@ -699,7 +683,7 @@
#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 (BLE_INCLUDED == TRUE && SMP_INCLUDED == TRUE)
+#if (SMP_INCLUDED == TRUE)
#define BTA_IO_CAP_KBDISP BTM_IO_CAP_KBDISP /* 4 Keyboard display */
#endif
typedef tBTM_IO_CAP tBTA_IO_CAP;
@@ -925,14 +909,11 @@
bool is_limited; /* true, if the limited inquiry bit is set in the CoD */
int8_t rssi; /* The rssi value */
uint8_t* p_eir; /* received EIR */
-#if (BLE_INCLUDED == TRUE)
uint8_t inq_result_type;
uint8_t ble_addr_type;
tBTM_BLE_EVT_TYPE ble_evt_type;
tBT_DEVICE_TYPE device_type;
uint8_t flag;
-#endif
-
} tBTA_DM_INQ_RES;
/* Structure associated with BTA_DM_INQ_CMPL_EVT */
@@ -995,7 +976,6 @@
#define BTA_DM_BLE_SEC_MITM BTM_BLE_SEC_ENCRYPT_MITM
typedef tBTM_BLE_SEC_ACT tBTA_DM_BLE_SEC_ACT;
-#if (BLE_INCLUDED == TRUE)
typedef tBTM_BLE_TX_TIME_MS tBTA_DM_BLE_TX_TIME_MS;
typedef tBTM_BLE_RX_TIME_MS tBTA_DM_BLE_RX_TIME_MS;
typedef tBTM_BLE_IDLE_TIME_MS tBTA_DM_BLE_IDLE_TIME_MS;
@@ -1043,10 +1023,6 @@
tBTA_DM_CONTRL_STATE ctrl_state,
tBTA_STATUS status);
-#else
-typedef uint8_t tBTA_DM_BLE_SEC_ACT;
-#endif
-
/* Maximum service name length */
#define BTA_SERVICE_NAME_LEN 35
#define BTA_SERVICE_DESP_LEN BTA_SERVICE_NAME_LEN
@@ -1629,7 +1605,6 @@
extern int32_t BTA_DmPcmResample(void* p_src, uint32_t in_bytes, void* p_dst);
#endif
-#if (BLE_INCLUDED == TRUE)
/* BLE related API functions */
/*******************************************************************************
*
@@ -1920,9 +1895,6 @@
extern void BTA_DmBleObserve(bool start, uint8_t duration,
tBTA_DM_SEARCH_CBACK* p_results_cb);
-#endif
-
-#if (BLE_INCLUDED == TRUE)
/*******************************************************************************
*
* Function BTA_DmBleConfigLocalPrivacy
@@ -2182,8 +2154,6 @@
******************************************************************************/
extern void BTA_VendorCleanup(void);
-#endif
-
#ifdef __cplusplus
}
#endif
diff --git a/bta/include/bta_gatt_api.h b/bta/include/bta_gatt_api.h
index 6df3f82..3eab85e 100644
--- a/bta/include/bta_gatt_api.h
+++ b/bta/include/bta_gatt_api.h
@@ -39,11 +39,6 @@
#define BTA_GATT_INCLUDED false
#endif
-#if (BLE_INCLUDED == FALSE && BTA_GATT_INCLUDED == TRUE)
-#undef BTA_GATT_INCLUDED
-#define BTA_GATT_INCLUDED false
-#endif
-
#ifndef BTA_GATT_DEBUG
#define BTA_GATT_DEBUG false
#endif
diff --git a/bta/include/bta_hh_co.h b/bta/include/bta_hh_co.h
index ac52696..946acf6 100644
--- a/bta/include/bta_hh_co.h
+++ b/bta/include/bta_hh_co.h
@@ -81,7 +81,7 @@
******************************************************************************/
extern void bta_hh_co_close(uint8_t dev_handle, uint8_t app_id);
-#if (BLE_INCLUDED == TRUE && BTA_HH_LE_INCLUDED == TRUE)
+#if (BTA_HH_LE_INCLUDED == TRUE)
/*******************************************************************************
*
* Function bta_hh_le_co_rpt_info
@@ -135,7 +135,7 @@
******************************************************************************/
extern void bta_hh_le_co_reset_rpt_cache(BD_ADDR remote_bda, uint8_t app_id);
-#endif /* #if (BLE_INCLUDED == true && BTA_HH_LE_INCLUDED == TRUE) */
+#endif /* #if (BTA_HH_LE_INCLUDED == TRUE) */
#ifdef __cplusplus
}
diff --git a/btif/co/bta_dm_co.cc b/btif/co/bta_dm_co.cc
index 81d29f3..94c1e6f 100644
--- a/btif/co/bta_dm_co.cc
+++ b/btif/co/bta_dm_co.cc
@@ -25,7 +25,6 @@
#include "bta_sys.h"
#include "btif_dm.h"
#include "osi/include/osi.h"
-#if (BLE_INCLUDED == TRUE)
#include "bte_appl.h"
tBTE_APPL_CFG bte_appl_cfg = {
@@ -36,7 +35,6 @@
#endif
BTM_LOCAL_IO_CAPS_BLE, BTM_BLE_INITIATOR_KEY_SIZE,
BTM_BLE_RESPONDER_KEY_SIZE, BTM_BLE_MAX_KEY_SIZE};
-#endif
/*******************************************************************************
*
@@ -306,7 +304,6 @@
#endif /* (BTM_SCO_HCI_INCLUDED == TRUE) && (BTM_SCO_INCLUDED == TRUE)*/
-#if (BLE_INCLUDED == TRUE)
/*******************************************************************************
*
* Function bta_dm_co_le_io_key_req
@@ -416,4 +413,3 @@
*p_max_key_size = bte_appl_cfg.ble_max_key_size;
}
-#endif
diff --git a/btif/co/bta_gatts_co.cc b/btif/co/bta_gatts_co.cc
index 21ec77d..5d145c0 100644
--- a/btif/co/bta_gatts_co.cc
+++ b/btif/co/bta_gatts_co.cc
@@ -18,7 +18,7 @@
#include "bta_api.h"
-#if (BLE_INCLUDED == TRUE) && (BTA_GATT_INCLUDED == TRUE)
+#if (BTA_GATT_INCLUDED == TRUE)
#include <stdlib.h>
#include <string.h>
@@ -147,4 +147,4 @@
return false;
}
-#endif // BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE
+#endif // BTA_GATT_INCLUDED == TRUE
diff --git a/btif/co/bta_hh_co.cc b/btif/co/bta_hh_co.cc
index 19ccdf6..7ff42c7 100644
--- a/btif/co/bta_hh_co.cc
+++ b/btif/co/bta_hh_co.cc
@@ -38,7 +38,7 @@
const char* dev_path = "/dev/uhid";
-#if (BLE_INCLUDED == TRUE && BTA_HH_LE_INCLUDED == TRUE)
+#if (BTA_HH_LE_INCLUDED == TRUE)
#include "btif_config.h"
#define BTA_HH_NV_LOAD_MAX 16
static tBTA_HH_RPT_CACHE_ENTRY sReportCache[BTA_HH_NV_LOAD_MAX];
@@ -503,7 +503,7 @@
}
}
-#if (BLE_INCLUDED == TRUE && BTA_HH_LE_INCLUDED == TRUE)
+#if (BTA_HH_LE_INCLUDED == TRUE)
/*******************************************************************************
*
* Function bta_hh_le_co_rpt_info
@@ -606,4 +606,4 @@
BTIF_TRACE_DEBUG("%s() - Reset cache for bda %s", __func__, bdstr);
}
-#endif // (BLE_INCLUDED == TRUE && BTA_HH_LE_INCLUDED == TRUE)
+#endif // (BTA_HH_LE_INCLUDED == TRUE)
diff --git a/btif/include/btif_dm.h b/btif/include/btif_dm.h
index b517e86..4f3e22e 100644
--- a/btif/include/btif_dm.h
+++ b/btif/include/btif_dm.h
@@ -63,7 +63,6 @@
void btif_dm_proc_loc_oob(bool valid, BT_OCTET16 c, BT_OCTET16 r);
bool btif_dm_proc_rmt_oob(BD_ADDR bd_addr, BT_OCTET16 p_c, BT_OCTET16 p_r);
#endif /* BTIF_DM_OOB_TEST */
-#if (BLE_INCLUDED == TRUE)
/*callout for reading SMP properties from Text file*/
bool btif_dm_get_smp_config(tBTE_APPL_CFG* p_cfg);
@@ -106,6 +105,5 @@
void btif_dm_update_ble_remote_properties(BD_ADDR bd_addr, BD_NAME bd_name,
tBT_DEVICE_TYPE dev_type);
-#endif /* BLE_INCLUDED */
#endif
diff --git a/btif/include/btif_storage.h b/btif/include/btif_storage.h
index 78be2c0..2bdc96f 100644
--- a/btif/include/btif_storage.h
+++ b/btif/include/btif_storage.h
@@ -207,7 +207,6 @@
******************************************************************************/
bool btif_storage_is_restricted_device(const bt_bdaddr_t* remote_bd_addr);
-#if (BLE_INCLUDED == TRUE)
bt_status_t btif_storage_add_ble_bonding_key(bt_bdaddr_t* remote_bd_addr,
char* key, uint8_t key_type,
uint8_t key_length);
@@ -228,7 +227,6 @@
bt_status_t btif_storage_set_remote_addr_type(bt_bdaddr_t* remote_bd_addr,
uint8_t addr_type);
-#endif
/******************************************************************************
* Exported for unit tests
*****************************************************************************/
diff --git a/btif/src/bluetooth.cc b/btif/src/bluetooth.cc
index c396ea4..6ddf5e0 100644
--- a/btif/src/bluetooth.cc
+++ b/btif/src/bluetooth.cc
@@ -94,10 +94,8 @@
extern btpan_interface_t* btif_pan_get_interface();
/*map client*/
extern btmce_interface_t* btif_mce_get_interface();
-#if (BLE_INCLUDED == TRUE)
/* gatt */
extern const btgatt_interface_t* btif_gatt_get_interface();
-#endif
/* avrc target */
extern btrc_interface_t* btif_rc_get_interface();
/* avrc controller */
@@ -348,7 +346,7 @@
if (is_profile(profile_id, BT_PROFILE_SDP_CLIENT_ID))
return btif_sdp_get_interface();
-#if (BTA_GATT_INCLUDED == TRUE && BLE_INCLUDED == TRUE)
+#if (BTA_GATT_INCLUDED == TRUE)
if (is_profile(profile_id, BT_PROFILE_GATT_ID))
return btif_gatt_get_interface();
#endif
@@ -380,7 +378,6 @@
return btif_dut_mode_send(opcode, buf, len);
}
-#if (BLE_INCLUDED == TRUE)
int le_test_mode(uint16_t opcode, uint8_t* buf, uint8_t len) {
LOG_INFO(LOG_TAG, "le_test_mode");
@@ -389,7 +386,6 @@
return btif_le_test_mode(opcode, buf, len);
}
-#endif
int config_hci_snoop_log(uint8_t enable) {
LOG_INFO(LOG_TAG, "config_hci_snoop_log");
@@ -436,11 +432,7 @@
get_profile_interface,
dut_mode_configure,
dut_mode_send,
-#if (BLE_INCLUDED == TRUE)
le_test_mode,
-#else
- NULL,
-#endif
config_hci_snoop_log,
set_os_callouts,
read_energy_info,
diff --git a/btif/src/btif_ble_scanner.cc b/btif/src/btif_ble_scanner.cc
index eac3906..cc04f20 100644
--- a/btif/src/btif_ble_scanner.cc
+++ b/btif/src/btif_ble_scanner.cc
@@ -32,8 +32,6 @@
#include "btif_common.h"
#include "btif_util.h"
-#if (BLE_INCLUDED == TRUE)
-
#include <hardware/bt_gatt.h>
#include "bta_api.h"
@@ -664,5 +662,3 @@
btif_gattc_dis_batch_scan,
btif_gattc_read_batch_scan_reports,
};
-
-#endif
diff --git a/btif/src/btif_core.cc b/btif/src/btif_core.cc
index c98b4cb..8e1c856 100644
--- a/btif/src/btif_core.cc
+++ b/btif/src/btif_core.cc
@@ -269,9 +269,7 @@
void btif_init_ok(UNUSED_ATTR uint16_t event, UNUSED_ATTR char* p_param) {
BTIF_TRACE_DEBUG("btif_task: received trigger stack init event");
-#if (BLE_INCLUDED == TRUE)
btif_dm_load_ble_local_keys();
-#endif
BTA_EnableBluetooth(bte_dm_evt);
}
@@ -573,11 +571,9 @@
bt_status_t btif_disable_bluetooth(void) {
BTIF_TRACE_DEBUG("BTIF DISABLE BLUETOOTH");
-#if (BLE_INCLUDED == TRUE)
btm_ble_multi_adv_cleanup();
// TODO(jpawlowski): this should do whole BTA_VendorCleanup(), but it would kill
// the stack now.
-#endif
btif_dm_on_disable();
/* cleanup rfcomm & l2cap api */
@@ -626,9 +622,7 @@
bt_status_t btif_cleanup_bluetooth(void) {
BTIF_TRACE_DEBUG("%s", __func__);
-#if (BLE_INCLUDED == TRUE)
BTA_VendorCleanup();
-#endif
btif_dm_cleanup();
btif_jni_disassociate();
@@ -856,7 +850,6 @@
prop.val = (void*)buf;
prop.len = sizeof(buf);
if (prop.type == BT_PROPERTY_LOCAL_LE_FEATURES) {
-#if (BLE_INCLUDED == true)
tBTM_BLE_VSC_CB cmn_vsc_cb;
bt_local_le_features_t local_le_features;
@@ -886,7 +879,6 @@
local_le_features.debug_logging_supported =
cmn_vsc_cb.debug_logging_supported > 0;
memcpy(prop.val, &local_le_features, prop.len);
-#endif
} else {
status = btif_storage_get_adapter_property(&prop);
}
diff --git a/btif/src/btif_dm.cc b/btif/src/btif_dm.cc
index 194ffa0..f0de72b 100644
--- a/btif/src/btif_dm.cc
+++ b/btif/src/btif_dm.cc
@@ -115,11 +115,9 @@
uint8_t timeout_retries;
uint8_t is_local_initiated;
uint8_t sdp_attempts;
-#if (BLE_INCLUDED == TRUE)
bool is_le_only;
bool is_le_nc; /* LE Numeric comparison */
btif_dm_ble_cb_t ble;
-#endif
} btif_dm_pairing_cb_t;
typedef struct {
@@ -217,7 +215,6 @@
static void btif_update_remote_properties(BD_ADDR bd_addr, BD_NAME bd_name,
DEV_CLASS dev_class,
tBT_DEVICE_TYPE dev_type);
-#if (BLE_INCLUDED == TRUE)
static btif_dm_local_key_cb_t ble_local_key_cb;
static void btif_dm_ble_key_notif_evt(tBTA_DM_SP_KEY_NOTIF* p_ssp_key_notif);
static void btif_dm_ble_auth_cmpl_evt(tBTA_DM_AUTH_CMPL* p_auth_cmpl);
@@ -225,7 +222,6 @@
static void btif_dm_ble_key_nc_req_evt(tBTA_DM_SP_KEY_NOTIF* p_notif_req);
static void btif_dm_ble_oob_req_evt(tBTA_DM_SP_RMT_OOB* req_oob_type);
static void btif_dm_ble_sc_oob_req_evt(tBTA_DM_SP_RMT_OOB* req_oob_type);
-#endif
static void bte_scan_filt_param_cfg_evt(uint8_t action_type,
tBTA_DM_BLE_PF_AVBL_SPACE avbl_space,
@@ -661,7 +657,6 @@
bool is_hid = check_cod(bd_addr, COD_HID_POINTING);
bond_state_changed(BT_STATUS_SUCCESS, bd_addr, BT_BOND_STATE_BONDING);
-#if (BLE_INCLUDED == TRUE)
int device_type;
int addr_type;
bdstr_t bdstr;
@@ -690,13 +685,8 @@
(transport == BT_TRANSPORT_LE)) {
BTA_DmAddBleDevice(bd_addr->address, addr_type, device_type);
}
-#endif
-#if (BLE_INCLUDED == TRUE)
if (is_hid && (device_type & BT_DEVICE_TYPE_BLE) == 0)
-#else
- if (is_hid)
-#endif
{
bt_status_t status;
status = (bt_status_t)btif_hh_connect(bd_addr);
@@ -1092,9 +1082,7 @@
// Skip SDP for certain HID Devices
if (p_auth_cmpl->success) {
-#if (BLE_INCLUDED == TRUE)
btif_storage_set_remote_addr_type(&bd_addr, p_auth_cmpl->addr_type);
-#endif
btif_update_remote_properties(p_auth_cmpl->bd_addr, p_auth_cmpl->bd_name,
NULL, p_auth_cmpl->dev_type);
pairing_cb.timeout_retries = 0;
@@ -1125,7 +1113,6 @@
HAL_CBACK(bt_hal_cbacks, remote_device_properties_cb, BT_STATUS_SUCCESS,
&bd_addr, 1, &prop);
} else {
-#if (BLE_INCLUDED == TRUE)
bool is_crosskey = false;
/* If bonded due to cross-key, save the static address too*/
if (pairing_cb.state == BT_BOND_STATE_BONDING &&
@@ -1138,7 +1125,6 @@
}
if (!is_crosskey ||
!(stack_config_get_interface()->get_pts_crosskey_sdp_disable())) {
-#endif
// Ensure inquiry is stopped before attempting service discovery
btif_dm_cancel_discovery();
@@ -1146,9 +1132,7 @@
/* Trigger SDP on the device */
pairing_cb.sdp_attempts = 1;
btif_dm_get_remote_services(&bd_addr);
-#if (BLE_INCLUDED == TRUE)
}
-#endif
}
// Do not call bond_state_changed_cb yet. Wait until remote service
// discovery is complete
@@ -1268,11 +1252,7 @@
BTIF_TRACE_DEBUG("%s() %s device_type = 0x%x\n", __func__,
bdaddr_to_string(&bdaddr, bdstr, sizeof(bdstr)),
-#if (BLE_INCLUDED == TRUE)
p_search_data->inq_res.device_type);
-#else
- BT_DEVICE_TYPE_BREDR);
-#endif
bdname.name[0] = 0;
cod = devclass2uint(p_search_data->inq_res.dev_class);
@@ -1321,7 +1301,6 @@
&cod);
num_properties++;
/* DEV_TYPE */
-#if (BLE_INCLUDED == TRUE)
/* FixMe: Assumption is that bluetooth.h and BTE enums match */
/* Verify if the device is dual mode in NVRAM */
@@ -1338,9 +1317,6 @@
if (p_search_data->inq_res.device_type == BT_DEVICE_TYPE_BLE)
addr_type = p_search_data->inq_res.ble_addr_type;
-#else
- dev_type = BT_DEVICE_TYPE_BREDR;
-#endif
BTIF_STORAGE_FILL_PROPERTY(&properties[num_properties],
BT_PROPERTY_TYPE_OF_DEVICE, sizeof(dev_type),
&dev_type);
@@ -1355,23 +1331,19 @@
btif_storage_add_remote_device(&bdaddr, num_properties, properties);
ASSERTC(status == BT_STATUS_SUCCESS,
"failed to save remote device (inquiry)", status);
-#if (BLE_INCLUDED == TRUE)
status = btif_storage_set_remote_addr_type(&bdaddr, addr_type);
ASSERTC(status == BT_STATUS_SUCCESS,
"failed to save remote addr type (inquiry)", status);
-#endif
/* Callback to notify upper layer of device */
HAL_CBACK(bt_hal_cbacks, device_found_cb, num_properties, properties);
}
} break;
case BTA_DM_INQ_CMPL_EVT: {
-#if (BLE_INCLUDED == TRUE)
tBTA_DM_BLE_PF_FILT_PARAMS adv_filt_param;
memset(&adv_filt_param, 0, sizeof(tBTA_DM_BLE_PF_FILT_PARAMS));
BTA_DmBleScanFilterSetup(BTA_DM_BLE_SCAN_COND_DELETE, 0, &adv_filt_param,
NULL, bte_scan_filt_param_cfg_evt, 0);
-#endif
} break;
case BTA_DM_DISC_CMPL_EVT: {
HAL_CBACK(bt_hal_cbacks, discovery_state_changed_cb,
@@ -1388,13 +1360,11 @@
*
*/
if (btif_dm_inquiry_in_progress == false) {
-#if (BLE_INCLUDED == TRUE)
tBTA_DM_BLE_PF_FILT_PARAMS adv_filt_param;
memset(&adv_filt_param, 0, sizeof(tBTA_DM_BLE_PF_FILT_PARAMS));
BTA_DmBleScanFilterSetup(BTA_DM_BLE_SCAN_COND_DELETE, 0,
&adv_filt_param, NULL,
bte_scan_filt_param_cfg_evt, 0);
-#endif
HAL_CBACK(bt_hal_cbacks, discovery_state_changed_cb,
BT_DISCOVERY_STOPPED);
}
@@ -1492,7 +1462,6 @@
/* no-op */
break;
-#if (BLE_INCLUDED == TRUE)
case BTA_DM_DISC_BLE_RES_EVT: {
BTIF_TRACE_DEBUG("%s:, services 0x%x)", __func__,
p_data->disc_ble_res.service.uu.uuid16);
@@ -1550,7 +1519,6 @@
&bd_addr, num_properties, prop);
}
} break;
-#endif /* BLE_INCLUDED */
default: { ASSERTC(0, "unhandled search services event", event); } break;
}
@@ -1638,10 +1606,8 @@
BTA_DmSetDeviceName(btif_get_default_local_name());
}
-#if (BLE_INCLUDED == TRUE)
/* Enable local privacy */
BTA_DmBleConfigLocalPrivacy(BLE_LOCAL_PRIVACY_ENABLED);
-#endif
/* for each of the enabled services in the mask, trigger the profile
* enable */
@@ -1758,7 +1724,6 @@
kill(getpid(), SIGKILL);
break;
-#if (BLE_INCLUDED == TRUE)
case BTA_DM_BLE_KEY_EVT:
BTIF_TRACE_DEBUG("BTA_DM_BLE_KEY_EVT key_type=0x%02x ",
p_data->ble_key.key_type);
@@ -1933,7 +1898,6 @@
osi_free(data);
break;
}
-#endif
case BTA_DM_AUTHORIZE_EVT:
case BTA_DM_SIG_STRENGTH_EVT:
@@ -2116,7 +2080,6 @@
sizeof(tBTA_DM_SEARCH), NULL);
}
-#if (BLE_INCLUDED == TRUE)
/*******************************************************************************
*
* Function bta_energy_info_cb
@@ -2148,7 +2111,6 @@
(char*)&btif_cb, sizeof(btif_activity_energy_info_cb_t),
NULL);
}
-#endif
/*******************************************************************************
*
@@ -2195,7 +2157,6 @@
BTIF_TRACE_EVENT("%s", __func__);
-#if (BLE_INCLUDED == TRUE)
memset(&adv_filt_param, 0, sizeof(tBTA_DM_BLE_PF_FILT_PARAMS));
/* Cleanup anything remaining on index 0 */
BTA_DmBleScanFilterSetup(BTA_DM_BLE_SCAN_COND_DELETE, 0, &adv_filt_param,
@@ -2221,9 +2182,6 @@
inq_params.intl_duration[2] = BTIF_DM_INTERLEAVE_DURATION_BR_TWO;
inq_params.intl_duration[3] = BTIF_DM_INTERLEAVE_DURATION_LE_TWO;
#endif
-#else
- inq_params.mode = BTA_DM_GENERAL_INQUIRY;
-#endif
inq_params.duration = BTIF_DM_DEFAULT_INQ_MAX_DURATION;
inq_params.max_resps = BTIF_DM_DEFAULT_INQ_MAX_RESULTS;
@@ -2343,8 +2301,6 @@
** 2. special handling for HID devices
*/
if (pairing_cb.state == BT_BOND_STATE_BONDING) {
-#if (BLE_INCLUDED == TRUE)
-
if (pairing_cb.is_ssp) {
if (pairing_cb.is_le_only) {
BTA_DmBleSecurityGrant((uint8_t*)bd_addr->address,
@@ -2363,17 +2319,6 @@
/* Cancel bonding, in case it is in ACL connection setup state */
BTA_DmBondCancel((uint8_t*)bd_addr->address);
}
-
-#else
- if (pairing_cb.is_ssp) {
- BTA_DmConfirm((uint8_t*)bd_addr->address, false);
- } else {
- BTA_DmPinReply((uint8_t*)bd_addr->address, false, 0, NULL);
- }
- /* Cancel bonding, in case it is in ACL connection setup state */
- BTA_DmBondCancel((uint8_t*)bd_addr->address);
- btif_storage_remove_bonded_device((bt_bdaddr_t*)bd_addr);
-#endif
}
return BT_STATUS_SUCCESS;
@@ -2436,8 +2381,6 @@
uint8_t pin_len, bt_pin_code_t* pin_code) {
BTIF_TRACE_EVENT("%s: accept=%d", __func__, accept);
if (pin_code == NULL || pin_len > PIN_CODE_LEN) return BT_STATUS_FAIL;
-#if (BLE_INCLUDED == TRUE)
-
if (pairing_cb.is_le_only) {
int i;
uint32_t passkey = 0;
@@ -2454,11 +2397,6 @@
BTA_DmPinReply((uint8_t*)bd_addr->address, accept, pin_len, pin_code->pin);
if (accept) pairing_cb.pin_code_len = pin_len;
}
-#else
- BTA_DmPinReply((uint8_t*)bd_addr->address, accept, pin_len, pin_code->pin);
-
- if (accept) pairing_cb.pin_code_len = pin_len;
-#endif
return BT_STATUS_SUCCESS;
}
@@ -2484,7 +2422,6 @@
}
/* BT_SSP_VARIANT_CONSENT & BT_SSP_VARIANT_PASSKEY_CONFIRMATION supported */
BTIF_TRACE_EVENT("%s: accept=%d", __func__, accept);
-#if (BLE_INCLUDED == TRUE)
if (pairing_cb.is_le_only) {
if (pairing_cb.is_le_nc) {
BTA_DmBleConfirmReply((uint8_t*)bd_addr->address, accept);
@@ -2498,9 +2435,6 @@
} else {
BTA_DmConfirm((uint8_t*)bd_addr->address, accept);
}
-#else
- BTA_DmConfirm((uint8_t*)bd_addr->address, accept);
-#endif
return BT_STATUS_SUCCESS;
}
@@ -2889,7 +2823,6 @@
return result;
}
#endif /* BTIF_DM_OOB_TEST */
-#if (BLE_INCLUDED == TRUE)
static void btif_dm_ble_key_notif_evt(tBTA_DM_SP_KEY_NOTIF* p_ssp_key_notif) {
bt_bdaddr_t bd_addr;
@@ -3295,7 +3228,6 @@
}
return BT_STATUS_SUCCESS;
}
-#endif
void btif_dm_on_disable() {
/* cancel any pending pairing requests */
@@ -3318,9 +3250,7 @@
*
******************************************************************************/
void btif_dm_read_energy_info() {
-#if (BLE_INCLUDED == TRUE)
BTA_DmBleGetEnergyInfo(bta_energy_info_cb);
-#endif
}
static char* btif_get_default_local_name() {
diff --git a/btif/src/btif_gatt.cc b/btif/src/btif_gatt.cc
index 8465d37..e0aa685 100644
--- a/btif/src/btif_gatt.cc
+++ b/btif/src/btif_gatt.cc
@@ -36,8 +36,6 @@
#include "btif_common.h"
#include "btif_util.h"
-#if (BLE_INCLUDED == TRUE)
-
#include "bta_api.h"
#include "bta_gatt_api.h"
#include "btif_gatt.h"
@@ -104,5 +102,3 @@
btgattInterface.advertiser = get_ble_advertiser_instance();
return &btgattInterface;
}
-
-#endif
diff --git a/btif/src/btif_gatt_client.cc b/btif/src/btif_gatt_client.cc
index 3c49656..dda2069 100644
--- a/btif/src/btif_gatt_client.cc
+++ b/btif/src/btif_gatt_client.cc
@@ -39,8 +39,6 @@
#include "btif_common.h"
#include "btif_util.h"
-#if (BLE_INCLUDED == TRUE)
-
#include <hardware/bt_gatt.h>
#include "bta_api.h"
@@ -561,5 +559,3 @@
btif_gattc_conn_parameter_update,
btif_gattc_test_command,
btif_gattc_get_gatt_db};
-
-#endif
diff --git a/btif/src/btif_gatt_server.cc b/btif/src/btif_gatt_server.cc
index 73a81b4..e58a170 100644
--- a/btif/src/btif_gatt_server.cc
+++ b/btif/src/btif_gatt_server.cc
@@ -38,8 +38,6 @@
#include "btif_common.h"
#include "btif_util.h"
-#if (BLE_INCLUDED == TRUE)
-
#include "bt_common.h"
#include "bta_api.h"
#include "bta_gatt_api.h"
@@ -424,4 +422,3 @@
btif_gatts_delete_service, btif_gatts_send_indication,
btif_gatts_send_response};
-#endif
diff --git a/btif/src/btif_gatt_test.cc b/btif/src/btif_gatt_test.cc
index 39f2952..7f330cd 100644
--- a/btif/src/btif_gatt_test.cc
+++ b/btif/src/btif_gatt_test.cc
@@ -29,8 +29,6 @@
#include "btif_common.h"
#include "btif_util.h"
-#if (BLE_INCLUDED == TRUE)
-
#include "bta_gatt_api.h"
#include "bte_appl.h"
#include "btif_dm.h"
@@ -289,5 +287,3 @@
}
return (bt_status_t)0;
}
-
-#endif
diff --git a/btif/src/btif_storage.cc b/btif/src/btif_storage.cc
index 6aee1e4..941b127 100644
--- a/btif/src/btif_storage.cc
+++ b/btif/src/btif_storage.cc
@@ -392,19 +392,12 @@
bt_linkkey_file_found = false;
}
}
-#if (BLE_INCLUDED == TRUE)
if ((btif_in_fetch_bonded_ble_device(bdstr, false, NULL) !=
BT_STATUS_SUCCESS) &&
(!bt_linkkey_file_found)) {
BTIF_TRACE_DEBUG("Remote device:%s, no link key or ble key found", bdstr);
return BT_STATUS_FAIL;
}
-#else
- if ((!bt_linkkey_file_found)) {
- BTIF_TRACE_DEBUG("Remote device:%s, no link key found", bdstr);
- return BT_STATUS_FAIL;
- }
-#endif
return BT_STATUS_SUCCESS;
}
@@ -449,34 +442,22 @@
BTA_DmAddDevice(bd_addr.address, dev_class, link_key, 0, 0,
(uint8_t)linkkey_type, 0, pin_length);
-#if (BLE_INCLUDED == TRUE)
if (btif_config_get_int(name, "DevType", &device_type) &&
(device_type == BT_DEVICE_TYPE_DUMO)) {
btif_gatts_add_bonded_dev_from_nv(bd_addr.address);
}
-#endif
}
bt_linkkey_file_found = true;
memcpy(&p_bonded_devices->devices[p_bonded_devices->num_devices++],
&bd_addr, sizeof(bt_bdaddr_t));
} else {
-#if (BLE_INCLUDED == TRUE)
bt_linkkey_file_found = false;
-#else
- BTIF_TRACE_ERROR(
- "bounded device:%s, LinkKeyType or PinLength is invalid", name);
-#endif
}
}
-#if (BLE_INCLUDED == TRUE)
if (!btif_in_fetch_bonded_ble_device(name, add, p_bonded_devices) &&
!bt_linkkey_file_found) {
BTIF_TRACE_DEBUG("Remote device:%s, no link key or ble key found", name);
}
-#else
- if (!bt_linkkey_file_found)
- BTIF_TRACE_DEBUG("Remote device:%s, no link key", name);
-#endif
}
return BT_STATUS_SUCCESS;
}
@@ -770,9 +751,7 @@
bdaddr_to_string(remote_bd_addr, bdstr, sizeof(bdstr));
BTIF_TRACE_DEBUG("in bd addr:%s", bdstr);
-#if (BLE_INCLUDED == TRUE)
btif_storage_remove_ble_bonding_keys(remote_bd_addr);
-#endif
int ret = 1;
if (btif_config_exist(bdstr, "LinkKeyType"))
@@ -915,8 +894,6 @@
return BT_STATUS_SUCCESS;
}
-#if (BLE_INCLUDED == TRUE)
-
/*******************************************************************************
*
* Function btif_storage_add_ble_bonding_key
@@ -1211,7 +1188,6 @@
int ret = btif_config_get_int(bdstr, "AddrType", addr_type);
return ret ? BT_STATUS_SUCCESS : BT_STATUS_FAIL;
}
-#endif
/*******************************************************************************
*
* Function btif_storage_add_hid_device_info
diff --git a/device/src/controller.cc b/device/src/controller.cc
index 0304593..edb6060 100644
--- a/device/src/controller.cc
+++ b/device/src/controller.cc
@@ -33,11 +33,7 @@
const bt_event_mask_t BLE_EVENT_MASK = {
{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x7f}};
-#if (BLE_INCLUDED)
const bt_event_mask_t CLASSIC_EVENT_MASK = {HCI_DUMO_EVENT_MASK_EXT};
-#else
-const bt_event_mask_t CLASSIC_EVENT_MASK = {HCI_LISBON_EVENT_MASK_EXT};
-#endif
// TODO(zachoverflow): factor out into common module
const uint8_t SCO_HOST_BUFFER_SIZE = 0xff;
@@ -140,7 +136,6 @@
packet_parser->parse_generic_command_complete(response);
}
-#if (BLE_INCLUDED == TRUE)
if (HCI_LE_SPT_SUPPORTED(features_classic[0].as_array)) {
uint8_t simultaneous_le_host =
HCI_SIMUL_LE_BREDR_SUPPORTED(features_classic[0].as_array)
@@ -155,7 +150,6 @@
if (last_features_classic_page_index < 1)
last_features_classic_page_index = 1;
}
-#endif
// Done telling the controller about what page 0 features we support
// Request the remaining feature pages
@@ -181,7 +175,6 @@
}
#endif
-#if (BLE_INCLUDED == TRUE)
ble_supported = last_features_classic_page_index >= 1 &&
HCI_LE_HOST_SUPPORTED(features_classic[1].as_array);
if (ble_supported) {
@@ -228,7 +221,6 @@
AWAIT_COMMAND(packet_factory->make_ble_set_event_mask(&BLE_EVENT_MASK));
packet_parser->parse_generic_command_complete(response);
}
-#endif
if (simple_pairing_supported) {
response =
diff --git a/include/bt_target.h b/include/bt_target.h
index 4b2edb5..8f6ee4b 100644
--- a/include/bt_target.h
+++ b/include/bt_target.h
@@ -669,10 +669,6 @@
*
*****************************************************************************/
-#ifndef BLE_INCLUDED
-#define BLE_INCLUDED TRUE
-#endif
-
#ifndef BLE_ANDROID_CONTROLLER_SCAN_FILTER
#define BLE_ANDROID_CONTROLLER_SCAN_FILTER TRUE
#endif
@@ -721,15 +717,7 @@
*
*****************************************************************************/
#ifndef BTA_GATT_INCLUDED
-#if BLE_INCLUDED == TRUE
#define BTA_GATT_INCLUDED TRUE
-#else
-#define BTA_GATT_INCLUDED FALSE
-#endif
-#endif
-
-#if BTA_GATT_INCLUDED == TRUE && BLE_INCLUDED == FALSE
-#error "can't have GATT without BLE"
#endif
#ifndef BLE_LLT_INCLUDED
@@ -788,15 +776,7 @@
*
*****************************************************************************/
#ifndef SMP_INCLUDED
-#if (BLE_INCLUDED == TRUE)
#define SMP_INCLUDED TRUE
-#else
-#define SMP_INCLUDED FALSE
-#endif
-#endif
-
-#if (SMP_INCLUDED == TRUE && BLE_INCLUDED == FALSE)
-#error "can't have SMP without BLE"
#endif
#ifndef SMP_DEBUG
diff --git a/include/bte_appl.h b/include/bte_appl.h
index e872f33..0dd2ad1 100644
--- a/include/bte_appl.h
+++ b/include/bte_appl.h
@@ -29,7 +29,7 @@
#endif
typedef struct {
-#if (BLE_INCLUDED == TRUE && SMP_INCLUDED == TRUE)
+#if (SMP_INCLUDED == TRUE)
uint8_t ble_auth_req;
uint8_t ble_io_cap;
uint8_t ble_init_key;
diff --git a/main/bte_init.cc b/main/bte_init.cc
index 751acaa..63b2201 100644
--- a/main/bte_init.cc
+++ b/main/bte_init.cc
@@ -59,12 +59,10 @@
#include "mca_api.h"
#endif
-#if (BLE_INCLUDED == TRUE)
#include "gatt_api.h"
#if (SMP_INCLUDED == TRUE)
#include "smp_api.h"
#endif
-#endif
/*****************************************************************************
** F U N C T I O N S *
diff --git a/main/bte_logmsg.cc b/main/bte_logmsg.cc
index c23d0cf..32c99d3 100644
--- a/main/bte_logmsg.cc
+++ b/main/bte_logmsg.cc
@@ -54,10 +54,8 @@
#if (PAN_INCLUDED == TRUE)
#include "pan_api.h"
#endif
-#if (BLE_INCLUDED == TRUE)
#include "gatt_api.h"
#include "smp_api.h"
-#endif
#ifndef DEFAULT_CONF_TRACE_LEVEL
#define DEFAULT_CONF_TRACE_LEVEL BT_TRACE_LEVEL_WARNING
@@ -151,10 +149,8 @@
{BTTRC_ID_STK_PAN, BTTRC_ID_STK_PAN, PAN_SetTraceLevel, "TRC_PAN", DEFAULT_CONF_TRACE_LEVEL},
#endif
{BTTRC_ID_STK_SDP, BTTRC_ID_STK_SDP, SDP_SetTraceLevel, "TRC_SDP", DEFAULT_CONF_TRACE_LEVEL},
-#if (BLE_INCLUDED == TRUE)
{BTTRC_ID_STK_GATT, BTTRC_ID_STK_GATT, GATT_SetTraceLevel, "TRC_GATT", DEFAULT_CONF_TRACE_LEVEL},
{BTTRC_ID_STK_SMP, BTTRC_ID_STK_SMP, SMP_SetTraceLevel, "TRC_SMP", DEFAULT_CONF_TRACE_LEVEL},
-#endif
/* LayerIDs for BTA, currently everything maps onto appl_trace_level.
*/
diff --git a/stack/btm/btm_acl.cc b/stack/btm/btm_acl.cc
index 40ba530..99208e5 100644
--- a/stack/btm/btm_acl.cc
+++ b/stack/btm/btm_acl.cc
@@ -97,11 +97,8 @@
{
for (xx = 0; xx < MAX_L2CAP_LINKS; xx++, p++)
{
- if ((p->in_use) && (!memcmp (p->remote_addr, bda, BD_ADDR_LEN))
-#if (BLE_INCLUDED == TRUE)
- && p->transport == transport
-#endif
- )
+ if ((p->in_use) && (!memcmp (p->remote_addr, bda, BD_ADDR_LEN)) &&
+ p->transport == transport)
{
BTM_TRACE_DEBUG ("btm_bda_to_acl found");
return(p);
@@ -150,7 +147,6 @@
** Returns success return true, otherwise false.
**
*******************************************************************************/
-#if (BLE_INCLUDED == TRUE)
bool btm_ble_get_acl_remote_addr(tBTM_SEC_DEV_REC *p_dev_rec, BD_ADDR conn_addr,
tBLE_ADDR_TYPE *p_addr_type)
{
@@ -187,14 +183,6 @@
return st;
}
-#else
-bool btm_ble_get_acl_remote_addr(UNUSED_ATTR tBTM_SEC_DEV_REC *p_dev_rec,
- UNUSED_ATTR BD_ADDR conn_addr,
- UNUSED_ATTR tBLE_ADDR_TYPE *p_addr_type)
-{
- return false;
-}
-#endif
#endif
/*******************************************************************************
**
@@ -221,9 +209,7 @@
{
p->hci_handle = hci_handle;
p->link_role = link_role;
-#if (BLE_INCLUDED == TRUE)
p->transport = transport;
-#endif
BTM_TRACE_DEBUG ("Duplicate btm_acl_created: RemBdAddr: %02x%02x%02x%02x%02x%02x",
bda[0], bda[1], bda[2], bda[3], bda[4], bda[5]);
BTM_SetLinkPolicy(p->remote_addr, &btm_cb.btm_def_link_policy);
@@ -241,7 +227,6 @@
p->link_up_issued = false;
memcpy (p->remote_addr, bda, BD_ADDR_LEN);
-#if (BLE_INCLUDED == TRUE)
p->transport = transport;
#if (BLE_PRIVACY_SPT == TRUE)
if (transport == BT_TRANSPORT_LE)
@@ -252,7 +237,6 @@
memcpy(p->conn_addr, &controller_get_interface()->get_address()->address, BD_ADDR_LEN);
#endif
-#endif
p->switch_role_state = BTM_ACL_SWKEY_STATE_IDLE;
btm_pm_sm_alloc(xx);
@@ -272,12 +256,10 @@
}
p_dev_rec = btm_find_dev_by_handle (hci_handle);
-#if (BLE_INCLUDED == TRUE)
if (p_dev_rec )
{
BTM_TRACE_DEBUG ("device_type=0x%x", p_dev_rec->device_type);
}
-#endif
if (p_dev_rec && !(transport == BT_TRANSPORT_LE))
{
@@ -305,7 +287,6 @@
}
}
-#if (BLE_INCLUDED == TRUE)
/* If here, features are not known yet */
if (p_dev_rec && transport == BT_TRANSPORT_LE)
{
@@ -325,7 +306,6 @@
}
}
else
-#endif
{
btm_read_remote_features (p->hci_handle);
}
@@ -383,9 +363,7 @@
{
tACL_CONN *p;
tBTM_BL_EVENT_DATA evt_data;
-#if (BLE_INCLUDED == TRUE)
tBTM_SEC_DEV_REC *p_dev_rec=NULL;
-#endif
BTM_TRACE_DEBUG ("btm_acl_removed");
p = btm_bda_to_acl(bda, transport);
if (p != (tACL_CONN *)NULL)
@@ -405,18 +383,14 @@
{
evt_data.event = BTM_BL_DISCN_EVT;
evt_data.discn.p_bda = bda;
-#if (BLE_INCLUDED == TRUE)
evt_data.discn.handle = p->hci_handle;
evt_data.discn.transport = p->transport;
-#endif
(*btm_cb.p_bl_changed_cb)(&evt_data);
}
btm_acl_update_busy_level (BTM_BLI_ACL_DOWN_EVT);
}
-#if (BLE_INCLUDED == TRUE)
-
BTM_TRACE_DEBUG ("acl hci_handle=%d transport=%d connectable_mode=0x%0x link_role=%d",
p->hci_handle,
p->transport,
@@ -454,7 +428,6 @@
BTM_TRACE_ERROR("Device not found");
}
-#endif
/* Clear the ACL connection data */
memset(p, 0, sizeof(tACL_CONN));
@@ -956,12 +929,10 @@
STREAM_TO_UINT16 (p_acl_cb->lmp_subversion, p);
}
-#if (BLE_INCLUDED == TRUE)
if (p_acl_cb->transport == BT_TRANSPORT_LE) {
l2cble_notify_le_connection (p_acl_cb->remote_addr);
btm_use_preferred_conn_params(p_acl_cb->remote_addr);
}
-#endif // (defined(BLE_INCLUDED) && (BLE_INCLUDED == true))
break;
}
}
@@ -1241,9 +1212,7 @@
tBTM_BL_EVENT_DATA evt_data;
BTM_TRACE_DEBUG ("btm_establish_continue");
#if (BTM_BYPASS_EXTRA_ACL_SETUP == FALSE)
-#if (BLE_INCLUDED == TRUE)
if (p_acl_cb->transport == BT_TRANSPORT_BR_EDR)
-#endif
{
/* For now there are a some devices that do not like sending */
/* commands events and data at the same time. */
@@ -1264,10 +1233,8 @@
evt_data.conn.p_bdn = p_acl_cb->remote_name;
evt_data.conn.p_dc = p_acl_cb->remote_dc;
evt_data.conn.p_features = p_acl_cb->peer_lmp_features[HCI_EXT_FEATURES_PAGE_0];
-#if (BLE_INCLUDED == TRUE)
evt_data.conn.handle = p_acl_cb->hci_handle;
evt_data.conn.transport = p_acl_cb->transport;
-#endif
(*btm_cb.p_bl_changed_cb)(&evt_data);
}
@@ -1989,10 +1956,8 @@
{
tACL_CONN *p;
tBT_TRANSPORT transport = BT_TRANSPORT_BR_EDR;
-#if (BLE_INCLUDED == TRUE)
tBT_DEVICE_TYPE dev_type;
tBLE_ADDR_TYPE addr_type;
-#endif
BTM_TRACE_API ("BTM_ReadRSSI: RemBdAddr: %02x%02x%02x%02x%02x%02x",
remote_bda[0], remote_bda[1], remote_bda[2],
remote_bda[3], remote_bda[4], remote_bda[5]);
@@ -2001,11 +1966,9 @@
if (btm_cb.devcb.p_rssi_cmpl_cb)
return(BTM_BUSY);
-#if (BLE_INCLUDED == TRUE)
BTM_ReadDevInfo(remote_bda, &dev_type, &addr_type);
if (dev_type == BT_DEVICE_TYPE_BLE)
transport = BT_TRANSPORT_LE;
-#endif
p = btm_bda_to_acl(remote_bda, transport);
if (p != (tACL_CONN *)NULL)
@@ -2098,14 +2061,12 @@
btm_read_tx_power_timeout, NULL,
btu_general_alarm_queue);
-#if (BLE_INCLUDED == TRUE)
if (p->transport == BT_TRANSPORT_LE)
{
memcpy(btm_cb.devcb.read_tx_pwr_addr, remote_bda, BD_ADDR_LEN);
btsnd_hcic_ble_read_adv_chnl_tx_power();
}
else
-#endif
{
btsnd_hcic_read_tx_power(p->hci_handle, BTM_READ_RSSI_TYPE_CUR);
}
@@ -2180,13 +2141,11 @@
}
}
}
-#if (BLE_INCLUDED == TRUE)
else
{
STREAM_TO_UINT8 (results.tx_power, p);
memcpy(results.rem_bda, btm_cb.devcb.read_tx_pwr_addr, BD_ADDR_LEN);
}
-#endif
BTM_TRACE_DEBUG ("BTM TX power Complete: tx_power %d, hci status 0x%02x",
results.tx_power, results.hci_status);
}
@@ -2567,11 +2526,8 @@
evt_data.event = BTM_BL_COLLISION_EVT;
evt_data.conn.p_bda = bda;
-
-#if (BLE_INCLUDED == TRUE)
evt_data.conn.transport = BT_TRANSPORT_BR_EDR;
evt_data.conn.handle = BTM_INVALID_HCI_HANDLE;
-#endif
(*btm_cb.p_bl_changed_cb)(&evt_data);
return true;
}
diff --git a/stack/btm/btm_ble.cc b/stack/btm/btm_ble.cc
index f0a2657..ebc49b1 100644
--- a/stack/btm/btm_ble.cc
+++ b/stack/btm/btm_ble.cc
@@ -27,8 +27,6 @@
#include "bt_target.h"
-#if (BLE_INCLUDED == TRUE)
-
#include <string.h>
#include "bt_types.h"
@@ -291,7 +289,6 @@
*******************************************************************************/
bool BTM_IsBleConnection (uint16_t conn_handle)
{
-#if (BLE_INCLUDED == TRUE)
uint8_t xx;
tACL_CONN *p;
@@ -304,9 +301,6 @@
p = &btm_cb.acl_db[xx];
return (p->transport == BT_TRANSPORT_LE);
-#else
- return false;
-#endif
}
/*******************************************************************************
@@ -2276,15 +2270,13 @@
*******************************************************************************/
bool BTM_GetLeSecurityState (BD_ADDR bd_addr, uint8_t *p_le_dev_sec_flags, uint8_t *p_le_key_size)
{
-#if (BLE_INCLUDED == TRUE)
tBTM_SEC_DEV_REC *p_dev_rec;
uint16_t dev_rec_sec_flags;
-#endif
*p_le_dev_sec_flags = 0;
*p_le_key_size = 0;
-#if (BLE_INCLUDED == TRUE && SMP_INCLUDED == TRUE)
+#if (SMP_INCLUDED == TRUE)
if ((p_dev_rec = btm_find_dev (bd_addr)) == NULL)
{
BTM_TRACE_ERROR ("%s fails", __func__);
@@ -2339,7 +2331,6 @@
*******************************************************************************/
bool BTM_BleSecurityProcedureIsRunning(BD_ADDR bd_addr)
{
-#if (BLE_INCLUDED == TRUE)
tBTM_SEC_DEV_REC *p_dev_rec = btm_find_dev (bd_addr);
if (p_dev_rec == NULL)
@@ -2352,9 +2343,6 @@
return (p_dev_rec->sec_state == BTM_SEC_STATE_ENCRYPTING ||
p_dev_rec->sec_state == BTM_SEC_STATE_AUTHENTICATING);
-#else
- return false;
-#endif
}
/*******************************************************************************
@@ -2370,7 +2358,7 @@
*******************************************************************************/
extern uint8_t BTM_BleGetSupportedKeySize (BD_ADDR bd_addr)
{
-#if (BLE_INCLUDED == TRUE && L2CAP_LE_COC_INCLUDED == TRUE)
+#if (L2CAP_LE_COC_INCLUDED == TRUE)
tBTM_SEC_DEV_REC *p_dev_rec = btm_find_dev (bd_addr);
tBTM_LE_IO_REQ dev_io_cfg;
uint8_t callback_rc;
@@ -2751,5 +2739,3 @@
}
#endif /* BTM_BLE_CONFORMANCE_TESTING */
-
-#endif /* BLE_INCLUDED */
diff --git a/stack/btm/btm_ble_addr.cc b/stack/btm/btm_ble_addr.cc
index 93a1b03..3401f5f 100644
--- a/stack/btm/btm_ble_addr.cc
+++ b/stack/btm/btm_ble_addr.cc
@@ -31,7 +31,6 @@
#include "gap_api.h"
#include "device/include/controller.h"
-#if (BLE_INCLUDED == TRUE)
#include "btm_ble_int.h"
#include "smp_api.h"
@@ -91,7 +90,7 @@
*******************************************************************************/
void btm_gen_resolve_paddr_low(tBTM_RAND_ENC *p)
{
-#if (BLE_INCLUDED == TRUE && SMP_INCLUDED == TRUE)
+#if (SMP_INCLUDED == TRUE)
tBTM_LE_RANDOM_CB *p_cb = &btm_cb.ble_ctr_cb.addr_mgnt_cb;
tSMP_ENC output;
@@ -312,7 +311,7 @@
*******************************************************************************/
static bool btm_ble_match_random_bda(void *data, void *context)
{
-#if (BLE_INCLUDED == TRUE && SMP_INCLUDED == TRUE)
+#if (SMP_INCLUDED == TRUE)
/* use the 3 MSB of bd address as prand */
tBTM_LE_RANDOM_CB *p_mgnt_cb = &btm_cb.ble_ctr_cb.addr_mgnt_cb;
@@ -578,6 +577,5 @@
}
#endif
}
-#endif
diff --git a/stack/btm/btm_ble_adv_filter.cc b/stack/btm/btm_ble_adv_filter.cc
index 9a23865..e637c35 100644
--- a/stack/btm/btm_ble_adv_filter.cc
+++ b/stack/btm/btm_ble_adv_filter.cc
@@ -22,8 +22,6 @@
#include "bt_target.h"
-#if (BLE_INCLUDED == TRUE)
-
#include "bt_types.h"
#include "bt_utils.h"
#include "btm_ble_api.h"
@@ -1280,5 +1278,3 @@
{
osi_free_and_reset((void **)&btm_ble_adv_filt_cb.p_addr_filter_count);
}
-
-#endif
diff --git a/stack/btm/btm_ble_batchscan.cc b/stack/btm/btm_ble_batchscan.cc
index c61e781..ce3b632 100644
--- a/stack/btm/btm_ble_batchscan.cc
+++ b/stack/btm/btm_ble_batchscan.cc
@@ -28,8 +28,6 @@
#include "device/include/controller.h"
#include "hcimsgs.h"
-#if (BLE_INCLUDED == TRUE)
-
tBTM_BLE_BATCH_SCAN_CB ble_batchscan_cb;
tBTM_BLE_ADV_TRACK_CB ble_advtrack_cb;
@@ -893,4 +891,3 @@
memset(&ble_advtrack_cb, 0, sizeof(tBTM_BLE_ADV_TRACK_CB));
}
-#endif
diff --git a/stack/btm/btm_ble_bgconn.cc b/stack/btm/btm_ble_bgconn.cc
index 7e573c4..3a4d24f 100644
--- a/stack/btm/btm_ble_bgconn.cc
+++ b/stack/btm/btm_ble_bgconn.cc
@@ -40,8 +40,6 @@
#define BTM_BLE_SCAN_PARAM_TOUT 50 /* 50 seconds */
#endif
-#if (BLE_INCLUDED == TRUE)
-
static void btm_suspend_wl_activity(tBTM_BLE_WL_STATE wl_state);
static void btm_resume_wl_activity(tBTM_BLE_WL_STATE wl_state);
@@ -735,7 +733,3 @@
return rt;
}
-
-#endif
-
-
diff --git a/stack/btm/btm_ble_cont_energy.cc b/stack/btm/btm_ble_cont_energy.cc
index 99bbf1f..77873b8 100644
--- a/stack/btm/btm_ble_cont_energy.cc
+++ b/stack/btm/btm_ble_cont_energy.cc
@@ -19,7 +19,6 @@
#include <string.h>
#include "bt_target.h"
-#if (BLE_INCLUDED == TRUE)
#include "bt_types.h"
#include "hcimsgs.h"
#include "btu.h"
@@ -100,6 +99,3 @@
btm_ble_cont_energy_cmpl_cback);
return BTM_CMD_STARTED;
}
-
-#endif
-
diff --git a/stack/btm/btm_ble_gap.cc b/stack/btm/btm_ble_gap.cc
index 5c8c622..743d53b 100644
--- a/stack/btm/btm_ble_gap.cc
+++ b/stack/btm/btm_ble_gap.cc
@@ -38,8 +38,6 @@
#include "hcimsgs.h"
#include "osi/include/osi.h"
-#if (BLE_INCLUDED == TRUE)
-
#include "btm_ble_int.h"
#include "gatt_int.h"
#include "gattdefs.h"
@@ -2880,5 +2878,3 @@
}
return rt;
}
-
-#endif /* BLE_INCLUDED */
diff --git a/stack/btm/btm_ble_int.h b/stack/btm/btm_ble_int.h
index 03b263f..26601a4 100644
--- a/stack/btm/btm_ble_int.h
+++ b/stack/btm/btm_ble_int.h
@@ -32,7 +32,7 @@
#include "btm_ble_api.h"
#include "btm_int.h"
-#if (BLE_INCLUDED == TRUE && SMP_INCLUDED == TRUE)
+#if (SMP_INCLUDED == TRUE)
#include "smp_api.h"
#endif
diff --git a/stack/btm/btm_ble_multi_adv.cc b/stack/btm/btm_ble_multi_adv.cc
index be12ba0..8e4570b 100644
--- a/stack/btm/btm_ble_multi_adv.cc
+++ b/stack/btm/btm_ble_multi_adv.cc
@@ -27,7 +27,6 @@
#include "device/include/controller.h"
#include "osi/include/alarm.h"
-#if (BLE_INCLUDED == TRUE)
#include "ble_advertiser.h"
#include "ble_advertiser_hci_interface.h"
#include "btm_int_types.h"
@@ -488,5 +487,3 @@
BleAdvertisingManager::CleanUp();
BleAdvertiserHciInterface::CleanUp();
}
-
-#endif
diff --git a/stack/btm/btm_ble_privacy.cc b/stack/btm/btm_ble_privacy.cc
index a9a5c16..4638394 100644
--- a/stack/btm/btm_ble_privacy.cc
+++ b/stack/btm/btm_ble_privacy.cc
@@ -24,7 +24,7 @@
#include <string.h>
#include "bt_target.h"
-#if (BLE_INCLUDED == TRUE && BLE_PRIVACY_SPT == TRUE)
+#if (BLE_PRIVACY_SPT == TRUE)
#include "bt_types.h"
#include "hcimsgs.h"
#include "btu.h"
diff --git a/stack/btm/btm_dev.cc b/stack/btm/btm_dev.cc
index bb27685..f4918a6 100644
--- a/stack/btm/btm_dev.cc
+++ b/stack/btm/btm_dev.cc
@@ -71,11 +71,9 @@
memcpy (p_dev_rec->bd_addr, bd_addr, BD_ADDR_LEN);
p_dev_rec->hci_handle = BTM_GetHCIConnHandle (bd_addr, BT_TRANSPORT_BR_EDR);
-#if (BLE_INCLUDED == TRUE)
/* use default value for background connection params */
/* update conn params, use default value for background connection params */
memset(&p_dev_rec->conn_params, 0xff, sizeof(tBTM_LE_CONN_PRAMS));
-#endif
} else {
/* "Bump" timestamp for existing record */
p_dev_rec->timestamp = btm_cb.dev_rec_count++;
@@ -262,24 +260,18 @@
{
memcpy (p_dev_rec->dev_class, p_inq_info->results.dev_class, DEV_CLASS_LEN);
-#if (BLE_INCLUDED == TRUE)
p_dev_rec->device_type = p_inq_info->results.device_type;
p_dev_rec->ble.ble_addr_type = p_inq_info->results.ble_addr_type;
-#endif
}
else if (!memcmp (bd_addr, btm_cb.connecting_bda, BD_ADDR_LEN))
memcpy (p_dev_rec->dev_class, btm_cb.connecting_dc, DEV_CLASS_LEN);
-#if (BLE_INCLUDED == TRUE)
/* update conn params, use default value for background connection params */
memset(&p_dev_rec->conn_params, 0xff, sizeof(tBTM_LE_CONN_PRAMS));
-#endif
memcpy (p_dev_rec->bd_addr, bd_addr, BD_ADDR_LEN);
-#if (BLE_INCLUDED == TRUE)
p_dev_rec->ble_hci_handle = BTM_GetHCIConnHandle (bd_addr, BT_TRANSPORT_LE);
-#endif
p_dev_rec->hci_handle = BTM_GetHCIConnHandle (bd_addr, BT_TRANSPORT_BR_EDR);
return(p_dev_rec);
@@ -295,10 +287,8 @@
*******************************************************************************/
void btm_sec_free_dev (tBTM_SEC_DEV_REC *p_dev_rec)
{
-#if (BLE_INCLUDED == TRUE)
/* Clear out any saved BLE keys */
btm_sec_clear_ble_keys (p_dev_rec);
-#endif
list_remove(btm_cb.sec_dev_rec, p_dev_rec);
}
@@ -361,11 +351,8 @@
tBTM_SEC_DEV_REC *p_dev_rec = static_cast<tBTM_SEC_DEV_REC *>(data);
uint16_t *handle = static_cast<uint16_t *>(context);
- if (p_dev_rec->hci_handle == *handle
-#if (BLE_INCLUDED == TRUE)
- || p_dev_rec->ble_hci_handle == *handle
-#endif
- )
+ if (p_dev_rec->hci_handle == *handle ||
+ p_dev_rec->ble_hci_handle == *handle)
return false;
return true;
@@ -397,14 +384,12 @@
if (!memcmp (p_dev_rec->bd_addr, *bd_addr, BD_ADDR_LEN))
return false;
-#if (BLE_INCLUDED == TRUE)
// If a LE random address is looking for device record
if (!memcmp(p_dev_rec->ble.pseudo_addr, *bd_addr, BD_ADDR_LEN))
return false;
if (btm_ble_addr_resolvable(*bd_addr, p_dev_rec))
return false;
-#endif
return true;
}
@@ -441,7 +426,6 @@
*******************************************************************************/
void btm_consolidate_dev(tBTM_SEC_DEV_REC *p_target_rec)
{
-#if (BLE_INCLUDED == TRUE)
tBTM_SEC_DEV_REC temp_rec = *p_target_rec;
BTM_TRACE_DEBUG("%s", __func__);
@@ -487,7 +471,6 @@
break;
}
}
-#endif
}
/*******************************************************************************
diff --git a/stack/btm/btm_devctl.cc b/stack/btm/btm_devctl.cc
index d3aaeb1..b77d005 100644
--- a/stack/btm/btm_devctl.cc
+++ b/stack/btm/btm_devctl.cc
@@ -41,9 +41,7 @@
#include "osi/include/osi.h"
#include "osi/include/thread.h"
-#if (BLE_INCLUDED == TRUE)
#include "gatt_int.h"
-#endif /* BLE_INCLUDED */
extern fixed_queue_t *btu_general_alarm_queue;
extern thread_t *bt_workqueue_thread;
@@ -168,17 +166,14 @@
btm_cb.btm_inq_vars.page_scan_period = HCI_DEF_PAGESCAN_INTERVAL;
btm_cb.btm_inq_vars.page_scan_type = HCI_DEF_SCAN_TYPE;
-#if (BLE_INCLUDED == TRUE)
btm_cb.ble_ctr_cb.conn_state = BLE_CONN_IDLE;
btm_cb.ble_ctr_cb.bg_conn_type = BTM_BLE_CONN_NONE;
btm_cb.ble_ctr_cb.p_select_cback = NULL;
gatt_reset_bgdev_list();
-#endif
btm_pm_reset();
l2c_link_processs_num_bufs(controller->get_acl_buffer_count_classic());
-#if (BLE_INCLUDED == TRUE)
#if (BLE_PRIVACY_SPT == TRUE)
/* Set up the BLE privacy settings */
@@ -194,7 +189,6 @@
btm_ble_white_list_init(controller->get_ble_white_list_size());
l2c_link_processs_ble_num_bufs(controller->get_acl_buffer_count_ble());
}
-#endif
BTM_SetPinType (btm_cb.cfg.pin_type, btm_cb.cfg.pin_code, btm_cb.cfg.pin_code_len);
diff --git a/stack/btm/btm_inq.cc b/stack/btm/btm_inq.cc
index e52b62f..89c8479 100644
--- a/stack/btm/btm_inq.cc
+++ b/stack/btm/btm_inq.cc
@@ -172,7 +172,6 @@
bool cod_limited;
BTM_TRACE_API ("BTM_SetDiscoverability");
-#if (BLE_INCLUDED == TRUE && BLE_INCLUDED == TRUE)
if (controller_get_interface()->supports_ble())
{
if (btm_ble_set_discoverability((uint16_t)(inq_mode))
@@ -183,7 +182,6 @@
}
}
inq_mode &= ~BTM_BLE_DISCOVERABLE_MASK;
-#endif
/*** Check mode parameter ***/
if (inq_mode > BTM_MAX_DISCOVERABLE)
@@ -583,7 +581,6 @@
BTM_TRACE_API ("BTM_SetConnectability");
-#if (BLE_INCLUDED == TRUE && BLE_INCLUDED == TRUE)
if (controller_get_interface()->supports_ble())
{
if (btm_ble_set_connectability(page_mode) != BTM_SUCCESS)
@@ -594,7 +591,6 @@
p_inq->connectable_mode |= (page_mode & BTM_BLE_CONNECTABLE_MASK);
}
page_mode &= ~BTM_BLE_CONNECTABLE_MASK;
-#endif
/*** Check mode parameter ***/
if (page_mode != BTM_NON_CONNECTABLE && page_mode != BTM_CONNECTABLE)
@@ -748,14 +744,12 @@
{
btsnd_hcic_inq_cancel();
}
-#if (BLE_INCLUDED == TRUE)
if (((p_inq->inqparms.mode & BTM_BLE_INQUIRY_MASK) != 0)
#if (BTA_HOST_INTERLEAVE_SEARCH == TRUE)
&&(active_mode & BTM_BLE_INQ_ACTIVE_MASK)
#endif
)
btm_ble_stop_inquiry();
-#endif
}
/* Do not send the BUSY_LEVEL event yet. Wait for the cancel_complete event
@@ -814,7 +808,6 @@
Also do not allow an inquiry if the inquiry filter is being updated */
if (p_inq->inq_active || p_inq->inqfilt_active)
{
-#if (BLE_INCLUDED == TRUE)
/*check if LE observe is already running*/
if(p_inq->scan_type==INQ_LE_OBSERVE && p_inq->p_inq_ble_results_cb!=NULL)
{
@@ -825,7 +818,6 @@
btsnd_hcic_ble_set_scan_enable (BTM_BLE_SCAN_DISABLE, BTM_BLE_DUPLICATE_ENABLE);
}
else
-#endif
{
return (BTM_BUSY);
BTM_TRACE_API("BTM_StartInquiry: return BUSY");
@@ -839,12 +831,9 @@
return (BTM_WRONG_MODE);
if ((p_inqparms->mode & BTM_BR_INQUIRY_MASK)!= BTM_GENERAL_INQUIRY &&
- (p_inqparms->mode & BTM_BR_INQUIRY_MASK)!= BTM_LIMITED_INQUIRY
-#if (BLE_INCLUDED == TRUE)
- && (p_inqparms->mode & BTM_BLE_INQUIRY_MASK)!= BTM_BLE_GENERAL_INQUIRY
- && (p_inqparms->mode & BTM_BLE_INQUIRY_MASK)!= BTM_BLE_LIMITED_INQUIRY
-#endif
- )
+ (p_inqparms->mode & BTM_BR_INQUIRY_MASK)!= BTM_LIMITED_INQUIRY &&
+ (p_inqparms->mode & BTM_BLE_INQUIRY_MASK)!= BTM_BLE_GENERAL_INQUIRY &&
+ (p_inqparms->mode & BTM_BLE_INQUIRY_MASK)!= BTM_BLE_LIMITED_INQUIRY)
return (BTM_ILLEGAL_VALUE);
#if (BTA_HOST_INTERLEAVE_SEARCH == TRUE)
@@ -852,7 +841,6 @@
return BTM_ILLEGAL_VALUE;
#endif
-
/* Save the inquiry parameters to be used upon the completion of setting/clearing the inquiry filter */
p_inq->inqparms = *p_inqparms;
@@ -866,7 +854,7 @@
BTM_TRACE_DEBUG("BTM_StartInquiry: p_inq->inq_active = 0x%02x", p_inq->inq_active);
/* interleave scan minimal conditions */
-#if (BLE_INCLUDED == TRUE && BTA_HOST_INTERLEAVE_SEARCH == TRUE)
+#if (BTA_HOST_INTERLEAVE_SEARCH == TRUE)
/* check if both modes are present */
if((p_inqparms->mode & BTM_BLE_INQUIRY_MASK) && (p_inqparms->mode & BTM_BR_INQUIRY_MASK))
@@ -885,7 +873,6 @@
/* start LE inquiry here if requested */
-#if (BLE_INCLUDED == TRUE)
if ((p_inqparms->mode & BTM_BLE_INQUIRY_MASK)
#if (BTA_HOST_INTERLEAVE_SEARCH == TRUE)
&&(p_inq->next_state==BTM_BLE_ONE || p_inq->next_state==BTM_BLE_TWO ||
@@ -937,7 +924,6 @@
BTM_TRACE_DEBUG("BTM_StartInquiry: mode = %02x", p_inqparms->mode);
}
-#endif /* end of BLE_INCLUDED */
/* we're done with this routine if BR/EDR inquiry is not desired. */
if ((p_inqparms->mode & BTM_BR_INQUIRY_MASK) == BTM_INQUIRY_NONE)
@@ -1047,16 +1033,13 @@
}
BTM_TRACE_API ("no device found in inquiry db");
-#if (BLE_INCLUDED == TRUE)
if (transport == BT_TRANSPORT_LE)
{
return btm_ble_read_remote_name(remote_bda, p_cur, p_cb);
}
else
-#endif
-
- return (btm_initiate_rem_name (remote_bda, p_cur, BTM_RMT_NAME_EXT,
- BTM_EXT_RMT_NAME_TIMEOUT_MS, p_cb));
+ return (btm_initiate_rem_name (remote_bda, p_cur, BTM_RMT_NAME_EXT,
+ BTM_EXT_RMT_NAME_TIMEOUT_MS, p_cb));
}
/*******************************************************************************
@@ -1084,7 +1067,6 @@
/* Make sure there is not already one in progress */
if (p_inq->remname_active)
{
-#if (BLE_INCLUDED == TRUE)
if (BTM_UseLeLink(p_inq->remname_bda))
{
if (btm_ble_cancel_remote_name(p_inq->remname_bda))
@@ -1093,7 +1075,6 @@
return (BTM_UNKNOWN_ADDR);
}
else
-#endif
btsnd_hcic_rmt_name_req_cancel(p_inq->remname_bda);
return (BTM_CMD_STARTED);
}
@@ -1325,10 +1306,8 @@
p_inq->page_scan_type = BTM_SCAN_TYPE_STANDARD;
p_inq->inq_scan_type = BTM_SCAN_TYPE_STANDARD;
-#if (BLE_INCLUDED == TRUE)
p_inq->discoverable_mode |= BTM_BLE_NON_DISCOVERABLE;
p_inq->connectable_mode |= BTM_BLE_NON_CONNECTABLE;
-#endif
return;
}
@@ -1876,24 +1855,20 @@
*/
if (p_inq->inqparms.max_resps &&
p_inq->inq_cmpl_info.num_resp >= p_inq->inqparms.max_resps
-#if (BLE_INCLUDED == TRUE)
/* new device response */
&& ( p_i == NULL ||
/* exisiting device with BR/EDR info */
(p_i && (p_i->inq_info.results.device_type & BT_DEVICE_TYPE_BREDR) != 0)
- )
-#endif
-
- )
+ ))
{
-/* BTM_TRACE_WARNING("INQ RES: Extra Response Received...ignoring"); */
+ /* BTM_TRACE_WARNING("INQ RES: Extra Response Received...ignoring"); */
return;
}
/* Check if this address has already been processed for this inquiry */
if (btm_inq_find_bdaddr(bda))
{
-/* BTM_TRACE_DEBUG("BDA seen before [%02x%02x %02x%02x %02x%02x]",
+ /* BTM_TRACE_DEBUG("BDA seen before [%02x%02x %02x%02x %02x%02x]",
bda[0], bda[1], bda[2], bda[3], bda[4], bda[5]);*/
/* By default suppose no update needed */
i_rssi = (int8_t)rssi;
@@ -1901,11 +1876,8 @@
/* If this new RSSI is higher than the last one */
if(p_inq->inqparms.report_dup && (rssi != 0) &&
p_i && (i_rssi > p_i->inq_info.results.rssi || p_i->inq_info.results.rssi == 0
-#if (BLE_INCLUDED == TRUE)
/* BR/EDR inquiry information update */
- || (p_i->inq_info.results.device_type & BT_DEVICE_TYPE_BREDR) != 0
-#endif
- ))
+ || (p_i->inq_info.results.device_type & BT_DEVICE_TYPE_BREDR) != 0))
{
p_cur = &p_i->inq_info.results;
BTM_TRACE_DEBUG("update RSSI new:%d, old:%d", i_rssi, p_cur->rssi);
@@ -1935,11 +1907,8 @@
a previous inquiry. (Ignore it if it is a duplicate response from the same
inquiry.
*/
- else if (p_i->inq_count == p_inq->inq_counter
-#if (BLE_INCLUDED == TRUE)
- && (p_i->inq_info.results.device_type == BT_DEVICE_TYPE_BREDR)
-#endif
- )
+ else if (p_i->inq_count == p_inq->inq_counter &&
+ (p_i->inq_info.results.device_type == BT_DEVICE_TYPE_BREDR))
is_new = false;
/* keep updating RSSI to have latest value */
@@ -1965,7 +1934,6 @@
if (p_i->inq_count != p_inq->inq_counter)
p_inq->inq_cmpl_info.num_resp++; /* A new response was found */
-#if (BLE_INCLUDED == TRUE)
p_cur->inq_result_type = BTM_INQ_RESULT_BR;
if (p_i->inq_count != p_inq->inq_counter)
{
@@ -1974,28 +1942,22 @@
}
else
p_cur->device_type |= BT_DEVICE_TYPE_BREDR;
-#endif
- p_i->inq_count = p_inq->inq_counter; /* Mark entry for current inquiry */
+ p_i->inq_count = p_inq->inq_counter; /* Mark entry for current inquiry */
/* If the number of responses found and not unlimited, issue a cancel inquiry */
if (!(p_inq->inq_active & BTM_PERIODIC_INQUIRY_ACTIVE) &&
p_inq->inqparms.max_resps &&
- p_inq->inq_cmpl_info.num_resp == p_inq->inqparms.max_resps
-#if (BLE_INCLUDED == TRUE)
+ p_inq->inq_cmpl_info.num_resp == p_inq->inqparms.max_resps &&
/* BLE scanning is active and received adv */
- && ((((p_inq->inqparms.mode & BTM_BLE_INQUIRY_MASK) != 0) &&
- p_cur->device_type == BT_DEVICE_TYPE_DUMO && p_i->scan_rsp) ||
- (p_inq->inqparms.mode & BTM_BLE_INQUIRY_MASK) == 0)
-#endif
- )
+ ((((p_inq->inqparms.mode & BTM_BLE_INQUIRY_MASK) != 0) &&
+ p_cur->device_type == BT_DEVICE_TYPE_DUMO && p_i->scan_rsp) ||
+ (p_inq->inqparms.mode & BTM_BLE_INQUIRY_MASK) == 0))
{
/* BTM_TRACE_DEBUG("BTMINQ: Found devices, cancelling inquiry..."); */
btsnd_hcic_inq_cancel();
-#if (BLE_INCLUDED == TRUE)
if ((p_inq->inqparms.mode & BTM_BLE_INQUIRY_MASK) != 0)
btm_ble_stop_inquiry();
-#endif
btm_acl_update_busy_level (BTM_BLI_INQ_DONE_EVT);
}
/* Initialize flag to false. This flag is set/used by application */
@@ -2115,9 +2077,7 @@
/* Notify caller that the inquiry has completed; (periodic inquiries do not send completion events */
if (!(p_inq->inq_active & BTM_PERIODIC_INQUIRY_ACTIVE) && p_inq->inqparms.mode == 0)
{
-#if (BLE_INCLUDED == TRUE)
btm_clear_all_pending_le_entry();
-#endif
p_inq->state = BTM_INQ_INACTIVE_STATE;
/* Increment so the start of a next inquiry has a new count */
@@ -2156,14 +2116,12 @@
if(p_inq->inqparms.mode == 0 && p_inq->scan_type == INQ_GENERAL)//this inquiry is complete
{
p_inq->scan_type = INQ_NONE;
-#if (BLE_INCLUDED == TRUE)
/* check if the LE observe is pending */
if(p_inq->p_inq_ble_results_cb != NULL)
{
BTM_TRACE_DEBUG("BTM Inq Compl: resuming a pending LE scan");
BTM_BleObserve(1,0, p_inq->p_inq_ble_results_cb, p_inq->p_inq_ble_cmpl_cb);
}
-#endif
}
#if (BTM_INQ_DEBUG == TRUE)
BTM_TRACE_DEBUG ("inq_active:0x%x state:%d inqfilt_active:%d",
@@ -2306,13 +2264,11 @@
(memcmp(bda, p_inq->remname_bda,BD_ADDR_LEN)==0)) || bda == NULL))
{
-#if (BLE_INCLUDED == TRUE)
if (BTM_UseLeLink(p_inq->remname_bda))
{
if (hci_status == HCI_ERR_UNSPECIFIED)
btm_ble_cancel_remote_name(p_inq->remname_bda);
}
-#endif
alarm_cancel(p_inq->remote_name_timer);
p_inq->remname_active = false;
/* Clean up and return the status if the command was not successful */
diff --git a/stack/btm/btm_int.h b/stack/btm/btm_int.h
index bdf12c0..33bd83c 100644
--- a/stack/btm/btm_int.h
+++ b/stack/btm/btm_int.h
@@ -36,12 +36,10 @@
#include "btm_api.h"
-#if (BLE_INCLUDED == TRUE)
#include "btm_ble_int.h"
#if (SMP_INCLUDED == TRUE)
#include "smp_api.h"
#endif
-#endif
#include "btm_int_types.h"
@@ -175,7 +173,6 @@
extern void btm_read_local_name_timeout(void *data);
extern void btm_read_local_name_complete(uint8_t *p, uint16_t evt_len);
-#if (BLE_INCLUDED == TRUE)
extern void btm_ble_add_2_white_list_complete(uint8_t status);
extern void btm_ble_remove_from_white_list_complete(uint8_t *p, uint16_t evt_len);
extern void btm_ble_clear_white_list_complete(uint8_t *p, uint16_t evt_len);
@@ -183,7 +180,6 @@
extern tBTM_STATUS btm_ble_read_resolving_list_entry(tBTM_SEC_DEV_REC *p_dev_rec);
extern bool btm_ble_resolving_list_load_dev(tBTM_SEC_DEV_REC *p_dev_rec);
extern void btm_ble_resolving_list_remove_dev(tBTM_SEC_DEV_REC *p_dev_rec);
-#endif /* BLE_INCLUDED */
/* Vendor Specific Command complete evt handler */
extern void btm_vsc_complete (uint8_t *p, uint16_t cc_opcode, uint16_t evt_len,
@@ -247,7 +243,6 @@
extern void btm_sec_dev_rec_cback_event (tBTM_SEC_DEV_REC *p_dev_rec, uint8_t res, bool is_le_trasnport);
extern void btm_sec_set_peer_sec_caps (tACL_CONN *p_acl_cb, tBTM_SEC_DEV_REC *p_dev_rec);
-#if (BLE_INCLUDED == TRUE)
extern void btm_sec_clear_ble_keys (tBTM_SEC_DEV_REC *p_dev_rec);
extern bool btm_sec_is_a_bonded_dev (BD_ADDR bda);
extern void btm_consolidate_dev(tBTM_SEC_DEV_REC *p_target_rec);
@@ -256,7 +251,6 @@
extern tBTM_SEC_SERV_REC *btm_sec_find_first_serv (CONNECTION_TYPE conn_type, uint16_t psm);
extern bool btm_ble_start_sec_check(BD_ADDR bd_addr, uint16_t psm, bool is_originator,
tBTM_SEC_CALLBACK *p_callback, void *p_ref_data);
-#endif /* BLE_INCLUDED */
extern tINQ_DB_ENT *btm_inq_db_new (BD_ADDR p_bda);
diff --git a/stack/btm/btm_int_types.h b/stack/btm/btm_int_types.h
index 1b9d243..50d211c 100644
--- a/stack/btm/btm_int_types.h
+++ b/stack/btm/btm_int_types.h
@@ -96,7 +96,6 @@
#define BTM_ACL_ENCRYPT_STATE_ENCRYPT_ON 3 /* encryption turning on */
uint8_t encrypt_state; /* overall BTM encryption state */
-#if (BLE_INCLUDED == TRUE)
tBT_TRANSPORT transport;
BD_ADDR conn_addr; /* local device address used for this connection */
uint8_t conn_addr_type; /* local device address type for this connection */
@@ -104,8 +103,6 @@
uint8_t active_remote_addr_type; /* local device address type for this connection */
BD_FEATURES peer_le_features; /* Peer LE Used features mask for the device */
-#endif
-
} tACL_CONN;
/* Define the Device Management control structure
@@ -144,8 +141,6 @@
DEV_CLASS dev_class; /* Local device class */
-#if (BLE_INCLUDED == TRUE)
-
tBTM_CMPL_CB *p_le_test_cmd_cmpl_cb; /* Callback function to be called when
LE test mode command has been sent successfully */
@@ -165,8 +160,6 @@
uint32_t test_local_sign_cntr;
#endif
-#endif /* BLE_INCLUDED */
-
tBTM_IO_CAP loc_io_caps; /* IO capability of the local device */
tBTM_AUTH_REQ loc_auth_req; /* the auth_req flag */
bool secure_connections_only; /* Rejects service level 0 connections if */
@@ -208,10 +201,7 @@
/* the same device. */
tBTM_INQ_INFO inq_info;
bool in_use;
-
-#if (BLE_INCLUDED == TRUE)
bool scan_rsp;
-#endif
} tINQ_DB_ENT;
@@ -429,7 +419,6 @@
#endif
} tBTM_SEC_SERV_REC;
-#if (BLE_INCLUDED == TRUE)
/* LE Security information of device in Slave Role */
typedef struct
{
@@ -478,9 +467,6 @@
#endif
} tBTM_SEC_BLE;
-
-#endif /* BLE_INCLUDED */
-
/* Peering bond type */
enum
{
@@ -586,10 +572,8 @@
/* SC BR/EDR->SC LE doesn't happen */
tBTM_BOND_TYPE bond_type; /* peering bond type */
-#if (BLE_INCLUDED == TRUE)
tBTM_SEC_BLE ble;
tBTM_LE_CONN_PRAMS conn_params;
-#endif
#if (BTM_DISC_DURING_RS == TRUE)
#define BTM_SEC_RS_NOT_PENDING 0 /* Role Switch not in progress */
@@ -794,7 +778,6 @@
/*****************************************************
** BLE Device controllers
*****************************************************/
-#if (BLE_INCLUDED == TRUE)
tBTM_BLE_CB ble_ctr_cb;
uint16_t enc_handle;
@@ -802,7 +785,6 @@
uint16_t ediv; /* received ediv value from LTK request */
uint8_t key_size;
tBTM_BLE_VSC_CB cmn_ble_vsc_cb;
-#endif
/* Packet types supported by the local device */
uint16_t btm_acl_pkt_types_supported;
diff --git a/stack/btm/btm_pm.cc b/stack/btm/btm_pm.cc
index 312baf6..54510f9 100644
--- a/stack/btm/btm_pm.cc
+++ b/stack/btm/btm_pm.cc
@@ -441,11 +441,8 @@
for (xx = 0; xx < MAX_L2CAP_LINKS; xx++, p++)
{
- if ((p->in_use) && (!memcmp (p->remote_addr, remote_bda, BD_ADDR_LEN))
-#if (BLE_INCLUDED == TRUE)
- && p->transport == BT_TRANSPORT_BR_EDR
-#endif // BLE_INCLUDED
- )
+ if ((p->in_use) && (!memcmp (p->remote_addr, remote_bda, BD_ADDR_LEN)) &&
+ p->transport == BT_TRANSPORT_BR_EDR)
{
#if (BTM_PM_DEBUG == TRUE)
BTM_TRACE_DEBUG( "btm_pm_find_acl_ind ind:%d, st:%d", xx, btm_cb.pm_mode_db[xx].state);
@@ -954,14 +951,12 @@
return true;
}
-#if (BLE_INCLUDED == TRUE)
/* Check BLE states */
if (btm_ble_get_conn_st() != BLE_CONN_IDLE)
{
BTM_TRACE_DEBUG("%s - BLE state: %x", __func__, btm_ble_get_conn_st());
return true;
}
-#endif
return false;
}
diff --git a/stack/btm/btm_sec.cc b/stack/btm/btm_sec.cc
index e0462cf..457ffed 100644
--- a/stack/btm/btm_sec.cc
+++ b/stack/btm/btm_sec.cc
@@ -40,9 +40,7 @@
#include "hcimsgs.h"
#include "l2c_int.h"
-#if (BLE_INCLUDED == TRUE)
- #include "gatt_int.h"
-#endif
+#include "gatt_int.h"
#define BTM_SEC_MAX_COLLISION_DELAY (5000)
@@ -226,20 +224,16 @@
*******************************************************************************/
bool BTM_SecRegister(tBTM_APPL_INFO *p_cb_info)
{
-#if (BLE_INCLUDED == TRUE)
BT_OCTET16 temp_value = {0};
-#endif
BTM_TRACE_EVENT("%s application registered", __func__);
-#if (BLE_INCLUDED == TRUE && SMP_INCLUDED == TRUE)
+#if (SMP_INCLUDED == TRUE)
LOG_INFO(LOG_TAG, "%s p_cb_info->p_le_callback == 0x%p", __func__, p_cb_info->p_le_callback);
if (p_cb_info->p_le_callback)
{
-#if (SMP_INCLUDED == TRUE)
BTM_TRACE_EVENT("%s SMP_Register( btm_proc_smp_cback )", __func__);
SMP_Register(btm_proc_smp_cback);
-#endif
/* if no IR is loaded, need to regenerate all the keys */
if (memcmp(btm_cb.devcb.id_keys.ir, &temp_value, sizeof(BT_OCTET16)) == 0)
{
@@ -250,10 +244,10 @@
{
LOG_WARN(LOG_TAG, "%s p_cb_info->p_le_callback == NULL", __func__);
}
-#endif /* (BLE_INCLUDED == TRUE && SMP_INCLUDED == TRUE) */
+#endif /* (SMP_INCLUDED == TRUE) */
btm_cb.api = *p_cb_info;
-#if (BLE_INCLUDED == TRUE && SMP_INCLUDED == TRUE)
+#if (SMP_INCLUDED == TRUE)
LOG_INFO(LOG_TAG, "%s btm_cb.api.p_le_callback = 0x%p ", __func__, btm_cb.api.p_le_callback);
#endif
BTM_TRACE_EVENT("%s application registered", __func__);
@@ -998,14 +992,10 @@
BTM_TRACE_DEBUG ("before update sec_flags=0x%x", p_dev_rec->sec_flags);
/* Finished if connection is active and already paired */
- if ( ((p_dev_rec->hci_handle != BTM_SEC_INVALID_HANDLE) && transport == BT_TRANSPORT_BR_EDR
- && (p_dev_rec->sec_flags & BTM_SEC_AUTHENTICATED))
-#if (BLE_INCLUDED == TRUE)
- ||((p_dev_rec->ble_hci_handle != BTM_SEC_INVALID_HANDLE) && transport == BT_TRANSPORT_LE
- && (p_dev_rec->sec_flags & BTM_SEC_LE_AUTHENTICATED))
-#endif
-
- )
+ if (((p_dev_rec->hci_handle != BTM_SEC_INVALID_HANDLE) && transport == BT_TRANSPORT_BR_EDR
+ && (p_dev_rec->sec_flags & BTM_SEC_AUTHENTICATED)) ||
+ ((p_dev_rec->ble_hci_handle != BTM_SEC_INVALID_HANDLE) && transport == BT_TRANSPORT_LE
+ && (p_dev_rec->sec_flags & BTM_SEC_LE_AUTHENTICATED)))
{
BTM_TRACE_WARNING("BTM_SecBond -> Already Paired");
return(BTM_SUCCESS);
@@ -1032,7 +1022,7 @@
if (trusted_mask)
BTM_SEC_COPY_TRUSTED_DEVICE(trusted_mask, p_dev_rec->trusted_mask);
-#if (BLE_INCLUDED == TRUE && SMP_INCLUDED == TRUE)
+#if (SMP_INCLUDED == TRUE)
if (transport == BT_TRANSPORT_LE)
{
btm_ble_init_pseudo_addr (p_dev_rec, bd_addr);
@@ -1190,10 +1180,8 @@
tBTM_STATUS BTM_SecBond (BD_ADDR bd_addr, uint8_t pin_len, uint8_t *p_pin, uint32_t trusted_mask[])
{
tBT_TRANSPORT transport = BT_TRANSPORT_BR_EDR;
-#if (BLE_INCLUDED == TRUE)
if (BTM_UseLeLink(bd_addr))
transport = BT_TRANSPORT_LE;
-#endif
return btm_sec_bond_by_transport(bd_addr, transport, pin_len, p_pin, trusted_mask);
}
/*******************************************************************************
@@ -1368,11 +1356,8 @@
tBTM_SEC_DEV_REC *p_dev_rec = btm_find_dev (bd_addr);
if (!p_dev_rec ||
- (transport == BT_TRANSPORT_BR_EDR && p_dev_rec->hci_handle == BTM_SEC_INVALID_HANDLE)
-#if (BLE_INCLUDED == TRUE)
- || (transport == BT_TRANSPORT_LE && p_dev_rec->ble_hci_handle == BTM_SEC_INVALID_HANDLE)
-#endif
- )
+ (transport == BT_TRANSPORT_BR_EDR && p_dev_rec->hci_handle == BTM_SEC_INVALID_HANDLE) ||
+ (transport == BT_TRANSPORT_LE && p_dev_rec->ble_hci_handle == BTM_SEC_INVALID_HANDLE))
{
/* Connection should be up and runnning */
BTM_TRACE_WARNING ("Security Manager: BTM_SetEncryption not connected");
@@ -1420,7 +1405,7 @@
p_dev_rec->hci_handle, p_dev_rec->sec_state, p_dev_rec->sec_flags,
p_dev_rec->security_required);
-#if (BLE_INCLUDED == TRUE && SMP_INCLUDED == TRUE)
+#if (SMP_INCLUDED == TRUE)
if (transport == BT_TRANSPORT_LE)
{
tACL_CONN *p = btm_bda_to_acl(bd_addr, transport);
@@ -1471,7 +1456,7 @@
p_dev_rec->sec_state = BTM_SEC_STATE_DISCONNECTING_BOTH;
break;
-#if (BLE_INCLUDED == TRUE && SMP_INCLUDED == TRUE)
+#if (SMP_INCLUDED == TRUE)
case BTM_SEC_STATE_DISCONNECTING_BLE:
if (conn_handle == p_dev_rec->ble_hci_handle)
return status;
@@ -4170,7 +4155,7 @@
void btm_sec_encrypt_change (uint16_t handle, uint8_t status, uint8_t encr_enable)
{
tBTM_SEC_DEV_REC *p_dev_rec = btm_find_dev_by_handle (handle);
-#if (BLE_INCLUDED == TRUE && SMP_INCLUDED == TRUE)
+#if (SMP_INCLUDED == TRUE)
tACL_CONN *p_acl = NULL;
uint8_t acl_idx = btm_handle_to_acl_index(handle);
#endif
@@ -4219,7 +4204,7 @@
BTM_TRACE_DEBUG ("after update p_dev_rec->sec_flags=0x%x", p_dev_rec->sec_flags );
-#if (BLE_INCLUDED == TRUE && SMP_INCLUDED == TRUE)
+#if (SMP_INCLUDED == TRUE)
if (acl_idx != MAX_L2CAP_LINKS)
p_acl = &btm_cb.acl_db[acl_idx];
@@ -4300,7 +4285,7 @@
}
#else
btm_sec_check_pending_enc_req (p_dev_rec, BT_TRANSPORT_BR_EDR, encr_enable);
-#endif /* BLE_INCLUDED == TRUE && SMP_INCLUDED == TRUE */
+#endif /* SMP_INCLUDED == TRUE */
/* If this encryption was started by peer do not need to do anything */
if (p_dev_rec->sec_state != BTM_SEC_STATE_ENCRYPTING)
@@ -4417,10 +4402,7 @@
}
else /* Update the timestamp for this device */
{
-
-#if (BLE_INCLUDED == TRUE)
bit_shift = (handle == p_dev_rec->ble_hci_handle) ? 8 :0;
-#endif
p_dev_rec->timestamp = btm_cb.dev_rec_count++;
if (p_dev_rec->sm4 & BTM_SM4_CONN_PEND)
{
@@ -4465,9 +4447,7 @@
}
}
-#if (BLE_INCLUDED == TRUE)
p_dev_rec->device_type |= BT_DEVICE_TYPE_BREDR;
-#endif
#if (BTM_DISC_DURING_RS == TRUE)
p_dev_rec->rs_disc_pending = BTM_SEC_RS_NOT_PENDING; /* reset flag */
@@ -4776,7 +4756,7 @@
}
}
-#if (BLE_INCLUDED == TRUE && SMP_INCLUDED == TRUE)
+#if (SMP_INCLUDED == TRUE)
btm_ble_update_mode_operation(HCI_ROLE_UNKNOWN, p_dev_rec->bd_addr, HCI_SUCCESS);
/* see sec_flags processing in btm_acl_removed */
@@ -4794,7 +4774,7 @@
| BTM_SEC_ROLE_SWITCHED | BTM_SEC_16_DIGIT_PIN_AUTHED);
}
-#if (BLE_INCLUDED == TRUE && SMP_INCLUDED == TRUE)
+#if (SMP_INCLUDED == TRUE)
if (p_dev_rec->sec_state == BTM_SEC_STATE_DISCONNECTING_BOTH)
{
p_dev_rec->sec_state = (transport == BT_TRANSPORT_LE) ?
@@ -4862,10 +4842,8 @@
p_dev_rec->sec_flags |= BTM_SEC_16_DIGIT_PIN_AUTHED;
}
-#if (BLE_INCLUDED == TRUE)
/* BR/EDR connection, update the encryption key size to be 16 as always */
p_dev_rec->enc_key_size = 16;
-#endif
memcpy (p_dev_rec->link_key, p_link_key, LINK_KEY_LEN);
if ( (btm_cb.pairing_state != BTM_PAIR_STATE_IDLE)
@@ -5895,11 +5873,9 @@
{
p_dev_rec->p_callback = NULL;
-#if (BLE_INCLUDED == TRUE)
if (is_le_transport)
(*p_callback) (p_dev_rec->ble.pseudo_addr, BT_TRANSPORT_LE, p_dev_rec->p_ref_data, res);
else
-#endif
(*p_callback) (p_dev_rec->bd_addr, BT_TRANSPORT_BR_EDR, p_dev_rec->p_ref_data, res);
}
@@ -6124,20 +6100,14 @@
tBTM_SEC_QUEUE_ENTRY *p_e = (tBTM_SEC_QUEUE_ENTRY *)list_node(node);
node = list_next(node);
- if (memcmp(p_e->bd_addr, p_dev_rec->bd_addr, BD_ADDR_LEN) == 0 && p_e->psm == 0
-#if (BLE_INCLUDED == TRUE)
- && p_e->transport == transport
-#endif
- )
+ if (memcmp(p_e->bd_addr, p_dev_rec->bd_addr, BD_ADDR_LEN) == 0 &&
+ p_e->psm == 0 && p_e->transport == transport)
{
- if (encr_enable == 0 || transport == BT_TRANSPORT_BR_EDR
-#if (BLE_INCLUDED == TRUE)
- || p_e->sec_act == BTM_BLE_SEC_ENCRYPT
- || p_e->sec_act == BTM_BLE_SEC_ENCRYPT_NO_MITM
- || (p_e->sec_act == BTM_BLE_SEC_ENCRYPT_MITM && p_dev_rec->sec_flags
- & BTM_SEC_LE_AUTHENTICATED)
-#endif
- )
+ if (encr_enable == 0 || transport == BT_TRANSPORT_BR_EDR ||
+ p_e->sec_act == BTM_BLE_SEC_ENCRYPT ||
+ p_e->sec_act == BTM_BLE_SEC_ENCRYPT_NO_MITM ||
+ (p_e->sec_act == BTM_BLE_SEC_ENCRYPT_MITM && p_dev_rec->sec_flags
+ & BTM_SEC_LE_AUTHENTICATED))
{
if (p_e->p_callback)
(*p_e->p_callback) (p_dev_rec->bd_addr, transport, p_e->p_ref_data, res);
@@ -6232,10 +6202,8 @@
tBTM_SEC_DEV_REC *p_dev_rec= btm_find_dev (bda);
bool le_capable = false;
-#if (BLE_INCLUDED == TRUE)
if (p_dev_rec && (p_dev_rec->device_type & BT_DEVICE_TYPE_BLE) == BT_DEVICE_TYPE_BLE)
le_capable = true;
-#endif
return le_capable;
}
diff --git a/stack/btu/btu_hcif.cc b/stack/btu/btu_hcif.cc
index b67cf3b..d4660ec 100644
--- a/stack/btu/btu_hcif.cc
+++ b/stack/btu/btu_hcif.cc
@@ -110,7 +110,6 @@
static void btu_hcif_ssr_evt (uint8_t *p, uint16_t evt_len);
#endif /* BTM_SSR_INCLUDED == TRUE */
- #if BLE_INCLUDED == true
static void btu_ble_ll_conn_complete_evt (uint8_t *p, uint16_t evt_len);
static void btu_ble_process_adv_pkt (uint8_t *p);
static void btu_ble_read_remote_feat_evt (uint8_t *p);
@@ -125,8 +124,6 @@
static void btu_ble_proc_enhanced_conn_cmpl (uint8_t *p, uint16_t evt_len);
#endif
- #endif
-
/*******************************************************************************
**
** Function btu_hcif_process_event
@@ -141,9 +138,7 @@
{
uint8_t *p = (uint8_t *)(p_msg + 1) + p_msg->offset;
uint8_t hci_evt_code, hci_evt_len;
-#if (BLE_INCLUDED == TRUE)
uint8_t ble_sub_code;
-#endif
STREAM_TO_UINT8 (hci_evt_code, p);
STREAM_TO_UINT8 (hci_evt_len, p);
@@ -179,11 +174,9 @@
case HCI_ENCRYPTION_CHANGE_EVT:
btu_hcif_encryption_change_evt (p);
break;
-#if (BLE_INCLUDED == TRUE)
case HCI_ENCRYPTION_KEY_REFRESH_COMP_EVT:
btu_hcif_encryption_key_refresh_cmpl_evt(p);
break;
-#endif
case HCI_READ_RMT_FEATURES_COMP_EVT:
btu_hcif_read_rmt_features_comp_evt (p);
break;
@@ -296,7 +289,6 @@
break;
#endif
-#if (BLE_INCLUDED == TRUE)
case HCI_BLE_EVENT:
STREAM_TO_UINT8 (ble_sub_code, p);
@@ -334,7 +326,6 @@
break;
}
break;
-#endif /* BLE_INCLUDED */
case HCI_VENDOR_SPECIFIC_EVT:
btm_vendor_specific_evt (p, hci_evt_len);
break;
@@ -363,12 +354,9 @@
// Eww...horrible hackery here
/* If command was a VSC, then extract command_complete callback */
- if ((opcode & HCI_GRP_VENDOR_SPECIFIC) == HCI_GRP_VENDOR_SPECIFIC
-#if (BLE_INCLUDED == TRUE)
- || (opcode == HCI_BLE_RAND)
- || (opcode == HCI_BLE_ENCRYPT)
-#endif
- ) {
+ if ((opcode & HCI_GRP_VENDOR_SPECIFIC) == HCI_GRP_VENDOR_SPECIFIC ||
+ (opcode == HCI_BLE_RAND) ||
+ (opcode == HCI_BLE_ENCRYPT)) {
vsc_callback = *((void **)(p_buf + 1));
}
@@ -921,7 +909,6 @@
btm_read_inq_tx_power_complete(p);
break;
-#if (BLE_INCLUDED == TRUE)
/* BLE Commands sComplete*/
case HCI_BLE_ADD_WHITE_LIST:
btm_ble_add_2_white_list_complete(*p);
@@ -980,8 +967,6 @@
case HCI_BLE_SET_RAND_PRIV_ADDR_TIMOUT:
break;
#endif
-#endif /* (BLE_INCLUDED == TRUE) */
-
default:
if ((opcode & HCI_GRP_VENDOR_SPECIFIC) == HCI_GRP_VENDOR_SPECIFIC)
btm_vsc_complete (p, opcode, evt_len, (tBTM_CMPL_CB *)p_cplt_cback);
@@ -1143,11 +1128,9 @@
btm_sec_encrypt_change (BTM_INVALID_HCI_HANDLE, status, false);
break;
-#if (BLE_INCLUDED == TRUE)
case HCI_BLE_CREATE_LL_CONN:
btm_ble_create_ll_conn_complete(status);
break;
-#endif
#if (BTM_SCO_INCLUDED == TRUE)
case HCI_SETUP_ESCO_CONNECTION:
@@ -1693,7 +1676,6 @@
/**********************************************
** BLE Events
***********************************************/
-#if (BLE_INCLUDED == TRUE)
static void btu_hcif_encryption_key_refresh_cmpl_evt (uint8_t *p)
{
uint8_t status;
@@ -1758,7 +1740,7 @@
STREAM_TO_UINT16(handle, p);
pp = p + 8;
STREAM_TO_UINT16(ediv, pp);
-#if (BLE_INCLUDED == TRUE && SMP_INCLUDED == TRUE)
+#if (SMP_INCLUDED == TRUE)
btm_ble_ltk_request(handle, p, ediv);
#endif
/* This is empty until an upper layer cares about returning event */
@@ -1803,5 +1785,3 @@
}
#endif /* BLE_LLT_INCLUDED */
-#endif /* BLE_INCLUDED */
-
diff --git a/stack/btu/btu_init.cc b/stack/btu/btu_init.cc
index 5373e99..f026da2 100644
--- a/stack/btu/btu_init.cc
+++ b/stack/btu/btu_init.cc
@@ -26,6 +26,8 @@
#include "btm_int.h"
#include "btu.h"
#include "device/include/controller.h"
+#include "gatt_api.h"
+#include "gatt_int.h"
#include "l2c_int.h"
#include "osi/include/alarm.h"
#include "osi/include/fixed_queue.h"
@@ -33,13 +35,9 @@
#include "osi/include/thread.h"
#include "sdpint.h"
-#if (BLE_INCLUDED == TRUE)
-#include "gatt_api.h"
-#include "gatt_int.h"
#if (SMP_INCLUDED == TRUE)
#include "smp_int.h"
#endif
-#endif
// Increase BTU task thread priority to avoid pre-emption
// of audio realated tasks.
@@ -88,13 +86,11 @@
sdp_init();
-#if (BLE_INCLUDED == TRUE)
gatt_init();
#if (SMP_INCLUDED == TRUE)
SMP_Init();
#endif
btm_ble_init();
-#endif
}
/*****************************************************************************
@@ -112,9 +108,7 @@
/* Free the mandatory core stack components */
l2c_free();
-#if (BLE_INCLUDED == TRUE)
gatt_free();
-#endif
}
/*****************************************************************************
diff --git a/stack/btu/btu_task.cc b/stack/btu/btu_task.cc
index fc015ae..0be39bd 100644
--- a/stack/btu/btu_task.cc
+++ b/stack/btu/btu_task.cc
@@ -73,14 +73,12 @@
#endif
#include "bta_sys.h"
-
-#if (BLE_INCLUDED == TRUE)
+#include "btm_ble_int.h"
#include "gatt_int.h"
+
#if (SMP_INCLUDED == TRUE)
#include "smp_int.h"
#endif
-#include "btm_ble_int.h"
-#endif
diff --git a/stack/gap/gap_api.cc b/stack/gap/gap_api.cc
index aaa1ae6..29b408f 100644
--- a/stack/gap/gap_api.cc
+++ b/stack/gap/gap_api.cc
@@ -68,8 +68,6 @@
gap_conn_init();
#endif
-#if (BLE_INCLUDED == TRUE)
gap_attr_db_init();
-#endif
}
diff --git a/stack/gap/gap_ble.cc b/stack/gap/gap_ble.cc
index 50f3a54..0058f11 100644
--- a/stack/gap/gap_ble.cc
+++ b/stack/gap/gap_ble.cc
@@ -17,8 +17,6 @@
******************************************************************************/
#include "bt_target.h"
-#if (BLE_INCLUDED == TRUE)
-
#include "bt_utils.h"
#include <string.h>
#include "gap_int.h"
@@ -787,9 +785,3 @@
return(true);
}
-#endif /* BLE_INCLUDED */
-
-
-
-
-
diff --git a/stack/gap/gap_int.h b/stack/gap/gap_int.h
index 4d34db0..99d6832 100644
--- a/stack/gap/gap_int.h
+++ b/stack/gap/gap_int.h
@@ -100,7 +100,6 @@
} tGAP_CONN;
-#if (BLE_INCLUDED == TRUE)
#define GAP_MAX_CHAR_NUM 4
typedef struct
@@ -109,7 +108,6 @@
uint16_t uuid;
tGAP_BLE_ATTR_VALUE attr_value;
}tGAP_ATTR;
-#endif
/**********************************************************************
** M A I N C O N T R O L B L O C K
***********************************************************************/
@@ -147,11 +145,9 @@
#endif
/* LE GAP attribute database */
-#if (BLE_INCLUDED == TRUE)
tGAP_ATTR gatt_attr[GAP_MAX_CHAR_NUM];
tGAP_CLCB clcb[GAP_MAX_CL]; /* connection link*/
tGATT_IF gatt_if;
-#endif
} tGAP_CB;
@@ -159,8 +155,5 @@
#if (GAP_CONN_INCLUDED == TRUE)
extern void gap_conn_init(void);
#endif
-#if (BLE_INCLUDED == TRUE)
extern void gap_attr_db_init(void);
#endif
-
-#endif
diff --git a/stack/gatt/att_protocol.cc b/stack/gatt/att_protocol.cc
index bef0982..80bf22e 100644
--- a/stack/gatt/att_protocol.cc
+++ b/stack/gatt/att_protocol.cc
@@ -24,8 +24,6 @@
#include "bt_target.h"
-#if (BLE_INCLUDED == TRUE)
-
#include "gatt_int.h"
#include "l2c_api.h"
@@ -603,4 +601,3 @@
return status;
}
-#endif
diff --git a/stack/gatt/gatt_attr.cc b/stack/gatt/gatt_attr.cc
index d3733a6..f109092 100644
--- a/stack/gatt/gatt_attr.cc
+++ b/stack/gatt/gatt_attr.cc
@@ -31,8 +31,6 @@
#include "btcore/include/uuid.h"
#include "osi/include/osi.h"
-#if (BLE_INCLUDED == TRUE)
-
#define GATTP_MAX_NUM_INC_SVR 0
#define GATTP_MAX_CHAR_NUM 2
#define GATTP_MAX_ATTR_NUM (GATTP_MAX_CHAR_NUM * 2 + GATTP_MAX_NUM_INC_SVR + 1)
@@ -468,5 +466,3 @@
p_clcb->ccc_stage ++;
gatt_cl_start_config_ccc(p_clcb);
}
-
-#endif /* BLE_INCLUDED */
diff --git a/stack/gatt/gatt_auth.cc b/stack/gatt/gatt_auth.cc
index 034b253..32142f5 100644
--- a/stack/gatt/gatt_auth.cc
+++ b/stack/gatt/gatt_auth.cc
@@ -24,7 +24,6 @@
#include "bt_target.h"
#include "bt_utils.h"
-#if (BLE_INCLUDED == TRUE)
#include <string.h>
#include "bt_common.h"
@@ -529,6 +528,3 @@
return status;
}
-
-
-#endif /* BLE_INCLUDED */
diff --git a/stack/gatt/gatt_cl.cc b/stack/gatt/gatt_cl.cc
index b522dfd..83e9e4b 100644
--- a/stack/gatt/gatt_cl.cc
+++ b/stack/gatt/gatt_cl.cc
@@ -24,8 +24,6 @@
#include "bt_target.h"
-#if (BLE_INCLUDED == TRUE)
-
#include <string.h>
#include "bt_utils.h"
#include "bt_common.h"
@@ -1248,5 +1246,3 @@
return;
}
-
-#endif /* BLE_INCLUDED */
diff --git a/stack/gatt/gatt_db.cc b/stack/gatt/gatt_db.cc
index 18dc08d..2338d43 100644
--- a/stack/gatt/gatt_db.cc
+++ b/stack/gatt/gatt_db.cc
@@ -24,8 +24,6 @@
#include "bt_target.h"
-#if (BLE_INCLUDED == TRUE)
-
#include "bt_trace.h"
#include "bt_utils.h"
@@ -1184,5 +1182,3 @@
}
return rt;
}
-
-#endif /* BLE_INCLUDED */
diff --git a/stack/gatt/gatt_main.cc b/stack/gatt/gatt_main.cc
index f904e68..94b0d7d 100644
--- a/stack/gatt/gatt_main.cc
+++ b/stack/gatt/gatt_main.cc
@@ -24,8 +24,6 @@
#include "bt_target.h"
-#if (BLE_INCLUDED == TRUE)
-
#include "bt_common.h"
#include "gatt_int.h"
#include "l2c_api.h"
@@ -1229,5 +1227,3 @@
}
return ch_state;
}
-
-#endif /* BLE_INCLUDED */
diff --git a/stack/gatt/gatt_sr.cc b/stack/gatt/gatt_sr.cc
index a4aa238..baf2558 100644
--- a/stack/gatt/gatt_sr.cc
+++ b/stack/gatt/gatt_sr.cc
@@ -26,7 +26,6 @@
#include "bt_utils.h"
#include "osi/include/osi.h"
-#if (BLE_INCLUDED == TRUE)
#include <string.h>
#include "gatt_int.h"
#include "l2c_api.h"
@@ -1480,5 +1479,3 @@
}
}
}
-
-#endif /* BLE_INCLUDED */
diff --git a/stack/gatt/gatt_utils.cc b/stack/gatt/gatt_utils.cc
index 42139a9..f788cb5 100644
--- a/stack/gatt/gatt_utils.cc
+++ b/stack/gatt/gatt_utils.cc
@@ -25,21 +25,20 @@
#include "bt_utils.h"
#include "osi/include/osi.h"
-#if (BLE_INCLUDED == TRUE)
- #include <string.h>
- #include "stdio.h"
- #include "bt_common.h"
+#include <string.h>
+#include "stdio.h"
+#include "bt_common.h"
- #include "l2cdefs.h"
- #include "gatt_int.h"
- #include "gatt_api.h"
- #include "gattdefs.h"
- #include "sdp_api.h"
- #include "btm_int.h"
+#include "l2cdefs.h"
+#include "gatt_int.h"
+#include "gatt_api.h"
+#include "gattdefs.h"
+#include "sdp_api.h"
+#include "btm_int.h"
/* check if [x, y] and [a, b] have overlapping range */
- #define GATT_VALIDATE_HANDLE_RANGE(x, y, a, b) ((y) >= (a) && (x) <= (b))
+#define GATT_VALIDATE_HANDLE_RANGE(x, y, a, b) ((y) >= (a) && (x) <= (b))
- #define GATT_GET_NEXT_VALID_HANDLE(x) (((x)/10 + 1) * 10)
+#define GATT_GET_NEXT_VALID_HANDLE(x) (((x)/10 + 1) * 10)
const char * const op_code_name[] =
{
@@ -2686,7 +2685,3 @@
return p_buf;
}
-
-#endif
-
-
diff --git a/stack/hcic/hciblecmds.cc b/stack/hcic/hciblecmds.cc
index 49978e0..6525168 100644
--- a/stack/hcic/hciblecmds.cc
+++ b/stack/hcic/hciblecmds.cc
@@ -33,8 +33,6 @@
#include <stddef.h>
#include <string.h>
-#if (BLE_INCLUDED == TRUE)
-
void btsnd_hcic_ble_set_local_used_feat (uint8_t feat_set[8])
{
BT_HDR *p = (BT_HDR *)osi_malloc(HCI_CMD_BUF_SIZE);
@@ -728,6 +726,3 @@
btu_hcif_send_cmd (LOCAL_BR_EDR_CONTROLLER_ID, p);
}
-
-#endif
-
diff --git a/stack/include/btm_api_types.h b/stack/include/btm_api_types.h
index 88ddcb7..af0d392 100644
--- a/stack/include/btm_api_types.h
+++ b/stack/include/btm_api_types.h
@@ -571,14 +571,12 @@
#define BTM_INQ_RESULT_BR 0x01
#define BTM_INQ_RESULT_BLE 0x02
-#if (BLE_INCLUDED == TRUE)
#define BTM_BLE_EVT_CONN_ADV 0x00
#define BTM_BLE_EVT_CONN_DIR_ADV 0x01
#define BTM_BLE_EVT_DISC_ADV 0x02
#define BTM_BLE_EVT_NON_CONN_ADV 0x03
#define BTM_BLE_EVT_SCAN_RSP 0x04
typedef uint8_t tBTM_BLE_EVT_TYPE;
-#endif
/* These are the fields returned in each device's response to the inquiry. It
** is returned in the results callback if registered.
@@ -594,13 +592,11 @@
int8_t rssi; /* Set to BTM_INQ_RES_IGNORE_RSSI if not valid */
uint32_t eir_uuid[BTM_EIR_SERVICE_ARRAY_SIZE];
bool eir_complete_list;
-#if (BLE_INCLUDED == TRUE)
tBT_DEVICE_TYPE device_type;
uint8_t inq_result_type;
uint8_t ble_addr_type;
tBTM_BLE_EVT_TYPE ble_evt_type;
uint8_t flag;
-#endif
} tBTM_INQ_RESULTS;
@@ -614,12 +610,10 @@
bool appl_knows_rem_name; /* set by application if it knows the remote name of the peer device.
This is later used by application to determine if remote name request is
required to be done. Having the flag here avoid duplicate store of inquiry results */
-#if (BLE_INCLUDED == TRUE)
uint16_t remote_name_len;
tBTM_BD_NAME remote_name;
uint8_t remote_name_state;
uint8_t remote_name_type;
-#endif
} tBTM_INQ_INFO;
@@ -793,10 +787,8 @@
DEV_CLASS_PTR p_dc; /* The device class */
BD_NAME_PTR p_bdn; /* The device name */
uint8_t *p_features; /* pointer to the remote device's features page[0] (supported features page) */
-#if (BLE_INCLUDED == TRUE)
uint16_t handle; /* connection handle */
tBT_TRANSPORT transport; /* link is LE or not */
-#endif
} tBTM_BL_CONN_DATA;
/* the data type associated with BTM_BL_DISCN_EVT */
@@ -804,10 +796,8 @@
{
tBTM_BL_EVENT event; /* The event reported. */
BD_ADDR_PTR p_bda; /* The address of the disconnected device */
-#if (BLE_INCLUDED == TRUE)
uint16_t handle; /* disconnected connection handle */
tBT_TRANSPORT transport; /* link is LE link or not */
-#endif
} tBTM_BL_DISCN_DATA;
/* Busy-Level shall have the inquiry_paging mask set when
@@ -857,16 +847,10 @@
** changes. First param is BD address, second is if added or removed.
** Registered through BTM_AclRegisterForChanges call.
*/
-#if (BLE_INCLUDED == TRUE)
typedef void (tBTM_ACL_DB_CHANGE_CB) (BD_ADDR p_bda, DEV_CLASS p_dc,
BD_NAME p_bdn, uint8_t *features,
bool is_new, uint16_t handle,
tBT_TRANSPORT transport);
-#else
-typedef void (tBTM_ACL_DB_CHANGE_CB) (BD_ADDR p_bda, DEV_CLASS p_dc,
- BD_NAME p_bdn, uint8_t *features,
- bool is_new);
-#endif
/*****************************************************************************
** SCO CHANNEL MANAGEMENT
*****************************************************************************/
@@ -1365,7 +1349,7 @@
#define BTM_IO_CAP_IO 1 /* DisplayYesNo */
#define BTM_IO_CAP_IN 2 /* KeyboardOnly */
#define BTM_IO_CAP_NONE 3 /* NoInputNoOutput */
-#if (BLE_INCLUDED == TRUE && SMP_INCLUDED == TRUE)
+#if (SMP_INCLUDED == TRUE)
#define BTM_IO_CAP_KBDISP 4 /* Keyboard display */
#define BTM_IO_CAP_MAX 5
#else
@@ -1606,7 +1590,7 @@
tBTM_LE_KEY_TYPE resp_keys; /* keys to be distributed, bit mask */
} tBTM_LE_IO_REQ;
-#if (BLE_INCLUDED == TRUE && SMP_INCLUDED == TRUE)
+#if (SMP_INCLUDED == TRUE)
/* data type for tBTM_LE_COMPLT */
typedef struct
{
@@ -1682,7 +1666,7 @@
/* BTM_LE_NC_REQ_EVT */
/* no callback data for BTM_LE_KEY_REQ_EVT */
/* and BTM_LE_OOB_REQ_EVT */
-#if (BLE_INCLUDED == TRUE && SMP_INCLUDED == TRUE)
+#if (SMP_INCLUDED == TRUE)
tBTM_LE_COMPLT complt; /* BTM_LE_COMPLT_EVT */
tSMP_OOB_DATA_TYPE req_oob_type;
#endif
@@ -1730,12 +1714,10 @@
tBTM_AUTH_COMPLETE_CALLBACK *p_auth_complete_callback;
tBTM_BOND_CANCEL_CMPL_CALLBACK *p_bond_cancel_cmpl_callback;
tBTM_SP_CALLBACK *p_sp_callback;
-#if (BLE_INCLUDED == TRUE)
#if (SMP_INCLUDED == TRUE)
tBTM_LE_CALLBACK *p_le_callback;
#endif
tBTM_LE_KEY_CALLBACK *p_le_key_callback;
-#endif
} tBTM_APPL_INFO;
/* Callback function for when a link supervision timeout event occurs.
@@ -1881,4 +1863,4 @@
typedef uint8_t tBTM_CONTRL_STATE;
-#endif // BTM_API_TYPES_H
\ No newline at end of file
+#endif // BTM_API_TYPES_H
diff --git a/stack/include/gap_api.h b/stack/include/gap_api.h
index 22087b7..1da9bad 100644
--- a/stack/include/gap_api.h
+++ b/stack/include/gap_api.h
@@ -320,7 +320,6 @@
*******************************************************************************/
extern void GAP_Init(void);
-#if (BLE_INCLUDED == TRUE)
/*******************************************************************************
**
** Function GAP_BleAttrDBUpdate
@@ -380,8 +379,6 @@
*******************************************************************************/
extern bool GAP_BleCancelReadPeerDevName (BD_ADDR peer_bda);
-#endif
-
#ifdef __cplusplus
}
#endif
diff --git a/stack/include/hcimsgs.h b/stack/include/hcimsgs.h
index c9b86ab..4e1613e 100644
--- a/stack/include/hcimsgs.h
+++ b/stack/include/hcimsgs.h
@@ -638,7 +638,6 @@
uint8_t len, uint8_t *p_data,
void *p_cmd_cplt_cback);
-#if (BLE_INCLUDED == TRUE)
/********************************************************************************
** BLE Commands
** Note: "local_controller_id" is for transport, not counted in HCI message size
@@ -800,8 +799,6 @@
extern void btsnd_hcic_ble_set_rand_priv_addr_timeout (uint16_t rpa_timout);
-#endif /* BLE_INCLUDED */
-
extern void btsnd_hcic_read_authenticated_payload_tout(uint16_t handle);
extern void btsnd_hcic_write_authenticated_payload_tout(uint16_t handle,
diff --git a/stack/include/l2c_api.h b/stack/include/l2c_api.h
index 033af10..6d6b675 100644
--- a/stack/include/l2c_api.h
+++ b/stack/include/l2c_api.h
@@ -1163,7 +1163,6 @@
*******************************************************************************/
extern bool L2CA_GetConnectionConfig(uint16_t lcid, uint16_t *mtu, uint16_t *rcid, uint16_t *handle);
-#if (BLE_INCLUDED == TRUE)
/*******************************************************************************
**
** Function L2CA_CancelBleConnectReq
@@ -1230,8 +1229,6 @@
*******************************************************************************/
extern uint16_t L2CA_GetDisconnectReason (BD_ADDR remote_bda, tBT_TRANSPORT transport);
-#endif /* (BLE_INCLUDED == TRUE) */
-
#ifdef __cplusplus
}
#endif
diff --git a/stack/include/smp_api_types.h b/stack/include/smp_api_types.h
index 41ccc8b..49c7509 100644
--- a/stack/include/smp_api_types.h
+++ b/stack/include/smp_api_types.h
@@ -28,7 +28,7 @@
#define SMP_PIN_CODE_LEN_MAX PIN_CODE_LEN
#define SMP_PIN_CODE_LEN_MIN 6
-#if (BLE_INCLUDED == TRUE && SMP_INCLUDED == TRUE)
+#if (SMP_INCLUDED == TRUE)
/* SMP command code */
#define SMP_OPCODE_PAIRING_REQ 0x01
#define SMP_OPCODE_PAIRING_RSP 0x02
@@ -296,4 +296,4 @@
}
#endif
-#endif // SMP_API_TYPES_H
\ No newline at end of file
+#endif // SMP_API_TYPES_H
diff --git a/stack/l2cap/l2c_api.cc b/stack/l2cap/l2c_api.cc
index 3248781..69bcce4 100644
--- a/stack/l2cap/l2c_api.cc
+++ b/stack/l2cap/l2c_api.cc
@@ -1695,10 +1695,8 @@
return (false);
}
-#if (BLE_INCLUDED == TRUE)
if (fixed_cid >= L2CAP_ATT_CID && fixed_cid <= L2CAP_SMP_CID)
transport = BT_TRANSPORT_LE;
-#endif
tL2C_BLE_FIXED_CHNLS_MASK peer_channel_mask;
@@ -1708,11 +1706,9 @@
// Fixed channels are mandatory on LE transports so ignore the received
// channel mask and use the locally cached LE channel mask.
-#if (BLE_INCLUDED == TRUE)
if (transport == BT_TRANSPORT_LE)
peer_channel_mask = l2cb.l2c_ble_fixed_chnls_mask;
else
-#endif
peer_channel_mask = p_lcb->peer_chnl_mask[0];
// Check for supported channel
@@ -1741,13 +1737,8 @@
return true;
}
-#if (BLE_INCLUDED == TRUE)
(*l2cb.fixed_reg[fixed_cid - L2CAP_FIRST_FIXED_CHNL].pL2CA_FixedConn_Cb)
(fixed_cid,p_lcb->remote_bd_addr, true, 0, p_lcb->transport);
-#else
- (*l2cb.fixed_reg[fixed_cid - L2CAP_FIRST_FIXED_CHNL].pL2CA_FixedConn_Cb)
- (fixed_cid, p_lcb->remote_bd_addr, true, 0, BT_TRANSPORT_BR_EDR);
-#endif
return true;
}
@@ -1799,10 +1790,8 @@
L2CAP_TRACE_API ("L2CA_SendFixedChnlData() CID: 0x%04x BDA: %08x%04x", fixed_cid,
(rem_bda[0]<<24)+(rem_bda[1]<<16)+(rem_bda[2]<<8)+rem_bda[3], (rem_bda[4]<<8)+rem_bda[5]);
-#if (BLE_INCLUDED == TRUE)
if (fixed_cid >= L2CAP_ATT_CID && fixed_cid <= L2CAP_SMP_CID)
transport = BT_TRANSPORT_LE;
-#endif
// Check CID is valid and registered
if ( (fixed_cid < L2CAP_FIRST_FIXED_CHNL) || (fixed_cid > L2CAP_LAST_FIXED_CHNL)
@@ -1834,11 +1823,9 @@
tL2C_BLE_FIXED_CHNLS_MASK peer_channel_mask;
// Select peer channels mask to use depending on transport
-#if (BLE_INCLUDED == TRUE)
if (transport == BT_TRANSPORT_LE)
peer_channel_mask = l2cb.l2c_ble_fixed_chnls_mask;
else
-#endif
peer_channel_mask = p_lcb->peer_chnl_mask[0];
if ((peer_channel_mask & (1 << fixed_cid)) == 0)
@@ -1915,10 +1902,8 @@
return (false);
}
-#if (BLE_INCLUDED == TRUE)
if (fixed_cid >= L2CAP_ATT_CID && fixed_cid <= L2CAP_SMP_CID)
transport = BT_TRANSPORT_LE;
-#endif
/* Is a fixed channel connected to the remote BDA ?*/
p_lcb = l2cu_find_lcb_by_bd_addr (rem_bda, transport);
@@ -1939,7 +1924,6 @@
p_lcb->p_fixed_ccbs[fixed_cid - L2CAP_FIRST_FIXED_CHNL] = NULL;
p_lcb->disc_reason = HCI_ERR_CONN_CAUSE_LOCAL_HOST;
-#if (BLE_INCLUDED == TRUE)
// Retain the link for a few more seconds after SMP pairing is done, since the Android
// platform always does service discovery after pairing is complete. This will avoid
// the link down (pairing is complete) and an immediate re-connection for service
@@ -1948,7 +1932,6 @@
// connection and service discovery.
if ((fixed_cid == L2CAP_ATT_CID ) && !p_lcb->ccb_queue.p_first_ccb)
p_lcb->idle_timeout = 0;
-#endif
l2cu_release_ccb (p_ccb);
@@ -1977,10 +1960,8 @@
tL2C_LCB *p_lcb;
tBT_TRANSPORT transport = BT_TRANSPORT_BR_EDR;
-#if (BLE_INCLUDED == TRUE)
if (fixed_cid >= L2CAP_ATT_CID && fixed_cid <= L2CAP_SMP_CID)
transport = BT_TRANSPORT_LE;
-#endif
/* Is a fixed channel connected to the remote BDA ?*/
p_lcb = l2cu_find_lcb_by_bd_addr (rem_bda, transport);
diff --git a/stack/l2cap/l2c_ble.cc b/stack/l2cap/l2c_ble.cc
index e1e3f3d..696937f 100644
--- a/stack/l2cap/l2c_ble.cc
+++ b/stack/l2cap/l2c_ble.cc
@@ -34,8 +34,6 @@
#include "stack_config.h"
#include "osi/include/osi.h"
-#if (BLE_INCLUDED == TRUE)
-
extern fixed_queue_t *btu_general_alarm_queue;
static void l2cble_start_conn_update (tL2C_LCB *p_lcb);
@@ -1474,4 +1472,3 @@
return status;
}
-#endif /* (BLE_INCLUDED == TRUE) */
diff --git a/stack/l2cap/l2c_int.h b/stack/l2cap/l2c_int.h
index 4312a02..bbc07c5 100644
--- a/stack/l2cap/l2c_int.h
+++ b/stack/l2cap/l2c_int.h
@@ -429,7 +429,6 @@
#endif
tBT_TRANSPORT transport;
-#if (BLE_INCLUDED == TRUE)
tBLE_ADDR_TYPE ble_addr_type;
uint16_t tx_data_len; /* tx data length used in data length extension */
fixed_queue_t *le_sec_pending_q; /* LE coc channels waiting for security check completion */
@@ -445,8 +444,6 @@
uint16_t latency;
uint16_t timeout;
-#endif
-
#if (L2CAP_ROUND_ROBIN_CHANNEL_SERVICE == TRUE)
/* each priority group is limited burst transmission */
/* round robin service for the same priority channels */
@@ -501,7 +498,6 @@
tL2CAP_FIXED_CHNL_REG fixed_reg[L2CAP_NUM_FIXED_CHNLS]; /* Reg info for fixed channels */
#endif
-#if (BLE_INCLUDED == TRUE)
uint16_t num_ble_links_active; /* Number of LE links active */
bool is_ble_connecting;
BD_ADDR ble_connecting_bda;
@@ -512,7 +508,6 @@
uint16_t ble_round_robin_unacked; /* Round-robin unacked */
bool ble_check_round_robin; /* Do a round robin check */
tL2C_RCB ble_rcb_pool[BLE_MAX_L2CAP_CLIENTS]; /* Registration info pool */
-#endif
tL2CA_ECHO_DATA_CB *p_echo_data_cb; /* Echo data callback */
@@ -621,7 +616,6 @@
extern void l2cu_set_non_flushable_pbf(bool );
#endif
-#if (BLE_INCLUDED == TRUE)
extern void l2cu_send_peer_ble_par_req (tL2C_LCB *p_lcb, uint16_t min_int, uint16_t max_int, uint16_t latency, uint16_t timeout);
extern void l2cu_send_peer_ble_par_rsp (tL2C_LCB *p_lcb, uint16_t reason, uint8_t rem_id);
extern void l2cu_reject_ble_connection (tL2C_LCB *p_lcb, uint8_t rem_id, uint16_t result);
@@ -629,7 +623,6 @@
extern void l2cu_send_peer_ble_credit_based_conn_req (tL2C_CCB *p_ccb);
extern void l2cu_send_peer_ble_flow_control_credit(tL2C_CCB *p_ccb, uint16_t credit_value);
extern void l2cu_send_peer_ble_credit_based_disconn_req(tL2C_CCB *p_ccb);
-#endif
extern bool l2cu_initialize_fixed_ccb (tL2C_LCB *p_lcb, uint16_t fixed_cid, tL2CAP_FCR_OPTS *p_fcr);
extern void l2cu_no_dynamic_ccbs (tL2C_LCB *p_lcb);
@@ -703,9 +696,7 @@
extern void l2c_pin_code_request (BD_ADDR bd_addr);
extern void l2c_link_adjust_chnl_allocation (void);
-#if (BLE_INCLUDED == TRUE)
extern void l2c_link_processs_ble_num_bufs (uint16_t num_lm_acl_bufs);
-#endif
#if (L2CAP_WAKE_PARKED_LINK == TRUE)
extern bool l2c_link_check_power_mode ( tL2C_LCB *p_lcb );
@@ -754,7 +745,6 @@
/* Functions provided by l2c_ble.cc
************************************
*/
-#if (BLE_INCLUDED == TRUE)
extern bool l2cble_create_conn (tL2C_LCB *p_lcb);
extern void l2cble_process_sig_cmd (tL2C_LCB *p_lcb, uint8_t *p, uint16_t pkt_len);
extern void l2cble_conn_comp (uint16_t handle, uint8_t role, BD_ADDR bda, tBLE_ADDR_TYPE type,
@@ -782,7 +772,6 @@
extern void l2cble_process_data_length_change_event(uint16_t handle, uint16_t tx_data_len,
uint16_t rx_data_len);
-#endif
extern void l2cu_process_fixed_disc_cback (tL2C_LCB *p_lcb);
#ifdef __cplusplus
diff --git a/stack/l2cap/l2c_link.cc b/stack/l2cap/l2c_link.cc
index b7eb94a..c2d89be 100644
--- a/stack/l2cap/l2c_link.cc
+++ b/stack/l2cap/l2c_link.cc
@@ -395,11 +395,9 @@
/* Just in case app decides to try again in the callback context */
p_lcb->link_state = LST_DISCONNECTING;
-#if (BLE_INCLUDED == TRUE)
/* Check for BLE and handle that differently */
if (p_lcb->transport == BT_TRANSPORT_LE)
btm_ble_update_link_topology_mask(p_lcb->link_role, false);
-#endif
/* Link is disconnected. For all channels, send the event through */
/* their FSMs. The CCBs should remove themselves from the LCB */
for (p_ccb = p_lcb->ccb_queue.p_first_ccb; p_ccb; )
@@ -420,9 +418,7 @@
}
#if (BTM_SCO_INCLUDED == TRUE)
-#if (BLE_INCLUDED == TRUE)
if (p_lcb->transport == BT_TRANSPORT_BR_EDR)
-#endif
/* Tell SCO management to drop any SCOs on this ACL */
btm_sco_acl_removed (p_lcb->remote_bd_addr);
#endif
@@ -435,7 +431,6 @@
{
L2CAP_TRACE_DEBUG("l2c_link_hci_disc_comp: Restarting pending ACL request");
transport = p_lcb->transport;
-#if (BLE_INCLUDED == TRUE)
/* for LE link, always drop and re-open to ensure to get LE remote feature */
if (p_lcb->transport == BT_TRANSPORT_LE)
{
@@ -451,7 +446,6 @@
}
}
else
-#endif
{
#if (L2CAP_NUM_FIXED_CHNLS > 0)
/* If we are going to re-use the LCB without dropping it, release all fixed channels
@@ -461,13 +455,8 @@
{
if (p_lcb->p_fixed_ccbs[xx] && p_lcb->p_fixed_ccbs[xx] != p_lcb->p_pending_ccb)
{
-#if (BLE_INCLUDED == TRUE)
(*l2cb.fixed_reg[xx].pL2CA_FixedConn_Cb)(xx + L2CAP_FIRST_FIXED_CHNL,
p_lcb->remote_bd_addr, false, p_lcb->disc_reason, p_lcb->transport);
-#else
- (*l2cb.fixed_reg[xx].pL2CA_FixedConn_Cb)(xx + L2CAP_FIRST_FIXED_CHNL,
- p_lcb->remote_bd_addr, false, p_lcb->disc_reason, BT_TRANSPORT_BR_EDR);
-#endif
if (p_lcb->p_fixed_ccbs[xx] == NULL) {
bdstr_t bd_addr_str = {0};
L2CAP_TRACE_ERROR("%s: unexpected p_fixed_ccbs[%d] is NULL remote_bd_addr = %s p_lcb = %p in_use = %d link_state = %d handle = %d link_role = %d is_bonding = %d disc_reason = %d transport = %d",
@@ -579,13 +568,11 @@
p_ccb = pn;
}
-#if (BLE_INCLUDED == TRUE)
if (p_lcb->link_state == LST_CONNECTING &&
l2cb.is_ble_connecting == true)
{
L2CA_CancelBleConnectReq(l2cb.ble_connecting_bda);
}
-#endif
/* Release the LCB */
l2cu_release_lcb (p_lcb);
}
@@ -1081,11 +1068,9 @@
if (p_lcb->link_xmit_quota == 0)
{
-#if (BLE_INCLUDED == TRUE)
if (p_lcb->transport == BT_TRANSPORT_LE)
l2cb.ble_check_round_robin = true;
else
-#endif
l2cb.check_round_robin = true;
}
}
@@ -1112,15 +1097,11 @@
/* If controller window is full, nothing to do */
if (((l2cb.controller_xmit_window == 0 ||
(l2cb.round_robin_unacked >= l2cb.round_robin_quota))
-#if (BLE_INCLUDED == TRUE)
&& (p_lcb->transport == BT_TRANSPORT_BR_EDR)
)
|| (p_lcb->transport == BT_TRANSPORT_LE &&
(l2cb.ble_round_robin_unacked >= l2cb.ble_round_robin_quota ||
l2cb.controller_le_xmit_window == 0 )))
-#else
- ))
-#endif
break;
@@ -1154,20 +1135,15 @@
}
/* If we finished without using up our quota, no need for a safety check */
- if ( (l2cb.controller_xmit_window > 0)
- && (l2cb.round_robin_unacked < l2cb.round_robin_quota)
-#if (BLE_INCLUDED == TRUE)
- && (p_lcb->transport == BT_TRANSPORT_BR_EDR)
-#endif
- )
+ if ((l2cb.controller_xmit_window > 0) &&
+ (l2cb.round_robin_unacked < l2cb.round_robin_quota) &&
+ (p_lcb->transport == BT_TRANSPORT_BR_EDR))
l2cb.check_round_robin = false;
-#if (BLE_INCLUDED == TRUE)
- if ( (l2cb.controller_le_xmit_window > 0)
- && (l2cb.ble_round_robin_unacked < l2cb.ble_round_robin_quota)
- && (p_lcb->transport == BT_TRANSPORT_LE))
+ if ((l2cb.controller_le_xmit_window > 0) &&
+ (l2cb.ble_round_robin_unacked < l2cb.ble_round_robin_quota) &&
+ (p_lcb->transport == BT_TRANSPORT_LE))
l2cb.ble_check_round_robin = false;
-#endif
}
else /* if this is not round-robin service */
{
@@ -1178,14 +1154,9 @@
return;
/* See if we can send anything from the link queue */
-#if (BLE_INCLUDED == TRUE)
while ( ((l2cb.controller_xmit_window != 0 && (p_lcb->transport == BT_TRANSPORT_BR_EDR)) ||
(l2cb.controller_le_xmit_window != 0 && (p_lcb->transport == BT_TRANSPORT_LE)))
&& (p_lcb->sent_not_acked < p_lcb->link_xmit_quota))
-#else
- while ( (l2cb.controller_xmit_window != 0)
- && (p_lcb->sent_not_acked < p_lcb->link_xmit_quota))
-#endif
{
if (list_is_empty(p_lcb->link_xmit_data_q))
break;
@@ -1199,13 +1170,9 @@
if (!single_write)
{
/* See if we can send anything for any channel */
-#if (BLE_INCLUDED == TRUE)
while ( ((l2cb.controller_xmit_window != 0 && (p_lcb->transport == BT_TRANSPORT_BR_EDR)) ||
(l2cb.controller_le_xmit_window != 0 && (p_lcb->transport == BT_TRANSPORT_LE)))
&& (p_lcb->sent_not_acked < p_lcb->link_xmit_quota))
-#else
- while ((l2cb.controller_xmit_window != 0) && (p_lcb->sent_not_acked < p_lcb->link_xmit_quota))
-#endif
{
if ((p_buf = l2cu_get_next_buffer_to_send (p_lcb)) == NULL)
break;
@@ -1243,34 +1210,25 @@
const controller_t *controller = controller_get_interface();
if ((p_buf->len <= controller->get_acl_packet_size_classic()
-#if (BLE_INCLUDED == TRUE)
&& (p_lcb->transport == BT_TRANSPORT_BR_EDR)) ||
- ((p_lcb->transport == BT_TRANSPORT_LE) && (p_buf->len <= controller->get_acl_packet_size_ble()))
-#else
- )
-#endif
- )
+ ((p_lcb->transport == BT_TRANSPORT_LE) && (p_buf->len <= controller->get_acl_packet_size_ble())))
{
if (p_lcb->link_xmit_quota == 0)
{
-#if (BLE_INCLUDED == TRUE)
if (p_lcb->transport == BT_TRANSPORT_LE)
l2cb.ble_round_robin_unacked++;
else
-#endif
l2cb.round_robin_unacked++;
}
p_lcb->sent_not_acked++;
p_buf->layer_specific = 0;
-#if (BLE_INCLUDED == TRUE)
if (p_lcb->transport == BT_TRANSPORT_LE)
{
l2cb.controller_le_xmit_window--;
bte_main_hci_send(p_buf, (uint16_t)(BT_EVT_TO_LM_HCI_ACL|LOCAL_BLE_CONTROLLER_ID));
}
else
-#endif
{
l2cb.controller_xmit_window--;
bte_main_hci_send(p_buf, BT_EVT_TO_LM_HCI_ACL);
@@ -1278,7 +1236,6 @@
}
else
{
-#if (BLE_INCLUDED == TRUE)
if (p_lcb->transport == BT_TRANSPORT_LE)
{
acl_data_size = controller->get_acl_data_size_ble();
@@ -1286,7 +1243,6 @@
}
else
-#endif
{
acl_data_size = controller->get_acl_data_size_classic();
xmit_window = l2cb.controller_xmit_window;
@@ -1317,7 +1273,6 @@
}
p_buf->layer_specific = num_segs;
-#if (BLE_INCLUDED == TRUE)
if (p_lcb->transport == BT_TRANSPORT_LE)
{
l2cb.controller_le_xmit_window -= num_segs;
@@ -1325,7 +1280,6 @@
l2cb.ble_round_robin_unacked += num_segs;
}
else
-#endif
{
l2cb.controller_xmit_window -= num_segs;
@@ -1334,20 +1288,17 @@
}
p_lcb->sent_not_acked += num_segs;
-#if (BLE_INCLUDED == TRUE)
if (p_lcb->transport == BT_TRANSPORT_LE)
{
bte_main_hci_send(p_buf, (uint16_t)(BT_EVT_TO_LM_HCI_ACL|LOCAL_BLE_CONTROLLER_ID));
}
else
-#endif
{
bte_main_hci_send(p_buf, BT_EVT_TO_LM_HCI_ACL);
}
}
#if (L2CAP_HCI_FLOW_CONTROL_DEBUG == TRUE)
-#if (BLE_INCLUDED == TRUE)
if (p_lcb->transport == BT_TRANSPORT_LE)
{
L2CAP_TRACE_DEBUG ("TotalWin=%d,Hndl=0x%x,Quota=%d,Unack=%d,RRQuota=%d,RRUnack=%d",
@@ -1357,7 +1308,6 @@
l2cb.ble_round_robin_quota, l2cb.ble_round_robin_unacked);
}
else
-#endif
{
L2CAP_TRACE_DEBUG ("TotalWin=%d,Hndl=0x%x,Quota=%d,Unack=%d,RRQuota=%d,RRUnack=%d",
l2cb.controller_xmit_window,
@@ -1407,11 +1357,9 @@
if (p_lcb)
{
-#if (BLE_INCLUDED == TRUE)
if (p_lcb && (p_lcb->transport == BT_TRANSPORT_LE))
l2cb.controller_le_xmit_window += num_sent;
else
-#endif
{
/* Maintain the total window to the controller */
l2cb.controller_xmit_window += num_sent;
@@ -1419,7 +1367,6 @@
/* If doing round-robin, adjust communal counts */
if (p_lcb->link_xmit_quota == 0)
{
-#if (BLE_INCLUDED == TRUE)
if (p_lcb->transport == BT_TRANSPORT_LE)
{
/* Don't go negative */
@@ -1429,7 +1376,6 @@
l2cb.ble_round_robin_unacked = 0;
}
else
-#endif
{
/* Don't go negative */
if (l2cb.round_robin_unacked > num_sent)
@@ -1454,7 +1400,6 @@
{
l2c_link_check_send_pkts (NULL, NULL, NULL);
}
-#if (BLE_INCLUDED == TRUE)
if ((p_lcb->transport == BT_TRANSPORT_LE)
&& (p_lcb->acl_priority == L2CAP_PRIORITY_HIGH)
&& ((l2cb.ble_check_round_robin)
@@ -1462,13 +1407,11 @@
{
l2c_link_check_send_pkts (NULL, NULL, NULL);
}
-#endif
}
#if (L2CAP_HCI_FLOW_CONTROL_DEBUG == TRUE)
if (p_lcb)
{
-#if (BLE_INCLUDED == TRUE)
if (p_lcb->transport == BT_TRANSPORT_LE)
{
L2CAP_TRACE_DEBUG ("TotalWin=%d,LinkUnack(0x%x)=%d,RRCheck=%d,RRUnack=%d",
@@ -1477,7 +1420,6 @@
l2cb.ble_check_round_robin, l2cb.ble_round_robin_unacked);
}
else
-#endif
{
L2CAP_TRACE_DEBUG ("TotalWin=%d,LinkUnack(0x%x)=%d,RRCheck=%d,RRUnack=%d",
l2cb.controller_xmit_window,
@@ -1488,18 +1430,11 @@
}
else
{
-#if (BLE_INCLUDED == TRUE)
L2CAP_TRACE_DEBUG ("TotalWin=%d LE_Win: %d, Handle=0x%x, RRCheck=%d, RRUnack=%d",
l2cb.controller_xmit_window,
l2cb.controller_le_xmit_window,
handle,
l2cb.ble_check_round_robin, l2cb.ble_round_robin_unacked);
-#else
- L2CAP_TRACE_DEBUG ("TotalWin=%d Handle=0x%x RRCheck=%d RRUnack=%d",
- l2cb.controller_xmit_window,
- handle,
- l2cb.check_round_robin, l2cb.round_robin_unacked);
-#endif
}
#endif
}
diff --git a/stack/l2cap/l2c_main.cc b/stack/l2cap/l2c_main.cc
index ffc94a7..bf51908 100644
--- a/stack/l2cap/l2c_main.cc
+++ b/stack/l2cap/l2c_main.cc
@@ -135,12 +135,10 @@
STREAM_TO_UINT16 (l2cap_len, p);
STREAM_TO_UINT16 (rcv_cid, p);
-#if (BLE_INCLUDED == TRUE)
/* for BLE channel, always notify connection when ACL data received on the link */
if (p_lcb && p_lcb->transport == BT_TRANSPORT_LE && p_lcb->link_state != LST_DISCONNECTING)
/* only process fixed channel data as channel open indication when link is not in disconnecting mode */
l2cble_notify_le_connection(p_lcb->remote_bd_addr);
-#endif
/* Find the CCB for this CID */
if (rcv_cid >= L2CAP_BASE_APPL_CID)
@@ -196,13 +194,11 @@
#endif
osi_free(p_msg);
}
-#if (BLE_INCLUDED == TRUE)
else if (rcv_cid == L2CAP_BLE_SIGNALLING_CID)
{
l2cble_process_sig_cmd (p_lcb, p, l2cap_len);
osi_free(p_msg);
}
-#endif
#if (L2CAP_NUM_FIXED_CHNLS > 0)
else if ((rcv_cid >= L2CAP_FIRST_FIXED_CHNL) && (rcv_cid <= L2CAP_LAST_FIXED_CHNL) &&
(l2cb.fixed_reg[rcv_cid - L2CAP_FIRST_FIXED_CHNL].pL2CA_FixedData_Cb != NULL) )
@@ -281,11 +277,9 @@
uint16_t result;
tL2C_CONN_INFO ci;
-#if (BLE_INCLUDED == TRUE)
/* if l2cap command received in CID 1 on top of an LE link, ignore this command */
if (p_lcb->transport == BT_TRANSPORT_LE)
return;
-#endif
/* Reject the packet if it exceeds the default Signalling Channel MTU */
if (pkt_len > L2CAP_DEFAULT_MTU)
@@ -844,10 +838,8 @@
l2cb.high_pri_min_xmit_quota = L2CAP_HIGH_PRI_MIN_XMIT_QUOTA;
#endif
-#if (BLE_INCLUDED == TRUE)
l2cb.l2c_ble_fixed_chnls_mask =
L2CAP_FIXED_CHNL_ATT_BIT | L2CAP_FIXED_CHNL_BLE_SIG_BIT | L2CAP_FIXED_CHNL_SMP_BIT;
-#endif
l2cb.rcv_pending_q = list_new(NULL);
if (l2cb.rcv_pending_q == NULL)
diff --git a/stack/l2cap/l2c_utils.cc b/stack/l2cap/l2c_utils.cc
index bf83b44..37e0a86 100644
--- a/stack/l2cap/l2c_utils.cc
+++ b/stack/l2cap/l2c_utils.cc
@@ -75,7 +75,6 @@
p_lcb->idle_timeout = l2cb.idle_timeout;
p_lcb->id = 1; /* spec does not allow '0' */
p_lcb->is_bonding = is_bonding;
-#if (BLE_INCLUDED == TRUE)
p_lcb->transport = transport;
p_lcb->tx_data_len = controller_get_interface()->get_ble_default_data_packet_length();
p_lcb->le_sec_pending_q = fixed_queue_new(SIZE_MAX);
@@ -86,7 +85,6 @@
l2c_ble_link_adjust_allocation();
}
else
-#endif
{
l2cb.num_links_active++;
l2c_link_adjust_allocation();
@@ -154,16 +152,13 @@
osi_free_and_reset((void **)&p_lcb->p_hcit_rcv_acl);
#if (BTM_SCO_INCLUDED == TRUE)
-#if (BLE_INCLUDED == TRUE)
if (p_lcb->transport == BT_TRANSPORT_BR_EDR)
-#endif
/* Release all SCO links */
btm_remove_sco_links(p_lcb->remote_bd_addr);
#endif
if (p_lcb->sent_not_acked > 0)
{
-#if (BLE_INCLUDED == TRUE)
if (p_lcb->transport == BT_TRANSPORT_LE)
{
l2cb.controller_le_xmit_window += p_lcb->sent_not_acked;
@@ -173,7 +168,6 @@
}
}
else
-#endif
{
l2cb.controller_xmit_window += p_lcb->sent_not_acked;
if (l2cb.controller_xmit_window > l2cb.num_lm_acl_bufs)
@@ -183,11 +177,9 @@
}
}
-#if (BLE_INCLUDED == TRUE)
// Reset BLE connecting flag only if the address matches
if (!memcmp(l2cb.ble_connecting_bda, p_lcb->remote_bd_addr, BD_ADDR_LEN))
l2cb.is_ble_connecting = false;
-#endif
#if (L2CAP_NUM_FIXED_CHNLS > 0)
l2cu_process_fixed_disc_cback(p_lcb);
@@ -201,11 +193,7 @@
/* Tell BTM Acl management the link was removed */
if ((p_lcb->link_state == LST_CONNECTED) || (p_lcb->link_state == LST_DISCONNECTING))
-#if (BLE_INCLUDED == TRUE)
btm_acl_removed (p_lcb->remote_bd_addr, p_lcb->transport);
-#else
- btm_acl_removed (p_lcb->remote_bd_addr, BT_TRANSPORT_BR_EDR);
-#endif
/* Release any held buffers */
if (p_lcb->link_xmit_data_q)
@@ -225,7 +213,6 @@
l2c_ucd_delete_sec_pending_q(p_lcb);
#endif
-#if (BLE_INCLUDED == TRUE)
/* Re-adjust flow control windows make sure it does not go negative */
if (p_lcb->transport == BT_TRANSPORT_LE)
{
@@ -235,7 +222,6 @@
l2c_ble_link_adjust_allocation();
}
else
-#endif
{
if (l2cb.num_links_active >= 1)
l2cb.num_links_active--;
@@ -288,9 +274,7 @@
for (xx = 0; xx < MAX_L2CAP_LINKS; xx++, p_lcb++)
{
if ((p_lcb->in_use) &&
-#if (BLE_INCLUDED == TRUE)
p_lcb->transport == transport &&
-#endif
(!memcmp (p_lcb->remote_bd_addr, p_bd_addr, BD_ADDR_LEN)))
{
return (p_lcb);
@@ -370,13 +354,11 @@
p = (uint8_t *)(p_buf + 1) + L2CAP_SEND_CMD_OFFSET;
/* Put in HCI header - handle + pkt boundary */
-#if (BLE_INCLUDED == TRUE)
if (p_lcb->transport == BT_TRANSPORT_LE)
{
UINT16_TO_STREAM (p, (p_lcb->handle | (L2CAP_PKT_START_NON_FLUSHABLE << L2CAP_PKT_TYPE_SHIFT)));
}
else
-#endif
{
#if (L2CAP_NON_FLUSHABLE_PB_INCLUDED == TRUE)
UINT16_TO_STREAM (p, p_lcb->handle | l2cb.non_flushable_pbf);
@@ -388,14 +370,12 @@
UINT16_TO_STREAM (p, len + L2CAP_PKT_OVERHEAD + L2CAP_CMD_OVERHEAD);
UINT16_TO_STREAM (p, len + L2CAP_CMD_OVERHEAD);
-#if (BLE_INCLUDED == TRUE)
if (p_lcb->transport == BT_TRANSPORT_LE)
{
UINT16_TO_STREAM (p, L2CAP_BLE_SIGNALLING_CID);
}
else
-#endif
{
UINT16_TO_STREAM (p, L2CAP_SIGNALLING_CID);
}
@@ -1185,14 +1165,12 @@
#endif
{
UINT16_TO_STREAM (p, L2CAP_INFO_RESP_RESULT_SUCCESS);
-#if (BLE_INCLUDED == TRUE)
if (p_lcb->transport == BT_TRANSPORT_LE)
{
/* optional data are not added for now */
UINT32_TO_STREAM (p, L2CAP_BLE_EXTFEA_MASK);
}
else
-#endif
{
#if (L2CAP_CONFORMANCE_TESTING == TRUE)
UINT32_TO_STREAM (p, l2cb.test_info_resp);
@@ -2261,9 +2239,7 @@
l2c_link_hci_disc_comp (p_lcb->handle, (uint8_t) -1);
}
}
-#if (BLE_INCLUDED == TRUE)
l2cb.is_ble_connecting = false;
-#endif
}
/*******************************************************************************
@@ -2283,7 +2259,6 @@
bool is_sco_active;
#endif
-#if (BLE_INCLUDED == TRUE)
tBT_DEVICE_TYPE dev_type;
tBLE_ADDR_TYPE addr_type;
@@ -2300,7 +2275,6 @@
return (l2cble_create_conn(p_lcb));
}
-#endif
/* If there is a connection where we perform as a slave, try to switch roles
for this connection */
@@ -2872,7 +2846,6 @@
*******************************************************************************/
void l2cu_process_fixed_chnl_resp (tL2C_LCB *p_lcb)
{
-#if (BLE_INCLUDED == TRUE)
if (p_lcb->transport == BT_TRANSPORT_BR_EDR)
{
/* ignore all not assigned BR/EDR channels */
@@ -2882,18 +2855,15 @@
}
else
p_lcb->peer_chnl_mask[0] = l2cb.l2c_ble_fixed_chnls_mask;
-#endif
/* Tell all registered fixed channels about the connection */
for (int xx = 0; xx < L2CAP_NUM_FIXED_CHNLS; xx++)
{
-#if (BLE_INCLUDED == TRUE)
/* skip sending LE fix channel callbacks on BR/EDR links */
if (p_lcb->transport == BT_TRANSPORT_BR_EDR &&
xx + L2CAP_FIRST_FIXED_CHNL >= L2CAP_ATT_CID &&
xx + L2CAP_FIRST_FIXED_CHNL <= L2CAP_SMP_CID)
continue;
-#endif
if (l2cb.fixed_reg[xx].pL2CA_FixedConn_Cb != NULL)
{
if (p_lcb->peer_chnl_mask[(xx + L2CAP_FIRST_FIXED_CHNL) / 8]
@@ -2901,23 +2871,13 @@
{
if (p_lcb->p_fixed_ccbs[xx])
p_lcb->p_fixed_ccbs[xx]->chnl_state = CST_OPEN;
-#if (BLE_INCLUDED == TRUE)
(*l2cb.fixed_reg[xx].pL2CA_FixedConn_Cb)(xx + L2CAP_FIRST_FIXED_CHNL,
p_lcb->remote_bd_addr, true, 0, p_lcb->transport);
-#else
- (*l2cb.fixed_reg[xx].pL2CA_FixedConn_Cb)(xx + L2CAP_FIRST_FIXED_CHNL,
- p_lcb->remote_bd_addr, true, 0, BT_TRANSPORT_BR_EDR);
-#endif
}
else
{
-#if (BLE_INCLUDED == TRUE)
(*l2cb.fixed_reg[xx].pL2CA_FixedConn_Cb)(xx + L2CAP_FIRST_FIXED_CHNL,
p_lcb->remote_bd_addr, false, p_lcb->disc_reason, p_lcb->transport);
-#else
- (*l2cb.fixed_reg[xx].pL2CA_FixedConn_Cb)(xx + L2CAP_FIRST_FIXED_CHNL,
- p_lcb->remote_bd_addr, false, p_lcb->disc_reason, BT_TRANSPORT_BR_EDR);
-#endif
if (p_lcb->p_fixed_ccbs[xx])
{
@@ -2962,29 +2922,18 @@
p_l2c_chnl_ctrl_block = p_lcb->p_fixed_ccbs[xx];
p_lcb->p_fixed_ccbs[xx] = NULL;
l2cu_release_ccb(p_l2c_chnl_ctrl_block);
-#if (BLE_INCLUDED == TRUE)
(*l2cb.fixed_reg[xx].pL2CA_FixedConn_Cb)(xx + L2CAP_FIRST_FIXED_CHNL,
p_lcb->remote_bd_addr, false, p_lcb->disc_reason, p_lcb->transport);
-#else
- (*l2cb.fixed_reg[xx].pL2CA_FixedConn_Cb)(xx + L2CAP_FIRST_FIXED_CHNL,
- p_lcb->remote_bd_addr, false, p_lcb->disc_reason, BT_TRANSPORT_BR_EDR);
-#endif
}
}
else if ( (peer_channel_mask & (1 << (xx + L2CAP_FIRST_FIXED_CHNL)))
&& (l2cb.fixed_reg[xx].pL2CA_FixedConn_Cb != NULL) )
-#if (BLE_INCLUDED == TRUE)
(*l2cb.fixed_reg[xx].pL2CA_FixedConn_Cb)(xx + L2CAP_FIRST_FIXED_CHNL,
p_lcb->remote_bd_addr, false, p_lcb->disc_reason, p_lcb->transport);
-#else
- (*l2cb.fixed_reg[xx].pL2CA_FixedConn_Cb)(xx + L2CAP_FIRST_FIXED_CHNL,
- p_lcb->remote_bd_addr, false, p_lcb->disc_reason, BT_TRANSPORT_BR_EDR);
-#endif
}
#endif
}
-#if (BLE_INCLUDED == TRUE)
/*******************************************************************************
**
** Function l2cu_send_peer_ble_par_req
@@ -3261,7 +3210,6 @@
l2c_link_check_send_pkts (p_lcb, NULL, p_buf);
}
-#endif /* BLE_INCLUDED == TRUE */
/*******************************************************************************
@@ -3653,7 +3601,6 @@
/* Set the pointer to the beginning of the data minus 4 bytes for the packet header */
p = (uint8_t *)(p_buf + 1) + p_buf->offset - HCI_DATA_PREAMBLE_SIZE;
-#if (BLE_INCLUDED == TRUE)
if (p_ccb->p_lcb->transport == BT_TRANSPORT_LE)
{
UINT16_TO_STREAM (p, p_ccb->p_lcb->handle | (L2CAP_PKT_START_NON_FLUSHABLE << L2CAP_PKT_TYPE_SHIFT));
@@ -3668,9 +3615,8 @@
{
UINT16_TO_STREAM (p, p_buf->len);
}
- } /* (BLE_INCLUDED == TRUE) */
+ }
else
-#endif
{
#if (L2CAP_NON_FLUSHABLE_PB_INCLUDED == TRUE)
if ( (((p_buf->layer_specific & L2CAP_FLUSHABLE_MASK) == L2CAP_FLUSHABLE_CH_BASED) && (p_ccb->is_flushable))
diff --git a/stack/smp/smp_br_main.cc b/stack/smp/smp_br_main.cc
index dbeea27..c8e1227 100644
--- a/stack/smp/smp_br_main.cc
+++ b/stack/smp/smp_br_main.cc
@@ -21,8 +21,6 @@
#include <string.h>
#include "smp_int.h"
-#if (BLE_INCLUDED == TRUE)
-
const char *const smp_br_state_name [SMP_BR_STATE_MAX+1] =
{
"SMP_BR_STATE_IDLE",
@@ -395,5 +393,3 @@
}
SMP_TRACE_DEBUG( "result state = %s", smp_get_br_state_name( p_cb->br_state ) ) ;
}
-
-#endif
diff --git a/stack/smp/smp_int.h b/stack/smp/smp_int.h
index 93256ad..c706a83 100644
--- a/stack/smp/smp_int.h
+++ b/stack/smp/smp_int.h
@@ -24,8 +24,6 @@
#ifndef SMP_INT_H
#define SMP_INT_H
-#if (BLE_INCLUDED == TRUE)
-
#include "btu.h"
#include "btm_ble_api.h"
#include "btm_api.h"
@@ -535,6 +533,4 @@
uint16_t tlen, uint8_t *p_signature);
extern void print128(BT_OCTET16 x, const uint8_t *key_name);
-#endif
-
#endif /* SMP_INT_H */
diff --git a/stack/srvc/srvc_battery.cc b/stack/srvc/srvc_battery.cc
index 21b10aa..7f16ae5 100644
--- a/stack/srvc/srvc_battery.cc
+++ b/stack/srvc/srvc_battery.cc
@@ -25,8 +25,6 @@
#include "btcore/include/uuid.h"
#include "osi/include/osi.h"
-#if (BLE_INCLUDED == TRUE)
-
#define BA_MAX_CHAR_NUM 1
#define BA_MAX_ATTR_NUM (BA_MAX_CHAR_NUM * 5 + 1) /* max 3 descriptors, 1 desclration and 1 value */
@@ -396,4 +394,3 @@
/* to be implemented */
return true;
}
-#endif /* BLE_INCLUDED */
diff --git a/stack/srvc/srvc_dis.cc b/stack/srvc/srvc_dis.cc
index 308228e..df27dd3 100644
--- a/stack/srvc/srvc_dis.cc
+++ b/stack/srvc/srvc_dis.cc
@@ -28,8 +28,6 @@
#include "srvc_eng_int.h"
#include "btcore/include/uuid.h"
-#if (BLE_INCLUDED == TRUE)
-
#define DIS_MAX_NUM_INC_SVR 0
#define DIS_MAX_CHAR_NUM 9
#define DIS_MAX_ATTR_NUM (DIS_MAX_CHAR_NUM * 2 + DIS_MAX_NUM_INC_SVR + 1)
@@ -486,5 +484,3 @@
return dis_gatt_c_read_dis_req(conn_id);
}
-#endif /* BLE_INCLUDED */
-
diff --git a/stack/srvc/srvc_eng.cc b/stack/srvc/srvc_eng.cc
index a2be5f7..a9c27e5 100644
--- a/stack/srvc/srvc_eng.cc
+++ b/stack/srvc/srvc_eng.cc
@@ -23,8 +23,6 @@
#include "osi/include/osi.h"
#include "srvc_eng_int.h"
-#if (BLE_INCLUDED == TRUE)
-
#include "srvc_dis_int.h"
#include "srvc_battery_int.h"
@@ -471,8 +469,3 @@
GATTS_HandleValueNotification( conn_id, handle, len, p_value);
}
}
-
-#endif
-
-
-