michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Mesh: Add error code for bt_mesh_adv_terminate

Browse source 
Return error code to let an implementation know if the adv was actually
stopped (was scheduled) or not.

Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
This commit is contained in:
Pavel Vasilyev 2024-01-22 14:49:19 +01:00 • committed by Henrik Brix Andersen
commit fcfc99a21d
3 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
subsys/bluetooth/mesh/adv.h
View file

@ -101,7 +101,7 @@ void bt_mesh_adv_local_ready(void);
void bt_mesh_adv_relay_ready(void);
void bt_mesh_adv_terminate(struct bt_mesh_adv *adv);
int bt_mesh_adv_terminate(struct bt_mesh_adv *adv);
void bt_mesh_adv_friend_ready(void);

10
subsys/bluetooth/mesh/adv_ext.c
View file

@ -370,7 +370,7 @@ void bt_mesh_adv_friend_ready(void)
}
}
void bt_mesh_adv_terminate(struct bt_mesh_adv *adv)
int bt_mesh_adv_terminate(struct bt_mesh_adv *adv)
{
int err;
@ -382,13 +382,13 @@ void bt_mesh_adv_terminate(struct bt_mesh_adv *adv)
}
if (!atomic_test_bit(ext_adv->flags, ADV_FLAG_ACTIVE)) {
return;
return 0;
}
err = bt_le_ext_adv_stop(ext_adv->instance);
if (err) {
LOG_ERR("Failed to stop adv %d", err);
return;
return err;
}
/* Do not call `cb:end`, since this user action */
@ -398,8 +398,10 @@ void bt_mesh_adv_terminate(struct bt_mesh_adv *adv)
k_work_submit(&ext_adv->work);
return;
return 0;
}
return -EINVAL;
}
void bt_mesh_adv_init(void)

4
subsys/bluetooth/mesh/adv_legacy.c
View file

@ -214,9 +214,11 @@ void bt_mesh_adv_gatt_update(void)
bt_mesh_adv_get_cancel();
}
void bt_mesh_adv_terminate(struct bt_mesh_adv *adv)
int bt_mesh_adv_terminate(struct bt_mesh_adv *adv)
{
ARG_UNUSED(adv);
return 0;
}
void bt_mesh_adv_init(void)