Bluetooth: controller: Fix master role RSSI measurement

Fix broken master role RSSI measurement. Since the original
contribution clean up into Zephyr, the radio shorts that was
set for measuring the RSSI for master role has been broken,
as it was cleared by the radio switching code further in the
Tx ISR.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2018-10-15 08:32:24 +02:00 committed by Carles Cufí
commit d80fee1ecb

View file

@ -715,15 +715,6 @@ static inline void isr_radio_state_tx(void)
break;
case ROLE_MASTER:
#if defined(CONFIG_BT_CTLR_CONN_RSSI)
if (_radio.packet_counter == 0) {
radio_rssi_measure();
}
#endif /* CONFIG_BT_CTLR_CONN_RSSI */
/* fall thru */
case ROLE_SLAVE:
#if defined(CONFIG_BT_CTLR_PHY)
@ -753,6 +744,13 @@ static inline void isr_radio_state_tx(void)
radio_tmr_hcto_configure(hcto);
#if defined(CONFIG_BT_CTLR_CONN_RSSI)
if ((_radio.role == ROLE_MASTER) &&
(_radio.packet_counter == 0)) {
radio_rssi_measure();
}
#endif /* CONFIG_BT_CTLR_CONN_RSSI */
#if defined(CONFIG_BT_CTLR_GPIO_LNA_PIN)
#if defined(CONFIG_BT_CTLR_PHY)
radio_gpio_pa_lna_enable(radio_tmr_tifs_base_get() +