Merge branch 'feature/support_ble_max_conn_num_to_9' into 'master'

Support bluedroid host maximum number of connections to 9 Closes BT-2914, BT-3000, and BT-2915 See merge request espressif/esp-idf!20933
espressif · Dec 2, 2022 · 18e0cd6 · 18e0cd6
2 parents 7e9a239 + 51c739c
commit 18e0cd6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/components/bt/controller/lib_esp32c3_family b/components/bt/controller/lib_esp32c3_family
diff --git a/components/bt/host/bluedroid/Kconfig.in b/components/bt/host/bluedroid/Kconfig.in
@@ -1001,12 +1001,16 @@ menu "BT DEBUG LOG LEVEL"
 endmenu #BT DEBUG LOG LEVEL
 
 config BT_ACL_CONNECTIONS
-    int "BT/BLE MAX ACL CONNECTIONS(1~7)"
+    int "BT/BLE MAX ACL CONNECTIONS(1~9)"
     depends on BT_BLUEDROID_ENABLED
-    range 1 7
+    range 1 9
     default 4
     help
-        Maximum BT/BLE connection count
+        Maximum BT/BLE connection count. The ESP32-C3/S3 chip supports a maximum of 10 instances,
+        including ADV, SCAN and connections. The ESP32-C3/S3 chip can connect up to 9 devices if
+        ADV or SCAN uses only one. If ADV and SCAN are both used, The ESP32-C3/S3 chip is connected
+        to a maximum of 8 devices. Because Bluetooth cannot reclaim used instances once ADV or SCAN
+        is used.
 
 config BT_MULTI_CONNECTION_ENBALE
     bool "Enable BLE multi-conections"

diff --git a/components/bt/host/bluedroid/bta/dm/include/bta_dm_int.h b/components/bt/host/bluedroid/bta/dm/include/bta_dm_int.h
@@ -1153,7 +1153,7 @@ typedef union {
 } tBTA_DM_MSG;
 
 
-#define BTA_DM_NUM_PEER_DEVICE 7
+#define BTA_DM_NUM_PEER_DEVICE  MAX_ACL_CONNECTIONS
 
 #define BTA_DM_NOT_CONNECTED  0
 #define BTA_DM_CONNECTED      1

diff --git a/components/bt/host/bluedroid/bta/gatt/include/bta_gattc_int.h b/components/bt/host/bluedroid/bta/gatt/include/bta_gattc_int.h
@@ -317,7 +317,7 @@ typedef struct {
 } tBTA_GATTC_SERV;
 
 #ifndef BTA_GATTC_NOTIF_REG_MAX
-#define BTA_GATTC_NOTIF_REG_MAX     7//15
+#define BTA_GATTC_NOTIF_REG_MAX     BTA_GATTC_CONN_MAX
 #endif
 
 typedef struct {