michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Audio: BT_AUDIO_CODEC_LC3_ID -> BT_HCI_CODING_FORMAT_LC3

Browse source 
Replace the BT_AUDIO_CODEC_LC3_ID macro with the
BT_HCI_CODING_FORMAT_LC3 as there is no reason to
define and use the LC3 ID different than the other
allowed codec IDs.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
This commit is contained in:
Emil Gydesen 2023-09-12 10:38:43 +02:00 • committed by Fabio Baltieri
commit f93caa3903
14 changed files with 20 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
samples/bluetooth/hap_ha/src/bap_unicast_sr.c
View file

@ -74,7 +74,7 @@ static void print_codec_cfg(const struct bt_audio_codec_cfg *codec_cfg)
printk("codec_cfg 0x%02x cid 0x%04x vid 0x%04x count %u\n", codec_cfg->id, codec_cfg->cid,
codec_cfg->vid, codec_cfg->data_len);
if (codec_cfg->id == BT_AUDIO_CODEC_LC3_ID) {
if (codec_cfg->id == BT_HCI_CODING_FORMAT_LC3) {
/* LC3 uses the generic LTV format - other codecs might do as well */
enum bt_audio_location chan_allocation;

2
samples/bluetooth/tmap_central/src/cap_initiator.c
View file

@ -196,7 +196,7 @@ static void print_remote_codec(const struct bt_audio_codec_cap *codec_cap, enum
printk("codec id 0x%02x cid 0x%04x vid 0x%04x count %u\n", codec_cap->id, codec_cap->cid,
codec_cap->vid, codec_cap->data_len);
if (codec_cap->id == BT_AUDIO_CODEC_LC3_ID) {
if (codec_cap->id == BT_HCI_CODING_FORMAT_LC3) {
bt_audio_data_parse(codec_cap->data, codec_cap->data_len, print_cb, "data");
} else { /* If not LC3, we cannot assume it's LTV */
printk("data: ");

2
samples/bluetooth/tmap_peripheral/src/bap_unicast_sr.c
View file

@ -63,7 +63,7 @@ static void print_codec_cfg(const struct bt_audio_codec_cfg *codec_cfg)
printk("codec_cfg 0x%02x cid 0x%04x vid 0x%04x count %u\n", codec_cfg->id, codec_cfg->cid,
codec_cfg->vid, codec_cfg->data_len);
if (codec_cfg->id == BT_AUDIO_CODEC_LC3_ID) {
if (codec_cfg->id == BT_HCI_CODING_FORMAT_LC3) {
/* LC3 uses the generic LTV format - other codecs might do as well */
enum bt_audio_location chan_allocation;

2
samples/bluetooth/unicast_audio_client/src/main.c
View file

@ -369,7 +369,7 @@ static void print_codec_cap(const struct bt_audio_codec_cap *codec_cap)
printk("codec id 0x%02x cid 0x%04x vid 0x%04x count %u\n", codec_cap->id, codec_cap->cid,
codec_cap->vid, codec_cap->data_len);
if (codec_cap->id == BT_AUDIO_CODEC_LC3_ID) {
if (codec_cap->id == BT_HCI_CODING_FORMAT_LC3) {
bt_audio_data_parse(codec_cap->data, codec_cap->data_len, print_cb, "data");
} else { /* If not LC3, we cannot assume it's LTV */
printk("data: ");

2
samples/bluetooth/unicast_audio_server/src/main.c
View file

@ -134,7 +134,7 @@ static void print_codec_cfg(const struct bt_audio_codec_cfg *codec_cfg)
printk("codec_cfg 0x%02x cid 0x%04x vid 0x%04x count %u\n", codec_cfg->id, codec_cfg->cid,
codec_cfg->vid, codec_cfg->data_len);
if (codec_cfg->id == BT_AUDIO_CODEC_LC3_ID) {
if (codec_cfg->id == BT_HCI_CODING_FORMAT_LC3) {
/* LC3 uses the generic LTV format - other codecs might do as well */
enum bt_audio_location chan_allocation;