michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: HCI_VS: Check for supported command

Browse source 
According to the Zephyr VS HCI specification:
Only Read_Version_Information and Read_Supported_Commands commands are
mandatory.

Check for supported Read Supported Features command before issuing this
command to the controller.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
This commit is contained in:
Joakim Andersson 2020-03-04 18:12:32 +01:00 • committed by Johan Hedberg
commit 681dfdc12b
2 changed files with 43 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

23
include/bluetooth/hci_vs.h
View file

@ -15,6 +15,29 @@
extern "C" { extern "C" {
#endif #endif
#define BT_VS_CMD_BIT_VERSION 0
#define BT_VS_CMD_BIT_SUP_CMD 1
#define BT_VS_CMD_BIT_SUP_FEAT 2
#define BT_VS_CMD_BIT_SET_EVT_MASK 3
#define BT_VS_CMD_BIT_RESET 4
#define BT_VS_CMD_BIT_WRITE_BDADDR 5
#define BT_VS_CMD_BIT_SET_TRACE_ENABLE 6
#define BT_VS_CMD_BIT_READ_BUILD_INFO 7
#define BT_VS_CMD_BIT_READ_STATIC_ADDRS 8
#define BT_VS_CMD_BIT_READ_KEY_ROOTS 9
#define BT_VS_CMD_BIT_READ_CHIP_TEMP 10
#define BT_VS_CMD_BIT_READ_HOST_STACK_CMD 11
#define BT_VS_CMD_BIT_SET_SCAN_REP_ENABLE 12
#define BT_VS_CMD_BIT_WRITE_TX_POWER 13
#define BT_VS_CMD_BIT_READ_TX_POWER 14
#define BT_VS_CMD_SUP_FEAT(cmd) BT_LE_FEAT_TEST(cmd, \
BT_VS_CMD_BIT_SUP_FEAT)
#define BT_VS_CMD_READ_STATIC_ADDRS(cmd) BT_LE_FEAT_TEST(cmd, \
BT_VS_CMD_BIT_READ_STATIC_ADDRS)
#define BT_VS_CMD_READ_KEY_ROOTS(cmd) BT_LE_FEAT_TEST(cmd, \
BT_VS_CMD_BIT_READ_KEY_ROOTS)
#define BT_HCI_VS_HW_PLAT_INTEL 0x0001 #define BT_HCI_VS_HW_PLAT_INTEL 0x0001
#define BT_HCI_VS_HW_PLAT_NORDIC 0x0002 #define BT_HCI_VS_HW_PLAT_NORDIC 0x0002
#define BT_HCI_VS_HW_PLAT_NXP 0x0003 #define BT_HCI_VS_HW_PLAT_NXP 0x0003

36
subsys/bluetooth/host/hci_core.c
View file

@ -5046,23 +5046,27 @@ static void hci_vs_init(void)
memcpy(bt_dev.vs_commands, rp.cmds->commands, BT_DEV_VS_CMDS_MAX); memcpy(bt_dev.vs_commands, rp.cmds->commands, BT_DEV_VS_CMDS_MAX);
net_buf_unref(rsp); net_buf_unref(rsp);
err = bt_hci_cmd_send_sync(BT_HCI_OP_VS_READ_SUPPORTED_FEATURES, if (BT_VS_CMD_SUP_FEAT(bt_dev.vs_commands)) {
NULL, &rsp); err = bt_hci_cmd_send_sync(BT_HCI_OP_VS_READ_SUPPORTED_FEATURES,
if (err) { NULL, &rsp);
BT_WARN("Failed to read supported vendor features"); if (err) {
return; BT_WARN("Failed to read supported vendor features");
} return;
}
if (IS_ENABLED(CONFIG_BT_HCI_VS_EXT_DETECT) && if (IS_ENABLED(CONFIG_BT_HCI_VS_EXT_DETECT) &&
rsp->len != sizeof(struct bt_hci_rp_vs_read_supported_features)) { rsp->len !=
BT_WARN("Invalid Vendor HCI extensions"); sizeof(struct bt_hci_rp_vs_read_supported_features)) {
BT_WARN("Invalid Vendor HCI extensions");
net_buf_unref(rsp);
return;
}
rp.feat = (void *)rsp->data;
memcpy(bt_dev.vs_features, rp.feat->features,
BT_DEV_VS_FEAT_MAX);
net_buf_unref(rsp); net_buf_unref(rsp);
return;
} }
rp.feat = (void *)rsp->data;
memcpy(bt_dev.vs_features, rp.feat->features, BT_DEV_VS_FEAT_MAX);
net_buf_unref(rsp);
} }
#endif /* CONFIG_BT_HCI_VS_EXT */ #endif /* CONFIG_BT_HCI_VS_EXT */
@ -5677,7 +5681,7 @@ static void bt_read_identity_root(u8_t *ir)
struct net_buf *rsp; struct net_buf *rsp;
int err; int err;
if (!(bt_dev.vs_commands[1] & BIT(1))) { if (!BT_VS_CMD_READ_KEY_ROOTS(bt_dev.vs_commands)) {
return; return;
} }
@ -5738,7 +5742,7 @@ static uint8_t bt_read_static_addr(struct bt_hci_vs_static_addr *addrs)
int err, i; int err, i;
u8_t cnt; u8_t cnt;
if (!(bt_dev.vs_commands[1] & BIT(0))) { if (!BT_VS_CMD_READ_STATIC_ADDRS(bt_dev.vs_commands)) {
BT_WARN("Read Static Addresses command not available"); BT_WARN("Read Static Addresses command not available");
return 0; return 0;
} }