michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Rename BT_LE_ADV_ADDR_PUBLIC to BT_LE_ADV_ADDR_IDENTITY

Browse source 
In anticipation of supporting a local static random address in the
future it makes more sense to call BT_LE_ADV_ADDR_PUBLIC
BT_LE_ADV_ADDR_IDENTITY.

Change-Id: I4826f1dfb50b54e13a35cbe7ee74e28641c81ad1
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Johan Hedberg 2016-02-01 18:15:52 +02:00 • committed by Anas Nashif
commit 479d25d035
4 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/nble/gap.c
View file

@ -146,7 +146,7 @@ static bool valid_adv_param(const struct bt_le_adv_param *param)
}
switch (param->addr_type) {
case BT_LE_ADV_ADDR_PUBLIC:
case BT_LE_ADV_ADDR_IDENTITY:
case BT_LE_ADV_ADDR_NRPA:
break;
default:

9
include/bluetooth/bluetooth.h
View file

@ -90,8 +90,11 @@ struct bt_data {
/** Local advertising address type */
enum {
/** Use local public address for advertising */
BT_LE_ADV_ADDR_PUBLIC,
/** Use local identity address for advertising. Unless a static
* random address has been configured this will be the public
* address.
*/
BT_LE_ADV_ADDR_IDENTITY,
/** Use local Non-resolvable Private Address (NRPA) for advertising */
BT_LE_ADV_ADDR_NRPA,
@ -127,7 +130,7 @@ struct bt_le_adv_param {
.interval_max = (_int_max), \
})
#define BT_LE_ADV(t) BT_LE_ADV_PARAM(t, BT_LE_ADV_ADDR_PUBLIC, \
#define BT_LE_ADV(t) BT_LE_ADV_PARAM(t, BT_LE_ADV_ADDR_IDENTITY, \
BT_GAP_ADV_FAST_INT_MIN_2, \
BT_GAP_ADV_FAST_INT_MAX_2)

2
net/bluetooth/hci_core.c
View file

@ -2302,7 +2302,7 @@ static bool valid_adv_param(const struct bt_le_adv_param *param)
}
switch (param->addr_type) {
case BT_LE_ADV_ADDR_PUBLIC:
case BT_LE_ADV_ADDR_IDENTITY:
case BT_LE_ADV_ADDR_NRPA:
break;
default:

4
samples/bluetooth/shell/src/main.c
View file

@ -575,12 +575,12 @@ static void cmd_advertise(int argc, char *argv[])
if (!strcmp(argv[1], "on")) {
param.type = BT_LE_ADV_IND;
param.addr_type = BT_LE_ADV_ADDR_PUBLIC;
param.addr_type = BT_LE_ADV_ADDR_IDENTITY;
scan_rsp = sd;
scan_rsp_len = ARRAY_SIZE(sd);
} else if (!strcmp(argv[1], "scan")) {
param.type = BT_LE_ADV_SCAN_IND;
param.addr_type = BT_LE_ADV_ADDR_PUBLIC;
param.addr_type = BT_LE_ADV_ADDR_IDENTITY;
scan_rsp = sd;
scan_rsp_len = ARRAY_SIZE(sd);
} else if (!strcmp(argv[1], "nconn")) {