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

Merge branch 'bugfix/error_param_in_BTA_AG_WBS_EVT_v5.1' into 'release/v5.1'

Browse Source 
Bugfix/error param in bta ag wbs evt (v5.1)

See merge request espressif/esp-idf!26001
This commit is contained in:
Wang Meng Yang
2023-09-19 12:01:11 +08:00
parent 5badfeefac a8790378e9
commit c7132d3f15
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/bt/host/bluedroid/api/include/api/esp_hf_ag_api.h
View File

@ -68,9 +68,9 @@ typedef enum
/// Dial type of ESP_HF_DIAL_EVT /// Dial type of ESP_HF_DIAL_EVT
typedef enum typedef enum
{ {
ESP_HF_DIAL_MEM = 0, /*!< Dial with a memory position */ ESP_HF_DIAL_NUM = 0, /*!< Dial with a phone number */
ESP_HF_DIAL_VOIP, /*!< Dial with VoIP */ ESP_HF_DIAL_VOIP, /*!< Dial with VoIP */
ESP_HF_DIAL_NUM, /*!< Dial with a phone number */ ESP_HF_DIAL_MEM, /*!< Dial with a memory position */
} esp_hf_dial_type_t; } esp_hf_dial_type_t;
/// HFP AG callback parameters /// HFP AG callback parameters

7
components/bt/host/bluedroid/bta/hf_ag/bta_ag_act.c
View File

@ -785,14 +785,17 @@ 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) void bta_ag_setcodec(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
{ {
#if (BTM_WBS_INCLUDED == TRUE) #if (BTM_WBS_INCLUDED == TRUE)
UINT16 handle = p_data->api_setcodec.hdr.layer_specific;
tBTA_AG_PEER_CODEC codec_type = p_data->api_setcodec.codec; tBTA_AG_PEER_CODEC codec_type = p_data->api_setcodec.codec;
tBTA_AG_VAL val; tBTA_AG_VAL val;
val.hdr.handle = handle;
val.num = codec_type;
/* Check if the requested codec type is valid */ /* Check if the requested codec type is valid */
if((codec_type != BTA_AG_CODEC_NONE) && if((codec_type != BTA_AG_CODEC_NONE) &&
(codec_type != BTA_AG_CODEC_CVSD) && (codec_type != BTA_AG_CODEC_CVSD) &&
(codec_type != BTA_AG_CODEC_MSBC)) { (codec_type != BTA_AG_CODEC_MSBC)) {
val.num = codec_type;
val.hdr.status = BTA_AG_FAIL_RESOURCES; val.hdr.status = BTA_AG_FAIL_RESOURCES;
APPL_TRACE_ERROR("%s error: unsupported codec type %d", __func__, 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);
@ -804,11 +807,9 @@ void bta_ag_setcodec(tBTA_AG_SCB *p_scb, tBTA_AG_DATA *p_data)
(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.hdr.status = BTA_AG_SUCCESS; val.hdr.status = BTA_AG_SUCCESS;
APPL_TRACE_DEBUG("%s: Updated codec type %d", __func__, codec_type); APPL_TRACE_DEBUG("%s: Updated codec type %d", __func__, codec_type);
} else { } else {
val.num = codec_type;
val.hdr.status = BTA_AG_FAIL_RESOURCES; val.hdr.status = BTA_AG_FAIL_RESOURCES;
APPL_TRACE_ERROR("%s error: unsupported codec type %d",__func__, codec_type); APPL_TRACE_ERROR("%s error: unsupported codec type %d",__func__, codec_type);
} }

12
components/bt/host/bluedroid/btc/profile/std/hf_ag/btc_hf_ag.c
View File

@ -134,12 +134,12 @@ do {
hf_local_param[idx].btc_hf_cb.num_active = 0; \ hf_local_param[idx].btc_hf_cb.num_active = 0; \
hf_local_param[idx].btc_hf_cb.num_held = 0; hf_local_param[idx].btc_hf_cb.num_held = 0;
#define CHECK_HF_IDX(idx) \ #define CHECK_HF_IDX(idx) \
do { \ do { \
if ((idx < 0) || (idx >= BTC_HF_NUM_CB)) { \ if ((idx < 0) || (idx >= BTC_HF_NUM_CB)) { \
BTC_TRACE_ERROR("%s: Invalid index %d", __FUNCTION__, idx); \ BTC_TRACE_ERROR("%s:%d Invalid index %d", __FUNCTION__, __LINE__, idx); \
return; \ return; \
} \ } \
} while (0) } while (0)
/************************************************************************************ /************************************************************************************