Merge branch 'bugfix/btdm_hfp_invalid_sco_param_v3.1' into 'release/v3.1'

jack0c · jack0c · commit b3eee7d58f76 · 2018-08-10T11:10:55.000+08:00
component/bt: modify the invalid retransmission setting for SCO link in HFP(backport v3.1)

See merge request idf/esp-idf!2956
diff --git a/components/bt/bluedroid/bta/hf_client/bta_hf_client_sco.c b/components/bt/bluedroid/bta/hf_client/bta_hf_client_sco.c
@@ -46,7 +46,7 @@ static const tBTM_ESCO_PARAMS bta_hf_client_esco_params[] = {
         BTM_SCO_PKT_TYPES_MASK_NO_3_EV3 |
         BTM_SCO_PKT_TYPES_MASK_NO_2_EV5 |
         BTM_SCO_PKT_TYPES_MASK_NO_3_EV5),
-        .retrans_effort = BTM_ESCO_RETRANS_POWER,
+        .retrans_effort = BTM_ESCO_RETRANS_OFF,
     },
     /* ESCO CVSD */
     {

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ static const tBTM_ESCO_PARAMS bta_hf_client_esco_params[] = {`
`46`	`46`	`BTM_SCO_PKT_TYPES_MASK_NO_3_EV3 \|`
`47`	`47`	`BTM_SCO_PKT_TYPES_MASK_NO_2_EV5 \|`
`48`	`48`	`BTM_SCO_PKT_TYPES_MASK_NO_3_EV5),`
`49`		`- .retrans_effort = BTM_ESCO_RETRANS_POWER,`
	`49`	`+ .retrans_effort = BTM_ESCO_RETRANS_OFF,`
`50`	`50`	`},`
`51`	`51`	`/* ESCO CVSD */`
`52`	`52`	`{`