From 34de2af39443f7b7fbf57173c26e426d304c17d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20S=C3=A6b=C3=B8?= Date: Thu, 17 Feb 2022 10:08:00 +0100 Subject: [PATCH] Bluetooth: audio - remove BT_AUDIO_DEBUG MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove the BT_AUDIO_DEBUG Kconfig option. Given that all the audio modules are guarded by the BT_AUDIO config, it seems excessive to also have a separate guard for audio module debug. It is sufficient that this is turned on/off module by module. Note that the BT_AUDIO_DEBUG was also located in the wrong file - the babs Kconfig file, not the main Kconfig file. Signed-off-by: Asbjørn Sæbø --- subsys/bluetooth/audio/Kconfig.aics | 2 -- subsys/bluetooth/audio/Kconfig.baps | 9 --------- subsys/bluetooth/audio/Kconfig.csis | 3 --- subsys/bluetooth/audio/Kconfig.mcs | 3 --- subsys/bluetooth/audio/Kconfig.mics | 2 -- subsys/bluetooth/audio/Kconfig.otc | 1 - subsys/bluetooth/audio/Kconfig.vcs | 2 -- subsys/bluetooth/audio/Kconfig.vocs | 2 -- tests/bluetooth/bsim_bt/bsim_test_audio/prj.conf | 1 - tests/bluetooth/shell/audio.conf | 1 - 10 files changed, 26 deletions(-) diff --git a/subsys/bluetooth/audio/Kconfig.aics b/subsys/bluetooth/audio/Kconfig.aics index 9d5b6498e76..f0e897968e8 100644 --- a/subsys/bluetooth/audio/Kconfig.aics +++ b/subsys/bluetooth/audio/Kconfig.aics @@ -35,7 +35,6 @@ config BT_AICS_MAX_INPUT_DESCRIPTION_SIZE config BT_DEBUG_AICS bool "Audio Input Control Service debug" - depends on BT_AUDIO_DEBUG help Use this option to enable Audio Input Control Service debug logs for the Bluetooth Audio functionality. @@ -66,7 +65,6 @@ if BT_AICS_CLIENT config BT_DEBUG_AICS_CLIENT bool "Audio Input Control Service client debug" - depends on BT_AUDIO_DEBUG help Use this option to enable Audio Input Control Service client debug logs for the Bluetooth Audio functionality. diff --git a/subsys/bluetooth/audio/Kconfig.baps b/subsys/bluetooth/audio/Kconfig.baps index bf6c08e44df..3d43b6a3454 100644 --- a/subsys/bluetooth/audio/Kconfig.baps +++ b/subsys/bluetooth/audio/Kconfig.baps @@ -183,14 +183,6 @@ config BT_AUDIO_BROADCAST_SNK_STREAM_COUNT endif # BT_AUDIO_BROADCAST_SINK -config BT_AUDIO_DEBUG - bool "Enable debug logs" - depends on BT_DEBUG - help - Use this option to enable debug logs for the Bluetooth - Audio functionality. - -if BT_AUDIO_DEBUG config BT_DEBUG_PACS bool "Published Audio Capabilities Service debug" @@ -248,7 +240,6 @@ config BT_AUDIO_DEBUG_BROADCAST_SINK Use this option to enable Bluetooth Audio Broadcast Sink debug logs for the Bluetooth Audio functionality. -endif # BT_AUDIO_DEBUG config BT_AUDIO_STREAM # Virtual/hidden option diff --git a/subsys/bluetooth/audio/Kconfig.csis b/subsys/bluetooth/audio/Kconfig.csis index 5a7874587d2..9a6776002be 100644 --- a/subsys/bluetooth/audio/Kconfig.csis +++ b/subsys/bluetooth/audio/Kconfig.csis @@ -48,7 +48,6 @@ config BT_CSIS_MAX_INSTANCE_COUNT config BT_DEBUG_CSIS bool "Coordinated Set Identification Service debug" - depends on BT_AUDIO_DEBUG help Use this option to enable Coordinated Set Identification Service debug logs for the Bluetooth Audio functionality. @@ -98,7 +97,6 @@ config BT_CSIS_CLIENT_ENC_SIRK_SUPPORT config BT_DEBUG_CSIS_CLIENT bool "Coordinated Set Identification Profile debug" - depends on BT_AUDIO_DEBUG help Use this option to enable Coordinated Set Identification Profile debug logs for the Bluetooth Audio functionality. @@ -107,7 +105,6 @@ endif # BT_CSIS_CLIENT config BT_DEBUG_CSIS_CRYPTO bool "Coordinated Set Identification Service crypto functions debug" - depends on BT_AUDIO_DEBUG depends on BT_CSIS_CLIENT || BT_CSIS help Use this option to enable Coordinated Set Identification Service diff --git a/subsys/bluetooth/audio/Kconfig.mcs b/subsys/bluetooth/audio/Kconfig.mcs index 402d199d215..72739439dfd 100644 --- a/subsys/bluetooth/audio/Kconfig.mcs +++ b/subsys/bluetooth/audio/Kconfig.mcs @@ -33,7 +33,6 @@ config BT_MCS_ICON_URL config BT_DEBUG_MCS bool "Media Control Service debug" - depends on BT_AUDIO_DEBUG help Use this option to enable Media Control Service debug logs for the Bluetooth Audio functionality. @@ -110,7 +109,6 @@ config BT_MCC_SHELL config BT_DEBUG_MCC bool "Media Control Client debug" - depends on BT_AUDIO_DEBUG help Use this option to enable Media Control Client debug logs for the Bluetooth Audio functionality. @@ -195,7 +193,6 @@ config BT_MCS_MAX_OBJ_SIZE config BT_DEBUG_MEDIA_PROXY bool "Media Proxy debug" - depends on BT_AUDIO_DEBUG help Use this option to enable Media Proxy debug logs for the Bluetooth Audio functionality. diff --git a/subsys/bluetooth/audio/Kconfig.mics b/subsys/bluetooth/audio/Kconfig.mics index 1fc273add64..21c0cdb4149 100644 --- a/subsys/bluetooth/audio/Kconfig.mics +++ b/subsys/bluetooth/audio/Kconfig.mics @@ -36,7 +36,6 @@ config BT_MICS_AICS config BT_DEBUG_MICS bool "Microphone Input Control Service debug" - depends on BT_AUDIO_DEBUG help Use this option to enable Microphone Input Control Service debug logs for the Bluetooth Audio functionality. @@ -74,7 +73,6 @@ config BT_MICS_CLIENT_AICS config BT_DEBUG_MICS_CLIENT bool "Microphone Control Profile debug" - depends on BT_AUDIO_DEBUG help Use this option to enable Microphone Control Profile debug logs for the Bluetooth Audio functionality. diff --git a/subsys/bluetooth/audio/Kconfig.otc b/subsys/bluetooth/audio/Kconfig.otc index 5118b910f26..1965509cee8 100644 --- a/subsys/bluetooth/audio/Kconfig.otc +++ b/subsys/bluetooth/audio/Kconfig.otc @@ -22,7 +22,6 @@ if BT_OTC config BT_DEBUG_OTC bool "Object Transfer Client debug" # TODO: Remove dependency on BT_AUDIO_DEBUG when moved out of the audio directory - depends on BT_AUDIO_DEBUG depends on BT_OTC help Use this option to enable Object Transfer Client debug logs for the diff --git a/subsys/bluetooth/audio/Kconfig.vcs b/subsys/bluetooth/audio/Kconfig.vcs index 0600cfadbc9..37ddead094a 100644 --- a/subsys/bluetooth/audio/Kconfig.vcs +++ b/subsys/bluetooth/audio/Kconfig.vcs @@ -50,7 +50,6 @@ config BT_VCS_AICS config BT_DEBUG_VCS bool "Volume Control Service debug" - depends on BT_AUDIO_DEBUG help Use this option to enable Volume Control Service debug logs for the Bluetooth Audio functionality. @@ -104,7 +103,6 @@ config BT_VCS_CLIENT_AICS config BT_DEBUG_VCS_CLIENT bool "Volume Control Profile debug" - depends on BT_AUDIO_DEBUG help Use this option to enable Volume Control Profile debug logs for the Bluetooth Audio functionality. diff --git a/subsys/bluetooth/audio/Kconfig.vocs b/subsys/bluetooth/audio/Kconfig.vocs index 1534f16c697..5f29aa8a019 100644 --- a/subsys/bluetooth/audio/Kconfig.vocs +++ b/subsys/bluetooth/audio/Kconfig.vocs @@ -35,7 +35,6 @@ config BT_VOCS_MAX_OUTPUT_DESCRIPTION_SIZE config BT_DEBUG_VOCS bool "Volume Offset Control Service debug" - depends on BT_AUDIO_DEBUG help Use this option to enable Volume Offset Control Service debug logs for the Bluetooth Audio functionality. @@ -66,7 +65,6 @@ if BT_VOCS_CLIENT config BT_DEBUG_VOCS_CLIENT bool "Volume Offset Control Service client debug" - depends on BT_AUDIO_DEBUG help Use this option to enable Volume Offset Control Service client debug logs for the Bluetooth Audio functionality. diff --git a/tests/bluetooth/bsim_bt/bsim_test_audio/prj.conf b/tests/bluetooth/bsim_bt/bsim_test_audio/prj.conf index 8ec60200bec..94ad43544e2 100644 --- a/tests/bluetooth/bsim_bt/bsim_test_audio/prj.conf +++ b/tests/bluetooth/bsim_bt/bsim_test_audio/prj.conf @@ -72,7 +72,6 @@ CONFIG_BT_OTS_MAX_OBJ_CNT=0x30 CONFIG_BT_OTC=y # DEBUGGING -CONFIG_BT_AUDIO_DEBUG=y CONFIG_BT_DEBUG_LOG=y CONFIG_BT_DEBUG_VCS=y CONFIG_BT_DEBUG_VCS_CLIENT=y diff --git a/tests/bluetooth/shell/audio.conf b/tests/bluetooth/shell/audio.conf index d874a4fa439..be6cd97141f 100644 --- a/tests/bluetooth/shell/audio.conf +++ b/tests/bluetooth/shell/audio.conf @@ -91,7 +91,6 @@ CONFIG_BT_OTC=y # DEBUGGING CONFIG_BT_DEBUG_LOG=y -CONFIG_BT_AUDIO_DEBUG=y CONFIG_BT_DEBUG_MCS=y CONFIG_BT_DEBUG_MCC=y CONFIG_BT_OTS_LOG_LEVEL_DBG=y