aboutsummaryrefslogtreecommitdiff
path: root/bta/ar/bta_ar.cc
diff options
context:
space:
mode:
Diffstat (limited to 'bta/ar/bta_ar.cc')
-rw-r--r--bta/ar/bta_ar.cc121
1 files changed, 93 insertions, 28 deletions
diff --git a/bta/ar/bta_ar.cc b/bta/ar/bta_ar.cc
index 4dda718c5..8e02aa45b 100644
--- a/bta/ar/bta_ar.cc
+++ b/bta/ar/bta_ar.cc
@@ -22,18 +22,36 @@
*
******************************************************************************/
-#include <cstdint>
+#include <string.h>
-#include "bta/ar/bta_ar_int.h"
-#include "bta/sys/bta_sys.h"
-#include "stack/include/avct_api.h"
-#include "stack/include/avrc_api.h"
+#include "bta_ar_api.h"
+#include "bta_ar_int.h"
/* AV control block */
tBTA_AR_CB bta_ar_cb;
/*******************************************************************************
*
+ * Function bta_ar_id
+ *
+ * Description This function maps sys_id to ar id mask.
+ *
+ * Returns void
+ *
+ ******************************************************************************/
+static uint8_t bta_ar_id(tBTA_SYS_ID sys_id) {
+ uint8_t mask = 0;
+ if (sys_id == BTA_ID_AV) {
+ mask = BTA_AR_AV_MASK;
+ } else if (sys_id == BTA_ID_AVK) {
+ mask = BTA_AR_AVK_MASK;
+ }
+
+ return mask;
+}
+
+/*******************************************************************************
+ *
* Function bta_ar_init
*
* Description This function is called to register to AVDTP.
@@ -61,6 +79,8 @@ static void bta_ar_avdt_cback(uint8_t handle, const RawAddress& bd_addr,
/* route the AVDT registration callback to av or avk */
if (bta_ar_cb.p_av_conn_cback)
(*bta_ar_cb.p_av_conn_cback)(handle, bd_addr, event, p_data, scb_index);
+ if (bta_ar_cb.p_avk_conn_cback)
+ (*bta_ar_cb.p_avk_conn_cback)(handle, bd_addr, event, p_data, scb_index);
}
/*******************************************************************************
@@ -72,15 +92,30 @@ static void bta_ar_avdt_cback(uint8_t handle, const RawAddress& bd_addr,
* Returns void
*
******************************************************************************/
-void bta_ar_reg_avdt(AvdtpRcb* p_reg, tAVDT_CTRL_CBACK* p_cback) {
- bta_ar_cb.p_av_conn_cback = p_cback;
- if (bta_ar_cb.avdt_registered == 0) {
- AVDT_Register(p_reg, bta_ar_avdt_cback);
+void bta_ar_reg_avdt(AvdtpRcb* p_reg, tAVDT_CTRL_CBACK* p_cback,
+ tBTA_SYS_ID sys_id) {
+ uint8_t mask = 0;
+
+ if (sys_id == BTA_ID_AV) {
+ bta_ar_cb.p_av_conn_cback = p_cback;
+ mask = BTA_AR_AV_MASK;
+ } else if (sys_id == BTA_ID_AVK) {
+ bta_ar_cb.p_avk_conn_cback = p_cback;
+ mask = BTA_AR_AVK_MASK;
} else {
- APPL_TRACE_WARNING("%s: doesn't register again (registered:%d)", __func__,
- bta_ar_cb.avdt_registered);
+ APPL_TRACE_ERROR("%s: the registration is from wrong sys_id:%d", __func__,
+ sys_id);
+ }
+
+ if (mask) {
+ if (bta_ar_cb.avdt_registered == 0) {
+ AVDT_Register(p_reg, bta_ar_avdt_cback);
+ } else {
+ APPL_TRACE_WARNING("%s: sys_id:%d doesn't register again (registered:%d)",
+ __func__, sys_id, bta_ar_cb.avdt_registered);
+ }
+ bta_ar_cb.avdt_registered |= mask;
}
- bta_ar_cb.avdt_registered |= BTA_AR_AV_MASK;
}
/*******************************************************************************
@@ -92,9 +127,17 @@ void bta_ar_reg_avdt(AvdtpRcb* p_reg, tAVDT_CTRL_CBACK* p_cback) {
* Returns void
*
******************************************************************************/
-void bta_ar_dereg_avdt() {
- bta_ar_cb.p_av_conn_cback = NULL;
- bta_ar_cb.avdt_registered &= ~BTA_AR_AV_MASK;
+void bta_ar_dereg_avdt(tBTA_SYS_ID sys_id) {
+ uint8_t mask = 0;
+
+ if (sys_id == BTA_ID_AV) {
+ bta_ar_cb.p_av_conn_cback = NULL;
+ mask = BTA_AR_AV_MASK;
+ } else if (sys_id == BTA_ID_AVK) {
+ bta_ar_cb.p_avk_conn_cback = NULL;
+ mask = BTA_AR_AVK_MASK;
+ }
+ bta_ar_cb.avdt_registered &= ~mask;
if (bta_ar_cb.avdt_registered == 0) AVDT_Deregister();
}
@@ -113,6 +156,18 @@ void bta_ar_dereg_avdt() {
******************************************************************************/
void bta_ar_avdt_conn(tBTA_SYS_ID sys_id, const RawAddress& bd_addr,
uint8_t scb_index) {
+ uint8_t event = BTA_AR_AVDT_CONN_EVT;
+ tAVDT_CTRL data;
+
+ if (sys_id == BTA_ID_AV) {
+ if (bta_ar_cb.p_avk_conn_cback) {
+ (*bta_ar_cb.p_avk_conn_cback)(0, bd_addr, event, &data, scb_index);
+ }
+ } else if (sys_id == BTA_ID_AVK) {
+ if (bta_ar_cb.p_av_conn_cback) {
+ (*bta_ar_cb.p_av_conn_cback)(0, bd_addr, event, &data, scb_index);
+ }
+ }
}
/*******************************************************************************
@@ -124,11 +179,16 @@ void bta_ar_avdt_conn(tBTA_SYS_ID sys_id, const RawAddress& bd_addr,
* Returns void
*
******************************************************************************/
-void bta_ar_reg_avct() {
- if (bta_ar_cb.avct_registered == 0) {
- AVCT_Register();
+void bta_ar_reg_avct(uint16_t mtu, uint16_t mtu_br, uint8_t sec_mask,
+ tBTA_SYS_ID sys_id) {
+ uint8_t mask = bta_ar_id(sys_id);
+
+ if (mask) {
+ if (bta_ar_cb.avct_registered == 0) {
+ AVCT_Register(mtu, mtu_br, sec_mask);
+ }
+ bta_ar_cb.avct_registered |= mask;
}
- bta_ar_cb.avct_registered |= BTA_AR_AV_MASK;
}
/*******************************************************************************
@@ -140,8 +200,10 @@ void bta_ar_reg_avct() {
* Returns void
*
******************************************************************************/
-void bta_ar_dereg_avct() {
- bta_ar_cb.avct_registered &= ~BTA_AR_AV_MASK;
+void bta_ar_dereg_avct(tBTA_SYS_ID sys_id) {
+ uint8_t mask = bta_ar_id(sys_id);
+
+ bta_ar_cb.avct_registered &= ~mask;
if (bta_ar_cb.avct_registered == 0) AVCT_Deregister();
}
@@ -157,11 +219,12 @@ void bta_ar_dereg_avct() {
*****************************************************************************/
void bta_ar_reg_avrc(uint16_t service_uuid, const char* service_name,
const char* provider_name, uint16_t categories,
- bool browse_supported, uint16_t profile_version) {
- uint8_t mask = BTA_AR_AV_MASK;
+ tBTA_SYS_ID sys_id, bool browse_supported,
+ uint16_t profile_version) {
+ uint8_t mask = bta_ar_id(sys_id);
uint8_t temp[8], *p;
- if (!categories) return;
+ if (!mask || !categories) return;
if (service_uuid == UUID_SERVCLASS_AV_REM_CTRL_TARGET) {
if (bta_ar_cb.sdp_tg_handle == 0) {
@@ -169,7 +232,7 @@ void bta_ar_reg_avrc(uint16_t service_uuid, const char* service_name,
bta_ar_cb.sdp_tg_handle = SDP_CreateRecord();
AVRC_AddRecord(service_uuid, service_name, provider_name, categories,
bta_ar_cb.sdp_tg_handle, browse_supported,
- profile_version, 0);
+ profile_version);
bta_sys_add_uuid(service_uuid);
}
/* only one TG is allowed (first-come, first-served).
@@ -182,7 +245,7 @@ void bta_ar_reg_avrc(uint16_t service_uuid, const char* service_name,
bta_ar_cb.sdp_ct_handle = SDP_CreateRecord();
AVRC_AddRecord(service_uuid, service_name, provider_name, categories,
bta_ar_cb.sdp_ct_handle, browse_supported,
- profile_version, 0);
+ profile_version);
bta_sys_add_uuid(service_uuid);
} else {
/* multiple CTs are allowed.
@@ -205,11 +268,13 @@ void bta_ar_reg_avrc(uint16_t service_uuid, const char* service_name,
* Returns void
*
*****************************************************************************/
-void bta_ar_dereg_avrc(uint16_t service_uuid) {
- uint8_t mask = BTA_AR_AV_MASK;
+void bta_ar_dereg_avrc(uint16_t service_uuid, tBTA_SYS_ID sys_id) {
+ uint8_t mask = bta_ar_id(sys_id);
uint16_t categories = 0;
uint8_t temp[8], *p;
+ if (!mask) return;
+
if (service_uuid == UUID_SERVCLASS_AV_REM_CTRL_TARGET) {
if (bta_ar_cb.sdp_tg_handle && mask == bta_ar_cb.tg_registered) {
bta_ar_cb.tg_registered = 0;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-05 09:57:31 +0000