Bluetooth: CSIP: Rename BT_CSIP_SET_MEMBER_NOTIFIABLE

Renamed BT_CSIP_SET_MEMBER_NOTIFIABLE to
BT_CSIP_SET_MEMBER_SIRK_NOTIFIABLE to be more specific.

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

Author: Thalley

doc/connectivity/bluetooth/shell/audio/cap.rst

@@ -40,7 +40,7 @@ Setting a new SIRK
 
 This command can modify the currently used SIRK. To get the new RSI to advertise on air,
 :code:`bt adv-data` or :code:`bt advertise` must be called again to set the new advertising data.
-If :code:`CONFIG_BT_CSIP_SET_MEMBER_NOTIFIABLE` is enabled, this will also notify connected
+If :code:`CONFIG_BT_CSIP_SET_MEMBER_SIRK_NOTIFIABLE` is enabled, this will also notify connected
 clients.
 
 .. code-block:: console

doc/connectivity/bluetooth/shell/audio/csip.rst

@@ -171,7 +171,7 @@ Setting a new SIRK
 
 This command can modify the currently used SIRK. To get the new RSI to advertise on air,
 :code:`bt adv-data` or :code:`bt advertise` must be called again to set the new advertising data.
-If :code:`CONFIG_BT_CSIP_SET_MEMBER_NOTIFIABLE` is enabled, this will also notify connected
+If :code:`CONFIG_BT_CSIP_SET_MEMBER_SIRK_NOTIFIABLE` is enabled, this will also notify connected
 clients.
 
 .. code-block:: console

doc/releases/migration-guide-4.2.rst

@@ -117,6 +117,12 @@ Timer
 Bluetooth
 *********
 
+Bluetooth Audio
+===============
+
+* ``CONFIG_BT_CSIP_SET_MEMBER_NOTIFIABLE`` has been renamed to
+  :kconfig:option:`CONFIG_BT_CSIP_SET_MEMBER_SIRK_NOTIFIABLE``. (:github:`86763``)
+
 Bluetooth Host
 ==============
 

subsys/bluetooth/audio/Kconfig.csip

@@ -48,7 +48,7 @@ config BT_CSIP_SET_MEMBER_MAX_INSTANCE_COUNT
 	  Enabling BT_CAP_ACCEPTOR_SET_MEMBER will take one of the allocated
 	  instances.
 
-config BT_CSIP_SET_MEMBER_NOTIFIABLE
+config BT_CSIP_SET_MEMBER_SIRK_NOTIFIABLE
 	bool "SIRK notifiable Support"
 	help
 	  This option enables support for clients to be notified on SIRK changes.

subsys/bluetooth/audio/csip_set_member.c

@@ -285,12 +285,12 @@ static ssize_t read_sirk(struct bt_conn *conn, const struct bt_gatt_attr *attr,
 				 sirk, sizeof(*sirk));
 }
 
-#if defined(CONFIG_BT_CSIP_SET_MEMBER_NOTIFIABLE)
+#if defined(CONFIG_BT_CSIP_SET_MEMBER_SIRK_NOTIFIABLE)
 static void sirk_cfg_changed(const struct bt_gatt_attr *attr, uint16_t value)
 {
 	LOG_DBG("value 0x%04x", value);
 }
-#endif /* CONFIG_BT_CSIP_SET_MEMBER_NOTIFIABLE */
+#endif /* CONFIG_BT_CSIP_SET_MEMBER_SIRK_NOTIFIABLE */
 
 static ssize_t read_set_size(struct bt_conn *conn,
 			     const struct bt_gatt_attr *attr,
@@ -614,7 +614,7 @@ static struct bt_conn_auth_info_cb auth_callbacks = {
 	.bond_deleted = csip_bond_deleted
 };
 
-#if defined(CONFIG_BT_CSIP_SET_MEMBER_NOTIFIABLE)
+#if defined(CONFIG_BT_CSIP_SET_MEMBER_SIRK_NOTIFIABLE)
 #define BT_CSIS_CHR_SIRK(_csip)                                                                    \
 	BT_AUDIO_CHRC(BT_UUID_CSIS_SIRK, BT_GATT_CHRC_READ | BT_GATT_CHRC_NOTIFY,                  \
 		      BT_GATT_PERM_READ_ENCRYPT, read_sirk, NULL, &_csip),                         \
@@ -623,7 +623,7 @@ static struct bt_conn_auth_info_cb auth_callbacks = {
 #define BT_CSIS_CHR_SIRK(_csip)                                                                    \
 	BT_AUDIO_CHRC(BT_UUID_CSIS_SIRK, BT_GATT_CHRC_READ, BT_GATT_PERM_READ_ENCRYPT, read_sirk,  \
 		      NULL, &_csip)
-#endif /* CONFIG_BT_CSIP_SET_MEMBER_NOTIFIABLE */
+#endif /* CONFIG_BT_CSIP_SET_MEMBER_SIRK_NOTIFIABLE */
 
 #define BT_CSIP_SERVICE_DEFINITION(_csip) {\
 	BT_GATT_PRIMARY_SERVICE(BT_UUID_CSIS), \
@@ -769,7 +769,7 @@ static void notify_cb(struct bt_conn *conn, void *data)
 			       sizeof(svc_inst->set_lock));
 		}
 
-		if (IS_ENABLED(CONFIG_BT_CSIP_SET_MEMBER_NOTIFIABLE) &&
+		if (IS_ENABLED(CONFIG_BT_CSIP_SET_MEMBER_SIRK_NOTIFIABLE) &&
 		    atomic_test_and_clear_bit(client->flags, FLAG_NOTIFY_SIRK)) {
 			notify(svc_inst, conn, BT_UUID_CSIS_SIRK, &svc_inst->sirk,
 			       sizeof(svc_inst->sirk));

tests/bsim/bluetooth/audio/prj.conf

@@ -88,7 +88,7 @@ CONFIG_BT_MICP_MIC_CTLR_MAX_AICS_INST=2
 # Coordinated Set Identification
 CONFIG_BT_CSIP_SET_MEMBER=y
 CONFIG_BT_CSIP_SET_MEMBER_TEST_SAMPLE_DATA=y
-CONFIG_BT_CSIP_SET_MEMBER_NOTIFIABLE=y
+CONFIG_BT_CSIP_SET_MEMBER_SIRK_NOTIFIABLE=y
 CONFIG_BT_CSIP_SET_COORDINATOR=y
 CONFIG_BT_CSIP_SET_COORDINATOR_TEST_SAMPLE_DATA=y