Merge branch 'feature/decrease_bt_contrller_memory_with_new_mem_reserved' into 'master'

decrease bt contrller memory with new mem reserved See merge request idf/esp-idf!2791
2026-08-18 06:35:35 +03:00 · 2018-08-16 19:12:44 +08:00
parent 3012b0f887 ab73e0ff13
commit 00ef8bf726
31 changed files with 573 additions and 259 deletions
--- a/examples/bluetooth/a2dp_sink/sdkconfig.defaults
+++ b/examples/bluetooth/a2dp_sink/sdkconfig.defaults
@@ -1,6 +1,9 @@
 # Override some defaults so BT stack is enabled and
 # Classic BT is enabled and BT_DRAM_RELEASE is disabled
 CONFIG_BT_ENABLED=y
+CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=
+CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=y
+CONFIG_BTDM_CONTROLLER_MODE_BTDM=
 CONFIG_BLUEDROID_ENABLED=y
 CONFIG_CLASSIC_BT_ENABLED=y
 CONFIG_A2DP_ENABLE=y
--- a/examples/bluetooth/a2dp_source/sdkconfig.defaults
+++ b/examples/bluetooth/a2dp_source/sdkconfig.defaults
@@ -1,6 +1,9 @@
 # Override some defaults so BT stack is enabled and
 # Classic BT is enabled
 CONFIG_BT_ENABLED=y
+CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=
+CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=y
+CONFIG_BTDM_CONTROLLER_MODE_BTDM=
 CONFIG_BLUEDROID_ENABLED=y
 CONFIG_CLASSIC_BT_ENABLED=y
 CONFIG_A2DP_ENABLE=y
--- a/examples/bluetooth/ble_adv/sdkconfig.defaults
+++ b/examples/bluetooth/ble_adv/sdkconfig.defaults
@@ -5,3 +5,6 @@
 # BT config
 #
 CONFIG_BT_ENABLED=y
+CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
+CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CONTROLLER_MODE_BTDM=
--- a/examples/bluetooth/ble_eddystone/sdkconfig.defaults
+++ b/examples/bluetooth/ble_eddystone/sdkconfig.defaults
@@ -1,4 +1,6 @@
 # Override some defaults so BT stack is enabled
 # and WiFi disabled by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_WIFI_ENABLED=n
+CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
+CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CONTROLLER_MODE_BTDM=
--- a/examples/bluetooth/ble_hid_device_demo/sdkconfig.defaults
+++ b/examples/bluetooth/ble_hid_device_demo/sdkconfig.defaults
@@ -1,3 +1,6 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
+CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
+CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CONTROLLER_MODE_BTDM=
--- a/examples/bluetooth/ble_ibeacon/sdkconfig.defaults
+++ b/examples/bluetooth/ble_ibeacon/sdkconfig.defaults
@@ -1,4 +1,6 @@
 # Override some defaults so BT stack is enabled
 # and WiFi disabled by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_WIFI_ENABLED=n
+CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
+CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CONTROLLER_MODE_BTDM=
--- a/examples/bluetooth/ble_spp_client/sdkconfig.defaults
+++ b/examples/bluetooth/ble_spp_client/sdkconfig.defaults
@@ -1,4 +1,6 @@
 # Override some defaults so BT stack is enabled
 # and WiFi disabled by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_WIFI_ENABLED=n
+CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
+CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CONTROLLER_MODE_BTDM=
--- a/examples/bluetooth/ble_spp_server/sdkconfig.defaults
+++ b/examples/bluetooth/ble_spp_server/sdkconfig.defaults
@@ -5,7 +5,10 @@
 # BT config
 #
 CONFIG_BT_ENABLED=y
-
+CONFIG_BT_ENABLED=y
+CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
+CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CONTROLLER_MODE_BTDM=
 #
 # ESP32-specific config
 #
--- a/examples/bluetooth/ble_throughput/throughput_client/sdkconfig.defaults
+++ b/examples/bluetooth/ble_throughput/throughput_client/sdkconfig.defaults
@@ -1,6 +1,10 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
+CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
+CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CONTROLLER_MODE_BTDM=
+CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN=9
 CONFIG_GATTS_NOTIFY_THROUGHPUT=y
 CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=n
 CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE_1=y
--- a/examples/bluetooth/ble_throughput/throughput_server/sdkconfig.defaults
+++ b/examples/bluetooth/ble_throughput/throughput_server/sdkconfig.defaults
@@ -1,6 +1,10 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
+CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
+CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CONTROLLER_MODE_BTDM=
+CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN=9
 CONFIG_GATTS_NOTIFY_THROUGHPUT=y
 CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=n
 CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE_1=y
--- a/examples/bluetooth/blufi/sdkconfig.defaults
+++ b/examples/bluetooth/blufi/sdkconfig.defaults
@@ -5,6 +5,9 @@
 # BT config
 #
 CONFIG_BT_ENABLED=y
+CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
+CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CONTROLLER_MODE_BTDM=
 CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE_0=y
 CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE_1=
 CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE=0
--- a/examples/bluetooth/bt_discovery/sdkconfig.defaults
+++ b/examples/bluetooth/bt_discovery/sdkconfig.defaults
@@ -1,6 +1,9 @@
 # Override some defaults so BT stack is enabled and
 # Classic BT is enabled and BT_DRAM_RELEASE is disabled
 CONFIG_BT_ENABLED=y
+CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=
+CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=y
+CONFIG_BTDM_CONTROLLER_MODE_BTDM=
 CONFIG_CLASSIC_BT_ENABLED=y
 CONFIG_A2DP_ENABLE=
 CONFIG_GATTS_ENABLE=
--- a/examples/bluetooth/bt_spp_acceptor/sdkconfig.defaults
+++ b/examples/bluetooth/bt_spp_acceptor/sdkconfig.defaults
@@ -1,6 +1,9 @@
 # Override some defaults so BT stack is enabled
 # and WiFi disabled by default in this example
 CONFIG_BT_ENABLED=y
+CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=
+CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=y
+CONFIG_BTDM_CONTROLLER_MODE_BTDM=
 CONFIG_CLASSIC_BT_ENABLED=y
 CONFIG_WIFI_ENABLED=n
-CONFIG_BT_SPP_ENABLED=y
+CONFIG_BT_SPP_ENABLED=y
--- a/examples/bluetooth/bt_spp_initiator/sdkconfig.defaults
+++ b/examples/bluetooth/bt_spp_initiator/sdkconfig.defaults
@@ -1,6 +1,9 @@
 # Override some defaults so BT stack is enabled
 # and WiFi disabled by default in this example
 CONFIG_BT_ENABLED=y
+CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=
+CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=y
+CONFIG_BTDM_CONTROLLER_MODE_BTDM=
 CONFIG_CLASSIC_BT_ENABLED=y
 CONFIG_WIFI_ENABLED=n
-CONFIG_BT_SPP_ENABLED=y
+CONFIG_BT_SPP_ENABLED=y
--- a/examples/bluetooth/bt_spp_vfs_acceptor/sdkconfig.defaults
+++ b/examples/bluetooth/bt_spp_vfs_acceptor/sdkconfig.defaults
@@ -1,6 +1,9 @@
 # Override some defaults so BT stack is enabled
 # and WiFi disabled by default in this example
 CONFIG_BT_ENABLED=y
+CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=
+CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=y
+CONFIG_BTDM_CONTROLLER_MODE_BTDM=
 CONFIG_CLASSIC_BT_ENABLED=y
 CONFIG_WIFI_ENABLED=n
-CONFIG_BT_SPP_ENABLED=y
+CONFIG_BT_SPP_ENABLED=y
--- a/examples/bluetooth/bt_spp_vfs_initiator/sdkconfig.defaults
+++ b/examples/bluetooth/bt_spp_vfs_initiator/sdkconfig.defaults
@@ -1,6 +1,9 @@
 # Override some defaults so BT stack is enabled
 # and WiFi disabled by default in this example
 CONFIG_BT_ENABLED=y
+CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=
+CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=y
+CONFIG_BTDM_CONTROLLER_MODE_BTDM=
 CONFIG_CLASSIC_BT_ENABLED=y
 CONFIG_WIFI_ENABLED=n
-CONFIG_BT_SPP_ENABLED=y
+CONFIG_BT_SPP_ENABLED=y
--- a/examples/bluetooth/controller_hci_uart/sdkconfig.defaults
+++ b/examples/bluetooth/controller_hci_uart/sdkconfig.defaults
@@ -5,6 +5,12 @@
 # BT config
 #
 CONFIG_BT_ENABLED=y
+CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=
+CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CONTROLLER_MODE_BTDM=y
+CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN=9
+CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN=7
+CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN=3
 CONFIG_BLUEDROID_ENABLED=n
 CONFIG_BT_HCI_UART=y
 CONFIG_BT_HCI_UART_NO_DEFAULT=1
--- a/examples/bluetooth/gatt_client/sdkconfig.defaults
+++ b/examples/bluetooth/gatt_client/sdkconfig.defaults
@@ -1,3 +1,6 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
+CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
+CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CONTROLLER_MODE_BTDM=
--- a/examples/bluetooth/gatt_security_client/sdkconfig.defaults
+++ b/examples/bluetooth/gatt_security_client/sdkconfig.defaults
@@ -1,4 +1,6 @@
 # Override some defaults so BT stack is enabled
 # and WiFi disabled by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_WIFI_ENABLED=n
+CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
+CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CONTROLLER_MODE_BTDM=
--- a/examples/bluetooth/gatt_security_server/sdkconfig.defaults
+++ b/examples/bluetooth/gatt_security_server/sdkconfig.defaults
@@ -1,3 +1,6 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
+CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
+CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CONTROLLER_MODE_BTDM=
--- a/examples/bluetooth/gatt_server/sdkconfig.defaults
+++ b/examples/bluetooth/gatt_server/sdkconfig.defaults
@@ -1,3 +1,6 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
+CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
+CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CONTROLLER_MODE_BTDM=
--- a/examples/bluetooth/gatt_server_service_table/sdkconfig.defaults
+++ b/examples/bluetooth/gatt_server_service_table/sdkconfig.defaults
@@ -5,6 +5,9 @@
 # BT config
 #
 CONFIG_BT_ENABLED=y
+CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
+CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CONTROLLER_MODE_BTDM=

 #
 # ESP32-specific config
--- a/examples/bluetooth/gattc_multi_connect/sdkconfig.defaults
+++ b/examples/bluetooth/gattc_multi_connect/sdkconfig.defaults
@@ -1,4 +1,7 @@
 # Override some defaults so BT stack is enabled
 # and WiFi disabled by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_WIFI_ENABLED=n
+CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
+CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CONTROLLER_MODE_BTDM=
+CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN=9