diff --git a/system/bta/dm/bta_dm_act.cc b/system/bta/dm/bta_dm_act.cc
index a7ffed9eec53f772841d45750d7e24b18b8066f3..e4ee3715715f9dc4f416ab2a99241241949b6978 100644
--- a/system/bta/dm/bta_dm_act.cc
+++ b/system/bta/dm/bta_dm_act.cc
@@ -693,7 +693,7 @@ void bta_dm_add_device(std::unique_ptr<tBTA_DM_API_ADD_DEVICE> msg) {
/** This function forces to close the connection to a remote device and
* optionaly remove the device from security database if required. */
void bta_dm_close_acl(const RawAddress& bd_addr, bool remove_dev,
- tBTA_TRANSPORT transport) {
+ tBT_TRANSPORT transport) {
uint8_t index;
APPL_TRACE_DEBUG("bta_dm_close_acl");
@@ -725,7 +725,7 @@ void bta_dm_close_acl(const RawAddress& bd_addr, bool remove_dev,
/** Bonds with peer device */
void bta_dm_bond(const RawAddress& bd_addr, tBLE_ADDR_TYPE addr_type,
- tBTA_TRANSPORT transport, int device_type) {
+ tBT_TRANSPORT transport, int device_type) {
tBTA_DM_SEC sec_event;
char* p_name;
@@ -1756,7 +1756,7 @@ static void bta_dm_discover_next_device(void) {
******************************************************************************/
static void bta_dm_discover_device(const RawAddress& remote_bd_addr) {
tBT_TRANSPORT transport = BT_TRANSPORT_BR_EDR;
- if (bta_dm_search_cb.transport == BTA_TRANSPORT_UNKNOWN) {
+ if (bta_dm_search_cb.transport == BT_TRANSPORT_UNKNOWN) {
tBT_DEVICE_TYPE dev_type;
tBLE_ADDR_TYPE addr_type;
@@ -1768,7 +1768,7 @@ static void bta_dm_discover_device(const RawAddress& remote_bd_addr) {
}
/* Reset transport state for next discovery */
- bta_dm_search_cb.transport = BTA_TRANSPORT_UNKNOWN;
+ bta_dm_search_cb.transport = BT_TRANSPORT_UNKNOWN;
VLOG(1) << __func__ << " BDA: " << remote_bd_addr;
@@ -3336,7 +3336,7 @@ void bta_dm_encrypt_cback(const RawAddress* bd_addr, tBT_TRANSPORT transport,
}
/**This function to encrypt the link */
-void bta_dm_set_encryption(const RawAddress& bd_addr, tBTA_TRANSPORT transport,
+void bta_dm_set_encryption(const RawAddress& bd_addr, tBT_TRANSPORT transport,
tBTA_DM_ENCRYPT_CBACK* p_callback,
tBTM_BLE_SEC_ACT sec_act) {
uint8_t i;
diff --git a/system/bta/dm/bta_dm_api.cc b/system/bta/dm/bta_dm_api.cc
index 9cdbe67b575ef2e54a62f882f7eef7c2866daefe..26775a3711a692a2f46771e390cc18e29fb8dc76 100644
--- a/system/bta/dm/bta_dm_api.cc
+++ b/system/bta/dm/bta_dm_api.cc
@@ -173,7 +173,7 @@ void BTA_DmDiscoverUUID(const RawAddress& bd_addr, const Uuid& uuid,
/** This function initiates a bonding procedure with a peer device */
void BTA_DmBond(const RawAddress& bd_addr, tBLE_ADDR_TYPE addr_type,
- tBTA_TRANSPORT transport, int device_type) {
+ tBT_TRANSPORT transport, int device_type) {
do_in_main_thread(FROM_HERE, base::Bind(bta_dm_bond, bd_addr, addr_type,
transport, device_type));
}
@@ -518,8 +518,7 @@ void BTA_DmSetBlePrefConnParams(const RawAddress& bd_addr,
static void bta_dm_discover_send_msg(const RawAddress& bd_addr,
tBTA_SERVICE_MASK_EXT* p_services,
tBTA_DM_SEARCH_CBACK* p_cback,
- bool sdp_search,
- tBTA_TRANSPORT transport) {
+ bool sdp_search, tBT_TRANSPORT transport) {
const size_t len =
p_services
? (sizeof(tBTA_DM_API_DISCOVER) + sizeof(Uuid) * p_services->num_uuid)
@@ -564,7 +563,7 @@ static void bta_dm_discover_send_msg(const RawAddress& bd_addr,
void BTA_DmDiscoverByTransport(const RawAddress& bd_addr,
tBTA_SERVICE_MASK_EXT* p_services,
tBTA_DM_SEARCH_CBACK* p_cback, bool sdp_search,
- tBTA_TRANSPORT transport) {
+ tBT_TRANSPORT transport) {
bta_dm_discover_send_msg(bd_addr, p_services, p_cback, sdp_search, transport);
}
@@ -660,7 +659,7 @@ void BTA_DmBleSetDataLength(const RawAddress& remote_device,
* Returns void
*
******************************************************************************/
-void BTA_DmSetEncryption(const RawAddress& bd_addr, tBTA_TRANSPORT transport,
+void BTA_DmSetEncryption(const RawAddress& bd_addr, tBT_TRANSPORT transport,
tBTA_DM_ENCRYPT_CBACK* p_callback,
tBTM_BLE_SEC_ACT sec_act) {
APPL_TRACE_API("%s", __func__);
@@ -682,7 +681,7 @@ void BTA_DmSetEncryption(const RawAddress& bd_addr, tBTA_TRANSPORT transport,
*
******************************************************************************/
void BTA_DmCloseACL(const RawAddress& bd_addr, bool remove_dev,
- tBTA_TRANSPORT transport) {
+ tBT_TRANSPORT transport) {
do_in_main_thread(
FROM_HERE, base::Bind(bta_dm_close_acl, bd_addr, remove_dev, transport));
}
diff --git a/system/bta/dm/bta_dm_int.h b/system/bta/dm/bta_dm_int.h
index 536009021a66477a56346f8beaaacc268a14d51b..110f41d96154dcd2d7993b758ef1c4289ba9c908 100644
--- a/system/bta/dm/bta_dm_int.h
+++ b/system/bta/dm/bta_dm_int.h
@@ -86,7 +86,7 @@ typedef struct {
tBTA_SERVICE_MASK services;
tBTA_DM_SEARCH_CBACK* p_cback;
bool sdp_search;
- tBTA_TRANSPORT transport;
+ tBT_TRANSPORT transport;
uint8_t num_uuid;
bluetooth::Uuid* p_uuid;
bluetooth::Uuid uuid;
@@ -351,7 +351,7 @@ typedef struct {
uint8_t peer_scn;
bool sdp_search;
bool cancel_pending; /* inquiry cancel is pending */
- tBTA_TRANSPORT transport;
+ tBT_TRANSPORT transport;
tBTA_DM_SEARCH_CBACK* p_scan_cback;
tGATT_IF client_if;
uint8_t num_uuid;
@@ -472,12 +472,12 @@ extern void bta_dm_set_dev_name(const std::vector<uint8_t>&);
extern void bta_dm_set_visibility(tBTA_DM_DISC, tBTA_DM_CONN, uint8_t, uint8_t);
extern void bta_dm_set_scan_config(tBTA_DM_MSG* p_data);
extern void bta_dm_vendor_spec_command(tBTA_DM_MSG* p_data);
-extern void bta_dm_bond(const RawAddress&, tBLE_ADDR_TYPE, tBTA_TRANSPORT, int);
+extern void bta_dm_bond(const RawAddress&, tBLE_ADDR_TYPE, tBT_TRANSPORT, int);
extern void bta_dm_bond_cancel(const RawAddress&);
extern void bta_dm_pin_reply(std::unique_ptr<tBTA_DM_API_PIN_REPLY> msg);
extern void bta_dm_add_device(std::unique_ptr<tBTA_DM_API_ADD_DEVICE> msg);
extern void bta_dm_remove_device(const RawAddress& bd_addr);
-extern void bta_dm_close_acl(const RawAddress&, bool, tBTA_TRANSPORT);
+extern void bta_dm_close_acl(const RawAddress&, bool, tBT_TRANSPORT);
extern void bta_dm_pm_btm_status(const RawAddress&, tBTM_PM_STATUS, uint16_t,
uint8_t);
@@ -506,7 +506,7 @@ extern void bta_dm_ble_set_data_length(const RawAddress&, uint16_t);
extern void bta_dm_ble_get_energy_info(tBTA_BLE_ENERGY_INFO_CBACK*);
-extern void bta_dm_set_encryption(const RawAddress&, tBTA_TRANSPORT,
+extern void bta_dm_set_encryption(const RawAddress&, tBT_TRANSPORT,
tBTA_DM_ENCRYPT_CBACK*, tBTM_BLE_SEC_ACT);
extern void bta_dm_confirm(const RawAddress&, bool);
diff --git a/system/bta/gatt/bta_gattc_act.cc b/system/bta/gatt/bta_gattc_act.cc
index fb0ca15f2368306bf395568a61d6cbb722099d46..2329a448c7aa3c619c46759f86c9bd08e271a3f1 100644
--- a/system/bta/gatt/bta_gattc_act.cc
+++ b/system/bta/gatt/bta_gattc_act.cc
@@ -500,7 +500,7 @@ void bta_gattc_conn(tBTA_GATTC_CLCB* p_clcb, tBTA_GATTC_DATA* p_data) {
if (p_clcb->p_rcb) {
/* there is no RM for GATT */
- if (p_clcb->transport == BTA_TRANSPORT_BR_EDR)
+ if (p_clcb->transport == BT_TRANSPORT_BR_EDR)
bta_sys_conn_open(BTA_ID_GATTC, BTA_ALL_APP_ID, p_clcb->bda);
bta_gattc_send_open_cback(p_clcb->p_rcb, GATT_SUCCESS, p_clcb->bda,
@@ -542,7 +542,7 @@ void bta_gattc_close(tBTA_GATTC_CLCB* p_clcb, tBTA_GATTC_DATA* p_data) {
cb_data.close.status = p_clcb->status;
cb_data.close.remote_bda = p_clcb->bda;
- if (p_clcb->transport == BTA_TRANSPORT_BR_EDR)
+ if (p_clcb->transport == BT_TRANSPORT_BR_EDR)
bta_sys_conn_close(BTA_ID_GATTC, BTA_ALL_APP_ID, p_clcb->bda);
bta_gattc_clcb_dealloc(p_clcb);
@@ -649,7 +649,7 @@ void bta_gattc_start_discover(tBTA_GATTC_CLCB* p_clcb,
p_clcb->p_srcb->update_count = 0;
p_clcb->p_srcb->state = BTA_GATTC_SERV_DISC_ACT;
- if (p_clcb->transport == BTA_TRANSPORT_LE)
+ if (p_clcb->transport == BT_TRANSPORT_LE)
L2CA_EnableUpdateBleConnParams(p_clcb->p_srcb->server_bda, false);
/* set all srcb related clcb into discovery ST */
@@ -683,7 +683,7 @@ void bta_gattc_disc_cmpl(tBTA_GATTC_CLCB* p_clcb,
VLOG(1) << __func__ << ": conn_id=" << loghex(p_clcb->bta_conn_id);
- if (p_clcb->transport == BTA_TRANSPORT_LE)
+ if (p_clcb->transport == BT_TRANSPORT_LE)
L2CA_EnableUpdateBleConnParams(p_clcb->p_srcb->server_bda, true);
p_clcb->p_srcb->state = BTA_GATTC_SERV_IDLE;
p_clcb->disc_active = false;
@@ -837,7 +837,7 @@ void bta_gattc_confirm(tBTA_GATTC_CLCB* p_clcb, tBTA_GATTC_DATA* p_data) {
LOG(ERROR) << __func__ << ": to handle=" << loghex(handle) << " failed";
} else {
/* if over BR_EDR, inform PM for mode change */
- if (p_clcb->transport == BTA_TRANSPORT_BR_EDR) {
+ if (p_clcb->transport == BT_TRANSPORT_BR_EDR) {
bta_sys_busy(BTA_ID_GATTC, BTA_ALL_APP_ID, p_clcb->bda);
bta_sys_idle(BTA_ID_GATTC, BTA_ALL_APP_ID, p_clcb->bda);
}
@@ -1216,7 +1216,7 @@ void bta_gattc_process_indicate(uint16_t conn_id, tGATTC_OPTYPE op,
tBTA_GATTC_NOTIFY notify;
RawAddress remote_bda;
tGATT_IF gatt_if;
- tBTA_TRANSPORT transport;
+ tBT_TRANSPORT transport;
if (!GATT_GetConnectionInfor(conn_id, &gatt_if, remote_bda, &transport)) {
LOG(ERROR) << __func__ << ": indication/notif for unknown app";
@@ -1298,7 +1298,7 @@ static void bta_gattc_cmpl_cback(uint16_t conn_id, tGATTC_OPTYPE op,
}
/* if over BR_EDR, inform PM for mode change */
- if (p_clcb->transport == BTA_TRANSPORT_BR_EDR) {
+ if (p_clcb->transport == BT_TRANSPORT_BR_EDR) {
bta_sys_busy(BTA_ID_GATTC, BTA_ALL_APP_ID, p_clcb->bda);
bta_sys_idle(BTA_ID_GATTC, BTA_ALL_APP_ID, p_clcb->bda);
}
diff --git a/system/bta/gatt/bta_gattc_cache.cc b/system/bta/gatt/bta_gattc_cache.cc
index 186bb85b8faff68c48088cccb6cd39cea18f56f4..0bfb591e4eacf0b74cdafd2ea9f91dc1186d95d6 100644
--- a/system/bta/gatt/bta_gattc_cache.cc
+++ b/system/bta/gatt/bta_gattc_cache.cc
@@ -135,7 +135,7 @@ tGATT_STATUS bta_gattc_discover_pri_service(uint16_t conn_id,
tBTA_GATTC_CLCB* p_clcb = bta_gattc_find_clcb_by_conn_id(conn_id);
if (!p_clcb) return GATT_ERROR;
- if (p_clcb->transport == BTA_TRANSPORT_LE) {
+ if (p_clcb->transport == BT_TRANSPORT_LE) {
return GATTC_Discover(conn_id, disc_type, 0x0001, 0xFFFF);
}
diff --git a/system/bta/gatt/bta_gattc_int.h b/system/bta/gatt/bta_gattc_int.h
index 4cfad8a535a24ae8f62dfc88ca42e81f64ac0dfd..5e798fda5ab725bcae00ce7325a063fbf019cab1 100644
--- a/system/bta/gatt/bta_gattc_int.h
+++ b/system/bta/gatt/bta_gattc_int.h
@@ -35,6 +35,7 @@
#include <base/logging.h>
#include <base/strings/stringprintf.h>
+#include "types/bt_transport.h"
/*****************************************************************************
* Constants and data types
@@ -90,7 +91,7 @@ typedef struct {
RawAddress remote_bda;
tGATT_IF client_if;
bool is_direct;
- tBTA_TRANSPORT transport;
+ tBT_TRANSPORT transport;
uint8_t initiating_phys;
bool opportunistic;
} tBTA_GATTC_API_OPEN;
@@ -244,7 +245,7 @@ typedef struct {
typedef struct {
uint16_t bta_conn_id; /* client channel ID, unique for clcb */
RawAddress bda;
- tBTA_TRANSPORT transport; /* channel transport */
+ tBT_TRANSPORT transport; /* channel transport */
tBTA_GATTC_RCB* p_rcb; /* pointer to the registration CB */
tBTA_GATTC_SERV* p_srcb; /* server cache CB */
tBTA_GATTC_DATA* p_q_cmd; /* command in queue waiting for execution */
@@ -372,8 +373,8 @@ extern void bta_gattc_cancel_bk_conn(tBTA_GATTC_API_CANCEL_OPEN* p_data);
extern void bta_gattc_send_open_cback(tBTA_GATTC_RCB* p_clreg,
tGATT_STATUS status,
const RawAddress& remote_bda,
- uint16_t conn_id,
- tBTA_TRANSPORT transport, uint16_t mtu);
+ uint16_t conn_id, tBT_TRANSPORT transport,
+ uint16_t mtu);
extern void bta_gattc_process_api_refresh(const RawAddress& remote_bda);
extern void bta_gattc_cfg_mtu(tBTA_GATTC_CLCB* p_clcb, tBTA_GATTC_DATA* p_data);
extern void bta_gattc_listen(tBTA_GATTC_DATA* p_msg);
@@ -382,15 +383,15 @@ extern void bta_gattc_broadcast(tBTA_GATTC_DATA* p_msg);
/* utility functions */
extern tBTA_GATTC_CLCB* bta_gattc_find_clcb_by_cif(uint8_t client_if,
const RawAddress& remote_bda,
- tBTA_TRANSPORT transport);
+ tBT_TRANSPORT transport);
extern tBTA_GATTC_CLCB* bta_gattc_find_clcb_by_conn_id(uint16_t conn_id);
extern tBTA_GATTC_CLCB* bta_gattc_clcb_alloc(tGATT_IF client_if,
const RawAddress& remote_bda,
- tBTA_TRANSPORT transport);
+ tBT_TRANSPORT transport);
extern void bta_gattc_clcb_dealloc(tBTA_GATTC_CLCB* p_clcb);
extern tBTA_GATTC_CLCB* bta_gattc_find_alloc_clcb(tGATT_IF client_if,
const RawAddress& remote_bda,
- tBTA_TRANSPORT transport);
+ tBT_TRANSPORT transport);
extern tBTA_GATTC_RCB* bta_gattc_cl_get_regcb(uint8_t client_if);
extern tBTA_GATTC_SERV* bta_gattc_find_srcb(const RawAddress& bda);
extern tBTA_GATTC_SERV* bta_gattc_srcb_alloc(const RawAddress& bda);
diff --git a/system/bta/gatt/bta_gattc_utils.cc b/system/bta/gatt/bta_gattc_utils.cc
index d0b45c10b7910d4d2a8c5971eb0eab263349dcab..d1e71b357a7da72d87b1179be4671936b99c15b6 100644
--- a/system/bta/gatt/bta_gattc_utils.cc
+++ b/system/bta/gatt/bta_gattc_utils.cc
@@ -81,7 +81,7 @@ uint8_t bta_gattc_num_reg_app(void) {
******************************************************************************/
tBTA_GATTC_CLCB* bta_gattc_find_clcb_by_cif(uint8_t client_if,
const RawAddress& remote_bda,
- tBTA_TRANSPORT transport) {
+ tBT_TRANSPORT transport) {
tBTA_GATTC_CLCB* p_clcb = &bta_gattc_cb.clcb[0];
uint8_t i;
@@ -122,7 +122,7 @@ tBTA_GATTC_CLCB* bta_gattc_find_clcb_by_conn_id(uint16_t conn_id) {
******************************************************************************/
tBTA_GATTC_CLCB* bta_gattc_clcb_alloc(tGATT_IF client_if,
const RawAddress& remote_bda,
- tBTA_TRANSPORT transport) {
+ tBT_TRANSPORT transport) {
uint8_t i_clcb = 0;
tBTA_GATTC_CLCB* p_clcb = NULL;
@@ -167,7 +167,7 @@ tBTA_GATTC_CLCB* bta_gattc_clcb_alloc(tGATT_IF client_if,
******************************************************************************/
tBTA_GATTC_CLCB* bta_gattc_find_alloc_clcb(tGATT_IF client_if,
const RawAddress& remote_bda,
- tBTA_TRANSPORT transport) {
+ tBT_TRANSPORT transport) {
tBTA_GATTC_CLCB* p_clcb;
p_clcb = bta_gattc_find_clcb_by_cif(client_if, remote_bda, transport);
@@ -489,7 +489,7 @@ bool bta_gattc_check_bg_conn(tGATT_IF client_if, const RawAddress& remote_bda,
******************************************************************************/
void bta_gattc_send_open_cback(tBTA_GATTC_RCB* p_clreg, tGATT_STATUS status,
const RawAddress& remote_bda, uint16_t conn_id,
- tBTA_TRANSPORT transport, uint16_t mtu) {
+ tBT_TRANSPORT transport, uint16_t mtu) {
tBTA_GATTC cb_data;
if (p_clreg->p_cback) {
diff --git a/system/bta/gatt/bta_gatts_act.cc b/system/bta/gatt/bta_gatts_act.cc
index 8e3d589c40b923c91ad9d2552643d9ae750ffa58..95b83f3c67be3eca253b39f11305053af8fb6445 100644
--- a/system/bta/gatt/bta_gatts_act.cc
+++ b/system/bta/gatt/bta_gatts_act.cc
@@ -372,7 +372,7 @@ void bta_gatts_indicate_handle(tBTA_GATTS_CB* p_cb, tBTA_GATTS_DATA* p_msg) {
tGATT_STATUS status = GATT_ILLEGAL_PARAMETER;
tGATT_IF gatt_if;
RawAddress remote_bda;
- tBTA_TRANSPORT transport;
+ tBT_TRANSPORT transport;
tBTA_GATTS cb_data;
p_srvc_cb =
@@ -394,7 +394,7 @@ void bta_gatts_indicate_handle(tBTA_GATTS_CB* p_cb, tBTA_GATTS_DATA* p_msg) {
p_msg->api_indicate.len, p_msg->api_indicate.value);
/* if over BR_EDR, inform PM for mode change */
- if (transport == BTA_TRANSPORT_BR_EDR) {
+ if (transport == BT_TRANSPORT_BR_EDR) {
bta_sys_busy(BTA_ID_GATTS, BTA_ALL_APP_ID, remote_bda);
bta_sys_idle(BTA_ID_GATTS, BTA_ALL_APP_ID, remote_bda);
}
@@ -514,7 +514,7 @@ void bta_gatts_close(UNUSED_ATTR tBTA_GATTS_CB* p_cb, tBTA_GATTS_DATA* p_msg) {
p_rcb = bta_gatts_find_app_rcb_by_app_if(gatt_if);
if (p_rcb && p_rcb->p_cback) {
- if (transport == BTA_TRANSPORT_BR_EDR)
+ if (transport == BT_TRANSPORT_BR_EDR)
bta_sys_conn_close(BTA_ID_GATTS, BTA_ALL_APP_ID, remote_bda);
tBTA_GATTS bta_gatts;
@@ -554,7 +554,7 @@ static void bta_gatts_send_request_cback(uint16_t conn_id, uint32_t trans_id,
if (p_rcb && p_rcb->p_cback) {
/* if over BR_EDR, inform PM for mode change */
- if (transport == BTA_TRANSPORT_BR_EDR) {
+ if (transport == BT_TRANSPORT_BR_EDR) {
bta_sys_busy(BTA_ID_GATTS, BTA_ALL_APP_ID, cb_data.req_data.remote_bda);
bta_sys_idle(BTA_ID_GATTS, BTA_ALL_APP_ID, cb_data.req_data.remote_bda);
}
@@ -603,7 +603,7 @@ static void bta_gatts_conn_cback(tGATT_IF gatt_if, const RawAddress& bdaddr,
if (p_reg && p_reg->p_cback) {
/* there is no RM for GATT */
- if (transport == BTA_TRANSPORT_BR_EDR) {
+ if (transport == BT_TRANSPORT_BR_EDR) {
if (connected)
bta_sys_conn_open(BTA_ID_GATTS, BTA_ALL_APP_ID, bdaddr);
else
diff --git a/system/bta/hearing_aid/hearing_aid.cc b/system/bta/hearing_aid/hearing_aid.cc
index 89e234207bb2b369ec75b7e216e1c65434a46908..c10abe61b40d0bb311bd00dd09789926e24f0d99 100644
--- a/system/bta/hearing_aid/hearing_aid.cc
+++ b/system/bta/hearing_aid/hearing_aid.cc
@@ -347,7 +347,7 @@ class HearingAidImpl : public HearingAid {
void OnGattConnected(tGATT_STATUS status, uint16_t conn_id,
tGATT_IF client_if, RawAddress address,
- tBTA_TRANSPORT transport, uint16_t mtu) {
+ tBT_TRANSPORT transport, uint16_t mtu) {
VLOG(2) << __func__ << ": address=" << address << ", conn_id=" << conn_id;
HearingDevice* hearingDevice = hearingDevices.FindByAddress(address);
@@ -420,7 +420,7 @@ class HearingAidImpl : public HearingAid {
if (sec_flag & BTM_SEC_FLAG_LKEY_KNOWN) {
/* if bonded and link not encrypted */
sec_flag = BTM_BLE_SEC_ENCRYPT;
- BTM_SetEncryption(address, BTA_TRANSPORT_LE, encryption_callback, nullptr,
+ BTM_SetEncryption(address, BT_TRANSPORT_LE, encryption_callback, nullptr,
sec_flag);
return;
}
diff --git a/system/bta/hh/bta_hh_le.cc b/system/bta/hh/bta_hh_le.cc
index aaeea57f545034279060195402fca9f038e61606..7d44be7d9bffc3fdf3fd5a335c529a2d793b79b4 100755
--- a/system/bta/hh/bta_hh_le.cc
+++ b/system/bta/hh/bta_hh_le.cc
@@ -1093,7 +1093,7 @@ void bta_hh_start_security(tBTA_HH_DEV_CB* p_cb,
else if (sec_flag & BTM_SEC_FLAG_LKEY_KNOWN) {
sec_flag = BTM_BLE_SEC_ENCRYPT;
p_cb->status = BTA_HH_ERR_AUTH_FAILED;
- BTM_SetEncryption(p_cb->addr, BTA_TRANSPORT_LE, bta_hh_le_encrypt_cback,
+ BTM_SetEncryption(p_cb->addr, BT_TRANSPORT_LE, bta_hh_le_encrypt_cback,
NULL, sec_flag);
}
/* unbonded device, report security error here */
@@ -1101,7 +1101,7 @@ void bta_hh_start_security(tBTA_HH_DEV_CB* p_cb,
sec_flag = BTM_BLE_SEC_ENCRYPT_NO_MITM;
p_cb->status = BTA_HH_ERR_AUTH_FAILED;
bta_hh_clear_service_cache(p_cb);
- BTM_SetEncryption(p_cb->addr, BTA_TRANSPORT_LE, bta_hh_le_encrypt_cback,
+ BTM_SetEncryption(p_cb->addr, BT_TRANSPORT_LE, bta_hh_le_encrypt_cback,
NULL, sec_flag);
}
/* otherwise let it go through */
diff --git a/system/bta/include/bta_api.h b/system/bta/include/bta_api.h
index 1101d8735b3c7e58c73e532207290928839427f8..6c40ab6cdc5e1272d817d897ae840632d2318023 100644
--- a/system/bta/include/bta_api.h
+++ b/system/bta/include/bta_api.h
@@ -678,7 +678,7 @@ typedef void(tBTA_DM_EXEC_CBACK)(void* p_param);
/* Encryption callback*/
typedef void(tBTA_DM_ENCRYPT_CBACK)(const RawAddress& bd_addr,
- tBTA_TRANSPORT transport,
+ tBT_TRANSPORT transport,
tBTA_STATUS result);
#define BTA_DM_BLE_SEC_NONE BTM_BLE_SEC_NONE
@@ -1038,7 +1038,7 @@ tBTA_STATUS BTA_DmGetCachedRemoteName(const RawAddress& remote_device,
*
******************************************************************************/
extern void BTA_DmBond(const RawAddress& bd_addr, tBLE_ADDR_TYPE addr_type,
- tBTA_TRANSPORT transport, int device_type);
+ tBT_TRANSPORT transport, int device_type);
/*******************************************************************************
*
@@ -1184,7 +1184,7 @@ extern tBTA_STATUS BTA_DmSetLocalDiRecord(tBTA_DI_RECORD* p_device_info,
*
******************************************************************************/
extern void BTA_DmCloseACL(const RawAddress& bd_addr, bool remove_dev,
- tBTA_TRANSPORT transport);
+ tBT_TRANSPORT transport);
/* BLE related API functions */
/*******************************************************************************
@@ -1314,8 +1314,7 @@ extern void BTA_DmSetBlePrefConnParams(const RawAddress& bd_addr,
extern void BTA_DmDiscoverByTransport(const RawAddress& bd_addr,
tBTA_SERVICE_MASK_EXT* p_services,
tBTA_DM_SEARCH_CBACK* p_cback,
- bool sdp_search,
- tBTA_TRANSPORT transport);
+ bool sdp_search, tBT_TRANSPORT transport);
/*******************************************************************************
*
@@ -1341,7 +1340,7 @@ extern void BTA_DmDiscoverByTransport(const RawAddress& bd_addr,
*
******************************************************************************/
extern void BTA_DmSetEncryption(const RawAddress& bd_addr,
- tBTA_TRANSPORT transport,
+ tBT_TRANSPORT transport,
tBTA_DM_ENCRYPT_CBACK* p_callback,
tBTM_BLE_SEC_ACT sec_act);
diff --git a/system/bta/include/bta_gatt_api.h b/system/bta/include/bta_gatt_api.h
index 924df83d1e071d21db81f7b487e66f25ad7461be..32daeb532199d170bf3d73fe5c6c28975f2cb0fe 100644
--- a/system/bta/include/bta_gatt_api.h
+++ b/system/bta/include/bta_gatt_api.h
@@ -145,7 +145,7 @@ typedef struct {
uint16_t conn_id;
tGATT_IF client_if;
RawAddress remote_bda;
- tBTA_TRANSPORT transport;
+ tBT_TRANSPORT transport;
uint16_t mtu;
} tBTA_GATTC_OPEN;
diff --git a/system/btif/src/btif_dm.cc b/system/btif/src/btif_dm.cc
index 55b87485d11de187be7c94f38356314774939873..0a37dccacc1781128b3e97557b6e34f32fbceba2 100644
--- a/system/btif/src/btif_dm.cc
+++ b/system/btif/src/btif_dm.cc
@@ -208,7 +208,7 @@ static size_t btif_events_end_index = 0;
static btif_dm_pairing_cb_t pairing_cb;
static btif_dm_oob_cb_t oob_cb;
static void btif_dm_cb_create_bond(const RawAddress bd_addr,
- tBTA_TRANSPORT transport);
+ tBT_TRANSPORT transport);
static void btif_update_remote_properties(const RawAddress& bd_addr,
BD_NAME bd_name, DEV_CLASS dev_class,
tBT_DEVICE_TYPE dev_type);
@@ -271,7 +271,7 @@ static void btif_dm_send_bond_state_changed(RawAddress address, bt_bond_state_t
}
invoke_bond_state_changed_cb(BT_STATUS_SUCCESS, address, bond_state);
- btif_dm_get_remote_services_by_transport(&address, BTA_TRANSPORT_UNKNOWN);
+ btif_dm_get_remote_services_by_transport(&address, BT_TRANSPORT_UNKNOWN);
}
void btif_dm_init(uid_set_t* set) {
@@ -663,7 +663,7 @@ static void btif_update_remote_properties(const RawAddress& bdaddr,
*
******************************************************************************/
static void btif_dm_cb_create_bond(const RawAddress bd_addr,
- tBTA_TRANSPORT transport) {
+ tBT_TRANSPORT transport) {
bool is_hid = check_cod(&bd_addr, COD_HID_POINTING);
bond_state_changed(BT_STATUS_SUCCESS, bd_addr, BT_BOND_STATE_BONDING);
@@ -1074,7 +1074,7 @@ static void btif_dm_auth_cmpl_evt(tBTA_DM_AUTH_CMPL* p_auth_cmpl) {
BTIF_TRACE_WARNING("%s() - Pairing timeout; retrying (%d) ...",
__func__, pairing_cb.timeout_retries);
--pairing_cb.timeout_retries;
- btif_dm_cb_create_bond(bd_addr, BTA_TRANSPORT_UNKNOWN);
+ btif_dm_cb_create_bond(bd_addr, BT_TRANSPORT_UNKNOWN);
return;
}
FALLTHROUGH_INTENDED; /* FALLTHROUGH */
@@ -1107,7 +1107,7 @@ static void btif_dm_auth_cmpl_evt(tBTA_DM_AUTH_CMPL* p_auth_cmpl) {
/* Create the Bond once again */
BTIF_TRACE_WARNING("%s() auto pair failed. Reinitiate Bond",
__func__);
- btif_dm_cb_create_bond(bd_addr, BTA_TRANSPORT_UNKNOWN);
+ btif_dm_cb_create_bond(bd_addr, BT_TRANSPORT_UNKNOWN);
return;
} else {
/* if autopair attempts are more than 1, or not attempted */
diff --git a/system/btif/src/btif_gatt_util.cc b/system/btif/src/btif_gatt_util.cc
index 2f2df59f245e1917c479f4d83c954988388f1336..acb9c706592cc6d3689f3d90117a809027be3591 100644
--- a/system/btif/src/btif_gatt_util.cc
+++ b/system/btif/src/btif_gatt_util.cc
@@ -63,7 +63,7 @@ static bool btif_gatt_is_link_encrypted(const RawAddress& bd_addr) {
}
static void btif_gatt_set_encryption_cb(UNUSED_ATTR const RawAddress& bd_addr,
- UNUSED_ATTR tBTA_TRANSPORT transport,
+ UNUSED_ATTR tBT_TRANSPORT transport,
tBTA_STATUS result) {
if (result != BTA_SUCCESS && result != BTA_BUSY) {
BTIF_TRACE_WARNING("%s() - Encryption failed (%d)", __func__, result);
diff --git a/system/main/shim/btm.cc b/system/main/shim/btm.cc
index 47b44aaf438756d4db82decfe6eeaf94da3249f0..e8102b652e329e81fc26ca5aecd343a04d506a38 100644
--- a/system/main/shim/btm.cc
+++ b/system/main/shim/btm.cc
@@ -759,11 +759,11 @@ size_t Btm::GetNumberOfAdvertisingInstances() const {
tBTM_STATUS Btm::CreateBond(const RawAddress& bd_addr, tBLE_ADDR_TYPE addr_type,
tBT_TRANSPORT transport, int device_type) {
- if (transport == BTA_TRANSPORT_UNKNOWN) {
+ if (transport == BT_TRANSPORT_UNKNOWN) {
if (device_type & BT_DEVICE_TYPE_BLE) {
- transport = BTA_TRANSPORT_LE;
+ transport = BT_TRANSPORT_LE;
} else if (device_type & BT_DEVICE_TYPE_BREDR) {
- transport = BTA_TRANSPORT_BR_EDR;
+ transport = BT_TRANSPORT_BR_EDR;
}
LOG_DEBUG("%s guessing transport as %02x ", __func__, transport);
}