michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Move GATT code to reduce number of ifdefs

Browse source 
Gather client related code togerther so it can be placed under
single blocks of ifdefs.

Change-Id: I6f2f5a06c0308b885d01fc6af300b162baec0823
Signed-off-by: Szymon Janc <ext.szymon.janc@tieto.com>
This commit is contained in:
Szymon Janc 2015-10-02 12:44:26 +02:00 • committed by Anas Nashif
commit 07805cb9a4
1 changed files with 29 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

62
net/bluetooth/gatt.c
View file

@ -424,22 +424,6 @@ void bt_gatt_connected(struct bt_conn *conn)
bt_gatt_foreach_attr(0x0001, 0xffff, connected_cb, conn); bt_gatt_foreach_attr(0x0001, 0xffff, connected_cb, conn);
} }
#if defined(CONFIG_BLUETOOTH_GATT_CLIENT)
void bt_gatt_notification(struct bt_conn *conn, uint16_t handle,
const void *data, uint16_t length)
{
struct bt_gatt_subscribe_params *params;
BT_DBG("handle 0x%04x length %u\n", handle, length);
for (params = subscriptions; params; params = params->_next) {
if (handle == params->value_handle) {
params->func(conn, 0, data, length);
}
}
}
#endif /* CONFIG_BLUETOOTH_GATT_CLIENT */
static uint8_t disconnected_cb(const struct bt_gatt_attr *attr, void *user_data) static uint8_t disconnected_cb(const struct bt_gatt_attr *attr, void *user_data)
{ {
struct bt_conn *conn = user_data; struct bt_conn *conn = user_data;
@ -486,6 +470,20 @@ static uint8_t disconnected_cb(const struct bt_gatt_attr *attr, void *user_data)
} }
#if defined(CONFIG_BLUETOOTH_GATT_CLIENT) #if defined(CONFIG_BLUETOOTH_GATT_CLIENT)
void bt_gatt_notification(struct bt_conn *conn, uint16_t handle,
const void *data, uint16_t length)
{
struct bt_gatt_subscribe_params *params;
BT_DBG("handle 0x%04x length %u\n", handle, length);
for (params = subscriptions; params; params = params->_next) {
if (handle == params->value_handle) {
params->func(conn, 0, data, length);
}
}
}
static void gatt_subscription_remove(struct bt_gatt_subscribe_params *prev, static void gatt_subscription_remove(struct bt_gatt_subscribe_params *prev,
struct bt_gatt_subscribe_params *params) struct bt_gatt_subscribe_params *params)
{ {
@ -515,24 +513,7 @@ static void remove_subscribtions(struct bt_conn *conn)
gatt_subscription_remove(prev, params); gatt_subscription_remove(prev, params);
} }
} }
#endif /* CONFIG_BLUETOOTH_GATT_CLIENT */
void bt_gatt_disconnected(struct bt_conn *conn)
{
BT_DBG("conn %p\n", conn);
bt_gatt_foreach_attr(0x0001, 0xffff, disconnected_cb, conn);
#if defined(CONFIG_BLUETOOTH_GATT_CLIENT)
/* If paired don't remove subscriptions */
if (bt_keys_find_addr(&conn->dst)) {
return;
}
remove_subscribtions(conn);
#endif /* CONFIG_BLUETOOTH_GATT_CLIENT */
}
#if defined(CONFIG_BLUETOOTH_GATT_CLIENT)
static void gatt_mtu_rsp(struct bt_conn *conn, uint8_t err, const void *pdu, static void gatt_mtu_rsp(struct bt_conn *conn, uint8_t err, const void *pdu,
uint16_t length, void *user_data) uint16_t length, void *user_data)
{ {
@ -1476,3 +1457,18 @@ int bt_gatt_read_multiple(struct bt_conn *conn, const uint16_t *handles,
return gatt_send(conn, buf, att_read_rsp, func, NULL); return gatt_send(conn, buf, att_read_rsp, func, NULL);
} }
#endif /* CONFIG_BLUETOOTH_GATT_CLIENT */ #endif /* CONFIG_BLUETOOTH_GATT_CLIENT */
void bt_gatt_disconnected(struct bt_conn *conn)
{
BT_DBG("conn %p\n", conn);
bt_gatt_foreach_attr(0x0001, 0xffff, disconnected_cb, conn);
#if defined(CONFIG_BLUETOOTH_GATT_CLIENT)
/* If paired don't remove subscriptions */
if (bt_keys_find_addr(&conn->dst)) {
return;
}
remove_subscribtions(conn);
#endif /* CONFIG_BLUETOOTH_GATT_CLIENT */
}