Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix error #8176: simple_ble_start enable controller failed 259 #11167

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions cores/esp32/esp32-hal-bt.c
Original file line number Diff line number Diff line change
@@ -17,17 +17,6 @@
#if SOC_BT_SUPPORTED
#ifdef CONFIG_BT_ENABLED

#if CONFIG_IDF_TARGET_ESP32
bool btInUse() {
return true;
}
#else
// user may want to change it to free resources
__attribute__((weak)) bool btInUse() {
return true;
}
#endif

#include "esp_bt.h"

#ifdef CONFIG_BTDM_CONTROLLER_MODE_BTDM
22 changes: 9 additions & 13 deletions cores/esp32/esp32-hal-misc.c
Original file line number Diff line number Diff line change
@@ -27,6 +27,15 @@
#include "esp_private/startup_internal.h"
#if defined(CONFIG_BT_ENABLED) && SOC_BT_SUPPORTED
#include "esp_bt.h"
#if CONFIG_IDF_TARGET_ESP32
bool btInUse() {
return true;
}
#else
bool btInUse() {
return false;
}
#endif
#endif //CONFIG_BT_ENABLED
#include <sys/time.h>
#include "soc/rtc.h"
@@ -243,19 +252,6 @@ bool verifyRollbackLater() {
}
#endif

#ifdef CONFIG_BT_ENABLED
#if CONFIG_IDF_TARGET_ESP32
//overwritten in esp32-hal-bt.c
bool btInUse() __attribute__((weak));
bool btInUse() {
return false;
}
#else
//from esp32-hal-bt.c
extern bool btInUse();
#endif
#endif

#if CONFIG_SPIRAM_SUPPORT || CONFIG_SPIRAM
ESP_SYSTEM_INIT_FN(init_psram_new, CORE, BIT(0), 99) {
psramInit();