espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-08-23 10:19:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

nimble/controller: Schedule AUX_ADV_IND based ADV_EXT_IND channel mask

Browse Source 
This gets rid of artificial delays in scheduling of AUX_ADV_IND.

X-Original-Commit: 52314320d6bad451a6dcee304e4ebb7b96ca71d7
This commit is contained in:
Szymon Janc
2017-06-29 23:20:17 +02:00
parent 1f616d3bc1
commit 580c0dde93
2 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/controller/include/controller/ble_ll.h
+1
View File
@@ -203,6 +203,7 @@ extern STATS_SECT_DECL(ble_ll_stats) ble_ll_stats;
/* LL timing */
#define BLE_LL_IFS (150) /* usecs */
#define BLE_LL_MAFS (300) /* usecs */
/*
* BLE LL device address. Note that element 0 of the array is the LSB and
nimble/controller/src/ble_ll_adv.c
+25 -11
View File
@@ -1285,6 +1285,26 @@ ble_ll_adv_scheduled(struct ble_ll_adv_sm *advsm, uint32_t sch_start)
os_cputime_usecs_to_ticks(BLE_LL_ADV_STATE_HD_MAX * 1000);
}
static void
ble_ll_set_adv_secondary_start_time(struct ble_ll_adv_sm *advsm)
{
static const uint8_t bits[8] = {0, 1, 1, 2, 1, 2, 2, 3};
struct ble_ll_sched_item *sched = &advsm->adv_sch;
uint32_t ext_duration;
uint8_t chans;
assert(advsm->adv_chanmask <= BLE_HCI_ADV_CHANMASK_DEF);
chans = bits[advsm->adv_chanmask];
ext_duration = (int32_t)(sched->end_time - sched->start_time);
ext_duration += os_cputime_usecs_to_ticks(BLE_LL_IFS) * (chans -1);
advsm->adv_secondary_start_time = advsm->adv_event_start_time +
ext_duration +
os_cputime_usecs_to_ticks(BLE_LL_MAFS);
}
static void
ble_ll_adv_secondary_scheduled(struct ble_ll_adv_sm *advsm, uint32_t sch_start)
{
@@ -1410,11 +1430,7 @@ ble_ll_adv_sm_start(struct ble_ll_adv_sm *advsm)
ble_ll_sched_adv_new(&advsm->adv_sch, ble_ll_adv_scheduled);
if (!(advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY)) {
/* TODO calculate this 5000 based on ext_adv sched time and channel used */
advsm->adv_secondary_start_time = advsm->adv_pdu_start_time +
os_cputime_usecs_to_ticks(2000) +
os_cputime_usecs_to_ticks(300);
ble_ll_set_adv_secondary_start_time(advsm);
ble_ll_adv_secondary_set_sched(advsm);
ble_ll_sched_adv_new(&advsm->adv_secondary_sch,
ble_ll_adv_secondary_scheduled);
@@ -2521,21 +2537,19 @@ ble_ll_adv_secondary_done(struct ble_ll_adv_sm *advsm)
return;
}
/* TODO calculate this 5000 based on ext_adv sched time and channel used */
advsm->adv_secondary_start_time = advsm->adv_pdu_start_time +
os_cputime_usecs_to_ticks(5000) +
os_cputime_usecs_to_ticks(300);
ble_ll_set_adv_secondary_start_time(advsm);
ble_ll_adv_secondary_set_sched(advsm);
/*
* In the unlikely event we cant reschedule this, just post a done
* event and we will reschedule the next advertising event
*
* TODO should we give scheduler more flexibility with delay?
*/
/* Reschedule advertising event */
rc = ble_ll_sched_adv_reschedule(&advsm->adv_secondary_sch,
&advsm->adv_secondary_start_time,
os_cputime_usecs_to_ticks(5000));
os_cputime_usecs_to_ticks(0));
if (rc) {
os_eventq_put(&g_ble_ll_data.ll_evq, &advsm->adv_txdone_ev);
}