diff --git a/nimble/controller/include/controller/ble_ll_utils.h b/nimble/controller/include/controller/ble_ll_utils.h index 4d7e7e702..fe1bca9f6 100644 --- a/nimble/controller/include/controller/ble_ll_utils.h +++ b/nimble/controller/include/controller/ble_ll_utils.h @@ -29,7 +29,7 @@ #define IN_RANGE(_n, _min, _max) (((_n) >= (_min)) && ((_n) <= (_max))) int ble_ll_utils_verify_aa(uint32_t aa); -uint32_t ble_ll_utils_calc_access_addr(void); +uint32_t ble_ll_utils_calc_aa(void); uint32_t ble_ll_utils_calc_seed_aa(void); uint32_t ble_ll_utils_calc_big_aa(uint32_t seed_aa, uint32_t n); uint8_t ble_ll_utils_remapped_channel(uint8_t remap_index, const uint8_t *chanmap); diff --git a/nimble/controller/src/ble_ll_adv.c b/nimble/controller/src/ble_ll_adv.c index 49228246b..125b62475 100644 --- a/nimble/controller/src/ble_ll_adv.c +++ b/nimble/controller/src/ble_ll_adv.c @@ -2612,7 +2612,7 @@ ble_ll_adv_sm_start_periodic(struct ble_ll_adv_sm *advsm) advsm->periodic_event_cntr = 0; /* for chaining we start with random counter as we share access addr */ advsm->periodic_chain_event_cntr = ble_ll_rand(); - advsm->periodic_access_addr = ble_ll_utils_calc_access_addr(); + advsm->periodic_access_addr = ble_ll_utils_calc_aa(); advsm->periodic_channel_id = ((advsm->periodic_access_addr & 0xffff0000) >> 16) ^ (advsm->periodic_access_addr & 0x0000ffff); advsm->periodic_crcinit = ble_ll_rand() & 0xffffff; @@ -2767,7 +2767,7 @@ ble_ll_adv_sm_start(struct ble_ll_adv_sm *advsm) #if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2) advsm->event_cntr = 0; - access_addr = ble_ll_utils_calc_access_addr(); + access_addr = ble_ll_utils_calc_aa(); advsm->channel_id = ((access_addr & 0xffff0000) >> 16) ^ (access_addr & 0x0000ffff); #endif diff --git a/nimble/controller/src/ble_ll_conn.c b/nimble/controller/src/ble_ll_conn.c index 9b926010c..4f12f1431 100644 --- a/nimble/controller/src/ble_ll_conn.c +++ b/nimble/controller/src/ble_ll_conn.c @@ -1769,7 +1769,7 @@ ble_ll_conn_central_common_init(struct ble_ll_conn_sm *connsm) #endif /* Calculate random access address and crc initialization value */ - connsm->access_addr = ble_ll_utils_calc_access_addr(); + connsm->access_addr = ble_ll_utils_calc_aa(); connsm->crcinit = ble_ll_rand() & 0xffffff; /* Set initial schedule callback */ diff --git a/nimble/controller/src/ble_ll_utils.c b/nimble/controller/src/ble_ll_utils.c index 1259f94d7..1921ee72a 100644 --- a/nimble/controller/src/ble_ll_utils.c +++ b/nimble/controller/src/ble_ll_utils.c @@ -137,7 +137,7 @@ ble_ll_utils_verify_aa(uint32_t aa) } uint32_t -ble_ll_utils_calc_access_addr(void) +ble_ll_utils_calc_aa(void) { uint32_t aa;