Bluetooth: pacs: Add dynamic PACS registration

Added option to set the PACS Characteristics through the bap API, making PACS configuration runtime available. Source and Sink PAC, as well as Source/Sink PAC Location is can be set through a register function in the PACS api. Signed-off-by: Fredrik Danebjer <frdn@demant.com>
zephyrproject-rtos · Jan 21, 2025 · c9b2e77 · c9b2e77
1 parent 9a236f8
commit c9b2e77
Show file tree

Hide file tree

Showing 16 changed files with 569 additions and 109 deletions.
diff --git a/doc/releases/migration-guide-4.1.rst b/doc/releases/migration-guide-4.1.rst
@@ -385,6 +385,12 @@ Bluetooth Audio
     * :kconfig:option:`CONFIG_BT_PAC_SNK`
     * :kconfig:option:`CONFIG_BT_PAC_SRC`
 
+* PACS have been changed to support dynamic, runtime configuration. This means that PACS now has
+  to be registered with :c:func:`bt_pacs_register` before it can be used. In addition,
+  :c:func:`bt_pacs_register` also have to be called before :c:func:`bt_ascs_register` can be
+  be called. All Kconfig options still remain. Runtime configuration cannot override a disabled
+  Kconfig option. (:github:`83730`)
+
 Bluetooth Classic
 =================
 

diff --git a/include/zephyr/bluetooth/audio/pacs.h b/include/zephyr/bluetooth/audio/pacs.h
@@ -45,6 +45,43 @@ struct bt_pacs_cap {
 	sys_snode_t _node;
 };
 
+/** Structure for registering PACS */
+struct bt_bap_pacs_register_param {
+#if defined(CONFIG_BT_PAC_SNK)
+	/**
+	 * @brief Enables or disables registration of Sink PAC Characteristic.
+	 */
+	bool snk_pac;
+#endif /* CONFIG_BT_PAC_SNK */
+
+#if defined(CONFIG_BT_PAC_SNK_LOC)
+	/**
+	 * @brief Enables or disables registration of Sink Location Characteristic.
+	 *
+	 * Registration of Sink Location is dependent on @ref bt_bap_pacs_register_param.snk_pac
+	 * also being set.
+	 */
+	bool snk_loc;
+#endif /* CONFIG_BT_PAC_SNK_LOC */
+
+#if defined(CONFIG_BT_PAC_SRC)
+	/**
+	 * @brief Enables or disables registration of Source PAC Characteristic.
+	 */
+	bool src_pac;
+#endif /* CONFIG_BT_PAC_SRC */
+
+#if defined(CONFIG_BT_PAC_SRC_LOC)
+	/**
+	 * @brief Enables or disables registration of Source Location Characteristic.
+	 *
+	 * Registration of Source Location is dependent on @ref bt_bap_pacs_register_param.src_pac
+	 * also being set.
+	 */
+	bool src_loc;
+#endif /* CONFIG_BT_PAC_SRC_LOC */
+};
+
 /**
  * @typedef bt_pacs_cap_foreach_func_t
  * @brief Published Audio Capability iterator callback.
@@ -71,6 +108,22 @@ void bt_pacs_cap_foreach(enum bt_audio_dir dir,
 			 bt_pacs_cap_foreach_func_t func,
 			 void *user_data);
 
+/**
+ * @brief Register the Published Audio Capability Service instance.
+ *
+ * @param param PACS register parameters.
+ *
+ * @return 0 in case of success or negative value in case of error.
+ */
+int bt_pacs_register(const struct bt_bap_pacs_register_param *param);
+
+/**
+ * @brief Unregister the Published Audio Capability Service instance.
+ *
+ * @return 0 in case of success or negative value in case of error.
+ */
+int bt_pacs_unregister(void);
+
 /**
  * @brief Register Published Audio Capability.
  *

diff --git a/samples/bluetooth/bap_broadcast_sink/src/main.c b/samples/bluetooth/bap_broadcast_sink/src/main.c
@@ -1272,8 +1272,13 @@ static struct bt_le_per_adv_sync_cb bap_pa_sync_cb = {
 	.term = bap_pa_sync_terminated_cb,
 };
 
+
 static int init(void)
 {
+	const struct bt_bap_pacs_register_param pacs_param = {
+		.snk_pac = true,
+		.snk_loc = true,
+	};
 	int err;
 
 	err = bt_enable(NULL);
@@ -1284,6 +1289,12 @@ static int init(void)
 
 	printk("Bluetooth initialized\n");
 
+	err = bt_pacs_register(&pacs_param);
+	if (err) {
+		printk("Could not register PACS (err %d)\n", err);
+		return err;
+	}
+
 	err = bt_pacs_cap_register(BT_AUDIO_DIR_SINK, &cap);
 	if (err) {
 		printk("Capability register failed (err %d)\n", err);

diff --git a/samples/bluetooth/bap_unicast_server/src/main.c b/samples/bluetooth/bap_unicast_server/src/main.c
@@ -721,9 +721,16 @@ static int set_available_contexts(void)
 	return 0;
 }
 
+
 int main(void)
 {
 	struct bt_le_ext_adv *adv;
+	const struct bt_bap_pacs_register_param pacs_param = {
+		.snk_pac = true,
+		.snk_loc = true,
+		.src_pac = true,
+		.src_loc = true
+	};
 	int err;
 
 	err = bt_enable(NULL);
@@ -734,6 +741,12 @@ int main(void)
 
 	printk("Bluetooth initialized\n");
 
+	err = bt_pacs_register(&pacs_param);
+	if (err) {
+		printk("Could not register PACS (err %d)\n", err);
+		return 0;
+	}
+
 	bt_bap_unicast_server_register(&param);
 	bt_bap_unicast_server_register_cb(&unicast_server_cb);
 

diff --git a/samples/bluetooth/cap_acceptor/src/main.c b/samples/bluetooth/cap_acceptor/src/main.c
@@ -256,6 +256,12 @@ static int init_cap_acceptor(void)
 	static const struct bt_audio_codec_cap lc3_codec_cap = BT_AUDIO_CODEC_CAP_LC3(
 		SUPPORTED_FREQ, SUPPORTED_DURATION, MAX_CHAN_PER_STREAM, MIN_SDU, MAX_SDU,
 		FRAMES_PER_SDU, (SINK_CONTEXT | SOURCE_CONTEXT));
+	const struct bt_bap_pacs_register_param pacs_param = {
+		.snk_pac = true,
+		.snk_loc = true,
+		.src_pac = true,
+		.src_loc = true
+	};
 	int err;
 
 	err = bt_enable(NULL);
@@ -267,6 +273,12 @@ static int init_cap_acceptor(void)
 
 	LOG_INF("Bluetooth initialized");
 
+	err = bt_pacs_register(&pacs_param);
+	if (err) {
+		LOG_ERR("Could not register PACS (err %d)", err);
+		return 0;
+	}
+
 	if (IS_ENABLED(CONFIG_BT_PAC_SNK)) {
 		static struct bt_pacs_cap sink_cap = {
 			.codec_cap = &lc3_codec_cap,

diff --git a/samples/bluetooth/hap_ha/src/bap_unicast_sr.c b/samples/bluetooth/hap_ha/src/bap_unicast_sr.c
@@ -405,6 +405,20 @@ static struct bt_pacs_cap cap_source = {
 
 int bap_unicast_sr_init(void)
 {
+	const struct bt_bap_pacs_register_param pacs_param = {
+		.snk_pac = true,
+		.snk_loc = true,
+		.src_pac = true,
+		.src_loc = true
+	};
+	int err;
+
+	err = bt_pacs_register(&pacs_param);
+	if (err) {
+		printk("Could not register PACS (err %d)\n", err);
+		return err;
+	}
+
 	bt_bap_unicast_server_register(&param);
 	bt_bap_unicast_server_register_cb(&unicast_server_cb);
 

diff --git a/samples/bluetooth/tmap_bmr/src/bap_broadcast_sink.c b/samples/bluetooth/tmap_bmr/src/bap_broadcast_sink.c
@@ -313,8 +313,18 @@ static int reset(void)
 
 int bap_broadcast_sink_init(void)
 {
+	const struct bt_bap_pacs_register_param pacs_param = {
+		.snk_pac = true,
+		.snk_loc = true,
+	};
 	int err;
 
+	err = bt_pacs_register(&pacs_param);
+	if (err) {
+		printk("Could not register PACS (err %d)\n", err);
+		return err;
+	}
+
 	bt_bap_broadcast_sink_register_cb(&broadcast_sink_cbs);
 	bt_le_per_adv_sync_cb_register(&broadcast_sync_cb);
 

diff --git a/samples/bluetooth/tmap_peripheral/src/bap_unicast_sr.c b/samples/bluetooth/tmap_peripheral/src/bap_unicast_sr.c
@@ -367,8 +367,23 @@ static struct bt_pacs_cap cap = {
 	.codec_cap = &lc3_codec_cap,
 };
 
+
 int bap_unicast_sr_init(void)
 {
+	const struct bt_bap_pacs_register_param pacs_param = {
+		.snk_pac = true,
+		.snk_loc = true,
+		.src_pac = true,
+		.src_loc = true
+	};
+	int err;
+
+	err = bt_pacs_register(&pacs_param);
+	if (err) {
+		printk("Could not register PACS (err %d)\n", err);
+		return err;
+	}
+
 	bt_bap_unicast_server_register(&param);
 	bt_bap_unicast_server_register_cb(&unicast_server_cb);