diff --git a/nimble/controller/include/controller/ble_ll_utils.h b/nimble/controller/include/controller/ble_ll_utils.h index 12d14edb0..ae8abfb36 100644 --- a/nimble/controller/include/controller/ble_ll_utils.h +++ b/nimble/controller/include/controller/ble_ll_utils.h @@ -21,8 +21,8 @@ uint32_t ble_ll_utils_calc_access_addr(void); uint8_t ble_ll_utils_remapped_channel(uint8_t remap_index, const uint8_t *chanmap); -uint8_t ble_ll_utils_calc_dci_csa2(uint16_t event_cntr, uint16_t channel_id, - uint8_t num_used_chans, const uint8_t *chanmap); +uint8_t ble_ll_utils_dci_csa2(uint16_t counter, uint16_t chan_id, + uint8_t num_used_chans, const uint8_t *chan_map); uint16_t ble_ll_utils_dci_iso_event(uint16_t counter, uint16_t chan_id, uint16_t *prn_sub_lu, uint8_t num_used_chans, const uint8_t *chan_map, uint16_t *remap_idx); diff --git a/nimble/controller/src/ble_ll_adv.c b/nimble/controller/src/ble_ll_adv.c index 070c89ce5..bc04c8f0b 100644 --- a/nimble/controller/src/ble_ll_adv.c +++ b/nimble/controller/src/ble_ll_adv.c @@ -1371,10 +1371,10 @@ ble_ll_adv_aux_calculate(struct ble_ll_adv_sm *advsm, aux->ext_hdr = 0; #if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2) - aux->chan = ble_ll_utils_calc_dci_csa2(advsm->event_cntr++, - advsm->channel_id, - g_ble_ll_conn_params.num_used_chans, - g_ble_ll_conn_params.central_chan_map); + aux->chan = ble_ll_utils_dci_csa2(advsm->event_cntr++, + advsm->channel_id, + g_ble_ll_conn_params.num_used_chans, + g_ble_ll_conn_params.central_chan_map); #else aux->chan = ble_ll_utils_remapped_channel(ble_ll_rand() % BLE_PHY_NUM_DATA_CHANS, g_ble_ll_conn_params.central_chan_map); @@ -2316,10 +2316,10 @@ ble_ll_adv_periodic_schedule_first(struct ble_ll_adv_sm *advsm, * Preincrement event counter as we later send this in PDU so make sure * same values are used */ - chan = ble_ll_utils_calc_dci_csa2(++advsm->periodic_event_cntr, - advsm->periodic_channel_id, - advsm->periodic_num_used_chans, - advsm->periodic_chanmap); + chan = ble_ll_utils_dci_csa2(++advsm->periodic_event_cntr, + advsm->periodic_channel_id, + advsm->periodic_num_used_chans, + advsm->periodic_chanmap); ble_ll_adv_sync_calculate(advsm, sync, 0, chan); @@ -2405,10 +2405,10 @@ ble_ll_adv_periodic_schedule_next(struct ble_ll_adv_sm *advsm) BLE_LL_ASSERT(rem_sync_data_len > 0); /* we use separate counter for chaining */ - chan = ble_ll_utils_calc_dci_csa2(advsm->periodic_chain_event_cntr++, - advsm->periodic_channel_id, - advsm->periodic_num_used_chans, - advsm->periodic_chanmap); + chan = ble_ll_utils_dci_csa2(advsm->periodic_chain_event_cntr++, + advsm->periodic_channel_id, + advsm->periodic_num_used_chans, + advsm->periodic_chanmap); ble_ll_adv_sync_calculate(advsm, sync_next, next_sync_data_offset, chan); max_usecs = ble_ll_pdu_tx_time_get(sync_next->payload_len, advsm->sec_phy); diff --git a/nimble/controller/src/ble_ll_conn.c b/nimble/controller/src/ble_ll_conn.c index f3d903d1a..c41c35b10 100644 --- a/nimble/controller/src/ble_ll_conn.c +++ b/nimble/controller/src/ble_ll_conn.c @@ -747,8 +747,8 @@ ble_ll_conn_calc_dci(struct ble_ll_conn_sm *conn, uint16_t latency) #if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2) if (CONN_F_CSA2_SUPP(conn)) { - return ble_ll_utils_calc_dci_csa2(conn->event_cntr, conn->channel_id, - conn->num_used_chans, conn->chanmap); + return ble_ll_utils_dci_csa2(conn->event_cntr, conn->channel_id, + conn->num_used_chans, conn->chanmap); } #endif diff --git a/nimble/controller/src/ble_ll_sync.c b/nimble/controller/src/ble_ll_sync.c index e5ef0efe5..43f328e3b 100644 --- a/nimble/controller/src/ble_ll_sync.c +++ b/nimble/controller/src/ble_ll_sync.c @@ -1178,8 +1178,8 @@ ble_ll_sync_next_event(struct ble_ll_sync_sm *sm, uint32_t cur_ww_adjust) } /* Calculate channel index of next event */ - sm->chan_index = ble_ll_utils_calc_dci_csa2(sm->event_cntr, sm->channel_id, - sm->num_used_chans, sm->chanmap); + sm->chan_index = ble_ll_utils_dci_csa2(sm->event_cntr, sm->channel_id, + sm->num_used_chans, sm->chanmap); cur_ww = ble_ll_utils_calc_window_widening(sm->anchor_point, sm->last_anchor_point, @@ -1409,8 +1409,8 @@ ble_ll_sync_info_event(struct ble_ll_scan_addr_data *addrd, sm->window_widening = BLE_LL_JITTER_USECS; /* Calculate channel index of first event */ - sm->chan_index = ble_ll_utils_calc_dci_csa2(sm->event_cntr, sm->channel_id, - sm->num_used_chans, sm->chanmap); + sm->chan_index = ble_ll_utils_dci_csa2(sm->event_cntr, sm->channel_id, + sm->num_used_chans, sm->chanmap); if (ble_ll_sched_sync(&sm->sch, rxhdr->beg_cputime, rxhdr->rem_usecs, offset, sm->phy_mode)) { @@ -1957,8 +1957,8 @@ ble_ll_sync_periodic_ind(struct ble_ll_conn_sm *connsm, sm->phy_mode = phy_mode; /* Calculate channel index of first event */ - sm->chan_index = ble_ll_utils_calc_dci_csa2(sm->event_cntr, sm->channel_id, - sm->num_used_chans, sm->chanmap); + sm->chan_index = ble_ll_utils_dci_csa2(sm->event_cntr, sm->channel_id, + sm->num_used_chans, sm->chanmap); /* get anchor for specified conn event */ conn_event_count = get_le16(sync_ind + 20); diff --git a/nimble/controller/src/ble_ll_utils.c b/nimble/controller/src/ble_ll_utils.c index 1b2857665..a2507ad28 100644 --- a/nimble/controller/src/ble_ll_utils.c +++ b/nimble/controller/src/ble_ll_utils.c @@ -339,16 +339,16 @@ ble_ll_utils_csa2_calc_chan_idx(uint16_t prn_e, uint8_t num_used_chans, } uint8_t -ble_ll_utils_calc_dci_csa2(uint16_t event_cntr, uint16_t channel_id, - uint8_t num_used_chans, const uint8_t *chanmap) +ble_ll_utils_dci_csa2(uint16_t counter, uint16_t chan_id, + uint8_t num_used_chans, const uint8_t *chan_map) { uint16_t prn_e; uint16_t chan_idx; uint16_t remap_idx; - prn_e = ble_ll_utils_csa2_prng(event_cntr, channel_id); + prn_e = ble_ll_utils_csa2_prng(counter, chan_id); - chan_idx = ble_ll_utils_csa2_calc_chan_idx(prn_e, num_used_chans, chanmap, + chan_idx = ble_ll_utils_csa2_calc_chan_idx(prn_e, num_used_chans, chan_map, &remap_idx); return chan_idx;