michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Use Zephyr standard log system instead of bluetooth/common/log

Browse source 
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>
This commit is contained in:
Théo Battrel 2022-11-02 14:31:13 +01:00 • committed by Carles Cufí
commit e458f5aae6
253 changed files with 7131 additions and 7180 deletions
Download patch file Download diff file Expand all files Collapse all files

12
subsys/bluetooth/mesh/pb_gatt_cli.c
View file

@ -15,10 +15,6 @@
#include <zephyr/bluetooth/gatt.h>
#include <zephyr/bluetooth/mesh.h>
#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_PROV)
#define LOG_MODULE_NAME bt_mesh_pb_gatt_client
#include "common/log.h"
#include "mesh.h"
#include "adv.h"
#include "net.h"
@ -34,6 +30,10 @@
#include "gatt_cli.h"
#include "proxy_msg.h"
#define LOG_LEVEL CONFIG_BT_MESH_PROV_LOG_LEVEL
#include <zephyr/logging/log.h>
LOG_MODULE_REGISTER(bt_mesh_pb_gatt_client);
static struct {
const uint8_t *target;
struct bt_mesh_proxy_role *srv;
@ -43,11 +43,11 @@ static void pb_gatt_msg_recv(struct bt_mesh_proxy_role *role)
{
switch (role->msg_type) {
case BT_MESH_PROXY_PROV:
BT_DBG("Mesh Provisioning PDU");
LOG_DBG("Mesh Provisioning PDU");
bt_mesh_pb_gatt_recv(role->conn, &role->buf);
break;
default:
BT_WARN("Unhandled Message Type 0x%02x", role->msg_type);
LOG_WRN("Unhandled Message Type 0x%02x", role->msg_type);
break;
}
}