This is an automated email from the ASF dual-hosted git repository. sjanc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
commit fce6ab6e17e9f86e66ef7057275826ea17117bd9 Author: Szymon Czapracki <[email protected]> AuthorDate: Tue Mar 31 18:21:22 2026 +0200 bttester: Remove app driven NRPA rotation mechanism NRPA rotation was handled in bttester application. We no longer want this, it's gonna by handled by host. --- apps/bttester/src/btp_gap.c | 60 +-------------------------------------------- 1 file changed, 1 insertion(+), 59 deletions(-) diff --git a/apps/bttester/src/btp_gap.c b/apps/bttester/src/btp_gap.c index c6361b1ff..c5b5a3f65 100644 --- a/apps/bttester/src/btp_gap.c +++ b/apps/bttester/src/btp_gap.c @@ -71,10 +71,6 @@ static struct os_callout connected_ev_co; static struct btp_gap_device_connected_ev connected_ev; #define CONNECTED_EV_DELAY_MS(itvl) 8 * BLE_HCI_CONN_ITVL * itvl / 1000 static int connection_attempts; -#if MYNEWT_VAL(BTTESTER_PRIVACY_MODE) && MYNEWT_VAL(BTTESTER_USE_NRPA) -static int64_t advertising_start; -static struct os_callout bttester_nrpa_rotate_timer; -#endif static const struct ble_gap_conn_params dflt_conn_params = { .scan_itvl = 0x0010, @@ -237,49 +233,6 @@ controller_info(const void *cmd, uint16_t cmd_len, static uint8_t ad_flags = BLE_HS_ADV_F_BREDR_UNSUP; -#if MYNEWT_VAL(BTTESTER_PRIVACY_MODE) && MYNEWT_VAL(BTTESTER_USE_NRPA) -static void rotate_nrpa_cb(struct os_event *ev) -{ - int rc; - ble_addr_t addr; - int32_t duration_ms = BLE_HS_FOREVER; - int32_t remaining_time; - os_time_t remaining_ticks; - - if (current_settings & BIT(BTP_GAP_SETTINGS_DISCOVERABLE)) { - if (ad_flags & BLE_HS_ADV_F_DISC_LTD) { - duration_ms = MYNEWT_VAL(BTTESTER_LTD_ADV_TIMEOUT); - } - } - -#if MYNEWT_VAL(BLE_EXT_ADV) - ble_gap_ext_adv_stop(0); -#else - ble_gap_adv_stop(); -#endif - - rc = ble_hs_id_gen_rnd(1, &addr); - assert(rc == 0); - rc = ble_hs_id_set_rnd(addr.val); - assert(rc == 0); - -#if MYNEWT_VAL(BLE_EXT_ADV) - ble_gap_ext_adv_start(0, duration_ms / 10, 0); -#else - ble_gap_adv_start(own_addr_type, NULL, duration_ms, - &adv_params, gap_event_cb, NULL); -#endif - - remaining_time = os_get_uptime_usec() - advertising_start; - if (remaining_time > 0) { - advertising_start = os_get_uptime_usec(); - os_time_ms_to_ticks(remaining_time, &remaining_ticks); - os_callout_reset(&bttester_nrpa_rotate_timer, - remaining_ticks); - } -} -#endif - static uint8_t set_connectable(const void *cmd, uint16_t cmd_len, void *rsp, uint16_t *rsp_len) @@ -558,14 +511,6 @@ start_advertising(const void *cmd, uint16_t cmd_len, return BTP_STATUS_FAILED; } -#if MYNEWT_VAL(BTTESTER_PRIVACY_MODE) && MYNEWT_VAL(BTTESTER_USE_NRPA) - if (MYNEWT_VAL(BTTESTER_NRPA_TIMEOUT) < duration_ms / 1000) { - advertising_start = os_get_uptime_usec(); - os_callout_reset(&bttester_nrpa_rotate_timer, - OS_TICKS_PER_SEC * MYNEWT_VAL(BTTESTER_NRPA_TIMEOUT)); - } -#endif - #if MYNEWT_VAL(BLE_EXT_ADV) err = ble_gap_ext_adv_start(0, duration_ms / 10, 0); #else @@ -2467,10 +2412,7 @@ tester_init_gap(void) return BTP_STATUS_FAILED; } #endif -#if MYNEWT_VAL(BTTESTER_PRIVACY_MODE) && MYNEWT_VAL(BTTESTER_USE_NRPA) - os_callout_init(&bttester_nrpa_rotate_timer, os_eventq_dflt_get(), - rotate_nrpa_cb, NULL); -#endif + adv_buf = os_msys_get(ADV_BUF_LEN, 0); assert(adv_buf);
