Format the BTM_WBS_INCLUDED macro
This commit is contained in:
parent
ad4b11a4f1
commit
392eb79704
|
@ -797,22 +797,23 @@ void bta_ag_setcodec(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
|
||||||
(codec_type != BTA_AG_CODEC_MSBC)) {
|
(codec_type != BTA_AG_CODEC_MSBC)) {
|
||||||
val.num = codec_type;
|
val.num = codec_type;
|
||||||
val.hdr.status = BTA_AG_FAIL_RESOURCES;
|
val.hdr.status = BTA_AG_FAIL_RESOURCES;
|
||||||
APPL_TRACE_ERROR("bta_ag_setcodec error: unsupported codec type %d", codec_type);
|
APPL_TRACE_ERROR("%s error: unsupported codec type %d", __func__, codec_type);
|
||||||
(*bta_ag_cb.p_cback)(BTA_AG_WBS_EVT, (tBTA_AG *) &val);
|
(*bta_ag_cb.p_cback)(BTA_AG_WBS_EVT, (tBTA_AG *) &val);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if((p_scb->peer_codecs & codec_type) || (codec_type == BTA_AG_CODEC_NONE) ||
|
if ((p_scb->peer_codecs & codec_type) ||
|
||||||
|
(codec_type == BTA_AG_CODEC_NONE) ||
|
||||||
(codec_type == BTA_AG_CODEC_CVSD)) {
|
(codec_type == BTA_AG_CODEC_CVSD)) {
|
||||||
p_scb->sco_codec = codec_type;
|
p_scb->sco_codec = codec_type;
|
||||||
p_scb->codec_updated = TRUE;
|
p_scb->codec_updated = TRUE;
|
||||||
val.num = codec_type;
|
val.num = codec_type;
|
||||||
val.hdr.status = BTA_AG_SUCCESS;
|
val.hdr.status = BTA_AG_SUCCESS;
|
||||||
APPL_TRACE_DEBUG("bta_ag_setcodec: Updated codec type %d", codec_type);
|
APPL_TRACE_DEBUG("%s: Updated codec type %d", __func__, codec_type);
|
||||||
} else {
|
} else {
|
||||||
val.num = codec_type;
|
val.num = codec_type;
|
||||||
val.hdr.status = BTA_AG_FAIL_RESOURCES;
|
val.hdr.status = BTA_AG_FAIL_RESOURCES;
|
||||||
APPL_TRACE_ERROR("bta_ag_setcodec error: unsupported codec type %d", codec_type);
|
APPL_TRACE_ERROR("%s error: unsupported codec type %d",__func__, codec_type);
|
||||||
}
|
}
|
||||||
(*bta_ag_cb.p_cback)(BTA_AG_WBS_EVT, (tBTA_AG *) &val);
|
(*bta_ag_cb.p_cback)(BTA_AG_WBS_EVT, (tBTA_AG *) &val);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -721,7 +721,7 @@ void bta_ag_codec_negotiate(tBTA_AG_SCB *p_scb)
|
||||||
bta_ag_sco_codec_nego(p_scb, TRUE);
|
bta_ag_sco_codec_nego(p_scb, TRUE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif /* (BTM_WBS_INCLUDED == TRUE ) */
|
#endif
|
||||||
|
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
**
|
**
|
||||||
|
|
|
@ -421,6 +421,7 @@ extern void bta_ag_sco_close(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data);
|
||||||
#if (BTM_WBS_INCLUDED == TRUE)
|
#if (BTM_WBS_INCLUDED == TRUE)
|
||||||
extern void bta_ag_sco_codec_nego(tBTA_AG_SCB *p_scb, BOOLEAN result);
|
extern void bta_ag_sco_codec_nego(tBTA_AG_SCB *p_scb, BOOLEAN result);
|
||||||
extern void bta_ag_codec_negotiate (tBTA_AG_SCB *p_scb);
|
extern void bta_ag_codec_negotiate (tBTA_AG_SCB *p_scb);
|
||||||
|
extern void bta_ag_send_bcs(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data);
|
||||||
#endif
|
#endif
|
||||||
extern void bta_ag_sco_shutdown(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data);
|
extern void bta_ag_sco_shutdown(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data);
|
||||||
extern void bta_ag_sco_conn_open(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data);
|
extern void bta_ag_sco_conn_open(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data);
|
||||||
|
@ -430,9 +431,6 @@ extern void bta_ag_post_sco_close(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data);
|
||||||
extern void bta_ag_svc_conn_open(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data);
|
extern void bta_ag_svc_conn_open(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data);
|
||||||
extern void bta_ag_result(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data);
|
extern void bta_ag_result(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data);
|
||||||
extern void bta_ag_setcodec(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data);
|
extern void bta_ag_setcodec(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data);
|
||||||
#if (BTM_WBS_INCLUDED == TRUE)
|
|
||||||
extern void bta_ag_send_bcs(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data);
|
|
||||||
#endif
|
|
||||||
extern void bta_ag_send_ring(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data);
|
extern void bta_ag_send_ring(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data);
|
||||||
extern void bta_ag_ci_sco_data(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data);
|
extern void bta_ag_ci_sco_data(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data);
|
||||||
extern void bta_ag_set_esco_param(BOOLEAN set_reset, tBTM_ESCO_PARAMS *param);
|
extern void bta_ag_set_esco_param(BOOLEAN set_reset, tBTM_ESCO_PARAMS *param);
|
||||||
|
|
|
@ -1441,7 +1441,6 @@ void btc_hf_cb_handler(btc_msg_t *msg)
|
||||||
#endif
|
#endif
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if (BTM_WBS_INCLUDED == TRUE)
|
#if (BTM_WBS_INCLUDED == TRUE)
|
||||||
case BTA_AG_WBS_EVT:
|
case BTA_AG_WBS_EVT:
|
||||||
{
|
{
|
||||||
|
@ -1451,7 +1450,7 @@ void btc_hf_cb_handler(btc_msg_t *msg)
|
||||||
btc_hf_cb_to_app(ESP_HF_WBS_RESPONSE_EVT, ¶m);
|
btc_hf_cb_to_app(ESP_HF_WBS_RESPONSE_EVT, ¶m);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
case BTA_AG_AT_BCS_EVT:
|
case BTA_AG_AT_BCS_EVT:
|
||||||
{
|
{
|
||||||
BTC_TRACE_DEBUG("AG final seleded codec is %d 1=CVSD 2=MSBC", p_data->val.num);
|
BTC_TRACE_DEBUG("AG final seleded codec is %d 1=CVSD 2=MSBC", p_data->val.num);
|
||||||
|
@ -1461,6 +1460,7 @@ void btc_hf_cb_handler(btc_msg_t *msg)
|
||||||
btc_hf_cb_to_app(ESP_HF_BCS_RESPONSE_EVT, ¶m);
|
btc_hf_cb_to_app(ESP_HF_BCS_RESPONSE_EVT, ¶m);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
default:
|
default:
|
||||||
BTC_TRACE_WARNING("%s: Unhandled event: %d", __FUNCTION__, event);
|
BTC_TRACE_WARNING("%s: Unhandled event: %d", __FUNCTION__, event);
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -525,13 +525,11 @@ static tBTM_STATUS btm_send_connect_request(UINT16 acl_handle,
|
||||||
|
|
||||||
/* Return error if no packet types left */
|
/* Return error if no packet types left */
|
||||||
if (temp_pkt_types == 0) {
|
if (temp_pkt_types == 0) {
|
||||||
BTM_TRACE_ERROR("%s: SCO Conn (BR/EDR SC): No packet types available",
|
BTM_TRACE_ERROR("%s: SCO Conn (BR/EDR SC): No packet types available",__FUNCTION__);
|
||||||
__FUNCTION__);
|
|
||||||
return (BTM_WRONG_MODE);
|
return (BTM_WRONG_MODE);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
BTM_TRACE_DEBUG("%s: SCO Conn(BR/EDR SC):local or peer does not support BR/EDR SC",
|
BTM_TRACE_DEBUG("%s: SCO Conn(BR/EDR SC):local or peer does not support BR/EDR SC",__FUNCTION__);
|
||||||
__FUNCTION__);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -161,8 +161,11 @@ void bt_app_hf_cb(esp_hf_cb_event_t event, esp_hf_cb_param_t *param)
|
||||||
{
|
{
|
||||||
ESP_LOGI(BT_HF_TAG, "--Audio State %s", c_audio_state_str[param->audio_stat.state]);
|
ESP_LOGI(BT_HF_TAG, "--Audio State %s", c_audio_state_str[param->audio_stat.state]);
|
||||||
#if CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_HCI
|
#if CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_HCI
|
||||||
if (param->audio_stat.state == ESP_HF_AUDIO_STATE_CONNECTED ||
|
if (param->audio_stat.state == ESP_HF_AUDIO_STATE_CONNECTED
|
||||||
param->audio_stat.state == ESP_HF_AUDIO_STATE_CONNECTED_MSBC) {
|
#if (BTM_WBS_INCLUDED == TRUE)
|
||||||
|
|| param->audio_stat.state == ESP_HF_AUDIO_STATE_CONNECTED_MSBC
|
||||||
|
#endif
|
||||||
|
) {
|
||||||
esp_bt_hf_register_data_callback(bt_app_hf_incoming_cb, bt_app_hf_outgoing_cb);
|
esp_bt_hf_register_data_callback(bt_app_hf_incoming_cb, bt_app_hf_outgoing_cb);
|
||||||
} else if (param->audio_stat.state == ESP_HF_AUDIO_STATE_DISCONNECTED) {
|
} else if (param->audio_stat.state == ESP_HF_AUDIO_STATE_DISCONNECTED) {
|
||||||
ESP_LOGI(BT_HF_TAG, "--ESP AG Audio Connection Disconnected.");
|
ESP_LOGI(BT_HF_TAG, "--ESP AG Audio Connection Disconnected.");
|
||||||
|
@ -263,7 +266,7 @@ void bt_app_hf_cb(esp_hf_cb_event_t event, esp_hf_cb_param_t *param)
|
||||||
case ESP_HF_ATA_RESPONSE_EVT:
|
case ESP_HF_ATA_RESPONSE_EVT:
|
||||||
{
|
{
|
||||||
ESP_LOGI(BT_HF_TAG, "--Asnwer Incoming Call.");
|
ESP_LOGI(BT_HF_TAG, "--Asnwer Incoming Call.");
|
||||||
char *number = {"186xxxx5549"};
|
char *number = {"123456"};
|
||||||
esp_bt_hf_answer_call(hf_peer_addr,1,0,1,0,number,0);
|
esp_bt_hf_answer_call(hf_peer_addr,1,0,1,0,number,0);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -271,7 +274,7 @@ void bt_app_hf_cb(esp_hf_cb_event_t event, esp_hf_cb_param_t *param)
|
||||||
case ESP_HF_CHUP_RESPONSE_EVT:
|
case ESP_HF_CHUP_RESPONSE_EVT:
|
||||||
{
|
{
|
||||||
ESP_LOGI(BT_HF_TAG, "--Reject Incoming Call.");
|
ESP_LOGI(BT_HF_TAG, "--Reject Incoming Call.");
|
||||||
char *number = {"186xxxx5549"};
|
char *number = {"123456"};
|
||||||
esp_bt_hf_reject_call(hf_peer_addr,0,0,0,0,number,0);
|
esp_bt_hf_reject_call(hf_peer_addr,0,0,0,0,number,0);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue