michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Mesh: Add Model Subscription Del & Overwrite support

Browse source 
The Del and Overwrite operations have the exact same parameters and
expected status response as the Add operation, so we can reuse most of
the code.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Johan Hedberg 2017-11-18 11:52:21 +02:00 • committed by Johan Hedberg
commit 324336167e
2 changed files with 59 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
include/bluetooth/mesh/cfg_cli.h
View file

@ -101,6 +101,20 @@ int bt_mesh_cfg_mod_sub_add_vnd(u16_t net_idx, u16_t addr, u16_t elem_addr,
u16_t sub_addr, u16_t mod_id, u16_t cid,
u8_t *status);
int bt_mesh_cfg_mod_sub_del(u16_t net_idx, u16_t addr, u16_t elem_addr,
u16_t sub_addr, u16_t mod_id, u8_t *status);
int bt_mesh_cfg_mod_sub_del_vnd(u16_t net_idx, u16_t addr, u16_t elem_addr,
u16_t sub_addr, u16_t mod_id, u16_t cid,
u8_t *status);
int bt_mesh_cfg_mod_sub_overwrite(u16_t net_idx, u16_t addr, u16_t elem_addr,
u16_t sub_addr, u16_t mod_id, u8_t *status);
int bt_mesh_cfg_mod_sub_overwrite_vnd(u16_t net_idx, u16_t addr,
u16_t elem_addr, u16_t sub_addr,
u16_t mod_id, u16_t cid, u8_t *status);
struct bt_mesh_cfg_hb_sub {
u16_t src;
u16_t dst;

52
subsys/bluetooth/host/mesh/cfg_cli.c
View file

@ -816,8 +816,8 @@ int bt_mesh_cfg_mod_app_bind_vnd(u16_t net_idx, u16_t addr, u16_t elem_addr,
status);
}
static int mod_sub_add(u16_t net_idx, u16_t addr, u16_t elem_addr,
u16_t sub_addr, u16_t mod_id, u16_t cid, u8_t *status)
static int mod_sub(u32_t op, u16_t net_idx, u16_t addr, u16_t elem_addr,
u16_t sub_addr, u16_t mod_id, u16_t cid, u8_t *status)
{
struct net_buf_simple *msg = NET_BUF_SIMPLE(2 + 8 + 4);
struct bt_mesh_msg_ctx ctx = {
@ -840,7 +840,7 @@ static int mod_sub_add(u16_t net_idx, u16_t addr, u16_t elem_addr,
return err;
}
bt_mesh_model_msg_init(msg, OP_MOD_SUB_ADD);
bt_mesh_model_msg_init(msg, op);
net_buf_simple_add_le16(msg, elem_addr);
net_buf_simple_add_le16(msg, sub_addr);
@ -874,8 +874,8 @@ static int mod_sub_add(u16_t net_idx, u16_t addr, u16_t elem_addr,
int bt_mesh_cfg_mod_sub_add(u16_t net_idx, u16_t addr, u16_t elem_addr,
u16_t sub_addr, u16_t mod_id, u8_t *status)
{
return mod_sub_add(net_idx, addr, elem_addr, sub_addr, mod_id,
CID_NVAL, status);
return mod_sub(OP_MOD_SUB_ADD, net_idx, addr, elem_addr, sub_addr,
mod_id, CID_NVAL, status);
}
int bt_mesh_cfg_mod_sub_add_vnd(u16_t net_idx, u16_t addr, u16_t elem_addr,
@ -886,8 +886,46 @@ int bt_mesh_cfg_mod_sub_add_vnd(u16_t net_idx, u16_t addr, u16_t elem_addr,
return -EINVAL;
}
return mod_sub_add(net_idx, addr, elem_addr, sub_addr, mod_id, cid,
status);
return mod_sub(OP_MOD_SUB_ADD, net_idx, addr, elem_addr, sub_addr,
mod_id, cid, status);
}
int bt_mesh_cfg_mod_sub_del(u16_t net_idx, u16_t addr, u16_t elem_addr,
u16_t sub_addr, u16_t mod_id, u8_t *status)
{
return mod_sub(OP_MOD_SUB_DEL, net_idx, addr, elem_addr, sub_addr,
mod_id, CID_NVAL, status);
}
int bt_mesh_cfg_mod_sub_del_vnd(u16_t net_idx, u16_t addr, u16_t elem_addr,
u16_t sub_addr, u16_t mod_id, u16_t cid,
u8_t *status)
{
if (cid == CID_NVAL) {
return -EINVAL;
}
return mod_sub(OP_MOD_SUB_DEL, net_idx, addr, elem_addr, sub_addr,
mod_id, cid, status);
}
int bt_mesh_cfg_mod_sub_overwrite(u16_t net_idx, u16_t addr, u16_t elem_addr,
u16_t sub_addr, u16_t mod_id, u8_t *status)
{
return mod_sub(OP_MOD_SUB_OVERWRITE, net_idx, addr, elem_addr,
sub_addr, mod_id, CID_NVAL, status);
}
int bt_mesh_cfg_mod_sub_overwrite_vnd(u16_t net_idx, u16_t addr,
u16_t elem_addr, u16_t sub_addr,
u16_t mod_id, u16_t cid, u8_t *status)
{
if (cid == CID_NVAL) {
return -EINVAL;
}
return mod_sub(OP_MOD_SUB_OVERWRITE, net_idx, addr, elem_addr,
sub_addr, mod_id, cid, status);
}
static int mod_pub_get(u16_t net_idx, u16_t addr, u16_t elem_addr,