Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport v4.0-branch] Bluetooth: Controller: Fix regression in connection update #84332

Open
wants to merge 1 commit into
base: v4.0-branch
Choose a base branch
from
+10 −2
Open

[Backport v4.0-branch] Bluetooth: Controller: Fix regression in connection update #84332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions subsys/bluetooth/controller/ll_sw/ull_conn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2179,9 +2179,10 @@

/* start periph/central with new timings */
uint8_t ticker_id_conn = TICKER_ID_CONN_BASE + ll_conn_handle_get(conn);
uint32_t ticker_status = ticker_stop(TICKER_INSTANCE_ID_CTLR, TICKER_USER_ID_ULL_HIGH,
ticker_id_conn, ticker_stop_conn_op_cb, (void *)conn);
uint32_t ticker_status = ticker_stop_abs(TICKER_INSTANCE_ID_CTLR, TICKER_USER_ID_ULL_HIGH,
ticker_id_conn, ticks_at_expire,
ticker_stop_conn_op_cb, (void *)conn);
LL_ASSERT((ticker_status == TICKER_STATUS_SUCCESS) ||

Check notice on line 2185 in subsys/bluetooth/controller/ll_sw/ull_conn.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

subsys/bluetooth/controller/ll_sw/ull_conn.c:2185 
-	uint32_t ticker_status = ticker_stop_abs(TICKER_INSTANCE_ID_CTLR, TICKER_USER_ID_ULL_HIGH,
-						 ticker_id_conn, ticks_at_expire,
-						 ticker_stop_conn_op_cb, (void *)conn);
+	uint32_t ticker_status =
+		ticker_stop_abs(TICKER_INSTANCE_ID_CTLR, TICKER_USER_ID_ULL_HIGH, ticker_id_conn,
+				ticks_at_expire, ticker_stop_conn_op_cb, (void *)conn);
(ticker_status == TICKER_STATUS_BUSY));
ticker_status = ticker_start(
TICKER_INSTANCE_ID_CTLR, TICKER_USER_ID_ULL_HIGH, ticker_id_conn, ticks_at_expire,
Expand Down
7 changes: 7 additions & 0 deletions tests/bluetooth/controller/mock_ctrl/src/ticker.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,13 @@
return TICKER_STATUS_SUCCESS;
}

uint8_t ticker_stop_abs(uint8_t instance_index, uint8_t user_id,
uint8_t ticker_id, uint32_t ticks_at_stop,
ticker_op_func fp_op_func, void *op_context)
{

Check notice on line 39 in tests/bluetooth/controller/mock_ctrl/src/ticker.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

tests/bluetooth/controller/mock_ctrl/src/ticker.c:39 
-uint8_t ticker_stop_abs(uint8_t instance_index, uint8_t user_id,
-			 uint8_t ticker_id, uint32_t ticks_at_stop,
-			 ticker_op_func fp_op_func, void *op_context)
+uint8_t ticker_stop_abs(uint8_t instance_index, uint8_t user_id, uint8_t ticker_id,
+			uint32_t ticks_at_stop, ticker_op_func fp_op_func, void *op_context)
return TICKER_STATUS_SUCCESS;
}

void ticker_job_sched(uint8_t instance_index, uint8_t user_id)
{
}
Expand Down
Loading