btstack_link_key_db_tlv: require NVM_NUM_LINK_KEYS to be set in btstack_config.h, set NVM_NUM_LINK_KEYS 16 where missing

This commit is contained in:
Matthias Ringwald 2020-07-13 18:05:30 +02:00
parent 9798b196e5
commit dbe92de6a9
20 changed files with 43 additions and 27 deletions

View File

@ -34,7 +34,8 @@
#define HCI_ACL_PAYLOAD_SIZE (1691 + 4)
#define HCI_INCOMING_PRE_BUFFER_SIZE 14 // sizeof BNEP header, avoid memcpy
#define NVM_NUM_DEVICE_DB_ENTRIES 20
#define NVM_NUM_LINK_KEYS 16
#define NVM_NUM_DEVICE_DB_ENTRIES 16
// Mesh Configuration
#define ENABLE_MESH

View File

@ -33,7 +33,8 @@
#define HCI_ACL_PAYLOAD_SIZE (1691 + 4)
#define HCI_INCOMING_PRE_BUFFER_SIZE 14 // sizeof BNEP header, avoid memcpy
#define NVM_NUM_DEVICE_DB_ENTRIES 20
#define NVM_NUM_LINK_KEYS 16
#define NVM_NUM_DEVICE_DB_ENTRIES 16
// Mesh Configuration
#define ENABLE_MESH

View File

@ -23,7 +23,8 @@
#define HCI_ACL_PAYLOAD_SIZE 1021
#define MAX_NR_LE_DEVICE_DB_ENTRIES 1
#define NVM_NUM_DEVICE_DB_ENTRIES 16
#define NVM_NUM_LINK_KEYS 16
#define NVM_NUM_DEVICE_DB_ENTRIES 16
// Daemon configuration
#define ENABLE_SDP

View File

@ -41,4 +41,7 @@
#define MAX_NR_AVDTP_CONNECTIONS 1
#define MAX_NR_AVRCP_CONNECTIONS 1
#define NVM_NUM_LINK_KEYS 16
#define NVM_NUM_DEVICE_DB_ENTRIES 16
#endif

View File

@ -35,7 +35,8 @@
#define HCI_INCOMING_PRE_BUFFER_SIZE 14 // sizeof benep heade, avoid memcpy
#define HCI_ACL_PAYLOAD_SIZE (1691 + 4)
#define NVM_NUM_DEVICE_DB_ENTRIES 20
#define NVM_NUM_LINK_KEYS 16
#define NVM_NUM_DEVICE_DB_ENTRIES 16
// Mesh Configuration
#define ENABLE_MESH

View File

@ -33,8 +33,8 @@
#define HCI_INCOMING_PRE_BUFFER_SIZE 14 // sizeof benep heade, avoid memcpy
#define HCI_ACL_PAYLOAD_SIZE (1691 + 4)
#define NVM_NUM_DEVICE_DB_ENTRIES 20
#define NVM_NUM_LINK_KEYS 16
#define NVM_NUM_DEVICE_DB_ENTRIES 16
// Mesh Configuration
#define ENABLE_MESH

View File

@ -31,7 +31,8 @@
#define HCI_INCOMING_PRE_BUFFER_SIZE 14 // sizeof benep heade, avoid memcpy
#define HCI_ACL_PAYLOAD_SIZE (1691 + 4)
#define NVM_NUM_DEVICE_DB_ENTRIES 4
#define NVM_NUM_LINK_KEYS 16
#define NVM_NUM_DEVICE_DB_ENTRIES 16
// Mesh Configuration

View File

@ -33,7 +33,8 @@
#define HCI_ACL_PAYLOAD_SIZE (1691 + 4)
#define HCI_INCOMING_PRE_BUFFER_SIZE 14 // sizeof BNEP header, avoid memcpy
#define NVM_NUM_DEVICE_DB_ENTRIES 20
#define NVM_NUM_LINK_KEYS 16
#define NVM_NUM_DEVICE_DB_ENTRIES 16
// Mesh Configuration
#define ENABLE_MESH

View File

@ -33,7 +33,8 @@
#define HCI_ACL_PAYLOAD_SIZE (1691 + 4)
#define HCI_INCOMING_PRE_BUFFER_SIZE 14 // sizeof BNEP header, avoid memcpy
#define NVM_NUM_DEVICE_DB_ENTRIES 20
#define NVM_NUM_LINK_KEYS 16
#define NVM_NUM_DEVICE_DB_ENTRIES 16
// Mesh Configuration
#define ENABLE_MESH

View File

@ -34,7 +34,8 @@
#define HCI_INCOMING_PRE_BUFFER_SIZE 14 // sizeof benep heade, avoid memcpy
#define HCI_ACL_PAYLOAD_SIZE (1691 + 4)
#define NVM_NUM_DEVICE_DB_ENTRIES 20
#define NVM_NUM_LINK_KEYS 16
#define NVM_NUM_DEVICE_DB_ENTRIES 16
// Mesh Configuration
#define ENABLE_MESH

View File

@ -44,5 +44,7 @@
#define MAX_NR_L2CAP_CHANNELS 0
#define MAX_NR_L2CAP_SERVICES 0
#define NVM_NUM_DEVICE_DB_ENTRIES 16
#endif

View File

@ -37,4 +37,6 @@
#define MAX_NR_SERVICE_RECORD_ITEMS 1
#define MAX_NR_LE_DEVICE_DB_ENTRIES 1
#define NVM_NUM_DEVICE_DB_ENTRIES 16
#endif

View File

@ -67,7 +67,7 @@
#define MAX_NR_SERVICE_RECORD_ITEMS 1
#define MAX_NR_LE_DEVICE_DB_ENTRIES 1
// Link Key DB and LE Device DB using TLV on top of Flash Sector interface
#define NVM_NUM_DEVICE_DB_ENTRIES 6
// LE Device DB using TLV
#define NVM_NUM_DEVICE_DB_ENTRIES 16
#endif

View File

@ -78,7 +78,7 @@
#define MAX_ATT_DB_SIZE 350
// Link Key DB and LE Device DB using TLV on top of Flash Sector interface
#define NVM_NUM_DEVICE_DB_ENTRIES 6
// LE Device DB using TLV
#define NVM_NUM_DEVICE_DB_ENTRIES 16
#endif

View File

@ -41,10 +41,10 @@
#define MAX_NR_SERVICE_RECORD_ITEMS 1
#define MAX_NR_LE_DEVICE_DB_ENTRIES 1
// WICED DCT used to store:
// - Num Classic Link Keys
#define NVM_NUM_LINK_KEYS 10
// - Num LE Device entries
#define NVM_NUM_LE_DEVICES 10
// TODO: only use NVM_NUM_LE_DEVICES
#define NVM_NUM_LE_DEVICES 16
#define NVM_NUM_DEVICE_DB_ENTRIES 16
#endif

View File

@ -43,10 +43,8 @@
#define MAX_NR_SERVICE_RECORD_ITEMS 1
#define MAX_NR_LE_DEVICE_DB_ENTRIES 1
// WICED DCT used to store:
// - Num Classic Link Keys
#define NVM_NUM_LINK_KEYS 10
// - Num LE Device entries
#define NVM_NUM_LE_DEVICES 10
// TODO: only use NVM_NUM_LE_DEVICES
#define NVM_NUM_LE_DEVICES 16
#define NVM_NUM_DEVICE_DB_ENTRIES 16
#endif

View File

@ -32,7 +32,8 @@
#define HCI_ACL_PAYLOAD_SIZE (1691 + 4)
#define HCI_INCOMING_PRE_BUFFER_SIZE 14 // sizeof BNEP header, avoid memcpy
#define NVM_NUM_DEVICE_DB_ENTRIES 20
#define NVM_NUM_LINK_KEYS 16
#define NVM_NUM_DEVICE_DB_ENTRIES 16
// Mesh Configuration
#define ENABLE_MESH

View File

@ -32,7 +32,8 @@
#define HCI_ACL_PAYLOAD_SIZE (1691 + 4)
#define HCI_INCOMING_PRE_BUFFER_SIZE 14 // sizeof BNEP header, avoid memcpy
#define NVM_NUM_DEVICE_DB_ENTRIES 20
#define NVM_NUM_LINK_KEYS 16
#define NVM_NUM_DEVICE_DB_ENTRIES 16
// Mesh Configuration
#define ENABLE_MESH

View File

@ -32,7 +32,8 @@
#define HCI_ACL_PAYLOAD_SIZE (1691 + 4)
#define HCI_INCOMING_PRE_BUFFER_SIZE 14 // sizeof BNEP header, avoid memcpy
#define NVM_NUM_DEVICE_DB_ENTRIES 20
#define NVM_NUM_LINK_KEYS 16
#define NVM_NUM_DEVICE_DB_ENTRIES 16
// Mesh Configuration
#define ENABLE_MESH

View File

@ -48,7 +48,7 @@
// NVM_NUM_LINK_KEYS defines number of stored link keys
#ifndef NVM_NUM_LINK_KEYS
#define NVM_NUM_LINK_KEYS 1
#error "Please set NVM_NUM_LINK_KEYS in btstack_config.h - number of link keys that can be stored in TLV"
#endif
typedef struct {