You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by an...@apache.org on 2019/01/31 15:17:16 UTC
[mynewt-nimble] branch master updated: nimble/ll: Fix randomizing
channel on sec phy
This is an automated email from the ASF dual-hosted git repository.
andk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
The following commit(s) were added to refs/heads/master by this push:
new f6c641b nimble/ll: Fix randomizing channel on sec phy
f6c641b is described below
commit f6c641bef5b8856462eb8df2b5fdc5260c0c452a
Author: Andrzej Kaczmarek <an...@codecoup.pl>
AuthorDate: Thu Jan 31 15:42:24 2019 +0100
nimble/ll: Fix randomizing channel on sec phy
We always use the same channel on secondary phy for all auxes in chain.
This is not stritcly incorrect, but we should better randomize channel
for each aux in chain which is what this patch does.
---
nimble/controller/src/ble_ll_adv.c | 29 +++++++++++++++++------------
1 file changed, 17 insertions(+), 12 deletions(-)
diff --git a/nimble/controller/src/ble_ll_adv.c b/nimble/controller/src/ble_ll_adv.c
index df62af6..d423a60 100644
--- a/nimble/controller/src/ble_ll_adv.c
+++ b/nimble/controller/src/ble_ll_adv.c
@@ -57,6 +57,7 @@ struct ble_ll_adv_aux {
struct ble_ll_sched_item sch;
uint32_t start_time;
uint16_t aux_data_offset;
+ uint8_t chan;
uint8_t ext_hdr;
uint8_t aux_data_len;
uint8_t payload_len;
@@ -121,7 +122,6 @@ struct ble_ll_adv_sm
struct ble_npl_event adv_sec_txdone_ev;
uint16_t duration;
uint16_t adi;
- uint8_t adv_secondary_chan;
uint8_t adv_random_addr[BLE_DEV_ADDR_LEN];
uint8_t events_max;
uint8_t events;
@@ -395,10 +395,10 @@ ble_ll_adv_legacy_pdu_make(uint8_t *dptr, void *pducb_arg, uint8_t *hdr_byte)
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
static void
-ble_ll_adv_put_aux_ptr(struct ble_ll_adv_sm *advsm, uint32_t offset,
+ble_ll_adv_put_aux_ptr(uint8_t chan, uint8_t phy, uint32_t offset,
uint8_t *dptr)
{
- dptr[0] = advsm->adv_secondary_chan;
+ dptr[0] = chan;
if (offset > 245700) {
dptr[0] |= 0x80;
@@ -408,7 +408,7 @@ ble_ll_adv_put_aux_ptr(struct ble_ll_adv_sm *advsm, uint32_t offset,
}
dptr[1] = (offset & 0x000000ff);
- dptr[2] = ((offset >> 8) & 0x0000001f) | (advsm->sec_phy - 1) << 5; //TODO;
+ dptr[2] = ((offset >> 8) & 0x0000001f) | (phy - 1) << 5; //TODO;
}
/**
@@ -473,7 +473,9 @@ ble_ll_adv_pdu_make(uint8_t *dptr, void *pducb_arg, uint8_t *hdr_byte)
} else {
offset = 0;
}
- ble_ll_adv_put_aux_ptr(advsm, offset, dptr);
+ /* Always use channel from 1st AUX */
+ ble_ll_adv_put_aux_ptr(AUX_CURRENT(advsm)->chan, advsm->sec_phy,
+ offset, dptr);
return BLE_LL_EXT_ADV_HDR_LEN + ext_hdr_len;
}
@@ -555,7 +557,8 @@ ble_ll_adv_aux_pdu_make(uint8_t *dptr, void *pducb_arg, uint8_t *hdr_byte)
offset = os_cputime_ticks_to_usecs(AUX_NEXT(advsm)->start_time - aux->start_time);
}
- ble_ll_adv_put_aux_ptr(advsm, offset, dptr);
+ ble_ll_adv_put_aux_ptr(AUX_NEXT(advsm)->chan, advsm->sec_phy,
+ offset, dptr);
dptr += BLE_LL_EXT_ADV_AUX_PTR_SIZE;
}
@@ -997,6 +1000,7 @@ ble_ll_adv_secondary_tx_start_cb(struct ble_ll_sched_item *sch)
uint32_t txstart;
struct ble_ll_adv_sm *advsm;
ble_phy_tx_pducb_t pducb;
+ struct ble_ll_adv_aux *aux;
/* Get the state machine for the event */
advsm = (struct ble_ll_adv_sm *)sch->cb_arg;
@@ -1010,7 +1014,8 @@ ble_ll_adv_secondary_tx_start_cb(struct ble_ll_sched_item *sch)
ble_phy_txpwr_set(advsm->adv_txpwr);
/* Set channel */
- rc = ble_phy_setchan(advsm->adv_secondary_chan, BLE_ACCESS_ADDR_ADV,
+ aux = AUX_CURRENT(advsm);
+ rc = ble_phy_setchan(aux->chan, BLE_ACCESS_ADDR_ADV,
BLE_LL_CRCINIT_ADV);
assert(rc == 0);
@@ -1126,6 +1131,11 @@ ble_ll_adv_aux_calculate(struct ble_ll_adv_sm *advsm,
aux->payload_len = 0;
aux->ext_hdr = 0;
+ /* TODO we could use CSA2 for this
+ * (will be needed for periodic advertising anyway)
+ */
+ aux->chan = rand() % BLE_PHY_NUM_DATA_CHANS;
+
rem_aux_data_len = AUX_DATA_LEN(advsm) - aux_data_offset;
chainable = !(advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_CONNECTABLE);
@@ -1275,11 +1285,6 @@ ble_ll_adv_aux_schedule_first(struct ble_ll_adv_sm *advsm)
aux = AUX_CURRENT(advsm);
ble_ll_adv_aux_calculate(advsm, aux, 0);
- /* TODO we could use CSA2 for this
- * (will be needed for periodic advertising anyway)
- */
- advsm->adv_secondary_chan = rand() % BLE_PHY_NUM_DATA_CHANS;
-
/* Set end time to maximum time this schedule item may take */
if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_CONNECTABLE) {
max_usecs = ble_ll_pdu_tx_time_get(aux->payload_len, advsm->sec_phy) +