michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Mesh: make models metadata const

Browse source 
Commit adds const qualifier to models metadata.
Specification claims: Composition Metadata Page 0
shall not change during a term of a node on the network.

Signed-off-by: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no>
This commit is contained in:
Aleksandr Khromykh 2024-03-01 15:47:12 +01:00 • committed by Alberto Escolar
commit aa87ed5d8a
7 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
doc/releases/migration-guide-3.7.rst
View file

@ -144,6 +144,11 @@ Bluetooth
Bluetooth Mesh Bluetooth Mesh
============== ==============
* The model metadata pointer declaration of :c:struct:`bt_mesh_model` has been changed
to add ``const`` qualifiers. The data pointer of :c:struct:`bt_mesh_models_metadata_entry`
got ``const`` qualifier too. The model's metadata structure and metadata raw value
can be declared as permanent constants in the non-volatile memory. (:github:`69679`)
Bluetooth Audio Bluetooth Audio
=============== ===============

4
include/zephyr/bluetooth/mesh/access.h
View file

@ -777,7 +777,7 @@ struct bt_mesh_models_metadata_entry {
const uint16_t id; const uint16_t id;
/* Pointer to raw data */ /* Pointer to raw data */
void *data; const void * const data;
}; };
/** /**
@ -924,7 +924,7 @@ struct bt_mesh_model {
#if defined(CONFIG_BT_MESH_LARGE_COMP_DATA_SRV) || defined(__DOXYGEN__) #if defined(CONFIG_BT_MESH_LARGE_COMP_DATA_SRV) || defined(__DOXYGEN__)
/* Pointer to the array of model metadata entries. */ /* Pointer to the array of model metadata entries. */
struct bt_mesh_models_metadata_entry **metadata; const struct bt_mesh_models_metadata_entry * const * const metadata;
#endif #endif
}; };

2
include/zephyr/bluetooth/mesh/health_srv.h
View file

@ -159,7 +159,7 @@ struct bt_mesh_health_srv {
#ifdef CONFIG_BT_MESH_LARGE_COMP_DATA_SRV #ifdef CONFIG_BT_MESH_LARGE_COMP_DATA_SRV
/** Pointer to the array with Health Test Info Metadata */ /** Pointer to the array with Health Test Info Metadata */
struct bt_mesh_models_metadata_entry *metadata; const struct bt_mesh_models_metadata_entry *metadata;
#endif #endif
}; };

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

@ -174,7 +174,7 @@ static void data_buf_add_le16_offset(struct net_buf_simple *buf,
} }
} }
static void data_buf_add_mem_offset(struct net_buf_simple *buf, uint8_t *data, size_t len, static void data_buf_add_mem_offset(struct net_buf_simple *buf, const uint8_t *data, size_t len,
size_t *offset) size_t *offset)
{ {
if (*offset >= len) { if (*offset >= len) {
@ -694,13 +694,13 @@ static int bt_mesh_comp_data_get_page_2(struct net_buf_simple *buf, size_t offse
data_buf_add_u8_offset(buf, dev_comp2->record[i].version.z, &offset); data_buf_add_u8_offset(buf, dev_comp2->record[i].version.z, &offset);
data_buf_add_u8_offset(buf, dev_comp2->record[i].elem_offset_cnt, &offset); data_buf_add_u8_offset(buf, dev_comp2->record[i].elem_offset_cnt, &offset);
if (dev_comp2->record[i].elem_offset_cnt) { if (dev_comp2->record[i].elem_offset_cnt) {
data_buf_add_mem_offset(buf, (uint8_t *)dev_comp2->record[i].elem_offset, data_buf_add_mem_offset(buf, dev_comp2->record[i].elem_offset,
dev_comp2->record[i].elem_offset_cnt, &offset); dev_comp2->record[i].elem_offset_cnt, &offset);
} }
data_buf_add_le16_offset(buf, dev_comp2->record[i].data_len, &offset); data_buf_add_le16_offset(buf, dev_comp2->record[i].data_len, &offset);
if (dev_comp2->record[i].data_len) { if (dev_comp2->record[i].data_len) {
data_buf_add_mem_offset(buf, (uint8_t *)dev_comp2->record[i].data, data_buf_add_mem_offset(buf, dev_comp2->record[i].data,
dev_comp2->record[i].data_len, &offset); dev_comp2->record[i].data_len, &offset);
} }
} }

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

@ -145,12 +145,12 @@ static const struct bt_mesh_health_srv_cb health_srv_cb = {
#endif /* CONFIG_BT_MESH_SHELL_HEALTH_SRV_INSTANCE */ #endif /* CONFIG_BT_MESH_SHELL_HEALTH_SRV_INSTANCE */
#ifdef CONFIG_BT_MESH_LARGE_COMP_DATA_SRV #ifdef CONFIG_BT_MESH_LARGE_COMP_DATA_SRV
static uint8_t health_tests[] = { static const uint8_t health_tests[] = {
BT_MESH_HEALTH_TEST_INFO(COMPANY_ID_LF, 6, 0x01, 0x02, 0x03, 0x04, 0x34, 0x15), BT_MESH_HEALTH_TEST_INFO(COMPANY_ID_LF, 6, 0x01, 0x02, 0x03, 0x04, 0x34, 0x15),
BT_MESH_HEALTH_TEST_INFO(COMPANY_ID_NORDIC_SEMI, 3, 0x01, 0x02, 0x03), BT_MESH_HEALTH_TEST_INFO(COMPANY_ID_NORDIC_SEMI, 3, 0x01, 0x02, 0x03),
}; };
static struct bt_mesh_models_metadata_entry health_srv_meta[] = { static const struct bt_mesh_models_metadata_entry health_srv_meta[] = {
BT_MESH_HEALTH_TEST_INFO_METADATA(health_tests), BT_MESH_HEALTH_TEST_INFO_METADATA(health_tests),
BT_MESH_MODELS_METADATA_END, BT_MESH_MODELS_METADATA_END,
}; };

8
tests/bluetooth/tester/src/btp_mesh.c
View file

@ -691,9 +691,9 @@ static uint8_t health_tests[] = {
BT_MESH_HEALTH_TEST_INFO(COMPANY_ID_NORDIC_SEMI, 3, 0x01, 0x02, 0x03), BT_MESH_HEALTH_TEST_INFO(COMPANY_ID_NORDIC_SEMI, 3, 0x01, 0x02, 0x03),
}; };
static uint8_t zero_metadata[100]; static const uint8_t zero_metadata[100];
static struct bt_mesh_models_metadata_entry health_srv_meta[] = { static const struct bt_mesh_models_metadata_entry health_srv_meta[] = {
BT_MESH_HEALTH_TEST_INFO_METADATA(health_tests), BT_MESH_HEALTH_TEST_INFO_METADATA(health_tests),
{ {
.len = ARRAY_SIZE(zero_metadata), .len = ARRAY_SIZE(zero_metadata),
@ -703,13 +703,13 @@ static struct bt_mesh_models_metadata_entry health_srv_meta[] = {
BT_MESH_MODELS_METADATA_END, BT_MESH_MODELS_METADATA_END,
}; };
static uint8_t health_tests_alt[] = { static const uint8_t health_tests_alt[] = {
BT_MESH_HEALTH_TEST_INFO(COMPANY_ID_LF, 6, 0x11, 0x22, 0x33, 0x44, 0x55, BT_MESH_HEALTH_TEST_INFO(COMPANY_ID_LF, 6, 0x11, 0x22, 0x33, 0x44, 0x55,
0x66), 0x66),
BT_MESH_HEALTH_TEST_INFO(COMPANY_ID_NORDIC_SEMI, 3, 0x11, 0x22, 0x33), BT_MESH_HEALTH_TEST_INFO(COMPANY_ID_NORDIC_SEMI, 3, 0x11, 0x22, 0x33),
}; };
static struct bt_mesh_models_metadata_entry health_srv_meta_alt[] = { static const struct bt_mesh_models_metadata_entry health_srv_meta_alt[] = {
BT_MESH_HEALTH_TEST_INFO_METADATA(health_tests_alt), BT_MESH_HEALTH_TEST_INFO_METADATA(health_tests_alt),
{ {
.len = ARRAY_SIZE(zero_metadata), .len = ARRAY_SIZE(zero_metadata),

2
tests/bsim/bluetooth/mesh/src/test_lcd.c
View file

@ -86,7 +86,7 @@ static void test_args_parse(int argc, char *argv[])
bs_args_parse_all_cmd_line(argc, argv, args_struct); bs_args_parse_all_cmd_line(argc, argv, args_struct);
} }
static struct bt_mesh_models_metadata_entry *dummy_meta_entry[] = {}; static const struct bt_mesh_models_metadata_entry *dummy_meta_entry[] = {};
/* Empty elements to create large composition/meta data */ /* Empty elements to create large composition/meta data */
#define DUMMY_ELEM(i, _) BT_MESH_ELEM((i) + 2, \ #define DUMMY_ELEM(i, _) BT_MESH_ELEM((i) + 2, \