Bluetooth: Audio: Move audio shell to audio directory

Thalley · carlescufi · commit c8e1b1e26406 · 2023-03-20T09:53:34.000+01:00
Move all audio related shell implementations to the
audio directory, to use the same structure as Mesh.

Signed-off-by: Emil Gydesen &lt;emil.gydesen@nordicsemi.no&gt;
diff --git a/subsys/bluetooth/audio/CMakeLists.txt b/subsys/bluetooth/audio/CMakeLists.txt
@@ -1,5 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
+add_subdirectory_ifdef(CONFIG_BT_SHELL shell)
+
 zephyr_library()
 zephyr_library_sources(
 	audio.c
diff --git a/subsys/bluetooth/audio/shell/CMakeLists.txt b/subsys/bluetooth/audio/shell/CMakeLists.txt
@@ -0,0 +1,79 @@
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_library()
+zephyr_library_link_libraries(subsys__bluetooth)
+
+zephyr_library_sources_ifdef(
+  CONFIG_BT_VCP_VOL_REND
+  vcp_vol_rend.c
+  )
+zephyr_library_sources_ifdef(
+  CONFIG_BT_VCP_VOL_CTLR
+  vcp_vol_ctlr.c
+  )
+zephyr_library_sources_ifdef(
+  CONFIG_BT_MICP_MIC_DEV
+  micp_mic_dev.c
+  )
+zephyr_library_sources_ifdef(
+  CONFIG_BT_MICP_MIC_CTLR
+  micp_mic_ctlr.c
+  )
+zephyr_library_sources_ifdef(
+  CONFIG_BT_CSIP_SET_MEMBER
+  csip_set_member.c
+  )
+zephyr_library_sources_ifdef(
+  CONFIG_BT_CSIP_SET_COORDINATOR
+  csip_set_coordinator.c
+  )
+zephyr_library_sources_ifdef(
+  CONFIG_BT_TBS
+  tbs.c
+  )
+zephyr_library_sources_ifdef(
+  CONFIG_BT_TBS_CLIENT
+  tbs_client.c
+  )
+zephyr_library_sources_ifdef(
+  CONFIG_BT_MPL
+  mpl.c
+  )
+zephyr_library_sources_ifdef(
+  CONFIG_BT_MCC
+  mcc.c
+  )
+zephyr_library_sources_ifdef(
+  CONFIG_BT_MCS
+  media_controller.c
+  )
+zephyr_library_sources_ifdef(
+  CONFIG_BT_HAS_PRESET_SUPPORT
+  has.c
+  )
+zephyr_library_sources_ifdef(
+  CONFIG_BT_CAP_ACCEPTOR_SET_MEMBER
+  cap_acceptor.c
+  )
+zephyr_library_sources_ifdef(
+  CONFIG_BT_CAP_INITIATOR
+  cap_initiator.c
+  )
+zephyr_library_sources_ifdef(
+  CONFIG_BT_HAS_CLIENT
+  has_client.c
+  )
+# We use BT_BAP_STREAM as a common ground for audio, as that is set whenever
+# any audio stream functionality is enabled.
+zephyr_library_sources_ifdef(
+  CONFIG_BT_BAP_STREAM
+  bap.c
+  )
+zephyr_library_sources_ifdef(
+  CONFIG_BT_BAP_SCAN_DELEGATOR
+  bap_scan_delegator.c
+  )
+zephyr_library_sources_ifdef(
+  CONFIG_BT_BAP_BROADCAST_ASSISTANT
+  bap_broadcast_assistant.c
+  )
diff --git a/subsys/bluetooth/audio/shell/audio.h b/subsys/bluetooth/audio/shell/audio.h
@@ -0,0 +1,25 @@
+/** @file
+ *  @brief Bluetooth audio shell functions
+ *
+ *  This is not to be included by the application.
+ */
+
+/*
+ * Copyright (c) 2023 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef __AUDIO_H
+#define __AUDIO_H
+
+#include <zephyr/bluetooth/bluetooth.h>
+
+extern struct bt_csip_set_member_svc_inst *svc_inst;
+
+ssize_t audio_ad_data_add(struct bt_data *data, const size_t data_size, const bool discoverable,
+			  const bool connectable);
+ssize_t audio_pa_data_add(struct bt_data *data_array, const size_t data_array_size);
+ssize_t csis_ad_data_add(struct bt_data *data, const size_t data_size, const bool discoverable);
+
+#endif /* __AUDIO_H */
diff --git a/subsys/bluetooth/audio/shell/bap.c b/subsys/bluetooth/audio/shell/bap.c
@@ -25,7 +25,7 @@
 #include <zephyr/bluetooth/audio/bap_lc3_preset.h>
 #include <zephyr/bluetooth/audio/pacs.h>
 
-#include "bt.h"
+#include "shell/bt.h"
 
 #define LOCATION BT_AUDIO_LOCATION_FRONT_LEFT
 #define CONTEXT BT_AUDIO_CONTEXT_TYPE_CONVERSATIONAL | BT_AUDIO_CONTEXT_TYPE_MEDIA
diff --git a/subsys/bluetooth/audio/shell/bap_broadcast_assistant.c b/subsys/bluetooth/audio/shell/bap_broadcast_assistant.c
@@ -18,8 +18,8 @@
 #include <zephyr/bluetooth/hci.h>
 #include <zephyr/bluetooth/audio/audio.h>
 #include <zephyr/bluetooth/audio/bap.h>
-#include "bt.h"
-#include "../host/hci_core.h"
+#include "shell/bt.h"
+#include "../../host/hci_core.h"
 
 static void bap_broadcast_assistant_discover_cb(struct bt_conn *conn, int err,
 						uint8_t recv_state_count)
diff --git a/subsys/bluetooth/audio/shell/bap_scan_delegator.c b/subsys/bluetooth/audio/shell/bap_scan_delegator.c
@@ -16,7 +16,7 @@
 #include <zephyr/bluetooth/gatt.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/audio/bap.h>
-#include "bt.h"
+#include "shell/bt.h"
 
 static void pa_synced(struct bt_bap_scan_delegator_recv_state *recv_state,
 		      const struct bt_le_per_adv_sync_synced_info *info)
diff --git a/subsys/bluetooth/audio/shell/cap_acceptor.c b/subsys/bluetooth/audio/shell/cap_acceptor.c
@@ -13,7 +13,7 @@
 #include <zephyr/bluetooth/gatt.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/audio/cap.h>
-#include "bt.h"
+#include "shell/bt.h"
 
 extern const struct shell *ctx_shell;
 static struct bt_csip_set_member_svc_inst *cap_csip_svc_inst;
diff --git a/subsys/bluetooth/audio/shell/cap_initiator.c b/subsys/bluetooth/audio/shell/cap_initiator.c
@@ -15,7 +15,7 @@
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/audio/cap.h>
 
-#include "bt.h"
+#include "shell/bt.h"
 
 #if defined(CONFIG_BT_BAP_UNICAST_CLIENT)
 
diff --git a/subsys/bluetooth/audio/shell/csip_set_coordinator.c b/subsys/bluetooth/audio/shell/csip_set_coordinator.c
@@ -18,7 +18,7 @@
 #include <zephyr/bluetooth/gatt.h>
 #include <zephyr/bluetooth/bluetooth.h>
 
-#include "bt.h"
+#include "shell/bt.h"
 
 #include <zephyr/bluetooth/audio/csip.h>
 
diff --git a/subsys/bluetooth/audio/shell/csip_set_member.c b/subsys/bluetooth/audio/shell/csip_set_member.c
@@ -17,7 +17,7 @@
 #include <zephyr/bluetooth/gatt.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/audio/csip.h>
-#include "bt.h"
+#include "shell/bt.h"
 
 extern const struct shell *ctx_shell;
 struct bt_csip_set_member_svc_inst *svc_inst;
diff --git a/subsys/bluetooth/audio/shell/has.c b/subsys/bluetooth/audio/shell/has.c
@@ -15,7 +15,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "bt.h"
+#include "shell/bt.h"
 
 static int preset_select(uint8_t index, bool sync)
 {
diff --git a/subsys/bluetooth/audio/shell/has_client.c b/subsys/bluetooth/audio/shell/has_client.c
@@ -15,7 +15,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "bt.h"
+#include "shell/bt.h"
 
 static struct bt_has *inst;
 
diff --git a/subsys/bluetooth/audio/shell/mcc.c b/subsys/bluetooth/audio/shell/mcc.c
@@ -15,11 +15,11 @@
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
 
-#include "bt.h"
+#include "shell/bt.h"
 
 #include <zephyr/bluetooth/services/ots.h>
-#include "../services/ots/ots_client_internal.h"
-#include "../audio/media_proxy_internal.h"
+#include "../../services/ots/ots_client_internal.h"
+#include "../media_proxy_internal.h"
 
 #include <zephyr/logging/log.h>
 
diff --git a/subsys/bluetooth/audio/shell/media_controller.c b/subsys/bluetooth/audio/shell/media_controller.c
@@ -14,11 +14,11 @@
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
 
-#include "bt.h"
+#include "shell/bt.h"
 #include <zephyr/bluetooth/services/ots.h>
 
 #include <zephyr/bluetooth/audio/media_proxy.h>
-#include "../audio/media_proxy_internal.h" /* For MPL_NO_TRACK_ID - TODO: Fix */
+#include "../media_proxy_internal.h" /* For MPL_NO_TRACK_ID - TODO: Fix */
 
 #include <zephyr/logging/log.h>
 
diff --git a/subsys/bluetooth/audio/shell/micp_mic_ctlr.c b/subsys/bluetooth/audio/shell/micp_mic_ctlr.c
@@ -14,7 +14,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "bt.h"
+#include "shell/bt.h"
 
 static struct bt_micp_mic_ctlr *mic_ctlr;
 #if defined(CONFIG_BT_MICP_MIC_CTLR_AICS)
diff --git a/subsys/bluetooth/audio/shell/micp_mic_dev.c b/subsys/bluetooth/audio/shell/micp_mic_dev.c
@@ -14,7 +14,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "bt.h"
+#include "shell/bt.h"
 
 static void micp_mic_dev_mute_cb(uint8_t mute)
 {
diff --git a/subsys/bluetooth/audio/shell/mpl.c b/subsys/bluetooth/audio/shell/mpl.c
@@ -14,10 +14,10 @@
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
 
-#include "bt.h"
+#include "shell/bt.h"
 
 #include <zephyr/bluetooth/audio/media_proxy.h>
-#include "../audio/mpl_internal.h"
+#include "../mpl_internal.h"
 
 #include <zephyr/logging/log.h>
 
diff --git a/subsys/bluetooth/audio/shell/tbs.c b/subsys/bluetooth/audio/shell/tbs.c
@@ -14,7 +14,7 @@
 
 #include <zephyr/bluetooth/audio/tbs.h>
 
-#include "bt.h"
+#include "shell/bt.h"
 
 static struct bt_conn *tbs_authorized_conn;
 static bool cbs_registered;
diff --git a/subsys/bluetooth/audio/shell/tbs_client.c b/subsys/bluetooth/audio/shell/tbs_client.c
@@ -22,7 +22,7 @@
 #include <zephyr/bluetooth/gatt.h>
 #include <zephyr/bluetooth/audio/tbs.h>
 
-#include "bt.h"
+#include "shell/bt.h"
 
 static int cmd_tbs_client_discover(const struct shell *sh, size_t argc,
 				   char *argv[])
diff --git a/subsys/bluetooth/audio/shell/vcp_vol_ctlr.c b/subsys/bluetooth/audio/shell/vcp_vol_ctlr.c
@@ -13,7 +13,7 @@
 #include <zephyr/shell/shell.h>
 #include <stdlib.h>
 
-#include "bt.h"
+#include "shell/bt.h"
 
 static struct bt_vcp_vol_ctlr *vol_ctlr;
 static struct bt_vcp_included vcp_included;
diff --git a/subsys/bluetooth/audio/shell/vcp_vol_rend.c b/subsys/bluetooth/audio/shell/vcp_vol_rend.c
@@ -15,7 +15,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "bt.h"
+#include "shell/bt.h"
 
 static struct bt_vcp_included vcp_included;
 
diff --git a/subsys/bluetooth/shell/CMakeLists.txt b/subsys/bluetooth/shell/CMakeLists.txt
@@ -25,82 +25,6 @@ zephyr_library_sources_ifdef(
   CONFIG_BT_ISO
   iso.c
   )
-zephyr_library_sources_ifdef(
-  CONFIG_BT_VCP_VOL_REND
-  vcp_vol_rend.c
-  )
-zephyr_library_sources_ifdef(
-  CONFIG_BT_VCP_VOL_CTLR
-  vcp_vol_ctlr.c
-  )
-zephyr_library_sources_ifdef(
-  CONFIG_BT_MICP_MIC_DEV
-  micp_mic_dev.c
-  )
-zephyr_library_sources_ifdef(
-  CONFIG_BT_MICP_MIC_CTLR
-  micp_mic_ctlr.c
-  )
-zephyr_library_sources_ifdef(
-  CONFIG_BT_CSIP_SET_MEMBER
-  csip_set_member.c
-  )
-zephyr_library_sources_ifdef(
-  CONFIG_BT_CSIP_SET_COORDINATOR
-  csip_set_coordinator.c
-  )
-zephyr_library_sources_ifdef(
-  CONFIG_BT_TBS
-  tbs.c
-  )
-zephyr_library_sources_ifdef(
-  CONFIG_BT_TBS_CLIENT
-  tbs_client.c
-  )
-zephyr_library_sources_ifdef(
-  CONFIG_BT_MPL
-  mpl.c
-  )
-zephyr_library_sources_ifdef(
-  CONFIG_BT_MCC
-  mcc.c
-  )
-zephyr_library_sources_ifdef(
-  CONFIG_BT_MCS
-  media_controller.c
-  )
-zephyr_library_sources_ifdef(
-  CONFIG_BT_HAS_PRESET_SUPPORT
-  has.c
-  )
-zephyr_library_sources_ifdef(
-  CONFIG_BT_CAP_ACCEPTOR_SET_MEMBER
-  cap_acceptor.c
-  )
-zephyr_library_sources_ifdef(
-  CONFIG_BT_CAP_INITIATOR
-  cap_initiator.c
-  )
-zephyr_library_sources_ifdef(
-  CONFIG_BT_HAS_CLIENT
-  has_client.c
-  )
-# We use BT_BAP_STREAM as a common ground for audio, as that is set whenever
-# any audio stream functionality is enabled.
-zephyr_library_sources_ifdef(
-  CONFIG_BT_BAP_STREAM
-  bap.c
-  )
-
-zephyr_library_sources_ifdef(
-  CONFIG_BT_BAP_SCAN_DELEGATOR
-  bap_scan_delegator.c
-  )
-zephyr_library_sources_ifdef(
-  CONFIG_BT_BAP_BROADCAST_ASSISTANT
-  bap_broadcast_assistant.c
-  )
-
 zephyr_library_sources_ifdef(
   CONFIG_BT_IAS
   ias.c
diff --git a/subsys/bluetooth/shell/bt.c b/subsys/bluetooth/shell/bt.c
@@ -41,6 +41,7 @@
 #include "bt.h"
 #include "ll.h"
 #include "hci.h"
+#include "../audio/shell/audio.h"
 
 static bool no_settings_load;
 
diff --git a/subsys/bluetooth/shell/bt.h b/subsys/bluetooth/shell/bt.h
