From d96f98188c53820a9e929636ebbf344fd27cb839 Mon Sep 17 00:00:00 2001
From: Andries Kruithof <andries.kruithof@nordicsemi.no>
Date: Thu, 11 Apr 2024 14:58:42 +0200
Subject: [PATCH] Bluetooth: CAP: Shell: Add cancel command

We didn't have a cancel command for the CAP commander, so adding this
command here.

Signed-off-by: Andries Kruithof <andries.kruithof@nordicsemi.no>
---
 doc/connectivity/bluetooth/api/shell/cap.rst |  1 +
 subsys/bluetooth/audio/shell/cap_commander.c | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/doc/connectivity/bluetooth/api/shell/cap.rst b/doc/connectivity/bluetooth/api/shell/cap.rst
index af03fdf5df9..0cb65d87f79 100644
--- a/doc/connectivity/bluetooth/api/shell/cap.rst
+++ b/doc/connectivity/bluetooth/api/shell/cap.rst
@@ -258,6 +258,7 @@ the optionally included CSIS instance by calling (:code:`cap_commander discover`
    cap_commander - Bluetooth CAP commander shell commands
    Subcommands:
      discover                :Discover CAS
+     cancel                  :CAP commander cancel current procedure
      change_volume           :Change volume on all connections <volume>
      change_volume_mute      :Change volume mute state on all connections <mute>
      change_volume_offset    :Change volume offset per connection <volume_offset
diff --git a/subsys/bluetooth/audio/shell/cap_commander.c b/subsys/bluetooth/audio/shell/cap_commander.c
index b65ec319c45..1042f3530a2 100644
--- a/subsys/bluetooth/audio/shell/cap_commander.c
+++ b/subsys/bluetooth/audio/shell/cap_commander.c
@@ -103,6 +103,19 @@ static struct bt_cap_commander_cb cbs = {
 #endif /* CONFIG_BT_MICP_MIC_CTLR */
 };
 
+static int cmd_cap_commander_cancel(const struct shell *sh, size_t argc, char *argv[])
+{
+	int err;
+
+	err = bt_cap_commander_cancel();
+	if (err != 0) {
+		shell_print(sh, "Failed to cancel CAP commander procedure: %d", err);
+		return -ENOEXEC;
+	}
+
+	return 0;
+}
+
 static int cmd_cap_commander_discover(const struct shell *sh, size_t argc, char *argv[])
 {
 	static bool cbs_registered;
@@ -472,6 +485,8 @@ static int cmd_cap_commander(const struct shell *sh, size_t argc, char **argv)
 SHELL_STATIC_SUBCMD_SET_CREATE(
 	cap_commander_cmds,
 	SHELL_CMD_ARG(discover, NULL, "Discover CAS", cmd_cap_commander_discover, 1, 0),
+	SHELL_CMD_ARG(cancel, NULL, "CAP commander cancel current procedure",
+		      cmd_cap_commander_cancel, 1, 0),
 #if defined(CONFIG_BT_VCP_VOL_CTLR)
 	SHELL_CMD_ARG(change_volume, NULL, "Change volume on all connections <volume>",
 		      cmd_cap_commander_change_volume, 2, 0),