Skip to content

Commit 6206ae2

Browse files
cvinayakcvinayak
committed
Bluetooth: Controller: Use consistent naming for ticker op callbacks
Use consistent naming for ticker operation callback functions. Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
1 parent 27f36bd commit 6206ae2

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

‎subsys/bluetooth/controller/ll_sw/ull_adv.c‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,12 @@ static uint16_t adv_time_get(struct pdu_adv *pdu, struct pdu_adv *pdu_scan,
6868

6969
static void ticker_cb(uint32_t ticks_at_expire, uint32_t remainder,
7070
uint16_t lazy, uint8_t force, void *param);
71-
static void ticker_op_update_cb(uint32_t status, void *param);
71+
static void ticker_update_op_cb(uint32_t status, void *param);
7272

7373
#if defined(CONFIG_BT_PERIPHERAL)
7474
static void ticker_stop_cb(uint32_t ticks_at_expire, uint32_t remainder,
7575
uint16_t lazy, uint8_t force, void *param);
76-
static void ticker_op_stop_cb(uint32_t status, void *param);
76+
static void ticker_stop_op_cb(uint32_t status, void *param);
7777
static void disabled_cb(void *param);
7878
static void conn_release(struct ll_adv_set *adv);
7979
#endif /* CONFIG_BT_PERIPHERAL */
@@ -82,9 +82,9 @@ static void conn_release(struct ll_adv_set *adv);
8282
static void adv_max_events_duration_set(struct ll_adv_set *adv,
8383
uint16_t duration,
8484
uint8_t max_ext_adv_evts);
85-
static void ticker_op_aux_stop_cb(uint32_t status, void *param);
85+
static void ticker_stop_aux_op_cb(uint32_t status, void *param);
8686
static void aux_disabled_cb(void *param);
87-
static void ticker_op_ext_stop_cb(uint32_t status, void *param);
87+
static void ticker_stop_ext_op_cb(uint32_t status, void *param);
8888
static void ext_disabled_cb(void *param);
8989
#endif /* CONFIG_BT_CTLR_ADV_EXT */
9090

@@ -1774,7 +1774,7 @@ static uint32_t ticker_update_rand(struct ll_adv_set *adv, uint32_t ticks_delay_
17741774
TICKER_ID_ADV_BASE + ull_adv_handle_get(adv),
17751775
random_delay,
17761776
ticks_adjust_minus, 0, 0, 0, 0,
1777-
ticker_op_update_cb, adv);
1777+
ticker_update_op_cb, adv);
17781778

17791779
LL_ASSERT((ret == TICKER_STATUS_SUCCESS) ||
17801780
(ret == TICKER_STATUS_BUSY));
@@ -1892,12 +1892,12 @@ void ull_adv_done(struct node_rx_event_done *done)
18921892
ret = ticker_stop(TICKER_INSTANCE_ID_CTLR,
18931893
TICKER_USER_ID_ULL_HIGH,
18941894
(TICKER_ID_ADV_AUX_BASE + aux_handle),
1895-
ticker_op_aux_stop_cb, adv);
1895+
ticker_stop_aux_op_cb, adv);
18961896
} else {
18971897
ret = ticker_stop(TICKER_INSTANCE_ID_CTLR,
18981898
TICKER_USER_ID_ULL_HIGH,
18991899
(TICKER_ID_ADV_BASE + handle),
1900-
ticker_op_ext_stop_cb, adv);
1900+
ticker_stop_ext_op_cb, adv);
19011901
}
19021902

19031903
LL_ASSERT((ret == TICKER_STATUS_SUCCESS) ||
@@ -2168,7 +2168,7 @@ static void ticker_cb(uint32_t ticks_at_expire, uint32_t remainder, uint16_t laz
21682168
DEBUG_RADIO_PREPARE_A(1);
21692169
}
21702170

2171-
static void ticker_op_update_cb(uint32_t status, void *param)
2171+
static void ticker_update_op_cb(uint32_t status, void *param)
21722172
{
21732173
LL_ASSERT(status == TICKER_STATUS_SUCCESS ||
21742174
param == ull_disable_mark_get());
@@ -2187,12 +2187,12 @@ static void ticker_stop_cb(uint32_t ticks_at_expire, uint32_t remainder,
21872187

21882188
ret = ticker_stop(TICKER_INSTANCE_ID_CTLR, TICKER_USER_ID_ULL_HIGH,
21892189
TICKER_ID_ADV_BASE + handle,
2190-
ticker_op_stop_cb, adv);
2190+
ticker_stop_op_cb, adv);
21912191
LL_ASSERT((ret == TICKER_STATUS_SUCCESS) ||
21922192
(ret == TICKER_STATUS_BUSY));
21932193
}
21942194

2195-
static void ticker_op_stop_cb(uint32_t status, void *param)
2195+
static void ticker_stop_op_cb(uint32_t status, void *param)
21962196
{
21972197
static memq_link_t link;
21982198
static struct mayfly mfy = {0, 0, &link, NULL, NULL};
@@ -2324,7 +2324,7 @@ static void adv_max_events_duration_set(struct ll_adv_set *adv,
23242324
HAL_TICKER_US_TO_TICKS((uint64_t)duration * 10 * USEC_PER_MSEC);
23252325
}
23262326

2327-
static void ticker_op_aux_stop_cb(uint32_t status, void *param)
2327+
static void ticker_stop_aux_op_cb(uint32_t status, void *param)
23282328
{
23292329
struct lll_adv_aux *lll_aux;
23302330
struct ll_adv_aux_set *aux;
@@ -2370,12 +2370,12 @@ static void aux_disabled_cb(void *param)
23702370
ret = ticker_stop(TICKER_INSTANCE_ID_CTLR,
23712371
TICKER_USER_ID_ULL_HIGH,
23722372
(TICKER_ID_ADV_BASE + handle),
2373-
ticker_op_ext_stop_cb, param);
2373+
ticker_stop_ext_op_cb, param);
23742374
LL_ASSERT((ret == TICKER_STATUS_SUCCESS) ||
23752375
(ret == TICKER_STATUS_BUSY));
23762376
}
23772377

2378-
static void ticker_op_ext_stop_cb(uint32_t status, void *param)
2378+
static void ticker_stop_ext_op_cb(uint32_t status, void *param)
23792379
{
23802380
static memq_link_t link;
23812381
static struct mayfly mfy = {0, 0, &link, NULL, NULL};

‎subsys/bluetooth/controller/ll_sw/ull_conn.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ static inline void disable(uint16_t handle);
8383
static void conn_cleanup(struct ll_conn *conn, uint8_t reason);
8484
static void conn_cleanup_finalize(struct ll_conn *conn);
8585
static void tx_ull_flush(struct ll_conn *conn);
86-
static void ticker_op_stop_cb(uint32_t status, void *param);
86+
static void ticker_stop_op_cb(uint32_t status, void *param);
8787
static void disabled_cb(void *param);
8888
static void tx_lll_flush(void *param);
8989

@@ -1974,7 +1974,7 @@ static void conn_cleanup_finalize(struct ll_conn *conn)
19741974
ticker_status = ticker_stop(TICKER_INSTANCE_ID_CTLR,
19751975
TICKER_USER_ID_ULL_HIGH,
19761976
TICKER_ID_CONN_BASE + lll->handle,
1977-
ticker_op_stop_cb, conn);
1977+
ticker_stop_op_cb, conn);
19781978
LL_ASSERT((ticker_status == TICKER_STATUS_SUCCESS) ||
19791979
(ticker_status == TICKER_STATUS_BUSY));
19801980

@@ -2036,7 +2036,7 @@ static void tx_ull_flush(struct ll_conn *conn)
20362036
}
20372037
}
20382038

2039-
static void ticker_op_stop_cb(uint32_t status, void *param)
2039+
static void ticker_stop_op_cb(uint32_t status, void *param)
20402040
{
20412041
static memq_link_t link;
20422042
static struct mayfly mfy = {0, 0, &link, NULL, NULL};

‎subsys/bluetooth/controller/ll_sw/ull_scan.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ static uint8_t duration_period_setup(struct ll_scan_set *scan,
6363
struct node_rx_pdu **node_rx_scan_term);
6464
static uint8_t duration_period_update(struct ll_scan_set *scan,
6565
uint8_t is_update);
66-
static void ticker_op_ext_stop_cb(uint32_t status, void *param);
66+
static void ticker_stop_ext_op_cb(uint32_t status, void *param);
6767
static void ext_disabled_cb(void *param);
6868
#endif /* CONFIG_BT_CTLR_ADV_EXT */
6969

@@ -515,7 +515,7 @@ void ull_scan_done(struct node_rx_event_done *done)
515515
rx_hdr->handle = handle;
516516

517517
ret = ticker_stop(TICKER_INSTANCE_ID_CTLR, TICKER_USER_ID_ULL_HIGH,
518-
(TICKER_ID_SCAN_BASE + handle), ticker_op_ext_stop_cb,
518+
(TICKER_ID_SCAN_BASE + handle), ticker_stop_ext_op_cb,
519519
scan);
520520

521521
LL_ASSERT((ret == TICKER_STATUS_SUCCESS) ||
@@ -837,7 +837,7 @@ static uint8_t duration_period_update(struct ll_scan_set *scan,
837837
return 0;
838838
}
839839

840-
static void ticker_op_ext_stop_cb(uint32_t status, void *param)
840+
static void ticker_stop_ext_op_cb(uint32_t status, void *param)
841841
{
842842
static memq_link_t link;
843843
static struct mayfly mfy = {0, 0, &link, NULL, NULL};

0 commit comments

Comments
 (0)