michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Split implicit (background) and explicit scan functions

Browse source 
For background/implicit/reconnection scanning we have fixed internal
parameters that we want to use. For explicit scanning on the other
hand the parameters come from the application. It makes therefore
sense to split the functions responsible for starting each scanning
type.

Change-Id: I0e89a1ce89aca61870f789c7f1e5ad81f97cd00e
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Johan Hedberg 2015-12-03 20:05:42 +02:00 • committed by Anas Nashif
commit 8b5bb4dbf9
1 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

24
net/bluetooth/hci_core.c
View file

@ -1176,7 +1176,6 @@ static int bt_hci_start_scanning(uint8_t scan_type)
return err;
}
/* Used to determine whether to start scan and which scan type should be used */
int bt_le_scan_update(void)
{
if (atomic_test_bit(bt_dev.flags, BT_DEV_SCANNING)) {
@ -1208,7 +1207,7 @@ int bt_le_scan_update(void)
}
#endif /* CONFIG_BLUETOOTH_CONN */
return bt_hci_start_scanning(BT_HCI_LE_SCAN_ACTIVE);
return 0;
}
static void le_adv_report(struct net_buf *buf)
@ -2075,17 +2074,34 @@ int bt_le_adv_stop(void)
int bt_le_scan_start(const struct bt_le_scan_param *param, bt_le_scan_cb_t cb)
{
int err;
/* Return if active scan is already enabled */
if (atomic_test_and_set_bit(bt_dev.flags, BT_DEV_EXPLICIT_SCAN)) {
return -EALREADY;
}
scan_dev_found_cb = cb;
if (!param->filter_dup) {
atomic_clear_bit(bt_dev.flags, BT_DEV_SCAN_FILTER_DUP);
}
return bt_le_scan_update();
if (atomic_test_bit(bt_dev.flags, BT_DEV_SCANNING)) {
err = bt_hci_stop_scanning();
if (err) {
atomic_clear_bit(bt_dev.flags, BT_DEV_EXPLICIT_SCAN);
return err;
}
}
err = bt_hci_start_scanning(BT_HCI_LE_SCAN_ACTIVE);
if (err) {
atomic_clear_bit(bt_dev.flags, BT_DEV_EXPLICIT_SCAN);
return err;
}
scan_dev_found_cb = cb;
return 0;
}
int bt_le_scan_stop(void)