michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: Refactor pdu_adv_payload_* to pdu_adv_*

Browse source 
Refactor PDU type names pdu_adv_payload_* to a shorter
pdu_adv_* struct names.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2018-01-30 14:08:54 +01:00 • committed by Carles Cufí
commit b521d50adc
4 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2234,7 +2234,7 @@ static void le_adv_ext_report(struct pdu_data *pdu_data, u8_t *b,
phy, adv->type, adv->len, adv->tx_addr, adv->rx_addr, rssi);
if ((adv->type == PDU_ADV_TYPE_EXT_IND) && adv->len) {
struct pdu_adv_payload_com_ext_adv *p;
struct pdu_adv_com_ext_adv *p;
struct ext_adv_hdr *h;
u8_t *ptr;

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

@ -901,7 +901,7 @@ static inline u32_t isr_rx_adv(u8_t devmatch_ok, u8_t devmatch_id,
[_radio.advertiser.adv_data.first][0];
if ((pdu_adv->type == PDU_ADV_TYPE_SCAN_REQ) &&
(pdu_adv->len == sizeof(struct pdu_adv_payload_scan_req)) &&
(pdu_adv->len == sizeof(struct pdu_adv_scan_req)) &&
isr_adv_sr_check(_pdu_adv, pdu_adv, devmatch_ok, &rl_idx)) {
#if defined(CONFIG_BT_CTLR_SCAN_REQ_NOTIFY)
@ -938,7 +938,7 @@ static inline u32_t isr_rx_adv(u8_t devmatch_ok, u8_t devmatch_id,
return 0;
} else if ((pdu_adv->type == PDU_ADV_TYPE_CONNECT_IND) &&
(pdu_adv->len == sizeof(struct pdu_adv_payload_connect_ind)) &&
(pdu_adv->len == sizeof(struct pdu_adv_connect_ind)) &&
isr_adv_ci_check(_pdu_adv, pdu_adv, devmatch_ok, &rl_idx) &&
((_radio.fc_ena == 0) || (_radio.fc_req == _radio.fc_ack)) &&
(_radio.advertiser.conn)) {
@ -1389,7 +1389,7 @@ static inline u32_t isr_rx_scan(u8_t devmatch_ok, u8_t devmatch_id,
}
pdu_adv_tx->rx_addr = pdu_adv_rx->tx_addr;
pdu_adv_tx->len = sizeof(struct pdu_adv_payload_connect_ind);
pdu_adv_tx->len = sizeof(struct pdu_adv_connect_ind);
#if defined(CONFIG_BT_CTLR_PRIVACY)
lrpa = ctrl_lrpa_get(rl_idx);
if (_radio.scanner.rpa_gen && lrpa) {
@ -1637,7 +1637,7 @@ static inline u32_t isr_rx_scan(u8_t devmatch_ok, u8_t devmatch_id,
pdu_adv_tx = (struct pdu_adv *)radio_pkt_scratch_get();
pdu_adv_tx->type = PDU_ADV_TYPE_SCAN_REQ;
pdu_adv_tx->rx_addr = pdu_adv_rx->tx_addr;
pdu_adv_tx->len = sizeof(struct pdu_adv_payload_scan_req);
pdu_adv_tx->len = sizeof(struct pdu_adv_scan_req);
#if defined(CONFIG_BT_CTLR_PRIVACY)
lrpa = ctrl_lrpa_get(rl_idx);
if (_radio.scanner.rpa_gen && lrpa) {

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

@ -137,11 +137,11 @@ u32_t ll_adv_params_set(u16_t interval, u8_t adv_type,
pdu->rx_addr = direct_addr_type;
memcpy(&pdu->payload.direct_ind.tgt_addr[0], direct_addr,
BDADDR_SIZE);
pdu->len = sizeof(struct pdu_adv_payload_direct_ind);
pdu->len = sizeof(struct pdu_adv_direct_ind);
#if defined(CONFIG_BT_CTLR_ADV_EXT)
} else if (pdu->type == PDU_ADV_TYPE_EXT_IND) {
struct pdu_adv_payload_com_ext_adv *p;
struct pdu_adv_com_ext_adv *p;
struct ext_adv_hdr *h;
u8_t *ptr;
u8_t len;
@ -182,14 +182,14 @@ u32_t ll_adv_params_set(u16_t interval, u8_t adv_type,
/* Calc primary PDU len */
len = ptr - (u8_t *)p;
if (len > (offsetof(struct pdu_adv_payload_com_ext_adv,
if (len > (offsetof(struct pdu_adv_com_ext_adv,
ext_hdr_adi_adv_data) + sizeof(*h))) {
p->ext_hdr_len = len -
offsetof(struct pdu_adv_payload_com_ext_adv,
offsetof(struct pdu_adv_com_ext_adv,
ext_hdr_adi_adv_data);
pdu->len = len;
} else {
pdu->len = offsetof(struct pdu_adv_payload_com_ext_adv,
pdu->len = offsetof(struct pdu_adv_com_ext_adv,
ext_hdr_adi_adv_data);
}
@ -367,7 +367,7 @@ u32_t ll_adv_enable(u8_t enable)
#if defined(CONFIG_BT_CTLR_ADV_EXT)
} else if (pdu_adv->type == PDU_ADV_TYPE_EXT_IND) {
struct pdu_adv_payload_com_ext_adv *p;
struct pdu_adv_com_ext_adv *p;
struct ext_adv_hdr *h;
u8_t *ptr;

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

@ -16,27 +16,27 @@
PDU_AC_PAYLOAD_SIZE_MAX)
#define PDU_EM_SIZE_MAX offsetof(struct pdu_data, payload)
struct pdu_adv_payload_adv_ind {
struct pdu_adv_adv_ind {
u8_t addr[BDADDR_SIZE];
u8_t data[31];
} __packed;
struct pdu_adv_payload_direct_ind {
struct pdu_adv_direct_ind {
u8_t adv_addr[BDADDR_SIZE];
u8_t tgt_addr[BDADDR_SIZE];
} __packed;
struct pdu_adv_payload_scan_rsp {
struct pdu_adv_scan_rsp {
u8_t addr[BDADDR_SIZE];
u8_t data[31];
} __packed;
struct pdu_adv_payload_scan_req {
struct pdu_adv_scan_req {
u8_t scan_addr[BDADDR_SIZE];
u8_t adv_addr[BDADDR_SIZE];
} __packed;
struct pdu_adv_payload_connect_ind {
struct pdu_adv_connect_ind {
u8_t init_addr[BDADDR_SIZE];
u8_t adv_addr[BDADDR_SIZE];
struct {
@ -54,7 +54,7 @@ struct pdu_adv_payload_connect_ind {
} __packed;
#if defined(CONFIG_BT_CTLR_ADV_EXT)
struct pdu_adv_payload_com_ext_adv {
struct pdu_adv_com_ext_adv {
u8_t ext_hdr_len:6;
u8_t adv_mode:2;
u8_t ext_hdr_adi_adv_data[254];
@ -146,14 +146,14 @@ struct pdu_adv {
u8_t len:8;
union {
struct pdu_adv_payload_adv_ind adv_ind;
struct pdu_adv_payload_direct_ind direct_ind;
struct pdu_adv_payload_scan_req scan_req;
struct pdu_adv_payload_scan_rsp scan_rsp;
struct pdu_adv_payload_connect_ind connect_ind;
struct pdu_adv_adv_ind adv_ind;
struct pdu_adv_direct_ind direct_ind;
struct pdu_adv_scan_req scan_req;
struct pdu_adv_scan_rsp scan_rsp;
struct pdu_adv_connect_ind connect_ind;
#if defined(CONFIG_BT_CTLR_ADV_EXT)
struct pdu_adv_payload_com_ext_adv adv_ext_ind;
struct pdu_adv_com_ext_adv adv_ext_ind;
#endif /* CONFIG_BT_CTLR_ADV_EXT */
} __packed payload;
} __packed;