michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: Initialize PDUs in set #0 on reset

Browse source 
Set #0 is used for legacy advertising when legacy HCI commands are used
and in such case it's possible to enable advertising without any prior
configuration. This means we should better always have PDUs in set #0
initialized with default empty data.

Signed-off-by: Andrzej Kaczmarek <andrzej.kaczmarek@codecoup.pl>
This commit is contained in:
Andrzej Kaczmarek 2020-11-27 14:21:27 +01:00 • committed by Carles Cufí
commit 9d8503c3b1
2 changed files with 43 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
include/bluetooth/hci.h
View file

@ -810,6 +810,15 @@ struct bt_hci_cp_le_set_random_address {
#define BT_HCI_ADV_DIRECT_IND_LOW_DUTY 0x04
#define BT_HCI_ADV_SCAN_RSP 0x04
#define BT_LE_ADV_INTERVAL_MIN 0x0020
#define BT_LE_ADV_INTERVAL_MAX 0x4000
#define BT_LE_ADV_INTERVAL_DEFAULT 0x0800
#define BT_LE_ADV_CHAN_MAP_CHAN_37 0x01
#define BT_LE_ADV_CHAN_MAP_CHAN_38 0x02
#define BT_LE_ADV_CHAN_MAP_CHAN_39 0x04
#define BT_LE_ADV_CHAN_MAP_ALL 0x07
#define BT_LE_ADV_FP_NO_WHITELIST 0x00
#define BT_LE_ADV_FP_WHITELIST_SCAN_REQ 0x01
#define BT_LE_ADV_FP_WHITELIST_CONN_IND 0x02

34
subsys/bluetooth/controller/ll_sw/ull_adv.c
View file

@ -78,6 +78,9 @@ static inline uint8_t disable(uint8_t handle);
static const uint8_t *adva_update(struct ll_adv_set *adv, struct pdu_adv *pdu);
static void tgta_update(struct ll_adv_set *adv, struct pdu_adv *pdu);
static void init_pdu(struct pdu_adv *pdu, uint8_t pdu_type);
static void init_set(struct ll_adv_set *adv);
static struct ll_adv_set ll_adv[BT_CTLR_ADV_SET];
#if defined(CONFIG_BT_TICKER_EXT)
@ -1649,6 +1652,13 @@ static int init_reset(void)
lll_adv_data_init(&ll_adv[handle].lll.scan_rsp);
}
/* Make sure that set #0 is initialized with empty legacy PDUs. This is
* especially important if legacy HCI interface is used for advertising
* because it allows to enable advertising without any configuration,
* thus we need to have PDUs already initialized.
*/
init_set(&ll_adv[0]);
return 0;
}
@ -2082,3 +2092,27 @@ static void tgta_update(struct ll_adv_set *adv, struct pdu_adv *pdu)
* need to update if LL Privacy is not supported.
*/
}
static void init_pdu(struct pdu_adv *pdu, uint8_t pdu_type)
{
/* TODO: Add support for extended advertising PDU if needed */
pdu->type = pdu_type;
pdu->rfu = 0;
pdu->chan_sel = 0;
pdu->tx_addr = 0;
pdu->rx_addr = 0;
pdu->len = BDADDR_SIZE;
}
static void init_set(struct ll_adv_set *adv)
{
adv->interval = BT_LE_ADV_INTERVAL_DEFAULT;
#if defined(CONFIG_BT_CTLR_PRIVACY)
adv->own_addr_type = BT_ADDR_LE_PUBLIC;
#endif /* CONFIG_BT_CTLR_PRIVACY */
adv->lll.chan_map = BT_LE_ADV_CHAN_MAP_ALL;
adv->lll.filter_policy = BT_LE_ADV_FP_NO_WHITELIST;
init_pdu(lll_adv_data_peek(&ll_adv[0].lll), PDU_ADV_TYPE_ADV_IND);
init_pdu(lll_adv_scan_rsp_peek(&ll_adv[0].lll), PDU_ADV_TYPE_SCAN_RSP);
}