espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-03 12:44:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/btdm_assert_without_sw_coex_enable_v3.3' into 'release/v3.3'

Browse Source 
components/bt: Fix assert without sw coexist enabled

See merge request espressif/esp-idf!12529
This commit is contained in:
Jiang Jiang Jian
2021-04-22 05:51:39 +00:00
parent a943d21126 716edebbbd
commit 067f73d4ea
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
components/bt/bt.c
View File

@@ -1107,7 +1107,7 @@ static uint8_t coex_schm_curr_period_get_wrapper(void)
#if CONFIG_SW_COEXIST_ENABLE #if CONFIG_SW_COEXIST_ENABLE
return coex_schm_curr_period_get(); return coex_schm_curr_period_get();
#else #else
return 0; return 1;
#endif #endif
} }
@@ -1125,13 +1125,7 @@ static int coex_wifi_channel_get_wrapper(uint8_t *primary, uint8_t *secondary)
#if CONFIG_SW_COEXIST_ENABLE #if CONFIG_SW_COEXIST_ENABLE
return coex_wifi_channel_get(primary, secondary); return coex_wifi_channel_get(primary, secondary);
#else #else
if (primary == NULL || secondary == NULL) { return -1;
return -1;
}
*primary = 0;
*secondary = 0;
return 0;
#endif #endif
} }
@@ -1140,7 +1134,7 @@ static int coex_register_wifi_channel_change_callback_wrapper(void *cb)
#if CONFIG_SW_COEXIST_ENABLE #if CONFIG_SW_COEXIST_ENABLE
return coex_register_wifi_channel_change_callback(cb); return coex_register_wifi_channel_change_callback(cb);
#else #else
return 0; return -1;
#endif #endif
} }