michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Mesh: Make bt_mesh_model as rodata

Browse source 
Since model struct most of member should not change at run time,
so mark as const will be suitable and safely.

Signed-off-by: Lingao Meng <menglingao@xiaomi.com>
This commit is contained in:
Lingao Meng 2023-11-14 12:00:30 +08:00 • committed by Carles Cufí
commit ab08f34fd9
79 changed files with 929 additions and 887 deletions
Download patch file Download diff file Expand all files Collapse all files

16
samples/bluetooth/mesh/src/main.c
View file

@ -25,12 +25,12 @@
#define OP_ONOFF_SET_UNACK BT_MESH_MODEL_OP_2(0x82, 0x03)
#define OP_ONOFF_STATUS BT_MESH_MODEL_OP_2(0x82, 0x04)
static void attention_on(struct bt_mesh_model *mod)
static void attention_on(const struct bt_mesh_model *mod)
{
board_led_set(true);
}
static void attention_off(struct bt_mesh_model *mod)
static void attention_off(const struct bt_mesh_model *mod)
{
board_led_set(false);
}
@ -102,7 +102,7 @@ static inline uint8_t model_time_encode(int32_t ms)
return 0x3f;
}
static int onoff_status_send(struct bt_mesh_model *model,
static int onoff_status_send(const struct bt_mesh_model *model,
struct bt_mesh_msg_ctx *ctx)
{
uint32_t remaining;
@ -151,7 +151,7 @@ static void onoff_timeout(struct k_work *work)
/* Generic OnOff Server message handlers */
static int gen_onoff_get(struct bt_mesh_model *model,
static int gen_onoff_get(const struct bt_mesh_model *model,
struct bt_mesh_msg_ctx *ctx,
struct net_buf_simple *buf)
{
@ -159,7 +159,7 @@ static int gen_onoff_get(struct bt_mesh_model *model,
return 0;
}
static int gen_onoff_set_unack(struct bt_mesh_model *model,
static int gen_onoff_set_unack(const struct bt_mesh_model *model,
struct bt_mesh_msg_ctx *ctx,
struct net_buf_simple *buf)
{
@ -202,7 +202,7 @@ static int gen_onoff_set_unack(struct bt_mesh_model *model,
return 0;
}
static int gen_onoff_set(struct bt_mesh_model *model,
static int gen_onoff_set(const struct bt_mesh_model *model,
struct bt_mesh_msg_ctx *ctx,
struct net_buf_simple *buf)
{
@ -221,7 +221,7 @@ static const struct bt_mesh_model_op gen_onoff_srv_op[] = {
/* Generic OnOff Client */
static int gen_onoff_status(struct bt_mesh_model *model,
static int gen_onoff_status(const struct bt_mesh_model *model,
struct bt_mesh_msg_ctx *ctx,
struct net_buf_simple *buf)
{
@ -248,7 +248,7 @@ static const struct bt_mesh_model_op gen_onoff_cli_op[] = {
};
/* This application only needs one element to contain its models */
static struct bt_mesh_model models[] = {
static const struct bt_mesh_model models[] = {
BT_MESH_MODEL_CFG_SRV,
BT_MESH_MODEL_HEALTH_SRV(&health_srv, &health_pub),
BT_MESH_MODEL(BT_MESH_MODEL_ID_GEN_ONOFF_SRV, gen_onoff_srv_op, NULL,

10
samples/bluetooth/mesh_demo/src/main.c
View file

@ -50,14 +50,14 @@ static void heartbeat(const struct bt_mesh_hb_sub *sub, uint8_t hops,
static struct bt_mesh_cfg_cli cfg_cli = {
};
static void attention_on(struct bt_mesh_model *model)
static void attention_on(const struct bt_mesh_model *model)
{
printk("attention_on()\n");
board_attention(true);
board_play("100H100C100H100C100H100C");
}
static void attention_off(struct bt_mesh_model *model)
static void attention_off(const struct bt_mesh_model *model)
{
printk("attention_off()\n");
board_attention(false);
@ -74,13 +74,13 @@ static struct bt_mesh_health_srv health_srv = {
BT_MESH_HEALTH_PUB_DEFINE(health_pub, 0);
static struct bt_mesh_model root_models[] = {
static const struct bt_mesh_model root_models[] = {
BT_MESH_MODEL_CFG_SRV,
BT_MESH_MODEL_CFG_CLI(&cfg_cli),
BT_MESH_MODEL_HEALTH_SRV(&health_srv, &health_pub),
};
static int vnd_button_pressed(struct bt_mesh_model *model,
static int vnd_button_pressed(const struct bt_mesh_model *model,
struct bt_mesh_msg_ctx *ctx,
struct net_buf_simple *buf)
{
@ -101,7 +101,7 @@ static const struct bt_mesh_model_op vnd_ops[] = {
BT_MESH_MODEL_OP_END,
};
static struct bt_mesh_model vnd_models[] = {
static const struct bt_mesh_model vnd_models[] = {
BT_MESH_MODEL_VND(BT_COMP_ID_LF, MOD_LF, vnd_ops, NULL, NULL),
};

2
samples/bluetooth/mesh_provisioner/src/main.c
View file

@ -53,7 +53,7 @@ static struct bt_mesh_health_cli health_cli = {
.current_status = health_current_status,
};
static struct bt_mesh_model root_models[] = {
static const struct bt_mesh_model root_models[] = {
BT_MESH_MODEL_CFG_SRV,
BT_MESH_MODEL_CFG_CLI(&cfg_cli),
BT_MESH_MODEL_HEALTH_CLI(&health_cli),