Merge branch 'develop' of https://github.com/bluekitchen/btstack into develop

This commit is contained in:
Matthias Ringwald 2017-06-22 16:04:54 +02:00
commit 7e289bee01
2 changed files with 7 additions and 3 deletions

View File

@ -134,7 +134,7 @@ static void link_key_db_put_link_key(bd_addr_t bd_addr, link_key_t link_key, lin
static void link_key_db_set_local_bd_addr(bd_addr_t bd_addr){
}
const btstack_link_key_db_t btstack_link_key_db_static = {
static const btstack_link_key_db_t btstack_link_key_db_static = {
link_key_db_init,
link_key_db_set_local_bd_addr,
link_key_db_close,

View File

@ -38,7 +38,7 @@
#include <string.h>
#include <stdlib.h>
#include "btstack_link_key_db_tlv.h"
#include "classic/btstack_link_key_db_tlv.h"
#include "btstack_debug.h"
#include "btstack_util.h"
@ -64,8 +64,12 @@ typedef struct link_key_nvm {
static btstack_link_key_db_tlv_h singleton;
static btstack_link_key_db_tlv_h * self = &singleton;
static const char tag_0 = 'B';
static const char tag_1 = 'T';
static const char tag_2 = 'L';
static uint32_t btstack_link_key_db_tag_for_index(uint8_t index){
return ('B' << 24) | ('T' << 16) | ('L' << 8) | index;
return (tag_0 << 24) | (tag_1 << 16) | (tag_2 << 8) | index;
}
// Device info