espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 18:57:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/btdm_a2dp_disconn_state_when_connecting_with_iphone_v3.0' into 'release/v3.0'

Browse Source 
component/bt: Fix bug a2dp have disconnect state when connecting with iphone 7

See merge request idf/esp-idf!2385
This commit is contained in:
Angus Gratton
2018-05-31 13:38:33 +08:00
parent 6ceedabb27 ab62202eb9
commit 5b2fee13cd
1 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
components/bt/bluedroid/btc/profile/std/a2dp/btc_avk.c
View File

@ -38,6 +38,7 @@
#include "bt_utils.h" #include "bt_utils.h"
#include "btc_common.h" #include "btc_common.h"
#include "btc_manage.h" #include "btc_manage.h"
#include "alarm.h"
#if BTC_AV_INCLUDED #if BTC_AV_INCLUDED
@ -80,7 +81,7 @@ typedef struct {
} btc_av_cb_t; } btc_av_cb_t;
typedef struct { typedef struct {
bt_bdaddr_t *target_bda; bt_bdaddr_t target_bda;
uint16_t uuid; uint16_t uuid;
} btc_av_connect_req_t; } btc_av_connect_req_t;
@ -88,7 +89,8 @@ typedef struct {
** Static variables ** Static variables
******************************************************************************/ ******************************************************************************/
static btc_av_cb_t btc_av_cb = {0}; static btc_av_cb_t btc_av_cb = {0};
static TIMER_LIST_ENT tle_av_open_on_rc;
static osi_alarm_t *tle_av_open_on_rc = NULL;
/* both interface and media task needs to be ready to alloc incoming request */ /* both interface and media task needs to be ready to alloc incoming request */
#define CHECK_BTAV_INIT() do \ #define CHECK_BTAV_INIT() do \
@ -203,19 +205,18 @@ UNUSED_ATTR static const char *dump_av_sm_event_name(btc_av_sm_event_t event)
** Returns void ** Returns void
** **
*******************************************************************************/ *******************************************************************************/
static void btc_initiate_av_open_tmr_hdlr(TIMER_LIST_ENT *tle) static void btc_initiate_av_open_tmr_hdlr(void *arg)
{ {
UNUSED(arg);
BD_ADDR peer_addr; BD_ADDR peer_addr;
UNUSED(tle);
btc_av_connect_req_t connect_req; btc_av_connect_req_t connect_req;
UNUSED(tle);
/* is there at least one RC connection - There should be */ /* is there at least one RC connection - There should be */
if (btc_rc_get_connected_peer(peer_addr)) { if (btc_rc_get_connected_peer(peer_addr)) {
LOG_DEBUG("%s Issuing connect to the remote RC peer", __FUNCTION__); LOG_DEBUG("%s Issuing connect to the remote RC peer", __FUNCTION__);
/* In case of AVRCP connection request, we will initiate SRC connection */ /* In case of AVRCP connection request, we will initiate SRC connection */
connect_req.target_bda = (bt_bdaddr_t *)&peer_addr; memcpy(connect_req.target_bda.address, peer_addr, sizeof(bt_bdaddr_t));
connect_req.uuid = UUID_SERVCLASS_AUDIO_SOURCE; connect_req.uuid = UUID_SERVCLASS_AUDIO_SOURCE;
btc_sm_dispatch(btc_av_cb.sm_handle, BTC_AV_CONNECT_REQ_EVT, (char *)&connect_req); btc_dispatch_sm_event(BTC_AV_CONNECT_REQ_EVT, &connect_req, sizeof(btc_av_connect_req_t));
} else { } else {
LOG_ERROR("%s No connected RC peers", __FUNCTION__); LOG_ERROR("%s No connected RC peers", __FUNCTION__);
} }
@ -289,7 +290,7 @@ static BOOLEAN btc_av_state_idle_handler(btc_sm_event_t event, void *p_data)
case BTA_AV_PENDING_EVT: case BTA_AV_PENDING_EVT:
case BTC_AV_CONNECT_REQ_EVT: { case BTC_AV_CONNECT_REQ_EVT: {
if (event == BTC_AV_CONNECT_REQ_EVT) { if (event == BTC_AV_CONNECT_REQ_EVT) {
memcpy(&btc_av_cb.peer_bda, ((btc_av_connect_req_t *)p_data)->target_bda, memcpy(&btc_av_cb.peer_bda, &((btc_av_connect_req_t *)p_data)->target_bda,
sizeof(bt_bdaddr_t)); sizeof(bt_bdaddr_t));
BTA_AvOpen(btc_av_cb.peer_bda.address, btc_av_cb.bta_handle, BTA_AvOpen(btc_av_cb.peer_bda.address, btc_av_cb.bta_handle,
TRUE, BTA_SEC_AUTHENTICATE, ((btc_av_connect_req_t *)p_data)->uuid); TRUE, BTA_SEC_AUTHENTICATE, ((btc_av_connect_req_t *)p_data)->uuid);
@ -313,10 +314,8 @@ static BOOLEAN btc_av_state_idle_handler(btc_sm_event_t event, void *p_data)
*/ */
LOG_DEBUG("BTA_AV_RC_OPEN_EVT received w/o AV"); LOG_DEBUG("BTA_AV_RC_OPEN_EVT received w/o AV");
memset(&tle_av_open_on_rc, 0, sizeof(tle_av_open_on_rc)); tle_av_open_on_rc = osi_alarm_new("AVconn", btc_initiate_av_open_tmr_hdlr, NULL, BTC_TIMEOUT_AV_OPEN_ON_RC_SECS * 1000);
tle_av_open_on_rc.param = (UINT32)btc_initiate_av_open_tmr_hdlr; osi_alarm_set(tle_av_open_on_rc, BTC_TIMEOUT_AV_OPEN_ON_RC_SECS * 1000);
btu_start_timer(&tle_av_open_on_rc, BTU_TTYPE_USER_FUNC,
BTC_TIMEOUT_AV_OPEN_ON_RC_SECS);
btc_rc_handler(event, p_data); btc_rc_handler(event, p_data);
break; break;
@ -329,9 +328,9 @@ static BOOLEAN btc_av_state_idle_handler(btc_sm_event_t event, void *p_data)
break; break;
case BTA_AV_RC_CLOSE_EVT: case BTA_AV_RC_CLOSE_EVT:
if (tle_av_open_on_rc.in_use) { if (tle_av_open_on_rc) {
LOG_DEBUG("BTA_AV_RC_CLOSE_EVT: Stopping AV timer."); osi_alarm_free(tle_av_open_on_rc);
btu_stop_timer(&tle_av_open_on_rc); tle_av_open_on_rc = NULL;
} }
btc_rc_handler(event, p_data); btc_rc_handler(event, p_data);
break; break;
@ -616,7 +615,7 @@ static BOOLEAN btc_av_state_opened_handler(btc_sm_event_t event, void *p_data)
break; break;
case BTC_AV_CONNECT_REQ_EVT: case BTC_AV_CONNECT_REQ_EVT:
if (memcmp ((bt_bdaddr_t *)p_data, &(btc_av_cb.peer_bda), if (memcmp (&((btc_av_connect_req_t *)p_data)->target_bda, &(btc_av_cb.peer_bda),
sizeof(btc_av_cb.peer_bda)) == 0) { sizeof(btc_av_cb.peer_bda)) == 0) {
LOG_DEBUG("%s: Ignore BTC_AVCONNECT_REQ_EVT for same device\n", __func__); LOG_DEBUG("%s: Ignore BTC_AVCONNECT_REQ_EVT for same device\n", __func__);
} else { } else {
@ -972,7 +971,7 @@ bt_status_t btc_a2d_sink_init(void)
static bt_status_t connect_int(bt_bdaddr_t *bd_addr, uint16_t uuid) static bt_status_t connect_int(bt_bdaddr_t *bd_addr, uint16_t uuid)
{ {
btc_av_connect_req_t connect_req; btc_av_connect_req_t connect_req;
connect_req.target_bda = bd_addr; memcpy(&connect_req.target_bda, bd_addr, sizeof(bt_bdaddr_t));
connect_req.uuid = uuid; connect_req.uuid = uuid;
LOG_DEBUG("%s\n", __FUNCTION__); LOG_DEBUG("%s\n", __FUNCTION__);
@ -1001,7 +1000,6 @@ bt_status_t btc_a2d_sink_connect(bt_bdaddr_t *remote_bda)
static void btc_a2d_sink_deinit(void) static void btc_a2d_sink_deinit(void)
{ {
LOG_DEBUG("%s\n", __FUNCTION__); LOG_DEBUG("%s\n", __FUNCTION__);
btc_dm_disable_service(BTA_A2DP_SOURCE_SERVICE_ID); btc_dm_disable_service(BTA_A2DP_SOURCE_SERVICE_ID);
#if (BTA_AV_SINK_INCLUDED == TRUE) #if (BTA_AV_SINK_INCLUDED == TRUE)
btc_dm_disable_service(BTA_A2DP_SINK_SERVICE_ID); btc_dm_disable_service(BTA_A2DP_SINK_SERVICE_ID);
@ -1232,6 +1230,9 @@ void btc_a2dp_call_handler(btc_msg_t *msg)
btc_a2dp_sink_reg_data_cb(arg->data_cb); btc_a2dp_sink_reg_data_cb(arg->data_cb);
break; break;
} }
case BTC_AV_CONNECT_REQ_EVT:
btc_sm_dispatch(btc_av_cb.sm_handle, msg->act, (char *)msg->arg);
break;
default: default:
LOG_WARN("%s : unhandled event: %d\n", __FUNCTION__, msg->act); LOG_WARN("%s : unhandled event: %d\n", __FUNCTION__, msg->act);
} }