michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: Add wl bit in resolving list

Browse source 
In order for some of the required checks in the ISR to be performed, we
need to keep track of which of the items in the resolving list are in
the whitelist as well. Track them using a single bit in the resolving
list entries.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
This commit is contained in:
Carles Cufi 2017-06-26 16:57:12 +02:00 • committed by Johan Hedberg
commit 59ff81ca28
1 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
subsys/bluetooth/controller/ll_sw/ll_filter.c
View file

@ -51,6 +51,7 @@ static struct rl_dev {
u8_t pirk_idx:3;
u8_t lirk:1;
u8_t dev:1;
u8_t wl:1;
u8_t id_addr_type:1;
bt_addr_t id_addr;
@ -113,7 +114,12 @@ static u32_t wl_peers_add(bt_addr_le_t *id_addr)
bt_addr_copy(&wl_peers[i].id_addr, &id_addr->a);
/* Get index to Resolving List if applicable */
j = ll_rl_find(id_addr->type, id_addr->a.val);
wl_peers[i].rl_idx = j >= 0 ? j : IDX_NONE;
if (j >= 0) {
wl_peers[i].rl_idx = j;
rl[j].wl = 1;
} else {
wl_peers[i].rl_idx = IDX_NONE;
}
wl_peers[i].taken = 1;
return 0;
}
@ -128,6 +134,10 @@ static u32_t wl_peers_remove(bt_addr_le_t *id_addr)
int i = wl_peers_find(id_addr->type, id_addr->a.val);
if (i >= 0) {
int j = wl_peers[i].rl_idx;
if (j != IDX_NONE) {
rl[j].wl = 0;
}
wl_peers[i].taken = 0;
return 0;
}
@ -569,6 +579,9 @@ u32_t ll_rl_add(bt_addr_le_t *id_addr, const u8_t pirk[16],
j = wl_peers_find(id_addr->type, id_addr->a.val);
if (j >= 0) {
wl_peers[j].rl_idx = i;
rl[i].wl = 1;
} else {
rl[i].wl = 0;
}
rl[i].taken = 1;