michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Host: Remove ifdef around sc_indicate

Browse source 
Instead, `sc_indicate` is defined as a no-op when if would previously
not be defined.

Signed-off-by: Aleksander Wasaznik <aleksander.wasaznik@nordicsemi.no>
This commit is contained in:
Aleksander Wasaznik 2023-11-15 16:16:24 +01:00 • committed by Carles Cufí
commit bf2f065876
1 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -854,9 +854,7 @@ static void db_hash_gen(void)
atomic_set_bit(gatt_sc.flags, DB_HASH_VALID); atomic_set_bit(gatt_sc.flags, DB_HASH_VALID);
} }
#if defined(CONFIG_BT_SETTINGS)
static void sc_indicate(uint16_t start, uint16_t end); static void sc_indicate(uint16_t start, uint16_t end);
#endif
static void do_db_hash(void) static void do_db_hash(void)
{ {
@ -1515,10 +1513,10 @@ void bt_gatt_init(void)
#endif /* CONFIG_BT_SETTINGS && CONFIG_BT_SMP */ #endif /* CONFIG_BT_SETTINGS && CONFIG_BT_SMP */
} }
#if defined(CONFIG_BT_GATT_DYNAMIC_DB) || \
(defined(CONFIG_BT_GATT_CACHING) && defined(CONFIG_BT_SETTINGS))
static void sc_indicate(uint16_t start, uint16_t end) static void sc_indicate(uint16_t start, uint16_t end)
{ {
#if defined(CONFIG_BT_GATT_DYNAMIC_DB) || \
(defined(CONFIG_BT_GATT_CACHING) && defined(CONFIG_BT_SETTINGS))
LOG_DBG("start 0x%04x end 0x%04x", start, end); LOG_DBG("start 0x%04x end 0x%04x", start, end);
if (!atomic_test_and_set_bit(gatt_sc.flags, SC_RANGE_CHANGED)) { if (!atomic_test_and_set_bit(gatt_sc.flags, SC_RANGE_CHANGED)) {
@ -1539,8 +1537,8 @@ submit:
/* Reschedule since the range has changed */ /* Reschedule since the range has changed */
sc_work_submit(SC_TIMEOUT); sc_work_submit(SC_TIMEOUT);
}
#endif /* BT_GATT_DYNAMIC_DB || (BT_GATT_CACHING && BT_SETTINGS) */ #endif /* BT_GATT_DYNAMIC_DB || (BT_GATT_CACHING && BT_SETTINGS) */
}
void bt_gatt_cb_register(struct bt_gatt_cb *cb) void bt_gatt_cb_register(struct bt_gatt_cb *cb)
{ {
@ -5757,14 +5755,12 @@ void bt_gatt_encrypt_change(struct bt_conn *conn)
bt_gatt_foreach_attr(0x0001, 0xffff, update_ccc, &data); bt_gatt_foreach_attr(0x0001, 0xffff, update_ccc, &data);
#if defined(CONFIG_BT_SETTINGS) && defined(CONFIG_BT_GATT_SERVICE_CHANGED)
if (!bt_gatt_change_aware(conn, false)) { if (!bt_gatt_change_aware(conn, false)) {
/* Send a Service Changed indication if the current peer is /* Send a Service Changed indication if the current peer is
* marked as change-unaware. * marked as change-unaware.
*/ */
sc_indicate(0x0001, 0xffff); sc_indicate(0x0001, 0xffff);
} }
#endif /* CONFIG_BT_SETTINGS && CONFIG_BT_GATT_SERVICE_CHANGED */
} }
bool bt_gatt_change_aware(struct bt_conn *conn, bool req) bool bt_gatt_change_aware(struct bt_conn *conn, bool req)