[Bugfix] Arduino 3.3.11 build/crash with esp32 c5/c6 vairants.

Author: Copilot

.github/workflows/build.yml

@@ -185,6 +185,7 @@ jobs:
           - "examples/NimBLE_Server"
         variant:
           - esp32
+          - esp32c5
           - esp32c3
           - esp32s3
           - esp32c6

src/nimble/esp_port/esp-hci/src/na_hci_transport.c

@@ -6,7 +6,7 @@
 
 #ifdef ESP_PLATFORM
 #include "syscfg/syscfg.h"
-#if CONFIG_BT_LE_CONTROLLER_NPL_OS_PORTING_SUPPORT && CONFIG_BT_BLUEDROID_ENABLED
+#if CONFIG_BT_LE_CONTROLLER_NPL_OS_PORTING_SUPPORT
 
 #include <stdio.h>
 #include <string.h>

src/nimble/esp_port/esp_ipc/src/hci_esp_ipc.c

@@ -6,8 +6,7 @@
 
 #include <syscfg/syscfg.h>
 #ifdef ESP_PLATFORM
-# if !defined(CONFIG_IDF_TARGET_ESP32) && !defined(CONFIG_IDF_TARGET_ESP32C3) && \
-     !defined(CONFIG_IDF_TARGET_ESP32S3) && CONFIG_BT_BLUEDROID_ENABLED
+# if !defined(CONFIG_IDF_TARGET_ESP32) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3)
 
 #include <assert.h>
 #include <string.h>

src/nimble/porting/nimble/include/os/os_mempool.h

@@ -32,6 +32,17 @@
 #include "nimble/porting/nimble/include/os/os.h"
 #include "nimble/porting/nimble/include/os/queue.h"
 
+#if defined(ARDUINO_ARCH_ESP32) && __has_include("esp_arduino_version.h")
+#include "esp_arduino_version.h"
+#endif
+
+#if defined(ESP_ARDUINO_VERSION)
+/* Arduino ESP32 core 3.3.11+ dropped the legacy r_ prefix for these mempool symbols. */
+#define NIMBLE_OS_MEMPOOL_USE_ROM_R_PREFIX (ESP_ARDUINO_VERSION < ESP_ARDUINO_VERSION_VAL(3, 3, 11))
+#else
+#define NIMBLE_OS_MEMPOOL_USE_ROM_R_PREFIX 1
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -170,7 +181,7 @@ typedef __uint128_t os_membuf_t;
 #define OS_MEMPOOL_BYTES(n,blksize)     \
     (sizeof (os_membuf_t) * OS_MEMPOOL_SIZE((n), (blksize)))
 
-#if SOC_ESP_NIMBLE_CONTROLLER && CONFIG_BT_CONTROLLER_ENABLED
+#if SOC_ESP_NIMBLE_CONTROLLER && CONFIG_BT_CONTROLLER_ENABLED && NIMBLE_OS_MEMPOOL_USE_ROM_R_PREFIX
 /**
  * Initialize a memory pool.
  *
@@ -405,6 +416,9 @@ os_error_t os_memblock_put(struct os_mempool *mp, void *block_addr);
 }
 #endif
 
+/* Keep this version gate local to this header. */
+#undef NIMBLE_OS_MEMPOOL_USE_ROM_R_PREFIX
+
 #endif  /* _OS_MEMPOOL_H_ */
 
 

src/nimble/porting/nimble/src/nimble_port.c

@@ -95,7 +95,7 @@ esp_err_t esp_nimble_init(void)
     os_mempool_module_init();
     os_msys_init();
 
-#elif CONFIG_BT_LE_CONTROLLER_NPL_OS_PORTING_SUPPORT && CONFIG_BT_BLUEDROID_ENABLED
+#elif CONFIG_BT_LE_CONTROLLER_NPL_OS_PORTING_SUPPORT
     hci_transport_deinit();
     na_hci_transport_init(HCI_TRANSPORT_VHCI);
     int na_npl_freertos_mempool_init(void);
@@ -137,8 +137,7 @@ esp_err_t esp_nimble_deinit(void)
 
     ble_transport_ll_deinit();
 
-#if CONFIG_BT_LE_CONTROLLER_NPL_OS_PORTING_SUPPORT && CONFIG_BT_BLUEDROID_ENABLED
-    na_hci_transport_deinit();
+#if CONFIG_BT_LE_CONTROLLER_NPL_OS_PORTING_SUPPORT
     void na_npl_freertos_mempool_deinit(void);
     na_npl_freertos_mempool_deinit();
     ble_npl_eventq_deinit(&g_eventq_dflt);

src/nimble/porting/npl/freertos/src/npl_os_freertos.c

@@ -661,7 +661,6 @@ static os_membuf_t *ble_freertos_mutex_buf = NULL;
 
 static uint16_t ble_freertos_total_event_cnt = 0;
 
-#if CONFIG_BT_BLUEDROID_ENABLED
 int na_npl_freertos_mempool_init(void)
 {
     int rc = -1;
@@ -818,5 +817,3 @@ na_npl_freertos_eventq_init(struct ble_npl_eventq *evq)
     }
 }
 #endif /* CONFIG_BT_BLUEDROID_ENABLED */
-
-#endif