michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Create dedicated flag for explicit scanning

Browse source 
Change-Id: I0d7548c755a277e7741cf0b3a1b97e127ea1d382
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Johan Hedberg 2015-12-03 19:41:42 +02:00 • committed by Anas Nashif
commit 6df50d474e
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
net/bluetooth/hci_core.c
View file

@ -1177,7 +1177,7 @@ int bt_le_scan_update(void)
if (atomic_test_bit(bt_dev.flags, BT_DEV_SCANNING)) {
int err;
if (scan_dev_found_cb) {
if (atomic_test_bit(bt_dev.flags, BT_DEV_EXPLICIT_SCAN)) {
return 0;
}
@ -1188,7 +1188,7 @@ int bt_le_scan_update(void)
}
#if defined(CONFIG_BLUETOOTH_CONN)
if (!scan_dev_found_cb) {
if (!atomic_test_bit(bt_dev.flags, BT_DEV_EXPLICIT_SCAN)) {
struct bt_conn *conn;
conn = bt_conn_lookup_state(BT_ADDR_LE_ANY,
@ -2071,7 +2071,7 @@ int bt_le_adv_stop(void)
int bt_le_scan_start(const struct bt_le_scan_param *param, bt_le_scan_cb_t cb)
{
/* Return if active scan is already enabled */
if (scan_dev_found_cb) {
if (atomic_test_and_set_bit(bt_dev.flags, BT_DEV_EXPLICIT_SCAN)) {
return -EALREADY;
}
@ -2086,7 +2086,7 @@ int bt_le_scan_start(const struct bt_le_scan_param *param, bt_le_scan_cb_t cb)
int bt_le_scan_stop(void)
{
/* Return if active scanning is already disabled */
if (!scan_dev_found_cb) {
if (!atomic_test_and_clear_bit(bt_dev.flags, BT_DEV_EXPLICIT_SCAN)) {
return -EALREADY;
}

1
net/bluetooth/hci_core.h
View file

@ -43,6 +43,7 @@ enum {
BT_DEV_ADVERTISING,
BT_DEV_SCANNING,
BT_DEV_SCAN_FILTER_DUP,
BT_DEV_EXPLICIT_SCAN,
#if defined(CONFIG_BLUETOOTH_BREDR)
BT_DEV_ISCAN,