Skip to content

Commit de507d4

Browse files
koffesrlubos
koffes
authored and
rlubos
committed
Applications: nrf5340_audio: Upmerge
OCT-3374 Upmerge 02-06-2025 Signed-off-by: Kristoffer Skøien <[email protected]>
1 parent c1f856c commit de507d4

File tree

5 files changed

+20
-57
lines changed

5 files changed

+20
-57
lines changed

‎applications/nrf5340_audio/broadcast_sink/main.c‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,6 @@ struct ble_iso_data {
3636

3737
static uint32_t last_broadcast_id = BRDCAST_ID_NOT_USED;
3838

39-
static struct zbus_observer_node zbus_obs_node_button;
40-
static struct zbus_observer_node zbus_obs_node_audio;
41-
static struct zbus_observer_node zbus_obs_node_volume;
42-
static struct zbus_observer_node zbus_obs_node_mgmt;
43-
4439
ZBUS_SUBSCRIBER_DEFINE(button_evt_sub, CONFIG_BUTTON_MSG_SUB_QUEUE_SIZE);
4540

4641
ZBUS_MSG_SUBSCRIBER_DEFINE(le_audio_evt_sub);
@@ -465,31 +460,27 @@ static int zbus_link_producers_observers(void)
465460
return -ENOTSUP;
466461
}
467462

468-
ret = zbus_chan_add_obs(&button_chan, &button_evt_sub, &zbus_obs_node_button,
469-
ZBUS_ADD_OBS_TIMEOUT_MS);
463+
ret = zbus_chan_add_obs(&button_chan, &button_evt_sub, ZBUS_ADD_OBS_TIMEOUT_MS);
470464
if (ret) {
471465
LOG_ERR("Failed to add button sub");
472466
return ret;
473467
}
474468

475-
ret = zbus_chan_add_obs(&le_audio_chan, &le_audio_evt_sub, &zbus_obs_node_audio,
476-
ZBUS_ADD_OBS_TIMEOUT_MS);
469+
ret = zbus_chan_add_obs(&le_audio_chan, &le_audio_evt_sub, ZBUS_ADD_OBS_TIMEOUT_MS);
477470
if (ret) {
478471
LOG_ERR("Failed to add le_audio sub");
479472
return ret;
480473
}
481474

482475
if (IS_ENABLED(CONFIG_BOARD_NRF5340_AUDIO_DK_NRF5340_CPUAPP)) {
483-
ret = zbus_chan_add_obs(&volume_chan, &volume_evt_sub, &zbus_obs_node_volume,
484-
ZBUS_ADD_OBS_TIMEOUT_MS);
476+
ret = zbus_chan_add_obs(&volume_chan, &volume_evt_sub, ZBUS_ADD_OBS_TIMEOUT_MS);
485477
if (ret) {
486478
LOG_ERR("Failed to add add volume sub");
487479
return ret;
488480
}
489481
}
490482

491-
ret = zbus_chan_add_obs(&bt_mgmt_chan, &bt_mgmt_evt_sub, &zbus_obs_node_mgmt,
492-
ZBUS_ADD_OBS_TIMEOUT_MS);
483+
ret = zbus_chan_add_obs(&bt_mgmt_chan, &bt_mgmt_evt_sub, ZBUS_ADD_OBS_TIMEOUT_MS);
493484
if (ret) {
494485
LOG_ERR("Failed to add bt_mgmt sub");
495486
return ret;

‎applications/nrf5340_audio/broadcast_source/main.c‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@
2525
#include <zephyr/logging/log.h>
2626
LOG_MODULE_REGISTER(main, CONFIG_MAIN_LOG_LEVEL);
2727

28-
static struct zbus_observer_node zbus_obs_node_ref;
29-
static struct zbus_observer_node zbus_obs_node_button;
30-
static struct zbus_observer_node zbus_obs_node_audio;
31-
static struct zbus_observer_node zbus_obs_node_mgmt;
32-
3328
ZBUS_SUBSCRIBER_DEFINE(button_evt_sub, CONFIG_BUTTON_MSG_SUB_QUEUE_SIZE);
3429

3530
ZBUS_MSG_SUBSCRIBER_DEFINE(le_audio_evt_sub);
@@ -277,8 +272,7 @@ static int zbus_subscribers_create(void)
277272
return ret;
278273
}
279274

280-
ret = zbus_chan_add_obs(&sdu_ref_chan, &sdu_ref_msg_listen, &zbus_obs_node_ref,
281-
ZBUS_ADD_OBS_TIMEOUT_MS);
275+
ret = zbus_chan_add_obs(&sdu_ref_chan, &sdu_ref_msg_listen, ZBUS_ADD_OBS_TIMEOUT_MS);
282276
if (ret) {
283277
LOG_ERR("Failed to add timestamp listener");
284278
return ret;
@@ -336,22 +330,19 @@ static int zbus_link_producers_observers(void)
336330
return -ENOTSUP;
337331
}
338332

339-
ret = zbus_chan_add_obs(&button_chan, &button_evt_sub, &zbus_obs_node_button,
340-
ZBUS_ADD_OBS_TIMEOUT_MS);
333+
ret = zbus_chan_add_obs(&button_chan, &button_evt_sub, ZBUS_ADD_OBS_TIMEOUT_MS);
341334
if (ret) {
342335
LOG_ERR("Failed to add button sub");
343336
return ret;
344337
}
345338

346-
ret = zbus_chan_add_obs(&le_audio_chan, &le_audio_evt_sub, &zbus_obs_node_audio,
347-
ZBUS_ADD_OBS_TIMEOUT_MS);
339+
ret = zbus_chan_add_obs(&le_audio_chan, &le_audio_evt_sub, ZBUS_ADD_OBS_TIMEOUT_MS);
348340
if (ret) {
349341
LOG_ERR("Failed to add le_audio sub");
350342
return ret;
351343
}
352344

353-
ret = zbus_chan_add_obs(&bt_mgmt_chan, &bt_mgmt_evt_listen, &zbus_obs_node_mgmt,
354-
ZBUS_ADD_OBS_TIMEOUT_MS);
345+
ret = zbus_chan_add_obs(&bt_mgmt_chan, &bt_mgmt_evt_listen, ZBUS_ADD_OBS_TIMEOUT_MS);
355346
if (ret) {
356347
LOG_ERR("Failed to add bt_mgmt listener");
357348
return ret;

‎applications/nrf5340_audio/src/bluetooth/bt_stream/unicast/unicast_server.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,15 @@ static const uint8_t cap_adv_data[] = {
5353
#if defined(CONFIG_BT_AUDIO_RX)
5454
#define AVAILABLE_SINK_CONTEXT (BT_AUDIO_CONTEXT_TYPE_ANY)
5555
#else
56-
#define AVAILABLE_SINK_CONTEXT BT_AUDIO_CONTEXT_TYPE_PROHIBITED
56+
#define AVAILABLE_SINK_CONTEXT BT_AUDIO_CONTEXT_TYPE_NONE
5757
#endif /* CONFIG_BT_AUDIO_RX */
5858

5959
static struct bt_cap_stream *cap_tx_streams[CONFIG_BT_ASCS_MAX_ASE_SRC_COUNT];
6060

6161
#if defined(CONFIG_BT_AUDIO_TX)
6262
#define AVAILABLE_SOURCE_CONTEXT (BT_AUDIO_CONTEXT_TYPE_ANY)
6363
#else
64-
#define AVAILABLE_SOURCE_CONTEXT BT_AUDIO_CONTEXT_TYPE_PROHIBITED
64+
#define AVAILABLE_SOURCE_CONTEXT BT_AUDIO_CONTEXT_TYPE_NONE
6565
#endif /* CONFIG_BT_AUDIO_TX */
6666

6767
static struct bt_bap_unicast_server_register_param unicast_server_params = {

‎applications/nrf5340_audio/unicast_client/main.c‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,6 @@ LOG_MODULE_REGISTER(main, CONFIG_MAIN_LOG_LEVEL);
2929

3030
static enum stream_state strm_state = STATE_PAUSED;
3131

32-
static struct zbus_observer_node zbus_obs_node_sdu;
33-
static struct zbus_observer_node zbus_obs_node_button;
34-
static struct zbus_observer_node zbus_obs_node_audio;
35-
static struct zbus_observer_node zbus_obs_node_media;
36-
static struct zbus_observer_node zbus_obs_node_mgmt;
37-
3832
ZBUS_SUBSCRIBER_DEFINE(button_evt_sub, CONFIG_BUTTON_MSG_SUB_QUEUE_SIZE);
3933
ZBUS_SUBSCRIBER_DEFINE(content_control_evt_sub, CONFIG_CONTENT_CONTROL_MSG_SUB_QUEUE_SIZE);
4034

@@ -475,8 +469,7 @@ static int zbus_subscribers_create(void)
475469
return ret;
476470
}
477471

478-
ret = zbus_chan_add_obs(&sdu_ref_chan, &sdu_ref_msg_listen, &zbus_obs_node_sdu,
479-
ZBUS_ADD_OBS_TIMEOUT_MS);
472+
ret = zbus_chan_add_obs(&sdu_ref_chan, &sdu_ref_msg_listen, ZBUS_ADD_OBS_TIMEOUT_MS);
480473
if (ret) {
481474
LOG_ERR("Failed to add timestamp listener");
482475
return ret;
@@ -498,29 +491,26 @@ static int zbus_link_producers_observers(void)
498491
return -ENOTSUP;
499492
}
500493

501-
ret = zbus_chan_add_obs(&button_chan, &button_evt_sub, &zbus_obs_node_button,
502-
ZBUS_ADD_OBS_TIMEOUT_MS);
494+
ret = zbus_chan_add_obs(&button_chan, &button_evt_sub, ZBUS_ADD_OBS_TIMEOUT_MS);
503495
if (ret) {
504496
LOG_ERR("Failed to add button sub");
505497
return ret;
506498
}
507499

508-
ret = zbus_chan_add_obs(&le_audio_chan, &le_audio_evt_sub, &zbus_obs_node_audio,
509-
ZBUS_ADD_OBS_TIMEOUT_MS);
500+
ret = zbus_chan_add_obs(&le_audio_chan, &le_audio_evt_sub, ZBUS_ADD_OBS_TIMEOUT_MS);
510501
if (ret) {
511502
LOG_ERR("Failed to add le_audio sub");
512503
return ret;
513504
}
514505

515-
ret = zbus_chan_add_obs(&bt_mgmt_chan, &bt_mgmt_evt_listen, &zbus_obs_node_mgmt,
516-
ZBUS_ADD_OBS_TIMEOUT_MS);
506+
ret = zbus_chan_add_obs(&bt_mgmt_chan, &bt_mgmt_evt_listen, ZBUS_ADD_OBS_TIMEOUT_MS);
517507
if (ret) {
518508
LOG_ERR("Failed to add bt_mgmt listener");
519509
return ret;
520510
}
521511

522-
ret = zbus_chan_add_obs(&cont_media_chan, &content_control_evt_sub, &zbus_obs_node_media,
523-
ZBUS_ADD_OBS_TIMEOUT_MS);
512+
ret = zbus_chan_add_obs(&cont_media_chan, &content_control_evt_sub,
513+
ZBUS_ADD_OBS_TIMEOUT_MS);
524514

525515
return 0;
526516
}

‎applications/nrf5340_audio/unicast_server/main.c‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@
2929
#include <zephyr/logging/log.h>
3030
LOG_MODULE_REGISTER(main, CONFIG_MAIN_LOG_LEVEL);
3131

32-
static struct zbus_observer_node zbus_obs_node_button;
33-
static struct zbus_observer_node zbus_obs_node_audio;
34-
static struct zbus_observer_node zbus_obs_node_volume;
35-
static struct zbus_observer_node zbus_obs_node_mgmt;
36-
3732
ZBUS_SUBSCRIBER_DEFINE(button_evt_sub, CONFIG_BUTTON_MSG_SUB_QUEUE_SIZE);
3833

3934
ZBUS_MSG_SUBSCRIBER_DEFINE(le_audio_evt_sub);
@@ -403,30 +398,26 @@ static int zbus_link_producers_observers(void)
403398
return -ENOTSUP;
404399
}
405400

406-
ret = zbus_chan_add_obs(&button_chan, &button_evt_sub, &zbus_obs_node_button,
407-
ZBUS_ADD_OBS_TIMEOUT_MS);
401+
ret = zbus_chan_add_obs(&button_chan, &button_evt_sub, ZBUS_ADD_OBS_TIMEOUT_MS);
408402
if (ret) {
409403
LOG_ERR("Failed to add button sub");
410404
return ret;
411405
}
412406

413-
ret = zbus_chan_add_obs(&le_audio_chan, &le_audio_evt_sub, &zbus_obs_node_audio,
414-
ZBUS_ADD_OBS_TIMEOUT_MS);
407+
ret = zbus_chan_add_obs(&le_audio_chan, &le_audio_evt_sub, ZBUS_ADD_OBS_TIMEOUT_MS);
415408
if (ret) {
416409
LOG_ERR("Failed to add le_audio sub");
417410
return ret;
418411
}
419412

420-
ret = zbus_chan_add_obs(&bt_mgmt_chan, &bt_mgmt_evt_listen, &zbus_obs_node_mgmt,
421-
ZBUS_ADD_OBS_TIMEOUT_MS);
413+
ret = zbus_chan_add_obs(&bt_mgmt_chan, &bt_mgmt_evt_listen, ZBUS_ADD_OBS_TIMEOUT_MS);
422414
if (ret) {
423415
LOG_ERR("Failed to add bt_mgmt sub");
424416
return ret;
425417
}
426418

427419
if (IS_ENABLED(CONFIG_BOARD_NRF5340_AUDIO_DK_NRF5340_CPUAPP)) {
428-
ret = zbus_chan_add_obs(&volume_chan, &volume_evt_sub, &zbus_obs_node_volume,
429-
ZBUS_ADD_OBS_TIMEOUT_MS);
420+
ret = zbus_chan_add_obs(&volume_chan, &volume_evt_sub, ZBUS_ADD_OBS_TIMEOUT_MS);
430421
if (ret) {
431422
LOG_ERR("Failed to add volume sub");
432423
return ret;

0 commit comments

Comments
 (0)