michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Remove legacy debug symbols

Browse source 
The `BT_DEBUG_*` Kconfig symbols have been deprecated for more than 2
versions, remove them.

Update code that was still using them.

Remove the Bluetooth specific `Kconfig.template.log_config_bt` and use
`Kconfig.template.log_config_inherit` from the logging subsystem
instead, now that the legacy symbols can be removed.

Signed-off-by: Théo Battrel <theo.battrel@nordicsemi.no>
This commit is contained in:
Théo Battrel 2024-05-02 07:59:24 +02:00 • committed by Alberto Escolar
commit b2e235d530
14 changed files with 105 additions and 813 deletions
Download patch file Download diff file Expand all files Collapse all files

3
doc/connectivity/bluetooth/api/audio/shell/bap_broadcast_assistant.rst
View file

@ -14,7 +14,8 @@ The Broadcast Assistant will typically be phones or laptops.
The Broadcast Assistant scans for periodic advertisements and transfer
information to the server.
It is necessary to have :code:`BT_DEBUG_BAP_BROADCAST_ASSISTANT` enabled for
It is necessary to have
:kconfig:option:`CONFIG_BT_BAP_BROADCAST_ASSISTANT_LOG_LEVEL_DBG` enabled for
using the Broadcast Assistant interactively.
When the Bluetooth stack has been initialized (:code:`bt init`),

3
doc/connectivity/bluetooth/api/audio/shell/bap_scan_delegator.rst
View file

@ -11,7 +11,8 @@ synchronization transfer (PAST) protocol.
The Scan Delegator server typically resides on devices that have inputs or
outputs.
It is necessary to have :code:`BT_DEBUG_BAP_SCAN_DELEGATOR` enabled for using
It is necessary to have
:kconfig:option:`CONFIG_BT_BAP_SCAN_DELEGATOR_LOG_LEVEL_DBG` enabled for using
the Scan Delegator interactively.
The Scan Delegator can currently only set the sync state of a receive state, but

8
doc/connectivity/bluetooth/api/audio/shell/ccp.rst
View file

@ -15,8 +15,8 @@ laptops. The call control client will also thus typically be the advertiser.
The client can control the states of calls on a server using the call control
point.
It is necessary to have :code:`BT_DEBUG_TBS_CLIENT` enabled for using the client
interactively.
It is necessary to have :kconfig:option:`CONFIG_BT_TBS_CLIENT_LOG_LEVEL_DBG`
enabled for using the client interactively.
Using the telephone bearer service client
=========================================
@ -160,8 +160,8 @@ The telephone bearer service is a service that typically resides on devices that
can make calls, including calls from apps such as Skype, e.g. (smart)phones and
PCs.
It is necessary to have :code:`BT_DEBUG_TBS` enabled for using the TBS server
interactively.
It is necessary to have :kconfig:option:`CONFIG_BT_TBS_LOG_LEVEL_DBG` enabled
for using the TBS server interactively.
Using the telephone bearer service
==================================

5
doc/connectivity/bluetooth/api/audio/shell/csip.rst
View file

@ -36,8 +36,9 @@ read the set information, which is needed to identify other set members.
The client can then scan for and connect to the remaining set members, and once
all the members has been connected to, it can lock and release the set.
It is necessary to enable :code:`BT_DEBUG_CSIP_SET_COORDINATOR` to properly use the set
coordinator.
It is necessary to enable
:kconfig:option:`CONFIG_BT_CSIP_SET_COORDINATOR_LOG_LEVEL_DBG` to properly use
the set coordinator.
.. code-block:: console

6
doc/releases/release-notes-3.7.rst
View file

@ -32,6 +32,12 @@ https://docs.zephyrproject.org/latest/security/vulnerabilities.html
API Changes
***********
Removed APIs in this release
============================
* The Bluetooth subsystem specific debug symbols are removed. They have been replaced with the
Zephyr logging ones.
Deprecated in this release
==========================

1
drivers/bluetooth/hci/cyw43xxx.c
View file

@ -19,7 +19,6 @@
#include <zephyr/drivers/gpio.h>
#include <zephyr/drivers/uart.h>
#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER)
#define LOG_LEVEL CONFIG_BT_HCI_DRIVER_LOG_LEVEL
#include <zephyr/logging/log.h>
LOG_MODULE_REGISTER(cyw43xxx_driver);

1
drivers/bluetooth/hci/hci_psoc6_bless.c
View file

@ -23,7 +23,6 @@
#include <zephyr/sys/util.h>
#include <zephyr/logging/log.h>
#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER)
#define LOG_LEVEL CONFIG_BT_HCI_DRIVER_LOG_LEVEL
#include <zephyr/logging/log.h>
LOG_MODULE_REGISTER(psoc6_bless);

4
scripts/kconfig/hardened.csv
View file

@ -2,8 +2,8 @@ BOOT_BANNER,n
BOOT_DELAY,0
BOUNDS_CHECK_BYPASS_MITIGATION,y
BT_CONN_DISABLE_SECURITY,n
BT_DEBUG_KEYS,n
BT_DEBUG_SMP,n
BT_KEYS_LOG_LEVEL_DBG,n
BT_SMP_LOG_LEVEL_DBG,n
BT_FIXED_PASSKEY,n
BT_LOG_SNIFFER_INFO,n
BT_OOB_DATA_FIXED,n

1 BOOT_BANNER n
2 BOOT_DELAY 0
3 BOUNDS_CHECK_BYPASS_MITIGATION y
4 BT_CONN_DISABLE_SECURITY n
5 BT_DEBUG_KEYS BT_KEYS_LOG_LEVEL_DBG n
6 BT_DEBUG_SMP BT_SMP_LOG_LEVEL_DBG n
7 BT_FIXED_PASSKEY n
8 BT_LOG_SNIFFER_INFO n
9 BT_OOB_DATA_FIXED n

838
subsys/bluetooth/Kconfig.logging
View file

File diff suppressed because it is too large Load diff

12
subsys/bluetooth/audio/Kconfig.tmap
View file

@ -12,15 +12,7 @@ config BT_TMAP
help
Enabling this will enable TMAP.
config BT_DEBUG_TMAP
bool "Telephony and Media Audio Profile debug"
select DEPRECATED
depends on BT_TMAP
help
Use this option to enable Telephony and Media Audio Profile debug
logs for the Bluetooth Audio functionality.
parent-module = BT
module = BT_TMAP
legacy-debug-sym = BT_DEBUG_TMAP
module-str = "Telephony and Media Audio Profile"
source "subsys/bluetooth/common/Kconfig.template.log_config_bt"
source "subsys/logging/Kconfig.template.log_config_inherit"

22
subsys/bluetooth/common/Kconfig.template.log_config_bt
View file

@ -1,22 +0,0 @@
# Copyright (c) 2022 Nordic Semicoductor ASA
# SPDX-License-Identifier: Apache-2.0
# Usage:
# This template provides backwards compatibility for legacy kconfig symbols.
# Do not add new uses of it.
#
# The following arguments are mandatory:
# - module:
# Name of the new log level kconfig.
# Example: "BT_HCI_CORE"
# - legacy-debug-sym:
# An existing "legacy" kconfig bool. If that bool is selected,
# the new kconfig is forced to max verbosity.
# Example: "BT_DEBUG_HCI_CORE"
config $(module)_LOG_LEVEL
default 4 if $(legacy-debug-sym)
module := $(module)
parent-module := BT
source "subsys/logging/Kconfig.template.log_config_inherit"

2
subsys/bluetooth/mesh/rpr_cli.c
View file

@ -298,7 +298,7 @@ static int handle_scan_report(const struct bt_mesh_model *mod, struct bt_mesh_ms
return -EINVAL;
}
if (IS_ENABLED(CONFIG_BT_MESH_DEBUG)) {
if (IS_ENABLED(CONFIG_BT_MESH_MODEL_LOG_LEVEL_DBG)) {
struct bt_uuid_128 uuid_repr = { .uuid = { BT_UUID_TYPE_128 } };
memcpy(uuid_repr.val, dev.uuid, 16);

2
subsys/bluetooth/mesh/rpr_srv.c
View file

@ -1173,7 +1173,7 @@ static void adv_handle_ext_scan(const struct bt_le_scan_recv_info *info,
srv.scan.addr = *info->addr;
atomic_set_bit(srv.flags, SCAN_EXT_HAS_ADDR);
if (IS_ENABLED(CONFIG_BT_MESH_DEBUG_MODEL)) {
if (IS_ENABLED(CONFIG_BT_MESH_MODEL_LOG_LEVEL_DBG)) {
struct bt_uuid_128 uuid_repr = { .uuid = { BT_UUID_TYPE_128 } };
memcpy(uuid_repr.val, dev->uuid, 16);

11
tests/bluetooth/ctrl_isoal/Kconfig
View file

@ -12,17 +12,10 @@ config BT_CTLR_CONN_ISO_GROUPS
range 1 240
default 1
config BT_CTLR_DEBUG_ISOAL
bool "[DEPRECATED] Bluetooth ISO-AL debug"
select DEPRECATED
depends on BT_CTLR_ISO
help
This option enables debug support for the Bluetooth ISO-AL.
parent-module = BT
module = BT_CTLR_ISOAL
legacy-debug-sym = BT_CTLR_DEBUG_ISOAL
module-str = "Bluetooth Controller ISO-AL"
source "subsys/bluetooth/common/Kconfig.template.log_config_bt"
source "subsys/logging/Kconfig.template.log_config_inherit"
config BT_CTLR_ISOAL_LOG_DBG_VERBOSE
bool "ISO-AL verbose debug logging"