Merge branch 'nimble-1.6.0-idf' into 'master'

fix(nimble): Migrate to nimble-1.6.0 Closes BLERP-558 See merge request espressif/esp-idf!29075
espressif · Mar 26, 2024 · 6e4eeec · 6e4eeec
2 parents 52137a2 + 1bc6570
commit 6e4eeec
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/components/bt/host/nimble/Kconfig.in b/components/bt/host/nimble/Kconfig.in
@@ -201,7 +201,7 @@ config BT_NIMBLE_LL_CFG_FEAT_LE_ENCRYPTION
     help
             Enable encryption connection
 
-config BT_NIMBLE_SM_SC_LVL
+config BT_NIMBLE_SM_LVL
     int "Security level"
     depends on BT_NIMBLE_SECURITY_ENABLE
     default 0
@@ -341,6 +341,13 @@ menu "Memory Settings"
             low-priority event buffers, then an incoming advertising report will
             get dropped
 
+    config BT_NIMBLE_L2CAP_COC_SDU_BUFF_COUNT
+        int "L2cap coc Service Data Unit Buffer count"
+        depends on BT_NIMBLE_ENABLED
+        default 1
+        help
+            This is the service data unit buffer count for l2cap coc.
+
 endmenu
 
 config BT_NIMBLE_GATT_MAX_PROCS

diff --git a/components/bt/host/nimble/nimble b/components/bt/host/nimble/nimble
diff --git a/components/bt/host/nimble/port/include/esp_nimble_cfg.h b/components/bt/host/nimble/port/include/esp_nimble_cfg.h
@@ -507,6 +507,10 @@
 
 /*** @apache-mynewt-nimble/nimble/host */
 
+#ifndef MYNEWT_VAL_BLE_L2CAP_COC_SDU_BUFF_COUNT
+#define MYNEWT_VAL_BLE_L2CAP_COC_SDU_BUFF_COUNT CONFIG_BT_NIMBLE_L2CAP_COC_SDU_BUFF_COUNT
+#endif
+
 #ifndef MYNEWT_VAL_BLE_DYNAMIC_SERVICE
 #ifdef CONFIG_BT_NIMBLE_DYNAMIC_SERVICE
 #define MYNEWT_VAL_BLE_DYNAMIC_SERVICE CONFIG_BT_NIMBLE_DYNAMIC_SERVICE
@@ -872,19 +876,18 @@
 #endif
 
 
-#ifndef MYNEWT_VAL_BLE_SM_SC_LVL
-#ifdef CONFIG_BT_NIMBLE_SM_SC_LVL
-#define MYNEWT_VAL_BLE_SM_SC_LVL CONFIG_BT_NIMBLE_SM_SC_LVL
+#ifndef MYNEWT_VAL_BLE_SM_LVL
+#ifdef CONFIG_BT_NIMBLE_SM_LVL
+#define MYNEWT_VAL_BLE_SM_LVL CONFIG_BT_NIMBLE_SM_LVL
 #else
-#define MYNEWT_VAL_BLE_SM_SC_LVL (0)
+#define MYNEWT_VAL_BLE_SM_LVL (0)
 #endif
 #endif
 
 #ifndef MYNEWT_VAL_BLE_SM_SC_ONLY
 #define MYNEWT_VAL_BLE_SM_SC_ONLY (0)
 #endif
 
-
 #ifndef MYNEWT_VAL_BLE_SM_THEIR_KEY_DIST
 #define MYNEWT_VAL_BLE_SM_THEIR_KEY_DIST (0)
 #endif

diff --git a/components/bt/sdkconfig.rename b/components/bt/sdkconfig.rename
@@ -251,6 +251,7 @@ CONFIG_NIMBLE_SM_LEGACY                                     CONFIG_BT_NIMBLE_SM_
 CONFIG_NIMBLE_SM_SC                                         CONFIG_BT_NIMBLE_SM_SC
 CONFIG_NIMBLE_DEBUG                                         CONFIG_BT_NIMBLE_DEBUG
 CONFIG_NIMBLE_SM_SC_DEBUG_KEYS                              CONFIG_BT_NIMBLE_SM_SC_DEBUG_KEYS
+CONFIG_BT_NIMBLE_SM_SC_LVL                                  CONFIG_BT_NIMBLE_SM_LVL
 CONFIG_NIMBLE_SVC_GAP_DEVICE_NAME                           CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME
 CONFIG_NIMBLE_GAP_DEVICE_NAME_MAX_LEN                       CONFIG_BT_NIMBLE_GAP_DEVICE_NAME_MAX_LEN
 CONFIG_NIMBLE_ATT_PREFERRED_MTU                             CONFIG_BT_NIMBLE_ATT_PREFERRED_MTU