michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Read static address from FICR on nRF5 if no VS enabled

Browse source 
When running combined build on nRF5 with disabled VS command it is
possible to simply read static random address from FICR in host.

Signed-off-by: Szymon Janc <szymon.janc@codecoup.pl>
This commit is contained in:
Szymon Janc 2018-09-11 13:36:12 +02:00 • committed by Carles Cufí
commit 732b45cff3
2 changed files with 74 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1954,6 +1954,30 @@ static int vendor_cmd_handle(u16_t ocf, struct net_buf *cmd,
}
#endif
#if !defined(CONFIG_BT_HCI_VS_EXT)
uint8_t bt_read_static_addr(bt_addr_le_t *addr)
{
#if defined(CONFIG_SOC_FAMILY_NRF)
if (((NRF_FICR->DEVICEADDR[0] != UINT32_MAX) ||
((NRF_FICR->DEVICEADDR[1] & UINT16_MAX) != UINT16_MAX)) &&
(NRF_FICR->DEVICEADDRTYPE & 0x01)) {
sys_put_le32(NRF_FICR->DEVICEADDR[0], &addr->a.val[0]);
sys_put_le16(NRF_FICR->DEVICEADDR[1], &addr->a.val[4]);
/* The FICR value is a just a random number, with no knowledge
* of the Bluetooth Specification requirements for random
* static addresses.
*/
BT_ADDR_SET_STATIC(&addr->a);
addr->type = BT_ADDR_LE_RANDOM;
return 1;
}
#endif /* CONFIG_SOC_FAMILY_NRF */
return 0;
}
#endif /* !CONFIG_BT_HCI_VS_EXT */
static void data_buf_overflow(struct net_buf **buf)
{
struct bt_hci_evt_data_buf_overflow *ep;

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

@ -4982,49 +4982,61 @@ int bt_id_delete(u8_t id)
return 0;
}
int bt_setup_id_addr(void)
{
#if defined(CONFIG_BT_HCI_VS_EXT)
/* Check for VS_Read_Static_Addresses support. Only read the
* addresses if the user has not already configured one or
* more identities (!bt_dev.id_count).
*/
if (!bt_dev.id_count && (bt_dev.vs_commands[1] & BIT(0))) {
struct bt_hci_rp_vs_read_static_addrs *rp;
struct net_buf *rsp;
int err, i;
err = bt_hci_cmd_send_sync(BT_HCI_OP_VS_READ_STATIC_ADDRS,
NULL, &rsp);
if (err) {
BT_WARN("Failed to read static addresses");
goto generate;
}
rp = (void *)rsp->data;
bt_dev.id_count = min(rp->num_addrs, CONFIG_BT_ID_MAX);
for (i = 0; i < bt_dev.id_count; i++) {
bt_addr_le_t addr;
addr.type = BT_ADDR_LE_RANDOM;
bt_addr_copy(&addr.a, &rp->a[i].bdaddr);
id_create(i, &addr, NULL);
}
net_buf_unref(rsp);
if (bt_dev.id_count) {
return set_random_address(&bt_dev.id_addr[0].a);
}
BT_WARN("No static addresses stored in controller");
} else {
static uint8_t bt_read_static_addr(bt_addr_le_t *addr)
{
struct bt_hci_rp_vs_read_static_addrs *rp;
struct net_buf *rsp;
int err, i;
u8_t cnt;
if (!(bt_dev.vs_commands[1] & BIT(0))) {
BT_WARN("Read Static Addresses command not available");
return 0;
}
generate:
#endif
err = bt_hci_cmd_send_sync(BT_HCI_OP_VS_READ_STATIC_ADDRS, NULL, &rsp);
if (err) {
BT_WARN("Failed to read static addresses");
return 0;
}
rp = (void *)rsp->data;
cnt = min(rp->num_addrs, CONFIG_BT_ID_MAX);
for (i = 0; i < cnt; i++) {
addr[i].type = BT_ADDR_LE_RANDOM;
bt_addr_copy(&addr[i].a, &rp->a[i].bdaddr);
}
net_buf_unref(rsp);
if (!cnt) {
BT_WARN("No static addresses stored in controller");
}
return cnt;
}
#elif defined(CONFIG_BT_CTLR)
uint8_t bt_read_static_addr(bt_addr_le_t *addr);
#endif /* CONFIG_BT_HCI_VS_EXT */
int bt_setup_id_addr(void)
{
#if defined(CONFIG_BT_HCI_VS_EXT) || defined(CONFIG_BT_CTLR)
/* Only read the addresses if the user has not already configured one or
* more identities (!bt_dev.id_count).
*/
if (!bt_dev.id_count) {
bt_addr_le_t addrs[CONFIG_BT_ID_MAX];
bt_dev.id_count = bt_read_static_addr(addrs);
if (bt_dev.id_count) {
int i;
for (i = 0; i < bt_dev.id_count; i++) {
id_create(i, &addrs[i], NULL);
}
return set_random_address(&bt_dev.id_addr[0].a);
}
}
#endif
return bt_id_create(NULL, NULL);
}