Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Format the BTM_WBS_INCLUDED macro

Browse source
This commit is contained in:
weitianhua 2019-12-04 15:37:31 +08:00
parent ad4b11a4f1
commit 392eb79704
12 changed files with 35 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
components/bt/host/bluedroid/bta/hf_ag/bta_ag_act.c
View file

@ -339,7 +339,7 @@ void bta_ag_rfc_fail(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
p_scb->conn_handle = 0;
p_scb->conn_service = 0;
p_scb->peer_features = 0;
#if (BTM_WBS_INCLUDED == TRUE )
#if (BTM_WBS_INCLUDED == TRUE)
p_scb->peer_codecs = BTA_AG_CODEC_NONE;
p_scb->sco_codec = BTA_AG_CODEC_NONE;
#endif
@ -373,7 +373,7 @@ void bta_ag_rfc_close(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
/* reinitialize stuff */
p_scb->conn_service = 0;
p_scb->peer_features = 0;
#if (BTM_WBS_INCLUDED == TRUE )
#if (BTM_WBS_INCLUDED == TRUE)
p_scb->peer_codecs = BTA_AG_CODEC_NONE;
p_scb->sco_codec = BTA_AG_CODEC_NONE;
/* Clear these flags upon SLC teardown */
@ -722,7 +722,7 @@ void bta_ag_svc_conn_open(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
evt.hdr.app_id = p_scb->app_id;
evt.peer_feat = p_scb->peer_features;
bdcpy(evt.bd_addr, p_scb->peer_addr);
#if (BTM_WBS_INCLUDED == TRUE )
#if (BTM_WBS_INCLUDED == TRUE)
evt.peer_codec = p_scb->peer_codecs;
#endif
if ((p_scb->call_ind != BTA_AG_CALL_INACTIVE) ||
@ -787,7 +787,7 @@ void bta_ag_rcvd_slc_ready(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
*******************************************************************************/
void bta_ag_setcodec(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
{
#if (BTM_WBS_INCLUDED == TRUE )
#if (BTM_WBS_INCLUDED == TRUE)
tBTA_AG_PEER_CODEC codec_type = p_data->api_setcodec.codec;
tBTA_AG_VAL val;
@ -797,22 +797,23 @@ void bta_ag_setcodec(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
(codec_type != BTA_AG_CODEC_MSBC)) {
val.num = codec_type;
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);
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)) {
p_scb->sco_codec = codec_type;
p_scb->codec_updated = TRUE;
val.num = codec_type;
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 {
val.num = codec_type;
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);
#endif

4
components/bt/host/bluedroid/bta/hf_ag/bta_ag_cmd.c
View file

@ -628,7 +628,7 @@ static UINT8 bta_ag_parse_chld(tBTA_AG_SCB *p_scb, char *p_s)
return(retval);
}
#if (BTM_WBS_INCLUDED == TRUE )
#if (BTM_WBS_INCLUDED == TRUE)
/*******************************************************************************
**
** Function bta_ag_parse_bac
@ -1101,7 +1101,7 @@ void bta_ag_at_hfp_cback(tBTA_AG_SCB *p_scb, UINT16 cmd, UINT8 arg_type,
}
break;
#if (BTM_WBS_INCLUDED == TRUE )
#if (BTM_WBS_INCLUDED == TRUE)
case BTA_AG_HF_CMD_BAC:
{
bta_ag_send_ok(p_scb);

2
components/bt/host/bluedroid/bta/hf_ag/bta_ag_main.c
View file

@ -422,7 +422,7 @@ static tBTA_AG_SCB *bta_ag_scb_alloc(void)
/* initialize variables */
p_scb->in_use = TRUE;
p_scb->sco_idx = BTM_INVALID_SCO_INDEX;
#if (BTM_WBS_INCLUDED == TRUE )
#if (BTM_WBS_INCLUDED == TRUE)
p_scb->codec_updated = FALSE;
#endif
/* set up timers */

8
components/bt/host/bluedroid/bta/hf_ag/bta_ag_sco.c
View file

@ -58,7 +58,7 @@ enum
BTA_AG_SCO_LISTEN_E, /* listen request */
BTA_AG_SCO_OPEN_E, /* open request */
BTA_AG_SCO_XFER_E, /* transfer request */
#if (BTM_WBS_INCLUDED == TRUE )
#if (BTM_WBS_INCLUDED == TRUE)
BTA_AG_SCO_CN_DONE_E, /* codec negotiation done */
BTA_AG_SCO_REOPEN_E, /* Retry with other codec when failed */
#endif
@ -69,7 +69,7 @@ enum
BTA_AG_SCO_CI_DATA_E /* SCO data ready */
};
#if (BTM_WBS_INCLUDED == TRUE )
#if (BTM_WBS_INCLUDED == TRUE)
#define BTA_AG_NUM_CODECS 3
#define BTA_AG_ESCO_SETTING_IDX_CVSD 0 /* eSCO setting for CVSD */
#define BTA_AG_ESCO_SETTING_IDX_T1 1 /* eSCO setting for mSBC T1 */
@ -721,7 +721,7 @@ void bta_ag_codec_negotiate(tBTA_AG_SCB *p_scb)
bta_ag_sco_codec_nego(p_scb, TRUE);
}
}
#endif /* (BTM_WBS_INCLUDED == TRUE ) */
#endif
/*******************************************************************************
**
@ -1298,7 +1298,7 @@ static void bta_ag_sco_event(tBTA_AG_SCB *p_scb, UINT8 event)
bta_ag_sco_evt_str(event));
}
#if (BTM_WBS_INCLUDED == TRUE )
#if (BTM_WBS_INCLUDED == TRUE)
if (p_cn_scb)
{
bta_ag_codec_negotiate(p_cn_scb);

8
components/bt/host/bluedroid/bta/hf_ag/include/bta_ag_int.h
View file

@ -136,7 +136,7 @@ enum
{
BTA_AG_SCO_SHUTDOWN_ST, /* no sco listening, all sco connections closed */
BTA_AG_SCO_LISTEN_ST, /* sco listening */
#if (BTM_WBS_INCLUDED == TRUE )
#if (BTM_WBS_INCLUDED == TRUE)
BTA_AG_SCO_CODEC_ST, /* sco codec negotiation */
#endif
BTA_AG_SCO_OPENING_ST, /* sco connection opening */
@ -225,7 +225,7 @@ typedef union
tBTA_AG_API_REGISTER api_register;
tBTA_AG_API_OPEN api_open;
tBTA_AG_API_RESULT api_result;
#if (BTM_WBS_INCLUDED == TRUE )
#if (BTM_WBS_INCLUDED == TRUE)
tBTA_AG_API_SETCODEC api_setcodec;
#endif
tBTA_AG_DISC_RESULT disc_result;
@ -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)
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_send_bcs(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data);
#endif
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);
@ -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_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);
#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_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);

2
components/bt/host/bluedroid/bta/include/bta/bta_ag_co.h
View file

@ -46,7 +46,7 @@
** Returns void
**
*******************************************************************************/
#if (BTM_WBS_INCLUDED == TRUE )
#if (BTM_WBS_INCLUDED == TRUE)
void bta_ag_sco_audio_state(UINT16 handle, UINT8 app_id, UINT8 state, tBTA_AG_PEER_CODEC codec);
#else
void bta_ag_sco_audio_state(UINT16 handle, UINT8 app_id, UINT8 state);

2
components/bt/host/bluedroid/btc/core/btc_util.c
View file

@ -156,7 +156,7 @@ const char* dump_hf_event(UINT16 event)
CASE_RETURN_STR(BTA_AG_MIC_EVT)
CASE_RETURN_STR(BTA_AG_AT_CKPD_EVT)
CASE_RETURN_STR(BTA_AG_DISABLE_EVT)
#if (BTM_WBS_INCLUDED == TRUE )
#if (BTM_WBS_INCLUDED == TRUE)
CASE_RETURN_STR(BTA_AG_WBS_EVT)
#endif
CASE_RETURN_STR(BTA_AG_AT_A_EVT)

2
components/bt/host/bluedroid/btc/profile/std/hf_ag/bta_ag_co.c
View file

@ -353,7 +353,7 @@ static void bta_ag_decode_msbc_frame(UINT8 **data, UINT8 *length, BOOLEAN is_bad
** Returns void
**
*******************************************************************************/
#if (BTM_WBS_INCLUDED == TRUE )
#if (BTM_WBS_INCLUDED == TRUE)
void bta_ag_sco_audio_state(UINT16 handle, UINT8 app_id, UINT8 state, tBTA_AG_PEER_CODEC codec)
#else
void bta_ag_sco_audio_state(UINT16 handle, UINT8 app_id, UINT8 state)

4
components/bt/host/bluedroid/btc/profile/std/hf_ag/btc_hf_ag.c
View file

@ -1441,7 +1441,6 @@ void btc_hf_cb_handler(btc_msg_t *msg)
#endif
break;
}
#if (BTM_WBS_INCLUDED == TRUE)
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, &param);
break;
}
#endif
case BTA_AG_AT_BCS_EVT:
{
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, &param);
break;
}
#endif
default:
BTC_TRACE_WARNING("%s: Unhandled event: %d", __FUNCTION__, event);
break;

8
components/bt/host/bluedroid/stack/btm/btm_sco.c
View file

@ -525,18 +525,16 @@ static tBTM_STATUS btm_send_connect_request(UINT16 acl_handle,
/* Return error if no packet types left */
if (temp_pkt_types == 0) {
BTM_TRACE_ERROR("%s: SCO Conn (BR/EDR SC): No packet types available",
__FUNCTION__);
BTM_TRACE_ERROR("%s: SCO Conn (BR/EDR SC): No packet types available",__FUNCTION__);
return (BTM_WRONG_MODE);
}
} else {
BTM_TRACE_DEBUG("%s: SCO Conn(BR/EDR SC):local or peer does not support BR/EDR SC",
__FUNCTION__);
BTM_TRACE_DEBUG("%s: SCO Conn(BR/EDR SC):local or peer does not support BR/EDR SC",__FUNCTION__);
}
}
BTM_TRACE_API(" txbw 0x%x, rxbw 0x%x, lat 0x%x, voice 0x%x, retrans 0x%02x, pkt 0x%04x",
BTM_TRACE_API("txbw 0x%x, rxbw 0x%x, lat 0x%x, voice 0x%x, retrans 0x%02x, pkt 0x%04x",
p_setup->tx_bw, p_setup->rx_bw,
p_setup->max_latency, p_setup->voice_contfmt,
p_setup->retrans_effort, temp_pkt_types);

2
components/bt/host/bluedroid/stack/include/stack/sdpdefs.h
View file

@ -276,7 +276,7 @@
#define UUID_SERVCLASS_TEST_SERVER 0x9000 /* Test Group UUID */
#if (BTM_WBS_INCLUDED == TRUE )
#if (BTM_WBS_INCLUDED == TRUE)
#define UUID_CODEC_CVSD 0x0001 /* CVSD */
#define UUID_CODEC_MSBC 0x0002 /* mSBC */
#endif

11
examples/bluetooth/bluedroid/classic_bt/hfp_ag/main/bt_app_hf.c
View file

@ -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]);
#if CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_HCI
if (param->audio_stat.state == ESP_HF_AUDIO_STATE_CONNECTED ||
param->audio_stat.state == ESP_HF_AUDIO_STATE_CONNECTED_MSBC) {
if (param->audio_stat.state == ESP_HF_AUDIO_STATE_CONNECTED
#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);
} else if (param->audio_stat.state == ESP_HF_AUDIO_STATE_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:
{
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);
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:
{
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);
break;
}