michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: Rename ext_hdr_adi_adv_data

Browse source 
The 'adi' part of that member name does not make sense since ADI is
already part of extended header, so we only have 'extended header' and
'advertising data'.

Signed-off-by: Andrzej Kaczmarek <andrzej.kaczmarek@codecoup.pl>
This commit is contained in:
Andrzej Kaczmarek 2020-11-09 14:53:54 +01:00 • committed by Anas Nashif
commit 014eb0ddf8
9 changed files with 42 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

22
subsys/bluetooth/controller/hci/hci.c
View file

@ -4504,7 +4504,7 @@ static void le_ext_adv_report(struct pdu_data *pdu_data,
adv->rx_addr, rssi);
p = (void *)&adv->adv_ext_ind;
h = (void *)p->ext_hdr_adi_adv_data;
h = (void *)p->ext_hdr_adv_data;
ptr = (void *)h;
BT_DBG(" Ext. adv mode= 0x%x, hdr len= %u", p->adv_mode,
@ -4514,7 +4514,7 @@ static void le_ext_adv_report(struct pdu_data *pdu_data,
if (!p->ext_hdr_len) {
hdr_len = offsetof(struct pdu_adv_com_ext_adv,
ext_hdr_adi_adv_data);
ext_hdr_adv_data);
goto no_ext_hdr;
}
@ -4605,22 +4605,22 @@ static void le_ext_adv_report(struct pdu_data *pdu_data,
hdr_len = ptr - (uint8_t *)p;
if (hdr_len <= (offsetof(struct pdu_adv_com_ext_adv,
ext_hdr_adi_adv_data) +
ext_hdr_adv_data) +
sizeof(struct pdu_adv_hdr))) {
hdr_len = offsetof(struct pdu_adv_com_ext_adv,
ext_hdr_adi_adv_data);
ext_hdr_adv_data);
ptr = (uint8_t *)h;
}
if (hdr_len > (p->ext_hdr_len +
offsetof(struct pdu_adv_com_ext_adv,
ext_hdr_adi_adv_data))) {
ext_hdr_adv_data))) {
BT_WARN(" Header length %u/%u, INVALID.", hdr_len,
p->ext_hdr_len);
} else {
uint8_t acad_len = p->ext_hdr_len +
offsetof(struct pdu_adv_com_ext_adv,
ext_hdr_adi_adv_data) -
ext_hdr_adv_data) -
hdr_len;
if (acad_len) {
@ -4908,7 +4908,7 @@ static void le_per_adv_sync_report(struct pdu_data *pdu_data,
BT_DBG("len = %u, rssi = %d", adv->len, rssi);
p = (void *)&adv->adv_ext_ind;
h = (void *)p->ext_hdr_adi_adv_data;
h = (void *)p->ext_hdr_adv_data;
ptr = (void *)h;
BT_DBG(" Ext. adv mode= 0x%x, hdr len= %u", p->adv_mode,
@ -4955,22 +4955,22 @@ static void le_per_adv_sync_report(struct pdu_data *pdu_data,
hdr_len = ptr - (uint8_t *)p;
if (hdr_len <= (offsetof(struct pdu_adv_com_ext_adv,
ext_hdr_adi_adv_data) +
ext_hdr_adv_data) +
sizeof(struct pdu_adv_hdr))) {
hdr_len = offsetof(struct pdu_adv_com_ext_adv,
ext_hdr_adi_adv_data);
ext_hdr_adv_data);
ptr = (uint8_t *)h;
}
if (hdr_len > (p->ext_hdr_len +
offsetof(struct pdu_adv_com_ext_adv,
ext_hdr_adi_adv_data))) {
ext_hdr_adv_data))) {
BT_WARN(" Header length %u/%u, INVALID.", hdr_len,
p->ext_hdr_len);
} else {
uint8_t acad_len = p->ext_hdr_len +
offsetof(struct pdu_adv_com_ext_adv,
ext_hdr_adi_adv_data) -
ext_hdr_adv_data) -
hdr_len;
if (acad_len) {

2
subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv.c
View file

@ -778,7 +778,7 @@ static void isr_done(void *param)
pdu = lll_adv_data_curr_get(lll);
p = (void *)&pdu->adv_ext_ind;
h = (void *)p->ext_hdr_adi_adv_data;
h = (void *)p->ext_hdr_adv_data;
if ((pdu->type == PDU_ADV_TYPE_EXT_IND) && h->aux_ptr) {
radio_filter_disable();

8
subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_aux.c
View file

@ -128,7 +128,7 @@ static int prepare_cb(struct lll_prepare_param *p)
/* Get reference to extended header */
pri_com_hdr = (void *)&pri_pdu->adv_ext_ind;
pri_hdr = (void *)pri_com_hdr->ext_hdr_adi_adv_data;
pri_hdr = (void *)pri_com_hdr->ext_hdr_adv_data;
pri_dptr = (uint8_t *)pri_hdr + sizeof(*pri_hdr);
/* traverse through adv_addr, if present */
@ -196,8 +196,8 @@ static int prepare_cb(struct lll_prepare_param *p)
/* Copy the address from the adv packet we will send
* into the scan response.
*/
memcpy(&scan_pdu->adv_ext_ind.ext_hdr_adi_adv_data[1],
&sec_pdu->adv_ext_ind.ext_hdr_adi_adv_data[1],
memcpy(&scan_pdu->adv_ext_ind.ext_hdr_adv_data[1],
&sec_pdu->adv_ext_ind.ext_hdr_adv_data[1],
BDADDR_SIZE);
}
#else
@ -422,7 +422,7 @@ static inline int isr_rx_pdu(struct lll_adv_aux *lll_aux,
pdu_aux = lll_adv_aux_data_latest_get(lll_aux, &upd);
/* AdvA is placed at 2nd byte of ext hdr data */
addr = &pdu_aux->adv_ext_ind.ext_hdr_adi_adv_data[1];
addr = &pdu_aux->adv_ext_ind.ext_hdr_adv_data[1];
tx_addr = pdu_aux->tx_addr;
if ((pdu_rx->type == PDU_ADV_TYPE_AUX_SCAN_REQ) &&

4
subsys/bluetooth/controller/ll_sw/pdu.h
View file

@ -43,7 +43,7 @@
* 18 octets in the Common Extended Advertising Payload Format.
*/
#define PDU_AC_EXT_PAYLOAD_OVERHEAD (offsetof(struct pdu_adv_com_ext_adv, \
ext_hdr_adi_adv_data) + \
ext_hdr_adv_data) + \
PDU_AC_EXT_HEADER_SIZE_MAX)
#define PDU_AC_PAYLOAD_SIZE_MAX MAX(MIN((PDU_AC_EXT_PAYLOAD_OVERHEAD + \
CONFIG_BT_CTLR_ADV_DATA_LEN_MAX), \
@ -223,7 +223,7 @@ struct pdu_adv_com_ext_adv {
#else
#error "Unsupported endianness"
#endif
uint8_t ext_hdr_adi_adv_data[254];
uint8_t ext_hdr_adv_data[254];
} __packed;
enum pdu_adv_mode {

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

@ -367,7 +367,7 @@ uint8_t ll_adv_params_set(uint16_t interval, uint8_t adv_type,
uint8_t len;
pri_com_hdr = (void *)&pdu->adv_ext_ind;
pri_hdr = (void *)pri_com_hdr->ext_hdr_adi_adv_data;
pri_hdr = (void *)pri_com_hdr->ext_hdr_adv_data;
pri_dptr = (uint8_t *)pri_hdr + sizeof(*pri_hdr);
pri_dptr_prev = pri_dptr;
@ -658,7 +658,7 @@ uint8_t ll_adv_enable(uint8_t enable)
struct pdu_adv_hdr *pri_hdr;
pri_com_hdr = (void *)&pdu_adv->adv_ext_ind;
pri_hdr = (void *)pri_com_hdr->ext_hdr_adi_adv_data;
pri_hdr = (void *)pri_com_hdr->ext_hdr_adv_data;
if (pri_com_hdr->adv_mode & BT_HCI_LE_ADV_PROP_SCAN) {
struct pdu_adv *sr = lll_adv_scan_rsp_peek(lll);
@ -680,7 +680,7 @@ uint8_t ll_adv_enable(uint8_t enable)
sec_pdu = lll_adv_aux_data_peek(lll->aux);
sec_com_hdr = (void *)&sec_pdu->adv_ext_ind;
sec_hdr = (void *)sec_com_hdr->ext_hdr_adi_adv_data;
sec_hdr = (void *)sec_com_hdr->ext_hdr_adv_data;
if (sec_hdr->adv_addr) {
pdu_adv_to_update = sec_pdu;
@ -1575,7 +1575,7 @@ const uint8_t *ull_adv_pdu_update_addrs(struct ll_adv_set *adv,
struct pdu_adv *pdu)
{
#if defined(CONFIG_BT_CTLR_ADV_EXT)
struct pdu_adv_hdr *hdr = (void *)pdu->adv_ext_ind.ext_hdr_adi_adv_data;
struct pdu_adv_hdr *hdr = (void *)pdu->adv_ext_ind.ext_hdr_adv_data;
#endif
const uint8_t *adv_addr;
@ -1985,12 +1985,12 @@ static inline uint8_t disable(uint8_t handle)
static inline uint8_t *adv_pdu_adva_get(struct pdu_adv *pdu)
{
#if defined(CONFIG_BT_CTLR_ADV_EXT)
struct pdu_adv_hdr *hdr = (void *)pdu->adv_ext_ind.ext_hdr_adi_adv_data;
struct pdu_adv_hdr *hdr = (void *)pdu->adv_ext_ind.ext_hdr_adv_data;
/* All extended PDUs have AdvA at the same offset in common header */
if (pdu->type == PDU_ADV_TYPE_EXT_IND) {
LL_ASSERT(hdr->adv_addr);
return &pdu->adv_ext_ind.ext_hdr_adi_adv_data[1];
return &pdu->adv_ext_ind.ext_hdr_adv_data[1];
}
#endif

20
subsys/bluetooth/controller/ll_sw/ull_adv_aux.c
View file

@ -259,7 +259,7 @@ uint8_t ll_adv_aux_sr_data_set(uint8_t handle, uint8_t op, uint8_t frag_pref, ui
sr_pdu->len = 0;
sr_com_hdr = &sr_pdu->adv_ext_ind;
sr_hdr = (void *)&sr_com_hdr->ext_hdr_adi_adv_data[0];
sr_hdr = (void *)&sr_com_hdr->ext_hdr_adv_data[0];
sr_dptr = (void *)sr_hdr;
/* Flags */
@ -273,7 +273,7 @@ uint8_t ll_adv_aux_sr_data_set(uint8_t handle, uint8_t op, uint8_t frag_pref, ui
sr_prev = lll_adv_scan_rsp_peek(lll);
/* AdvA */
memcpy(sr_dptr, &sr_prev->adv_ext_ind.ext_hdr_adi_adv_data[1],
memcpy(sr_dptr, &sr_prev->adv_ext_ind.ext_hdr_adv_data[1],
BDADDR_SIZE);
sr_dptr += BDADDR_SIZE;
@ -287,8 +287,8 @@ uint8_t ll_adv_aux_sr_data_set(uint8_t handle, uint8_t op, uint8_t frag_pref, ui
/* Check if data will fit in remaining space */
/* TODO: need aux_chain_ind support */
ext_hdr_len = sr_dptr - &sr_com_hdr->ext_hdr_adi_adv_data[0];
if (sizeof(sr_com_hdr->ext_hdr_adi_adv_data) -
ext_hdr_len = sr_dptr - &sr_com_hdr->ext_hdr_adv_data[0];
if (sizeof(sr_com_hdr->ext_hdr_adv_data) -
sr_com_hdr->ext_hdr_len < len) {
return BT_HCI_ERR_PACKET_TOO_LONG;
}
@ -457,7 +457,7 @@ uint8_t ull_adv_aux_hdr_set_clear(struct ll_adv_set *adv,
}
pri_com_hdr_prev = (void *)&pri_pdu_prev->adv_ext_ind;
pri_hdr = (void *)pri_com_hdr_prev->ext_hdr_adi_adv_data;
pri_hdr = (void *)pri_com_hdr_prev->ext_hdr_adv_data;
pri_hdr_prev = *pri_hdr;
pri_dptr_prev = (uint8_t *)pri_hdr + sizeof(*pri_hdr);
@ -474,7 +474,7 @@ uint8_t ull_adv_aux_hdr_set_clear(struct ll_adv_set *adv,
pri_pdu->chan_sel = 0U;
pri_com_hdr = (void *)&pri_pdu->adv_ext_ind;
pri_com_hdr->adv_mode = pri_com_hdr_prev->adv_mode;
pri_hdr = (void *)pri_com_hdr->ext_hdr_adi_adv_data;
pri_hdr = (void *)pri_com_hdr->ext_hdr_adv_data;
pri_dptr = (uint8_t *)pri_hdr + sizeof(*pri_hdr);
*(uint8_t *)pri_hdr = 0U;
@ -498,7 +498,7 @@ uint8_t ull_adv_aux_hdr_set_clear(struct ll_adv_set *adv,
/* Get reference to previous secondary PDU data */
sec_pdu_prev = lll_adv_aux_data_peek(lll_aux);
sec_com_hdr_prev = (void *)&sec_pdu_prev->adv_ext_ind;
sec_hdr = (void *)sec_com_hdr_prev->ext_hdr_adi_adv_data;
sec_hdr = (void *)sec_com_hdr_prev->ext_hdr_adv_data;
if (!is_aux_new) {
sec_hdr_prev = *sec_hdr;
} else {
@ -508,7 +508,7 @@ uint8_t ull_adv_aux_hdr_set_clear(struct ll_adv_set *adv,
sec_pdu_prev->tx_addr = 0U;
sec_pdu_prev->rx_addr = 0U;
sec_pdu_prev->len = offsetof(struct pdu_adv_com_ext_adv,
ext_hdr_adi_adv_data);
ext_hdr_adv_data);
*(uint8_t *)&sec_hdr_prev = 0U;
}
sec_dptr_prev = (uint8_t *)sec_hdr + sizeof(*sec_hdr);
@ -524,7 +524,7 @@ uint8_t ull_adv_aux_hdr_set_clear(struct ll_adv_set *adv,
sec_com_hdr = (void *)&sec_pdu->adv_ext_ind;
sec_com_hdr->adv_mode = pri_com_hdr->adv_mode;
sec_hdr = (void *)sec_com_hdr->ext_hdr_adi_adv_data;
sec_hdr = (void *)sec_com_hdr->ext_hdr_adv_data;
sec_dptr = (uint8_t *)sec_hdr + sizeof(*sec_hdr);
*(uint8_t *)sec_hdr = 0U;
@ -939,7 +939,7 @@ struct pdu_adv_aux_ptr *ull_adv_aux_lll_offset_fill(uint32_t ticks_offset,
uint8_t *ptr;
pri_com_hdr = (void *)&pdu->adv_ext_ind;
h = (void *)pri_com_hdr->ext_hdr_adi_adv_data;
h = (void *)pri_com_hdr->ext_hdr_adv_data;
ptr = (uint8_t *)h + sizeof(*h);
if (h->adv_addr) {

6
subsys/bluetooth/controller/ll_sw/ull_adv_internal.h
View file

@ -100,10 +100,10 @@ ull_adv_aux_hdr_len_calc(struct pdu_adv_com_ext_adv *com_hdr, uint8_t **dptr)
uint8_t len;
len = *dptr - (uint8_t *)com_hdr;
if (len <= (offsetof(struct pdu_adv_com_ext_adv, ext_hdr_adi_adv_data) +
if (len <= (offsetof(struct pdu_adv_com_ext_adv, ext_hdr_adv_data) +
sizeof(struct pdu_adv_hdr))) {
len = offsetof(struct pdu_adv_com_ext_adv,
ext_hdr_adi_adv_data);
ext_hdr_adv_data);
*dptr = (uint8_t *)com_hdr + len;
}
@ -115,7 +115,7 @@ static inline void
ull_adv_aux_hdr_len_fill(struct pdu_adv_com_ext_adv *com_hdr, uint8_t len)
{
com_hdr->ext_hdr_len = len - offsetof(struct pdu_adv_com_ext_adv,
ext_hdr_adi_adv_data);
ext_hdr_adv_data);
}

8
subsys/bluetooth/controller/ll_sw/ull_adv_sync.c
View file

@ -125,7 +125,7 @@ uint8_t ll_adv_sync_param_set(uint8_t handle, uint16_t interval, uint16_t flags)
ter_pdu->rx_addr = 0U;
ter_com_hdr = (void *)&ter_pdu->adv_ext_ind;
ter_hdr = (void *)ter_com_hdr->ext_hdr_adi_adv_data;
ter_hdr = (void *)ter_com_hdr->ext_hdr_adv_data;
ter_dptr = (uint8_t *)ter_hdr + sizeof(*ter_hdr);
ter_hdr_prev = *ter_hdr;
*(uint8_t *)ter_hdr = 0U;
@ -189,7 +189,7 @@ uint8_t ll_adv_sync_ad_data_set(uint8_t handle, uint8_t op, uint8_t len,
/* Get reference to previous tertiary PDU data */
ter_pdu_prev = lll_adv_sync_data_peek(lll_sync);
ter_com_hdr_prev = (void *)&ter_pdu_prev->adv_ext_ind;
ter_hdr = (void *)ter_com_hdr_prev->ext_hdr_adi_adv_data;
ter_hdr = (void *)ter_com_hdr_prev->ext_hdr_adv_data;
ter_hdr_prev = *ter_hdr;
ter_dptr_prev = (uint8_t *)ter_hdr + sizeof(*ter_hdr);
@ -200,7 +200,7 @@ uint8_t ll_adv_sync_ad_data_set(uint8_t handle, uint8_t op, uint8_t len,
ter_pdu->chan_sel = 0U;
ter_com_hdr = (void *)&ter_pdu->adv_ext_ind;
ter_com_hdr->adv_mode = ter_com_hdr_prev->adv_mode;
ter_hdr = (void *)ter_com_hdr->ext_hdr_adi_adv_data;
ter_hdr = (void *)ter_com_hdr->ext_hdr_adv_data;
ter_dptr = (uint8_t *)ter_hdr + sizeof(*ter_hdr);
*(uint8_t *)ter_hdr = 0U;
@ -651,7 +651,7 @@ static inline struct pdu_adv_sync_info *sync_info_get(struct pdu_adv *pdu)
uint8_t *ptr;
p = (void *)&pdu->adv_ext_ind;
h = (void *)p->ext_hdr_adi_adv_data;
h = (void *)p->ext_hdr_adv_data;
ptr = (uint8_t *)h + sizeof(*h);
if (h->adv_addr) {

2
subsys/bluetooth/controller/ll_sw/ull_scan_aux.c
View file

@ -187,7 +187,7 @@ void ull_scan_aux_setup(memq_link_t *link, struct node_rx_hdr *rx)
goto ull_scan_aux_rx_flush;
}
h = (void *)p->ext_hdr_adi_adv_data;
h = (void *)p->ext_hdr_adv_data;
if (!h->aux_ptr && !sync) {
goto ull_scan_aux_rx_flush;
}