patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

Bluetooth: Controller: Make PHY check in conn mode Kconf dependent

Browse source 
Constant Tone Extension may not be transmittied with PHY CODED.
There were check to avoid situation that controller tries to
transmit or receive CTE when PHY is set to CODED.
These check were not conditionally compilated, hence when
PHY Update feature is disabled code did build.

The commit fixes the issue.

Signed-off-by: Piotr Pryga <piotr.pryga@nordicsemi.no>
This commit is contained in:
Piotr Pryga 2022-02-03 00:04:52 +01:00 committed by Carles Cufí
parent 8f59477dc6
commit 281ad2102e
3 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2916,9 +2916,14 @@ static void le_df_connection_iq_report(struct node_rx_pdu *node_rx, struct net_b
lll = iq_report->hdr.rx_ftr.param;
#if defined(CONFIG_BT_CTLR_PHY)
phy_rx = lll->phy_rx;
/* Make sure the report is generated for connection on PHY UNCODED */
LL_ASSERT(phy_rx != PHY_CODED);
#else
phy_rx = PHY_1M;
#endif /* CONFIG_BT_CTLR_PHY */
/* TX LL thread has higher priority than RX thread. It may happen that host succefully
* disables CTE sampling in the meantime. It should be verified here, to avoid reporing

6
subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c
View file

@ -473,7 +473,11 @@ void lll_conn_isr_tx(void *param)
enum radio_end_evt_delay_state end_evt_delay;
#endif /* CONFIG_BT_CTLR_DF_PHYEND_OFFSET_COMPENSATION_ENABLE */
#if defined(CONFIG_BT_CTLR_PHY)
if (lll->phy_rx != PHY_CODED) {
#else
if (1) {
#endif /* CONFIG_BT_CTLR_PHY */
struct lll_df_conn_rx_params *df_rx_params;
struct lll_df_conn_rx_cfg *df_rx_cfg;
@ -1021,9 +1025,11 @@ static inline bool create_iq_report(struct lll_conn *lll, uint8_t rssi_ready, ui
struct lll_df_conn_rx_params *rx_params;
struct lll_df_conn_rx_cfg *rx_cfg;
#if defined(CONFIG_BT_CTLR_PHY)
if (lll->phy_rx == PHY_CODED) {
return false;
}
#endif /* CONFIG_BT_CTLR_PHY */
rx_cfg = &lll->df_rx_cfg;

4
subsys/bluetooth/controller/ll_sw/nordic/lll/lll_peripheral.c
View file

@ -218,7 +218,11 @@ static int prepare_cb(struct lll_prepare_param *p)
enum radio_end_evt_delay_state end_evt_delay;
#endif /* CONFIG_BT_CTLR_DF_PHYEND_OFFSET_COMPENSATION_ENABLE */
#if defined(CONFIG_BT_CTLR_PHY)
if (lll->phy_rx != PHY_CODED) {
#else
if (1) {
#endif /* CONFIG_BT_CTLR_PHY */
df_rx_cfg = &lll->df_rx_cfg;
df_rx_params = dbuf_latest_get(&df_rx_cfg->hdr, NULL);