diff --git a/subsys/bluetooth/controller/ll_sw/isoal.c b/subsys/bluetooth/controller/ll_sw/isoal.c index fba78369c9c115..93cee474222f81 100644 --- a/subsys/bluetooth/controller/ll_sw/isoal.c +++ b/subsys/bluetooth/controller/ll_sw/isoal.c @@ -315,7 +315,7 @@ isoal_status_t isoal_sink_create( * BIG reference anchor point + * BIG_Sync_Delay + SDU_interval + ISO_Interval - Time_Offset. */ - if (role == BT_CONN_ROLE_PERIPHERAL) { + if (role == ISOAL_ROLE_PERIPHERAL) { if (framed) { session->sdu_sync_const = stream_sync_delay + sdu_interval + (flush_timeout * iso_interval_us); @@ -323,7 +323,7 @@ isoal_status_t isoal_sink_create( session->sdu_sync_const = stream_sync_delay + ((flush_timeout - 1UL) * iso_interval_us); } - } else if (role == BT_CONN_ROLE_CENTRAL) { + } else if (role == ISOAL_ROLE_CENTRAL) { if (framed) { session->sdu_sync_const = stream_sync_delay - group_sync_delay; } else { @@ -331,7 +331,7 @@ isoal_status_t isoal_sink_create( (((iso_interval_us / sdu_interval) - 1UL) * iso_interval_us); } - } else if (role == BT_ROLE_BROADCAST) { + } else if (role == ISOAL_ROLE_BROADCAST_SINK) { if (framed) { session->sdu_sync_const = group_sync_delay + sdu_interval + iso_interval_us; } else { diff --git a/subsys/bluetooth/controller/ll_sw/isoal.h b/subsys/bluetooth/controller/ll_sw/isoal.h index 304a54f77d40db..2bceebe7de744c 100644 --- a/subsys/bluetooth/controller/ll_sw/isoal.h +++ b/subsys/bluetooth/controller/ll_sw/isoal.h @@ -24,7 +24,10 @@ typedef uint8_t isoal_status_t; #define ISOAL_STATUS_ERR_PDU_EMIT ((isoal_status_t) 0x20) /* PDU emission */ #define ISOAL_STATUS_ERR_UNSPECIFIED ((isoal_status_t) 0x80) /* Unspecified error */ -#define BT_ROLE_BROADCAST (BT_CONN_ROLE_PERIPHERAL + 1) +#define ISOAL_ROLE_CENTRAL (BT_CONN_ROLE_CENTRAL) +#define ISOAL_ROLE_PERIPHERAL (BT_CONN_ROLE_PERIPHERAL) +#define ISOAL_ROLE_BROADCAST_SOURCE (BT_CONN_ROLE_PERIPHERAL + 1U) +#define ISOAL_ROLE_BROADCAST_SINK (BT_CONN_ROLE_PERIPHERAL + 2U) /** Handle to a registered ISO Sub-System sink */ typedef uint8_t isoal_sink_handle_t; diff --git a/subsys/bluetooth/controller/ll_sw/ull_iso.c b/subsys/bluetooth/controller/ll_sw/ull_iso.c index e04d29cc1ec5f8..b52f9c31b4b98c 100644 --- a/subsys/bluetooth/controller/ll_sw/ull_iso.c +++ b/subsys/bluetooth/controller/ll_sw/ull_iso.c @@ -303,7 +303,7 @@ uint8_t ll_setup_iso_path(uint16_t handle, uint8_t path_dir, uint8_t path_id, adv_iso = ull_adv_iso_by_stream_get(stream_handle); lll_iso = &adv_iso->lll; - role = 0U; /* FIXME: Set role from LLL struct */ + role = ISOAL_ROLE_BROADCAST_SOURCE; iso_interval = lll_iso->iso_interval; sdu_interval = lll_iso->sdu_interval; burst_number = lll_iso->bn; @@ -329,7 +329,7 @@ uint8_t ll_setup_iso_path(uint16_t handle, uint8_t path_dir, uint8_t path_id, sync_iso = ull_sync_iso_by_stream_get(stream_handle); lll_iso = &sync_iso->lll; - role = 1U; /* FIXME: Is this correct role value? */ + role = ISOAL_ROLE_BROADCAST_SINK; iso_interval = lll_iso->iso_interval; sdu_interval = lll_iso->sdu_interval; burst_number = lll_iso->bn; diff --git a/tests/bluetooth/ctrl_isoal/src/isoal_test_common.h b/tests/bluetooth/ctrl_isoal/src/isoal_test_common.h index aa38109112a2cc..730cb2e6f40af5 100644 --- a/tests/bluetooth/ctrl_isoal/src/isoal_test_common.h +++ b/tests/bluetooth/ctrl_isoal/src/isoal_test_common.h @@ -37,9 +37,11 @@ (s == BT_ISO_CONT ? "CONT" : \ (s == BT_ISO_END ? "END" : "???")))) -#define ROLE_TO_STR(s) (s == BT_ROLE_BROADCAST ? "Broadcast" : \ - (role == BT_CONN_ROLE_PERIPHERAL ? "Peripheral" : \ - (role == BT_CONN_ROLE_CENTRAL ? "Central" : "Undefined"))) +#define ROLE_TO_STR(s) \ + ((s) == ISOAL_ROLE_BROADCAST_SOURCE ? "Broadcast Source" : \ + ((s) == ISOAL_ROLE_BROADCAST_SINK ? "Broadcast Sink" : \ + ((s) == ISOAL_ROLE_PERIPHERAL ? "Peripheral" : \ + ((s) == ISOAL_ROLE_CENTRAL ? "Central" : "Undefined")))) #define FSM_TO_STR(s) (s == ISOAL_START ? "START" : \ (s == ISOAL_CONTINUE ? "CONTINUE" : \ diff --git a/tests/bluetooth/ctrl_isoal/src/sub_sets/isoal_test_rx.c b/tests/bluetooth/ctrl_isoal/src/sub_sets/isoal_test_rx.c index c0074405bded8d..2ce8862e1d4862 100644 --- a/tests/bluetooth/ctrl_isoal/src/sub_sets/isoal_test_rx.c +++ b/tests/bluetooth/ctrl_isoal/src/sub_sets/isoal_test_rx.c @@ -281,7 +281,7 @@ static int32_t calc_rx_latency_by_role(uint8_t role, iso_interval = iso_interval_int * ISO_INT_UNIT_US; switch (role) { - case BT_CONN_ROLE_PERIPHERAL: + case ISOAL_ROLE_PERIPHERAL: if (framed) { latency = stream_sync_delay + sdu_interval + (flush_timeout * iso_interval); } else { @@ -289,7 +289,7 @@ static int32_t calc_rx_latency_by_role(uint8_t role, } break; - case BT_CONN_ROLE_CENTRAL: + case ISOAL_ROLE_CENTRAL: if (framed) { latency = stream_sync_delay - group_sync_delay; } else { @@ -298,7 +298,7 @@ static int32_t calc_rx_latency_by_role(uint8_t role, } break; - case BT_ROLE_BROADCAST: + case ISOAL_ROLE_BROADCAST_SINK: if (framed) { latency = group_sync_delay + sdu_interval + iso_interval; } else { @@ -496,9 +496,9 @@ ZTEST(test_rx_basics, test_sink_isoal_test_create_destroy) pdus_per_sdu = (burst_number * sdu_interval) / iso_interval; switch (role) { - case BT_CONN_ROLE_PERIPHERAL: - case BT_CONN_ROLE_CENTRAL: - case BT_ROLE_BROADCAST: + case ISOAL_ROLE_PERIPHERAL: + case ISOAL_ROLE_CENTRAL: + case ISOAL_ROLE_BROADCAST_SINK: latency = calc_rx_latency_by_role(role, framed, flush_timeout, @@ -625,7 +625,7 @@ ZTEST(test_rx_basics, test_sink_isoal_test_create_err) bool framed; handle = 0x8000; - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; burst_number = 1; flush_timeout = 1; framed = false; @@ -711,7 +711,7 @@ ZTEST(test_rx_basics, test_sink_disable) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = ISO_INT_UNIT_US; BN = 1; @@ -812,7 +812,7 @@ ZTEST(test_rx_unframed, test_rx_unframed_single_pdu) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = ISO_INT_UNIT_US; BN = 1; @@ -979,7 +979,7 @@ ZTEST(test_rx_unframed, test_rx_unframed_single_pdu_ts_wrap1) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = ISO_INT_UNIT_US; BN = 1; @@ -1114,7 +1114,7 @@ ZTEST(test_rx_unframed, test_rx_unframed_single_pdu_ts_wrap2) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_CENTRAL; + role = ISOAL_ROLE_CENTRAL; iso_interval_int = 1; sdu_interval = ISO_INT_UNIT_US; BN = 1; @@ -1250,7 +1250,7 @@ ZTEST(test_rx_unframed, test_rx_unframed_dbl_pdu) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = ISO_INT_UNIT_US; BN = 2; @@ -1433,7 +1433,7 @@ ZTEST(test_rx_unframed, test_rx_unframed_dbl_split) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = ISO_INT_UNIT_US / 2; BN = 4; @@ -1774,7 +1774,7 @@ ZTEST(test_rx_unframed, test_rx_unframed_multi_split) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = ISO_INT_UNIT_US; BN = 5; @@ -2078,7 +2078,7 @@ ZTEST(test_rx_unframed, test_rx_unframed_multi_split_on_border) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = ISO_INT_UNIT_US; BN = 5; @@ -2403,7 +2403,7 @@ ZTEST(test_rx_unframed, test_rx_unframed_long_pdu_short_sdu) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = ISO_INT_UNIT_US; BN = 1; @@ -2558,7 +2558,7 @@ ZTEST(test_rx_unframed, test_rx_unframed_dbl_pdu_prem) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = ISO_INT_UNIT_US; BN = 1; @@ -2740,7 +2740,7 @@ ZTEST(test_rx_unframed, test_rx_unframed_single_pdu_err) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = ISO_INT_UNIT_US; BN = 1; @@ -2924,7 +2924,7 @@ ZTEST(test_rx_unframed, test_rx_unframed_seq_err) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = ISO_INT_UNIT_US; BN = 3; @@ -3153,7 +3153,7 @@ ZTEST(test_rx_unframed, test_rx_unframed_seq_pdu_err1) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = ISO_INT_UNIT_US; BN = 3; @@ -3435,7 +3435,7 @@ ZTEST(test_rx_unframed, test_rx_unframed_seq_pdu_err2) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = ISO_INT_UNIT_US; BN = 3; @@ -3734,7 +3734,7 @@ ZTEST(test_rx_unframed, test_rx_unframed_padding) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = ISO_INT_UNIT_US; BN = 4; @@ -3962,7 +3962,7 @@ ZTEST(test_rx_unframed, test_rx_unframed_padding_no_end) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = ISO_INT_UNIT_US; BN = 3; @@ -4542,7 +4542,7 @@ ZTEST(test_rx_unframed, test_rx_unframed_padding_error1) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = ISO_INT_UNIT_US; BN = 3; @@ -4729,7 +4729,7 @@ ZTEST(test_rx_unframed, test_rx_unframed_padding_error2) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = ISO_INT_UNIT_US; BN = 3; @@ -4917,7 +4917,7 @@ ZTEST(test_rx_unframed, test_rx_unframed_padding_error3) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = ISO_INT_UNIT_US; BN = 3; @@ -5111,7 +5111,7 @@ ZTEST(test_rx_unframed, test_rx_unframed_zero_len_packet) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = ISO_INT_UNIT_US; BN = 1; @@ -5231,7 +5231,7 @@ ZTEST(test_rx_unframed, test_rx_unframed_seq_err_zero_length) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = ISO_INT_UNIT_US; BN = 3; @@ -5467,7 +5467,7 @@ ZTEST(test_rx_unframed, test_rx_unframed_dbl_pdu_no_end) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = ISO_INT_UNIT_US; BN = 2; @@ -5628,7 +5628,7 @@ ZTEST(test_rx_unframed, test_rx_unframed_dbl_pdu_invalid_llid1) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = ISO_INT_UNIT_US; BN = 2; @@ -5718,7 +5718,7 @@ ZTEST(test_rx_unframed, test_rx_unframed_dbl_pdu_invalid_llid2) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = ISO_INT_UNIT_US; BN = 2; @@ -5854,7 +5854,7 @@ ZTEST(test_rx_unframed, test_rx_unframed_dbl_pdu_invalid_llid2_pdu_err) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = ISO_INT_UNIT_US; BN = 2; @@ -6019,7 +6019,7 @@ ZTEST(test_rx_framed, test_rx_framed_single_pdu_single_sdu) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = ((iso_interval_int * ISO_INT_UNIT_US) / 3) + 5; BN = 3; @@ -6150,7 +6150,7 @@ ZTEST(test_rx_framed, test_rx_framed_single_pdu_single_sdu_ts_wrap1) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = ((iso_interval_int * ISO_INT_UNIT_US) / 3) + 5; BN = 3; @@ -6282,7 +6282,7 @@ ZTEST(test_rx_framed, test_rx_framed_single_pdu_single_sdu_ts_wrap2) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_CENTRAL; + role = ISOAL_ROLE_CENTRAL; iso_interval_int = 1; sdu_interval = ((iso_interval_int * ISO_INT_UNIT_US) / 3) + 5; BN = 3; @@ -6413,7 +6413,7 @@ ZTEST(test_rx_framed, test_rx_framed_trppl_pdu_single_sdu) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = ((iso_interval_int * ISO_INT_UNIT_US) / 3) + 5; BN = 3; @@ -6626,7 +6626,7 @@ ZTEST(test_rx_framed, test_rx_framed_trppl_pdu_dbl_sdu) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; iso_interval_us = (iso_interval_int * ISO_INT_UNIT_US); sdu_interval = (iso_interval_us / 3) + 5; @@ -6889,7 +6889,7 @@ ZTEST(test_rx_framed, test_rx_framed_zero_length_sdu) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; iso_interval_us = iso_interval_int * ISO_INT_UNIT_US; sdu_interval = (iso_interval_us / 3) + 5; @@ -7195,7 +7195,7 @@ ZTEST(test_rx_framed, test_rx_framed_dbl_pdu_dbl_sdu_padding) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; iso_interval_us = iso_interval_int * ISO_INT_UNIT_US; sdu_interval = (iso_interval_us / 3) + 5; @@ -8163,7 +8163,7 @@ ZTEST(test_rx_framed, test_rx_framed_dbl_pdu_dbl_sdu_pdu_err1) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; iso_interval_us = iso_interval_int * ISO_INT_UNIT_US; sdu_interval = (iso_interval_us / 3) + 5; @@ -8360,7 +8360,7 @@ ZTEST(test_rx_framed, test_rx_framed_dbl_pdu_dbl_sdu_pdu_err2) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; iso_interval_us = iso_interval_int * ISO_INT_UNIT_US; sdu_interval = (iso_interval_us / 3) + 5; @@ -8562,7 +8562,7 @@ ZTEST(test_rx_framed, test_rx_framed_dbl_pdu_dbl_sdu_pdu_err3) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = ((iso_interval_int * ISO_INT_UNIT_US) / 3) + 5; BN = 3; @@ -8754,7 +8754,7 @@ ZTEST(test_rx_framed, test_rx_framed_dbl_pdu_dbl_sdu_seq_err1) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; iso_interval_us = iso_interval_int * ISO_INT_UNIT_US; sdu_interval = (iso_interval_us / 3) + 5; @@ -8998,7 +8998,7 @@ ZTEST(test_rx_framed, test_rx_framed_trppl_pdu_single_sdu_pdu_err1) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; iso_interval_us = iso_interval_int * ISO_INT_UNIT_US; sdu_interval = iso_interval_us + 5; @@ -9263,7 +9263,7 @@ ZTEST(test_rx_framed, test_rx_framed_trppl_pdu_single_sdu_pdu_err2) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; iso_interval_us = iso_interval_int * ISO_INT_UNIT_US; sdu_interval = (iso_interval_us / 3) + 5; @@ -9532,7 +9532,7 @@ ZTEST(test_rx_framed, test_rx_framed_trppl_pdu_single_sdu_pdu_err3) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; iso_interval_us = iso_interval_int * ISO_INT_UNIT_US; sdu_interval = (iso_interval_us / 3) + 5; @@ -9810,7 +9810,7 @@ ZTEST(test_rx_framed, test_rx_framed_trppl_pdu_single_sdu_seq_err1) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; iso_interval_us = iso_interval_int * ISO_INT_UNIT_US; sdu_interval = (iso_interval_us / 3) + 5; @@ -10055,7 +10055,7 @@ ZTEST(test_rx_framed, test_rx_framed_trppl_pdu_single_sdu_pdu_seq_err1) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; iso_interval_us = iso_interval_int * ISO_INT_UNIT_US; sdu_interval = (iso_interval_us / 3) + 5; @@ -10300,7 +10300,7 @@ ZTEST(test_rx_framed, test_rx_framed_trppl_pdu_dbl_sdu_pdu_err1) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; iso_interval_us = iso_interval_int * ISO_INT_UNIT_US; sdu_interval = (iso_interval_us / 3) + 5; @@ -10674,7 +10674,7 @@ ZTEST(test_rx_framed, test_rx_framed_trppl_pdu_dbl_sdu_pdu_err2) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; iso_interval_us = iso_interval_int * ISO_INT_UNIT_US; sdu_interval = (iso_interval_us / 3) + 5; @@ -11044,7 +11044,7 @@ ZTEST(test_rx_framed, test_rx_framed_trppl_pdu_dbl_sdu_pdu_err3) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; iso_interval_us = iso_interval_int * ISO_INT_UNIT_US; sdu_interval = (iso_interval_us / 3) + 5; @@ -11423,7 +11423,7 @@ ZTEST(test_rx_framed, test_rx_framed_trppl_pdu_dbl_sdu_seq_err1) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; iso_interval_us = iso_interval_int * ISO_INT_UNIT_US; sdu_interval = (iso_interval_us / 3) + 5; @@ -11770,7 +11770,7 @@ ZTEST(test_rx_framed, test_rx_framed_trppl_pdu_dbl_sdu_pdu_seq_err1) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; iso_interval_us = iso_interval_int * ISO_INT_UNIT_US; sdu_interval = (iso_interval_us / 3) + 5; @@ -12095,7 +12095,7 @@ ZTEST(test_rx_framed, test_rx_framed_single_invalid_pdu_single_sdu) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = ((iso_interval_int * ISO_INT_UNIT_US) / 3) + 5; BN = 3; @@ -12256,7 +12256,7 @@ ZTEST(test_rx_framed, test_rx_framed_single_invalid_pdu_single_sdu_hdr_err) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = ((iso_interval_int * ISO_INT_UNIT_US) / 3) + 5; BN = 3; @@ -12459,7 +12459,7 @@ ZTEST(test_rx_framed, test_rx_framed_trppl_pdu_dbl_sdu_seg_err1) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; iso_interval_us = iso_interval_int * ISO_INT_UNIT_US; sdu_interval = (iso_interval_us / 3) + 5; @@ -12742,7 +12742,7 @@ ZTEST(test_rx_framed, test_rx_framed_trppl_pdu_dbl_sdu_seg_err2) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; iso_interval_us = iso_interval_int * ISO_INT_UNIT_US; sdu_interval = (iso_interval_us / 3) + 5; diff --git a/tests/bluetooth/ctrl_isoal/src/sub_sets/isoal_test_tx.c b/tests/bluetooth/ctrl_isoal/src/sub_sets/isoal_test_tx.c index 42fc0af89a8f17..fe375b7accd9de 100644 --- a/tests/bluetooth/ctrl_isoal/src/sub_sets/isoal_test_tx.c +++ b/tests/bluetooth/ctrl_isoal/src/sub_sets/isoal_test_tx.c @@ -648,7 +648,7 @@ ZTEST(test_tx_basics, test_source_isoal_test_create_err) bool framed; handle = 0x8000; - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; burst_number = 1; max_octets = 40; flush_timeout = 1; @@ -745,7 +745,7 @@ ZTEST(test_tx_unframed, test_tx_unframed_1_sdu_1_frag_1_pdu_maxPDU) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = CONN_INT_UNIT_US; max_octets = TEST_TX_PDU_PAYLOAD_MAX - 5; @@ -873,7 +873,7 @@ ZTEST(test_tx_unframed, test_tx_unframed_1_sdu_1_frag_1_pdu_bufSize) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = CONN_INT_UNIT_US; max_octets = TEST_TX_PDU_PAYLOAD_MAX + 5; @@ -991,7 +991,7 @@ ZTEST(test_tx_unframed, test_tx_unframed_1_sdu_1_frag_3_pdu) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = CONN_INT_UNIT_US; max_octets = TEST_TX_PDU_PAYLOAD_MAX - 5; @@ -1150,7 +1150,7 @@ ZTEST(test_tx_unframed, test_tx_unframed_1_sdu_3_frag_1_pdu) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = CONN_INT_UNIT_US; max_octets = TEST_TX_PDU_PAYLOAD_MAX + 5; @@ -1355,7 +1355,7 @@ ZTEST(test_tx_unframed, test_tx_unframed_1_sdu_3_frag_2_pdu) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = CONN_INT_UNIT_US; max_octets = TEST_TX_PDU_PAYLOAD_MAX + 5; @@ -1687,7 +1687,7 @@ ZTEST(test_tx_unframed, test_tx_unframed_2_sdu_1_frag_2_pdu_ts_wrap1) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = CONN_INT_UNIT_US; max_octets = TEST_TX_PDU_PAYLOAD_MAX - 5; @@ -1868,7 +1868,7 @@ ZTEST(test_tx_unframed, test_tx_unframed_2_sdu_3_frag_4_pdu) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 2; sdu_interval = CONN_INT_UNIT_US; max_octets = TEST_TX_PDU_PAYLOAD_MAX + 5; @@ -2262,7 +2262,7 @@ ZTEST(test_tx_unframed, test_tx_unframed_2_sdu_3_frag_4_pdu_padding) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 2; sdu_interval = CONN_INT_UNIT_US; max_octets = TEST_TX_PDU_PAYLOAD_MAX + 5; @@ -2737,7 +2737,7 @@ ZTEST(test_tx_unframed, test_tx_unframed_1_zero_sdu_1_frag_1_pdu_maxPDU_padding) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = CONN_INT_UNIT_US; max_octets = TEST_TX_PDU_PAYLOAD_MAX - 5; @@ -2905,7 +2905,7 @@ ZTEST(test_tx_unframed, test_tx_unframed_1_sdu_1_frag_pdu_alloc_err) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = CONN_INT_UNIT_US; max_octets = TEST_TX_PDU_PAYLOAD_MAX - 5; @@ -3022,7 +3022,7 @@ ZTEST(test_tx_unframed, test_tx_unframed_1_sdu_1_frag_pdu_emit_err) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = CONN_INT_UNIT_US; max_octets = TEST_TX_PDU_PAYLOAD_MAX - 5; @@ -3151,7 +3151,7 @@ ZTEST(test_tx_unframed, test_tx_unframed_4_sdu_1_frag_4_pdu_stream_loc) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = CONN_INT_UNIT_US / 2; max_octets = TEST_TX_PDU_PAYLOAD_MAX - 5; @@ -3488,7 +3488,7 @@ ZTEST(test_tx_framed, test_tx_framed_1_sdu_1_frag_1_pdu_maxPDU) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = CONN_INT_UNIT_US + 50; max_octets = TEST_TX_PDU_PAYLOAD_MAX - 5; @@ -3643,7 +3643,7 @@ ZTEST(test_tx_framed, test_tx_framed_1_sdu_1_frag_1_pdu_bufSize) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = CONN_INT_UNIT_US + 50; max_octets = TEST_TX_PDU_PAYLOAD_MAX + 5; @@ -3789,7 +3789,7 @@ ZTEST(test_tx_framed, test_tx_framed_1_sdu_1_frag_3_pdu) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = CONN_INT_UNIT_US + 50; max_octets = TEST_TX_PDU_PAYLOAD_MAX - 5; @@ -4020,7 +4020,7 @@ ZTEST(test_tx_framed, test_tx_framed_1_sdu_3_frag_1_pdu) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = CONN_INT_UNIT_US + 50; max_octets = TEST_TX_PDU_PAYLOAD_MAX + 5; @@ -4279,7 +4279,7 @@ ZTEST(test_tx_framed, test_tx_framed_1_sdu_3_frag_2_pdu) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = CONN_INT_UNIT_US + 50; max_octets = TEST_TX_PDU_PAYLOAD_MAX + 5; @@ -4581,7 +4581,7 @@ ZTEST(test_tx_framed, test_tx_framed_2_sdu_3_frag_4_pdu) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 2; sdu_interval = CONN_INT_UNIT_US + 50; max_octets = TEST_TX_PDU_PAYLOAD_MAX + 5; @@ -5113,7 +5113,7 @@ ZTEST(test_tx_framed, test_tx_framed_2_sdu_3_frag_4_pdu_padding) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 2; sdu_interval = CONN_INT_UNIT_US + 50; max_octets = TEST_TX_PDU_PAYLOAD_MAX + 5; @@ -5659,7 +5659,7 @@ ZTEST(test_tx_framed, test_tx_framed_2_sdu_1_frag_2_pdu_refPoint2) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = CONN_INT_UNIT_US + 50; max_octets = TEST_TX_PDU_PAYLOAD_MAX + 5; @@ -5888,7 +5888,7 @@ ZTEST(test_tx_framed, test_tx_framed_1_sdu_1_frag_1_pdu_refPoint3) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = CONN_INT_UNIT_US + 50; max_octets = TEST_TX_PDU_PAYLOAD_MAX + 5; @@ -6044,7 +6044,7 @@ ZTEST(test_tx_framed, test_tx_framed_2_sdu_1_frag_2_pdu_ts_wrap1) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = CONN_INT_UNIT_US + 50; max_octets = TEST_TX_PDU_PAYLOAD_MAX + 5; @@ -6268,7 +6268,7 @@ ZTEST(test_tx_framed, test_tx_framed_1_zero_sdu_1_frag_1_pdu_maxPDU) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = CONN_INT_UNIT_US + 50; max_octets = TEST_TX_PDU_PAYLOAD_MAX - 5; @@ -6411,7 +6411,7 @@ ZTEST(test_tx_framed, test_tx_framed_1_zero_sdu_1_frag_1_pdu_padding) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = CONN_INT_UNIT_US + 50; max_octets = TEST_TX_PDU_PAYLOAD_MAX - 5; @@ -6596,7 +6596,7 @@ ZTEST(test_tx_framed, test_tx_framed_1_sdu_1_frag_pdu_alloc_err) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = CONN_INT_UNIT_US + 50; max_octets = TEST_TX_PDU_PAYLOAD_MAX - 5; @@ -6724,7 +6724,7 @@ ZTEST(test_tx_framed, test_tx_framed_1_sdu_1_frag_pdu_emit_err) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 1; sdu_interval = CONN_INT_UNIT_US + 50; max_octets = TEST_TX_PDU_PAYLOAD_MAX - 5; @@ -6873,7 +6873,7 @@ ZTEST(test_tx_framed, test_tx_framed_2_sdu_1_frag_pdu_timeout) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 800; sdu_interval = 500000; max_octets = TEST_TX_PDU_PAYLOAD_MAX + 5; @@ -7167,7 +7167,7 @@ ZTEST(test_tx_framed_ebq, test_tx_framed_cis_fra_per_bv07c) uint8_t FT; /* Settings */ - role = BT_CONN_ROLE_PERIPHERAL; + role = ISOAL_ROLE_PERIPHERAL; iso_interval_int = 800; sdu_interval = 500000; max_octets = TEST_TX_PDU_PAYLOAD_MAX + 5;