From 738522f1a3ce85b1760d7cdb2f62959118c8c06d Mon Sep 17 00:00:00 2001 From: baohongde Date: Thu, 13 Sep 2018 20:17:37 +0800 Subject: [PATCH] component/bt: Unlock reserve of SCN 1 for HFP --- components/bt/bluedroid/stack/btm/btm_acl.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/components/bt/bluedroid/stack/btm/btm_acl.c b/components/bt/bluedroid/stack/btm/btm_acl.c index 5bf59c895c..3f101c1ba7 100644 --- a/components/bt/bluedroid/stack/btm/btm_acl.c +++ b/components/bt/bluedroid/stack/btm/btm_acl.c @@ -1522,11 +1522,10 @@ UINT8 BTM_AllocateSCN(void) { UINT8 x; BTM_TRACE_DEBUG ("BTM_AllocateSCN\n"); - // stack reserves scn 1 for HFP, HSP we still do the correct way for (x = 1; x < BTM_MAX_SCN; x++) { - if (!btm_cb.btm_scn[x]) { - btm_cb.btm_scn[x] = TRUE; - return (x + 1); + if (!btm_cb.btm_scn[x - 1]) { + btm_cb.btm_scn[x - 1] = TRUE; + return x; } } return (0); /* No free ports */ @@ -1545,10 +1544,7 @@ UINT8 BTM_AllocateSCN(void) #if (CLASSIC_BT_INCLUDED == TRUE) BOOLEAN BTM_TryAllocateSCN(UINT8 scn) { - /* Make sure we don't exceed max port range. - * Stack reserves scn 1 for HFP, HSP we still do the correct way. - */ - if ( (scn >= BTM_MAX_SCN) || (scn == 1) ) { + if (scn >= BTM_MAX_SCN) { return FALSE; }