michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: Fix HCI LE Set PHY command status response

Browse source 
Fixed the implementation to generate command status as per
Bluetooth v5.0 specification instead of the incorrect
command complete that was generated before.

Also, the unsupported features status will be generated
before the invalid parameters status.

Relates to commit 258c7ccff1 ("Bluetooth: controller: Fix
HCI LE Set PHY invalid behavior check")

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2018-07-27 13:05:43 +02:00 • committed by Carles Cufí
commit 76320d2142
1 changed files with 7 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1303,27 +1303,21 @@ static void le_set_phy(struct net_buf *buf, struct net_buf **evt)
}
if (cmd->all_phys & BT_HCI_LE_PHY_TX_ANY) {
cmd->tx_phys = mask_phys;
cmd->tx_phys |= mask_phys;
}
if (cmd->all_phys & BT_HCI_LE_PHY_RX_ANY) {
cmd->rx_phys = mask_phys;
cmd->rx_phys |= mask_phys;
}
if (!(cmd->tx_phys & 0x07) ||
!(cmd->rx_phys & 0x07)) {
struct bt_hci_evt_cc_status *ccst;
ccst = cmd_complete(evt, sizeof(*ccst));
ccst->status = BT_HCI_ERR_INVALID_PARAM;
if ((cmd->tx_phys | cmd->rx_phys) & ~mask_phys) {
*evt = cmd_status(BT_HCI_ERR_UNSUPP_FEATURE_PARAM_VAL);
return;
}
if ((cmd->tx_phys | cmd->rx_phys) & ~mask_phys) {
struct bt_hci_evt_cc_status *ccst;
ccst = cmd_complete(evt, sizeof(*ccst));
ccst->status = BT_HCI_ERR_UNSUPP_FEATURE_PARAM_VAL;
if (!(cmd->tx_phys & 0x07) ||
!(cmd->rx_phys & 0x07)) {
*evt = cmd_status(BT_HCI_ERR_INVALID_PARAM);
return;
}