Bluetooth: Controller: Fix PA and LNA conditional compilation (1d922038) · Commits · Wenxi XU / zephyr

subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_iso.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -319,14 +319,14 @@ static int prepare_cb_common(struct lll_prepare_param *p)
		remainder = p->remainder;
		start_us = radio_tmr_start(1, ticks_at_start, remainder);

		#if defined(CONFIG_BT_CTLR_GPIO_PA_PIN)
		#if defined(HAL_RADIO_GPIO_HAVE_PA_PIN)
		radio_gpio_pa_setup();

		radio_gpio_pa_lna_enable(start_us + radio_tx_ready_delay_get(phy, 1) -
		CONFIG_BT_CTLR_GPIO_PA_OFFSET);
		#else /* !CONFIG_BT_CTLR_GPIO_PA_PIN */
		HAL_RADIO_GPIO_PA_OFFSET);
		#else /* !HAL_RADIO_GPIO_HAVE_PA_PIN */
		ARG_UNUSED(start_us);
		#endif /* !CONFIG_BT_CTLR_GPIO_PA_PIN */
		#endif /* !HAL_RADIO_GPIO_HAVE_PA_PIN */

		if (0) {
		#if defined(CONFIG_BT_CTLR_XTAL_ADVANCED) && \

+6 −6

Original line number	Diff line number	Diff line
		@@ -294,13 +294,13 @@ static int prepare_cb_common(struct lll_prepare_param *p)
		radio_tmr_end_capture();
		radio_rssi_measure();

		#if defined(CONFIG_BT_CTLR_GPIO_LNA_PIN)
		#if defined(HAL_RADIO_GPIO_HAVE_LNA_PIN)
		radio_gpio_lna_setup();

		radio_gpio_pa_lna_enable(remainder_us +
		radio_rx_ready_delay_get(lll->phy, 1) -
		CONFIG_BT_CTLR_GPIO_LNA_OFFSET);
		#endif /* CONFIG_BT_CTLR_GPIO_LNA_PIN */
		HAL_RADIO_GPIO_LNA_OFFSET);
		#endif /* HAL_RADIO_GPIO_HAVE_LNA_PIN */

		if (0) {
		#if defined(CONFIG_BT_CTLR_XTAL_ADVANCED) && \
		@@ -700,11 +700,11 @@ isr_rx_next_subevent:
		radio_tmr_hcto_configure(hcto);
		radio_tmr_end_capture();

		#if defined(CONFIG_BT_CTLR_GPIO_LNA_PIN)
		#if defined(HAL_RADIO_GPIO_HAVE_LNA_PIN)
		radio_gpio_lna_setup();

		radio_gpio_pa_lna_enable(remainder_us +
		radio_rx_ready_delay_get(lll->phy, 1) -
		CONFIG_BT_CTLR_GPIO_LNA_OFFSET);
		#endif /* CONFIG_BT_CTLR_GPIO_LNA_PIN */
		HAL_RADIO_GPIO_LNA_OFFSET);
		#endif /* HAL_RADIO_GPIO_HAVE_LNA_PIN */
		}