michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Mesh: Model start callback

Browse source 
Replaces the Mesh model settings_commit callback with a start callback,
indicating that the mesh model behavior is ready to start. Everything
that was previously done in the settings_commit callback may be moved to
this callback, which gets called just after mesh settings are committed,
instead of in the middle of the process.

This resolves an issue where models had no context in which to start
their behavior, as the previous settings_commit call fired before the
mesh was declared valid, making access APIs inaccessible.

Signed-off-by: Trond Einar Snekvik <Trond.Einar.Snekvik@nordicsemi.no>
This commit is contained in:
Trond Einar Snekvik 2019-12-20 12:18:14 +01:00 • committed by Johan Hedberg
commit 723e14a432
4 changed files with 27 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
include/bluetooth/mesh/access.h
View file

@ -467,18 +467,19 @@ struct bt_mesh_model_cb {
size_t len_rd, settings_read_cb read_cb,
void *cb_arg);
/** @brief Callback called when all settings have been loaded.
/** @brief Callback called when the mesh is started.
*
* This handler gets called after the settings have been loaded in
* full.
* This handler gets called after the node has been provisioned, or
* after all mesh data has been loaded from persistent storage.
*
* @sa settings_handler::h_commit
* When this callback fires, the mesh model may start its behavior,
* and all Access APIs are ready for use.
*
* @param model Model this callback belongs to.
* @param model Model this callback belongs to.
*
* @return 0 on success, error otherwise.
*/
int (*const settings_commit)(struct bt_mesh_model *model);
int (*const start)(struct bt_mesh_model *model);
/** @brief Model init callback.
*

18
subsys/bluetooth/mesh/main.c
View file

@ -83,7 +83,7 @@ int bt_mesh_provision(const u8_t net_key[16], u16_t net_idx,
bt_mesh_store_iv(false);
}
bt_mesh_net_start();
bt_mesh_start();
return 0;
}
@ -326,3 +326,19 @@ int bt_mesh_init(const struct bt_mesh_prov *prov,
return 0;
}
static void model_start(struct bt_mesh_model *mod, struct bt_mesh_elem *elem,
bool vnd, bool primary, void *user_data)
{
if (mod->cb && mod->cb->start) {
mod->cb->start(mod);
}
}
int bt_mesh_start(void)
{
bt_mesh_net_start();
bt_mesh_model_foreach(model_start, NULL);
return 0;
}

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

@ -15,3 +15,5 @@
#define BT_MESH_ADDR_IS_RFU(addr) ((addr) >= 0xff00 && (addr) <= 0xfffb)
struct bt_mesh_net;
int bt_mesh_start(void);

6
subsys/bluetooth/mesh/settings.c
View file

@ -899,10 +899,6 @@ static void commit_mod(struct bt_mesh_model *mod, struct bt_mesh_elem *elem,
k_delayed_work_submit(&mod->pub->timer, ms);
}
}
if (mod->cb && mod->cb->settings_commit) {
mod->cb->settings_commit(mod);
}
}
static int mesh_commit(void)
@ -962,7 +958,7 @@ static int mesh_commit(void)
atomic_set_bit(bt_mesh.flags, BT_MESH_VALID);
bt_mesh_net_start();
bt_mesh_start();
return 0;
}