diff --git a/doc/connectivity/bluetooth/api/audio/shell/bap_broadcast_assistant.rst b/doc/connectivity/bluetooth/api/audio/shell/bap_broadcast_assistant.rst index 5ebd7b34327..2fdd25192c1 100644 --- a/doc/connectivity/bluetooth/api/audio/shell/bap_broadcast_assistant.rst +++ b/doc/connectivity/bluetooth/api/audio/shell/bap_broadcast_assistant.rst @@ -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`), diff --git a/doc/connectivity/bluetooth/api/audio/shell/bap_scan_delegator.rst b/doc/connectivity/bluetooth/api/audio/shell/bap_scan_delegator.rst index cbdbc8ecbce..ad9348c1705 100644 --- a/doc/connectivity/bluetooth/api/audio/shell/bap_scan_delegator.rst +++ b/doc/connectivity/bluetooth/api/audio/shell/bap_scan_delegator.rst @@ -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 diff --git a/doc/connectivity/bluetooth/api/audio/shell/ccp.rst b/doc/connectivity/bluetooth/api/audio/shell/ccp.rst index 69e20de63e8..023e8515aa9 100644 --- a/doc/connectivity/bluetooth/api/audio/shell/ccp.rst +++ b/doc/connectivity/bluetooth/api/audio/shell/ccp.rst @@ -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 ================================== diff --git a/doc/connectivity/bluetooth/api/audio/shell/csip.rst b/doc/connectivity/bluetooth/api/audio/shell/csip.rst index c4efa0a6f93..307eade3999 100644 --- a/doc/connectivity/bluetooth/api/audio/shell/csip.rst +++ b/doc/connectivity/bluetooth/api/audio/shell/csip.rst @@ -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 diff --git a/doc/releases/release-notes-3.7.rst b/doc/releases/release-notes-3.7.rst index 54d96f9d367..fd74dc40f8f 100644 --- a/doc/releases/release-notes-3.7.rst +++ b/doc/releases/release-notes-3.7.rst @@ -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 ========================== diff --git a/drivers/bluetooth/hci/cyw43xxx.c b/drivers/bluetooth/hci/cyw43xxx.c index f1ee9ad81b1..8da6192610d 100644 --- a/drivers/bluetooth/hci/cyw43xxx.c +++ b/drivers/bluetooth/hci/cyw43xxx.c @@ -19,7 +19,6 @@ #include #include -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER) #define LOG_LEVEL CONFIG_BT_HCI_DRIVER_LOG_LEVEL #include LOG_MODULE_REGISTER(cyw43xxx_driver); diff --git a/drivers/bluetooth/hci/hci_psoc6_bless.c b/drivers/bluetooth/hci/hci_psoc6_bless.c index 9a622411454..af6804f2f17 100644 --- a/drivers/bluetooth/hci/hci_psoc6_bless.c +++ b/drivers/bluetooth/hci/hci_psoc6_bless.c @@ -23,7 +23,6 @@ #include #include -#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER) #define LOG_LEVEL CONFIG_BT_HCI_DRIVER_LOG_LEVEL #include LOG_MODULE_REGISTER(psoc6_bless); diff --git a/scripts/kconfig/hardened.csv b/scripts/kconfig/hardened.csv index a8caf3a87cc..f55899569e4 100644 --- a/scripts/kconfig/hardened.csv +++ b/scripts/kconfig/hardened.csv @@ -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 diff --git a/subsys/bluetooth/Kconfig.logging b/subsys/bluetooth/Kconfig.logging index 6c6c26f0b77..6cd4006c91a 100644 --- a/subsys/bluetooth/Kconfig.logging +++ b/subsys/bluetooth/Kconfig.logging @@ -7,704 +7,89 @@ config BT_LOG # convenience symbol, _no touchy_ bool default y if LOG && BT - select BT_LOG_LEGACY if BT_LOG menu "Bluetooth logging" -config BT_LOG_LEGACY - bool - -if BT_LOG_LEGACY - -menu "Bluetooth legacy logging options" - -# COMMON - -config BT_DEBUG_HCI_DRIVER - bool "[DEPRECATED] Bluetooth HCI driver debug" - select DEPRECATED - help - This option enables debug support for the active - Bluetooth HCI driver, including the Controller-side HCI layer - when included in the build. - -config BT_DEBUG_RPA - bool "[DEPRECATED] Bluetooth Resolvable Private Address (RPA) debug" - select DEPRECATED - depends on BT_RPA - help - This option enables debug support for the Bluetooth - Resolvable Private Address (RPA) generation and resolution. - -menu "[DEPRECATED] Audio" - -# AICS - -config BT_DEBUG_AICS - bool "[DEPRECATED] Audio Input Control Service debug" - select DEPRECATED - help - Use this option to enable Audio Input Control Service debug logs for - the Bluetooth Audio functionality. - -config BT_DEBUG_AICS_CLIENT - bool "[DEPRECATED] Audio Input Control Service client debug" - select DEPRECATED - help - Use this option to enable Audio Input Control Service client debug - logs for the Bluetooth Audio functionality. - -# BAP - -config BT_BAP_DEBUG_STREAM - bool "[DEPRECATED] Basic Audio Profile Stream debug" - select DEPRECATED - depends on BT_BAP_STREAM - help - Use this option to enable Basic Audio Profile Stream debug logs. - -config BT_DEBUG_ASCS - bool "[DEPRECATED] Audio Stream Control Service debug" - select DEPRECATED - depends on BT_ASCS - help - Use this option to enable Audio Stream Control Service debug logs for - the Bluetooth Audio functionality. - -config BT_DEBUG_BAP_UNICAST_SERVER - bool "[DEPRECATED] Bluetooth Audio Unicast Server debug" - select DEPRECATED - depends on BT_BAP_UNICAST_SERVER - help - Use this option to enable Bluetooth Audio Unicast Server debug logs - for the Bluetooth Audio functionality. - -config BT_DEBUG_BAP_UNICAST_CLIENT - bool "[DEPRECATED] Basic Audio Profile client debug" - select DEPRECATED - depends on BT_BAP_UNICAST_CLIENT - help - Use this option to enable Basic Audio Profile debug logs for the - Bluetooth Audio functionality. - -config BT_DEBUG_BAP_BROADCAST_SOURCE - bool "[DEPRECATED] Bluetooth Audio Broadcast Source debug" - select DEPRECATED - depends on BT_BAP_BROADCAST_SOURCE - help - Use this option to enable Bluetooth Audio Broadcast Source debug logs - for the Bluetooth Audio functionality. - -config BT_DEBUG_BAP_BROADCAST_SINK - bool "[DEPRECATED] Bluetooth Audio Broadcast Sink debug" - select DEPRECATED - depends on BT_BAP_BROADCAST_SINK - help - Use this option to enable Bluetooth Audio Broadcast Sink debug logs - for the Bluetooth Audio functionality. - -config BT_DEBUG_BAP_SCAN_DELEGATOR - bool "[DEPRECATED] Broadcast Audio Scan Service debug" - select DEPRECATED - depends on BT_BAP_SCAN_DELEGATOR - help - Use this option to enable Broadcast Audio Scan Service debug logs for - the Bluetooth Audio functionality. - -config BT_DEBUG_BAP_BROADCAST_ASSISTANT - bool "[DEPRECATED] Broadcast Audio Scan Service client debug" - select DEPRECATED - depends on BT_BAP_BROADCAST_ASSISTANT - help - Use this option to enable Broadcast Audio Scan Service client - debug logs for the Bluetooth Audio functionality. - -# CAP - -config BT_DEBUG_CAP_ACCEPTOR - bool "[DEPRECATED] Common Audio Profile debug" - select DEPRECATED - depends on BT_CAP_ACCEPTOR - help - Use this option to enable CAP debug logs for the - Bluetooth Audio functionality. - -config BT_DEBUG_CAP_INITIATOR - bool "[DEPRECATED] Common Audio Profile Initiator debug" - select DEPRECATED - depends on BT_CAP_INITIATOR - help - Use this option to enable CAP Initiator debug logs for the - Bluetooth Audio functionality. - -# CISP - -config BT_DEBUG_CSIP_SET_MEMBER - bool "[DEPRECATED] Coordinated Set Identification Service debug" - select DEPRECATED - help - Use this option to enable Coordinated Set Identification Service debug - logs for the Bluetooth Audio functionality. - -config BT_DEBUG_CSIP_SET_COORDINATOR - bool "[DEPRECATED] Coordinated Set Identification Profile Set Coordinator debug" - select DEPRECATED - help - Use this option to enable Coordinated Set Identification Profile - Set Coordinator debug logs for the Bluetooth Audio functionality. - -config BT_DEBUG_CSIP_SET_MEMBER_CRYPTO - bool "[DEPRECATED] Coordinated Set Identification Profile crypto functions debug" - select DEPRECATED - depends on BT_CSIP_SET_COORDINATOR || BT_CSIP_SET_MEMBER - help - Use this option to enable Coordinated Set Identification Profile - crypto functions debug logs for the Bluetooth Audio functionality. - -# HAS - -config BT_DEBUG_HAS - bool "[DEPRECATED] Hearing Access Service debug" - select DEPRECATED - help - This option enables enables Hearing Access Service debug logs. - -config BT_DEBUG_HAS_CLIENT - bool "[DEPRECATED] Hearing Access Service Client debug" - select DEPRECATED - depends on BT_HAS_CLIENT - help - This option enables enables Hearing Access Service Client debug logs. - -# MCS - -config BT_DEBUG_MCS - bool "[DEPRECATED] Media Control Service debug" - select DEPRECATED - help - Use this option to enable Media Control Service debug logs for the - Bluetooth Audio functionality. - -config BT_DEBUG_MCC - bool "[DEPRECATED] Media Control Client debug" - select DEPRECATED - help - Use this option to enable Media Control Client debug logs for the - Bluetooth Audio functionality. - -# MCTL - -config MCTL_DEBUG - bool "[DEPRECATED] Media control debug" - select DEPRECATED - help - Use this option to enable Media control debug logs - -# MICP - -config BT_DEBUG_MICP_MIC_DEV - bool "[DEPRECATED] Microphone Control Profile Microphone Device debug" - select DEPRECATED - help - Use this option to enable Microphone Control Profile - Microphone Device debug logs for the Bluetooth Audio functionality. - -config BT_DEBUG_MICP_MIC_CTLR - bool "[DEPRECATED] Microphone Control Profile Microphone Controller debug" - select DEPRECATED - help - Use this option to enable Microphone Control Profile Microphone - Controller debug logs for the Bluetooth Audio functionality. - -# MPL - -config BT_DEBUG_MPL - bool "[DEPRECATED] Media player debug" - select DEPRECATED - help - Enables debug logs for the media player - -# PACS - -config BT_DEBUG_PACS - bool "[DEPRECATED] Published Audio Capabilities Service debug" - select DEPRECATED - depends on BT_PACS - help - Use this option to enable Published Audio Capabilities Service debug - logs for the Bluetooth Audio functionality. - -# TBS - -config BT_DEBUG_TBS - bool "[DEPRECATED] Telephone Bearer Service debug" - select DEPRECATED - help - Use this option to enable Telephone Bearer Service debug logs for the - Bluetooth Audio functionality. - -config BT_DEBUG_TBS_CLIENT - bool "[DEPRECATED] Telephone Bearer Service client debug" - select DEPRECATED - help - Use this option to enable Telephone Bearer Service client debug logs - for the Bluetooth Audio functionality. - -# VCP - -config BT_DEBUG_VCP_VOL_REND - bool "[DEPRECATED] Volume Control Profile Volume Renderer debug" - select DEPRECATED - help - Use this option to enable Volume Control Profile debug logs for the - Bluetooth Audio functionality. - -config BT_DEBUG_VCP_VOL_CTLR - bool "[DEPRECATED] Volume Control Profile Volume Controller debug" - select DEPRECATED - help - Use this option to enable Volume Control Profile Volume Controller - debug logs for the Bluetooth Audio functionality. - -# VOCS - -config BT_DEBUG_VOCS - bool "[DEPRECATED] Volume Offset Control Service debug" - select DEPRECATED - help - Use this option to enable Volume Offset Control Service debug logs for - the Bluetooth Audio functionality. - -config BT_DEBUG_VOCS_CLIENT - bool "[DEPRECATED] Volume Offset Control Service client debug" - select DEPRECATED - help - Use this option to enable Volume Offset Control Service client debug - logs for the Bluetooth Audio functionality. - -endmenu # [DEPRECATED] Audio - -menu "[DEPRECATED] Others" - -# CRYPTO (subsys/bluetooth/crypto/Kconfig) - -config BT_DEBUG_CRYPTO - bool "[DEPRECATED] Bluetooth Cryptographic Toolbox debug" - select DEPRECATED - depends on BT_CRYPTO - help - This option enables debug log output for the Bluetooth - Cryptographic Toolbox. - - WARNING: This option prints out private security keys such as - the Long Term Key. - Use of this feature in production is strongly discouraged. - -# GATT - -config BT_DEBUG_ATT - bool "[DEPRECATED] Bluetooth Attribute Protocol (ATT) debug" - select DEPRECATED - help - This option enables debug support for the Bluetooth - Attribute Protocol (ATT). - -config BT_DEBUG_GATT - bool "[DEPRECATED] Bluetooth Generic Attribute Profile (GATT) debug" - select DEPRECATED - help - This option enables debug support for the Bluetooth - Generic Attribute Profile (GATT). - -# L2CAP - -config BT_DEBUG_L2CAP - bool "[DEPRECATED] Bluetooth L2CAP debug" - select DEPRECATED - help - This option enables debug support for the Bluetooth - L2ACP layer. - -# HOST (subsys/bluetooth/host/Kconfig) - -config BT_DEBUG_DF - bool "[DEPRECATED] Bluetooth Direction Finding debug" - select DEPRECATED - help - This option enables debug support for Bluetooth Direction Finding - -config BT_DEBUG_SETTINGS - bool "[DEPRECATED] Bluetooth storage debug" - select DEPRECATED - depends on BT_SETTINGS - help - This option enables debug support for Bluetooth storage. - -config BT_DEBUG_HCI_CORE - bool "[DEPRECATED] Bluetooth HCI core debug" - select DEPRECATED - help - This option enables debug support for Bluetooth HCI - core. - -config BT_DEBUG_CONN - bool "[DEPRECATED] Bluetooth connection debug" - select DEPRECATED - depends on BT_CONN || BT_ISO - help - This option enables debug support for Bluetooth - connection handling. - -config BT_DEBUG_ISO - bool "[DEPRECATED] ISO channel debug" - select DEPRECATED - help - Use this option to enable ISO channels debug logs for the - Bluetooth Audio functionality. - -config BT_DEBUG_KEYS - bool "[DEPRECATED] Bluetooth security keys debug" - select DEPRECATED - depends on BT_HCI_HOST - depends on BT_SMP - help - This option enables debug support for the handling of - Bluetooth security keys. - - WARNING: This option prints out private security keys such as - the Long Term Key. - Use of this feature in production is strongly discouraged. - -config BT_DEBUG_SMP - bool "[DEPRECATED] Bluetooth Security Manager Protocol (SMP) debug" - select DEPRECATED - depends on BT_HCI_HOST - depends on BT_SMP - help - This option enables debug support for the Bluetooth - Security Manager Protocol (SMP). - - WARNING: This option prints out private security keys such as - the Long Term Key. - Use of this feature in production is strongly discouraged. - -config BT_DEBUG_SERVICE - bool "[DEPRECATED] Bluetooth Services debug" - select DEPRECATED - depends on BT_CONN - help - This option enables debug support for the Bluetooth - Services. - -# CONTROLLER (subsys/bluetooth/controller/Kconfig) - -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. - - -endmenu # [DEPRECATED] Others - -menu "[DEPRECATED] BR/EDR" - -config BT_DEBUG_RFCOMM - bool "[DEPRECATED] Bluetooth RFCOMM debug" - select DEPRECATED - depends on BT_RFCOMM - help - This option enables debug support for the Bluetooth - RFCOMM layer. - -config BT_DEBUG_HFP_HF - bool "[DEPRECATED] Bluetooth Hands Free Profile (HFP) debug" - select DEPRECATED - depends on BT_HFP_HF - help - This option enables debug support for the Bluetooth - Hands Free Profile (HFP). - -config BT_DEBUG_AVDTP - bool "[DEPRECATED] Bluetooth AVDTP debug" - select DEPRECATED - depends on BT_AVDTP - help - This option enables debug support for the Bluetooth AVDTP. - -config BT_DEBUG_A2DP - bool "[DEPRECATED] Bluetooth A2DP debug" - select DEPRECATED - depends on BT_A2DP - help - This option enables debug support for the Bluetooth - A2DP profile. - -config BT_DEBUG_SDP - bool "[DEPRECATED] Bluetooth Service Discovery Protocol (SDP) debug" - select DEPRECATED - depends on BT_CLASSIC - help - This option enables debug support for the Bluetooth - Service Discovery Protocol (SDP). - -endmenu # [DEPRECATED] BR/EDR - -# MESH (subsys/bluetooth/mesh/Kconfig) - -menu "[DEPRECATED] Mesh" - -config BT_MESH_DEBUG - bool "[DEPRECATED] Debug logs" - select DEPRECATED - help - Use this option to enable debug logs for the Bluetooth - Mesh functionality. - -config BT_MESH_DEBUG_NET - bool "[DEPRECATED] Network layer debug" - select DEPRECATED - help - Use this option to enable Network layer debug logs for the - Bluetooth Mesh functionality. - -config BT_MESH_DEBUG_RPL - bool "[DEPRECATED] Replay protection list debug" - select DEPRECATED - help - Use this option to enable Replay protection list debug logs - for the Bluetooth Mesh functionality. - -config BT_MESH_DEBUG_TRANS - bool "[DEPRECATED] Transport layer debug" - select DEPRECATED - help - Use this option to enable Transport layer debug logs for the - Bluetooth Mesh functionality. - -config BT_MESH_DEBUG_BEACON - bool "[DEPRECATED] Beacon debug" - select DEPRECATED - help - Use this option to enable Beacon-related debug logs for the - Bluetooth Mesh functionality. - -config BT_MESH_DEBUG_CRYPTO - bool "[DEPRECATED] Crypto debug" - select DEPRECATED - help - Use this option to enable cryptographic debug logs for the - Bluetooth Mesh functionality. - -config BT_MESH_DEBUG_KEYS - bool "[DEPRECATED] Key management debug" - select DEPRECATED - help - Use this option to enable key management debug logs for the - Bluetooth Mesh functionality. - -config BT_MESH_DEBUG_PROV - bool "[DEPRECATED] Provisioning debug" - select DEPRECATED - help - Use this option to enable Provisioning debug logs for the - Bluetooth Mesh functionality. - -config BT_MESH_DEBUG_PROVISIONER - bool "[DEPRECATED] Provisioner debug" - select DEPRECATED - help - Use this option to enable Provisioner debug logs for the - Bluetooth Mesh functionality. - -config BT_MESH_DEBUG_PROV_DEVICE - bool "[DEPRECATED] Provisioning device debug" - select DEPRECATED - help - Use this option to enable Provisioning device debug logs for the - Bluetooth Mesh functionality. - -config BT_MESH_DEBUG_ACCESS - bool "[DEPRECATED] Access layer debug" - select DEPRECATED - help - Use this option to enable Access layer and device composition - related debug logs for Bluetooth Mesh. - -config BT_MESH_DEBUG_MODEL - bool "[DEPRECATED] Foundation model debug" - select DEPRECATED - help - Use this option to enable debug logs for the Foundation - Models. - -config BT_MESH_DEBUG_ADV - bool "[DEPRECATED] Advertising debug" - select DEPRECATED - help - Use this option to enable advertising debug logs for - the Bluetooth Mesh functionality. - -config BT_MESH_DEBUG_LOW_POWER - bool "[DEPRECATED] Low Power debug" - select DEPRECATED - help - Use this option to enable Low Power debug logs for the - Bluetooth Mesh functionality. - -config BT_MESH_DEBUG_FRIEND - bool "[DEPRECATED] Friend debug" - select DEPRECATED - help - Use this option to enable Friend debug logs for the - Bluetooth Mesh functionality. - -config BT_MESH_DEBUG_PROXY - bool "[DEPRECATED] Proxy debug" - select DEPRECATED - depends on BT_MESH_GATT - help - Use this option to enable Proxy protocol debug logs. - -config BT_MESH_DEBUG_SETTINGS - bool "[DEPRECATED] Persistent settings debug" - select DEPRECATED - depends on BT_SETTINGS - help - Use this option to enable persistent settings debug logs. - -config BT_MESH_DEBUG_CDB - bool "[DEPRECATED] Configuration database debug" - select DEPRECATED - depends on BT_MESH_CDB - help - Use this option to enable configuration database debug logs. - -config BT_MESH_DEBUG_CFG - bool "[DEPRECATED] Configuration debug" - select DEPRECATED - help - Use this option to enable node configuration debug logs for the - Bluetooth Mesh functionality. - -endmenu # [DEPRECATED] Mesh - -menu "[DEPRECATED] Services" - -# IAS - -config BT_DEBUG_IAS_CLIENT - bool "[DEPRECATED] Immediate Alert Service Client debug" - select DEPRECATED - depends on BT_IAS_CLIENT - help - This option enables enables Immediate Alert Service Client debug logs. - -# OTS - -# TODO: Unify logging for OTS server and client - the client uses -# "BT" debugging, the server does not. - -config BT_DEBUG_OTS_CLIENT - bool "[DEPRECATED] Object Transfer Service Client debug" - select DEPRECATED - help - Use this option to enable Object Transfer Client debug logs - -endmenu # [DEPRECATED] Services - -endmenu # Bluetooth legacy logging options - -endif # BT_LOG_LEGACY - # (subsys/bluetooth/Kconfig) module = BT module-str = "Bluetooth" source "subsys/logging/Kconfig.template.log_config" +# Set BT as the parent module for all the symbols that will use +# `Kconfig.template.log_config_inherit`. This is more convenient to do it here +# instead of setting it for every modules. +# +# The downside of doing that is that people need to be careful when adding a new +# parent module because all the following symbol will use it. +parent-module = BT + # COMMON (subsys/bluetooth/common/Kconfig) module = BT_HCI_DRIVER -legacy-debug-sym = BT_DEBUG_HCI_DRIVER module-str = "Bluetooth HCI driver" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_RPA -legacy-debug-sym = BT_DEBUG_RPA module-str = "Bluetooth Resolvable Private Address (RPA)" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" menu "Audio" # AICS module = BT_AICS -legacy-debug-sym = BT_DEBUG_AICS module-str = "Audio Input Control Service" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_AICS_CLIENT -legacy-debug-sym = BT_DEBUG_AICS_CLIENT module-str = "Audio Input Control Service client" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" # BAP module = BT_BAP_STREAM -legacy-debug-sym = BT_BAP_DEBUG_STREAM module-str = "Bluetooth Audio Stream" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" -parent-module = BT module = BT_BAP_BASE module-str = "Bluetooth Basic Audio Profile Broadcast Audio Source Endpoint" source "subsys/logging/Kconfig.template.log_config_inherit" -parent-module = BT module = BT_AUDIO_CODEC module-str = "Bluetooth Audio Codec" source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_ASCS -legacy-debug-sym = BT_DEBUG_ASCS module-str = "Audio Stream Control Service" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_BAP_UNICAST_SERVER -legacy-debug-sym = BT_DEBUG_BAP_UNICAST_SERVER module-str = "Bluetooth Audio Unicast Server" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_BAP_UNICAST_CLIENT -legacy-debug-sym = BT_DEBUG_BAP_UNICAST_CLIENT module-str = "Basic Audio Profile" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_BAP_BROADCAST_SOURCE -legacy-debug-sym = BT_DEBUG_BAP_BROADCAST_SOURCE module-str = "Bluetooth Audio Broadcast Source" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_BAP_BROADCAST_SINK -legacy-debug-sym = BT_DEBUG_BAP_BROADCAST_SINK module-str = "Bluetooth Audio Broadcast Sink" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_BAP_SCAN_DELEGATOR -legacy-debug-sym = BT_DEBUG_BAP_SCAN_DELEGATOR module-str = "Broadcast Audio Scan Service" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_BAP_BROADCAST_ASSISTANT -legacy-debug-sym = BT_DEBUG_BAP_BROADCAST_ASSISTANT module-str = "Broadcast Audio Scan Service client debug" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" -parent-module = BT module = BT_BAP_ISO module-str = "Bluetooth Audio ISO" source "subsys/logging/Kconfig.template.log_config_inherit" @@ -712,26 +97,21 @@ source "subsys/logging/Kconfig.template.log_config_inherit" # CAP module = BT_CAP_ACCEPTOR -legacy-debug-sym = BT_DEBUG_CAP_ACCEPTOR module-str = "Common Audio Profile Acceptor" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_CAP_INITIATOR -legacy-debug-sym = BT_DEBUG_CAP_INITIATOR module-str = "Common Audio Profile Initiator" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" -parent-module = BT module = BT_CAP_COMMANDER module-str = "Common Audio Profile Commander" source "subsys/logging/Kconfig.template.log_config_inherit" -parent-module = BT module = BT_CAP_COMMON module-str = "Common Audio Profile Common" source "subsys/logging/Kconfig.template.log_config_inherit" -parent-module = BT module = BT_CAP_STREAM module-str = "Common Audio Profile Stream" source "subsys/logging/Kconfig.template.log_config_inherit" @@ -739,112 +119,94 @@ source "subsys/logging/Kconfig.template.log_config_inherit" # CSIP module = BT_CSIP_SET_MEMBER -legacy-debug-sym = BT_DEBUG_CSIP_SET_MEMBER module-str = "Coordinated Set Identification Service" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_CSIP_SET_COORDINATOR -legacy-debug-sym = BT_DEBUG_CSIP_SET_COORDINATOR module-str = "Coordinated Set Identification Profile Set Coordinator" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_CSIP_SET_MEMBER_CRYPTO -legacy-debug-sym = BT_DEBUG_CSIP_SET_MEMBER_CRYPTO module-str = "Coordinated Set Identification Profile crypto functions" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" # HAS module = BT_HAS -legacy-debug-sym = BT_DEBUG_HAS module-str = "Hearing Access Service" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_HAS_CLIENT -legacy-debug-sym = BT_DEBUG_HAS_CLIENT module-str = "Hearing Access Service Client" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" # MCS module = BT_MCS -legacy-debug-sym = BT_DEBUG_MCS module-str = "Media Control Service" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_MCC -legacy-debug-sym = BT_DEBUG_MCC module-str = "Media Control Client" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" # MCTL module = MCTL -legacy-debug-sym = MCTL_DEBUG module-str = "Media control" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" # MICP module = BT_MICP_MIC_DEV -legacy-debug-sym = BT_DEBUG_MICP_MIC_DEV module-str = "Microphone Control Profile Microphone Device" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_MICP_MIC_CTLR -legacy-debug-sym = BT_DEBUG_MICP_MIC_CTLR module-str = "Microphone Control Profile Microphone Controller" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" # MPL module = BT_MPL -legacy-debug-sym = BT_DEBUG_MPL module-str = "Media player" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" # PACS module = BT_PACS -legacy-debug-sym = BT_DEBUG_PACS module-str = "Published Audio Capabilities Service" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" # TBS module = BT_TBS -legacy-debug-sym = BT_DEBUG_TBS module-str = "Telephone Bearer Service" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_TBS_CLIENT -legacy-debug-sym = BT_DEBUG_TBS_CLIENT module-str = "Telephone Bearer Service client" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" # VCP module = BT_VCP_VOL_REND -legacy-debug-sym = BT_DEBUG_VCP_VOL_REND module-str = "Volume Control Profile Voluem Renderer" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_VCP_VOL_CTLR -legacy-debug-sym = BT_DEBUG_VCP_VOL_CTLR module-str = "Volume Control Profile Volume Controller" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" # VOCS module = BT_VOCS -legacy-debug-sym = BT_DEBUG_VOCS module-str = "Volume Offset Control Service" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_VOCS_CLIENT -legacy-debug-sym = BT_DEBUG_VOCS_CLIENT module-str = "Volume Offset Control Service client" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" # PBP @@ -859,32 +221,27 @@ menu "Others" # CRYPTO (subsys/bluetooth/crypto/Kconfig) module = BT_CRYPTO -legacy-debug-sym = BT_DEBUG_CRYPTO module-str = "Bluetooth Cryptographic Toolbox" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" # GATT module = BT_ATT -legacy-debug-sym = BT_DEBUG_ATT module-str = "Bluetooth Attribute Protocol (ATT)" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_GATT -legacy-debug-sym = BT_DEBUG_GATT module-str = "Bluetooth Generic Attribute Profile (GATT)" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" # L2CAP module = BT_L2CAP -legacy-debug-sym = BT_DEBUG_L2CAP module-str = "Bluetooth L2CAP" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" # LIB (subsys/bluetooth/lib/Kconfig) -parent-module = BT module = BT_EAD module-str = "Bluetooth Encrypted Advertising Data" source "subsys/logging/Kconfig.template.log_config_inherit" @@ -892,80 +249,66 @@ source "subsys/logging/Kconfig.template.log_config_inherit" # HOST (subsys/bluetooth/host/Kconfig) module = BT_DF -legacy-debug-sym = BT_DEBUG_DF module-str = "Bluetooth Direction Finding" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_SETTINGS -legacy-debug-sym = BT_DEBUG_SETTINGS module-str = "Bluetooth storage" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_HCI_CORE -legacy-debug-sym = BT_DEBUG_HCI_CORE module-str = "Bluetooth HCI core" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_CONN -legacy-debug-sym = BT_DEBUG_CONN module-str = "Bluetooth connection" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_ISO -legacy-debug-sym = BT_DEBUG_ISO module-str = "ISO channel" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_KEYS -legacy-debug-sym = BT_DEBUG_KEYS module-str = "Bluetooth security keys" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_SMP -legacy-debug-sym = BT_DEBUG_SMP module-str = "Bluetooth Security Manager Protocol" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_SERVICE -legacy-debug-sym = BT_DEBUG_SERVICE module-str = "Bluetooth Services" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" # CONTROLLER (subsys/bluetooth/controller/Kconfig) 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" endmenu # Others menu "BR/EDR" module = BT_RFCOMM -legacy-debug-sym = BT_DEBUG_RFCOMM module-str = "Bluetooth RFCOMM" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_HFP_HF -legacy-debug-sym = BT_DEBUG_HFP_HF module-str = "Bluetooth Hands Free Profile (HFP)" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_AVDTP -legacy-debug-sym = BT_DEBUG_AVDTP module-str = "Bluetooth AVDTP debug" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_A2DP -legacy-debug-sym = BT_DEBUG_A2DP module-str = "Bluetooth A2DP" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_SDP -legacy-debug-sym = BT_DEBUG_SDP module-str = "Bluetooth Service Discovery Protocol (SDP)" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" endmenu # BR/EDR @@ -974,103 +317,84 @@ endmenu # BR/EDR menu "Mesh" module = BT_MESH -legacy-debug-sym = BT_MESH_DEBUG module-str = "Debug logs" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_MESH_NET -legacy-debug-sym = BT_MESH_DEBUG_NET module-str = "Network layer" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_MESH_RPL -legacy-debug-sym = BT_MESH_DEBUG_RPL module-str = "Replay protection list" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_MESH_TRANS -legacy-debug-sym = BT_MESH_DEBUG_TRANS module-str = "Transport layer" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_MESH_BEACON -legacy-debug-sym = BT_MESH_DEBUG_BEACON module-str = "Beacon" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_MESH_CRYPTO -legacy-debug-sym = BT_MESH_DEBUG_CRYPTO module-str = "Crypto" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_MESH_KEYS -legacy-debug-sym = BT_MESH_DEBUG_KEYS module-str = "Key management" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_MESH_PROV -legacy-debug-sym = BT_MESH_DEBUG_PROV module-str = "Provisioning" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_MESH_PROVISIONER -legacy-debug-sym = BT_MESH_DEBUG_PROVISIONER module-str = "Provisioner" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_MESH_PROVISIONEE -legacy-debug-sym = BT_MESH_DEBUG_PROV_DEVICE module-str = "Provisioning device" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_MESH_ACCESS -legacy-debug-sym = BT_MESH_DEBUG_ACCESS module-str = "Access layer" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_MESH_MODEL -legacy-debug-sym = BT_MESH_DEBUG_MODEL module-str = "Foundation model" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_MESH_DFU module-str = "DFU model" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_MESH_ADV -legacy-debug-sym = BT_MESH_DEBUG_ADV module-str = "Advertising" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_MESH_LOW_POWER -legacy-debug-sym = BT_MESH_DEBUG_LOW_POWER module-str = "Low Power" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_MESH_FRIEND -legacy-debug-sym = BT_MESH_DEBUG_FRIEND module-str = "Friend" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_MESH_PROXY -legacy-debug-sym = BT_MESH_DEBUG_PROXY module-str = "Proxy" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_MESH_SETTINGS -legacy-debug-sym = BT_MESH_DEBUG_SETTINGS module-str = "Persistent settings" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_MESH_CDB -legacy-debug-sym = BT_MESH_DEBUG_CDB module-str = "Configuration database" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_MESH_CFG -legacy-debug-sym = BT_MESH_DEBUG_CFG module-str = "Configuration" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" endmenu # Mesh @@ -1097,9 +421,8 @@ source "subsys/logging/Kconfig.template.log_config" # IAS module = BT_IAS_CLIENT -legacy-debug-sym = BT_DEBUG_IAS_CLIENT module-str = "Immediate Alert Service Client" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_IAS module-str = IAS @@ -1108,9 +431,8 @@ source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config" # OTS (subsys/bluetooth/services/ots/Kconfig) module = BT_OTS_CLIENT -legacy-debug-sym = BT_DEBUG_OTS_CLIENT module-str = "Object Transfer Service Client" -source "subsys/bluetooth/common/Kconfig.template.log_config_bt" +source "subsys/logging/Kconfig.template.log_config_inherit" module = BT_OTS module-str = BT_OTS diff --git a/subsys/bluetooth/audio/Kconfig.tmap b/subsys/bluetooth/audio/Kconfig.tmap index 9a9d6c61d26..a2bc94d6fb9 100644 --- a/subsys/bluetooth/audio/Kconfig.tmap +++ b/subsys/bluetooth/audio/Kconfig.tmap @@ -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" diff --git a/subsys/bluetooth/common/Kconfig.template.log_config_bt b/subsys/bluetooth/common/Kconfig.template.log_config_bt deleted file mode 100644 index 0a1a865cfaf..00000000000 --- a/subsys/bluetooth/common/Kconfig.template.log_config_bt +++ /dev/null @@ -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" diff --git a/subsys/bluetooth/mesh/rpr_cli.c b/subsys/bluetooth/mesh/rpr_cli.c index cbb92e75b40..5d5aeb9ee60 100644 --- a/subsys/bluetooth/mesh/rpr_cli.c +++ b/subsys/bluetooth/mesh/rpr_cli.c @@ -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); diff --git a/subsys/bluetooth/mesh/rpr_srv.c b/subsys/bluetooth/mesh/rpr_srv.c index d31368f3178..ed8d87f3c04 100644 --- a/subsys/bluetooth/mesh/rpr_srv.c +++ b/subsys/bluetooth/mesh/rpr_srv.c @@ -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); diff --git a/tests/bluetooth/ctrl_isoal/Kconfig b/tests/bluetooth/ctrl_isoal/Kconfig index 30049d53a5e..e6623e8e3b2 100644 --- a/tests/bluetooth/ctrl_isoal/Kconfig +++ b/tests/bluetooth/ctrl_isoal/Kconfig @@ -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"