Bluetooth: MPL: Fix build issues with the MPL shell

If logging (CONFIG_LOGGING) was disabled, then the shell
could not build. Ideally the (test) functions should not
depend on logging, but rather only CONFIG_BT_TESTING.

The shell commands were also properly guarded.

Signed-off-by: Emil Gydesen <[email protected]>

Author: Thalley

subsys/bluetooth/audio/mpl.c

@@ -2526,8 +2526,7 @@ void mpl_debug_dump_state(void)
 }
 #endif /* CONFIG_BT_MPL_LOG_LEVEL_DBG */
 
-#if defined(CONFIG_BT_MPL_LOG_LEVEL_DBG) &&                                                        \
-	defined(CONFIG_BT_TESTING) /* Special commands for testing */
+#if defined(CONFIG_BT_TESTING) /* Special commands for testing */
 
 #if CONFIG_BT_MPL_OBJECTS
 void mpl_test_unset_parent_group(void)
@@ -2626,4 +2625,4 @@ void mpl_test_search_results_changed_cb(void)
 }
 #endif /* CONFIG_BT_MPL_OBJECTS */
 
-#endif /* CONFIG_BT_MPL_LOG_LEVEL_DBG && CONFIG_BT_TESTING */
+#endif /* CONFIG_BT_TESTING */

subsys/bluetooth/audio/shell/mpl.c

@@ -29,7 +29,7 @@ LOG_MODULE_REGISTER(bt_mpl_shell, CONFIG_BT_MPL_LOG_LEVEL);
 
 #if defined(CONFIG_BT_MPL)
 
-#if defined(CONFIG_BT_MPL_LOG_LEVEL_DBG) && defined(CONFIG_BT_TESTING)
+#if defined(CONFIG_BT_TESTING)
 int cmd_mpl_test_set_media_state(const struct shell *sh, size_t argc,
 				 char *argv[])
 {
@@ -63,7 +63,7 @@ int cmd_mpl_test_unset_parent_group(const struct shell *sh, size_t argc,
 	return 0;
 }
 #endif /* CONFIG_BT_MPL_OBJECTS */
-#endif /* CONFIG_BT_MPL_LOG_LEVEL_DBG && CONFIG_BT_TESTING */
+#endif /* CONFIG_BT_TESTING */
 
 #if defined(CONFIG_BT_MPL_LOG_LEVEL_DBG)
 int cmd_mpl_debug_dump_state(const struct shell *sh, size_t argc,
@@ -90,6 +90,7 @@ int cmd_media_proxy_pl_init(const struct shell *sh, size_t argc, char *argv[])
 	return err;
 }
 
+#if defined(CONFIG_BT_TESTING)
 int cmd_mpl_test_player_name_cb(const struct shell *sh, size_t argc,
 				char *argv[])
 {
@@ -207,6 +208,7 @@ int cmd_mpl_test_search_results_changed_cb(const struct shell *sh, size_t argc,
 	return 0;
 }
 #endif /* CONFIG_BT_MPL_OBJECTS */
+#endif /* CONFIG_BT_TESTING */
 
 static int cmd_mpl(const struct shell *sh, size_t argc, char **argv)
 {
@@ -216,7 +218,7 @@ static int cmd_mpl(const struct shell *sh, size_t argc, char **argv)
 }
 
 SHELL_STATIC_SUBCMD_SET_CREATE(mpl_cmds,
-#if defined(CONFIG_BT_MPL_LOG_LEVEL_DBG) && defined(CONFIG_BT_TESTING)
+#if defined(CONFIG_BT_TESTING)
 	SHELL_CMD_ARG(test_set_media_state, NULL,
 		      "Set the media player state (test) <state>",
 		      cmd_mpl_test_set_media_state, 2, 0),
@@ -225,7 +227,7 @@ SHELL_STATIC_SUBCMD_SET_CREATE(mpl_cmds,
 		      "Set current group to be its own parent (test)",
 		      cmd_mpl_test_unset_parent_group, 1, 0),
 #endif /* CONFIG_BT_MPL_OBJECTS */
-#endif /* CONFIG_BT_MPL_LOG_LEVEL_DBG && CONFIG_BT_TESTING */
+#endif /* CONFIG_BT_TESTING */
 #if defined(CONFIG_BT_MPL_LOG_LEVEL_DBG)
 	SHELL_CMD_ARG(debug_dump_state, NULL,
 		      "Dump media player's state as debug output (debug)",
@@ -234,6 +236,7 @@ SHELL_STATIC_SUBCMD_SET_CREATE(mpl_cmds,
 	SHELL_CMD_ARG(init, NULL,
 		      "Initialize media player",
 		      cmd_media_proxy_pl_init, 1, 0),
+#if defined(CONFIG_BT_TESTING)
 	SHELL_CMD_ARG(player_name_changed_cb, NULL,
 		      "Trigger Player Name changed callback (test)",
 		      cmd_mpl_test_player_name_cb, 1, 0),
@@ -286,6 +289,7 @@ SHELL_STATIC_SUBCMD_SET_CREATE(mpl_cmds,
 		      "Trigger Search Results Object ID callback (test)",
 		      cmd_mpl_test_search_results_changed_cb, 1, 0),
 #endif /* CONFIG_BT_MPL_OBJECTS */
+#endif /* CONFIG_BT_TESTING */
 	SHELL_SUBCMD_SET_END
 );