patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

Bluetooth: Logging: Move all logging symbols together

Browse source 
Move all Kconfig symbols related to Bluetooth logging into the newly
created `Kconfig.logging`. The logging symbols are now grouped by into a
menu "Bluetooth logging". Closely related symbols are grouped with each
others. For example, audio related logging symbol are found behind a
submenu "Audio" inside the "Bluetooth logging".

The deprecated logging symbols have also been moved in a submenu of
"Bluetooth logging", it's easier to avoid them so.

Behavior of the Bluetooth logging system:

When `LOG` symbol is selected, if Bluetooth is enabled (`BT` symbol
selected), the Bluetooth logging is enabled.

If the user does not set any log level, the Bluetooth logging symbols
will inherit the log level of `BT_LOG_LEVEL`. If the user does not set
the level of `BT_LOG_LEVEL`, the default log level will be the one
defined by the logging subsystem. Which currently is `LOG_LEVEL_INF`.

Signed-off-by: Théo Battrel <theo.battrel@nordicsemi.no>
This commit is contained in:
Théo Battrel 2023-03-24 09:56:04 +01:00 committed by Carles Cufí
parent 3af095b122
commit af01a0f313
27 changed files with 1086 additions and 990 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
subsys/bluetooth/Kconfig
View file

@ -15,10 +15,6 @@ menuconfig BT
if BT
module = BT
module-str = bt
source "subsys/logging/Kconfig.template.log_config"
choice BT_STACK_SELECTION
prompt "Bluetooth Stack Selection"
default BT_HCI
@ -188,6 +184,7 @@ rsource "controller/Kconfig"
rsource "shell/Kconfig"
rsource "crypto/Kconfig"
rsource "lib/Kconfig"
rsource "Kconfig.logging"
endif # BT_HCI

1083
subsys/bluetooth/Kconfig.logging Normal file
View file

File diff suppressed because it is too large Load diff

32
subsys/bluetooth/audio/Kconfig.aics
View file

@ -32,20 +32,6 @@ config BT_AICS_MAX_INPUT_DESCRIPTION_SIZE
help
This option sets the maximum input description size in octets.
############# DEBUG #############
config BT_DEBUG_AICS
bool "Audio Input Control Service debug"
select DEPRECATED
help
Use this option to enable Audio Input Control Service debug logs for
the Bluetooth Audio functionality.
module = BT_AICS
legacy-debug-sym = BT_DEBUG_AICS
module-str = "Audio Input Control Service"
source "subsys/bluetooth/common/Kconfig.template.log_config_bt"
endif # BT_AICS
##################### Audio Input Control Service Client #####################
@ -64,21 +50,3 @@ config BT_AICS_CLIENT
select EXPERIMENTAL
help
This hidden option enables support for Audio Input Control Service.
if BT_AICS_CLIENT
############# DEBUG #############
config BT_DEBUG_AICS_CLIENT
bool "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.
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"
endif # BT_AICS_CLIENT

113
subsys/bluetooth/audio/Kconfig.bap
View file

@ -253,23 +253,6 @@ config BT_BAP_BROADCAST_ASSISTANT_RECV_STATE_COUNT
endif # BT_BAP_BROADCAST_ASSISTANT
config BT_BAP_DEBUG_STREAM
bool "Basic Audio Profile Stream debug"
select DEPRECATED
depends on BT_BAP_STREAM
help
Use this option to enable Basic Audio Profile Stream debug logs.
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"
parent-module = BT
module = BT_AUDIO_CODEC
module-str = "Bluetooth Audio Codec"
source "subsys/logging/Kconfig.template.log_config_inherit"
config BT_BAP_DEBUG_STREAM_DATA
bool "Bluetooth Audio Stream data debug"
depends on BT_BAP_STREAM_LOG_LEVEL_DBG
@ -278,107 +261,11 @@ config BT_BAP_DEBUG_STREAM_DATA
the Bluetooth Audio functionality. This will enable debug logs for all
audio data received and sent.
config BT_DEBUG_ASCS
bool "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.
module = BT_ASCS
legacy-debug-sym = BT_DEBUG_ASCS
module-str = "Audio Stream Control Service"
source "subsys/bluetooth/common/Kconfig.template.log_config_bt"
config BT_DEBUG_BAP_UNICAST_SERVER
bool "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.
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"
config BT_DEBUG_BAP_UNICAST_CLIENT
bool "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.
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"
config BT_DEBUG_BAP_BROADCAST_SOURCE
bool "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.
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"
config BT_DEBUG_BAP_BROADCAST_SINK
bool "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.
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"
config BT_DEBUG_BAP_SCAN_DELEGATOR
bool "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.
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"
config BT_DEBUG_BAP_BROADCAST_ASSISTANT
bool "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.
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"
config BT_BAP_STREAM
# Virtual/hidden option
bool
default y if BT_ASCS || BT_BAP_UNICAST_CLIENT || \
BT_BAP_BROADCAST_SOURCE || BT_BAP_BROADCAST_SINK
parent-module = BT
module = BT_BAP_ISO
module-str = "Bluetooth Audio ISO"
source "subsys/logging/Kconfig.template.log_config_inherit"
rsource "Kconfig.pacs"
rsource "Kconfig.ascs"

36
subsys/bluetooth/audio/Kconfig.cap
View file

@ -26,45 +26,9 @@ config BT_CAP_ACCEPTOR_SET_MEMBER
Enabling will take one of the allocated CSIS instances
(BT_CSIP_SET_MEMBER_MAX_INSTANCE_COUNT).
config BT_DEBUG_CAP_ACCEPTOR
bool "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.
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"
config BT_CAP_INITIATOR
bool "Common Audio Profile Initiator Role Support [EXPERIMENTAL]"
depends on (BT_BAP_UNICAST_CLIENT && BT_CSIP_SET_COORDINATOR) || BT_BAP_BROADCAST_SOURCE
select EXPERIMENTAL
help
Enabling this will enable the CAP Initiator role.
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"
config BT_DEBUG_CAP_INITIATOR
bool "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.
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"
parent-module = BT
module = BT_CAP_STREAM
module-str = "Common Audio Profile Stream"
source "subsys/logging/Kconfig.template.log_config_inherit"

41
subsys/bluetooth/audio/Kconfig.csip
View file

@ -47,20 +47,6 @@ config BT_CSIP_SET_MEMBER_MAX_INSTANCE_COUNT
Enabling BT_CAP_ACCEPTOR_SET_MEMBER will take one of the allocated
instances.
############### DEBUG ###############
config BT_DEBUG_CSIP_SET_MEMBER
bool "Coordinated Set Identification Service debug"
select DEPRECATED
help
Use this option to enable Coordinated Set Identification Service debug
logs for the Bluetooth Audio functionality.
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"
endif # BT_CSIP_SET_MEMBER
#################### Coordinated Set Identification Client ####################
@ -101,31 +87,4 @@ config BT_CSIP_SET_COORDINATOR_ENC_SIRK_SUPPORT
help
Enables support encrypting the SIRK.
############### DEBUG ###############
config BT_DEBUG_CSIP_SET_COORDINATOR
bool "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.
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"
endif # BT_CSIP_SET_COORDINATOR
config BT_DEBUG_CSIP_SET_MEMBER_CRYPTO
bool "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.
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"

23
subsys/bluetooth/audio/Kconfig.has
View file

@ -34,17 +34,6 @@ config BT_HAS_PRESET_NAME_DYNAMIC
endif # BT_HAS_PRESET_SUPPORT
config BT_DEBUG_HAS
bool "Hearing Access Service debug"
select DEPRECATED
help
This option enables enables Hearing Access Service debug logs.
module = BT_HAS
legacy-debug-sym = BT_DEBUG_HAS
module-str = "Hearing Access Service"
source "subsys/bluetooth/common/Kconfig.template.log_config_bt"
endif # BT_HAS
config BT_HAS_CLIENT
@ -56,15 +45,3 @@ config BT_HAS_CLIENT
select UTF8
help
This option enables support for Hearing Access Service Client.
config BT_DEBUG_HAS_CLIENT
bool "Hearing Access Service Client debug"
select DEPRECATED
depends on BT_HAS_CLIENT
help
This option enables enables Hearing Access Service Client debug logs.
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"

30
subsys/bluetooth/audio/Kconfig.mcs
View file

@ -17,22 +17,6 @@ config BT_MCS
help
This option enables support for the Media Control Service.
if BT_MCS
config BT_DEBUG_MCS
bool "Media Control Service debug"
select DEPRECATED
help
Use this option to enable Media Control Service debug logs for the
Bluetooth Audio functionality.
module = BT_MCS
legacy-debug-sym = BT_DEBUG_MCS
module-str = "Media Control Service"
source "subsys/bluetooth/common/Kconfig.template.log_config_bt"
endif # BT_MCS
#### Media Control Client ################################
config BT_MCC
@ -136,18 +120,4 @@ config BT_MCC_SHELL
help
This option enables shell support for the Media Control Client.
#### MCC Debug logs ####
config BT_DEBUG_MCC
bool "Media Control Client debug"
select DEPRECATED
help
Use this option to enable Media Control Client debug logs for the
Bluetooth Audio functionality.
module = BT_MCC
legacy-debug-sym = BT_DEBUG_MCC
module-str = "Media Control Client"
source "subsys/bluetooth/common/Kconfig.template.log_config_bt"
endif # BT_MCC

11
subsys/bluetooth/audio/Kconfig.mctl
View file

@ -57,15 +57,4 @@ config MCTL_REMOTE_PLAYER_CONTROL_OBJECTS
This options enables support for accessing objects (tracks, groups,
search results, ...) on a remote media player
config MCTL_DEBUG
bool "Media control debug"
select DEPRECATED
help
Use this option to enable Media control debug logs
module = MCTL
legacy-debug-sym = MCTL_DEBUG
module-str = "Media control"
source "subsys/bluetooth/common/Kconfig.template.log_config_bt"
endif # MCTL

28
subsys/bluetooth/audio/Kconfig.micp
View file

@ -33,20 +33,6 @@ config BT_MICP_MIC_DEV_AICS
This hidden option makes it possible to easily check if AICS is
enabled for Microphone Control Profile Microphone Device.
############# DEBUG #############
config BT_DEBUG_MICP_MIC_DEV
bool "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.
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"
endif # BT_MICP_MIC_DEV
########### Microphone Control Profile Microphone Controller ###########
@ -77,18 +63,4 @@ config BT_MICP_MIC_CTLR_AICS
This hidden option makes it possible to easily check if AICS is
enabled for MICP client.
############# DEBUG #############
config BT_DEBUG_MICP_MIC_CTLR
bool "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.
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"
endif # BT_MICP_MIC_CTLR

11
subsys/bluetooth/audio/Kconfig.mpl
View file

@ -107,15 +107,4 @@ config BT_MPL_TRACK_MAX_SIZE
endif # BT_MPL_OBJECTS
config BT_DEBUG_MPL
bool "Media player debug"
select DEPRECATED
help
Enables debug logs for the media player
module = BT_MPL
legacy-debug-sym = BT_DEBUG_MPL
module-str = "Media player"
source "subsys/bluetooth/common/Kconfig.template.log_config_bt"
endif # BT_MPL

13
subsys/bluetooth/audio/Kconfig.pacs
View file

@ -88,17 +88,4 @@ endif # BT_PAC_SRC
config BT_PACS
def_bool BT_PAC_SNK || BT_PAC_SRC
config BT_DEBUG_PACS
bool "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.
module = BT_PACS
legacy-debug-sym = BT_DEBUG_PACS
module-str = "Published Audio Capabilities Service"
source "subsys/bluetooth/common/Kconfig.template.log_config_bt"
endmenu

29
subsys/bluetooth/audio/Kconfig.tbs
View file

@ -126,21 +126,6 @@ config BT_TBS_AUTHORIZATION
If set to true, then any writable characteristics will require
authorization per connection.
############# DEBUG #############
config BT_DEBUG_TBS
bool "Telephone Bearer Service debug"
select DEPRECATED
help
Use this option to enable Telephone Bearer Service debug logs for the
Bluetooth Audio functionality.
module = BT_TBS
legacy-debug-sym = BT_DEBUG_TBS
module-str = "Telephone Bearer Service"
source "subsys/bluetooth/common/Kconfig.template.log_config_bt"
endif # BT_TBS
@ -322,20 +307,6 @@ config BT_TBS_CLIENT_CALL_FRIENDLY_NAME
help
This option enables support for reading Call Friendly Name.
############# DEBUG #############
config BT_DEBUG_TBS_CLIENT
bool "Telephone Bearer Service client debug"
select DEPRECATED
help
Use this option to enable Telephone Bearer Service client debug logs
for the Bluetooth Audio functionality.
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"
endif # BT_TBS_CLIENT
if BT_TBS || BT_TBS_CLIENT

28
subsys/bluetooth/audio/Kconfig.vcp
View file

@ -46,20 +46,6 @@ config BT_VCP_VOL_REND_AICS
This hidden option makes it possible to easily check if AICS is
enabled for VCS.
############# DEBUG #############
config BT_DEBUG_VCP_VOL_REND
bool "Volume Control Profile Volume Renderer debug"
select DEPRECATED
help
Use this option to enable Volume Control Profile debug logs for the
Bluetooth Audio functionality.
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"
endif # BT_VCP_VOL_REND
################### Volume Control Profile Volume Controller ###################
@ -105,18 +91,4 @@ config BT_VCP_VOL_CTLR_AICS
This hidden option makes it possible to easily check if AICS is
enabled for VCS client.
############# DEBUG #############
config BT_DEBUG_VCP_VOL_CTLR
bool "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.
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"
endif # BT_VCP_VOL_CTLR

32
subsys/bluetooth/audio/Kconfig.vocs
View file

@ -31,20 +31,6 @@ config BT_VOCS_MAX_OUTPUT_DESCRIPTION_SIZE
help
This option sets the maximum output description size in octets.
############# DEBUG #############
config BT_DEBUG_VOCS
bool "Volume Offset Control Service debug"
select DEPRECATED
help
Use this option to enable Volume Offset Control Service debug logs for
the Bluetooth Audio functionality.
module = BT_VOCS
legacy-debug-sym = BT_DEBUG_VOCS
module-str = "Volume Offset Control Service"
source "subsys/bluetooth/common/Kconfig.template.log_config_bt"
endif # BT_VOCS
##################### Volume Offset Control Service Client #####################
@ -63,21 +49,3 @@ config BT_VOCS_CLIENT
select EXPERIMENTAL
help
This hidden option enables support for Volume Offset Control Service.
if BT_VOCS_CLIENT
############# DEBUG #############
config BT_DEBUG_VOCS_CLIENT
bool "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.
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"
endif # BT_VOCS_CLIENT

30
subsys/bluetooth/common/Kconfig
View file

@ -368,33 +368,3 @@ config BT_DEBUG_MONITOR_RTT_BUFFER_SIZE
endif # BT_DEBUG_MONITOR_RTT
endchoice # Bluetooth debug type
if BT_DEBUG
config BT_DEBUG_HCI_DRIVER
bool "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.
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"
config BT_DEBUG_RPA
bool "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.
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"
endif # BT_DEBUG

17
subsys/bluetooth/crypto/Kconfig
View file

@ -8,20 +8,3 @@ config BT_CRYPTO
select TINYCRYPT_AES_CMAC
help
This option enables the Bluetooth Cryptographic Toolbox.
config BT_DEBUG_CRYPTO
bool "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.
module = BT_CRYPTO
legacy-debug-sym = BT_DEBUG_CRYPTO
module-str = "Bluetooth Cryptographic Toolbox"
source "subsys/bluetooth/common/Kconfig.template.log_config_bt"

173
subsys/bluetooth/host/Kconfig
View file

@ -880,17 +880,6 @@ config BT_DF_VS_CONN_IQ_REPORT_16_BITS_IQ_SAMPLES
extenstion to handle connection IQ report with samples that are in 16 bit signed integer
format.
config BT_DEBUG_DF
bool "Bluetooth Direction Finding debug"
select DEPRECATED
help
This option enables debug support for Bluetooth Direction Finding
module = BT_DF
legacy-debug-sym = BT_DEBUG_DF
module-str = "Bluetooth Direction Finding"
source "subsys/bluetooth/common/Kconfig.template.log_config_bt"
endif # BT_DF
endif # BT_HCI_HOST
@ -939,55 +928,6 @@ config BT_PER_ADV_SYNC_BUF_SIZE
if BT_DEBUG
config BT_DEBUG_SETTINGS
bool "Bluetooth storage debug"
select DEPRECATED
depends on BT_SETTINGS
help
This option enables debug support for Bluetooth storage.
module = BT_SETTINGS
legacy-debug-sym = BT_DEBUG_SETTINGS
module-str = "Bluetooth storage"
source "subsys/bluetooth/common/Kconfig.template.log_config_bt"
config BT_DEBUG_HCI_CORE
bool "Bluetooth HCI core debug"
select DEPRECATED
help
This option enables debug support for Bluetooth HCI
core.
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"
config BT_DEBUG_CONN
bool "Bluetooth connection debug"
select DEPRECATED
depends on BT_CONN || BT_ISO
help
This option enables debug support for Bluetooth
connection handling.
module = BT_CONN
legacy-debug-sym = BT_DEBUG_CONN
module-str = "Bluetooth connection"
source "subsys/bluetooth/common/Kconfig.template.log_config_bt"
config BT_DEBUG_ISO
bool "ISO channel debug"
select DEPRECATED
help
Use this option to enable ISO channels debug logs for the
Bluetooth Audio functionality.
module = BT_ISO
legacy-debug-sym = BT_DEBUG_ISO
module-str = "ISO channel"
source "subsys/bluetooth/common/Kconfig.template.log_config_bt"
config BT_DEBUG_ISO_DATA
bool "ISO channel data debug"
depends on BT_ISO_LOG_LEVEL_DBG
@ -996,42 +936,6 @@ config BT_DEBUG_ISO_DATA
Bluetooth Audio functionality. This will enable debug logs for all
ISO data received and sent.
config BT_DEBUG_KEYS
bool "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.
module = BT_KEYS
legacy-debug-sym = BT_DEBUG_KEYS
module-str = "Bluetooth security keys"
source "subsys/bluetooth/common/Kconfig.template.log_config_bt"
config BT_DEBUG_SMP
bool "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.
module = BT_SMP
legacy-debug-sym = BT_DEBUG_SMP
module-str = "Bluetooth Security Manager Protocol"
source "subsys/bluetooth/common/Kconfig.template.log_config_bt"
config BT_SMP_SELFTEST
bool "Bluetooth SMP self tests executed on init"
depends on BT_SMP_LOG_LEVEL_DBG
@ -1047,83 +951,6 @@ config BT_SMP_FORCE_BREDR
supporting BR/EDR Secure Connections. This option is solely for
testing and should never be enabled on production devices.
config BT_DEBUG_RFCOMM
bool "Bluetooth RFCOMM debug"
select DEPRECATED
depends on BT_RFCOMM
help
This option enables debug support for the Bluetooth
RFCOMM layer.
module = BT_RFCOMM
legacy-debug-sym = BT_DEBUG_RFCOMM
module-str = "Bluetooth RFCOMM"
source "subsys/bluetooth/common/Kconfig.template.log_config_bt"
config BT_DEBUG_HFP_HF
bool "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).
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"
config BT_DEBUG_AVDTP
bool "Bluetooth AVDTP debug"
select DEPRECATED
depends on BT_AVDTP
help
This option enables debug support for the Bluetooth AVDTP.
module = BT_AVDTP
legacy-debug-sym = BT_DEBUG_AVDTP
module-str = "Bluetooth AVDTP debug"
source "subsys/bluetooth/common/Kconfig.template.log_config_bt"
config BT_DEBUG_A2DP
bool "Bluetooth A2DP debug"
select DEPRECATED
depends on BT_A2DP
help
This option enables debug support for the Bluetooth
A2DP profile.
module = BT_A2DP
legacy-debug-sym = BT_DEBUG_A2DP
module-str = "Bluetooth A2DP"
source "subsys/bluetooth/common/Kconfig.template.log_config_bt"
config BT_DEBUG_SDP
bool "Bluetooth Service Discovery Protocol (SDP) debug"
select DEPRECATED
depends on BT_BREDR
help
This option enables debug support for the Bluetooth
Service Discovery Protocol (SDP).
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"
config BT_DEBUG_SERVICE
bool "Bluetooth Services debug"
select DEPRECATED
depends on BT_CONN
help
This option enables debug support for the Bluetooth
Services.
module = BT_SERVICE
legacy-debug-sym = BT_DEBUG_SERVICE
module-str = "Bluetooth Services"
source "subsys/bluetooth/common/Kconfig.template.log_config_bt"
endif # BT_DEBUG
config BT_LOG_SNIFFER_INFO

28
subsys/bluetooth/host/Kconfig.gatt
View file

@ -276,32 +276,4 @@ config DEVICE_NAME_GATT_WRITABLE_AUTHEN
endif #BT_DEVICE_NAME_GATT_WRITABLE
if BT_DEBUG
config BT_DEBUG_ATT
bool "Bluetooth Attribute Protocol (ATT) debug"
select DEPRECATED
help
This option enables debug support for the Bluetooth
Attribute Protocol (ATT).
module = BT_ATT
legacy-debug-sym = BT_DEBUG_ATT
module-str = "Bluetooth Attribute Protocol (ATT)"
source "subsys/bluetooth/common/Kconfig.template.log_config_bt"
config BT_DEBUG_GATT
bool "Bluetooth Generic Attribute Profile (GATT) debug"
select DEPRECATED
help
This option enables debug support for the Bluetooth
Generic Attribute Profile (GATT).
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"
endif # BT_DEBUG
endmenu

13
subsys/bluetooth/host/Kconfig.l2cap
View file

@ -58,17 +58,4 @@ config BT_L2CAP_ECRED
This option enables support for LE Connection oriented Channels with
Enhanced Credit Based Flow Control support on dynamic L2CAP Channels.
config BT_DEBUG_L2CAP
bool "Bluetooth L2CAP debug"
select DEPRECATED
depends on BT_DEBUG
help
This option enables debug support for the Bluetooth
L2ACP layer.
module = BT_L2CAP
legacy-debug-sym = BT_DEBUG_L2CAP
module-str = "Bluetooth L2CAP"
source "subsys/bluetooth/common/Kconfig.template.log_config_bt"
endmenu

5
subsys/bluetooth/lib/Kconfig
View file

@ -7,8 +7,3 @@ config BT_EAD
select BT_HOST_CCM
help
Enable the Encrypted Advertising Data library
parent-module = BT
module = BT_EAD
module-str = "Bluetooth Encrypted Advertising Data"
source "subsys/logging/Kconfig.template.log_config_inherit"

233
subsys/bluetooth/mesh/Kconfig
View file

@ -1551,19 +1551,6 @@ config BT_MESH_SEQ_STORE_RATE
endif # BT_SETTINGS
config BT_MESH_DEBUG
bool "Debug logs"
select DEPRECATED
depends on BT_DEBUG
help
Use this option to enable debug logs for the Bluetooth
Mesh functionality.
module = BT_MESH
legacy-debug-sym = BT_MESH_DEBUG
module-str = "Debug logs"
source "subsys/bluetooth/common/Kconfig.template.log_config_bt"
if BT_MESH_LOG_LEVEL_DBG
config BT_MESH_DEBUG_USE_ID_ADDR
@ -1574,226 +1561,6 @@ config BT_MESH_DEBUG_USE_ID_ADDR
traces), however it should never be enabled for a production
build as it compromises the privacy of the device.
config BT_MESH_DEBUG_NET
bool "Network layer debug"
select DEPRECATED
help
Use this option to enable Network layer debug logs for the
Bluetooth mesh functionality.
module = BT_MESH_NET
legacy-debug-sym = BT_MESH_DEBUG_NET
module-str = "Network layer"
source "subsys/bluetooth/common/Kconfig.template.log_config_bt"
config BT_MESH_DEBUG_RPL
bool "Replay protection list debug"
select DEPRECATED
help
Use this option to enable Replay protection list debug logs
for the Bluetooth mesh functionality.
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"
config BT_MESH_DEBUG_TRANS
bool "Transport layer debug"
select DEPRECATED
help
Use this option to enable Transport layer debug logs for the
Bluetooth mesh functionality.
module = BT_MESH_TRANS
legacy-debug-sym = BT_MESH_DEBUG_TRANS
module-str = "Transport layer"
source "subsys/bluetooth/common/Kconfig.template.log_config_bt"
config BT_MESH_DEBUG_BEACON
bool "Beacon debug"
select DEPRECATED
help
Use this option to enable Beacon-related debug logs for the
Bluetooth mesh functionality.
module = BT_MESH_BEACON
legacy-debug-sym = BT_MESH_DEBUG_BEACON
module-str = "Beacon"
source "subsys/bluetooth/common/Kconfig.template.log_config_bt"
config BT_MESH_DEBUG_CRYPTO
bool "Crypto debug"
select DEPRECATED
help
Use this option to enable cryptographic debug logs for the
Bluetooth mesh functionality.
module = BT_MESH_CRYPTO
legacy-debug-sym = BT_MESH_DEBUG_CRYPTO
module-str = "Crypto"
source "subsys/bluetooth/common/Kconfig.template.log_config_bt"
config BT_MESH_DEBUG_KEYS
bool "Key management debug"
select DEPRECATED
help
Use this option to enable key management debug logs for the
Bluetooth mesh functionality.
module = BT_MESH_KEYS
legacy-debug-sym = BT_MESH_DEBUG_KEYS
module-str = "Key management"
source "subsys/bluetooth/common/Kconfig.template.log_config_bt"
config BT_MESH_DEBUG_PROV
bool "Provisioning debug"
select DEPRECATED
help
Use this option to enable Provisioning debug logs for the
Bluetooth mesh functionality.
module = BT_MESH_PROV
legacy-debug-sym = BT_MESH_DEBUG_PROV
module-str = "Provisioning"
source "subsys/bluetooth/common/Kconfig.template.log_config_bt"
config BT_MESH_DEBUG_PROVISIONER
bool "Provisioner debug"
select DEPRECATED
help
Use this option to enable Provisioner debug logs for the
Bluetooth mesh functionality.
module = BT_MESH_PROVISIONER
legacy-debug-sym = BT_MESH_DEBUG_PROVISIONER
module-str = "Provisioner"
source "subsys/bluetooth/common/Kconfig.template.log_config_bt"
config BT_MESH_DEBUG_PROV_DEVICE
bool "Provisioning device debug"
select DEPRECATED
help
Use this option to enable Provisioning device debug logs for the
Bluetooth Mesh functionality.
module = BT_MESH_PROV_DEVICE
legacy-debug-sym = BT_MESH_DEBUG_PROV_DEVICE
module-str = "Provisioning device"
source "subsys/bluetooth/common/Kconfig.template.log_config_bt"
config BT_MESH_DEBUG_ACCESS
bool "Access layer debug"
select DEPRECATED
help
Use this option to enable Access layer and device composition
related debug logs for Bluetooth mesh.
module = BT_MESH_ACCESS
legacy-debug-sym = BT_MESH_DEBUG_ACCESS
module-str = "Access layer"
source "subsys/bluetooth/common/Kconfig.template.log_config_bt"
config BT_MESH_DEBUG_MODEL
bool "Foundation model debug"
select DEPRECATED
help
Use this option to enable debug logs for the Foundation
Models.
module = BT_MESH_MODEL
legacy-debug-sym = BT_MESH_DEBUG_MODEL
module-str = "Foundation model"
source "subsys/bluetooth/common/Kconfig.template.log_config_bt"
module = BT_MESH_DFU
module-str = "DFU model"
source "subsys/bluetooth/common/Kconfig.template.log_config_bt"
config BT_MESH_DEBUG_ADV
bool "Advertising debug"
select DEPRECATED
help
Use this option to enable advertising debug logs for
the Bluetooth mesh functionality.
module = BT_MESH_ADV
legacy-debug-sym = BT_MESH_DEBUG_ADV
module-str = "Advertising"
source "subsys/bluetooth/common/Kconfig.template.log_config_bt"
config BT_MESH_DEBUG_LOW_POWER
bool "Low Power debug"
select DEPRECATED
help
Use this option to enable Low Power debug logs for the
Bluetooth mesh functionality.
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"
config BT_MESH_DEBUG_FRIEND
bool "Friend debug"
select DEPRECATED
help
Use this option to enable Friend debug logs for the
Bluetooth mesh functionality.
module = BT_MESH_FRIEND
legacy-debug-sym = BT_MESH_DEBUG_FRIEND
module-str = "Friend"
source "subsys/bluetooth/common/Kconfig.template.log_config_bt"
config BT_MESH_DEBUG_PROXY
bool "Proxy debug"
select DEPRECATED
depends on BT_MESH_GATT
help
Use this option to enable Proxy protocol debug logs.
module = BT_MESH_PROXY
legacy-debug-sym = BT_MESH_DEBUG_PROXY
module-str = "Proxy"
source "subsys/bluetooth/common/Kconfig.template.log_config_bt"
config BT_MESH_DEBUG_SETTINGS
bool "Persistent settings debug"
select DEPRECATED
depends on BT_SETTINGS
help
Use this option to enable persistent settings debug logs.
module = BT_MESH_SETTINGS
legacy-debug-sym = BT_MESH_DEBUG_SETTINGS
module-str = "Persistent settings"
source "subsys/bluetooth/common/Kconfig.template.log_config_bt"
config BT_MESH_DEBUG_CDB
bool "Configuration database debug"
select DEPRECATED
depends on BT_MESH_CDB
help
Use this option to enable configuration database debug logs.
module = BT_MESH_CDB
legacy-debug-sym = BT_MESH_DEBUG_CDB
module-str = "Configuration database"
source "subsys/bluetooth/common/Kconfig.template.log_config_bt"
config BT_MESH_DEBUG_CFG
bool "Configuration debug"
select DEPRECATED
help
Use this option to enable node configuration debug logs for the
Bluetooth mesh functionality.
module = BT_MESH_CFG
legacy-debug-sym = BT_MESH_DEBUG_CFG
module-str = "Configuration"
source "subsys/bluetooth/common/Kconfig.template.log_config_bt"
endif # BT_MESH_LOG_LEVEL_DBG
endif # BT_MESH

10
subsys/bluetooth/services/Kconfig.bas
View file

@ -3,14 +3,6 @@
# Copyright (c) 2018 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0
menuconfig BT_BAS
config BT_BAS
bool "GATT Battery service"
select SENSOR
if BT_BAS
module = BT_BAS
module-str = BAS
source "subsys/logging/Kconfig.template.log_config"
endif # BT_BAS

4
subsys/bluetooth/services/Kconfig.hrs
View file

@ -27,8 +27,4 @@ config BT_HRS_DEFAULT_PERM_RW_AUTHEN
endchoice
module = BT_HRS
module-str = HRS
source "subsys/logging/Kconfig.template.log_config"
endif # BT_HRS

10
subsys/bluetooth/services/Kconfig.tps
View file

@ -3,13 +3,5 @@
# Copyright (c) 2020 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0
menuconfig BT_TPS
config BT_TPS
bool "GATT TX Power service"
if BT_TPS
module = BT_TPS
module-str = TPS
source "subsys/logging/Kconfig.template.log_config"
endif # BT_TPS

16
subsys/bluetooth/services/ias/Kconfig.ias
View file

@ -36,19 +36,3 @@ config BT_IAS_CLIENT
select EXPERIMENTAL
help
This option enables support for Immediate Alert Service Client
config BT_DEBUG_IAS_CLIENT
bool "Immediate Alert Service Client debug"
select DEPRECATED
depends on BT_IAS_CLIENT
help
This option enables enables Immediate Alert Service Client debug logs.
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"
module = BT_IAS
module-str = IAS
source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config"

22
subsys/bluetooth/services/ots/Kconfig
View file

@ -78,24 +78,6 @@ config BT_OTS_CLIENT
help
This option enables support for the Object Transfer Service Client.
if BT_OTS_CLIENT
# TODO: Unify logging for OTS server and client - the client uses
# "BT" debugging, the server does not.
config BT_DEBUG_OTS_CLIENT
bool "Object Transfer Service Client debug"
select DEPRECATED
help
Use this option to enable Object Transfer Client debug logs
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"
endif # BT_OTS_CLIENT
if BT_OTS || BT_OTS_CLIENT
config BT_OTS_MAX_OBJ_CNT
@ -127,8 +109,4 @@ config BT_OTS_OBJ_MAX_NAME_LEN
default 120
range 1 120
module = BT_OTS
module-str = BT_OTS
source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config"
endif # BT_OTS || BT_OTS_CLIENT