[nrf fromtree] tests: Bluetooth: Add ASCS CIS connection events

Add support for the ASCS CIS connection state events.

Signed-off-by: Emil Gydesen <[email protected]>
(cherry picked from commit 29f4f24)

Author: Thalley

tests/bluetooth/tester/src/audio/btp/btp_ascs.h

@@ -117,5 +117,20 @@ struct btp_ascs_ase_state_changed_ev {
 	uint8_t state;
 } __packed;
 
+#define BTP_ASCS_EV_CIS_CONNECTED 0x83
+struct btp_ascs_cis_connected_ev {
+	bt_addr_le_t address;
+	uint8_t ase_id;
+	uint8_t cis_id;
+} __packed;
+
+#define BTP_ASCS_EV_CIS_DISCONNECTED 0x84
+struct btp_ascs_cis_disconnected_ev {
+	bt_addr_le_t address;
+	uint8_t ase_id;
+	uint8_t cis_id;
+	uint8_t reason;
+} __packed;
+
 #define BTP_ASCS_STATUS_SUCCESS	0x00
 #define BTP_ASCS_STATUS_FAILED	0x01

tests/bluetooth/tester/src/audio/btp_bap_unicast.c

@@ -7,12 +7,15 @@
  */
 
 #include <stddef.h>
+#include <stdint.h>
 #include <errno.h>
 
+#include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/audio/bap.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/iso.h>
+#include <zephyr/sys/__assert.h>
 #include <zephyr/types.h>
 #include <zephyr/kernel.h>
 #include <zephyr/sys/ring_buffer.h>
@@ -168,6 +171,37 @@ static void btp_send_ascs_ase_state_changed_ev(struct bt_conn *conn, uint8_t ase
 	tester_event(BTP_SERVICE_ID_ASCS, BTP_ASCS_EV_ASE_STATE_CHANGED, &ev, sizeof(ev));
 }
 
+static void btp_send_ascs_cis_connected_ev(const struct bt_bap_stream *stream)
+{
+	struct btp_bap_unicast_stream *u_stream;
+	struct btp_ascs_cis_connected_ev ev;
+
+	u_stream = stream_bap_to_unicast(stream);
+	__ASSERT(u_stream != NULL, "Failed to get unicast_stream from %p", stream);
+
+	bt_addr_le_copy(&ev.address, bt_conn_get_dst(stream->conn));
+	ev.ase_id = u_stream->ase_id;
+	ev.cis_id = u_stream->cis_id;
+
+	tester_event(BTP_SERVICE_ID_ASCS, BTP_ASCS_EV_CIS_CONNECTED, &ev, sizeof(ev));
+}
+
+static void btp_send_ascs_cis_disconnected_ev(const struct bt_bap_stream *stream, uint8_t reason)
+{
+	struct btp_bap_unicast_stream *u_stream;
+	struct btp_ascs_cis_disconnected_ev ev;
+
+	u_stream = stream_bap_to_unicast(stream);
+	__ASSERT(u_stream != NULL, "Failed to get unicast_stream from %p", stream);
+
+	bt_addr_le_copy(&ev.address, bt_conn_get_dst(stream->conn));
+	ev.ase_id = u_stream->ase_id;
+	ev.cis_id = u_stream->cis_id;
+	ev.reason = reason;
+
+	tester_event(BTP_SERVICE_ID_ASCS, BTP_ASCS_EV_CIS_DISCONNECTED, &ev, sizeof(ev));
+}
+
 static void btp_send_ascs_operation_completed_ev(struct bt_conn *conn, uint8_t ase_id,
 						 uint8_t opcode, uint8_t status)
 {
@@ -669,6 +703,15 @@ static void stream_connected_cb(struct bt_bap_stream *stream)
 							     BTP_ASCS_STATUS_SUCCESS);
 		}
 	}
+
+	btp_send_ascs_cis_connected_ev(stream);
+}
+
+static void stream_disconnected_cb(struct bt_bap_stream *stream, uint8_t reason)
+{
+	LOG_DBG("Disconnected stream %p: 0x%02X", stream, reason);
+
+	btp_send_ascs_cis_disconnected_ev(stream, reason);
 }
 
 static void stream_stopped_cb(struct bt_bap_stream *stream, uint8_t reason)
@@ -749,6 +792,7 @@ static struct bt_bap_stream_ops stream_ops = {
 	.recv = stream_recv_cb,
 	.sent = btp_bap_audio_stream_sent_cb,
 	.connected = stream_connected_cb,
+	.disconnected = stream_disconnected_cb,
 };
 
 struct btp_bap_unicast_stream *btp_bap_unicast_stream_alloc(

tests/bsim/bluetooth/tester/src/bsim_btp.c

@@ -1041,6 +1041,10 @@ static bool is_valid_ascs_packet_len(const struct btp_hdr *hdr, struct net_buf_s
 		return buf_simple->len == 0U;
 	case BTP_ASCS_EV_ASE_STATE_CHANGED:
 		return buf_simple->len == sizeof(struct btp_ascs_ase_state_changed_ev);
+	case BTP_ASCS_EV_CIS_CONNECTED:
+		return buf_simple->len == sizeof(struct btp_ascs_cis_connected_ev);
+	case BTP_ASCS_EV_CIS_DISCONNECTED:
+		return buf_simple->len == sizeof(struct btp_ascs_cis_disconnected_ev);
 	default:
 		LOG_ERR("Unhandled opcode 0x%02X", hdr->opcode);
 		return false;