From 8613e0eb5b9621b90c6c50e3d739bfa544af1c63 Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Mon, 5 Oct 2020 12:48:31 +0200 Subject: [PATCH] ports: remove memory config for classic where classic is not enabled --- port/arduino/btstack_config.h | 10 +--------- port/nrf5-zephyr/btstack_config.h | 2 +- port/nrf5x/btstack_config.h | 17 ++++------------- .../samv71-xplained-atwilc3000/btstack_config.h | 12 ------------ .../port/btstack_config.h | 9 --------- .../port/btstack_config.h | 6 ++---- .../port/btstack_config.h | 2 -- 7 files changed, 8 insertions(+), 50 deletions(-) diff --git a/port/arduino/btstack_config.h b/port/arduino/btstack_config.h index b0a48d619..7577682ce 100644 --- a/port/arduino/btstack_config.h +++ b/port/arduino/btstack_config.h @@ -17,20 +17,12 @@ // BTstack configuration. buffers, sizes, ... #define HCI_ACL_PAYLOAD_SIZE 200 -#define MAX_NR_BNEP_SERVICES 0 -#define MAX_NR_BNEP_CHANNELS 0 #define MAX_NR_HCI_CONNECTIONS 1 #define MAX_NR_L2CAP_SERVICES 0 #define MAX_NR_L2CAP_CHANNELS 0 -#define MAX_NR_RFCOMM_MULTIPLEXERS 0 -#define MAX_NR_RFCOMM_SERVICES 0 -#define MAX_NR_RFCOMM_CHANNELS 0 -#define MAX_NR_BTSTACK_LINK_KEY_DB_MEMORY_ENTRIES 0 #define MAX_NR_GATT_CLIENTS 1 #define MAX_ATT_DB_SIZE 200 -#define MAX_NR_HFP_CONNECTIONS 0 #define MAX_NR_WHITELIST_ENTRIES 1 #define MAX_NR_SM_LOOKUP_ENTRIES 3 -#define MAX_NR_SERVICE_RECORD_ITEMS 1 #define MAX_NR_LE_DEVICE_DB_ENTRIES 1 -#endif \ No newline at end of file +#endif diff --git a/port/nrf5-zephyr/btstack_config.h b/port/nrf5-zephyr/btstack_config.h index 8ccdc9834..1a2bf12dc 100644 --- a/port/nrf5-zephyr/btstack_config.h +++ b/port/nrf5-zephyr/btstack_config.h @@ -32,7 +32,7 @@ #define MAX_NR_BTSTACK_LINK_KEY_DB_MEMORY_ENTRIES 0 #define MAX_NR_BNEP_SERVICES 0 #define MAX_NR_BNEP_CHANNELS 0 -#define MAX_NR_SERVICE_RECORD_ITEMS 1 +#define MAX_NR_SERVICE_RECORD_ITEMS 0 #define MAX_NR_LE_DEVICE_DB_ENTRIES 1 // hack to fix usage of hci_init in zephry diff --git a/port/nrf5x/btstack_config.h b/port/nrf5x/btstack_config.h index aaf3ebe02..645bb499f 100644 --- a/port/nrf5x/btstack_config.h +++ b/port/nrf5x/btstack_config.h @@ -18,21 +18,12 @@ // BTstack configuration. buffers, sizes, ... #define HCI_ACL_PAYLOAD_SIZE 52 -#define MAX_SPP_CONNECTIONS 1 +#define MAX_NR_HCI_CONNECTIONS 1 +#define MAX_NR_L2CAP_SERVICES 12 +#define MAX_NR_L2CAP_CHANNELS 1 #define MAX_NR_GATT_CLIENTS 1 -#define MAX_NR_HCI_CONNECTIONS MAX_SPP_CONNECTIONS -#define MAX_NR_L2CAP_SERVICES 2 -#define MAX_NR_L2CAP_CHANNELS (1+MAX_SPP_CONNECTIONS) -#define MAX_NR_RFCOMM_MULTIPLEXERS MAX_SPP_CONNECTIONS -#define MAX_NR_RFCOMM_SERVICES 1 -#define MAX_NR_RFCOMM_CHANNELS MAX_SPP_CONNECTIONS -#define MAX_NR_BTSTACK_LINK_KEY_DB_MEMORY_ENTRIES 2 -#define MAX_NR_BNEP_SERVICES 0 -#define MAX_NR_BNEP_CHANNELS 0 -#define MAX_NR_HFP_CONNECTIONS 0 #define MAX_NR_WHITELIST_ENTRIES 1 #define MAX_NR_SM_LOOKUP_ENTRIES 3 -#define MAX_NR_SERVICE_RECORD_ITEMS 1 #define MAX_NR_LE_DEVICE_DB_ENTRIES 1 -#endif \ No newline at end of file +#endif diff --git a/port/samv71-xplained-atwilc3000/btstack_config.h b/port/samv71-xplained-atwilc3000/btstack_config.h index 4742e3c19..de3a821d0 100644 --- a/port/samv71-xplained-atwilc3000/btstack_config.h +++ b/port/samv71-xplained-atwilc3000/btstack_config.h @@ -32,18 +32,6 @@ #define MAX_NR_SM_LOOKUP_ENTRIES 1 #define MAX_NR_WHITELIST_ENTRIES 1 -// no classic services -#define MAX_NR_AVDTP_CONNECTIONS 0 -#define MAX_NR_AVDTP_STREAM_ENDPOINTS 0 -#define MAX_NR_AVRCP_CONNECTIONS 0 -#define MAX_NR_BNEP_CHANNELS 0 -#define MAX_NR_BNEP_SERVICES 0 -#define MAX_NR_DB_MEM_DEVICE_LINK_KEYS 0 -#define MAX_NR_BTSTACK_LINK_KEY_DB_MEMORY_ENTRIES 0 -#define MAX_NR_HFP_CONNECTIONS 0 -#define MAX_NR_L2CAP_CHANNELS 0 -#define MAX_NR_L2CAP_SERVICES 0 - // if defined, le_device_db_memory will not be compiled // #define NVM_NUM_DEVICE_DB_ENTRIES 16 diff --git a/port/stm32-l073rz-nucleo-em9304/port/btstack_config.h b/port/stm32-l073rz-nucleo-em9304/port/btstack_config.h index ce109310d..b4cd37780 100644 --- a/port/stm32-l073rz-nucleo-em9304/port/btstack_config.h +++ b/port/stm32-l073rz-nucleo-em9304/port/btstack_config.h @@ -27,15 +27,6 @@ #define MAX_NR_L2CAP_CHANNELS 1 #define MAX_NR_GATT_CLIENTS 1 -#define MAX_NR_RFCOMM_MULTIPLEXERS 0 -#define MAX_NR_RFCOMM_SERVICES 0 -#define MAX_NR_RFCOMM_CHANNELS 0 -#define MAX_NR_HFP_CONNECTIONS 0 -#define MAX_NR_BTSTACK_LINK_KEY_DB_MEMORY_ENTRIES 0 -#define MAX_NR_BNEP_SERVICES 0 -#define MAX_NR_BNEP_CHANNELS 0 -#define MAX_NR_SERVICE_RECORD_ITEMS 1 - // LE Device DB using TLV on top of Flash Sector interface #define NVM_NUM_DEVICE_DB_ENTRIES 16 diff --git a/port/stm32-l451-miromico-sx1280/port/btstack_config.h b/port/stm32-l451-miromico-sx1280/port/btstack_config.h index bc8ba9ce0..c96ed2e46 100644 --- a/port/stm32-l451-miromico-sx1280/port/btstack_config.h +++ b/port/stm32-l451-miromico-sx1280/port/btstack_config.h @@ -59,12 +59,10 @@ #define HCI_ACL_PAYLOAD_SIZE (512 + 4) //Max official att size + l2cap header size #define MAX_NR_GATT_CLIENTS 1 #define MAX_NR_HCI_CONNECTIONS 1 -#define MAX_NR_L2CAP_SERVICES 2 -#define MAX_NR_L2CAP_CHANNELS 3 -#define MAX_NR_BTSTACK_LINK_KEY_DB_MEMORY_ENTRIES 2 +#define MAX_NR_L2CAP_SERVICES 1 +#define MAX_NR_L2CAP_CHANNELS 1 #define MAX_NR_WHITELIST_ENTRIES 1 #define MAX_NR_SM_LOOKUP_ENTRIES 3 -#define MAX_NR_SERVICE_RECORD_ITEMS 1 #define MAX_NR_LE_DEVICE_DB_ENTRIES 1 // LE Device DB using TLV diff --git a/port/stm32-wb55xx-nucleo-freertos/port/btstack_config.h b/port/stm32-wb55xx-nucleo-freertos/port/btstack_config.h index 2d9fe6bd9..d5f37749b 100644 --- a/port/stm32-wb55xx-nucleo-freertos/port/btstack_config.h +++ b/port/stm32-wb55xx-nucleo-freertos/port/btstack_config.h @@ -70,10 +70,8 @@ #define MAX_NR_HCI_CONNECTIONS 1 #define MAX_NR_L2CAP_SERVICES 2 #define MAX_NR_L2CAP_CHANNELS 3 -#define MAX_NR_BTSTACK_LINK_KEY_DB_MEMORY_ENTRIES 2 #define MAX_NR_WHITELIST_ENTRIES 1 #define MAX_NR_SM_LOOKUP_ENTRIES 3 -#define MAX_NR_SERVICE_RECORD_ITEMS 1 #define MAX_NR_LE_DEVICE_DB_ENTRIES 1 #define MAX_ATT_DB_SIZE 350