michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Controller: Add HCI_LE_Remove_Device_From_White_List

Browse source 
Add implementation in HCI and Controller to support
HCI_LE_Remove_Device_From_White_List, as it is listed as
mandatory under BT Spec. v4.2, Part E, Section 3.19 LE
Controller Requirements.

Change-id: Icef88dffc85746f3cc7adb7fb692ae5578274ed2
Signed-off-by: Vinayak Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
This commit is contained in:
Vinayak Chettimada 2016-11-11 11:58:39 +01:00 • committed by Johan Hedberg
commit 5629197b17
3 changed files with 42 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -205,9 +205,8 @@ static void read_supported_commands(struct net_buf *buf, struct net_buf *evt)
/* All LE commands in this octet. */ /* All LE commands in this octet. */
rp->commands[26] = 0xFF; rp->commands[26] = 0xFF;
/* All LE commands in this octet, /* All LE commands in this octet,
* except LE Remove Device From White List
*/ */
rp->commands[27] = 0xFD; rp->commands[27] = 0xFF;
/* LE Start Encryption, LE Long Term Key Req Reply, /* LE Start Encryption, LE Long Term Key Req Reply,
* LE Long Term Key Req Neg Reply. and * LE Long Term Key Req Neg Reply. and
* LE Read Supported States. * LE Read Supported States.
@ -480,6 +479,18 @@ static void le_add_dev_to_wl(struct net_buf *buf, struct net_buf *evt)
ccst->status = (!status) ? 0x00 : BT_HCI_ERR_MEM_CAPACITY_EXCEEDED; ccst->status = (!status) ? 0x00 : BT_HCI_ERR_MEM_CAPACITY_EXCEEDED;
} }
static void le_rem_dev_from_wl(struct net_buf *buf, struct net_buf *evt)
{
struct bt_hci_cp_le_rem_dev_from_wl *cmd = (void *)buf->data;
struct bt_hci_evt_cc_status *ccst;
uint32_t status;
status = radio_filter_remove(cmd->addr.type, &cmd->addr.a.val[0]);
ccst = cmd_complete(evt, sizeof(*ccst));
ccst->status = (!status) ? 0x00 : BT_HCI_ERR_CMD_DISALLOWED;
}
static void le_conn_update(struct net_buf *buf, struct net_buf *evt) static void le_conn_update(struct net_buf *buf, struct net_buf *evt)
{ {
struct hci_cp_le_conn_update *cmd = (void *)buf->data; struct hci_cp_le_conn_update *cmd = (void *)buf->data;
@ -736,6 +747,10 @@ static int controller_cmd_handle(uint8_t ocf, struct net_buf *cmd,
le_add_dev_to_wl(cmd, evt); le_add_dev_to_wl(cmd, evt);
break; break;
case BT_OCF(BT_HCI_OP_LE_REM_DEV_FROM_WL):
le_rem_dev_from_wl(cmd, evt);
break;
case BT_OCF(BT_HCI_OP_LE_CONN_UPDATE): case BT_OCF(BT_HCI_OP_LE_CONN_UPDATE):
le_conn_update(cmd, evt); le_conn_update(cmd, evt);
break; break;

24
subsys/bluetooth/controller/ll/ctrl.c
View file

@ -6320,6 +6320,30 @@ uint32_t radio_filter_add(uint8_t addr_type, uint8_t *addr)
return 1; return 1;
} }
uint32_t radio_filter_remove(uint8_t addr_type, uint8_t *addr)
{
uint8_t index;
if (!_radio.filter_enable_bitmask) {
return 1;
}
index = 8;
while (index--) {
if ((_radio.filter_enable_bitmask & BIT(index)) &&
(((_radio.filter_addr_type_bitmask >> index) & 0x01) ==
(addr_type & 0x01)) &&
!memcmp(_radio.filter_bdaddr[index], addr, BDADDR_SIZE)) {
_radio.filter_enable_bitmask &= ~BIT(index);
_radio.filter_addr_type_bitmask &= ~BIT(index);
return 0;
}
}
return 1;
}
void radio_irk_clear(void) void radio_irk_clear(void)
{ {
_radio.nirk = 0; _radio.nirk = 0;

1
subsys/bluetooth/controller/ll/ctrl.h
View file

@ -213,6 +213,7 @@ struct radio_adv_data *radio_adv_data_get(void);
struct radio_adv_data *radio_scan_data_get(void); struct radio_adv_data *radio_scan_data_get(void);
void radio_filter_clear(void); void radio_filter_clear(void);
uint32_t radio_filter_add(uint8_t addr_type, uint8_t *addr); uint32_t radio_filter_add(uint8_t addr_type, uint8_t *addr);
uint32_t radio_filter_remove(uint8_t addr_type, uint8_t *addr);
void radio_irk_clear(void); void radio_irk_clear(void);
uint32_t radio_irk_add(uint8_t *irk); uint32_t radio_irk_add(uint8_t *irk);
uint32_t radio_adv_enable(uint16_t interval, uint8_t chl_map, uint32_t radio_adv_enable(uint16_t interval, uint8_t chl_map,