mirror of
https://github.com/bluekitchen/btstack.git
synced 2025-02-19 15:40:52 +00:00
extracted method get_item(bt_addr_t*)
This commit is contained in:
parent
461809d6c5
commit
8ab76fbca2
@ -48,28 +48,54 @@ static void db_open(void){
|
|||||||
static void db_close(void){
|
static void db_close(void){
|
||||||
}
|
}
|
||||||
|
|
||||||
static int get_link_key(bd_addr_t *bd_addr, link_key_t *link_key) {
|
db_mem_device_t * _get_item(bd_addr_t *bd_addr) {
|
||||||
linked_item_t *it;
|
linked_item_t *it;
|
||||||
for (it = (linked_item_t *) db_mem_devices; it ; it = it->next){
|
for (it = (linked_item_t *) db_mem_devices; it ; it = it->next){
|
||||||
db_mem_device_t * item = (db_mem_device_t *) it;
|
db_mem_device_t * item = (db_mem_device_t *) it;
|
||||||
if (BD_ADDR_CMP(item->bd_addr, *bd_addr) == 0) {
|
if (BD_ADDR_CMP(item->bd_addr, *bd_addr) == 0) {
|
||||||
memcpy(link_key, item->link_key, LINK_KEY_LEN);
|
return item;
|
||||||
return 1;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return 0;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void put_link_key(bd_addr_t *bd_addr, link_key_t *link_key){
|
static void delete_item(bd_addr_t *bd_addr){
|
||||||
linked_item_t *it;
|
device_name_t device_name;
|
||||||
for (it = (linked_item_t *) db_mem_devices; it ; it = it->next){
|
db_mem_device_t * item = _get_item(bd_addr);
|
||||||
db_mem_device_t * item = (db_mem_device_t *) it;
|
|
||||||
if (BD_ADDR_CMP(item->bd_addr, *bd_addr) == 0) {
|
if (!item) return;
|
||||||
memcpy(item->link_key, link_key, LINK_KEY_LEN);
|
|
||||||
return;
|
linked_list_remove(&db_mem_devices, (linked_item_t *) item);
|
||||||
}
|
btstack_memory_db_mem_device_free(item);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static int get_name(bd_addr_t *bd_addr, device_name_t *device_name) {
|
||||||
|
db_mem_device_t * item = _get_item(bd_addr);
|
||||||
|
|
||||||
|
if (!item) return 0;
|
||||||
|
|
||||||
|
strncpy((char*)device_name, item->device_name, MAX_NAME_LEN);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int get_link_key(bd_addr_t *bd_addr, link_key_t *link_key) {
|
||||||
|
db_mem_device_t * item = _get_item(bd_addr);
|
||||||
|
|
||||||
|
if (!item) return 0;
|
||||||
|
|
||||||
|
memcpy(link_key, item->link_key, LINK_KEY_LEN);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void delete_link_key(bd_addr_t *bd_addr){
|
||||||
|
delete_item(bd_addr);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void put_link_key(bd_addr_t *bd_addr, link_key_t *link_key){
|
||||||
|
if ( get_link_key(bd_addr, link_key) ) return;
|
||||||
|
|
||||||
// Record not found, create new one for this device
|
// Record not found, create new one for this device
|
||||||
db_mem_device_t * newItem = btstack_memory_db_mem_device_get();
|
db_mem_device_t * newItem = btstack_memory_db_mem_device_get();
|
||||||
|
|
||||||
@ -81,30 +107,13 @@ static void put_link_key(bd_addr_t *bd_addr, link_key_t *link_key){
|
|||||||
linked_list_add(&db_mem_devices, (linked_item_t *) newItem);
|
linked_list_add(&db_mem_devices, (linked_item_t *) newItem);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void delete_link_key(bd_addr_t *bd_addr){
|
static void delete_name(bd_addr_t *bd_addr){
|
||||||
linked_item_t *it;
|
delete_item(bd_addr);
|
||||||
for (it = (linked_item_t *) db_mem_devices; it ; it = it->next){
|
|
||||||
db_mem_device_t * item = (db_mem_device_t *) it;
|
|
||||||
if (BD_ADDR_CMP(item->bd_addr, *bd_addr) == 0) {
|
|
||||||
// Found record, delete it
|
|
||||||
linked_list_remove(&db_mem_devices, (linked_item_t *) item);
|
|
||||||
btstack_memory_db_mem_device_free(item);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void put_name(bd_addr_t *bd_addr, device_name_t *device_name){
|
static void put_name(bd_addr_t *bd_addr, device_name_t *device_name){
|
||||||
linked_item_t *it;
|
if (get_name(bd_addr, device_name)) return;
|
||||||
for (it = (linked_item_t *) db_mem_devices; it ; it = it->next){
|
|
||||||
db_mem_device_t * item = (db_mem_device_t *) it;
|
|
||||||
if (BD_ADDR_CMP(item->bd_addr, *bd_addr) == 0) {
|
|
||||||
// Found record, ammend it
|
|
||||||
strncpy(item->device_name, (const char*) device_name, MAX_NAME_LEN);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Record not found, create a new one for this device
|
// Record not found, create a new one for this device
|
||||||
db_mem_device_t * newItem = btstack_memory_db_mem_device_get();
|
db_mem_device_t * newItem = btstack_memory_db_mem_device_get();
|
||||||
|
|
||||||
@ -113,34 +122,9 @@ static void put_name(bd_addr_t *bd_addr, device_name_t *device_name){
|
|||||||
memcpy(newItem->bd_addr, bd_addr, sizeof(bd_addr_t));
|
memcpy(newItem->bd_addr, bd_addr, sizeof(bd_addr_t));
|
||||||
strncpy(newItem->device_name, (const char*) device_name, MAX_NAME_LEN);
|
strncpy(newItem->device_name, (const char*) device_name, MAX_NAME_LEN);
|
||||||
memset(newItem->link_key, 0, LINK_KEY_LEN);
|
memset(newItem->link_key, 0, LINK_KEY_LEN);
|
||||||
|
|
||||||
linked_list_add(&db_mem_devices, (linked_item_t *) newItem);
|
linked_list_add(&db_mem_devices, (linked_item_t *) newItem);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void delete_name(bd_addr_t *bd_addr){
|
|
||||||
linked_item_t *it;
|
|
||||||
for (it = (linked_item_t *) db_mem_devices; it ; it = it->next){
|
|
||||||
db_mem_device_t * item = (db_mem_device_t *) it;
|
|
||||||
if (BD_ADDR_CMP(item->bd_addr, *bd_addr) == 0) {
|
|
||||||
// Found record, delete it
|
|
||||||
linked_list_remove(&db_mem_devices, (linked_item_t *) item);
|
|
||||||
btstack_memory_db_mem_device_free(item);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static int get_name(bd_addr_t *bd_addr, device_name_t *device_name) {
|
|
||||||
linked_item_t *it;
|
|
||||||
for (it = (linked_item_t *) db_mem_devices; it ; it = it->next){
|
|
||||||
db_mem_device_t * item = (db_mem_device_t *) it;
|
|
||||||
if (BD_ADDR_CMP(item->bd_addr, *bd_addr) == 0) {
|
|
||||||
strncpy((char*)device_name, item->device_name, MAX_NAME_LEN);
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
// MARK: PERSISTENT RFCOMM CHANNEL ALLOCATION
|
// MARK: PERSISTENT RFCOMM CHANNEL ALLOCATION
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user