diff options
Diffstat (limited to 'bta/av')
| -rw-r--r-- | bta/av/bta_av_aact.c | 264 | ||||
| -rw-r--r-- | bta/av/bta_av_act.c | 60 | ||||
| -rw-r--r-- | bta/av/bta_av_api.c | 10 | ||||
| -rw-r--r-- | bta/av/bta_av_cfg.c | 10 | ||||
| -rw-r--r-- | bta/av/bta_av_ci.c | 6 | ||||
| -rw-r--r-- | bta/av/bta_av_int.h | 16 | ||||
| -rw-r--r-- | bta/av/bta_av_main.c | 48 | ||||
| -rw-r--r-- | bta/av/bta_av_sbc.c | 34 | ||||
| -rw-r--r-- | bta/av/bta_av_ssm.c | 20 |
9 files changed, 234 insertions, 234 deletions
diff --git a/bta/av/bta_av_aact.c b/bta/av/bta_av_aact.c index c6ce55a..c5234a6 100644 --- a/bta/av/bta_av_aact.c +++ b/bta/av/bta_av_aact.c @@ -74,46 +74,46 @@ const tBTA_AV_CO_FUNCTS bta_av_a2d_cos = /* ssm action functions for audio stream */ const tBTA_AV_SACT bta_av_a2d_action[] = { - bta_av_do_disc_a2d, /* BTA_AV_DO_DISC */ - bta_av_cleanup, /* BTA_AV_CLEANUP */ - bta_av_free_sdb, /* BTA_AV_FREE_SDB */ - bta_av_config_ind, /* BTA_AV_CONFIG_IND */ - bta_av_disconnect_req, /* BTA_AV_DISCONNECT_REQ */ - bta_av_security_req, /* BTA_AV_SECURITY_REQ */ - bta_av_security_rsp, /* BTA_AV_SECURITY_RSP */ - bta_av_setconfig_rsp, /* BTA_AV_SETCONFIG_RSP */ + bta_av_do_disc_a2d, /* BTA_AV_DO_DISC */ + bta_av_cleanup, /* BTA_AV_CLEANUP */ + bta_av_free_sdb, /* BTA_AV_FREE_SDB */ + bta_av_config_ind, /* BTA_AV_CONFIG_IND */ + bta_av_disconnect_req, /* BTA_AV_DISCONNECT_REQ */ + bta_av_security_req, /* BTA_AV_SECURITY_REQ */ + bta_av_security_rsp, /* BTA_AV_SECURITY_RSP */ + bta_av_setconfig_rsp, /* BTA_AV_SETCONFIG_RSP */ bta_av_st_rc_timer, /* BTA_AV_ST_RC_TIMER */ - bta_av_str_opened, /* BTA_AV_STR_OPENED */ - bta_av_security_ind, /* BTA_AV_SECURITY_IND */ - bta_av_security_cfm, /* BTA_AV_SECURITY_CFM */ - bta_av_do_close, /* BTA_AV_DO_CLOSE */ - bta_av_connect_req, /* BTA_AV_CONNECT_REQ */ - bta_av_sdp_failed, /* BTA_AV_SDP_FAILED */ - bta_av_disc_results, /* BTA_AV_DISC_RESULTS */ - bta_av_disc_res_as_acp, /* BTA_AV_DISC_RES_AS_ACP */ - bta_av_open_failed, /* BTA_AV_OPEN_FAILED */ - bta_av_getcap_results, /* BTA_AV_GETCAP_RESULTS */ - bta_av_setconfig_rej, /* BTA_AV_SETCONFIG_REJ */ - bta_av_discover_req, /* BTA_AV_DISCOVER_REQ */ - bta_av_conn_failed, /* BTA_AV_CONN_FAILED */ - bta_av_do_start, /* BTA_AV_DO_START */ - bta_av_str_stopped, /* BTA_AV_STR_STOPPED */ - bta_av_reconfig, /* BTA_AV_RECONFIG */ - bta_av_data_path, /* BTA_AV_DATA_PATH */ - bta_av_start_ok, /* BTA_AV_START_OK */ - bta_av_start_failed, /* BTA_AV_START_FAILED */ - bta_av_str_closed, /* BTA_AV_STR_CLOSED */ - bta_av_clr_cong, /* BTA_AV_CLR_CONG */ - bta_av_suspend_cfm, /* BTA_AV_SUSPEND_CFM */ - bta_av_rcfg_str_ok, /* BTA_AV_RCFG_STR_OK */ - bta_av_rcfg_failed, /* BTA_AV_RCFG_FAILED */ - bta_av_rcfg_connect, /* BTA_AV_RCFG_CONNECT */ - bta_av_rcfg_discntd, /* BTA_AV_RCFG_DISCNTD */ - bta_av_suspend_cont, /* BTA_AV_SUSPEND_CONT */ - bta_av_rcfg_cfm, /* BTA_AV_RCFG_CFM */ - bta_av_rcfg_open, /* BTA_AV_RCFG_OPEN */ - bta_av_security_rej, /* BTA_AV_SECURITY_REJ */ - bta_av_open_rc, /* BTA_AV_OPEN_RC */ + bta_av_str_opened, /* BTA_AV_STR_OPENED */ + bta_av_security_ind, /* BTA_AV_SECURITY_IND */ + bta_av_security_cfm, /* BTA_AV_SECURITY_CFM */ + bta_av_do_close, /* BTA_AV_DO_CLOSE */ + bta_av_connect_req, /* BTA_AV_CONNECT_REQ */ + bta_av_sdp_failed, /* BTA_AV_SDP_FAILED */ + bta_av_disc_results, /* BTA_AV_DISC_RESULTS */ + bta_av_disc_res_as_acp, /* BTA_AV_DISC_RES_AS_ACP */ + bta_av_open_failed, /* BTA_AV_OPEN_FAILED */ + bta_av_getcap_results, /* BTA_AV_GETCAP_RESULTS */ + bta_av_setconfig_rej, /* BTA_AV_SETCONFIG_REJ */ + bta_av_discover_req, /* BTA_AV_DISCOVER_REQ */ + bta_av_conn_failed, /* BTA_AV_CONN_FAILED */ + bta_av_do_start, /* BTA_AV_DO_START */ + bta_av_str_stopped, /* BTA_AV_STR_STOPPED */ + bta_av_reconfig, /* BTA_AV_RECONFIG */ + bta_av_data_path, /* BTA_AV_DATA_PATH */ + bta_av_start_ok, /* BTA_AV_START_OK */ + bta_av_start_failed, /* BTA_AV_START_FAILED */ + bta_av_str_closed, /* BTA_AV_STR_CLOSED */ + bta_av_clr_cong, /* BTA_AV_CLR_CONG */ + bta_av_suspend_cfm, /* BTA_AV_SUSPEND_CFM */ + bta_av_rcfg_str_ok, /* BTA_AV_RCFG_STR_OK */ + bta_av_rcfg_failed, /* BTA_AV_RCFG_FAILED */ + bta_av_rcfg_connect, /* BTA_AV_RCFG_CONNECT */ + bta_av_rcfg_discntd, /* BTA_AV_RCFG_DISCNTD */ + bta_av_suspend_cont, /* BTA_AV_SUSPEND_CONT */ + bta_av_rcfg_cfm, /* BTA_AV_RCFG_CFM */ + bta_av_rcfg_open, /* BTA_AV_RCFG_OPEN */ + bta_av_security_rej, /* BTA_AV_SECURITY_REJ */ + bta_av_open_rc, /* BTA_AV_OPEN_RC */ bta_av_chk_2nd_start, /* BTA_AV_CHK_2ND_START */ bta_av_save_caps, /* BTA_AV_SAVE_CAPS */ bta_av_set_use_rc, /* BTA_AV_SET_USE_RC */ @@ -127,54 +127,54 @@ const tBTA_AV_SACT bta_av_a2d_action[] = /* these tables translate AVDT events to SSM events */ static const UINT16 bta_av_stream_evt_ok[] = { - BTA_AV_STR_DISC_OK_EVT, /* AVDT_DISCOVER_CFM_EVT */ - BTA_AV_STR_GETCAP_OK_EVT, /* AVDT_GETCAP_CFM_EVT */ - BTA_AV_STR_OPEN_OK_EVT, /* AVDT_OPEN_CFM_EVT */ - BTA_AV_STR_OPEN_OK_EVT, /* AVDT_OPEN_IND_EVT */ - BTA_AV_STR_CONFIG_IND_EVT, /* AVDT_CONFIG_IND_EVT */ - BTA_AV_STR_START_OK_EVT, /* AVDT_START_CFM_EVT */ - BTA_AV_STR_START_OK_EVT, /* AVDT_START_IND_EVT */ - BTA_AV_STR_SUSPEND_CFM_EVT, /* AVDT_SUSPEND_CFM_EVT */ - BTA_AV_STR_SUSPEND_CFM_EVT, /* AVDT_SUSPEND_IND_EVT */ - BTA_AV_STR_CLOSE_EVT, /* AVDT_CLOSE_CFM_EVT */ - BTA_AV_STR_CLOSE_EVT, /* AVDT_CLOSE_IND_EVT */ - BTA_AV_STR_RECONFIG_CFM_EVT, /* AVDT_RECONFIG_CFM_EVT */ - 0, /* AVDT_RECONFIG_IND_EVT */ - BTA_AV_STR_SECURITY_CFM_EVT, /* AVDT_SECURITY_CFM_EVT */ - BTA_AV_STR_SECURITY_IND_EVT, /* AVDT_SECURITY_IND_EVT */ + BTA_AV_STR_DISC_OK_EVT, /* AVDT_DISCOVER_CFM_EVT */ + BTA_AV_STR_GETCAP_OK_EVT, /* AVDT_GETCAP_CFM_EVT */ + BTA_AV_STR_OPEN_OK_EVT, /* AVDT_OPEN_CFM_EVT */ + BTA_AV_STR_OPEN_OK_EVT, /* AVDT_OPEN_IND_EVT */ + BTA_AV_STR_CONFIG_IND_EVT, /* AVDT_CONFIG_IND_EVT */ + BTA_AV_STR_START_OK_EVT, /* AVDT_START_CFM_EVT */ + BTA_AV_STR_START_OK_EVT, /* AVDT_START_IND_EVT */ + BTA_AV_STR_SUSPEND_CFM_EVT, /* AVDT_SUSPEND_CFM_EVT */ + BTA_AV_STR_SUSPEND_CFM_EVT, /* AVDT_SUSPEND_IND_EVT */ + BTA_AV_STR_CLOSE_EVT, /* AVDT_CLOSE_CFM_EVT */ + BTA_AV_STR_CLOSE_EVT, /* AVDT_CLOSE_IND_EVT */ + BTA_AV_STR_RECONFIG_CFM_EVT, /* AVDT_RECONFIG_CFM_EVT */ + 0, /* AVDT_RECONFIG_IND_EVT */ + BTA_AV_STR_SECURITY_CFM_EVT, /* AVDT_SECURITY_CFM_EVT */ + BTA_AV_STR_SECURITY_IND_EVT, /* AVDT_SECURITY_IND_EVT */ BTA_AV_STR_WRITE_CFM_EVT, /* AVDT_WRITE_CFM_EVT */ BTA_AV_AVDT_CONNECT_EVT, /* AVDT_CONNECT_IND_EVT */ BTA_AV_AVDT_DISCONNECT_EVT, /* AVDT_DISCONNECT_IND_EVT */ #if (AVDT_REPORTING == TRUE) - BTA_AV_AVDT_RPT_CONN_EVT, /* AVDT_REPORT_CONN_EVT */ - BTA_AV_AVDT_RPT_CONN_EVT, /* AVDT_REPORT_DISCONN_EVT */ + BTA_AV_AVDT_RPT_CONN_EVT, /* AVDT_REPORT_CONN_EVT */ + BTA_AV_AVDT_RPT_CONN_EVT, /* AVDT_REPORT_DISCONN_EVT */ #endif BTA_AV_AVDT_DELAY_RPT_EVT, /* AVDT_DELAY_REPORT_EVT */ 0 /* AVDT_DELAY_REPORT_CFM_EVT */ }; static const UINT16 bta_av_stream_evt_fail[] = { - BTA_AV_STR_DISC_FAIL_EVT, /* AVDT_DISCOVER_CFM_EVT */ - BTA_AV_STR_GETCAP_FAIL_EVT, /* AVDT_GETCAP_CFM_EVT */ - BTA_AV_STR_OPEN_FAIL_EVT, /* AVDT_OPEN_CFM_EVT */ - BTA_AV_STR_OPEN_OK_EVT, /* AVDT_OPEN_IND_EVT */ - BTA_AV_STR_CONFIG_IND_EVT, /* AVDT_CONFIG_IND_EVT */ - BTA_AV_STR_START_FAIL_EVT, /* AVDT_START_CFM_EVT */ - BTA_AV_STR_START_OK_EVT, /* AVDT_START_IND_EVT */ - BTA_AV_STR_SUSPEND_CFM_EVT, /* AVDT_SUSPEND_CFM_EVT */ - BTA_AV_STR_SUSPEND_CFM_EVT, /* AVDT_SUSPEND_IND_EVT */ - BTA_AV_STR_CLOSE_EVT, /* AVDT_CLOSE_CFM_EVT */ - BTA_AV_STR_CLOSE_EVT, /* AVDT_CLOSE_IND_EVT */ - BTA_AV_STR_RECONFIG_CFM_EVT, /* AVDT_RECONFIG_CFM_EVT */ - 0, /* AVDT_RECONFIG_IND_EVT */ - BTA_AV_STR_SECURITY_CFM_EVT, /* AVDT_SECURITY_CFM_EVT */ - BTA_AV_STR_SECURITY_IND_EVT, /* AVDT_SECURITY_IND_EVT */ + BTA_AV_STR_DISC_FAIL_EVT, /* AVDT_DISCOVER_CFM_EVT */ + BTA_AV_STR_GETCAP_FAIL_EVT, /* AVDT_GETCAP_CFM_EVT */ + BTA_AV_STR_OPEN_FAIL_EVT, /* AVDT_OPEN_CFM_EVT */ + BTA_AV_STR_OPEN_OK_EVT, /* AVDT_OPEN_IND_EVT */ + BTA_AV_STR_CONFIG_IND_EVT, /* AVDT_CONFIG_IND_EVT */ + BTA_AV_STR_START_FAIL_EVT, /* AVDT_START_CFM_EVT */ + BTA_AV_STR_START_OK_EVT, /* AVDT_START_IND_EVT */ + BTA_AV_STR_SUSPEND_CFM_EVT, /* AVDT_SUSPEND_CFM_EVT */ + BTA_AV_STR_SUSPEND_CFM_EVT, /* AVDT_SUSPEND_IND_EVT */ + BTA_AV_STR_CLOSE_EVT, /* AVDT_CLOSE_CFM_EVT */ + BTA_AV_STR_CLOSE_EVT, /* AVDT_CLOSE_IND_EVT */ + BTA_AV_STR_RECONFIG_CFM_EVT, /* AVDT_RECONFIG_CFM_EVT */ + 0, /* AVDT_RECONFIG_IND_EVT */ + BTA_AV_STR_SECURITY_CFM_EVT, /* AVDT_SECURITY_CFM_EVT */ + BTA_AV_STR_SECURITY_IND_EVT, /* AVDT_SECURITY_IND_EVT */ BTA_AV_STR_WRITE_CFM_EVT, /* AVDT_WRITE_CFM_EVT */ BTA_AV_AVDT_CONNECT_EVT, /* AVDT_CONNECT_IND_EVT */ BTA_AV_AVDT_DISCONNECT_EVT, /* AVDT_DISCONNECT_IND_EVT */ #if (AVDT_REPORTING == TRUE) - BTA_AV_AVDT_RPT_CONN_EVT, /* AVDT_REPORT_CONN_EVT */ - BTA_AV_AVDT_RPT_CONN_EVT, /* AVDT_REPORT_DISCONN_EVT */ + BTA_AV_AVDT_RPT_CONN_EVT, /* AVDT_REPORT_CONN_EVT */ + BTA_AV_AVDT_RPT_CONN_EVT, /* AVDT_REPORT_DISCONN_EVT */ #endif BTA_AV_AVDT_DELAY_RPT_EVT, /* AVDT_DELAY_REPORT_EVT */ 0 /* AVDT_DELAY_REPORT_CFM_EVT */ @@ -199,7 +199,7 @@ tAVDT_CTRL_CBACK * const bta_av_dt_cback[] = { bta_av_stream0_cback ,bta_av_stream1_cback -#if BTA_AV_NUM_STRS > 2 +#if BTA_AV_NUM_STRS > 2 ,bta_av_stream2_cback #endif #if BTA_AV_NUM_STRS > 3 @@ -218,8 +218,8 @@ tAVDT_CTRL_CBACK * const bta_av_dt_cback[] = ** Function bta_av_save_addr ** ** Description copy the bd_addr and maybe reset the supported flags -** -** +** +** ** Returns void ** *******************************************************************************/ @@ -247,7 +247,7 @@ static void bta_av_save_addr(tBTA_AV_SCB *p_scb, const BD_ADDR b) ** Description start the AVRC timer if no RC connection & CT is supported & ** RC is used or ** as ACP (we do not really know if we want AVRC) -** +** ** Returns void ** *******************************************************************************/ @@ -275,7 +275,7 @@ void bta_av_st_rc_timer(tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data) ** ** Description The function gets the capabilities of the next available ** stream found in the discovery results. -** +** ** Returns TRUE if we sent request to AVDT, FALSE otherwise. ** *******************************************************************************/ @@ -288,8 +288,8 @@ static BOOLEAN bta_av_next_getcap(tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data) for (i = p_scb->sep_info_idx; i < p_scb->num_seps; i++) { /* steam not in use, is a sink, and is the right media type (audio/video) */ - if ((p_scb->sep_info[i].in_use == FALSE) && - (p_scb->sep_info[i].tsep == AVDT_TSEP_SNK) && + if ((p_scb->sep_info[i].in_use == FALSE) && + (p_scb->sep_info[i].tsep == AVDT_TSEP_SNK) && (p_scb->sep_info[i].media_type == p_scb->media_type)) { p_scb->sep_info_idx = i; @@ -319,7 +319,7 @@ static BOOLEAN bta_av_next_getcap(tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data) break; } } - + /* if no streams available then stream open fails */ if (!sent_cmd) { @@ -327,7 +327,7 @@ static BOOLEAN bta_av_next_getcap(tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data) } return sent_cmd; - + } /******************************************************************************* @@ -335,7 +335,7 @@ static BOOLEAN bta_av_next_getcap(tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data) ** Function bta_av_proc_stream_evt ** ** Description Utility function to compose stream events. -** +** ** Returns void ** *******************************************************************************/ @@ -359,7 +359,7 @@ void bta_av_proc_stream_evt(UINT8 handle, BD_ADDR bd_addr, UINT8 event, tAVDT_CT p_data->security_cfm.len : BTA_AV_SECURITY_MAX_LEN; } } - + if (p_scb && (p_msg = (tBTA_AV_STR_MSG *) GKI_getbuf((UINT16) (sizeof(tBTA_AV_STR_MSG) + sec_len))) != NULL) { @@ -382,17 +382,17 @@ void bta_av_proc_stream_evt(UINT8 handle, BD_ADDR bd_addr, UINT8 event, tAVDT_CT switch (event) { case AVDT_CONFIG_IND_EVT: - /* We might have 2 SEP signallings(A2DP + VDP) with one peer device on one L2CAP. - * If we already have a signalling connection with the bd_addr and the streaming - * SST is at INIT state, change it to INCOMING state to handle the signalling + /* We might have 2 SEP signallings(A2DP + VDP) with one peer device on one L2CAP. + * If we already have a signalling connection with the bd_addr and the streaming + * SST is at INIT state, change it to INCOMING state to handle the signalling * from the 2nd SEP. */ if ((bta_av_find_lcb(bd_addr, BTA_AV_LCB_FIND) != NULL) && (bta_av_is_scb_init(p_scb))) { bta_av_set_scb_sst_incoming (p_scb); - - /* When ACP_CONNECT_EVT was received, we put first available scb to incoming state. - * Later when we receive AVDT_CONFIG_IND_EVT, we use a new p_scb and set its state to - * incoming which we do it above. + + /* When ACP_CONNECT_EVT was received, we put first available scb to incoming state. + * Later when we receive AVDT_CONFIG_IND_EVT, we use a new p_scb and set its state to + * incoming which we do it above. * We also have to set the old p_scb state to init to be used later */ for (xx = 0; xx < BTA_AV_NUM_STRS; xx++) { @@ -412,12 +412,12 @@ void bta_av_proc_stream_evt(UINT8 handle, BD_ADDR bd_addr, UINT8 event, tAVDT_CT break; case AVDT_SECURITY_IND_EVT: - p_msg->msg.security_ind.p_data = (UINT8 *) (p_msg + 1); + p_msg->msg.security_ind.p_data = (UINT8 *) (p_msg + 1); memcpy(p_msg->msg.security_ind.p_data, p_data->security_ind.p_data, sec_len); break; - + case AVDT_SECURITY_CFM_EVT: - p_msg->msg.security_cfm.p_data = (UINT8 *) (p_msg + 1); + p_msg->msg.security_cfm.p_data = (UINT8 *) (p_msg + 1); if (p_data->hdr.err_code == 0) { memcpy(p_msg->msg.security_cfm.p_data, p_data->security_cfm.p_data, sec_len); @@ -467,7 +467,7 @@ void bta_av_proc_stream_evt(UINT8 handle, BD_ADDR bd_addr, UINT8 event, tAVDT_CT ** Function bta_av_stream0_cback ** ** Description This is the AVDTP callback function for stream events. -** +** ** Returns void ** *******************************************************************************/ @@ -482,7 +482,7 @@ static void bta_av_stream0_cback(UINT8 handle, BD_ADDR bd_addr, UINT8 event, tAV ** Function bta_av_stream1_cback ** ** Description This is the AVDTP callback function for stream events. -** +** ** Returns void ** *******************************************************************************/ @@ -498,7 +498,7 @@ static void bta_av_stream1_cback(UINT8 handle, BD_ADDR bd_addr, UINT8 event, tAV ** Function bta_av_stream2_cback ** ** Description This is the AVDTP callback function for stream events. -** +** ** Returns void ** *******************************************************************************/ @@ -515,7 +515,7 @@ static void bta_av_stream2_cback(UINT8 handle, BD_ADDR bd_addr, UINT8 event, tAV ** Function bta_av_stream3_cback ** ** Description This is the AVDTP callback function for stream events. -** +** ** Returns void ** *******************************************************************************/ @@ -531,7 +531,7 @@ static void bta_av_stream3_cback(UINT8 handle, BD_ADDR bd_addr, UINT8 event, tAV ** Function bta_av_stream4_cback ** ** Description This is the AVDTP callback function for stream events. -** +** ** Returns void ** *******************************************************************************/ @@ -548,7 +548,7 @@ static void bta_av_stream4_cback(UINT8 handle, BD_ADDR bd_addr, UINT8 event, tAV ** Function bta_av_stream5_cback ** ** Description This is the AVDTP callback function for stream events. -** +** ** Returns void ** *******************************************************************************/ @@ -585,8 +585,8 @@ static void bta_av_a2d_sdp_cback(BOOLEAN found, tA2D_Service *p_service) p_scb->avdt_version = p_service->avdt_version; else p_scb->avdt_version = 0x00; - - p_msg->hdr.layer_specific = bta_av_cb.handle; + + p_msg->hdr.layer_specific = bta_av_cb.handle; bta_sys_sendmsg(p_msg); } else @@ -601,8 +601,8 @@ static void bta_av_a2d_sdp_cback(BOOLEAN found, tA2D_Service *p_service) ** Function bta_av_adjust_seps_idx ** ** Description adjust the sep_idx -** -** Returns +** +** Returns ** *******************************************************************************/ static void bta_av_adjust_seps_idx(tBTA_AV_SCB *p_scb) @@ -682,7 +682,7 @@ void bta_av_switch_role (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data) ** Function bta_av_role_res ** ** Description Handle the role changed event -** +** ** ** Returns void ** @@ -727,7 +727,7 @@ void bta_av_role_res (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data) { p_scb->role &= ~BTA_AV_ROLE_START_INT; p_scb->wait &= ~BTA_AV_WAIT_ROLE_SW_BITS; - + if (p_data->role_res.hci_status != HCI_SUCCESS) { /* Open failed because of role switch. */ @@ -749,7 +749,7 @@ void bta_av_role_res (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data) APPL_TRACE_WARNING2 ("Unexpected role switch event: q_tag = %d wait = %d", p_scb->q_tag, p_scb->wait); } } - + APPL_TRACE_DEBUG2("wait:x%x, role:x%x", p_scb->wait, p_scb->role); } @@ -789,7 +789,7 @@ void bta_av_do_disc_a2d (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data) p_data->api_open.use_rc, p_data->api_open.switch_res, bta_av_cb.audio_open_cnt); memcpy (&(p_scb->open_api), &(p_data->api_open), sizeof(tBTA_AV_API_OPEN)); - + switch(p_data->api_open.switch_res) { case BTA_AV_RS_NONE: @@ -984,7 +984,7 @@ void bta_av_config_ind (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data) bta_sys_stop_timer(&bta_av_cb.acp_sig_tmr); /* if no codec parameters in configuration, fail */ - if ((p_evt_cfg->num_codec == 0) || + if ((p_evt_cfg->num_codec == 0) || /* or the peer requests for a service we do not support */ ((psc_mask != p_scb->cfg.psc_mask) && (psc_mask != (p_scb->cfg.psc_mask&~AVDT_PSC_DELAY_RPT))) ) @@ -1147,7 +1147,7 @@ void bta_av_setconfig_rsp (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data) APPL_TRACE_DEBUG2("sep_info[%d] SEID: %d", i, p_seid[i-1]); /* initialize the sep_info[] to get capabilities */ p_scb->sep_info[i].in_use = FALSE; - p_scb->sep_info[i].tsep = AVDT_TSEP_SNK; + p_scb->sep_info[i].tsep = AVDT_TSEP_SNK; p_scb->sep_info[i].media_type = p_scb->media_type; p_scb->sep_info[i].seid = p_seid[i-1]; } @@ -1195,14 +1195,14 @@ void bta_av_str_opened (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data) memset(&p_scb->q_info, 0, sizeof(tBTA_AV_Q_INFO)); p_scb->l2c_bufs = 0; - p_scb->p_cos->open(p_scb->hndl, + p_scb->p_cos->open(p_scb->hndl, p_scb->codec_type, p_scb->cfg.codec_info, mtu); { /* TODO check if other audio channel is open. * If yes, check if reconfig is needed * Rigt now we do not do this kind of checking. - * BTA-AV is INT for 2nd audio connection. + * BTA-AV is INT for 2nd audio connection. * The application needs to make sure the current codec_info is proper. * If one audio connection is open and another SNK attempts to connect to AV, * the connection will be rejected. @@ -1305,7 +1305,7 @@ void bta_av_do_close (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data) /* stop stream if started */ if (p_scb->co_started) { - bta_av_str_stopped(p_scb, NULL); + bta_av_str_stopped(p_scb, NULL); } bta_sys_stop_timer(&bta_av_cb.sig_tmr); @@ -1346,7 +1346,7 @@ void bta_av_connect_req (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data) APPL_TRACE_EVENT1("bta_av_connect_req: coll_mask = 0x%2X", p_scb->coll_mask); return; } - + AVDT_ConnectReq(p_scb->peer_addr, p_scb->sec_mask, bta_av_dt_cback[p_scb->hdi]); } @@ -1363,7 +1363,7 @@ void bta_av_sdp_failed (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data) { if (!p_scb->open_status) p_scb->open_status = BTA_AV_FAIL_SDP; - + utl_freebuf((void **) &p_scb->p_disc_db); bta_av_str_closed(p_scb, p_data); } @@ -1389,8 +1389,8 @@ void bta_av_disc_results (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data) for (i = 0; i < p_scb->num_seps; i++) { /* steam not in use, is a sink, and is audio */ - if ((p_scb->sep_info[i].in_use == FALSE) && - (p_scb->sep_info[i].tsep == AVDT_TSEP_SNK) && + if ((p_scb->sep_info[i].in_use == FALSE) && + (p_scb->sep_info[i].tsep == AVDT_TSEP_SNK) && (p_scb->sep_info[i].media_type == p_scb->media_type)) { num_snks++; @@ -1399,7 +1399,7 @@ void bta_av_disc_results (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data) p_scb->p_cos->disc_res(p_scb->hndl, p_scb->num_seps, num_snks, p_scb->peer_addr); p_scb->num_disc_snks = num_snks; - + /* if we got any */ if (p_scb->num_seps > 0) { @@ -1439,7 +1439,7 @@ void bta_av_disc_res_as_acp (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data) for (i = 0; i < p_scb->num_seps; i++) { /* steam is a sink, and is audio */ - if ((p_scb->sep_info[i].tsep == AVDT_TSEP_SNK) && + if ((p_scb->sep_info[i].tsep == AVDT_TSEP_SNK) && (p_scb->sep_info[i].media_type == p_scb->media_type)) { p_scb->sep_info[i].in_use = FALSE; @@ -1449,7 +1449,7 @@ void bta_av_disc_res_as_acp (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data) p_scb->p_cos->disc_res(p_scb->hndl, p_scb->num_seps, num_snks, p_scb->peer_addr); p_scb->num_disc_snks = num_snks; - + /* if we got any */ if (p_scb->num_seps > 0) { @@ -1703,7 +1703,7 @@ void bta_av_do_start (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data) } /* disallow role switch during streaming, only if we are the master role - * i.e. allow role switch, if we are slave. + * i.e. allow role switch, if we are slave. * It would not hurt us, if the peer device wants us to be master */ if ((BTM_GetRole (p_scb->peer_addr, &cur_role) == BTM_SUCCESS) && (cur_role == BTM_ROLE_MASTER) ) @@ -1744,7 +1744,7 @@ void bta_av_str_stopped (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data) BT_HDR *p_buf; UINT8 policy = HCI_ENABLE_SNIFF_MODE; - APPL_TRACE_ERROR2("bta_av_str_stopped:audio_open_cnt=%d, p_data %x", + APPL_TRACE_ERROR2("bta_av_str_stopped:audio_open_cnt=%d, p_data %x", bta_av_cb.audio_open_cnt, p_data); bta_sys_idle(BTA_ID_AV, bta_av_cb.audio_open_cnt, p_scb->peer_addr); @@ -1883,7 +1883,7 @@ void bta_av_reconfig (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data) L2CA_FlushChannel (p_scb->l2c_cid, L2CAP_FLUSH_CHANS_ALL); AVDT_CloseReq(p_scb->avdt_handle); - + } } @@ -2105,7 +2105,7 @@ void bta_av_start_ok (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data) p_scb->p_cos->start(p_scb->hndl, p_scb->codec_type); p_scb->co_started = TRUE; - APPL_TRACE_DEBUG3("bta_av_start_ok suspending: %d, role:x%x, init %d", + APPL_TRACE_DEBUG3("bta_av_start_ok suspending: %d, role:x%x, init %d", suspend, p_scb->role, initiator); start.suspending = suspend; @@ -2146,7 +2146,7 @@ void bta_av_start_failed (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data) { /* if start failed, clear role */ p_scb->role &= ~BTA_AV_ROLE_START_INT; - + bta_sys_idle(BTA_ID_AV, bta_av_cb.audio_open_cnt, p_scb->peer_addr); start.chnl = p_scb->chnl; start.status = BTA_AV_FAIL; @@ -2161,7 +2161,7 @@ void bta_av_start_failed (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data) /******************************************************************************* ** -** Function bta_av_str_closed +** Function bta_av_str_closed ** ** Description Stream closed. ** @@ -2254,7 +2254,7 @@ void bta_av_suspend_cfm (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data) APPL_TRACE_DEBUG2 ("bta_av_suspend_cfm:audio_open_cnt = %d, err_code = %d", bta_av_cb.audio_open_cnt, err_code); - + suspend_rsp.status = BTA_AV_SUCCESS; if(err_code) { @@ -2434,7 +2434,7 @@ void bta_av_rcfg_discntd (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data) ** ** Function bta_av_suspend_cont ** -** Description received the suspend response. +** Description received the suspend response. ** continue to reconfigure the stream ** ** Returns void @@ -2471,7 +2471,7 @@ void bta_av_suspend_cont (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data) { APPL_TRACE_DEBUG0("bta_av_suspend_cont calling AVDT_ReconfigReq"); /* reconfig the stream */ - + AVDT_ReconfigReq(p_scb->avdt_handle, p_scb->p_cap); p_scb->p_cap->psc_mask = p_scb->cur_psc_mask; } @@ -2527,7 +2527,7 @@ void bta_av_rcfg_open (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data) { /* Need to update call-out module so that it will be ready for discover */ p_scb->p_cos->stop(p_scb->hndl, p_scb->codec_type); - + /* send avdtp discover request */ AVDT_DiscoverReq(p_scb->peer_addr, p_scb->sep_info, BTA_AV_NUM_SEPS, bta_av_dt_cback[p_scb->hdi]); } @@ -2544,7 +2544,7 @@ void bta_av_rcfg_open (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data) AVDT_OpenReq(p_scb->avdt_handle, p_scb->peer_addr, p_scb->sep_info[p_scb->sep_info_idx].seid, p_scb->p_cap); } - + } /******************************************************************************* @@ -2708,7 +2708,7 @@ void bta_av_open_at_inc (tBTA_AV_SCB *p_scb, tBTA_AV_DATA *p_data) /* We need to switch to INIT state and start opening connection. */ p_scb->coll_mask = 0; bta_av_set_scb_sst_init (p_scb); - + if ((p_buf = (tBTA_AV_API_OPEN *) GKI_getbuf(sizeof(tBTA_AV_API_OPEN))) != NULL) { memcpy(p_buf, &(p_scb->open_api), sizeof(tBTA_AV_API_OPEN)); diff --git a/bta/av/bta_av_act.c b/bta/av/bta_av_act.c index 4693a6e..a8f255d 100644 --- a/bta/av/bta_av_act.c +++ b/bta/av/bta_av_act.c @@ -181,7 +181,7 @@ static void bta_av_avrc_sdp_cback(UINT16 status) ** Function bta_av_rc_ctrl_cback ** ** Description AVRCP control callback. -** +** ** Returns void ** *******************************************************************************/ @@ -197,7 +197,7 @@ static void bta_av_rc_ctrl_cback(UINT8 handle, UINT8 event, UINT16 result, BD_AD #endif if (event == AVRC_OPEN_IND_EVT) { - /* save handle of opened connection + /* save handle of opened connection bta_av_cb.rc_handle = handle;*/ msg_event = BTA_AV_AVRC_OPEN_EVT; @@ -225,7 +225,7 @@ static void bta_av_rc_ctrl_cback(UINT8 handle, UINT8 event, UINT16 result, BD_AD ** Function bta_av_rc_msg_cback ** ** Description AVRCP message callback. -** +** ** Returns void ** *******************************************************************************/ @@ -306,15 +306,15 @@ UINT8 bta_av_rc_create(tBTA_AV_CB *p_cb, UINT8 role, UINT8 shdl, UINT8 lidx) ccb.p_ctrl_cback = bta_av_rc_ctrl_cback; ccb.p_msg_cback = bta_av_rc_msg_cback; - ccb.company_id = p_bta_av_cfg->company_id; - ccb.conn = role; + ccb.company_id = p_bta_av_cfg->company_id; + ccb.conn = role; /* note: BTA_AV_FEAT_RCTG = AVRC_CT_TARGET, BTA_AV_FEAT_RCCT = AVRC_CT_CONTROL */ ccb.control = p_cb->features & (BTA_AV_FEAT_RCTG | BTA_AV_FEAT_RCCT | AVRC_CT_PASSIVE); if (AVRC_Open(&rc_handle, &ccb, bda) != AVRC_SUCCESS) return BTA_AV_RC_HANDLE_NONE; - + i = rc_handle; p_rcb = &p_cb->rcb[i]; @@ -322,7 +322,7 @@ UINT8 bta_av_rc_create(tBTA_AV_CB *p_cb, UINT8 role, UINT8 shdl, UINT8 lidx) { APPL_TRACE_ERROR1("bta_av_rc_create found duplicated handle:%d", rc_handle); } - + p_rcb->handle = rc_handle; p_rcb->status = status; p_rcb->shdl = shdl; @@ -346,7 +346,7 @@ UINT8 bta_av_rc_create(tBTA_AV_CB *p_cb, UINT8 role, UINT8 shdl, UINT8 lidx) ** Function bta_av_valid_group_navi_msg ** ** Description Check if it is Group Navigation Msg for Metadata -** +** ** Returns BTA_AV_RSP_ACCEPT or BTA_AV_RSP_NOT_IMPL. ** *******************************************************************************/ @@ -356,7 +356,7 @@ static tBTA_AV_CODE bta_av_group_navi_supported(UINT8 len, UINT8 *p_data) UINT8 *p_ptr = p_data; UINT16 u16; UINT32 u32; - + if (p_bta_av_cfg->avrc_group && len == BTA_GROUP_NAVI_MSG_OP_DATA_LEN) { BTA_AV_BE_STREAM_TO_CO_ID(u32, p_ptr); @@ -379,7 +379,7 @@ static tBTA_AV_CODE bta_av_group_navi_supported(UINT8 len, UINT8 *p_data) ** Function bta_av_op_supported ** ** Description Check if remote control operation is supported. -** +** ** Returns BTA_AV_RSP_ACCEPT of supported, BTA_AV_RSP_NOT_IMPL if not. ** *******************************************************************************/ @@ -409,7 +409,7 @@ static tBTA_AV_CODE bta_av_op_supported(tBTA_AV_RC rc_id) ** Function bta_av_find_lcb ** ** Description Given BD_addr, find the associated LCB. -** +** ** Returns NULL, if not found. ** *******************************************************************************/ @@ -613,7 +613,7 @@ void bta_av_rc_vendor_rsp(tBTA_AV_CB *p_cb, tBTA_AV_DATA *p_data) } /******************************************************************************* -** +** ** Function bta_av_rc_meta_rsp ** ** Description Send an AVRCP metadata/advanced control command/response. @@ -643,7 +643,7 @@ void bta_av_rc_meta_rsp(tBTA_AV_CB *p_cb, tBTA_AV_DATA *p_data) } /******************************************************************************* -** +** ** Function bta_av_rc_free_rsp ** ** Description free an AVRCP metadata command buffer. @@ -657,7 +657,7 @@ void bta_av_rc_free_rsp (tBTA_AV_CB *p_cb, tBTA_AV_DATA *p_data) } /******************************************************************************* -** +** ** Function bta_av_rc_meta_req ** ** Description Send an AVRCP metadata command. @@ -738,7 +738,7 @@ tBTA_AV_EVT bta_av_proc_meta_cmd(tAVRC_RESPONSE *p_rc_rsp, tBTA_AV_RC_MSG *p_ms /* reject it */ evt=0; p_vendor->hdr.ctype = BTA_AV_RSP_NOT_IMPL; - AVRC_VendorRsp(p_msg->handle, p_msg->label, &p_msg->msg.vendor); + AVRC_VendorRsp(p_msg->handle, p_msg->label, &p_msg->msg.vendor); } else { @@ -824,7 +824,7 @@ void bta_av_rc_msg(tBTA_AV_CB *p_cb, tBTA_AV_DATA *p_data) } else { - p_data->rc_msg.msg.hdr.ctype = bta_av_op_supported(p_data->rc_msg.msg.pass.op_id); + p_data->rc_msg.msg.hdr.ctype = bta_av_op_supported(p_data->rc_msg.msg.pass.op_id); } /* send response */ @@ -853,7 +853,7 @@ void bta_av_rc_msg(tBTA_AV_CB *p_cb, tBTA_AV_DATA *p_data) av.remote_rsp.rsp_code = p_data->rc_msg.msg.hdr.ctype; av.remote_rsp.label = p_data->rc_msg.label; } - /* must be a bad ctype -> reject*/ + /* must be a bad ctype -> reject*/ else { p_data->rc_msg.msg.hdr.ctype = BTA_AV_RSP_REJ; @@ -871,20 +871,20 @@ void bta_av_rc_msg(tBTA_AV_CB *p_cb, tBTA_AV_DATA *p_data) av.vendor_cmd.len = p_vendor->vendor_len; /* if configured to support vendor specific and it's a command */ - if ((p_cb->features & BTA_AV_FEAT_VENDOR) && + if ((p_cb->features & BTA_AV_FEAT_VENDOR) && p_data->rc_msg.msg.hdr.ctype <= AVRC_CMD_GEN_INQ) { evt = BTA_AV_VENDOR_CMD_EVT; } /* else if configured to support vendor specific and it's a response */ - else if ((p_cb->features & BTA_AV_FEAT_VENDOR) && + else if ((p_cb->features & BTA_AV_FEAT_VENDOR) && p_data->rc_msg.msg.hdr.ctype >= AVRC_RSP_ACCEPT) { evt = BTA_AV_VENDOR_RSP_EVT; } /* else if not configured to support vendor specific and it's a command */ - else if (!(p_cb->features & BTA_AV_FEAT_VENDOR) && + else if (!(p_cb->features & BTA_AV_FEAT_VENDOR) && p_data->rc_msg.msg.hdr.ctype <= AVRC_CMD_GEN_INQ) { if(p_data->rc_msg.msg.vendor.p_vendor_data[0] == AVRC_PDU_INVALID) @@ -1170,7 +1170,7 @@ void bta_av_conn_chg(tBTA_AV_DATA *p_data) /* clear the conned mask for this channel */ p_cb->conn_audio &= ~mask; p_cb->conn_video &= ~mask; - if(p_scb) + if(p_scb) { /* the stream is closed. * clear the peer address, so it would not mess up the AVRCP for the next round of operation */ @@ -1332,7 +1332,7 @@ void bta_av_sig_chg(tBTA_AV_DATA *p_data) AVDT_DisconnectReq (p_data->str_msg.bd_addr, NULL); return; } - + p_lcb = &p_cb->lcb[xx]; p_lcb->lidx = xx + 1; bdcpy(p_lcb->addr, p_data->str_msg.bd_addr); @@ -1352,8 +1352,8 @@ void bta_av_sig_chg(tBTA_AV_DATA *p_data) p_cb->p_scb[xx]->use_rc = TRUE; /* allowing RC for incoming connection */ bta_av_ssm_execute(p_cb->p_scb[xx], BTA_AV_ACP_CONNECT_EVT, p_data); - /* The Pending Event should be sent as soon as the L2CAP signalling channel - * is set up, which is NOW. Earlier this was done only after + /* The Pending Event should be sent as soon as the L2CAP signalling channel + * is set up, which is NOW. Earlier this was done only after * BTA_AV_SIG_TIME_VAL milliseconds. * The following function shall send the event and start the recurring timer */ @@ -1443,20 +1443,20 @@ void bta_av_sig_timer(tBTA_AV_DATA *p_data) ** Description Process the timeout when SRC is accepting connection ** and SNK did not start signalling. ** -** Returns void +** Returns void ** *******************************************************************************/ static void bta_av_acp_sig_timer_cback (TIMER_LIST_ENT *p_tle) { UINT8 inx = (UINT8)p_tle->param; - tBTA_AV_CB *p_cb = &bta_av_cb; + tBTA_AV_CB *p_cb = &bta_av_cb; tBTA_AV_SCB *p_scb = p_cb->p_scb[inx]; tBTA_AV_API_OPEN *p_buf; if (p_scb) { APPL_TRACE_DEBUG1("bta_av_acp_sig_timer_cback, coll_mask = 0x%02X", p_scb->coll_mask); - + if (p_scb->coll_mask & BTA_AV_COLL_INC_TMR) { p_scb->coll_mask &= ~BTA_AV_COLL_INC_TMR; @@ -1486,7 +1486,7 @@ static void bta_av_acp_sig_timer_cback (TIMER_LIST_ENT *p_tle) if (p_scb->coll_mask & BTA_AV_COLL_API_CALLED) { p_scb->coll_mask &= ~BTA_AV_COLL_API_CALLED; - + /* BTA_AV_API_OPEN_EVT */ if ((p_buf = (tBTA_AV_API_OPEN *) GKI_getbuf(sizeof(tBTA_AV_API_OPEN))) != NULL) { @@ -1494,7 +1494,7 @@ static void bta_av_acp_sig_timer_cback (TIMER_LIST_ENT *p_tle) bta_sys_sendmsg(p_buf); } } - } + } } } } @@ -1538,7 +1538,7 @@ tBTA_AV_FEAT bta_av_check_peer_features (UINT16 service_uuid) { peer_features |= BTA_AV_FEAT_RCTG; } - } + } if (( SDP_FindAttributeInRec(p_rec, ATTR_ID_BT_PROFILE_DESC_LIST)) != NULL) { diff --git a/bta/av/bta_av_api.c b/bta/av/bta_av_api.c index 762692f..496f185 100644 --- a/bta/av/bta_av_api.c +++ b/bta/av/bta_av_api.c @@ -3,7 +3,7 @@ ** Name: bta_av_api.c ** ** Description: This is the implementation of the API for the advanced -** audio/video (AV) subsystem of BTA, Widcomm's Bluetooth +** audio/video (AV) subsystem of BTA, Widcomm's Bluetooth ** application layer for mobile phones. ** ** Copyright (c) 2011, Broadcom Corp., All Rights Reserved. @@ -36,7 +36,7 @@ static const tBTA_SYS_REG bta_av_reg = ** ** Function BTA_AvEnable ** -** Description Enable the advanced audio/video service. When the enable +** Description Enable the advanced audio/video service. When the enable ** operation is complete the callback function will be ** called with a BTA_AV_ENABLE_EVT. This function must ** be called before other function in the AV API are @@ -89,7 +89,7 @@ void BTA_AvDisable(void) ** ** Function BTA_AvRegister ** -** Description Register the audio or video service to stack. When the +** Description Register the audio or video service to stack. When the ** operation is complete the callback function will be ** called with a BTA_AV_REGISTER_EVT. This function must ** be called before AVDT stream is open. @@ -324,7 +324,7 @@ void BTA_AvProtectReq(tBTA_AV_HNDL hndl, UINT8 *p_data, UINT16 len) ** Function BTA_AvProtectRsp ** ** Description Send a content protection response. This function must -** be called if a BTA_AV_PROTECT_REQ_EVT is received. +** be called if a BTA_AV_PROTECT_REQ_EVT is received. ** This function can only be used if AV is enabled with ** feature BTA_AV_FEAT_PROTECT. ** @@ -424,7 +424,7 @@ void BTA_AvVendorCmd(UINT8 rc_handle, UINT8 label, tBTA_AV_CODE cmd_code, UINT8 ** Function BTA_AvVendorRsp ** ** Description Send a vendor dependent remote control response. -** This function must be called if a BTA_AV_VENDOR_CMD_EVT +** This function must be called if a BTA_AV_VENDOR_CMD_EVT ** is received. This function can only be used if AV is ** enabled with feature BTA_AV_FEAT_VENDOR. ** diff --git a/bta/av/bta_av_cfg.c b/bta/av/bta_av_cfg.c index ebd8bd1..5f89a75 100644 --- a/bta/av/bta_av_cfg.c +++ b/bta/av/bta_av_cfg.c @@ -63,7 +63,7 @@ const UINT8 bta_av_meta_caps_evt_ids[] = { }; #ifndef BTA_AV_NUM_RC_EVT_IDS #define BTA_AV_NUM_RC_EVT_IDS (sizeof(bta_av_meta_caps_evt_ids) / sizeof(bta_av_meta_caps_evt_ids[0])) -#endif /* BTA_AV_NUM_RC_EVT_IDS */ +#endif /* BTA_AV_NUM_RC_EVT_IDS */ #else /* !ANDROID_APP_INCLUDED */ @@ -147,7 +147,7 @@ const UINT16 bta_av_rc_id[] = 8=PAGE_DOWN */ #if (BTA_AV_RC_PASS_RSP_CODE == BTA_AV_RSP_INTERIM) - /* btui_app provides an example of how to leave the decision of rejecting a command or not + /* btui_app provides an example of how to leave the decision of rejecting a command or not * based on which media player is currently addressed (this is only applicable for AVRCP 1.4 or later) * If the decision is per player for a particular rc_id, the related bit is clear (not set) */ 0x0070, /* bit mask: 0=POWER, 1=VOL_UP, 2=VOL_DOWN, 3=MUTE, @@ -167,7 +167,7 @@ const UINT16 bta_av_rc_id[] = 12=BACKWARD */ #endif #endif - + 0x0000, /* bit mask: 0=ANGLE, 1=SUBPICT */ 0, /* not used */ @@ -195,14 +195,14 @@ const UINT16 bta_av_rc_id_ac[] = 4=INPUT_SEL, 5=DISP_INFO, 6=HELP, 7=PAGE_UP, 8=PAGE_DOWN */ - /* btui_app provides an example of how to leave the decision of rejecting a command or not + /* btui_app provides an example of how to leave the decision of rejecting a command or not * based on which media player is currently addressed (this is only applicable for AVRCP 1.4 or later) * If the decision is per player for a particular rc_id, the related bit is set */ 0x1800, /* bit mask: 0=POWER, 1=VOL_UP, 2=VOL_DOWN, 3=MUTE, 4=PLAY, 5=STOP, 6=PAUSE, 7=RECORD, 8=REWIND, 9=FAST_FOR, 10=EJECT, 11=FORWARD, 12=BACKWARD */ - + 0x0000, /* bit mask: 0=ANGLE, 1=SUBPICT */ 0, /* not used */ diff --git a/bta/av/bta_av_ci.c b/bta/av/bta_av_ci.c index c182948..1aa3751 100644 --- a/bta/av/bta_av_ci.c +++ b/bta/av/bta_av_ci.c @@ -3,7 +3,7 @@ ** Name: bta_av_ci.c ** ** Description: This is the implementation file for advanced audio/video -** call-in functions. +** call-in functions. ** ** Copyright (c) 2005, Widcomm Inc., All Rights Reserved. ** Widcomm Bluetooth Core. Proprietary and confidential. @@ -26,7 +26,7 @@ ** should call bta_av_co_audio_src_data_path() or ** bta_av_co_video_src_data_path(). ** -** Returns void +** Returns void ** *******************************************************************************/ void bta_av_ci_src_data_ready(tBTA_AV_CHNL chnl) @@ -51,7 +51,7 @@ void bta_av_ci_src_data_ready(tBTA_AV_CHNL chnl) ** AVDT_SUCCESS if the codec configuration is ok, ** otherwise error. ** -** Returns void +** Returns void ** *******************************************************************************/ void bta_av_ci_setconfig(tBTA_AV_HNDL hndl, UINT8 err_code, UINT8 category, diff --git a/bta/av/bta_av_int.h b/bta/av/bta_av_int.h index 41fb565..b8d3e21 100644 --- a/bta/av/bta_av_int.h +++ b/bta/av/bta_av_int.h @@ -48,17 +48,17 @@ enum BTA_AV_SRC_DATA_READY_EVT, BTA_AV_CI_SETCONFIG_OK_EVT, BTA_AV_CI_SETCONFIG_FAIL_EVT, - BTA_AV_SDP_DISC_OK_EVT, + BTA_AV_SDP_DISC_OK_EVT, BTA_AV_SDP_DISC_FAIL_EVT, - BTA_AV_STR_DISC_OK_EVT, + BTA_AV_STR_DISC_OK_EVT, BTA_AV_STR_DISC_FAIL_EVT, BTA_AV_STR_GETCAP_OK_EVT, BTA_AV_STR_GETCAP_FAIL_EVT, - BTA_AV_STR_OPEN_OK_EVT, + BTA_AV_STR_OPEN_OK_EVT, BTA_AV_STR_OPEN_FAIL_EVT, BTA_AV_STR_START_OK_EVT, BTA_AV_STR_START_FAIL_EVT, - BTA_AV_STR_CLOSE_EVT, + BTA_AV_STR_CLOSE_EVT, BTA_AV_STR_CONFIG_IND_EVT, BTA_AV_STR_SECURITY_IND_EVT, BTA_AV_STR_SECURITY_CFM_EVT, @@ -66,7 +66,7 @@ enum BTA_AV_STR_SUSPEND_CFM_EVT, BTA_AV_STR_RECONFIG_CFM_EVT, BTA_AV_AVRC_TIMER_EVT, - BTA_AV_AVDT_CONNECT_EVT, + BTA_AV_AVDT_CONNECT_EVT, BTA_AV_AVDT_DISCONNECT_EVT, BTA_AV_ROLE_CHANGE_EVT, BTA_AV_AVDT_DELAY_RPT_EVT, @@ -85,7 +85,7 @@ enum BTA_AV_CONN_CHG_EVT, BTA_AV_DEREG_COMP_EVT, #if (AVDT_REPORTING == TRUE) - BTA_AV_AVDT_RPT_CONN_EVT, + BTA_AV_AVDT_RPT_CONN_EVT, #endif BTA_AV_API_START_EVT, /* the following 2 events must be in the same order as the *AP_*EVT */ BTA_AV_API_STOP_EVT @@ -154,8 +154,8 @@ typedef UINT8 (*tBTA_AV_CO_GETCFG) (tBTA_AV_HNDL hndl, tBTA_AV_CODEC codec_type, typedef void (*tBTA_AV_CO_SETCFG) (tBTA_AV_HNDL hndl, tBTA_AV_CODEC codec_type, UINT8 *p_codec_info, UINT8 seid, BD_ADDR addr, UINT8 num_protect, UINT8 *p_protect_info); -typedef void (*tBTA_AV_CO_OPEN) (tBTA_AV_HNDL hndl, - tBTA_AV_CODEC codec_type, UINT8 *p_codec_info, +typedef void (*tBTA_AV_CO_OPEN) (tBTA_AV_HNDL hndl, + tBTA_AV_CODEC codec_type, UINT8 *p_codec_info, UINT16 mtu); typedef void (*tBTA_AV_CO_CLOSE) (tBTA_AV_HNDL hndl, tBTA_AV_CODEC codec_type, UINT16 mtu); typedef void (*tBTA_AV_CO_START) (tBTA_AV_HNDL hndl, tBTA_AV_CODEC codec_type); diff --git a/bta/av/bta_av_main.c b/bta/av/bta_av_main.c index ebf11b4..6c835fa 100644 --- a/bta/av/bta_av_main.c +++ b/bta/av/bta_av_main.c @@ -224,7 +224,7 @@ static void bta_av_timer_cback(void *p_tle) ** Function bta_av_api_enable ** ** Description Handle an API enable event. -** +** ** ** Returns void ** @@ -399,9 +399,9 @@ void bta_av_conn_cback(UINT8 handle, BD_ADDR bd_addr, UINT8 event, tAVDT_CTRL *p #endif if (/*((p_scb && (p_scb->role & BTA_AV_ROLE_AD_ACP)) || - + //(AVDT_CONNECT_IND_EVT == event && AVDT_ACP == p_data->hdr.err_param)) - + (AVDT_CONNECT_IND_EVT == event))&& */ (p_msg = (tBTA_AV_STR_MSG *) GKI_getbuf((UINT16) (sizeof(tBTA_AV_STR_MSG)))) != NULL) { @@ -505,10 +505,10 @@ static void bta_av_api_register(tBTA_AV_DATA *p_data) /* register with no authorization; let AVDTP use authorization instead */ #if( defined BTA_AR_INCLUDED ) && (BTA_AR_INCLUDED == TRUE) #if (BTA_AV_WITH_AVCTP_AUTHORIZATION == TRUE) - bta_ar_reg_avct(p_bta_av_cfg->avrc_mtu, p_bta_av_cfg->avrc_br_mtu, + bta_ar_reg_avct(p_bta_av_cfg->avrc_mtu, p_bta_av_cfg->avrc_br_mtu, bta_av_cb.sec_mask, BTA_ID_AV); #else - bta_ar_reg_avct(p_bta_av_cfg->avrc_mtu, p_bta_av_cfg->avrc_br_mtu, + bta_ar_reg_avct(p_bta_av_cfg->avrc_mtu, p_bta_av_cfg->avrc_br_mtu, (UINT8)(bta_av_cb.sec_mask & (~BTA_SEC_AUTHORIZE)), BTA_ID_AV); #endif @@ -526,13 +526,13 @@ static void bta_av_api_register(tBTA_AV_DATA *p_data) /* memset(&cs.cfg,0,sizeof(tAVDT_CFG)); */ cs.cfg.num_codec = 1; cs.tsep = AVDT_TSEP_SRC; - + /* * memset of cs takes care setting call back pointers to null. cs.p_data_cback = NULL; cs.p_report_cback = NULL; */ - cs.nsc_mask = AVDT_NSC_RECONFIG | + cs.nsc_mask = AVDT_NSC_RECONFIG | ((bta_av_cb.features & BTA_AV_FEAT_PROTECT) ? 0 : AVDT_NSC_SECURITY); APPL_TRACE_DEBUG1("nsc_mask: 0x%x", cs.nsc_mask); @@ -609,10 +609,10 @@ static void bta_av_api_register(tBTA_AV_DATA *p_data) { #if( defined BTA_AR_INCLUDED ) && (BTA_AR_INCLUDED == TRUE) #if (BTA_AV_WITH_AVCTP_AUTHORIZATION == TRUE) - bta_ar_reg_avct(p_bta_av_cfg->avrc_mtu, p_bta_av_cfg->avrc_br_mtu, + bta_ar_reg_avct(p_bta_av_cfg->avrc_mtu, p_bta_av_cfg->avrc_br_mtu, bta_av_cb.sec_mask, BTA_ID_AV); #else - bta_ar_reg_avct(p_bta_av_cfg->avrc_mtu, p_bta_av_cfg->avrc_br_mtu, + bta_ar_reg_avct(p_bta_av_cfg->avrc_mtu, p_bta_av_cfg->avrc_br_mtu, (UINT8)(bta_av_cb.sec_mask & (~BTA_SEC_AUTHORIZE)), BTA_ID_AV); #endif #endif @@ -646,7 +646,7 @@ static void bta_av_api_register(tBTA_AV_DATA *p_data) ** Function bta_av_api_deregister ** ** Description de-register a channel -** +** ** ** Returns void ** @@ -671,7 +671,7 @@ void bta_av_api_deregister(tBTA_AV_DATA *p_data) ** Function bta_av_ci_data ** ** Description forward the BTA_AV_CI_SRC_DATA_READY_EVT to stream state machine -** +** ** ** Returns void ** @@ -682,7 +682,7 @@ static void bta_av_ci_data(tBTA_AV_DATA *p_data) int i; UINT8 chnl = (UINT8)p_data->hdr.layer_specific; - for( i=0; i < BTA_AV_NUM_STRS; i++ ) + for( i=0; i < BTA_AV_NUM_STRS; i++ ) { p_scb = bta_av_cb.p_scb[i]; @@ -714,7 +714,7 @@ static void bta_av_rpc_conn(tBTA_AV_DATA *p_data) ** Function bta_av_api_to_ssm ** ** Description forward the API request to stream state machine -** +** ** ** Returns void ** @@ -734,7 +734,7 @@ static void bta_av_api_to_ssm(tBTA_AV_DATA *p_data) ** ** Function bta_av_chk_start ** -** Description if this is audio channel, check if more than one audio +** Description if this is audio channel, check if more than one audio ** channel is connected & already started. ** ** Returns TRUE, if need api_start @@ -801,7 +801,7 @@ void bta_av_restore_switch (void) } break; } - } + } } /******************************************************************************* @@ -853,7 +853,7 @@ static void bta_av_sys_rs_cback (tBTA_SYS_CONN_STATUS status,UINT8 id, UINT8 app (cur_role == BTM_ROLE_SLAVE) ) { bta_sys_set_policy(BTA_ID_AV, HCI_ENABLE_MASTER_SLAVE_SWITCH, peer_addr); - } + } /* if BTA_AvOpen() was called for other device, which caused the role switch of the peer_addr, */ /* we need to continue opening process for the BTA_AvOpen(). */ @@ -883,7 +883,7 @@ static void bta_av_sys_rs_cback (tBTA_SYS_CONN_STATUS status,UINT8 id, UINT8 app ** Function bta_av_sco_chg_cback ** ** Description receive & process the SCO connection up/down event from sys. -** call setup also triggers this callback, to suspend av before sco +** call setup also triggers this callback, to suspend av before sco ** activity happens, or to resume av once call ends. ** ** Returns void @@ -929,7 +929,7 @@ static void bta_av_sco_chg_cback(tBTA_SYS_CONN_STATUS status, UINT8 id, UINT8 { APPL_TRACE_DEBUG1("starting scb:%d", i); bta_av_ssm_execute(p_scb, BTA_AV_AP_START_EVT, NULL); - } + } } } } @@ -1025,7 +1025,7 @@ BOOLEAN bta_av_link_role_ok(tBTA_AV_SCB *p_scb, UINT8 bits) ** ** Function bta_av_chk_mtu ** -** Description if this is audio channel, check if more than one audio +** Description if this is audio channel, check if more than one audio ** channel is connected. ** ** Returns The smallest mtu of the connected audio channels @@ -1122,7 +1122,7 @@ void bta_av_dup_audio_buf(tBTA_AV_SCB *p_scb, BT_HDR *p_buf) ** Function bta_av_sm_execute ** ** Description State machine event handling function for AV -** +** ** ** Returns void ** @@ -1161,7 +1161,7 @@ void bta_av_sm_execute(tBTA_AV_CB *p_cb, UINT16 event, tBTA_AV_DATA *p_data) ** Function bta_av_hdl_event ** ** Description Advanced audio/video main event handling function. -** +** ** ** Returns BOOLEAN ** @@ -1203,7 +1203,7 @@ BOOLEAN bta_av_hdl_event(BT_HDR *p_msg) bta_av_ssm_execute( bta_av_hndl_to_scb(p_msg->layer_specific), p_msg->event, (tBTA_AV_DATA *) p_msg); } - return TRUE; + return TRUE; } @@ -1215,7 +1215,7 @@ BOOLEAN bta_av_hdl_event(BT_HDR *p_msg) ** ** Function bta_av_st_code ** -** Description +** Description ** ** Returns char * ** @@ -1233,7 +1233,7 @@ static char *bta_av_st_code(UINT8 state) ** ** Function bta_av_evt_code ** -** Description +** Description ** ** Returns char * ** diff --git a/bta/av/bta_av_sbc.c b/bta/av/bta_av_sbc.c index ba11752..6142e9a 100644 --- a/bta/av/bta_av_sbc.c +++ b/bta/av/bta_av_sbc.c @@ -43,7 +43,7 @@ tBTA_AV_SBC_UPS_CB bta_av_sbc_ups_cb; ** dst_sps: samples per second (converted audio data) ** bits: number of bits per pcm sample ** n_channels: number of channels (i.e. mono(1), stereo(2)...) -** +** ** Returns none ** *******************************************************************************/ @@ -89,7 +89,7 @@ void bta_av_sbc_init_up_sample (UINT32 src_sps, UINT32 dst_sps, UINT16 bits, UIN ** ** Function bta_av_sbc_up_sample ** -** Description Given the source (p_src) audio data and +** Description Given the source (p_src) audio data and ** source speed (src_sps, samples per second), ** This function converts it to audio data in the desired format ** @@ -134,7 +134,7 @@ int bta_av_sbc_up_sample (void *p_src, void *p_dst, ** ** Function bta_av_sbc_up_sample_16s (16bits-stereo) ** -** Description Given the source (p_src) audio data and +** Description Given the source (p_src) audio data and ** source speed (src_sps, samples per second), ** This function converts it to audio data in the desired format ** @@ -142,7 +142,7 @@ int bta_av_sbc_up_sample (void *p_src, void *p_dst, ** p_dst: the data buffer to hold the converted audio data ** src_samples: The number of source samples (in uint of 4 bytes) ** dst_samples: The size of p_dst (in uint of 4 bytes) -** +** ** Returns The number of bytes used in p_dst ** The number of bytes used in p_src (in *p_ret) ** @@ -197,7 +197,7 @@ int bta_av_sbc_up_sample_16s (void *p_src, void *p_dst, ** ** Function bta_av_sbc_up_sample_16m (16bits-mono) ** -** Description Given the source (p_src) audio data and +** Description Given the source (p_src) audio data and ** source speed (src_sps, samples per second), ** This function converts it to audio data in the desired format ** @@ -205,7 +205,7 @@ int bta_av_sbc_up_sample_16s (void *p_src, void *p_dst, ** p_dst: the data buffer to hold the converted audio data ** src_samples: The number of source samples (in uint of 2 bytes) ** dst_samples: The size of p_dst (in uint of 2 bytes) -** +** ** Returns The number of bytes used in p_dst ** The number of bytes used in p_src (in *p_ret) ** @@ -262,7 +262,7 @@ int bta_av_sbc_up_sample_16m (void *p_src, void *p_dst, ** ** Function bta_av_sbc_up_sample_8s (8bits-stereo) ** -** Description Given the source (p_src) audio data and +** Description Given the source (p_src) audio data and ** source speed (src_sps, samples per second), ** This function converts it to audio data in the desired format ** @@ -270,7 +270,7 @@ int bta_av_sbc_up_sample_16m (void *p_src, void *p_dst, ** p_dst: the data buffer to hold the converted audio data ** src_samples: The number of source samples (in uint of 2 bytes) ** dst_samples: The size of p_dst (in uint of 2 bytes) -** +** ** Returns The number of bytes used in p_dst ** The number of bytes used in p_src (in *p_ret) ** @@ -331,7 +331,7 @@ int bta_av_sbc_up_sample_8s (void *p_src, void *p_dst, ** ** Function bta_av_sbc_up_sample_8m (8bits-mono) ** -** Description Given the source (p_src) audio data and +** Description Given the source (p_src) audio data and ** source speed (src_sps, samples per second), ** This function converts it to audio data in the desired format ** @@ -339,7 +339,7 @@ int bta_av_sbc_up_sample_8s (void *p_src, void *p_dst, ** p_dst: the data buffer to hold the converted audio data ** src_samples: The number of source samples (number of bytes) ** dst_samples: The size of p_dst (number of bytes) -** +** ** Returns The number of bytes used in p_dst ** The number of bytes used in p_src (in *p_ret) ** @@ -398,12 +398,12 @@ int bta_av_sbc_up_sample_8m (void *p_src, void *p_dst, ** ** Description Determine the preferred SBC codec configuration for the ** given codec capabilities. The function is passed the -** preferred codec configuration and the peer codec +** preferred codec configuration and the peer codec ** capabilities for the stream. The function attempts to ** match the preferred capabilities with the configuration ** as best it can. The resulting codec configuration is ** returned in the same memory used for the capabilities. -** +** ** Returns 0 if ok, nonzero if error. ** Codec configuration in p_cap. ** @@ -429,7 +429,7 @@ UINT8 bta_av_sbc_cfg_for_cap(UINT8 *p_peer, tA2D_SBC_CIE *p_cap, tA2D_SBC_CIE *p APPL_TRACE_ERROR1("bta_av_sbc_cfg_for_cap: ch_mode(0x%02X) not supported", p_pref->ch_mode); return A2D_FAIL; } - + /* Check if the peer supports our sampling freq */ if (peer_cie.samp_freq & p_pref->samp_freq) { @@ -500,7 +500,7 @@ UINT8 bta_av_sbc_cfg_for_cap(UINT8 *p_peer, tA2D_SBC_CIE *p_cap, tA2D_SBC_CIE *p ** ** Description This function checks whether an SBC codec configuration ** is allowable for the given codec capabilities. -** +** ** Returns 0 if ok, nonzero if error. ** *******************************************************************************/ @@ -517,7 +517,7 @@ UINT8 bta_av_sbc_cfg_in_cap(UINT8 *p_cfg, tA2D_SBC_CIE *p_cap) /* verify that each parameter is in range */ - /* sampling frequency */ + /* sampling frequency */ if ((cfg_cie.samp_freq & p_cap->samp_freq) == 0) { status = A2D_NS_SAMP_FREQ; @@ -551,7 +551,7 @@ UINT8 bta_av_sbc_cfg_in_cap(UINT8 *p_cfg, tA2D_SBC_CIE *p_cap) else if (cfg_cie.min_bitpool < p_cap->min_bitpool) { status = A2D_NS_MIN_BITPOOL; - } + } return status; } @@ -561,7 +561,7 @@ UINT8 bta_av_sbc_cfg_in_cap(UINT8 *p_cfg, tA2D_SBC_CIE *p_cap) ** Function bta_av_sbc_bld_hdr ** ** Description This function builds the packet header for MPF1. -** +** ** Returns void ** *******************************************************************************/ diff --git a/bta/av/bta_av_ssm.c b/bta/av/bta_av_ssm.c index 9e74881..f1132d9 100644 --- a/bta/av/bta_av_ssm.c +++ b/bta/av/bta_av_ssm.c @@ -135,7 +135,7 @@ static const UINT8 bta_av_sst_init[][BTA_AV_NUM_COLS] = /* AVDT_DELAY_RPT_EVT */ {BTA_AV_SIGNORE, BTA_AV_SIGNORE, BTA_AV_INIT_SST }, /* ACP_CONNECT_EVT */ {BTA_AV_SIGNORE, BTA_AV_SIGNORE, BTA_AV_INCOMING_SST } }; - + /* state table for incoming state */ static const UINT8 bta_av_sst_incoming[][BTA_AV_NUM_COLS] = { @@ -361,7 +361,7 @@ static char *bta_av_sst_code(UINT8 state); ** Function bta_av_is_rcfg_sst ** ** Description Check if stream state machine is in reconfig state. -** +** ** ** Returns TRUE if stream state machine is in reconfig state. ** @@ -384,7 +384,7 @@ BOOLEAN bta_av_is_rcfg_sst (tBTA_AV_SCB *p_scb) ** Function bta_av_ssm_execute ** ** Description Stream state machine event handling function for AV -** +** ** ** Returns void ** @@ -456,7 +456,7 @@ void bta_av_ssm_execute(tBTA_AV_SCB *p_scb, UINT16 event, tBTA_AV_DATA *p_data) ** Function bta_av_is_scb_opening ** ** Description Returns TRUE is scb is in opening state. -** +** ** ** Returns TRUE if scb is in opening state. ** @@ -464,7 +464,7 @@ void bta_av_ssm_execute(tBTA_AV_SCB *p_scb, UINT16 event, tBTA_AV_DATA *p_data) BOOLEAN bta_av_is_scb_opening (tBTA_AV_SCB *p_scb) { BOOLEAN is_opening = FALSE; - + if (p_scb) { if (p_scb->state == BTA_AV_OPENING_SST) @@ -479,7 +479,7 @@ BOOLEAN bta_av_is_scb_opening (tBTA_AV_SCB *p_scb) ** Function bta_av_is_scb_incoming ** ** Description Returns TRUE is scb is in incoming state. -** +** ** ** Returns TRUE if scb is in incoming state. ** @@ -487,7 +487,7 @@ BOOLEAN bta_av_is_scb_opening (tBTA_AV_SCB *p_scb) BOOLEAN bta_av_is_scb_incoming (tBTA_AV_SCB *p_scb) { BOOLEAN is_incoming = FALSE; - + if (p_scb) { if (p_scb->state == BTA_AV_INCOMING_SST) @@ -520,7 +520,7 @@ void bta_av_set_scb_sst_init (tBTA_AV_SCB *p_scb) ** Function bta_av_is_scb_init ** ** Description Returns TRUE is scb is in init state. -** +** ** ** Returns TRUE if scb is in incoming state. ** @@ -528,7 +528,7 @@ void bta_av_set_scb_sst_init (tBTA_AV_SCB *p_scb) BOOLEAN bta_av_is_scb_init (tBTA_AV_SCB *p_scb) { BOOLEAN is_init = FALSE; - + if (p_scb) { if (p_scb->state == BTA_AV_INIT_SST) @@ -564,7 +564,7 @@ void bta_av_set_scb_sst_incoming (tBTA_AV_SCB *p_scb) ** ** Function bta_av_sst_code ** -** Description +** Description ** ** Returns char * ** |