Bluetooth: CAP: Shell: Share args between modules

Instead of defining the same arguments in all 3 CAP files,
we declare them in audio.h and initiate them in either
the initiator or commander, depending on their use.

The reason for this change, is that the CAP Handover API
require several of the parameter to be globally/statically
allocated, and cannot just rely on stack allocated parameters.
By doing this, we can use the same argument among the
CAP shell modules, while keeping the memory usage down.
This has the additional postive effect that we do not allocate
some of these arrays, which can be quite larger, on the stack.

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

Author: Thalley

subsys/bluetooth/audio/shell/audio.h

@@ -266,11 +266,28 @@ extern struct named_lc3_preset default_sink_preset;
 extern struct named_lc3_preset default_source_preset;
 
 int cap_ac_unicast(const struct shell *sh, const struct cap_unicast_ac_param *param);
+
+#if defined(CONFIG_BT_CAP_INITIATOR)
+extern struct bt_cap_unicast_audio_start_stream_param
+	cap_initiator_audio_start_stream_params[UNICAST_CLIENT_STREAM_COUNT];
+extern struct bt_cap_unicast_group_stream_param
+	cap_initiator_unicast_group_stream_params[UNICAST_CLIENT_STREAM_COUNT];
+extern struct bt_cap_unicast_group_stream_pair_param
+	cap_initiator_unicast_group_pair_params[UNICAST_CLIENT_STREAM_COUNT];
+extern struct bt_cap_unicast_audio_start_param cap_initiator_unicast_audio_start_param;
+extern struct bt_cap_unicast_group_param cap_initiator_unicast_group_param;
+#endif /* CONFIG_BT_CAP_INITIATOR */
 #endif /* CONFIG_BT_BAP_UNICAST_CLIENT */
 #endif /* CONFIG_BT_BAP_UNICAST */
 
 #if defined(CONFIG_BT_BAP_BROADCAST_ASSISTANT)
 extern struct broadcast_assistant_recv_state broadcast_assistant_recv_states[CONFIG_BT_MAX_CONN];
+
+#if defined(CONFIG_BT_CAP_COMMANDER)
+extern struct bt_cap_commander_broadcast_reception_stop_param cap_commander_reception_stop_param;
+extern struct bt_cap_commander_broadcast_reception_stop_member_param
+	cap_commander_reception_stop_member_params[CONFIG_BT_MAX_CONN];
+#endif /* CONFIG_BT_CAP_COMMANDER */
 #endif /* CONFIG_BT_BAP_BROADCAST_ASSISTANT */
 #if defined(CONFIG_BT_BAP_SCAN_DELEGATOR)
 extern struct scan_delegator_sync_state
@@ -841,6 +858,22 @@ int cap_ac_broadcast(const struct shell *sh, size_t argc, char **argv,
 extern struct shell_stream broadcast_source_streams[CONFIG_BT_BAP_BROADCAST_SRC_STREAM_COUNT];
 extern struct broadcast_source default_source;
 extern struct named_lc3_preset default_broadcast_source_preset;
+
+#if defined(CONFIG_BT_CAP_INITIATOR)
+#define MAX_CAP_BROADCAST_STREAMS                                                                  \
+	MAX(BAP_UNICAST_AC_MAX_SRC,                                                                \
+	    COND_CODE_1(CONFIG_BT_CAP_HANDOVER,                           \
+						(CONFIG_BT_BAP_UNICAST_CLIENT_ASE_SNK_COUNT), (0)))
+BUILD_ASSERT(MAX_CAP_BROADCAST_STREAMS > CONFIG_BT_BAP_BROADCAST_SRC_STREAM_COUNT,
+	     "CONFIG_BT_BAP_BROADCAST_SRC_STREAM_COUNT needs to be equal or greater to "
+	     "MAX_CAP_BROADCAST_STREAMS");
+
+extern struct bt_cap_initiator_broadcast_stream_param
+	cap_initiator_broadcast_stream_params[MAX_CAP_BROADCAST_STREAMS];
+
+extern struct bt_cap_initiator_broadcast_subgroup_param cap_initiator_broadcast_subgroup_param;
+extern struct bt_cap_initiator_broadcast_create_param cap_initiator_broadcast_create_param;
+#endif /* CONFIG_BT_CAP_INITIATOR */
 #endif /* CONFIG_BT_BAP_BROADCAST_SOURCE */
 
 static inline bool print_base_subgroup_bis_cb(const struct bt_bap_base_subgroup_bis *bis,

subsys/bluetooth/audio/shell/cap_commander.c

@@ -521,6 +521,10 @@ static int cmd_cap_commander_change_microphone_gain(const struct shell *sh, size
 #endif /* CONFIG_BT_MICP_MIC_CTLR */
 
 #if defined(CONFIG_BT_BAP_BROADCAST_ASSISTANT)
+struct bt_cap_commander_broadcast_reception_stop_param cap_commander_reception_stop_param;
+struct bt_cap_commander_broadcast_reception_stop_member_param
+	cap_commander_reception_stop_member_params[CONFIG_BT_MAX_CONN];
+
 static int cmd_cap_commander_broadcast_reception_start(const struct shell *sh, size_t argc,
 						       char *argv[])
 {
@@ -693,14 +697,7 @@ static int cmd_cap_commander_broadcast_reception_start(const struct shell *sh, s
 static int cmd_cap_commander_broadcast_reception_stop(const struct shell *sh, size_t argc,
 						      char *argv[])
 {
-	struct bt_cap_commander_broadcast_reception_stop_member_param
-		member_params[CONFIG_BT_MAX_CONN] = {0};
 	const size_t cap_args = argc - 1; /* First argument is the command itself */
-	struct bt_cap_commander_broadcast_reception_stop_param param = {
-		.type = BT_CAP_SET_TYPE_AD_HOC,
-		.param = member_params,
-	};
-
 	struct bt_conn *connected_conns[CONFIG_BT_MAX_CONN] = {0};
 	size_t conn_cnt = 0U;
 	int err = 0;
@@ -710,6 +707,19 @@ static int cmd_cap_commander_broadcast_reception_stop(const struct shell *sh, si
 		return -ENOEXEC;
 	}
 
+#if defined(CONFIG_BT_BAP_BROADCAST_SOURCE)
+	if (default_source.handover_in_progress) {
+		shell_error(sh, "Handover already in progress");
+
+		return -ENOEXEC;
+	}
+#endif /* CONFIG_BT_BAP_BROADCAST_SOURCE */
+
+	(void)memset(&cap_commander_reception_stop_param, 0,
+		     sizeof((cap_commander_reception_stop_param)));
+	(void)memset(&cap_commander_reception_stop_member_params, 0,
+		     sizeof((cap_commander_reception_stop_member_params)));
+
 	/* TODO: Add support for coordinated sets */
 
 	/* Populate the array of connected connections */
@@ -748,15 +758,19 @@ static int cmd_cap_commander_broadcast_reception_stop(const struct shell *sh, si
 		}
 
 		/* TODO: Allow for multiple subgroups */
-		member_params[i].num_subgroups = 1;
-		member_params[i].src_id = src_id;
-		member_params[i].member.member = connected_conns[i];
-		param.count++;
+		cap_commander_reception_stop_member_params[i].num_subgroups = 1;
+		cap_commander_reception_stop_member_params[i].src_id = src_id;
+		cap_commander_reception_stop_member_params[i].member.member = connected_conns[i];
+		cap_commander_reception_stop_param.count++;
 	}
 
-	shell_print(sh, "Stopping broadcast reception on %zu connection(s)", param.count);
+	cap_commander_reception_stop_param.type = BT_CAP_SET_TYPE_AD_HOC;
+	cap_commander_reception_stop_param.param = cap_commander_reception_stop_member_params;
+
+	shell_print(sh, "Stopping broadcast reception on %zu connection(s)",
+		    cap_commander_reception_stop_param.count);
 
-	err = bt_cap_commander_broadcast_reception_stop(&param);
+	err = bt_cap_commander_broadcast_reception_stop(&cap_commander_reception_stop_param);
 	if (err != 0) {
 		shell_print(sh, "Failed to initiate broadcast reception stop: %d", err);