Add compile guards to esp322 legacy HCI code for newer chips

h2zero · h2zero · commit 875b54f23a85 · 2025-04-24T17:06:25.000-06:00
diff --git a/src/NimBLEDevice.cpp b/src/NimBLEDevice.cpp
@@ -891,11 +891,13 @@ bool NimBLEDevice::init(const std::string& deviceName) {
             return false;
         }
 
+#   if CONFIG_BT_NIMBLE_LEGACY_VHCI_ENABLE
         err = esp_nimble_hci_init();
         if (err != ESP_OK) {
             NIMBLE_LOGE(LOG_TAG, "esp_nimble_hci_init() failed; err=%d", err);
             return false;
         }
+#   endif
 #  endif
 # endif
         nimble_port_init();
diff --git a/src/nimble/esp_port/esp-hci/src/esp_nimble_hci.c b/src/nimble/esp_port/esp-hci/src/esp_nimble_hci.c
@@ -5,6 +5,8 @@
  */
 
 #ifdef ESP_PLATFORM
+#include "syscfg/syscfg.h"
+#if CONFIG_BT_NIMBLE_LEGACY_VHCI_ENABLE
 
 #include <assert.h>
 #include "nimble/porting/nimble/include/sysinit/sysinit.h"
@@ -342,4 +344,5 @@ esp_err_t esp_nimble_hci_deinit(void)
     return ESP_OK;
 }
 
+#endif
 #endif //ESP_PLATFORM

Original file line number	Diff line number	Diff line change
`@@ -891,11 +891,13 @@ bool NimBLEDevice::init(const std::string& deviceName) {`
`891`	`891`	`return false;`
`892`	`892`	`}`
`893`	`893`
	`894`	`+# if CONFIG_BT_NIMBLE_LEGACY_VHCI_ENABLE`
`894`	`895`	`err = esp_nimble_hci_init();`
`895`	`896`	`if (err != ESP_OK) {`
`896`	`897`	`NIMBLE_LOGE(LOG_TAG, "esp_nimble_hci_init() failed; err=%d", err);`
`897`	`898`	`return false;`
`898`	`899`	`}`
	`900`	`+# endif`
`899`	`901`	`# endif`
`900`	`902`	`# endif`
`901`	`903`	`nimble_port_init();`