Commit 90e5b7d6 authored by Emil Gydesen's avatar Emil Gydesen Committed by Benjamin Cabé
Browse files

Bluetooth: Shell: Only add broadcast audio val one place 

Instead of add BT_UUID_BROADCAST_AUDIO_VAL for either BAP or
CAP, we now only do it one place (in BAP). This can now be done
since the default_source.broadcast_id was recently added.

Signed-off-by: default avatarEmil Gydesen <emil.gydesen@nordicsemi.no>
parent 6fe14742

subsys/bluetooth/audio/shell/audio.h

+0 −2
Changes for subsys/bluetooth/audio/shell/audio.h: 0 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -48,8 +48,6 @@ size_t cap_acceptor_ad_data_add(struct bt_data data[], size_t data_size, bool di 
size_t bap_scan_delegator_ad_data_add(struct bt_data data[], size_t data_size);

size_t gmap_ad_data_add(struct bt_data data[], size_t data_size);

size_t pbp_ad_data_add(struct bt_data data[], size_t data_size);

size_t cap_initiator_ad_data_add(struct bt_data *data_array, const size_t data_array_size,

				 const bool discoverable, const bool connectable);

size_t cap_initiator_pa_data_add(struct bt_data *data_array, const size_t data_array_size);



#if defined(CONFIG_BT_AUDIO)

subsys/bluetooth/audio/shell/bap.c

+7 −19
Changes for subsys/bluetooth/audio/shell/bap.c: 7 added lines, 19 removed lines.
Original line number Diff line number Diff line
@@ -4329,24 +4329,17 @@ static size_t nonconnectable_ad_data_add(struct bt_data *data_array, const size_ 
	};

	size_t ad_len = 0;



	if (IS_ENABLED(CONFIG_BT_CAP_ACCEPTOR)) {

		static const uint8_t ad_cap_announcement[3] = {

			BT_UUID_16_ENCODE(BT_UUID_CAS_VAL),

			BT_AUDIO_UNICAST_ANNOUNCEMENT_TARGETED,

		};



		__ASSERT(data_array_size > ad_len, "No space for AD_CAP_ANNOUNCEMENT");

		data_array[ad_len].type = BT_DATA_SVC_DATA16;

		data_array[ad_len].data_len = ARRAY_SIZE(ad_cap_announcement);

		data_array[ad_len].data = &ad_cap_announcement[0];

		ad_len++;

	}



#if defined(CONFIG_BT_BAP_BROADCAST_SOURCE)

	if (default_source.bap_source != NULL && !default_source.is_cap) {

	if (default_source.bap_source != NULL) {

		static uint8_t ad_bap_broadcast_announcement[5] = {

			BT_UUID_16_ENCODE(BT_UUID_BROADCAST_AUDIO_VAL),

		};



		if (data_array_size <= ad_len) {

			bt_shell_warn("No space for BT_UUID_BROADCAST_AUDIO_VAL");

			return ad_len;

		}



		sys_put_le24(default_source.broadcast_id, &ad_bap_broadcast_announcement[2]);

		data_array[ad_len].type = BT_DATA_SVC_DATA16;

		data_array[ad_len].data_len = ARRAY_SIZE(ad_bap_broadcast_announcement);
@@ -4385,11 +4378,6 @@ size_t audio_ad_data_add(struct bt_data *data_array, const size_t data_array_siz 
		ad_len += nonconnectable_ad_data_add(data_array, data_array_size);

	}



	if (IS_ENABLED(CONFIG_BT_CAP_INITIATOR)) {

		ad_len += cap_initiator_ad_data_add(data_array, data_array_size, discoverable,

						    connectable);

	}



	return ad_len;

}

subsys/bluetooth/audio/shell/cap_initiator.c

+0 −34
Changes for subsys/bluetooth/audio/shell/cap_initiator.c: 0 added lines, 34 removed lines.
Original line number Diff line number Diff line
@@ -1442,40 +1442,6 @@ SHELL_CMD_ARG_REGISTER(cap_initiator, &cap_initiator_cmds, 
		       "Bluetooth CAP initiator shell commands",

		       cmd_cap_initiator, 1, 1);



static size_t nonconnectable_ad_data_add(struct bt_data *data_array, const size_t data_array_size)

{

#if defined(CONFIG_BT_BAP_BROADCAST_SOURCE)

	if (default_source.cap_source != NULL && default_source.is_cap) {

		static uint8_t ad_cap_broadcast_announcement[5] = {

			BT_UUID_16_ENCODE(BT_UUID_BROADCAST_AUDIO_VAL),

		};



		sys_put_le24(default_source.broadcast_id, &ad_cap_broadcast_announcement[2]);

		data_array[0].type = BT_DATA_SVC_DATA16;

		data_array[0].data_len = ARRAY_SIZE(ad_cap_broadcast_announcement);

		data_array[0].data = ad_cap_broadcast_announcement;



		return 1;

	}

#endif /* CONFIG_BT_BAP_BROADCAST_SOURCE */



	return 0;

}



size_t cap_initiator_ad_data_add(struct bt_data *data_array, const size_t data_array_size,

				 const bool discoverable, const bool connectable)

{

	if (!discoverable) {

		return 0;

	}



	if (!connectable) {

		return nonconnectable_ad_data_add(data_array, data_array_size);

	}



	return 0;

}



size_t cap_initiator_pa_data_add(struct bt_data *data_array, const size_t data_array_size)

{

#if defined(CONFIG_BT_BAP_BROADCAST_SOURCE)

CRA Git | Maintained and supported by SUSTech CRA and CCSE