michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Controller: Add missing check for Coded PHY support

Browse source 
Add missing check for Coded PHY support when creating
extended advertising set.

Added a fallback in Controller for upper layers requesting
Coded PHY while Controller is implemented without Coded PHY.
In this case, 1M PHY will be used in extended advertising
for testing purposes.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2024-03-20 09:12:24 +01:00 • committed by Fabio Baltieri
commit a725931c11
2 changed files with 35 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3439,6 +3439,15 @@ static void le_set_ext_adv_param(struct net_buf *buf, struct net_buf **evt)
*evt = cmd_complete_status(BT_HCI_ERR_UNSUPP_FEATURE_PARAM_VAL);
return;
}
if ((cmd->prim_adv_phy > BT_HCI_LE_PHY_CODED) ||
(cmd->sec_adv_phy > BT_HCI_LE_PHY_CODED) ||
(!IS_ENABLED(CONFIG_BT_CTLR_PHY_CODED) &&
((cmd->prim_adv_phy == BT_HCI_LE_PHY_CODED) ||
(cmd->sec_adv_phy == BT_HCI_LE_PHY_CODED)))) {
*evt = cmd_complete_status(BT_HCI_ERR_UNSUPP_FEATURE_PARAM_VAL);
return;
}
}
status = ll_adv_set_by_hci_handle_get_or_new(cmd->handle, &handle);

28
subsys/bluetooth/controller/ll_sw/ull_adv.c
View file

@ -315,6 +315,17 @@ uint8_t ll_adv_params_set(uint16_t interval, uint8_t adv_type,
adv_type = 0x05; /* index of PDU_ADV_TYPE_EXT_IND in */
/* pdu_adv_type[] */
/* Fallback to 1M if upper layer did not check HCI
* parameters for Coded PHY support.
* This fallback allows *testing* extended advertising
* using 1M using a upper layer that is requesting Coded
* PHY on Controllers without Coded PHY support.
*/
if (!IS_ENABLED(CONFIG_BT_CTLR_PHY_CODED) &&
(phy_p == PHY_CODED)) {
phy_p = PHY_1M;
}
adv->lll.phy_p = phy_p;
adv->lll.phy_flags = PHY_FLAGS_S8;
}
@ -581,15 +592,28 @@ uint8_t ll_adv_params_set(uint16_t interval, uint8_t adv_type,
/* No SyncInfo in primary channel PDU */
#if (CONFIG_BT_CTLR_ADV_AUX_SET > 0)
/* Fallback to 1M if upper layer did not check HCI
* parameters for Coded PHY support.
* This fallback allows *testing* extended advertising
* using 1M using a upper layer that is requesting Coded
* PHY on Controllers without Coded PHY support.
*/
if (!IS_ENABLED(CONFIG_BT_CTLR_PHY_CODED) &&
(phy_s == PHY_CODED)) {
phy_s = PHY_1M;
}
adv->lll.phy_s = phy_s;
/* AuxPtr */
if (pri_hdr_prev.aux_ptr) {
pri_dptr_prev -= sizeof(struct pdu_adv_aux_ptr);
}
if (pri_hdr->aux_ptr) {
pri_dptr -= sizeof(struct pdu_adv_aux_ptr);
ull_adv_aux_ptr_fill((void *)pri_dptr, 0U, phy_s);
ull_adv_aux_ptr_fill((void *)pri_dptr, 0U,
adv->lll.phy_s);
}
adv->lll.phy_s = phy_s;
#endif /* (CONFIG_BT_CTLR_ADV_AUX_SET > 0) */
/* ADI */