michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: split: Fix piggy back implementation

Browse source 
Fix conditional compilation of piggy back implementation.
This code should be deleted once periodic advertising
implementation is complete.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2020-03-13 17:07:14 +05:30 • committed by Carles Cufí
commit de3d4a3a64
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -501,7 +501,7 @@ static void isr_done(void *param)
return;
#if defined(CONFIG_BT_CTLR_ADV_EXT) && defined(CONFIG_BT_CTLR_ADV_EXT_PBACK)
#if defined(CONFIG_BT_CTLR_ADV_EXT) && defined(BT_CTLR_ADV_EXT_PBACK)
} else {
struct pdu_adv_com_ext_adv *p;
struct ext_adv_hdr *h;

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

@ -151,10 +151,10 @@ static int prepare_cb(struct lll_prepare_param *prepare_param)
}
aux = (void *)ptr;
#if !defined(CONFIG_BT_CTLR_ADV_EXT_PBACK)
#if !defined(BT_CTLR_ADV_EXT_PBACK)
/* Set up Radio H/W */
radio_reset();
#endif /* !CONFIG_BT_CTLR_ADV_EXT_PBACK */
#endif /* !BT_CTLR_ADV_EXT_PBACK */
#if defined(CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL)
radio_tx_power_set(lll->tx_pwr_lvl);
@ -168,12 +168,12 @@ static int prepare_cb(struct lll_prepare_param *prepare_param)
radio_phy_set(phy_s, 1);
radio_pkt_configure(8, PDU_AC_PAYLOAD_SIZE_MAX, (phy_s << 1));
#if !defined(CONFIG_BT_CTLR_ADV_EXT_PBACK)
#if !defined(BT_CTLR_ADV_EXT_PBACK)
/* Access address and CRC */
radio_aa_set((uint8_t *)&aa);
radio_crc_configure(((0x5bUL) | ((0x06UL) << 8) | ((0x00UL) << 16)),
0x555555);
#endif /* !CONFIG_BT_CTLR_ADV_EXT_PBACK */
#endif /* !BT_CTLR_ADV_EXT_PBACK */
/* Use channel idx in aux_ptr */
lll_chan_set(aux->chan_idx);
@ -185,10 +185,10 @@ static int prepare_cb(struct lll_prepare_param *prepare_param)
radio_isr_set(lll_isr_done, lll);
radio_switch_complete_and_disable();
#if defined(CONFIG_BT_CTLR_ADV_EXT_PBACK)
#if defined(BT_CTLR_ADV_EXT_PBACK)
start_us = 1000;
radio_tmr_start_us(1, start_us);
#else /* !CONFIG_BT_CTLR_ADV_EXT_PBACK */
#else /* !BT_CTLR_ADV_EXT_PBACK */
ticks_at_event = prepare_param->ticks_at_expire;
evt = HDR_LLL2EVT(lll);
@ -199,7 +199,7 @@ static int prepare_cb(struct lll_prepare_param *prepare_param)
remainder = prepare_param->remainder;
start_us = radio_tmr_start(1, ticks_at_start, remainder);
#endif /* !CONFIG_BT_CTLR_ADV_EXT_PBACK */
#endif /* !BT_CTLR_ADV_EXT_PBACK */
/* capture end of Tx-ed PDU, used to calculate HCTO. */
radio_tmr_end_capture();