IA2: Use proper types API tBTA_SYS_ID
Bug: 298669075
Test: m .
Change-Id: Ib683319ccedd28a55a7baf153ab5bfe8751bc872
diff --git a/system/bta/ag/bta_ag_int.h b/system/bta/ag/bta_ag_int.h
index 201839f..a7c8e9e 100644
--- a/system/bta/ag/bta_ag_int.h
+++ b/system/bta/ag/bta_ag_int.h
@@ -344,7 +344,7 @@
const tBTA_AG_DATA& data);
void bta_ag_sm_execute_by_handle(uint16_t handle, uint16_t event,
const tBTA_AG_DATA& data);
-void bta_ag_collision_cback(tBTA_SYS_CONN_STATUS status, uint8_t id,
+void bta_ag_collision_cback(tBTA_SYS_CONN_STATUS status, tBTA_SYS_ID id,
uint8_t app_id, const RawAddress& peer_addr);
void bta_ag_resume_open(tBTA_AG_SCB* p_scb);
diff --git a/system/bta/ag/bta_ag_main.cc b/system/bta/ag/bta_ag_main.cc
index 80ab89f..0ee7e15 100644
--- a/system/bta/ag/bta_ag_main.cc
+++ b/system/bta/ag/bta_ag_main.cc
@@ -346,8 +346,8 @@
* Returns void
*
******************************************************************************/
-void bta_ag_collision_cback(UNUSED_ATTR tBTA_SYS_CONN_STATUS status, uint8_t id,
- UNUSED_ATTR uint8_t app_id,
+void bta_ag_collision_cback(UNUSED_ATTR tBTA_SYS_CONN_STATUS status,
+ tBTA_SYS_ID id, UNUSED_ATTR uint8_t app_id,
const RawAddress& peer_addr) {
/* Check if we have opening scb for the peer device. */
uint16_t handle = bta_ag_idx_by_bdaddr(&peer_addr);
diff --git a/system/bta/av/bta_av_main.cc b/system/bta/av/bta_av_main.cc
index 768fbca..0347565 100644
--- a/system/bta/av/bta_av_main.cc
+++ b/system/bta/av/bta_av_main.cc
@@ -33,6 +33,7 @@
#include "bta/include/bta_ar_api.h"
#include "bta/include/bta_av_co.h"
#include "bta/include/utl.h"
+#include "bta/sys/bta_sys.h"
#include "btif/avrcp/avrcp_service.h"
#include "btif/include/btif_av.h"
#include "btif/include/btif_av_co.h"
diff --git a/system/bta/dm/bta_dm_act.cc b/system/bta/dm/bta_dm_act.cc
index 9ac96e6..2a6f2f9 100644
--- a/system/bta/dm/bta_dm_act.cc
+++ b/system/bta/dm/bta_dm_act.cc
@@ -92,8 +92,8 @@
static void bta_dm_set_eir(char* local_name);
static void bta_dm_disable_conn_down_timer_cback(void* data);
-void bta_dm_rm_cback(tBTA_SYS_CONN_STATUS status, uint8_t id, uint8_t app_id,
- const RawAddress& peer_addr);
+static void bta_dm_rm_cback(tBTA_SYS_CONN_STATUS status, tBTA_SYS_ID id,
+ uint8_t app_id, const RawAddress& peer_addr);
static void bta_dm_adjust_roles(bool delay_role_switch);
static void bta_dm_bond_cancel_complete_cback(tBTM_STATUS result);
@@ -1453,8 +1453,8 @@
* Returns void
*
******************************************************************************/
-void bta_dm_rm_cback(tBTA_SYS_CONN_STATUS status, uint8_t id, uint8_t app_id,
- const RawAddress& peer_addr) {
+static void bta_dm_rm_cback(tBTA_SYS_CONN_STATUS status, tBTA_SYS_ID id,
+ uint8_t app_id, const RawAddress& peer_addr) {
uint8_t j;
tBTA_PREF_ROLES role;
tBTA_DM_PEER_DEVICE* p_dev;
diff --git a/system/bta/hf_client/bta_hf_client_int.h b/system/bta/hf_client/bta_hf_client_int.h
index 70cde2d..8207055 100644
--- a/system/bta/hf_client/bta_hf_client_int.h
+++ b/system/bta/hf_client/bta_hf_client_int.h
@@ -224,7 +224,7 @@
bool bta_hf_client_allocate_handle(const RawAddress& bd_addr,
uint16_t* p_handle);
void bta_hf_client_app_callback(uint16_t event, tBTA_HF_CLIENT* data);
-void bta_hf_client_collision_cback(tBTA_SYS_CONN_STATUS status, uint8_t id,
+void bta_hf_client_collision_cback(tBTA_SYS_CONN_STATUS status, tBTA_SYS_ID id,
uint8_t app_id, const RawAddress& peer_addr);
void bta_hf_client_resume_open(tBTA_HF_CLIENT_CB* client_cb);
tBTA_STATUS bta_hf_client_api_enable(tBTA_HF_CLIENT_CBACK* p_cback,
diff --git a/system/bta/hf_client/bta_hf_client_main.cc b/system/bta/hf_client/bta_hf_client_main.cc
index ebb6327..97aac60 100644
--- a/system/bta/hf_client/bta_hf_client_main.cc
+++ b/system/bta/hf_client/bta_hf_client_main.cc
@@ -370,7 +370,7 @@
*
******************************************************************************/
void bta_hf_client_collision_cback(UNUSED_ATTR tBTA_SYS_CONN_STATUS status,
- uint8_t id, UNUSED_ATTR uint8_t app_id,
+ tBTA_SYS_ID id, UNUSED_ATTR uint8_t app_id,
const RawAddress& peer_addr) {
tBTA_HF_CLIENT_CB* client_cb = bta_hf_client_find_cb_by_bda(peer_addr);
if (client_cb != NULL && client_cb->state == BTA_HF_CLIENT_OPENING_ST) {
diff --git a/system/bta/sys/bta_sys.h b/system/bta/sys/bta_sys.h
index 4098591..d534a35 100644
--- a/system/bta/sys/bta_sys.h
+++ b/system/bta/sys/bta_sys.h
@@ -226,26 +226,34 @@
void bta_sys_sco_register(tBTA_SYS_CONN_CBACK* p_cback);
-void bta_sys_conn_open(uint8_t id, uint8_t app_id, const RawAddress& peer_addr);
-void bta_sys_conn_close(uint8_t id, uint8_t app_id,
+void bta_sys_conn_open(tBTA_SYS_ID id, uint8_t app_id,
+ const RawAddress& peer_addr);
+void bta_sys_conn_close(tBTA_SYS_ID id, uint8_t app_id,
const RawAddress& peer_addr);
-void bta_sys_app_open(uint8_t id, uint8_t app_id, const RawAddress& peer_addr);
-void bta_sys_app_close(uint8_t id, uint8_t app_id, const RawAddress& peer_addr);
-void bta_sys_sco_open(uint8_t id, uint8_t app_id, const RawAddress& peer_addr);
-void bta_sys_sco_close(uint8_t id, uint8_t app_id, const RawAddress& peer_addr);
-void bta_sys_sco_use(uint8_t id, uint8_t app_id, const RawAddress& peer_addr);
-void bta_sys_sco_unuse(uint8_t id, uint8_t app_id, const RawAddress& peer_addr);
-void bta_sys_idle(uint8_t id, uint8_t app_id, const RawAddress& peer_addr);
-void bta_sys_busy(uint8_t id, uint8_t app_id, const RawAddress& peer_addr);
+void bta_sys_app_open(tBTA_SYS_ID id, uint8_t app_id,
+ const RawAddress& peer_addr);
+void bta_sys_app_close(tBTA_SYS_ID id, uint8_t app_id,
+ const RawAddress& peer_addr);
+void bta_sys_sco_open(tBTA_SYS_ID id, uint8_t app_id,
+ const RawAddress& peer_addr);
+void bta_sys_sco_close(tBTA_SYS_ID id, uint8_t app_id,
+ const RawAddress& peer_addr);
+void bta_sys_sco_use(tBTA_SYS_ID id, uint8_t app_id,
+ const RawAddress& peer_addr);
+void bta_sys_sco_unuse(tBTA_SYS_ID id, uint8_t app_id,
+ const RawAddress& peer_addr);
+void bta_sys_idle(tBTA_SYS_ID id, uint8_t app_id, const RawAddress& peer_addr);
+void bta_sys_busy(tBTA_SYS_ID id, uint8_t app_id, const RawAddress& peer_addr);
void bta_sys_ssr_cfg_register(tBTA_SYS_SSR_CFG_CBACK* p_cback);
-void bta_sys_chg_ssr_config(uint8_t id, uint8_t app_id, uint16_t max_latency,
- uint16_t min_tout);
+void bta_sys_chg_ssr_config(tBTA_SYS_ID id, uint8_t app_id,
+ uint16_t max_latency, uint16_t min_tout);
void bta_sys_role_chg_register(tBTA_SYS_ROLE_SWITCH_CBACK* p_cback);
void bta_sys_notify_role_chg(const RawAddress& peer_addr, tHCI_ROLE new_role,
tHCI_STATUS hci_status);
-void bta_sys_collision_register(uint8_t bta_id, tBTA_SYS_CONN_CBACK* p_cback);
+void bta_sys_collision_register(tBTA_SYS_ID bta_id,
+ tBTA_SYS_CONN_CBACK* p_cback);
void bta_sys_notify_collision(const RawAddress& peer_addr);
#if (BTA_EIR_CANNED_UUID_LIST != TRUE)
diff --git a/system/bta/sys/bta_sys_conn.cc b/system/bta/sys/bta_sys_conn.cc
index 58912ae..3a72e23 100644
--- a/system/bta/sys/bta_sys_conn.cc
+++ b/system/bta/sys/bta_sys_conn.cc
@@ -106,7 +106,8 @@
* Returns void
*
******************************************************************************/
-void bta_sys_collision_register(uint8_t bta_id, tBTA_SYS_CONN_CBACK* p_cback) {
+void bta_sys_collision_register(tBTA_SYS_ID bta_id,
+ tBTA_SYS_CONN_CBACK* p_cback) {
uint8_t index;
for (index = 0; index < MAX_COLLISION_REG; index++) {
@@ -180,7 +181,7 @@
* Returns void
*
******************************************************************************/
-void bta_sys_conn_open(uint8_t id, uint8_t app_id,
+void bta_sys_conn_open(tBTA_SYS_ID id, uint8_t app_id,
const RawAddress& peer_addr) {
if (bta_sys_cb.prm_cb) {
bta_sys_cb.prm_cb(BTA_SYS_CONN_OPEN, id, app_id, peer_addr);
@@ -202,7 +203,7 @@
* Returns void
*
******************************************************************************/
-void bta_sys_conn_close(uint8_t id, uint8_t app_id,
+void bta_sys_conn_close(tBTA_SYS_ID id, uint8_t app_id,
const RawAddress& peer_addr) {
if (bta_sys_cb.prm_cb) {
bta_sys_cb.prm_cb(BTA_SYS_CONN_CLOSE, id, app_id, peer_addr);
@@ -224,7 +225,8 @@
* Returns void
*
******************************************************************************/
-void bta_sys_app_open(uint8_t id, uint8_t app_id, const RawAddress& peer_addr) {
+void bta_sys_app_open(tBTA_SYS_ID id, uint8_t app_id,
+ const RawAddress& peer_addr) {
if (bta_sys_cb.ppm_cb) {
bta_sys_cb.ppm_cb(BTA_SYS_APP_OPEN, id, app_id, peer_addr);
}
@@ -240,7 +242,7 @@
* Returns void
*
******************************************************************************/
-void bta_sys_app_close(uint8_t id, uint8_t app_id,
+void bta_sys_app_close(tBTA_SYS_ID id, uint8_t app_id,
const RawAddress& peer_addr) {
if (bta_sys_cb.ppm_cb) {
bta_sys_cb.ppm_cb(BTA_SYS_APP_CLOSE, id, app_id, peer_addr);
@@ -257,11 +259,12 @@
* Returns void
*
******************************************************************************/
-void bta_sys_sco_open(uint8_t id, uint8_t app_id, const RawAddress& peer_addr) {
+void bta_sys_sco_open(tBTA_SYS_ID id, uint8_t app_id,
+ const RawAddress& peer_addr) {
/* AG triggers p_sco_cb by bta_sys_sco_use. */
if ((id != BTA_ID_AG) && (bta_sys_cb.p_sco_cb)) {
/* without querying BTM_GetNumScoLinks() */
- bta_sys_cb.p_sco_cb(BTA_SYS_SCO_OPEN, 1, app_id, peer_addr);
+ bta_sys_cb.p_sco_cb(BTA_SYS_SCO_OPEN, id, app_id, peer_addr);
}
if (bta_sys_cb.ppm_cb) {
@@ -279,7 +282,7 @@
* Returns void
*
******************************************************************************/
-void bta_sys_sco_close(uint8_t id, uint8_t app_id,
+void bta_sys_sco_close(tBTA_SYS_ID id, uint8_t app_id,
const RawAddress& peer_addr) {
uint8_t num_sco_links;
@@ -303,7 +306,7 @@
* Returns void
*
******************************************************************************/
-void bta_sys_sco_use(UNUSED_ATTR uint8_t id, uint8_t app_id,
+void bta_sys_sco_use(UNUSED_ATTR tBTA_SYS_ID id, uint8_t app_id,
const RawAddress& peer_addr) {
/* AV streaming need to be suspended before SCO is connected. */
if (bta_sys_cb.p_sco_cb) {
@@ -356,7 +359,7 @@
* Returns void
*
******************************************************************************/
-void bta_sys_idle(uint8_t id, uint8_t app_id, const RawAddress& peer_addr) {
+void bta_sys_idle(tBTA_SYS_ID id, uint8_t app_id, const RawAddress& peer_addr) {
if (bta_sys_cb.prm_cb) {
bta_sys_cb.prm_cb(BTA_SYS_CONN_IDLE, id, app_id, peer_addr);
}
@@ -376,7 +379,7 @@
* Returns void
*
******************************************************************************/
-void bta_sys_busy(uint8_t id, uint8_t app_id, const RawAddress& peer_addr) {
+void bta_sys_busy(tBTA_SYS_ID id, uint8_t app_id, const RawAddress& peer_addr) {
if (bta_sys_cb.prm_cb) {
bta_sys_cb.prm_cb(BTA_SYS_CONN_BUSY, id, app_id, peer_addr);
}
diff --git a/system/bta/sys/bta_sys_int.h b/system/bta/sys/bta_sys_int.h
index 65f0ab9..56802e6 100644
--- a/system/bta/sys/bta_sys_int.h
+++ b/system/bta/sys/bta_sys_int.h
@@ -39,7 +39,7 @@
#define MAX_COLLISION_REG 5
typedef struct {
- uint8_t id[MAX_COLLISION_REG];
+ tBTA_SYS_ID id[MAX_COLLISION_REG];
tBTA_SYS_CONN_CBACK* p_coll_cback[MAX_COLLISION_REG];
} tBTA_SYS_COLLISION;
diff --git a/system/test/mock/mock_bta_sys_conn.cc b/system/test/mock/mock_bta_sys_conn.cc
index c6b62f8..36538f1 100644
--- a/system/test/mock/mock_bta_sys_conn.cc
+++ b/system/test/mock/mock_bta_sys_conn.cc
@@ -92,11 +92,11 @@
void bta_sys_sco_register(tBTA_SYS_CONN_CBACK* p_cback) {
inc_func_call_count(__func__);
}
-void bta_sys_sco_unuse(uint8_t id, uint8_t app_id,
+void bta_sys_sco_unuse(tBTA_SYS_ID id, uint8_t app_id,
const RawAddress& peer_addr) {
inc_func_call_count(__func__);
}
-void bta_sys_sco_use(UNUSED_ATTR uint8_t id, uint8_t app_id,
+void bta_sys_sco_use(UNUSED_ATTR tBTA_SYS_ID id, uint8_t app_id,
const RawAddress& peer_addr) {
inc_func_call_count(__func__);
}
