Bluetooth: Audio: VCS client use auto CCC discovery

Update the VCS client to use the auto CCC discovery
feature instead of expecting it to be a specific place
in the remote server's GATT database.

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

Author: Thalley

subsys/bluetooth/audio/Kconfig.vcs

@@ -63,6 +63,7 @@ endif # BT_VCS
 config BT_VCS_CLIENT
 	bool "Volume Control Profile Support"
 	select BT_GATT_CLIENT
+	select BT_GATT_AUTO_DISCOVER_CCC
 	default n
 	help
 	  This option enables support for Volume Control Profile.

subsys/bluetooth/audio/vcs_client.c

@@ -476,25 +476,24 @@ static uint8_t vcs_discover_func(struct bt_conn *conn,
 			BT_DBG("Volume state");
 			vcs_inst->cli.state_handle = chrc->value_handle;
 			sub_params = &vcs_inst->cli.state_sub_params;
+			sub_params->disc_params = &vcs_inst->cli.state_sub_disc_params;
 		} else if (bt_uuid_cmp(chrc->uuid, BT_UUID_VCS_CONTROL) == 0) {
 			BT_DBG("Control Point");
 			vcs_inst->cli.control_handle = chrc->value_handle;
 		} else if (bt_uuid_cmp(chrc->uuid, BT_UUID_VCS_FLAGS) == 0) {
 			BT_DBG("Flags");
 			vcs_inst->cli.flag_handle = chrc->value_handle;
 			sub_params = &vcs_inst->cli.flag_sub_params;
+			sub_params->disc_params = &vcs_inst->cli.flag_sub_disc_params;
 		}
 
 		if (sub_params != NULL) {
 			int err;
 
 			sub_params->value = BT_GATT_CCC_NOTIFY;
 			sub_params->value_handle = chrc->value_handle;
-			/*
-			 * TODO: Don't assume that CCC is at handle + 2;
-			 * do proper discovery;
-			 */
-			sub_params->ccc_handle = attr->handle + 2;
+			sub_params->ccc_handle = 0;
+			sub_params->end_handle = vcs_inst->cli.end_handle;
 			sub_params->notify = vcs_client_notify_handler;
 			err = bt_gatt_subscribe(conn, sub_params);
 			if (err == 0) {

subsys/bluetooth/audio/vcs_internal.h

@@ -47,7 +47,9 @@ struct bt_vcs_client {
 	uint16_t control_handle;
 	uint16_t flag_handle;
 	struct bt_gatt_subscribe_params state_sub_params;
+	struct bt_gatt_discover_params state_sub_disc_params;
 	struct bt_gatt_subscribe_params flag_sub_params;
+	struct bt_gatt_discover_params flag_sub_disc_params;
 	bool cp_retried;
 
 	bool busy;