From adb74f0f1606a33c86c1a00d4ed756a34d42cb54 Mon Sep 17 00:00:00 2001
From: Emil Gydesen <emil.gydesen@nordicsemi.no>
Date: Thu, 21 Dec 2023 11:03:28 +0100
Subject: [PATCH] Bluetooth: MICP: Fix missing guards for AICS

Some places MICP accessed AICS when it was not supported.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
---
 subsys/bluetooth/audio/micp_internal.h |  2 ++
 subsys/bluetooth/audio/micp_mic_ctlr.c | 44 ++++++++++++++++----------
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/subsys/bluetooth/audio/micp_internal.h b/subsys/bluetooth/audio/micp_internal.h
index 507e7547c75e..ce486bf6fe6c 100644
--- a/subsys/bluetooth/audio/micp_internal.h
+++ b/subsys/bluetooth/audio/micp_internal.h
@@ -29,8 +29,10 @@ struct bt_micp_mic_ctlr {
 	struct bt_gatt_discover_params discover_params;
 	struct bt_conn *conn;
 
+#if defined(CONFIG_BT_MICP_MIC_CTLR_AICS)
 	uint8_t aics_inst_cnt;
 	struct bt_aics *aics[CONFIG_BT_MICP_MIC_CTLR_MAX_AICS_INST];
+#endif /* CONFIG_BT_MICP_MIC_CTLR_AICS */
 };
 
 #endif /* ZEPHYR_INCLUDE_BLUETOOTH_AUDIO_MICP_INTERNAL_ */
diff --git a/subsys/bluetooth/audio/micp_mic_ctlr.c b/subsys/bluetooth/audio/micp_mic_ctlr.c
index 8232d664dce8..45190b7c9b4c 100644
--- a/subsys/bluetooth/audio/micp_mic_ctlr.c
+++ b/subsys/bluetooth/audio/micp_mic_ctlr.c
@@ -72,7 +72,15 @@ static void micp_mic_ctlr_discover_complete(struct bt_micp_mic_ctlr *mic_ctlr, i
 
 	SYS_SLIST_FOR_EACH_CONTAINER_SAFE(&micp_mic_ctlr_cbs, listener, next, _node) {
 		if (listener->discover) {
-			listener->discover(mic_ctlr, err, err == 0 ? mic_ctlr->aics_inst_cnt : 0U);
+			uint8_t aics_cnt = 0U;
+
+#if defined(CONFIG_BT_MICP_MIC_CTLR_AICS)
+			if (err == 0) {
+				aics_cnt = mic_ctlr->aics_inst_cnt;
+			}
+#endif /* CONFIG_BT_MICP_MIC_CTLR_AICS */
+
+			listener->discover(mic_ctlr, err, aics_cnt);
 		}
 	}
 }
@@ -298,7 +306,6 @@ static void micp_mic_ctlr_aics_set_auto_mode_cb(struct bt_aics *inst, int err)
 		}
 	}
 }
-#endif /* CONFIG_BT_MICP_MIC_CTLR_AICS */
 
 static uint8_t micp_discover_include_func(
 	struct bt_conn *conn, const struct bt_gatt_attr *attr,
@@ -350,6 +357,7 @@ static uint8_t micp_discover_include_func(
 
 	return BT_GATT_ITER_CONTINUE;
 }
+#endif /* CONFIG_BT_MICP_MIC_CTLR_AICS */
 
 /**
  * @brief This will discover all characteristics on the server, retrieving the
@@ -367,22 +375,22 @@ static uint8_t micp_discover_func(struct bt_conn *conn,
 
 		LOG_DBG("Discovery complete");
 		(void)memset(params, 0, sizeof(*params));
-		if (CONFIG_BT_MICP_MIC_CTLR_MAX_AICS_INST > 0) {
-			/* Discover included services */
-			mic_ctlr->discover_params.start_handle = mic_ctlr->start_handle;
-			mic_ctlr->discover_params.end_handle = mic_ctlr->end_handle;
-			mic_ctlr->discover_params.type = BT_GATT_DISCOVER_INCLUDE;
-			mic_ctlr->discover_params.func = micp_discover_include_func;
-
-			err = bt_gatt_discover(conn,
-					       &mic_ctlr->discover_params);
-			if (err != 0) {
-				LOG_DBG("Discover AICS failed (err %d)", err);
-				micp_mic_ctlr_discover_complete(mic_ctlr, err);
-			}
-		} else {
+
+#if defined(CONFIG_BT_MICP_MIC_CTLR_AICS)
+		/* Discover included services */
+		mic_ctlr->discover_params.start_handle = mic_ctlr->start_handle;
+		mic_ctlr->discover_params.end_handle = mic_ctlr->end_handle;
+		mic_ctlr->discover_params.type = BT_GATT_DISCOVER_INCLUDE;
+		mic_ctlr->discover_params.func = micp_discover_include_func;
+
+		err = bt_gatt_discover(conn, &mic_ctlr->discover_params);
+		if (err != 0) {
+			LOG_DBG("Discover AICS failed (err %d)", err);
 			micp_mic_ctlr_discover_complete(mic_ctlr, err);
 		}
+#else
+		micp_mic_ctlr_discover_complete(mic_ctlr, err);
+#endif /* CONFIG_BT_MICP_MIC_CTLR_AICS */
 
 		return BT_GATT_ITER_STOP;
 	}
@@ -476,7 +484,9 @@ static void micp_mic_ctlr_reset(struct bt_micp_mic_ctlr *mic_ctlr)
 	mic_ctlr->start_handle = 0;
 	mic_ctlr->end_handle = 0;
 	mic_ctlr->mute_handle = 0;
+#if defined(CONFIG_BT_MICP_MIC_CTLR_AICS)
 	mic_ctlr->aics_inst_cnt = 0;
+#endif /* CONFIG_BT_MICP_MIC_CTLR_AICS */
 
 	if (mic_ctlr->conn != NULL) {
 		struct bt_conn *conn = mic_ctlr->conn;
@@ -594,6 +604,7 @@ int bt_micp_mic_ctlr_cb_register(struct bt_micp_mic_ctlr_cb *cb)
 	return 0;
 }
 
+#if defined(CONFIG_BT_MICP_MIC_CTLR_AICS)
 int bt_micp_mic_ctlr_included_get(struct bt_micp_mic_ctlr *mic_ctlr,
 				  struct bt_micp_included *included)
 {
@@ -611,6 +622,7 @@ int bt_micp_mic_ctlr_included_get(struct bt_micp_mic_ctlr *mic_ctlr,
 
 	return 0;
 }
+#endif /* CONFIG_BT_MICP_MIC_CTLR_AICS */
 
 struct bt_micp_mic_ctlr *bt_micp_mic_ctlr_get_by_conn(const struct bt_conn *conn)
 {