Merge branch 'bugfix/btdm_assert_without_sw_coex_enable_v4.2' into 'release/v4.2'

components/bt: Fix assert without sw coexist enabled

See merge request espressif/esp-idf!12527
pull/7016/head
Jiang Jiang Jian 2021-03-24 03:23:58 +00:00
commit bb067c0883
1 zmienionych plików z 3 dodań i 3 usunięć

Wyświetl plik

@ -1113,7 +1113,7 @@ static uint8_t coex_schm_curr_period_get_wrapper(void)
#if CONFIG_SW_COEXIST_ENABLE
return coex_schm_curr_period_get();
#else
return 0;
return 1;
#endif
}
@ -1131,7 +1131,7 @@ static int coex_wifi_channel_get_wrapper(uint8_t *primary, uint8_t *secondary)
#if CONFIG_SW_COEXIST_ENABLE
return coex_wifi_channel_get(primary, secondary);
#else
return 0;
return -1;
#endif
}
@ -1140,7 +1140,7 @@ static int coex_register_wifi_channel_change_callback_wrapper(void *cb)
#if CONFIG_SW_COEXIST_ENABLE
return coex_register_wifi_channel_change_callback(cb);
#else
return 0;
return -1;
#endif
}