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

56
subsys/bluetooth/mesh/health_srv.c
View file

@ -31,11 +31,11 @@ LOG_MODULE_REGISTER(bt_mesh_health_srv);
/* Health Server context of the primary element */
struct bt_mesh_health_srv *health_srv;
static void health_get_registered(struct bt_mesh_model *mod,
static void health_get_registered(const struct bt_mesh_model *mod,
uint16_t company_id,
struct net_buf_simple *msg)
{
struct bt_mesh_health_srv *srv = mod->user_data;
struct bt_mesh_health_srv *srv = *(mod->user_data);
uint8_t *test_id;
LOG_DBG("Company ID 0x%04x", company_id);
@ -64,10 +64,10 @@ static void health_get_registered(struct bt_mesh_model *mod,
}
}
static size_t health_get_current(struct bt_mesh_model *mod,
static size_t health_get_current(const struct bt_mesh_model *mod,
struct net_buf_simple *msg)
{
struct bt_mesh_health_srv *srv = mod->user_data;
struct bt_mesh_health_srv *srv = *(mod->user_data);
const struct bt_mesh_comp *comp;
uint8_t *test_id, *company_ptr;
uint16_t company_id;
@ -105,7 +105,7 @@ static size_t health_get_current(struct bt_mesh_model *mod,
return fault_count;
}
static int health_fault_get(struct bt_mesh_model *model,
static int health_fault_get(const struct bt_mesh_model *model,
struct bt_mesh_msg_ctx *ctx,
struct net_buf_simple *buf)
{
@ -125,11 +125,11 @@ static int health_fault_get(struct bt_mesh_model *model,
return 0;
}
static int health_fault_clear_unrel(struct bt_mesh_model *model,
static int health_fault_clear_unrel(const struct bt_mesh_model *model,
struct bt_mesh_msg_ctx *ctx,
struct net_buf_simple *buf)
{
struct bt_mesh_health_srv *srv = model->user_data;
struct bt_mesh_health_srv *srv = *(model->user_data);
uint16_t company_id;
company_id = net_buf_simple_pull_le16(buf);
@ -143,12 +143,12 @@ static int health_fault_clear_unrel(struct bt_mesh_model *model,
return 0;
}
static int health_fault_clear(struct bt_mesh_model *model,
static int health_fault_clear(const struct bt_mesh_model *model,
struct bt_mesh_msg_ctx *ctx,
struct net_buf_simple *buf)
{
NET_BUF_SIMPLE_DEFINE(sdu, BT_MESH_TX_SDU_MAX);
struct bt_mesh_health_srv *srv = model->user_data;
struct bt_mesh_health_srv *srv = *(model->user_data);
uint16_t company_id;
company_id = net_buf_simple_pull_le16(buf);
@ -173,11 +173,11 @@ static int health_fault_clear(struct bt_mesh_model *model,
return 0;
}
static int health_fault_test_unrel(struct bt_mesh_model *model,
static int health_fault_test_unrel(const struct bt_mesh_model *model,
struct bt_mesh_msg_ctx *ctx,
struct net_buf_simple *buf)
{
struct bt_mesh_health_srv *srv = model->user_data;
struct bt_mesh_health_srv *srv = *(model->user_data);
uint16_t company_id;
uint8_t test_id;
@ -193,12 +193,12 @@ static int health_fault_test_unrel(struct bt_mesh_model *model,
return 0;
}
static int health_fault_test(struct bt_mesh_model *model,
static int health_fault_test(const struct bt_mesh_model *model,
struct bt_mesh_msg_ctx *ctx,
struct net_buf_simple *buf)
{
NET_BUF_SIMPLE_DEFINE(sdu, BT_MESH_TX_SDU_MAX);
struct bt_mesh_health_srv *srv = model->user_data;
struct bt_mesh_health_srv *srv = *(model->user_data);
uint16_t company_id;
uint8_t test_id;
@ -228,12 +228,12 @@ static int health_fault_test(struct bt_mesh_model *model,
return 0;
}
static int send_attention_status(struct bt_mesh_model *model,
static int send_attention_status(const struct bt_mesh_model *model,
struct bt_mesh_msg_ctx *ctx)
{
/* Needed size: opcode (2 bytes) + msg + MIC */
BT_MESH_MODEL_BUF_DEFINE(msg, OP_ATTENTION_STATUS, 1);
struct bt_mesh_health_srv *srv = model->user_data;
struct bt_mesh_health_srv *srv = *(model->user_data);
uint8_t time;
time = k_ticks_to_ms_floor32(
@ -251,7 +251,7 @@ static int send_attention_status(struct bt_mesh_model *model,
return 0;
}
static int attention_get(struct bt_mesh_model *model,
static int attention_get(const struct bt_mesh_model *model,
struct bt_mesh_msg_ctx *ctx,
struct net_buf_simple *buf)
{
@ -260,7 +260,7 @@ static int attention_get(struct bt_mesh_model *model,
return send_attention_status(model, ctx);
}
static int attention_set_unrel(struct bt_mesh_model *model,
static int attention_set_unrel(const struct bt_mesh_model *model,
struct bt_mesh_msg_ctx *ctx,
struct net_buf_simple *buf)
{
@ -275,7 +275,7 @@ static int attention_set_unrel(struct bt_mesh_model *model,
return 0;
}
static int attention_set(struct bt_mesh_model *model,
static int attention_set(const struct bt_mesh_model *model,
struct bt_mesh_msg_ctx *ctx,
struct net_buf_simple *buf)
{
@ -291,7 +291,7 @@ static int attention_set(struct bt_mesh_model *model,
return send_attention_status(model, ctx);
}
static int send_health_period_status(struct bt_mesh_model *model,
static int send_health_period_status(const struct bt_mesh_model *model,
struct bt_mesh_msg_ctx *ctx)
{
/* Needed size: opcode (2 bytes) + msg + MIC */
@ -308,7 +308,7 @@ static int send_health_period_status(struct bt_mesh_model *model,
return 0;
}
static int health_period_get(struct bt_mesh_model *model,
static int health_period_get(const struct bt_mesh_model *model,
struct bt_mesh_msg_ctx *ctx,
struct net_buf_simple *buf)
{
@ -317,7 +317,7 @@ static int health_period_get(struct bt_mesh_model *model,
return send_health_period_status(model, ctx);
}
static int health_period_set_unrel(struct bt_mesh_model *model,
static int health_period_set_unrel(const struct bt_mesh_model *model,
struct bt_mesh_msg_ctx *ctx,
struct net_buf_simple *buf)
{
@ -336,7 +336,7 @@ static int health_period_set_unrel(struct bt_mesh_model *model,
return 0;
}
static int health_period_set(struct bt_mesh_model *model,
static int health_period_set(const struct bt_mesh_model *model,
struct bt_mesh_msg_ctx *ctx,
struct net_buf_simple *buf)
{
@ -367,7 +367,7 @@ const struct bt_mesh_model_op bt_mesh_health_srv_op[] = {
BT_MESH_MODEL_OP_END,
};
static int health_pub_update(struct bt_mesh_model *mod)
static int health_pub_update(const struct bt_mesh_model *mod)
{
struct bt_mesh_model_pub *pub = mod->pub;
size_t count;
@ -386,7 +386,7 @@ static int health_pub_update(struct bt_mesh_model *mod)
int bt_mesh_health_srv_fault_update(struct bt_mesh_elem *elem)
{
struct bt_mesh_model *mod;
const struct bt_mesh_model *mod;
mod = bt_mesh_model_find(elem, BT_MESH_MODEL_ID_HEALTH_SRV);
if (!mod) {
@ -418,9 +418,9 @@ static void attention_off(struct k_work *work)
}
}
static int health_srv_init(struct bt_mesh_model *model)
static int health_srv_init(const struct bt_mesh_model *model)
{
struct bt_mesh_health_srv *srv = model->user_data;
struct bt_mesh_health_srv *srv = *(model->user_data);
if (!srv) {
LOG_ERR("No Health Server context provided");
@ -449,7 +449,7 @@ const struct bt_mesh_model_cb bt_mesh_health_srv_cb = {
.init = health_srv_init,
};
void bt_mesh_attention(struct bt_mesh_model *model, uint8_t time)
void bt_mesh_attention(const struct bt_mesh_model *model, uint8_t time)
{
struct bt_mesh_health_srv *srv;
@ -462,7 +462,7 @@ void bt_mesh_attention(struct bt_mesh_model *model, uint8_t time)
model = srv->model;
} else {
srv = model->user_data;
srv = *(model->user_data);
}
if ((time > 0) && srv->cb && srv->cb->attn_on) {