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

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

View File

@@ -1107,7 +1107,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
}
@@ -1125,13 +1125,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
if (primary == NULL || secondary == NULL) {
return -1;
}
*primary = 0;
*secondary = 0;
return 0;
return -1;
#endif
}
@@ -1140,7 +1134,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
}