michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Mesh: Enable CDP1 by default

Browse source 
CDP1 is mandatory to qualify a mesh device for mesh protocol v1.1.
The dependency on BT_MESH_MODEL_EXTENSIONS is removed because if a node
contains only base models (for example Generic OnOff Server), this API
will consume extra RAM bytes which won't be used.

Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
This commit is contained in:
Pavel Vasilyev 2024-02-19 11:26:12 +01:00 • committed by Anas Nashif
commit e30b7a84bc
2 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
subsys/bluetooth/mesh/Kconfig
View file

@ -712,7 +712,7 @@ config BT_MESH_MODEL_EXTENSIONS
config BT_MESH_COMP_PAGE_1 config BT_MESH_COMP_PAGE_1
bool "Support for Composition Data Page 1" bool "Support for Composition Data Page 1"
depends on BT_MESH_MODEL_EXTENSIONS default y
help help
Enable support for Composition Data Page 1. Enable support for Composition Data Page 1.
@ -720,6 +720,7 @@ config BT_MESH_MODEL_EXTENSION_LIST_SIZE
int "Model extensions list size" int "Model extensions list size"
depends on BT_MESH_COMP_PAGE_1 depends on BT_MESH_COMP_PAGE_1
range 0 255 range 0 255
default 0 if !BT_MESH_MODEL_EXTENSIONS
default 10 default 10
help help
This option specifies how many models relations can be saved. This option specifies how many models relations can be saved.

14
subsys/bluetooth/mesh/access.c
View file

@ -1066,13 +1066,13 @@ int bt_mesh_comp_register(const struct bt_mesh_comp *comp)
err = 0; err = 0;
if (IS_ENABLED(CONFIG_BT_MESH_COMP_PAGE_1)) { if (MOD_REL_LIST_SIZE > 0) {
memset(mod_rel_list, 0, sizeof(mod_rel_list)); memset(mod_rel_list, 0, sizeof(mod_rel_list));
} }
bt_mesh_model_foreach(mod_init, &err); bt_mesh_model_foreach(mod_init, &err);
if (IS_ENABLED(CONFIG_BT_MESH_COMP_PAGE_1)) { if (MOD_REL_LIST_SIZE > 0) {
int i; int i;
MOD_REL_LIST_FOR_EACH(i) { MOD_REL_LIST_FOR_EACH(i) {
@ -1744,7 +1744,8 @@ static int mod_rel_register(const struct bt_mesh_model *base,
return 0; return 0;
} }
} }
LOG_ERR("Failed to extend");
LOG_ERR("CONFIG_BT_MESH_MODEL_EXTENSION_LIST_SIZE is too small");
return -ENOMEM; return -ENOMEM;
} }
@ -1784,8 +1785,11 @@ int bt_mesh_model_extend(const struct bt_mesh_model *extending_mod,
} }
register_extension: register_extension:
if (IS_ENABLED(CONFIG_BT_MESH_COMP_PAGE_1)) { if (MOD_REL_LIST_SIZE > 0) {
return mod_rel_register(base_mod, extending_mod, RELATION_TYPE_EXT); return mod_rel_register(base_mod, extending_mod, RELATION_TYPE_EXT);
} else if (IS_ENABLED(CONFIG_BT_MESH_COMP_PAGE_1)) {
LOG_ERR("CONFIG_BT_MESH_MODEL_EXTENSION_LIST_SIZE is too small");
return -ENOMEM;
} }
return 0; return 0;
@ -1797,7 +1801,7 @@ int bt_mesh_model_correspond(const struct bt_mesh_model *corresponding_mod,
int i, err; int i, err;
uint8_t cor_id = 0; uint8_t cor_id = 0;
if (!IS_ENABLED(CONFIG_BT_MESH_COMP_PAGE_1)) { if (MOD_REL_LIST_SIZE == 0) {
return -ENOTSUP; return -ENOTSUP;
} }