You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by GitBox <gi...@apache.org> on 2018/04/30 06:18:36 UTC
[GitHub] sjanc closed pull request #70: nimble/ll: Fix HCI events for high
duty directed advertising
sjanc closed pull request #70: nimble/ll: Fix HCI events for high duty directed advertising
URL: https://github.com/apache/mynewt-nimble/pull/70
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/nimble/controller/src/ble_ll_adv.c b/nimble/controller/src/ble_ll_adv.c
index a075ab20..723a1d73 100644
--- a/nimble/controller/src/ble_ll_adv.c
+++ b/nimble/controller/src/ble_ll_adv.c
@@ -133,7 +133,7 @@ struct ble_ll_adv_sm
#define BLE_LL_ADV_SM_FLAG_CONN_RSP_TXD 0x08
#define BLE_LL_ADV_SM_FLAG_ACTIVE_CHANSET_MASK 0x30 /* use helpers! */
#define BLE_LL_ADV_SM_FLAG_ADV_DATA_INCOMPLETE 0x40
-#define BLE_LL_ADV_SM_FLAG_ADV_TERMINATE_EVT 0x80
+#define BLE_LL_ADV_SM_FLAG_ADV_EXT_HCI 0x80
#define ADV_DATA_LEN(_advsm) \
((_advsm->adv_data) ? OS_MBUF_PKTLEN(advsm->adv_data) : 0)
@@ -1573,14 +1573,42 @@ static void
ble_ll_adv_sm_stop_timeout(struct ble_ll_adv_sm *advsm)
{
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
- ble_ll_hci_ev_send_adv_set_terminated(BLE_ERR_DIR_ADV_TMO,
+ if (advsm->flags & BLE_LL_ADV_SM_FLAG_ADV_EXT_HCI) {
+ ble_ll_hci_ev_send_adv_set_terminated(BLE_ERR_DIR_ADV_TMO,
+ advsm->adv_instance, 0,
+ advsm->events);
+ }
+#endif
+
+ /*
+ * For high duty directed advertising we need to send connection
+ * complete event with proper status
+ */
+ if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_HD_DIRECTED) {
+ ble_ll_conn_comp_event_send(NULL, BLE_ERR_DIR_ADV_TMO,
+ advsm->conn_comp_ev, advsm);
+ advsm->conn_comp_ev = NULL;
+ }
+
+ /* Disable advertising */
+ ble_ll_adv_sm_stop(advsm);
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+static void
+ble_ll_adv_sm_stop_limit_reached(struct ble_ll_adv_sm *advsm)
+{
+ ble_ll_hci_ev_send_adv_set_terminated(BLE_RR_LIMIT_REACHED,
advsm->adv_instance, 0,
advsm->events);
-#endif
/*
* For high duty directed advertising we need to send connection
* complete event with proper status
+ *
+ * Spec is a bit unambiguous here since it doesn't define what code should
+ * be used if HD directed advertising was terminated before timeout due to
+ * events count limit. For now just use same code as with duration timeout.
*/
if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_HD_DIRECTED) {
ble_ll_conn_comp_event_send(NULL, BLE_ERR_DIR_ADV_TMO,
@@ -1591,6 +1619,7 @@ ble_ll_adv_sm_stop_timeout(struct ble_ll_adv_sm *advsm)
/* Disable advertising */
ble_ll_adv_sm_stop(advsm);
}
+#endif
static void
ble_ll_adv_scheduled(struct ble_ll_adv_sm *advsm, uint32_t sch_start, void *arg)
@@ -2274,7 +2303,7 @@ ble_ll_adv_ext_set_param(uint8_t *cmdbuf, uint8_t *rspbuf, uint8_t *rsplen)
advsm->flags &= ~BLE_LL_ADV_SM_FLAG_SCAN_REQ_NOTIF;
}
- advsm->flags |= BLE_LL_ADV_SM_FLAG_ADV_TERMINATE_EVT;
+ advsm->flags |= BLE_LL_ADV_SM_FLAG_ADV_EXT_HCI;
done:
/* Update TX power */
@@ -3093,8 +3122,7 @@ ble_ll_adv_done(struct ble_ll_adv_sm *advsm)
/* Legacy PDUs need to be stop here, for ext adv it will be stopped when
* AUX is done.
*/
- if ((advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY) &&
- (advsm->flags & BLE_LL_ADV_SM_FLAG_ADV_TERMINATE_EVT)) {
+ if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY) {
ble_ll_adv_sm_stop_timeout(advsm);
}
@@ -3113,14 +3141,8 @@ ble_ll_adv_done(struct ble_ll_adv_sm *advsm)
/* Legacy PDUs need to be stop here, for ext adv it will be stopped when
* AUX is done.
*/
- if ((advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY) &&
- (advsm->flags & BLE_LL_ADV_SM_FLAG_ADV_TERMINATE_EVT)) {
- ble_ll_hci_ev_send_adv_set_terminated(BLE_RR_LIMIT_REACHED,
- advsm->adv_instance, 0,
- advsm->events);
-
- /* Disable advertising */
- ble_ll_adv_sm_stop(advsm);
+ if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY) {
+ ble_ll_adv_sm_stop_limit_reached(advsm);
}
return;
@@ -3209,11 +3231,7 @@ ble_ll_adv_sec_done(struct ble_ll_adv_sm *advsm)
}
if (advsm->events_max && (advsm->events >= advsm->events_max)) {
- ble_ll_hci_ev_send_adv_set_terminated(BLE_RR_LIMIT_REACHED,
- advsm->adv_instance, 0,
- advsm->events);
- /* Disable advertising */
- ble_ll_adv_sm_stop(advsm);
+ ble_ll_adv_sm_stop_limit_reached(advsm);
return;
}
@@ -3305,7 +3323,7 @@ ble_ll_adv_send_conn_comp_ev(struct ble_ll_conn_sm *connsm,
#endif
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
- if (advsm->flags & BLE_LL_ADV_SM_FLAG_ADV_TERMINATE_EVT) {
+ if (advsm->flags & BLE_LL_ADV_SM_FLAG_ADV_EXT_HCI) {
ble_ll_hci_ev_send_adv_set_terminated(0, advsm->adv_instance,
connsm->conn_handle, advsm->events);
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services