Skip to content

Commit e924e5f

Browse files
llyespressif-bot
lly
authored and
espressif-bot
committed
ble_mesh: stack: Rename cfg & health client status recv func
1 parent 36d714e commit e924e5f

File tree

2 files changed

+28
-28
lines changed

2 files changed

+28
-28
lines changed

‎components/bt/esp_ble_mesh/mesh_core/cfg_cli.c

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,9 @@ static void timeout_handler(struct k_work *work)
123123
return;
124124
}
125125

126-
static void cfg_client_cancel(struct bt_mesh_model *model,
127-
struct bt_mesh_msg_ctx *ctx,
128-
void *status, size_t len)
126+
static void cfg_client_recv_status(struct bt_mesh_model *model,
127+
struct bt_mesh_msg_ctx *ctx,
128+
void *status, size_t len)
129129
{
130130
bt_mesh_client_node_t *node = NULL;
131131
struct net_buf_simple buf = {0};
@@ -265,7 +265,7 @@ static void comp_data_status(struct bt_mesh_model *model,
265265

266266
net_buf_simple_add_mem(status.comp_data, buf->data, buf->len);
267267

268-
cfg_client_cancel(model, ctx, &status, sizeof(struct bt_mesh_cfg_comp_data_status));
268+
cfg_client_recv_status(model, ctx, &status, sizeof(struct bt_mesh_cfg_comp_data_status));
269269
}
270270

271271
static void state_status_u8(struct bt_mesh_model *model,
@@ -280,7 +280,7 @@ static void state_status_u8(struct bt_mesh_model *model,
280280

281281
status = net_buf_simple_pull_u8(buf);
282282

283-
cfg_client_cancel(model, ctx, &status, sizeof(u8_t));
283+
cfg_client_recv_status(model, ctx, &status, sizeof(u8_t));
284284
}
285285

286286
static void beacon_status(struct bt_mesh_model *model,
@@ -324,7 +324,7 @@ static void relay_status(struct bt_mesh_model *model,
324324
status.relay = net_buf_simple_pull_u8(buf);
325325
status.retransmit = net_buf_simple_pull_u8(buf);
326326

327-
cfg_client_cancel(model, ctx, &status, sizeof(struct bt_mesh_cfg_relay_status));
327+
cfg_client_recv_status(model, ctx, &status, sizeof(struct bt_mesh_cfg_relay_status));
328328
}
329329

330330
static void net_key_status(struct bt_mesh_model *model,
@@ -340,7 +340,7 @@ static void net_key_status(struct bt_mesh_model *model,
340340
status.status = net_buf_simple_pull_u8(buf);
341341
status.net_idx = net_buf_simple_pull_le16(buf) & 0xfff;
342342

343-
cfg_client_cancel(model, ctx, &status, sizeof(struct bt_mesh_cfg_netkey_status));
343+
cfg_client_recv_status(model, ctx, &status, sizeof(struct bt_mesh_cfg_netkey_status));
344344
}
345345

346346
static void app_key_status(struct bt_mesh_model *model,
@@ -356,7 +356,7 @@ static void app_key_status(struct bt_mesh_model *model,
356356
status.status = net_buf_simple_pull_u8(buf);
357357
key_idx_unpack(buf, &status.net_idx, &status.app_idx);
358358

359-
cfg_client_cancel(model, ctx, &status, sizeof(struct bt_mesh_cfg_appkey_status));
359+
cfg_client_recv_status(model, ctx, &status, sizeof(struct bt_mesh_cfg_appkey_status));
360360
}
361361

362362
static void mod_app_status(struct bt_mesh_model *model,
@@ -379,7 +379,7 @@ static void mod_app_status(struct bt_mesh_model *model,
379379
}
380380
status.mod_id = net_buf_simple_pull_le16(buf);
381381

382-
cfg_client_cancel(model, ctx, &status, sizeof(struct bt_mesh_cfg_mod_app_status));
382+
cfg_client_recv_status(model, ctx, &status, sizeof(struct bt_mesh_cfg_mod_app_status));
383383
}
384384

385385
static void mod_pub_status(struct bt_mesh_model *model,
@@ -408,7 +408,7 @@ static void mod_pub_status(struct bt_mesh_model *model,
408408
}
409409
status.mod_id = net_buf_simple_pull_le16(buf);
410410

411-
cfg_client_cancel(model, ctx, &status, sizeof(struct bt_mesh_cfg_mod_pub_status));
411+
cfg_client_recv_status(model, ctx, &status, sizeof(struct bt_mesh_cfg_mod_pub_status));
412412
}
413413

414414
static void mod_sub_status(struct bt_mesh_model *model,
@@ -431,7 +431,7 @@ static void mod_sub_status(struct bt_mesh_model *model,
431431
}
432432
status.mod_id = net_buf_simple_pull_le16(buf);
433433

434-
cfg_client_cancel(model, ctx, &status, sizeof(struct bt_mesh_cfg_mod_sub_status));
434+
cfg_client_recv_status(model, ctx, &status, sizeof(struct bt_mesh_cfg_mod_sub_status));
435435
}
436436

437437
static void hb_sub_status(struct bt_mesh_model *model,
@@ -452,7 +452,7 @@ static void hb_sub_status(struct bt_mesh_model *model,
452452
status.min = net_buf_simple_pull_u8(buf);
453453
status.max = net_buf_simple_pull_u8(buf);
454454

455-
cfg_client_cancel(model, ctx, &status, sizeof(struct bt_mesh_cfg_hb_sub_status));
455+
cfg_client_recv_status(model, ctx, &status, sizeof(struct bt_mesh_cfg_hb_sub_status));
456456
}
457457

458458
static void hb_pub_status(struct bt_mesh_model *model,
@@ -473,7 +473,7 @@ static void hb_pub_status(struct bt_mesh_model *model,
473473
status.feat = net_buf_simple_pull_u8(buf);
474474
status.net_idx = net_buf_simple_pull_u8(buf);
475475

476-
cfg_client_cancel(model, ctx, &status, sizeof(struct bt_mesh_cfg_hb_sub_status));
476+
cfg_client_recv_status(model, ctx, &status, sizeof(struct bt_mesh_cfg_hb_sub_status));
477477
}
478478

479479
static void node_reset_status(struct bt_mesh_model *model,
@@ -484,7 +484,7 @@ static void node_reset_status(struct bt_mesh_model *model,
484484
ctx->net_idx, ctx->app_idx, ctx->addr, buf->len,
485485
bt_hex(buf->data, buf->len));
486486

487-
cfg_client_cancel(model, ctx, NULL, 0);
487+
cfg_client_recv_status(model, ctx, NULL, 0);
488488
}
489489

490490
static void mod_sub_list(struct bt_mesh_model *model,
@@ -513,7 +513,7 @@ static void mod_sub_list(struct bt_mesh_model *model,
513513
}
514514
net_buf_simple_add_mem(list.addr, buf->data, buf->len);
515515

516-
cfg_client_cancel(model, ctx, &list, sizeof(struct bt_mesh_cfg_mod_sub_list));
516+
cfg_client_recv_status(model, ctx, &list, sizeof(struct bt_mesh_cfg_mod_sub_list));
517517
}
518518

519519
static void net_key_list(struct bt_mesh_model *model,
@@ -533,7 +533,7 @@ static void net_key_list(struct bt_mesh_model *model,
533533
}
534534
net_buf_simple_add_mem(list.net_idx, buf->data, buf->len);
535535

536-
cfg_client_cancel(model, ctx, &list, sizeof(struct bt_mesh_cfg_net_key_list));
536+
cfg_client_recv_status(model, ctx, &list, sizeof(struct bt_mesh_cfg_net_key_list));
537537
}
538538

539539
static void app_key_list(struct bt_mesh_model *model,
@@ -555,7 +555,7 @@ static void app_key_list(struct bt_mesh_model *model,
555555
}
556556
net_buf_simple_add_mem(list.app_idx, buf->data, buf->len);
557557

558-
cfg_client_cancel(model, ctx, &list, sizeof(struct bt_mesh_cfg_app_key_list));
558+
cfg_client_recv_status(model, ctx, &list, sizeof(struct bt_mesh_cfg_app_key_list));
559559
}
560560

561561
static void node_id_status(struct bt_mesh_model *model,
@@ -572,7 +572,7 @@ static void node_id_status(struct bt_mesh_model *model,
572572
status.net_idx = net_buf_simple_pull_le16(buf);
573573
status.identity = net_buf_simple_pull_u8(buf);
574574

575-
cfg_client_cancel(model, ctx, &status, sizeof(struct bt_mesh_cfg_node_id_status));
575+
cfg_client_recv_status(model, ctx, &status, sizeof(struct bt_mesh_cfg_node_id_status));
576576
}
577577

578578
static void mod_app_list(struct bt_mesh_model *model,
@@ -601,7 +601,7 @@ static void mod_app_list(struct bt_mesh_model *model,
601601
}
602602
net_buf_simple_add_mem(list.app_idx, buf->data, buf->len);
603603

604-
cfg_client_cancel(model, ctx, &list, sizeof(struct bt_mesh_cfg_mod_app_list));
604+
cfg_client_recv_status(model, ctx, &list, sizeof(struct bt_mesh_cfg_mod_app_list));
605605
}
606606

607607
static void kr_phase_status(struct bt_mesh_model *model,
@@ -618,7 +618,7 @@ static void kr_phase_status(struct bt_mesh_model *model,
618618
status.net_idx = net_buf_simple_pull_le16(buf);
619619
status.phase = net_buf_simple_pull_u8(buf);
620620

621-
cfg_client_cancel(model, ctx, &status, sizeof(struct bt_mesh_cfg_key_refresh_status));
621+
cfg_client_recv_status(model, ctx, &status, sizeof(struct bt_mesh_cfg_key_refresh_status));
622622
}
623623

624624
static void lpn_pollto_status(struct bt_mesh_model *model,
@@ -636,7 +636,7 @@ static void lpn_pollto_status(struct bt_mesh_model *model,
636636
status.timeout |= net_buf_simple_pull_u8(buf) << 8;
637637
status.timeout |= net_buf_simple_pull_u8(buf) << 16;
638638

639-
cfg_client_cancel(model, ctx, &status, sizeof(struct bt_mesh_cfg_lpn_pollto_status));
639+
cfg_client_recv_status(model, ctx, &status, sizeof(struct bt_mesh_cfg_lpn_pollto_status));
640640
}
641641

642642
static void net_trans_status(struct bt_mesh_model *model,

‎components/bt/esp_ble_mesh/mesh_core/health_cli.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ static void timeout_handler(struct k_work *work)
8181
return;
8282
}
8383

84-
static void health_client_cancel(struct bt_mesh_model *model,
85-
struct bt_mesh_msg_ctx *ctx,
86-
void *status, size_t len)
84+
static void health_client_recv_status(struct bt_mesh_model *model,
85+
struct bt_mesh_msg_ctx *ctx,
86+
void *status, size_t len)
8787
{
8888
bt_mesh_client_node_t *node = NULL;
8989
struct net_buf_simple buf = {0};
@@ -167,7 +167,7 @@ static void health_fault_status(struct bt_mesh_model *model,
167167

168168
net_buf_simple_add_mem(status.fault_array, buf->data, buf->len);
169169

170-
health_client_cancel(model, ctx, &status, sizeof(struct bt_mesh_health_fault_status));
170+
health_client_recv_status(model, ctx, &status, sizeof(struct bt_mesh_health_fault_status));
171171
}
172172

173173
static void health_current_status(struct bt_mesh_model *model,
@@ -190,7 +190,7 @@ static void health_current_status(struct bt_mesh_model *model,
190190

191191
net_buf_simple_add_mem(status.fault_array, buf->data, buf->len);
192192

193-
health_client_cancel(model, ctx, &status, sizeof(struct bt_mesh_health_current_status));
193+
health_client_recv_status(model, ctx, &status, sizeof(struct bt_mesh_health_current_status));
194194
}
195195

196196
static void health_period_status(struct bt_mesh_model *model,
@@ -205,7 +205,7 @@ static void health_period_status(struct bt_mesh_model *model,
205205

206206
status = net_buf_simple_pull_u8(buf);
207207

208-
health_client_cancel(model, ctx, &status, sizeof(u8_t));
208+
health_client_recv_status(model, ctx, &status, sizeof(u8_t));
209209
}
210210

211211
static void health_attention_status(struct bt_mesh_model *model,
@@ -220,7 +220,7 @@ static void health_attention_status(struct bt_mesh_model *model,
220220

221221
status = net_buf_simple_pull_u8(buf);
222222

223-
health_client_cancel(model, ctx, &status, sizeof(u8_t));
223+
health_client_recv_status(model, ctx, &status, sizeof(u8_t));
224224
}
225225

226226
const struct bt_mesh_model_op bt_mesh_health_cli_op[] = {

0 commit comments

Comments
 (0)