kopia lustrzana https://github.com/espressif/esp-idf
Merge branch 'bugfix/fix_sink_wrong_sniff_params_v4.4' into 'release/v4.4'
Fix A2DP Sink Wrong Sniff Parameters which Caused by HID Porting[backport 4.4] See merge request espressif/esp-idf!18801pull/9422/head
commit
977a040301
|
@ -252,7 +252,7 @@ tBTA_DM_PM_TYPE_QUALIFIER tBTA_DM_PM_SPEC bta_dm_pm_spec[BTA_DM_NUM_PM_SPEC] = {
|
|||
{{BTA_DM_PM_NO_ACTION, 0}, {BTA_DM_PM_NO_ACTION, 0}}, /* app close */
|
||||
{{BTA_DM_PM_NO_ACTION, 0}, {BTA_DM_PM_NO_ACTION, 0}}, /* sco open */
|
||||
{{BTA_DM_PM_NO_ACTION, 0}, {BTA_DM_PM_NO_ACTION, 0}}, /* sco close */
|
||||
{{BTA_DM_PM_SNIFF4, 3000 + BTA_DM_PM_SPEC_TO_OFFSET}, {BTA_DM_PM_NO_ACTION, 0}}, /* idle */
|
||||
{{BTA_DM_PM_SNIFF_AVK_IDLE_IDX, 3000 + BTA_DM_PM_SPEC_TO_OFFSET}, {BTA_DM_PM_NO_ACTION, 0}}, /* idle */
|
||||
{{BTA_DM_PM_ACTIVE, 0}, {BTA_DM_PM_NO_ACTION, 0}}, /* busy */
|
||||
{{BTA_DM_PM_NO_ACTION, 0}, {BTA_DM_PM_NO_ACTION, 0}} /* mode change retry */
|
||||
}
|
||||
|
@ -381,10 +381,10 @@ tBTA_DM_PM_TYPE_QUALIFIER tBTM_PM_PWR_MD bta_dm_pm_md[] = {
|
|||
/* sniff modes: max interval, min interval, attempt, timeout */
|
||||
{BTA_DM_PM_SNIFF_MAX, BTA_DM_PM_SNIFF_MIN, BTA_DM_PM_SNIFF_ATTEMPT, BTA_DM_PM_SNIFF_TIMEOUT, BTM_PM_MD_SNIFF}, /* for BTA_DM_PM_SNIFF - A2DP */
|
||||
{BTA_DM_PM_SNIFF1_MAX, BTA_DM_PM_SNIFF1_MIN, BTA_DM_PM_SNIFF1_ATTEMPT, BTA_DM_PM_SNIFF1_TIMEOUT, BTM_PM_MD_SNIFF}, /* for BTA_DM_PM_SNIFF1 */
|
||||
{BTA_DM_PM_SNIFF2_MAX, BTA_DM_PM_SNIFF2_MIN, BTA_DM_PM_SNIFF2_ATTEMPT, BTA_DM_PM_SNIFF2_TIMEOUT, BTM_PM_MD_SNIFF}, /* for BTA_DM_PM_SNIFF2- HD idle */
|
||||
{BTA_DM_PM_SNIFF2_MAX, BTA_DM_PM_SNIFF2_MIN, BTA_DM_PM_SNIFF2_ATTEMPT, BTA_DM_PM_SNIFF2_TIMEOUT, BTM_PM_MD_SNIFF}, /* for BTA_DM_PM_SNIFF2 */
|
||||
{BTA_DM_PM_SNIFF3_MAX, BTA_DM_PM_SNIFF3_MIN, BTA_DM_PM_SNIFF3_ATTEMPT, BTA_DM_PM_SNIFF3_TIMEOUT, BTM_PM_MD_SNIFF}, /* for BTA_DM_PM_SNIFF3- SCO open */
|
||||
{BTA_DM_PM_SNIFF4_MAX, BTA_DM_PM_SNIFF4_MIN, BTA_DM_PM_SNIFF4_ATTEMPT, BTA_DM_PM_SNIFF4_TIMEOUT, BTM_PM_MD_SNIFF}, /* for BTA_DM_PM_SNIFF4- HD active */
|
||||
{BTA_DM_PM_SNIFF5_MAX, BTA_DM_PM_SNIFF5_MIN, BTA_DM_PM_SNIFF5_ATTEMPT, BTA_DM_PM_SNIFF5_TIMEOUT, BTM_PM_MD_SNIFF}, /* for BTA_DM_PM_SNIFF5- HD active */
|
||||
{BTA_DM_PM_SNIFF4_MAX, BTA_DM_PM_SNIFF4_MIN, BTA_DM_PM_SNIFF4_ATTEMPT, BTA_DM_PM_SNIFF4_TIMEOUT, BTM_PM_MD_SNIFF}, /* for BTA_DM_PM_SNIFF4 */
|
||||
{BTA_DM_PM_SNIFF5_MAX, BTA_DM_PM_SNIFF5_MIN, BTA_DM_PM_SNIFF5_ATTEMPT, BTA_DM_PM_SNIFF5_TIMEOUT, BTM_PM_MD_SNIFF}, /* for BTA_DM_PM_SNIFF5 */
|
||||
{BTA_DM_PM_PARK_MAX, BTA_DM_PM_PARK_MIN, BTA_DM_PM_PARK_ATTEMPT, BTA_DM_PM_PARK_TIMEOUT, BTM_PM_MD_PARK}
|
||||
|
||||
#ifdef BTE_SIM_APP /* For Insight builds only */
|
||||
|
|
|
@ -1266,38 +1266,41 @@ typedef UINT8 tBTA_DM_PM_ACTION;
|
|||
#endif
|
||||
|
||||
#ifndef BTA_DM_PM_SNIFF_A2DP_IDX
|
||||
#define BTA_DM_PM_SNIFF_A2DP_IDX BTA_DM_PM_SNIFF
|
||||
#define BTA_DM_PM_SNIFF_A2DP_IDX BTA_DM_PM_SNIFF
|
||||
#endif
|
||||
|
||||
#ifndef BTA_DM_PM_SNIFF_AVK_IDLE_IDX
|
||||
#define BTA_DM_PM_SNIFF_AVK_IDLE_IDX BTA_DM_PM_SNIFF4
|
||||
#endif
|
||||
|
||||
#ifndef BTA_DM_PM_SNIFF_JV_IDX
|
||||
#define BTA_DM_PM_SNIFF_JV_IDX BTA_DM_PM_SNIFF
|
||||
#define BTA_DM_PM_SNIFF_JV_IDX BTA_DM_PM_SNIFF
|
||||
#endif
|
||||
|
||||
#ifndef BTA_DM_PM_SNIFF_HD_IDLE_IDX
|
||||
#define BTA_DM_PM_SNIFF_HD_IDLE_IDX BTA_DM_PM_SNIFF2
|
||||
#define BTA_DM_PM_SNIFF_HD_IDLE_IDX BTA_DM_PM_SNIFF4
|
||||
#endif
|
||||
|
||||
#ifndef BTA_DM_PM_SNIFF_SCO_OPEN_IDX
|
||||
#define BTA_DM_PM_SNIFF_SCO_OPEN_IDX BTA_DM_PM_SNIFF3
|
||||
#define BTA_DM_PM_SNIFF_SCO_OPEN_IDX BTA_DM_PM_SNIFF3
|
||||
#endif
|
||||
|
||||
#ifndef BTA_DM_PM_SNIFF_HD_ACTIVE_IDX
|
||||
#define BTA_DM_PM_SNIFF_HD_ACTIVE_IDX BTA_DM_PM_SNIFF4
|
||||
#define BTA_DM_PM_SNIFF_HD_ACTIVE_IDX BTA_DM_PM_SNIFF5
|
||||
#endif
|
||||
|
||||
#ifndef BTA_DM_PM_SNIFF_HH_OPEN_IDX
|
||||
#define BTA_DM_PM_SNIFF_HH_OPEN_IDX BTA_DM_PM_SNIFF2
|
||||
#define BTA_DM_PM_SNIFF_HH_OPEN_IDX BTA_DM_PM_SNIFF4
|
||||
#endif
|
||||
|
||||
#ifndef BTA_DM_PM_SNIFF_HH_ACTIVE_IDX
|
||||
#define BTA_DM_PM_SNIFF_HH_ACTIVE_IDX BTA_DM_PM_SNIFF2
|
||||
#define BTA_DM_PM_SNIFF_HH_ACTIVE_IDX BTA_DM_PM_SNIFF4
|
||||
#endif
|
||||
|
||||
#ifndef BTA_DM_PM_SNIFF_HH_IDLE_IDX
|
||||
#define BTA_DM_PM_SNIFF_HH_IDLE_IDX BTA_DM_PM_SNIFF2
|
||||
#define BTA_DM_PM_SNIFF_HH_IDLE_IDX BTA_DM_PM_SNIFF4
|
||||
#endif
|
||||
|
||||
|
||||
#ifndef BTA_DM_PM_HH_OPEN_DELAY
|
||||
#define BTA_DM_PM_HH_OPEN_DELAY 30000
|
||||
#endif
|
||||
|
@ -1331,8 +1334,8 @@ typedef UINT8 tBTA_DM_PM_ACTION;
|
|||
#endif
|
||||
|
||||
#ifndef BTA_DM_PM_SNIFF2_MAX
|
||||
#define BTA_DM_PM_SNIFF2_MAX 54 //180
|
||||
#define BTA_DM_PM_SNIFF2_MIN 30 //150
|
||||
#define BTA_DM_PM_SNIFF2_MAX 180 //54
|
||||
#define BTA_DM_PM_SNIFF2_MIN 150 //30
|
||||
#define BTA_DM_PM_SNIFF2_ATTEMPT 4
|
||||
#define BTA_DM_PM_SNIFF2_TIMEOUT 1
|
||||
#endif
|
||||
|
@ -1345,17 +1348,17 @@ typedef UINT8 tBTA_DM_PM_ACTION;
|
|||
#endif
|
||||
|
||||
#ifndef BTA_DM_PM_SNIFF4_MAX
|
||||
#define BTA_DM_PM_SNIFF4_MAX 18 //54
|
||||
#define BTA_DM_PM_SNIFF4_MIN 10 //30
|
||||
#define BTA_DM_PM_SNIFF4_MAX 54 //18
|
||||
#define BTA_DM_PM_SNIFF4_MIN 30 //10
|
||||
#define BTA_DM_PM_SNIFF4_ATTEMPT 4
|
||||
#define BTA_DM_PM_SNIFF4_TIMEOUT 1
|
||||
#endif
|
||||
|
||||
#ifndef BTA_DM_PM_SNIFF5_MAX
|
||||
#define BTA_DM_PM_SNIFF5_MAX 36
|
||||
#define BTA_DM_PM_SNIFF5_MIN 30
|
||||
#define BTA_DM_PM_SNIFF5_ATTEMPT 2
|
||||
#define BTA_DM_PM_SNIFF5_TIMEOUT 0
|
||||
#define BTA_DM_PM_SNIFF5_MAX 18
|
||||
#define BTA_DM_PM_SNIFF5_MIN 10
|
||||
#define BTA_DM_PM_SNIFF5_ATTEMPT 4
|
||||
#define BTA_DM_PM_SNIFF5_TIMEOUT 1
|
||||
#endif
|
||||
|
||||
#ifndef BTA_DM_PM_PARK_MAX
|
||||
|
|
Ładowanie…
Reference in New Issue