Replace BD_ADDR with bt_bdaddr_t in JV related code
Test: compilation test
Change-Id: Ie0cf491506ebb898ba968586048d2b58248ba112
diff --git a/btif/src/btif_gatt_util.cc b/btif/src/btif_gatt_util.cc
index cb6ebe1..647c93b 100644
--- a/btif/src/btif_gatt_util.cc
+++ b/btif/src/btif_gatt_util.cc
@@ -213,7 +213,7 @@
#if (BLE_DELAY_REQUEST_ENC == FALSE)
static bool btif_gatt_is_link_encrypted(const bt_bdaddr_t& bd_addr) {
- return BTA_JvIsEncrypted(to_BD_ADDR(bd_addr));
+ return BTA_JvIsEncrypted(bd_addr);
}
static void btif_gatt_set_encryption_cb(UNUSED_ATTR const bt_bdaddr_t& bd_addr,
diff --git a/btif/src/btif_sock_l2cap.cc b/btif/src/btif_sock_l2cap.cc
index d839b55..23a9b6e 100644
--- a/btif/src/btif_sock_l2cap.cc
+++ b/btif/src/btif_sock_l2cap.cc
@@ -1,19 +1,19 @@
/*
-* Copyright (C) 2014 Samsung System LSI
-* Copyright (C) 2013 The Android Open Source Project
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Copyright (C) 2014 Samsung System LSI
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
#define LOG_TAG "bt_btif_sock"
@@ -197,14 +197,6 @@
return true;
}
-static inline void bd_copy(uint8_t* dest, uint8_t* src, bool swap) {
- if (swap) {
- for (int i = 0; i < 6; i++) dest[i] = src[5 - i];
- } else {
- memcpy(dest, src, 6);
- }
-}
-
static char is_inited(void) {
std::unique_lock<std::mutex> lock(state_lock);
return pth != -1;
@@ -442,8 +434,7 @@
uint32_t new_listen_id;
// std::mutex locked by caller
- accept_rs = btsock_l2cap_alloc_l(
- sock->name, (const bt_bdaddr_t*)p_open->rem_bda, false, 0);
+ accept_rs = btsock_l2cap_alloc_l(sock->name, &p_open->rem_bda, false, 0);
accept_rs->connected = true;
accept_rs->security = sock->security;
accept_rs->fixed_chan = sock->fixed_chan;
@@ -490,8 +481,7 @@
uint32_t new_listen_id;
// std::mutex locked by caller
- accept_rs = btsock_l2cap_alloc_l(
- sock->name, (const bt_bdaddr_t*)p_open->rem_bda, false, 0);
+ accept_rs = btsock_l2cap_alloc_l(sock->name, &p_open->rem_bda, false, 0);
if (accept_rs) {
// swap IDs
new_listen_id = accept_rs->id;
@@ -527,7 +517,7 @@
static void on_cl_l2cap_psm_connect_l(tBTA_JV_L2CAP_OPEN* p_open,
l2cap_socket* sock) {
- bd_copy(sock->addr.address, p_open->rem_bda, 0);
+ sock->addr = p_open->rem_bda;
if (!send_app_psm_or_chan_l(sock)) {
APPL_TRACE_ERROR("send_app_psm_or_chan_l failed");
@@ -550,7 +540,7 @@
static void on_cl_l2cap_le_connect_l(tBTA_JV_L2CAP_LE_OPEN* p_open,
l2cap_socket* sock) {
- bd_copy(sock->addr.address, p_open->rem_bda, 0);
+ sock->addr = p_open->rem_bda;
if (!send_app_psm_or_chan_l(sock)) {
APPL_TRACE_ERROR("send_app_psm_or_chan_l failed");
@@ -926,7 +916,7 @@
} else {
if (fixed_chan) {
if (BTA_JvL2capConnectLE(sock->security, 0, NULL, channel,
- L2CAP_DEFAULT_MTU, NULL, sock->addr.address,
+ L2CAP_DEFAULT_MTU, NULL, sock->addr,
btsock_l2cap_cbk, sock->id) != BTA_JV_SUCCESS)
stat = BT_STATUS_FAIL;
@@ -934,13 +924,13 @@
if (sock->is_le_coc) {
if (BTA_JvL2capConnect(BTA_JV_CONN_TYPE_L2CAP_LE, sock->security, 0,
NULL, channel, L2CAP_MAX_SDU_LENGTH, &cfg,
- sock->addr.address, btsock_l2cap_cbk,
+ sock->addr, btsock_l2cap_cbk,
sock->id) != BTA_JV_SUCCESS)
stat = BT_STATUS_FAIL;
} else {
if (BTA_JvL2capConnect(BTA_JV_CONN_TYPE_L2CAP, sock->security, 0,
&obex_l2c_etm_opt, channel, L2CAP_MAX_SDU_LENGTH,
- &cfg, sock->addr.address, btsock_l2cap_cbk,
+ &cfg, sock->addr, btsock_l2cap_cbk,
sock->id) != BTA_JV_SUCCESS)
stat = BT_STATUS_FAIL;
}
@@ -1050,7 +1040,7 @@
"btsock_l2cap_signaled - %d bytes received from socket", count);
if (sock->fixed_chan) {
- if (BTA_JvL2capWriteFixed(sock->channel, (BD_ADDR*)&sock->addr,
+ if (BTA_JvL2capWriteFixed(sock->channel, sock->addr,
PTR_TO_UINT(buffer), btsock_l2cap_cbk,
buffer, count, user_id) != BTA_JV_SUCCESS) {
// On fail, free the buffer
diff --git a/btif/src/btif_sock_rfc.cc b/btif/src/btif_sock_rfc.cc
index 1db39ae..abb8b4f 100644
--- a/btif/src/btif_sock_rfc.cc
+++ b/btif/src/btif_sock_rfc.cc
@@ -353,8 +353,8 @@
if (is_uuid_empty(service_uuid)) {
tBTA_JV_STATUS ret =
- BTA_JvRfcommConnect(slot->security, slot->role, slot->scn,
- slot->addr.address, rfcomm_cback, slot->id);
+ BTA_JvRfcommConnect(slot->security, slot->role, slot->scn, slot->addr,
+ rfcomm_cback, slot->id);
if (ret != BTA_JV_SUCCESS) {
LOG_ERROR(LOG_TAG, "%s unable to initiate RFCOMM connection: %d",
__func__, ret);
@@ -373,7 +373,7 @@
memcpy(sdp_uuid.uu.uuid128, service_uuid, sizeof(sdp_uuid.uu.uuid128));
if (!is_requesting_sdp()) {
- BTA_JvStartDiscovery((uint8_t*)bd_addr->address, 1, &sdp_uuid, slot->id);
+ BTA_JvStartDiscovery(*bd_addr, 1, &sdp_uuid, slot->id);
slot->f.pending_sdp_request = false;
slot->f.doing_sdp_request = true;
} else {
@@ -501,9 +501,8 @@
rfc_slot_t* srv_rs = find_rfc_slot_by_id(id);
if (!srv_rs) return 0;
- accept_rs =
- create_srv_accept_rfc_slot(srv_rs, (const bt_bdaddr_t*)p_open->rem_bda,
- p_open->handle, p_open->new_listen_handle);
+ accept_rs = create_srv_accept_rfc_slot(
+ srv_rs, &p_open->rem_bda, p_open->handle, p_open->new_listen_handle);
if (!accept_rs) return 0;
// Start monitoring the socket.
@@ -529,7 +528,7 @@
}
slot->rfc_port_handle = BTA_JvRfcommGetPortHdl(p_open->handle);
- memcpy(slot->addr.address, p_open->rem_bda, 6);
+ slot->addr = p_open->rem_bda;
if (send_app_connect_signal(slot->fd, &slot->addr, slot->scn, 0, -1)) {
slot->f.connected = true;
@@ -710,7 +709,7 @@
// Establish the connection if we successfully looked up a channel
// number to connect to.
if (BTA_JvRfcommConnect(slot->security, slot->role,
- p_data->disc_comp.scn, slot->addr.address,
+ p_data->disc_comp.scn, slot->addr,
rfcomm_cback, slot->id) == BTA_JV_SUCCESS) {
slot->scn = p_data->disc_comp.scn;
slot->f.doing_sdp_request = false;
@@ -737,8 +736,7 @@
sdp_uuid.len = 16;
memcpy(sdp_uuid.uu.uuid128, slot->service_uuid,
sizeof(sdp_uuid.uu.uuid128));
- BTA_JvStartDiscovery((uint8_t*)slot->addr.address, 1, &sdp_uuid,
- slot->id);
+ BTA_JvStartDiscovery(slot->addr, 1, &sdp_uuid, slot->id);
slot->f.pending_sdp_request = false;
slot->f.doing_sdp_request = true;
}