Merge branch 'bugfix/add_nimble_50_feature_support_flag_v4.4' into 'r…

…elease/v4.4' fix(nimble): add flag to indicate 5.0 feature support(v4.4) See merge request espressif/esp-idf!25765
espressif · Sep 5, 2023 · 1f00708 · 1f00708
2 parents 56bd34a + 183eab7
commit 1f00708
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/components/bt/host/nimble/Kconfig.in b/components/bt/host/nimble/Kconfig.in
@@ -445,10 +445,18 @@ config BT_NIMBLE_MAX_CONN_REATTEMPT
     help
         Defines maximum number of connection reattempts.
 
+config BT_NIMBLE_50_FEATURE_SUPPORT
+    bool "Enable BLE 5 feature"
+    depends on BT_NIMBLE_ENABLED
+    default y if (IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3)
+    default n if IDF_TARGET_ESP32
+    help
+        Enable BLE 5 features
+
 config BT_NIMBLE_EXT_ADV
     bool "Enable extended advertising."
     default n
-    depends on BT_NIMBLE_ENABLED && BT_SOC_SUPPORT_5_0
+    depends on BT_NIMBLE_ENABLED && BT_NIMBLE_50_FEATURE_SUPPORT
     help
         Enable this option to do extended advertising. Extended advertising
         will be supported from BLE 5.0 onwards.

diff --git a/components/bt/host/nimble/port/include/esp_nimble_cfg.h b/components/bt/host/nimble/port/include/esp_nimble_cfg.h
@@ -50,6 +50,12 @@
 #define MYNEWT_VAL_BLE_EXT_ADV (CONFIG_BT_NIMBLE_EXT_ADV)
 #endif
 
+#ifndef CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT
+#define BLE_50_FEATURE_SUPPORT (0)
+#else
+#define BLE_50_FEATURE_SUPPORT (CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT)
+#endif
+
 #ifndef MYNEWT_VAL_BLE_EXT_ADV_MAX_SIZE
 #ifdef CONFIG_BT_NIMBLE_EXT_ADV
 #define MYNEWT_VAL_BLE_EXT_ADV_MAX_SIZE (CONFIG_BT_NIMBLE_MAX_EXT_ADV_DATA_LEN)