michaelh/zephyr
1
0
Fork 0
Code Releases Activity

subsys: bluetooth: Add notification TX complete callback

Browse source 
This changed added notification complete callback which
gives information if a given notification has been sent.

Signed-off-by: Kamil Gawor <Kamil.Gawor@nordicsemi.no>
This commit is contained in:
Kamil Gawor 2018-09-12 09:58:43 +02:00 • committed by Carles Cufí
commit 8853cb3d06
2 changed files with 40 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

29
include/bluetooth/gatt.h
View file

@ -679,6 +679,28 @@ ssize_t bt_gatt_attr_read_cpf(struct bt_conn *conn,
.user_data = _value, \
}
/** @brief Notification complete result callback.
*
* @param conn Connection object.
*/
typedef void (*bt_gatt_notify_complete_func_t) (struct bt_conn *conn);
/** @brief Notify attribute value change with callback.
*
* This function works in the same way as @ref bt_gatt_notify.
* With the addition that after sending the notification the
* callback function will be called.
*
* @param conn Connection object.
* @param attr Characteristic or Characteristic Value attribute.
* @param data Pointer to Attribute data.
* @param len Attribute value length.
* @param func Notification value callback.
*/
int bt_gatt_notify_cb(struct bt_conn *conn, const struct bt_gatt_attr *attr,
const void *data, u16_t len,
bt_gatt_notify_complete_func_t func);
/** @brief Notify attribute value change.
*
* Send notification of attribute value change, if connection is NULL notify
@ -696,8 +718,11 @@ ssize_t bt_gatt_attr_read_cpf(struct bt_conn *conn,
* @param data Pointer to Attribute data.
* @param len Attribute value length.
*/
int bt_gatt_notify(struct bt_conn *conn, const struct bt_gatt_attr *attr,
const void *data, u16_t len);
static inline int bt_gatt_notify(struct bt_conn *conn, const struct bt_gatt_attr *attr,
const void *data, u16_t len)
{
return bt_gatt_notify_cb(conn, attr, data, len, NULL);
}
/** @typedef bt_gatt_indicate_func_t
* @brief Indication complete result callback.

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

@ -682,13 +682,14 @@ struct notify_data {
int err;
u16_t type;
const struct bt_gatt_attr *attr;
bt_gatt_notify_complete_func_t func;
const void *data;
u16_t len;
struct bt_gatt_indicate_params *params;
};
static int gatt_notify(struct bt_conn *conn, u16_t handle, const void *data,
size_t len)
size_t len, bt_gatt_notify_complete_func_t cb)
{
struct net_buf *buf;
struct bt_att_notify *nfy;
@ -707,7 +708,7 @@ static int gatt_notify(struct bt_conn *conn, u16_t handle, const void *data,
net_buf_add(buf, len);
memcpy(nfy->value, data, len);
bt_l2cap_send(conn, BT_L2CAP_CID_ATT, buf);
bt_l2cap_send_cb(conn, BT_L2CAP_CID_ATT, buf, cb);
return 0;
}
@ -866,7 +867,8 @@ static u8_t notify_cb(const struct bt_gatt_attr *attr, void *user_data)
err = gatt_indicate(conn, data->params);
} else {
err = gatt_notify(conn, data->attr->handle,
data->data, data->len);
data->data, data->len,
data->func);
}
bt_conn_unref(conn);
@ -881,12 +883,14 @@ static u8_t notify_cb(const struct bt_gatt_attr *attr, void *user_data)
return BT_GATT_ITER_CONTINUE;
}
int bt_gatt_notify(struct bt_conn *conn, const struct bt_gatt_attr *attr,
const void *data, u16_t len)
int bt_gatt_notify_cb(struct bt_conn *conn, const struct bt_gatt_attr *attr,
const void *data, u16_t len,
bt_gatt_notify_complete_func_t func)
{
struct notify_data nfy;
__ASSERT(attr && attr->handle, "invalid parameters\n");
__ASSERT(attr && attr->handle,
"invalid parameters\n");
/* Check if attribute is a characteristic then adjust the handle */
if (!bt_uuid_cmp(attr->uuid, BT_UUID_GATT_CHRC)) {
@ -900,11 +904,13 @@ int bt_gatt_notify(struct bt_conn *conn, const struct bt_gatt_attr *attr,
}
if (conn) {
return gatt_notify(conn, attr->handle, data, len);
return gatt_notify(conn, attr->handle, data,
len, func);
}
nfy.err = -ENOTCONN;
nfy.attr = attr;
nfy.func = func;
nfy.type = BT_GATT_CCC_NOTIFY;
nfy.data = data;
nfy.len = len;