michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: host: Remove deprecated scan filter duplicate params

Browse source 
Remove the deprecated scan filter duplicate enum values and parameter.
This was deprecated for the 2.3.0 release.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
This commit is contained in:
Joakim Andersson 2021-01-20 16:05:03 +01:00 • committed by Anas Nashif
commit a0d62f03a0
3 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
doc/releases/release-notes-2.5.rst
View file

@ -93,6 +93,15 @@ Deprecated in this release
Removed APIs in this release Removed APIs in this release
============================ ============================
* Bluetooth
* The deprecated BT_LE_SCAN_FILTER_DUPLICATE define has been removed,
use BT_LE_SCAN_OPT_FILTER_DUPLICATE instead.
* The deprecated BT_LE_SCAN_FILTER_WHITELIST define has been removed,
use BT_LE_SCAN_OPT_FILTER_WHITELIST instead.
* The deprecated bt_le_scan_param::filter_dup argument has been removed,
use bt_le_scan_param::options instead.
Stable API changes in this release Stable API changes in this release
================================== ==================================

14
include/bluetooth/bluetooth.h
View file

@ -1489,11 +1489,6 @@ enum {
* @note Requires @ref BT_LE_SCAN_OPT_CODED. * @note Requires @ref BT_LE_SCAN_OPT_CODED.
*/ */
BT_LE_SCAN_OPT_NO_1M = BIT(3), BT_LE_SCAN_OPT_NO_1M = BIT(3),
BT_LE_SCAN_FILTER_DUPLICATE __deprecated =
BT_LE_SCAN_OPT_FILTER_DUPLICATE,
BT_LE_SCAN_FILTER_WHITELIST __deprecated =
BT_LE_SCAN_OPT_FILTER_WHITELIST,
}; };
enum { enum {
@ -1509,13 +1504,8 @@ struct bt_le_scan_param {
/** Scan type (BT_LE_SCAN_TYPE_ACTIVE or BT_LE_SCAN_TYPE_PASSIVE) */ /** Scan type (BT_LE_SCAN_TYPE_ACTIVE or BT_LE_SCAN_TYPE_PASSIVE) */
uint8_t type; uint8_t type;
union { /** Bit-field of scanning options. */
/** Bit-field of scanning filter options. */ uint32_t options;
uint32_t filter_dup __deprecated;
/** Bit-field of scanning options. */
uint32_t options;
};
/** Scan interval (N * 0.625 ms) */ /** Scan interval (N * 0.625 ms) */
uint16_t interval; uint16_t interval;

2
samples/bluetooth/central_ht/src/main.c
View file

@ -228,7 +228,7 @@ static int scan_start(void)
*/ */
struct bt_le_scan_param scan_param = { struct bt_le_scan_param scan_param = {
.type = BT_LE_SCAN_TYPE_ACTIVE, .type = BT_LE_SCAN_TYPE_ACTIVE,
.filter_dup = BT_LE_SCAN_OPT_FILTER_DUPLICATE, .options = BT_LE_SCAN_OPT_FILTER_DUPLICATE,
.interval = BT_GAP_SCAN_FAST_INTERVAL, .interval = BT_GAP_SCAN_FAST_INTERVAL,
.window = BT_GAP_SCAN_FAST_WINDOW, .window = BT_GAP_SCAN_FAST_WINDOW,
}; };