Skip to content

Commit b2e235d

Browse files
theob-proaescolar
authored andcommitted
Bluetooth: Remove legacy debug symbols
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>
1 parent dc376a8 commit b2e235d

File tree

14 files changed

+105
-813
lines changed

14 files changed

+105
-813
lines changed

doc/connectivity/bluetooth/api/audio/shell/bap_broadcast_assistant.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ The Broadcast Assistant will typically be phones or laptops.
1414
The Broadcast Assistant scans for periodic advertisements and transfer
1515
information to the server.
1616

17-
It is necessary to have :code:`BT_DEBUG_BAP_BROADCAST_ASSISTANT` enabled for
17+
It is necessary to have
18+
:kconfig:option:`CONFIG_BT_BAP_BROADCAST_ASSISTANT_LOG_LEVEL_DBG` enabled for
1819
using the Broadcast Assistant interactively.
1920

2021
When the Bluetooth stack has been initialized (:code:`bt init`),

doc/connectivity/bluetooth/api/audio/shell/bap_scan_delegator.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ synchronization transfer (PAST) protocol.
1111
The Scan Delegator server typically resides on devices that have inputs or
1212
outputs.
1313

14-
It is necessary to have :code:`BT_DEBUG_BAP_SCAN_DELEGATOR` enabled for using
14+
It is necessary to have
15+
:kconfig:option:`CONFIG_BT_BAP_SCAN_DELEGATOR_LOG_LEVEL_DBG` enabled for using
1516
the Scan Delegator interactively.
1617

1718
The Scan Delegator can currently only set the sync state of a receive state, but

doc/connectivity/bluetooth/api/audio/shell/ccp.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ laptops. The call control client will also thus typically be the advertiser.
1515
The client can control the states of calls on a server using the call control
1616
point.
1717

18-
It is necessary to have :code:`BT_DEBUG_TBS_CLIENT` enabled for using the client
19-
interactively.
18+
It is necessary to have :kconfig:option:`CONFIG_BT_TBS_CLIENT_LOG_LEVEL_DBG`
19+
enabled for using the client interactively.
2020

2121
Using the telephone bearer service client
2222
=========================================
@@ -160,8 +160,8 @@ The telephone bearer service is a service that typically resides on devices that
160160
can make calls, including calls from apps such as Skype, e.g. (smart)phones and
161161
PCs.
162162

163-
It is necessary to have :code:`BT_DEBUG_TBS` enabled for using the TBS server
164-
interactively.
163+
It is necessary to have :kconfig:option:`CONFIG_BT_TBS_LOG_LEVEL_DBG` enabled
164+
for using the TBS server interactively.
165165

166166
Using the telephone bearer service
167167
==================================

doc/connectivity/bluetooth/api/audio/shell/csip.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@ read the set information, which is needed to identify other set members.
3636
The client can then scan for and connect to the remaining set members, and once
3737
all the members has been connected to, it can lock and release the set.
3838

39-
It is necessary to enable :code:`BT_DEBUG_CSIP_SET_COORDINATOR` to properly use the set
40-
coordinator.
39+
It is necessary to enable
40+
:kconfig:option:`CONFIG_BT_CSIP_SET_COORDINATOR_LOG_LEVEL_DBG` to properly use
41+
the set coordinator.
4142

4243
.. code-block:: console
4344

doc/releases/release-notes-3.7.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@ https://docs.zephyrproject.org/latest/security/vulnerabilities.html
3232
API Changes
3333
***********
3434

35+
Removed APIs in this release
36+
============================
37+
38+
* The Bluetooth subsystem specific debug symbols are removed. They have been replaced with the
39+
Zephyr logging ones.
40+
3541
Deprecated in this release
3642
==========================
3743

drivers/bluetooth/hci/cyw43xxx.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include <zephyr/drivers/gpio.h>
2020
#include <zephyr/drivers/uart.h>
2121

22-
#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER)
2322
#define LOG_LEVEL CONFIG_BT_HCI_DRIVER_LOG_LEVEL
2423
#include <zephyr/logging/log.h>
2524
LOG_MODULE_REGISTER(cyw43xxx_driver);

drivers/bluetooth/hci/hci_psoc6_bless.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#include <zephyr/sys/util.h>
2424
#include <zephyr/logging/log.h>
2525

26-
#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER)
2726
#define LOG_LEVEL CONFIG_BT_HCI_DRIVER_LOG_LEVEL
2827
#include <zephyr/logging/log.h>
2928
LOG_MODULE_REGISTER(psoc6_bless);

scripts/kconfig/hardened.csv

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ BOOT_BANNER,n
22
BOOT_DELAY,0
33
BOUNDS_CHECK_BYPASS_MITIGATION,y
44
BT_CONN_DISABLE_SECURITY,n
5-
BT_DEBUG_KEYS,n
6-
BT_DEBUG_SMP,n
5+
BT_KEYS_LOG_LEVEL_DBG,n
6+
BT_SMP_LOG_LEVEL_DBG,n
77
BT_FIXED_PASSKEY,n
88
BT_LOG_SNIFFER_INFO,n
99
BT_OOB_DATA_FIXED,n

0 commit comments

Comments
 (0)