michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: GATT: Refactor gatt_sub_add to add withouth conn object

Browse source 
Refactor the gatt_sub_add function to be similar in structure to how
find_cf_cfg is implemented. This is so that a subscription can be added
without an active connection.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
This commit is contained in:
Joakim Andersson 2020-09-03 21:48:17 +02:00 • committed by Carles Cufí
commit ae5489085f
1 changed files with 16 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

43
subsys/bluetooth/host/gatt.c
View file

@ -2489,48 +2489,37 @@ static void gatt_sub_remove(struct bt_conn *conn, struct gatt_sub *sub,
}
#if defined(CONFIG_BT_GATT_CLIENT)
static struct gatt_sub *gatt_sub_find_free(struct bt_conn *conn,
struct gatt_sub **free_sub)
static struct gatt_sub *gatt_sub_find(struct bt_conn *conn)
{
int i;
if (free_sub) {
*free_sub = NULL;
}
for (i = 0; i < ARRAY_SIZE(subscriptions); i++) {
for (int i = 0; i < ARRAY_SIZE(subscriptions); i++) {
struct gatt_sub *sub = &subscriptions[i];
if (bt_conn_is_peer_addr_le(conn, sub->id, &sub->peer)) {
if (!conn) {
if (!bt_addr_le_cmp(&sub->peer, BT_ADDR_LE_ANY)) {
return sub;
}
} else if (bt_conn_is_peer_addr_le(conn, sub->id, &sub->peer)) {
return sub;
} else if (free_sub &&
!bt_addr_le_cmp(BT_ADDR_LE_ANY, &sub->peer)) {
*free_sub = sub;
}
}
return NULL;
}
#define gatt_sub_find(_conn) \
gatt_sub_find_free(_conn, NULL)
static struct gatt_sub *gatt_sub_add(struct bt_conn *conn)
{
struct gatt_sub *sub, *free_sub;
struct gatt_sub *sub;
sub = gatt_sub_find_free(conn, &free_sub);
if (sub) {
return sub;
sub = gatt_sub_find(conn);
if (!sub) {
sub = gatt_sub_find(NULL);
if (sub) {
bt_addr_le_copy(&sub->peer, &conn->le.dst);
sub->id = conn->id;
}
}
if (free_sub) {
bt_addr_le_copy(&free_sub->peer, &conn->le.dst);
free_sub->id = conn->id;
return free_sub;
}
return NULL;
return sub;
}
void bt_gatt_notification(struct bt_conn *conn, uint16_t handle,