mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-03-03 07:13:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

MAX_NO_BTSTACK_LINK_KEY_DB_MEMORYS -> MAX_NO_BTSTACK_LINK_KEY_DB_MEMORY_ENTRIES

Browse Source
This commit is contained in:
Matthias Ringwald 2016-03-27 23:10:54 +02:00
parent af0d0df5e5
commit 2c455dad9a
14 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/manual/docs/how_to.md
View File

@ -36,7 +36,7 @@ allocated in two different manners:
#define MAX_NO_RFCOMM_MULTIPLEXERS 1
#define MAX_NO_RFCOMM_SERVICES 1
#define MAX_NO_RFCOMM_CHANNELS 1
#define MAX_NO_BTSTACK_LINK_KEY_DB_MEMORYS 3
#define MAX_NO_BTSTACK_LINK_KEY_DB_MEMORY_ENTRIES 3
Listing: Title. {#lst:memoryConfigurationSPP}

2
port/arduino/btstack_config.h
View File

@ -26,7 +26,7 @@
#define MAX_NO_RFCOMM_MULTIPLEXERS 0
#define MAX_NO_RFCOMM_SERVICES 0
#define MAX_NO_RFCOMM_CHANNELS 0
#define MAX_NO_BTSTACK_LINK_KEY_DB_MEMORYS 0
#define MAX_NO_BTSTACK_LINK_KEY_DB_MEMORY_ENTRIES 0
#define MAX_NO_GATT_CLIENTS 1
#define MAX_ATT_DB_SIZE 200
#define MAX_NO_HFP_CONNECTIONS 0

2
port/ez430-rf2560/btstack_config.h
View File

@ -30,7 +30,7 @@
#define MAX_NO_RFCOMM_CHANNELS MAX_SPP_CONNECTIONS
#define MAX_NO_BNEP_SERVICES 1
#define MAX_NO_BNEP_CHANNELS MAX_SPP_CONNECTIONS
#define MAX_NO_BTSTACK_LINK_KEY_DB_MEMORYS 2
#define MAX_NO_BTSTACK_LINK_KEY_DB_MEMORY_ENTRIES 2
#define MAX_NO_HFP_CONNECTIONS 0
#define MAX_NO_WHITELIST_ENTRIES 1
#define MAX_NO_SM_LOOKUP_ENTRIES 3

2
port/msp-exp430f5438-cc2564b/btstack_config.h
View File

@ -21,7 +21,7 @@
#define HCI_ACL_PAYLOAD_SIZE 52
#define MAX_NO_BNEP_CHANNELS MAX_SPP_CONNECTIONS
#define MAX_NO_BNEP_SERVICES 1
#define MAX_NO_BTSTACK_LINK_KEY_DB_MEMORYS 2
#define MAX_NO_BTSTACK_LINK_KEY_DB_MEMORY_ENTRIES 2
#define MAX_NO_GATT_CLIENTS 0
#define MAX_NO_GATT_SUBCLIENTS 0
#define MAX_NO_HCI_CONNECTIONS MAX_SPP_CONNECTIONS

2
port/msp430f5229lp-cc2564b/btstack_config.h
View File

@ -32,7 +32,7 @@
#define MAX_NO_RFCOMM_CHANNELS MAX_SPP_CONNECTIONS
#define MAX_NO_BNEP_SERVICES 1
#define MAX_NO_BNEP_CHANNELS MAX_SPP_CONNECTIONS
#define MAX_NO_BTSTACK_LINK_KEY_DB_MEMORYS 2
#define MAX_NO_BTSTACK_LINK_KEY_DB_MEMORY_ENTRIES 2
#define MAX_NO_WHITELIST_ENTRIES 1
#define MAX_NO_SM_LOOKUP_ENTRIES 3
#define MAX_NO_SERVICE_RECORD_ITEMS 1

2
port/nrf5x/btstack_config.h
View File

@ -27,7 +27,7 @@
#define MAX_NO_RFCOMM_MULTIPLEXERS MAX_SPP_CONNECTIONS
#define MAX_NO_RFCOMM_SERVICES 1
#define MAX_NO_RFCOMM_CHANNELS MAX_SPP_CONNECTIONS
#define MAX_NO_BTSTACK_LINK_KEY_DB_MEMORYS 2
#define MAX_NO_BTSTACK_LINK_KEY_DB_MEMORY_ENTRIES 2
#define MAX_NO_BNEP_SERVICES 0
#define MAX_NO_BNEP_CHANNELS 0
#define MAX_NO_HFP_CONNECTIONS 0

2
port/pic32-harmony/src/btstack_config.h
View File

@ -25,7 +25,7 @@
#define MAX_NO_RFCOMM_MULTIPLEXERS MAX_SPP_CONNECTIONS
#define MAX_NO_RFCOMM_SERVICES 1
#define MAX_NO_RFCOMM_CHANNELS MAX_SPP_CONNECTIONS
#define MAX_NO_BTSTACK_LINK_KEY_DB_MEMORYS 2
#define MAX_NO_BTSTACK_LINK_KEY_DB_MEMORY_ENTRIES 2
#define MAX_NO_BNEP_SERVICES 0
#define MAX_NO_BNEP_CHANNELS 0
#define MAX_NO_HFP_CONNECTIONS 0

2
port/stm32-f103rb-nucleo/btstack_config.h
View File

@ -27,7 +27,7 @@
#define MAX_NO_RFCOMM_MULTIPLEXERS MAX_SPP_CONNECTIONS
#define MAX_NO_RFCOMM_SERVICES 1
#define MAX_NO_RFCOMM_CHANNELS MAX_SPP_CONNECTIONS
#define MAX_NO_BTSTACK_LINK_KEY_DB_MEMORYS 2
#define MAX_NO_BTSTACK_LINK_KEY_DB_MEMORY_ENTRIES 2
#define MAX_NO_BNEP_SERVICES 0
#define MAX_NO_BNEP_CHANNELS 0
#define MAX_NO_HFP_CONNECTIONS 0

2
port/wiced/btstack_config.h
View File

@ -27,7 +27,7 @@
#define MAX_NO_RFCOMM_MULTIPLEXERS MAX_SPP_CONNECTIONS
#define MAX_NO_RFCOMM_SERVICES 1
#define MAX_NO_RFCOMM_CHANNELS MAX_SPP_CONNECTIONS
#define MAX_NO_BTSTACK_LINK_KEY_DB_MEMORYS 2
#define MAX_NO_BTSTACK_LINK_KEY_DB_MEMORY_ENTRIES 2
#define MAX_NO_BNEP_SERVICES 0
#define MAX_NO_BNEP_CHANNELS 0
#define MAX_NO_HFP_CONNECTIONS 0

38
src/btstack_memory.c
View File

@ -247,35 +247,35 @@ void btstack_memory_rfcomm_channel_free(rfcomm_channel_t *rfcomm_channel){
// MARK: btstack_link_key_db_memory_t
#ifdef MAX_NO_BTSTACK_LINK_KEY_DB_MEMORYS
#if MAX_NO_BTSTACK_LINK_KEY_DB_MEMORYS > 0
static btstack_link_key_db_memory_t btstack_link_key_db_memory_storage[MAX_NO_BTSTACK_LINK_KEY_DB_MEMORYS];
static btstack_memory_pool_t btstack_link_key_db_memory_pool;
btstack_link_key_db_memory_t * btstack_memory_btstack_link_key_db_memory_get(void){
return (btstack_link_key_db_memory_t *) btstack_memory_pool_get(&btstack_link_key_db_memory_pool);
// MARK: btstack_link_key_db_memory_entry_t
#ifdef MAX_NO_BTSTACK_LINK_KEY_DB_MEMORY_ENTRIES
#if MAX_NO_BTSTACK_LINK_KEY_DB_MEMORY_ENTRIES > 0
static btstack_link_key_db_memory_entry_t btstack_link_key_db_memory_entry_storage[MAX_NO_BTSTACK_LINK_KEY_DB_MEMORY_ENTRIES];
static btstack_memory_pool_t btstack_link_key_db_memory_entry_pool;
btstack_link_key_db_memory_entry_t * btstack_memory_btstack_link_key_db_memory_entry_get(void){
return (btstack_link_key_db_memory_entry_t *) btstack_memory_pool_get(&btstack_link_key_db_memory_entry_pool);
}
void btstack_memory_btstack_link_key_db_memory_free(btstack_link_key_db_memory_t *btstack_link_key_db_memory){
btstack_memory_pool_free(&btstack_link_key_db_memory_pool, btstack_link_key_db_memory);
void btstack_memory_btstack_link_key_db_memory_entry_free(btstack_link_key_db_memory_entry_t *btstack_link_key_db_memory_entry){
btstack_memory_pool_free(&btstack_link_key_db_memory_entry_pool, btstack_link_key_db_memory_entry);
}
#else
btstack_link_key_db_memory_t * btstack_memory_btstack_link_key_db_memory_get(void){
btstack_link_key_db_memory_entry_t * btstack_memory_btstack_link_key_db_memory_entry_get(void){
return NULL;
}
void btstack_memory_btstack_link_key_db_memory_free(btstack_link_key_db_memory_t *btstack_link_key_db_memory){
void btstack_memory_btstack_link_key_db_memory_entry_free(btstack_link_key_db_memory_entry_t *btstack_link_key_db_memory_entry){
// silence compiler warning about unused parameter in a portable way
(void) btstack_link_key_db_memory;
(void) btstack_link_key_db_memory_entry;
};
#endif
#elif defined(HAVE_MALLOC)
btstack_link_key_db_memory_t * btstack_memory_btstack_link_key_db_memory_get(void){
return (btstack_link_key_db_memory_t*) malloc(sizeof(btstack_link_key_db_memory_t));
btstack_link_key_db_memory_entry_t * btstack_memory_btstack_link_key_db_memory_entry_get(void){
return (btstack_link_key_db_memory_entry_t*) malloc(sizeof(btstack_link_key_db_memory_entry_t));
}
void btstack_memory_btstack_link_key_db_memory_free(btstack_link_key_db_memory_t *btstack_link_key_db_memory){
free(btstack_link_key_db_memory);
void btstack_memory_btstack_link_key_db_memory_entry_free(btstack_link_key_db_memory_entry_t *btstack_link_key_db_memory_entry){
free(btstack_link_key_db_memory_entry);
}
#else
#error "Neither HAVE_MALLOC nor MAX_NO_BTSTACK_LINK_KEY_DB_MEMORYS for struct btstack_link_key_db_memory is defined. Please, edit the config file."
#error "Neither HAVE_MALLOC nor MAX_NO_BTSTACK_LINK_KEY_DB_MEMORY_ENTRIES for struct btstack_link_key_db_memory_entry is defined. Please, edit the config file."
#endif
@ -529,8 +529,8 @@ void btstack_memory_init(void){
#if MAX_NO_RFCOMM_CHANNELS > 0
btstack_memory_pool_create(&rfcomm_channel_pool, rfcomm_channel_storage, MAX_NO_RFCOMM_CHANNELS, sizeof(rfcomm_channel_t));
#endif
#if MAX_NO_BTSTACK_LINK_KEY_DB_MEMORYS > 0
btstack_memory_pool_create(&btstack_link_key_db_memory_pool, btstack_link_key_db_memory_storage, MAX_NO_BTSTACK_LINK_KEY_DB_MEMORYS, sizeof(btstack_link_key_db_memory_t));
#if MAX_NO_BTSTACK_LINK_KEY_DB_MEMORY_ENTRIES > 0
btstack_memory_pool_create(&btstack_link_key_db_memory_entry_pool, btstack_link_key_db_memory_entry_storage, MAX_NO_BTSTACK_LINK_KEY_DB_MEMORY_ENTRIES, sizeof(btstack_link_key_db_memory_entry_t));
#endif
#if MAX_NO_BNEP_SERVICES > 0
btstack_memory_pool_create(&bnep_service_pool, bnep_service_storage, MAX_NO_BNEP_SERVICES, sizeof(bnep_service_t));

6
src/btstack_memory.h
View File

@ -98,9 +98,9 @@ void btstack_memory_rfcomm_service_free(rfcomm_service_t *rfcomm_service);
rfcomm_channel_t * btstack_memory_rfcomm_channel_get(void);
void btstack_memory_rfcomm_channel_free(rfcomm_channel_t *rfcomm_channel);
// btstack_link_key_db_memory
btstack_link_key_db_memory_t * btstack_memory_btstack_link_key_db_memory_get(void);
void btstack_memory_btstack_link_key_db_memory_free(btstack_link_key_db_memory_t *btstack_link_key_db_memory);
// btstack_link_key_db_memory_entry
btstack_link_key_db_memory_entry_t * btstack_memory_btstack_link_key_db_memory_entry_get(void);
void btstack_memory_btstack_link_key_db_memory_entry_free(btstack_link_key_db_memory_entry_t *btstack_link_key_db_memory_entry);
// bnep_service, bnep_channel
bnep_service_t * btstack_memory_bnep_service_get(void);

2
test/btstack_link_key_db/btstack_config.h
View File

@ -32,7 +32,7 @@
#define MAX_NO_RFCOMM_CHANNELS 0
#define MAX_NO_BNEP_SERVICES 0
#define MAX_NO_BNEP_CHANNELS 0
#define MAX_NO_BTSTACK_LINK_KEY_DB_MEMORYS 2
#define MAX_NO_BTSTACK_LINK_KEY_DB_MEMORY_ENTRIES 2
#define MAX_NO_HFP_CONNECTIONS 0
#define MAX_NO_WHITELIST_ENTRIES 0
#define MAX_NO_SM_LOOKUP_ENTRIES 0

2
test/btstack_link_key_db/btstack_link_key_db_memory_test.c
View File

@ -51,7 +51,7 @@ TEST_GROUP(RemoteDeviceDB){
};
TEST(RemoteDeviceDB, MemoryPool){
CHECK(MAX_NO_BTSTACK_LINK_KEY_DB_MEMORYS == 2);
CHECK(MAX_NO_BTSTACK_LINK_KEY_DB_MEMORY_ENTRIES == 2);
// void * item = btstack_memory_db_mem_device_name_get();
// CHECK(item);
}

2
tool/btstack_memory_generator.py
View File

@ -166,7 +166,7 @@ list_of_structs = [
["hci_connection"],
["l2cap_service", "l2cap_channel"],
["rfcomm_multiplexer", "rfcomm_service", "rfcomm_channel"],
["btstack_link_key_db_memory"],
["btstack_link_key_db_memory_entry"],
["bnep_service", "bnep_channel"],
["hfp_connection"],
["service_record_item"]