Skip to content

Commit 5d0ec8c

Browse files
committed
Bluetooth: Controller: Fix return types for ll_length
ll_length_req_send and ll_length_default_set were defined to return a uint32_t, but only returned a uint8_t HCI error code and was the return value was always stored as such. Signed-off-by: Emil Gydesen <[email protected]>
1 parent 9ee617a commit 5d0ec8c

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

subsys/bluetooth/controller/include/ll.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,10 +267,10 @@ uint8_t ll_tx_pwr_lvl_set(uint8_t handle_type, uint16_t handle,
267267
uint8_t ll_apto_get(uint16_t handle, uint16_t *const apto);
268268
uint8_t ll_apto_set(uint16_t handle, uint16_t apto);
269269

270-
uint32_t ll_length_req_send(uint16_t handle, uint16_t tx_octets, uint16_t tx_time);
270+
uint8_t ll_length_req_send(uint16_t handle, uint16_t tx_octets, uint16_t tx_time);
271271
void ll_length_default_get(uint16_t *const max_tx_octets,
272272
uint16_t *const max_tx_time);
273-
uint32_t ll_length_default_set(uint16_t max_tx_octets, uint16_t max_tx_time);
273+
uint8_t ll_length_default_set(uint16_t max_tx_octets, uint16_t max_tx_time);
274274
void ll_length_max_get(uint16_t *const max_tx_octets,
275275
uint16_t *const max_tx_time,
276276
uint16_t *const max_rx_octets,

subsys/bluetooth/controller/ll_sw/ull_conn.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -562,8 +562,7 @@ static bool ll_len_validate(uint16_t tx_octets, uint16_t tx_time)
562562
return true;
563563
}
564564

565-
uint32_t ll_length_req_send(uint16_t handle, uint16_t tx_octets,
566-
uint16_t tx_time)
565+
uint8_t ll_length_req_send(uint16_t handle, uint16_t tx_octets, uint16_t tx_time)
567566
{
568567
struct ll_conn *conn;
569568

@@ -601,7 +600,7 @@ void ll_length_default_get(uint16_t *max_tx_octets, uint16_t *max_tx_time)
601600
*max_tx_time = default_tx_time;
602601
}
603602

604-
uint32_t ll_length_default_set(uint16_t max_tx_octets, uint16_t max_tx_time)
603+
uint8_t ll_length_default_set(uint16_t max_tx_octets, uint16_t max_tx_time)
605604
{
606605
if (IS_ENABLED(CONFIG_BT_CTLR_PARAM_CHECK) &&
607606
!ll_len_validate(max_tx_octets, max_tx_time)) {

0 commit comments

Comments
 (0)