e458f5aae6
The `bluetooth/common/log.h` and `bluetooth/common/log.c` files have been removed. Files that were using them have been updated to use `zephyr/logging/log.h` instead. Those replacement have been done consequently: - `/BT_DBG/LOG_DBG/` - `/BT_ERR/LOG_ERR/` - `/BT_WARN/LOG_WRN/` - `/BT_INFO/LOG_INF/` - `/BT_HEXDUMP_DBG/LOG_HEXDUMP_DBG/` - `/BT_DBG_OBJ_ID/LOG_DBG_OBJ_ID/` Also, some files were relying on the `common/log.h` include to include `zephyr/bluetooth/hci.h`, in those cases the include of `hci.h` has been added. For files that were including `common/log.h` but not using any logs, the include has been removed and not replaced. Signed-off-by: Théo Battrel <theo.battrel@nordicsemi.no>
134 lines
2.7 KiB
C
134 lines
2.7 KiB
C
/*
|
|
* Copyright (c) 2021 Nordic Semiconductor ASA
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
#include <zephyr/bluetooth/mesh.h>
|
|
|
|
#include "msg.h"
|
|
|
|
#define LOG_LEVEL CONFIG_BT_MESH_ACCESS_LOG_LEVEL
|
|
#include <zephyr/logging/log.h>
|
|
LOG_MODULE_REGISTER(bt_mesh_msg);
|
|
|
|
void bt_mesh_model_msg_init(struct net_buf_simple *msg, uint32_t opcode)
|
|
{
|
|
net_buf_simple_init(msg, 0);
|
|
|
|
switch (BT_MESH_MODEL_OP_LEN(opcode)) {
|
|
case 1:
|
|
net_buf_simple_add_u8(msg, opcode);
|
|
break;
|
|
case 2:
|
|
net_buf_simple_add_be16(msg, opcode);
|
|
break;
|
|
case 3:
|
|
net_buf_simple_add_u8(msg, ((opcode >> 16) & 0xff));
|
|
/* Using LE for the CID since the model layer is defined as
|
|
* little-endian in the mesh spec and using BT_MESH_MODEL_OP_3
|
|
* will declare the opcode in this way.
|
|
*/
|
|
net_buf_simple_add_le16(msg, opcode & 0xffff);
|
|
break;
|
|
default:
|
|
LOG_WRN("Unknown opcode format");
|
|
break;
|
|
}
|
|
}
|
|
|
|
void bt_mesh_msg_ack_ctx_clear(struct bt_mesh_msg_ack_ctx *ack)
|
|
{
|
|
ack->op = 0U;
|
|
ack->user_data = NULL;
|
|
ack->dst = BT_MESH_ADDR_UNASSIGNED;
|
|
}
|
|
|
|
int bt_mesh_msg_ack_ctx_prepare(struct bt_mesh_msg_ack_ctx *ack,
|
|
uint32_t op, uint16_t dst, void *user_data)
|
|
{
|
|
if (ack->op) {
|
|
LOG_WRN("Another synchronous operation pending");
|
|
return -EBUSY;
|
|
}
|
|
|
|
ack->op = op;
|
|
ack->user_data = user_data;
|
|
ack->dst = dst;
|
|
|
|
return 0;
|
|
}
|
|
|
|
int bt_mesh_msg_ack_ctx_wait(struct bt_mesh_msg_ack_ctx *ack, k_timeout_t timeout)
|
|
{
|
|
int err;
|
|
|
|
err = k_sem_take(&ack->sem, timeout);
|
|
bt_mesh_msg_ack_ctx_clear(ack);
|
|
|
|
if (err == -EAGAIN) {
|
|
return -ETIMEDOUT;
|
|
}
|
|
|
|
return err;
|
|
}
|
|
|
|
bool bt_mesh_msg_ack_ctx_match(const struct bt_mesh_msg_ack_ctx *ack,
|
|
uint32_t op, uint16_t addr, void **user_data)
|
|
{
|
|
if (ack->op != op || (BT_MESH_ADDR_IS_UNICAST(ack->dst) && ack->dst != addr)) {
|
|
return false;
|
|
}
|
|
|
|
if (user_data != NULL) {
|
|
*user_data = ack->user_data;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
int bt_mesh_msg_send(struct bt_mesh_model *model, struct bt_mesh_msg_ctx *ctx,
|
|
struct net_buf_simple *buf)
|
|
{
|
|
if (!ctx && !model->pub) {
|
|
return -ENOTSUP;
|
|
}
|
|
|
|
if (ctx) {
|
|
return bt_mesh_model_send(model, ctx, buf, NULL, 0);
|
|
}
|
|
|
|
net_buf_simple_reset(model->pub->msg);
|
|
net_buf_simple_add_mem(model->pub->msg, buf->data, buf->len);
|
|
|
|
return bt_mesh_model_publish(model);
|
|
}
|
|
|
|
int bt_mesh_msg_ackd_send(struct bt_mesh_model *model, struct bt_mesh_msg_ctx *ctx,
|
|
struct net_buf_simple *buf, const struct bt_mesh_msg_rsp_ctx *rsp)
|
|
{
|
|
int err;
|
|
|
|
if (rsp) {
|
|
err = bt_mesh_msg_ack_ctx_prepare(rsp->ack, rsp->op,
|
|
ctx ? ctx->addr : model->pub->addr,
|
|
rsp->user_data);
|
|
if (err) {
|
|
return err;
|
|
}
|
|
}
|
|
|
|
err = bt_mesh_msg_send(model, ctx, buf);
|
|
|
|
if (!rsp) {
|
|
return err;
|
|
}
|
|
|
|
if (!err) {
|
|
return bt_mesh_msg_ack_ctx_wait(rsp->ack, K_MSEC(rsp->timeout));
|
|
}
|
|
|
|
bt_mesh_msg_ack_ctx_clear(rsp->ack);
|
|
|
|
return err;
|
|
}
|