michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: host: add support for unregister scanner callback

Browse source 
This is a pairing function with bt_le_scan_cb_register()
to used for remove the scanner callback from callback list.

Signed-off-by: chao an <anchao@xiaomi.com>
This commit is contained in:
chao an 2021-01-11 14:45:54 +08:00 • committed by Johan Hedberg
commit 1027b0e4f0
2 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
include/bluetooth/bluetooth.h
View file

@ -1714,6 +1714,15 @@ int bt_le_scan_stop(void);
*/ */
void bt_le_scan_cb_register(struct bt_le_scan_cb *cb); void bt_le_scan_cb_register(struct bt_le_scan_cb *cb);
/**
* @brief Unregister scanner packet callbacks.
*
* Remove the callback structure from the list of scanner callbacks.
*
* @param cb Callback struct. Must point to memory that remains valid.
*/
void bt_le_scan_cb_unregister(struct bt_le_scan_cb *cb);
/** /**
* @brief Add device (LE) to whitelist. * @brief Add device (LE) to whitelist.
* *

14
subsys/bluetooth/host/hci_core.c
View file

@ -4301,7 +4301,7 @@ static uint8_t get_adv_props(uint8_t evt_type)
static void le_adv_recv(bt_addr_le_t *addr, struct bt_le_scan_recv_info *info, static void le_adv_recv(bt_addr_le_t *addr, struct bt_le_scan_recv_info *info,
struct net_buf *buf, uint8_t len) struct net_buf *buf, uint8_t len)
{ {
struct bt_le_scan_cb *listener; struct bt_le_scan_cb *listener, *next;
struct net_buf_simple_state state; struct net_buf_simple_state state;
bt_addr_le_t id_addr; bt_addr_le_t id_addr;
@ -4339,8 +4339,7 @@ static void le_adv_recv(bt_addr_le_t *addr, struct bt_le_scan_recv_info *info,
net_buf_simple_restore(&buf->b, &state); net_buf_simple_restore(&buf->b, &state);
} }
SYS_SLIST_FOR_EACH_CONTAINER_SAFE(&scan_cbs, listener, next, node) {
SYS_SLIST_FOR_EACH_CONTAINER(&scan_cbs, listener, node) {
if (listener->recv) { if (listener->recv) {
net_buf_simple_save(&buf->b, &state); net_buf_simple_save(&buf->b, &state);
@ -4359,7 +4358,7 @@ static void le_adv_recv(bt_addr_le_t *addr, struct bt_le_scan_recv_info *info,
#if defined(CONFIG_BT_EXT_ADV) #if defined(CONFIG_BT_EXT_ADV)
static void le_scan_timeout(struct net_buf *buf) static void le_scan_timeout(struct net_buf *buf)
{ {
struct bt_le_scan_cb *listener; struct bt_le_scan_cb *listener, *next;
atomic_clear_bit(bt_dev.flags, BT_DEV_SCANNING); atomic_clear_bit(bt_dev.flags, BT_DEV_SCANNING);
atomic_clear_bit(bt_dev.flags, BT_DEV_EXPLICIT_SCAN); atomic_clear_bit(bt_dev.flags, BT_DEV_EXPLICIT_SCAN);
@ -4371,7 +4370,7 @@ static void le_scan_timeout(struct net_buf *buf)
pending_id_keys_update(); pending_id_keys_update();
#endif #endif
SYS_SLIST_FOR_EACH_CONTAINER(&scan_cbs, listener, node) { SYS_SLIST_FOR_EACH_CONTAINER_SAFE(&scan_cbs, listener, next, node) {
if (listener->timeout) { if (listener->timeout) {
listener->timeout(); listener->timeout();
} }
@ -8996,6 +8995,11 @@ void bt_le_scan_cb_register(struct bt_le_scan_cb *cb)
{ {
sys_slist_append(&scan_cbs, &cb->node); sys_slist_append(&scan_cbs, &cb->node);
} }
void bt_le_scan_cb_unregister(struct bt_le_scan_cb *cb)
{
sys_slist_find_and_remove(&scan_cbs, &cb->node);
}
#endif /* CONFIG_BT_OBSERVER */ #endif /* CONFIG_BT_OBSERVER */
#if defined(CONFIG_BT_WHITELIST) #if defined(CONFIG_BT_WHITELIST)