michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: Rename pdu_adv_hdr to pdu_adv_ext_hdr

Browse source 
pdu_adv_hdr name is quite confusing since it suggests some generic
header for advertising PDUs while this in fact is extended header
which is a part of common extended advertising payload and only applies
to extended advertising PDUs.

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

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

@ -4486,7 +4486,7 @@ static void le_ext_adv_report(struct pdu_data *pdu_data,
uint8_t *adv_addr_curr = NULL; uint8_t *adv_addr_curr = NULL;
uint8_t data_len_curr = 0U; uint8_t data_len_curr = 0U;
uint8_t *data_curr = NULL; uint8_t *data_curr = NULL;
struct pdu_adv_hdr *h; struct pdu_adv_ext_hdr *h;
uint8_t sec_phy_curr = 0U; uint8_t sec_phy_curr = 0U;
uint8_t evt_type_curr; uint8_t evt_type_curr;
uint8_t hdr_len; uint8_t hdr_len;
@ -4606,7 +4606,7 @@ static void le_ext_adv_report(struct pdu_data *pdu_data,
hdr_len = ptr - (uint8_t *)p; hdr_len = ptr - (uint8_t *)p;
if (hdr_len <= (offsetof(struct pdu_adv_com_ext_adv, if (hdr_len <= (offsetof(struct pdu_adv_com_ext_adv,
ext_hdr_adv_data) + ext_hdr_adv_data) +
sizeof(struct pdu_adv_hdr))) { sizeof(struct pdu_adv_ext_hdr))) {
hdr_len = offsetof(struct pdu_adv_com_ext_adv, hdr_len = offsetof(struct pdu_adv_com_ext_adv,
ext_hdr_adv_data); ext_hdr_adv_data);
ptr = (uint8_t *)h; ptr = (uint8_t *)h;
@ -4898,7 +4898,7 @@ static void le_per_adv_sync_report(struct pdu_data *pdu_data,
uint8_t data_len_curr = 0U; uint8_t data_len_curr = 0U;
uint8_t *data_curr = NULL; uint8_t *data_curr = NULL;
uint8_t sec_phy_curr = 0U; uint8_t sec_phy_curr = 0U;
struct pdu_adv_hdr *h; struct pdu_adv_ext_hdr *h;
uint8_t hdr_len; uint8_t hdr_len;
uint8_t *ptr; uint8_t *ptr;
@ -4956,7 +4956,7 @@ static void le_per_adv_sync_report(struct pdu_data *pdu_data,
hdr_len = ptr - (uint8_t *)p; hdr_len = ptr - (uint8_t *)p;
if (hdr_len <= (offsetof(struct pdu_adv_com_ext_adv, if (hdr_len <= (offsetof(struct pdu_adv_com_ext_adv,
ext_hdr_adv_data) + ext_hdr_adv_data) +
sizeof(struct pdu_adv_hdr))) { sizeof(struct pdu_adv_ext_hdr))) {
hdr_len = offsetof(struct pdu_adv_com_ext_adv, hdr_len = offsetof(struct pdu_adv_com_ext_adv,
ext_hdr_adv_data); ext_hdr_adv_data);
ptr = (uint8_t *)h; ptr = (uint8_t *)h;

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

@ -773,7 +773,7 @@ static void isr_done(void *param)
#if defined(CONFIG_BT_CTLR_ADV_EXT) && defined(BT_CTLR_ADV_EXT_PBACK) #if defined(CONFIG_BT_CTLR_ADV_EXT) && defined(BT_CTLR_ADV_EXT_PBACK)
} else { } else {
struct pdu_adv_com_ext_adv *p; struct pdu_adv_com_ext_adv *p;
struct pdu_adv_hdr *h; struct pdu_adv_ext_hdr *h;
struct pdu_adv *pdu; struct pdu_adv *pdu;
pdu = lll_adv_data_curr_get(lll); pdu = lll_adv_data_curr_get(lll);

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

@ -98,7 +98,7 @@ static int prepare_cb(struct lll_prepare_param *p)
uint32_t ticks_at_event, ticks_at_start; uint32_t ticks_at_event, ticks_at_start;
struct pdu_adv *pri_pdu, *sec_pdu; struct pdu_adv *pri_pdu, *sec_pdu;
struct pdu_adv_aux_ptr *aux_ptr; struct pdu_adv_aux_ptr *aux_ptr;
struct pdu_adv_hdr *pri_hdr; struct pdu_adv_ext_hdr *pri_hdr;
struct lll_adv_aux *lll; struct lll_adv_aux *lll;
struct lll_adv *lll_adv; struct lll_adv *lll_adv;
struct evt_hdr *evt; struct evt_hdr *evt;

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

@ -232,7 +232,7 @@ enum pdu_adv_mode {
EXT_ADV_MODE_NON_CONN_SCAN = 0x02, EXT_ADV_MODE_NON_CONN_SCAN = 0x02,
}; };
struct pdu_adv_hdr { struct pdu_adv_ext_hdr {
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
uint8_t adv_addr:1; uint8_t adv_addr:1;
uint8_t tgt_addr:1; uint8_t tgt_addr:1;

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

@ -361,7 +361,7 @@ uint8_t ll_adv_params_set(uint16_t interval, uint8_t adv_type,
#if defined(CONFIG_BT_CTLR_ADV_EXT) #if defined(CONFIG_BT_CTLR_ADV_EXT)
} else if (pdu->type == PDU_ADV_TYPE_EXT_IND) { } else if (pdu->type == PDU_ADV_TYPE_EXT_IND) {
struct pdu_adv_hdr *pri_hdr, pri_hdr_prev; struct pdu_adv_ext_hdr *pri_hdr, pri_hdr_prev;
struct pdu_adv_com_ext_adv *pri_com_hdr; struct pdu_adv_com_ext_adv *pri_com_hdr;
uint8_t *pri_dptr_prev, *pri_dptr; uint8_t *pri_dptr_prev, *pri_dptr;
uint8_t len; uint8_t len;
@ -655,7 +655,7 @@ uint8_t ll_adv_enable(uint8_t enable)
#if defined(CONFIG_BT_CTLR_ADV_EXT) #if defined(CONFIG_BT_CTLR_ADV_EXT)
} else if (pdu_adv->type == PDU_ADV_TYPE_EXT_IND) { } else if (pdu_adv->type == PDU_ADV_TYPE_EXT_IND) {
struct pdu_adv_com_ext_adv *pri_com_hdr; struct pdu_adv_com_ext_adv *pri_com_hdr;
struct pdu_adv_hdr *pri_hdr; struct pdu_adv_ext_hdr *pri_hdr;
pri_com_hdr = (void *)&pdu_adv->adv_ext_ind; pri_com_hdr = (void *)&pdu_adv->adv_ext_ind;
pri_hdr = (void *)pri_com_hdr->ext_hdr_adv_data; pri_hdr = (void *)pri_com_hdr->ext_hdr_adv_data;
@ -674,7 +674,7 @@ uint8_t ll_adv_enable(uint8_t enable)
#if (CONFIG_BT_CTLR_ADV_AUX_SET > 0) #if (CONFIG_BT_CTLR_ADV_AUX_SET > 0)
} else if (pri_hdr->aux_ptr) { } else if (pri_hdr->aux_ptr) {
struct pdu_adv_com_ext_adv *sec_com_hdr; struct pdu_adv_com_ext_adv *sec_com_hdr;
struct pdu_adv_hdr *sec_hdr; struct pdu_adv_ext_hdr *sec_hdr;
struct pdu_adv *sec_pdu; struct pdu_adv *sec_pdu;
sec_pdu = lll_adv_aux_data_peek(lll->aux); sec_pdu = lll_adv_aux_data_peek(lll->aux);
@ -1575,7 +1575,7 @@ const uint8_t *ull_adv_pdu_update_addrs(struct ll_adv_set *adv,
struct pdu_adv *pdu) struct pdu_adv *pdu)
{ {
#if defined(CONFIG_BT_CTLR_ADV_EXT) #if defined(CONFIG_BT_CTLR_ADV_EXT)
struct pdu_adv_hdr *hdr = (void *)pdu->adv_ext_ind.ext_hdr_adv_data; struct pdu_adv_ext_hdr *hdr = (void *)pdu->adv_ext_ind.ext_hdr_adv_data;
#endif #endif
const uint8_t *adv_addr; const uint8_t *adv_addr;
@ -1985,7 +1985,7 @@ static inline uint8_t disable(uint8_t handle)
static inline uint8_t *adv_pdu_adva_get(struct pdu_adv *pdu) static inline uint8_t *adv_pdu_adva_get(struct pdu_adv *pdu)
{ {
#if defined(CONFIG_BT_CTLR_ADV_EXT) #if defined(CONFIG_BT_CTLR_ADV_EXT)
struct pdu_adv_hdr *hdr = (void *)pdu->adv_ext_ind.ext_hdr_adv_data; struct pdu_adv_ext_hdr *hdr = (void *)pdu->adv_ext_ind.ext_hdr_adv_data;
/* All extended PDUs have AdvA at the same offset in common header */ /* All extended PDUs have AdvA at the same offset in common header */
if (pdu->type == PDU_ADV_TYPE_EXT_IND) { if (pdu->type == PDU_ADV_TYPE_EXT_IND) {

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

@ -174,7 +174,7 @@ uint8_t ll_adv_aux_sr_data_set(uint8_t handle, uint8_t op, uint8_t frag_pref, ui
{ {
struct pdu_adv_com_ext_adv *sr_com_hdr; struct pdu_adv_com_ext_adv *sr_com_hdr;
struct pdu_adv *pri_pdu_prev; struct pdu_adv *pri_pdu_prev;
struct pdu_adv_hdr *sr_hdr; struct pdu_adv_ext_hdr *sr_hdr;
struct pdu_adv_adi *sr_adi; struct pdu_adv_adi *sr_adi;
struct pdu_adv *sr_prev; struct pdu_adv *sr_prev;
struct pdu_adv *aux_pdu; struct pdu_adv *aux_pdu;
@ -419,8 +419,8 @@ uint8_t ull_adv_aux_hdr_set_clear(struct ll_adv_set *adv,
{ {
struct pdu_adv_com_ext_adv *pri_com_hdr, *pri_com_hdr_prev; struct pdu_adv_com_ext_adv *pri_com_hdr, *pri_com_hdr_prev;
struct pdu_adv_com_ext_adv *sec_com_hdr, *sec_com_hdr_prev; struct pdu_adv_com_ext_adv *sec_com_hdr, *sec_com_hdr_prev;
struct pdu_adv_hdr *pri_hdr, pri_hdr_prev; struct pdu_adv_ext_hdr *pri_hdr, pri_hdr_prev;
struct pdu_adv_hdr *sec_hdr, sec_hdr_prev; struct pdu_adv_ext_hdr *sec_hdr, sec_hdr_prev;
uint16_t pri_len, sec_len, sec_len_prev; uint16_t pri_len, sec_len, sec_len_prev;
struct pdu_adv *pri_pdu, *pri_pdu_prev; struct pdu_adv *pri_pdu, *pri_pdu_prev;
struct pdu_adv *sec_pdu_prev, *sec_pdu; struct pdu_adv *sec_pdu_prev, *sec_pdu;
@ -934,7 +934,7 @@ struct pdu_adv_aux_ptr *ull_adv_aux_lll_offset_fill(uint32_t ticks_offset,
{ {
struct pdu_adv_com_ext_adv *pri_com_hdr; struct pdu_adv_com_ext_adv *pri_com_hdr;
struct pdu_adv_aux_ptr *aux; struct pdu_adv_aux_ptr *aux;
struct pdu_adv_hdr *h; struct pdu_adv_ext_hdr *h;
uint32_t offs; uint32_t offs;
uint8_t *ptr; uint8_t *ptr;

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

@ -101,7 +101,7 @@ ull_adv_aux_hdr_len_calc(struct pdu_adv_com_ext_adv *com_hdr, uint8_t **dptr)
len = *dptr - (uint8_t *)com_hdr; len = *dptr - (uint8_t *)com_hdr;
if (len <= (offsetof(struct pdu_adv_com_ext_adv, ext_hdr_adv_data) + if (len <= (offsetof(struct pdu_adv_com_ext_adv, ext_hdr_adv_data) +
sizeof(struct pdu_adv_hdr))) { sizeof(struct pdu_adv_ext_hdr))) {
len = offsetof(struct pdu_adv_com_ext_adv, len = offsetof(struct pdu_adv_com_ext_adv,
ext_hdr_adv_data); ext_hdr_adv_data);
*dptr = (uint8_t *)com_hdr + len; *dptr = (uint8_t *)com_hdr + len;

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

@ -58,7 +58,7 @@ static void *adv_sync_free;
uint8_t ll_adv_sync_param_set(uint8_t handle, uint16_t interval, uint16_t flags) uint8_t ll_adv_sync_param_set(uint8_t handle, uint16_t interval, uint16_t flags)
{ {
struct pdu_adv_hdr *ter_hdr, ter_hdr_prev; struct pdu_adv_ext_hdr *ter_hdr, ter_hdr_prev;
struct pdu_adv_com_ext_adv *ter_com_hdr; struct pdu_adv_com_ext_adv *ter_com_hdr;
uint8_t *ter_dptr_prev, *ter_dptr; uint8_t *ter_dptr_prev, *ter_dptr;
struct lll_adv_sync *lll_sync; struct lll_adv_sync *lll_sync;
@ -168,7 +168,7 @@ uint8_t ll_adv_sync_ad_data_set(uint8_t handle, uint8_t op, uint8_t len,
uint8_t const *const data) uint8_t const *const data)
{ {
struct pdu_adv_com_ext_adv *ter_com_hdr, *ter_com_hdr_prev; struct pdu_adv_com_ext_adv *ter_com_hdr, *ter_com_hdr_prev;
struct pdu_adv_hdr *ter_hdr, ter_hdr_prev; struct pdu_adv_ext_hdr *ter_hdr, ter_hdr_prev;
struct pdu_adv *ter_pdu, *ter_pdu_prev; struct pdu_adv *ter_pdu, *ter_pdu_prev;
uint8_t *ter_dptr, *ter_dptr_prev; uint8_t *ter_dptr, *ter_dptr_prev;
uint16_t ter_len, ter_len_prev; uint16_t ter_len, ter_len_prev;
@ -647,7 +647,7 @@ static void mfy_sync_offset_get(void *param)
static inline struct pdu_adv_sync_info *sync_info_get(struct pdu_adv *pdu) static inline struct pdu_adv_sync_info *sync_info_get(struct pdu_adv *pdu)
{ {
struct pdu_adv_com_ext_adv *p; struct pdu_adv_com_ext_adv *p;
struct pdu_adv_hdr *h; struct pdu_adv_ext_hdr *h;
uint8_t *ptr; uint8_t *ptr;
p = (void *)&pdu->adv_ext_ind; p = (void *)&pdu->adv_ext_ind;

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

@ -90,7 +90,7 @@ void ull_scan_aux_setup(memq_link_t *link, struct node_rx_hdr *rx)
uint32_t ready_delay_us; uint32_t ready_delay_us;
uint32_t aux_offset_us; uint32_t aux_offset_us;
uint32_t ticker_status; uint32_t ticker_status;
struct pdu_adv_hdr *h; struct pdu_adv_ext_hdr *h;
struct pdu_adv *pdu; struct pdu_adv *pdu;
uint8_t aux_handle; uint8_t aux_handle;
uint8_t *ptr; uint8_t *ptr;