mirror
/
esp-idf
kopia lustrzana https://github.com/espressif/esp-idf
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge branch 'bugfix/btdm_unreserve_scn1_for_hfp' into 'master' 

component/bt: Unlock reserve of SCN 1 for HFP

See merge request idf/esp-idf!3269
pull/2429/head
Jiang Jiang Jian 2018-09-14 19:49:47 +08:00
rodzic 8001737d3e 738522f1a3
commit 18a893bd35
1 zmienionych plików z 4 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

12
components/bt/bluedroid/stack/btm/btm_acl.c
Wyświetl plik

@ -1522,11 +1522,10 @@ UINT8 BTM_AllocateSCN(void)
{ {
UINT8 x; UINT8 x;
BTM_TRACE_DEBUG ("BTM_AllocateSCN\n"); 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++) { for (x = 1; x < BTM_MAX_SCN; x++) {
if (!btm_cb.btm_scn[x]) { if (!btm_cb.btm_scn[x - 1]) {
btm_cb.btm_scn[x] = TRUE; btm_cb.btm_scn[x - 1] = TRUE;
return (x + 1); return x;
} }
} }
return (0); /* No free ports */ return (0); /* No free ports */
@ -1545,10 +1544,7 @@ UINT8 BTM_AllocateSCN(void)
#if (CLASSIC_BT_INCLUDED == TRUE) #if (CLASSIC_BT_INCLUDED == TRUE)
BOOLEAN BTM_TryAllocateSCN(UINT8 scn) BOOLEAN BTM_TryAllocateSCN(UINT8 scn)
{ {
/* Make sure we don't exceed max port range. if (scn >= BTM_MAX_SCN) {
* Stack reserves scn 1 for HFP, HSP we still do the correct way.
*/
if ( (scn >= BTM_MAX_SCN) || (scn == 1) ) {
return FALSE; return FALSE;
} }