michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: host: adv: add adv_is_directed helper

Browse source 
Makes it more readable.

Signed-off-by: Jonathan Rico <jonathan.rico@nordicsemi.no>
This commit is contained in:
Jonathan Rico 2022-12-16 09:06:35 +01:00 • committed by Fabio Baltieri
commit 5f98b1bea4
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
subsys/bluetooth/host/adv.c
View file

@ -900,6 +900,14 @@ static uint8_t get_adv_channel_map(uint32_t options)
return channel_map; return channel_map;
} }
static inline bool adv_is_directed(const struct bt_le_ext_adv *adv)
{
/* The advertiser is assumed to be directed when the peer address has
* been set.
*/
return !bt_addr_le_eq(&adv->target_addr, BT_ADDR_LE_ANY);
}
static int le_adv_start_add_conn(const struct bt_le_ext_adv *adv, static int le_adv_start_add_conn(const struct bt_le_ext_adv *adv,
struct bt_conn **out_conn) struct bt_conn **out_conn)
{ {
@ -907,7 +915,7 @@ static int le_adv_start_add_conn(const struct bt_le_ext_adv *adv,
bt_dev.adv_conn_id = adv->id; bt_dev.adv_conn_id = adv->id;
if (bt_addr_le_eq(&adv->target_addr, BT_ADDR_LE_ANY)) { if (!adv_is_directed(adv)) {
/* Undirected advertising */ /* Undirected advertising */
conn = bt_conn_add_le(adv->id, BT_ADDR_LE_NONE); conn = bt_conn_add_le(adv->id, BT_ADDR_LE_NONE);
if (!conn) { if (!conn) {
@ -937,7 +945,7 @@ static void le_adv_stop_free_conn(const struct bt_le_ext_adv *adv, uint8_t statu
{ {
struct bt_conn *conn; struct bt_conn *conn;
if (bt_addr_le_eq(&adv->target_addr, BT_ADDR_LE_ANY)) { if (!adv_is_directed(adv)) {
conn = bt_conn_lookup_state_le(adv->id, BT_ADDR_LE_NONE, conn = bt_conn_lookup_state_le(adv->id, BT_ADDR_LE_NONE,
BT_CONN_CONNECTING_ADV); BT_CONN_CONNECTING_ADV);
} else { } else {